aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/sledjchisl/sledjchisl.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c
index 885bfad..37fa588 100644
--- a/src/sledjchisl/sledjchisl.c
+++ b/src/sledjchisl/sledjchisl.c
@@ -2553,7 +2553,7 @@ void ungitar(simData *simd, char *sim, int count, int window, int panes, int pan
2553 Results in slightly larger I/OARs, as we store the directory names separately. Can't see any options to not do that. 2553 Results in slightly larger I/OARs, as we store the directory names separately. Can't see any options to not do that.
2554 Also, we name them .oar.tgz, to NOT hide the fact they are simple tarballs, while still tagging them as I/OARs. 2554 Also, we name them .oar.tgz, to NOT hide the fact they are simple tarballs, while still tagging them as I/OARs.
2555*/ 2555*/
2556 char *name = xstrdup(sim); 2556 char *name = xstrdup(sim), *tab = xstrdup(simd->tab);
2557 2557
2558 if (FLAG(m)) 2558 if (FLAG(m))
2559 { 2559 {
@@ -2561,9 +2561,12 @@ void ungitar(simData *simd, char *sim, int count, int window, int panes, int pan
2561 { 2561 {
2562 free(name); 2562 free(name);
2563 name = xmprintf("%s_%s", sim, last); 2563 name = xmprintf("%s_%s", sim, last);
2564 free(tab);
2565 name = xmprintf("%s %s", sim, last);
2564 } 2566 }
2565 else 2567 else
2566 { 2568 {
2569 free(tab);
2567 free(name); 2570 free(name);
2568 return; 2571 return;
2569 } 2572 }
@@ -2634,12 +2637,12 @@ void ungitar(simData *simd, char *sim, int count, int window, int panes, int pan
2634 break; 2637 break;
2635 } 2638 }
2636 free(prev); 2639 free(prev);
2637 prev = xmprintf("%s/%s-%s.tgz", scBackup, simd->tab, &out[l - 24]); // Converting any old full names to new names. 2640 prev = xmprintf("%s/%s-%s.tgz", scBackup, tab, &out[l - 24]); // Converting any old full names to new names.
2638 if (!qfile_exist(prev)) 2641 if (!qfile_exist(prev))
2639 { 2642 {
2640 I("Extracting %s", prev); 2643 I("Extracting %s", prev);
2641 free(prev); 2644 free(prev);
2642 prev = xmprintf("%s/%s-%s", scBackup, simd->tab, &out[l - 24]); // Converting any old full names to new names. 2645 prev = xmprintf("%s/%s-%s", scBackup, tab, &out[l - 24]); // Converting any old full names to new names.
2643 // OpenSim insists on the archive.xml file being the very first in the tarball. 2646 // OpenSim insists on the archive.xml file being the very first in the tarball.
2644 if (shellMeFail("cd %s/%s; ionice -c3 nice -n 19 tar -c archive.xml -f %s", dir, gar, prev)) E("Failed to tar %s!", prev); 2647 if (shellMeFail("cd %s/%s; ionice -c3 nice -n 19 tar -c archive.xml -f %s", dir, gar, prev)) E("Failed to tar %s!", prev);
2645 if (shellMeFail("cd %s/%s; ionice -c3 nice -n 19 tar -r -f %s --exclude='.git*' --exclude='archive.xml' * ", 2648 if (shellMeFail("cd %s/%s; ionice -c3 nice -n 19 tar -r -f %s --exclude='.git*' --exclude='archive.xml' * ",
@@ -2667,6 +2670,7 @@ ungitARend:
2667 free(gar); 2670 free(gar);
2668 } 2671 }
2669 free(dir); 2672 free(dir);
2673 free(tab);
2670 free(name); 2674 free(name);
2671} 2675}
2672 2676