Changeset 2291 in MondoRescue for branches/2.2.10/mondo/src/mondorestore

Timestamp:

Jul 22, 2009, 2:11:26 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Fix a printing error in mindi for the tar command
• Fix all mr_asprintf which had no second param as a string

(report bug fix done originaly in 2.2.9)

Location:

branches/2.2.10/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (3 diffs)
• mondo-rstr-compare.c (modified) (3 diffs)
• mondorestore.c (modified) (2 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

@@ -615 +615 @@
   // - faulty devices ignored
   // - persistent superblock always used as this is recommended
-  mr_asprintf(&program,
-       "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d",
-       raidlist->el[i].raid_device, level,
-       raidlist->el[i].data_disks.entries);
+  mr_asprintf(&program, "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d", raidlist->el[i].raid_device, level, raidlist->el[i].data_disks.entries);
   if (raidlist->el[i].parity != -1) {
     mr_asprintf(&strtmp, "%s", program);
@@ -709 +706 @@
 #endif
     if (strlen(format) <= 2) {
-        mr_asprintf(&tmp,
-                "%s has a really small format type ('%s') - this is probably a hexadecimal string, which would suggest the partition is an image --- I shouldn't format it",
-                device, format);
+        mr_asprintf(&tmp, "%s has a really small format type ('%s') - this is probably a hexadecimal string, which would suggest the partition is an image --- I shouldn't format it", device, format);
         log_it(tmp);
         paranoid_free(tmp);
@@ -774 +769 @@
 
                 while (1) {
-                    mr_asprintf(&tmp,
-                            "vinum lp -r %s | grep '^S' | head -1 | tr -s ' ' | cut -d: -f2 | cut -f1 | sed 's/^ //' | sed 's/I //' | sed 's/%%//'",
-                            line);
+                    mr_asprintf(&tmp, "vinum lp -r %s | grep '^S' | head -1 | tr -s ' ' | cut -d: -f2 | cut -f1 | sed 's/^ //' | sed 's/I //' | sed 's/%%//'", line);
                     FILE *pin = popen(tmp, "r");
                     paranoid_free(tmp);

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -81 +81 @@
             insist_on_this_cd_number((++g_current_media_number));
         } else {
-            mr_asprintf(&tmp_ptr,
-                    "No CD's left. No biggiefiles left. No prob, Bob.");
+            mr_asprintf(&tmp_ptr, "No CD's left. No biggiefiles left. No prob, Bob.");
             log_msg(2, tmp_ptr);
             paranoid_free(tmp_ptr);
@@ -89 +88 @@
     }
     if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
-        mr_asprintf(&tmp_ptr,
-                "Cannot open bigfile %ld (%s)'s info file",
-                bigfileno + 1, bigfile_fname_ptr);
+        mr_asprintf(&tmp_ptr, "Cannot open bigfile %ld (%s)'s info file", bigfileno + 1, bigfile_fname_ptr);
         log_to_screen(tmp_ptr);
         paranoid_free(tmp_ptr);
@@ -148 +145 @@
         }
     }
-    mr_asprintf(&tmp_ptr, "bigfile #%ld ('%s') ", bigfileno + 1,
-            bigfile_fname_ptr);
+    mr_asprintf(&tmp_ptr, "bigfile #%ld ('%s') ", bigfileno + 1, bigfile_fname_ptr);
     if (!strcmp(checksum_ptr, original_cksum_ptr) != 0) {
         mr_strcat(tmp_ptr, " ... OK");

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -1725 +1725 @@
 
         if (use_star) {
-            mr_asprintf(&command,
-                    "star -x -force-remove -U " STAR_ACL_SZ
-                    " errctl= file=%s", tarball_fname);
+            mr_asprintf(&command, "star -x -force-remove -U " STAR_ACL_SZ " errctl= file=%s", tarball_fname);
             if (strstr(tarball_fname, ".bz2")) {
                 mr_strcat(command, " -bz");
@@ -1736 +1734 @@
             } else {
                 if (filelist_subset_fname != NULL) {
-                    mr_asprintf(&command,
-                        "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s",
-                        TAPE_BLOCK_SIZE,
-                        BUFSIZE, executable, filelist_subset_fname,
-                        tarball_fname);
+                    mr_asprintf(&command, "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, filelist_subset_fname, tarball_fname);
                 } else {
-                    mr_asprintf(&command,
-                        "afio -i -b %ld -c %ld -M 8m %s %s",
-                        TAPE_BLOCK_SIZE,
-                        BUFSIZE, executable, tarball_fname);
+                    mr_asprintf(&command, "afio -i -b %ld -c %ld -M 8m %s %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, tarball_fname);
                 }
             }