Changeset 3469 in MondoRescue

Timestamp:

Sep 11, 2015, 5:34:21 PM (9 years ago)

Author:

Bruno Cornec

Message:

Remove usage of a local use_star variable and use the one in bkpinfo instead

File:

• branches/3.2/mondo/src/mondorestore/mondorestore.c (modified) (11 diffs)

branches/3.2/mondo/src/mondorestore/mondorestore.c

@@ -673 +673 @@
     char *temp_log = NULL;
     long matches = 0;
-    bool use_star;
     char *xattr_fname = NULL;
     char *acl_fname = NULL;
@@ -681 +680 @@
 
     log_msg(5, "Entering");
-    use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
+    if (strstr(tarball_fname, ".star")) {
+        bkpinfo->use_star = TRUE;
+    } else {
+        bkpinfo->use_star = FALSE;
+    }
     mr_asprintf(command, "mkdir -p %s/tmp", MNT_RESTORING);
     run_program_and_log_output(command, 9);
@@ -710 +713 @@
              save_filelist_entries_in_common(filelist_name, filelist,
                                              filelist_subset_fname,
-                                             use_star)) <= 0) {
+                                             bkpinfo->use_star)) <= 0) {
             log_msg(1, "Skipping fileset %ld", current_tarball_number);
         } else {
@@ -758 +761 @@
 #endif
 
-        if (use_star) {
+        if (bkpinfo->use_star) {
             mr_asprintf(command, "star -x -force-remove -sparse -U " STAR_ACL_SZ " file=%s", tarball_fname);
             if (strstr(tarball_fname, ".bz2")) {
@@ -797 +800 @@
         }
 
-        if (! use_star) {
+        if (! bkpinfo->use_star) {
             if (g_getfattr) {
                 log_msg(1, "Setting fattr list %s", xattr_fname);
@@ -826 +829 @@
         }
         // Be verbose for star
-        if (retval || use_star) {
+        if (retval || bkpinfo->use_star) {
             mr_asprintf(command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
             paranoid_system(command);
@@ -1447 +1450 @@
     long matches = 0;
     bool restore_this_fileset = FALSE;
-    bool use_star;
 
     assert(bkpinfo != NULL);
@@ -1453 +1455 @@
 
     /* to do it with a file... */
-    use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
     mds = media_descriptor_string(bkpinfo->backup_media_type);
     log_msg(2, "Restoring from fileset #%ld (%ld KB) on %s #%d",
@@ -1473 +1474 @@
     if (strstr(tarball_fname, ".star")) {
         bkpinfo->use_star = TRUE;
+    } else {
+        bkpinfo->use_star = FALSE;
     }
     if (res) {
@@ -1492 +1495 @@
     } else                      // If restoring selectively then get TOC from tarball
     {
-        if (strstr(tarball_fname, ".star.")) {
-            use_star = TRUE;
+        if (bkpinfo->use_star) {
             mr_asprintf(command, "star -sparse -t file=%s %s", afio_fname, executable);
         } else {
-            use_star = FALSE;
             mr_asprintf(command, "afio -t -M 8m -b %ld %s %s", TAPE_BLOCK_SIZE, executable, afio_fname);
         }
@@ -1509 +1510 @@
              save_filelist_entries_in_common(filelist_fname, filelist,
                                              filelist_subset_fname,
-                                             use_star))
+                                             bkpinfo->use_star))
             <= 0 || length_of_file(filelist_subset_fname) < 2) {
             if (length_of_file(filelist_subset_fname) < 2) {