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

Timestamp:

Jul 23, 2009, 2:53:30 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Replace sprintf by mr_asprintf in mondo-rstr-compare.c
• All mr_asprintf call should be on one line (for quality script) and use a string as second param
• Improve quality script

Location:

branches/2.2.10/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (13 diffs)
• mondo-rstr-compare.c (modified) (26 diffs)
• mondo-rstr-tools.c (modified) (17 diffs)
• mondorestore.c (modified) (10 diffs)

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

@@ -79 +79 @@
         make_list_of_drives_in_mountlist(mountlist, drivelist);
         for (lino = 0; lino < drivelist->entries; lino++) {
-            mr_asprintf(&command,
-                    "dd if=%s bs=512 count=1 2> /dev/null | grep \"%s\"",
-                    drivelist->el[lino].device, MONDO_WAS_HERE);
+            mr_asprintf(&command, "dd if=%s bs=512 count=1 2> /dev/null | grep \"%s\"", drivelist->el[lino].device, MONDO_WAS_HERE);
             res = run_program_and_log_output(command, 1);
             mr_free(command);
@@ -260 +258 @@
         strcpy(vgremove_sz, "vgremove");
     }
-    mr_asprintf(&tmp1,
-            "for i in `%s | cut -d\"'\" -f2 | sort -r` ; do echo \"Shutting down lv $i\" >> %s ; %s -f $i; done", lvscan_sz, MONDO_LOGFILE, lvremove_sz);
+    mr_asprintf(&tmp1, "for i in `%s | cut -d\"'\" -f2 | sort -r` ; do echo \"Shutting down lv $i\" >> %s ; %s -f $i; done", lvscan_sz, MONDO_LOGFILE, lvremove_sz);
     run_program_and_log_output(tmp1, 5);
     mr_free(tmp1);
@@ -521 +518 @@
                             new_mountlist->entries++;
                         } else {
-                            mr_asprintf(&tmp,
-                                    "Not adding %s to mountlist: it's already there",
-                                    p);
+                            mr_asprintf(&tmp, "Not adding %s to mountlist: it's already there", p);
                             log_it(tmp);
                             mr_free(tmp);
@@ -647 +642 @@
     mr_asprintf(&strtmp, "%s", program);
     paranoid_free(program);
-    mr_asprintf(&program, "%s --spare-devices=%d", strtmp,
-         raidlist->el[i].spare_disks.entries);
+    mr_asprintf(&program, "%s --spare-devices=%d", strtmp, raidlist->el[i].spare_disks.entries);
     paranoid_free(strtmp);
   }
@@ -747 +741 @@
 
             /* format raid partition */
-            mr_asprintf(&program,
-                    "for plex in `vinum lv -r %s | grep '^P' | tr '\t' ' ' | tr -s ' ' | cut -d' ' -f2`; do echo $plex; done > /tmp/plexes", basename(device));
+            mr_asprintf(&program, "for plex in `vinum lv -r %s | grep '^P' | tr '\t' ' ' | tr -s ' ' | cut -d' ' -f2`; do echo $plex; done > /tmp/plexes", basename(device));
             system(program);
             if (g_fprep) {
@@ -914 +907 @@
 
     assert(mountlist != NULL);
-    mr_asprintf(&tmp, "format_everything (mountlist, interactively = %s",
-            (interactively) ? "true" : "false");
+    mr_asprintf(&tmp, "format_everything (mountlist, interactively = %s", (interactively) ? "true" : "false");
     log_it(tmp);
     mr_free(tmp);
@@ -943 +935 @@
             if (interactively) {
                 // ask user if we should format the current device
-                mr_asprintf(&tmp, "Shall I format %s (%s) ?", me->device,
-                        me->mountpoint);
+                mr_asprintf(&tmp, "Shall I format %s (%s) ?", me->device, me->mountpoint);
                 do_it = ask_me_yes_or_no(tmp);
                 mr_free(tmp);
@@ -1425 +1416 @@
     mr_free(command);
 
-    mr_asprintf(&command, "disklabel -R %s /tmp/disklabel",
-            canonical_name(drivename));
+    mr_asprintf(&command, "disklabel -R %s /tmp/disklabel", canonical_name(drivename));
     retval += run_program_and_log_output(command, TRUE);
     mr_free(command);
@@ -1571 +1561 @@
             file = open(drivename, O_WRONLY);
             if (file != -1) {
-                mr_asprintf(&tmp,
-                        "Warning - unable to open %s for wiping it's partition table",
-                        drivename);
+                mr_asprintf(&tmp, "Warning - unable to open %s for wiping it's partition table", drivename);
                 log_to_screen(tmp);
                 mr_free(tmp);
@@ -1580 +1568 @@
             for (i = 0; i < 512; i++) {
                 if (!write(file, "\0", 1)) {
-                    mr_asprintf(&tmp, "Warning - unable to write to %s",
-                            drivename);
+                    mr_asprintf(&tmp, "Warning - unable to write to %s", drivename);
                     log_to_screen(tmp);
                     mr_free(tmp);
@@ -1642 +1629 @@
     if (pout_to_fdisk) {
 // mark relevant partition as bootable
-        mr_asprintf(&tmp, "a\n%s\n",
-                call_program_and_get_last_line_of_output
-                ("make-me-bootable /tmp/mountlist.txt dummy"));
+        mr_asprintf(&tmp, "a\n%s\n", call_program_and_get_last_line_of_output("make-me-bootable /tmp/mountlist.txt dummy"));
         fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
         mr_free(tmp);
@@ -1739 +1724 @@
 
     if (is_this_device_mounted(partition_name)) {
-        mr_asprintf(&tmp, "%s is mounted, and should not be partitioned",
-                partition_name);
+        mr_asprintf(&tmp, "%s is mounted, and should not be partitioned", partition_name);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -2050 +2034 @@
     } else {
         /* probably an image */
-        mr_asprintf(&tmp,
-                "Unknown format ('%s') - using supplied string anyway",
-                format);
+        mr_asprintf(&tmp, "Unknown format ('%s') - using supplied string anyway", format);
         mvaddstr_and_log_it(g_currentY++, 0, tmp);
         mr_free(tmp);

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

@@ -47 +47 @@
     char *bigfile_fname_ptr;
     char *tmp_ptr = NULL;
-    char *command_ptr;
+    char *command_ptr = NULL;
 
     char *checksum, *original_cksum, *bigfile_fname, *tmp, *command;
@@ -65 +65 @@
     malloc_string(original_cksum_ptr);
     malloc_string(bigfile_fname_ptr);
-    malloc_string(command_ptr);
 
   /*********************************************************************
@@ -74 +73 @@
     memset(original_cksum_ptr, '\0', sizeof(original_cksum));
     memset(bigfile_fname_ptr, '\0', sizeof(bigfile_fname));
-    memset(command_ptr, '\0', sizeof(command));
   /** end **/
 
@@ -113 +111 @@
     if (!strncmp(bigfile_fname_ptr, "/dev/", 5)) {
         strcpy(original_cksum_ptr, "IGNORE");
-    } else {
-        sprintf(command_ptr,
-                "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors",
-                MNT_RESTORING, bigfile_fname_ptr);
-    }
+        log_msg(2, "IGNORING %s as begining with /dev", bigfile_fname_ptr);
+        return (1);
+    }
+
+    mr_asprintf(&command_ptr, "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors", MNT_RESTORING, bigfile_fname_ptr);
     log_msg(2, command_ptr);
+    i =  system(command_ptr);
+    mr_free(command_ptr);
+
     mr_asprintf(&tmp_ptr, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
     paranoid_system(tmp_ptr);
     paranoid_free(tmp_ptr);
 
-    if (system(command_ptr)) {
+    if (i) {
         log_OS_error("Warning - command failed");
         original_cksum[0] = '\0';
@@ -169 +170 @@
     paranoid_free(checksum_ptr);
     paranoid_free(checksum);
-    paranoid_free(command_ptr);
     paranoid_free(command);
     paranoid_free(tmp);
@@ -190 +190 @@
     int res;
     long noof_biggiefiles, bigfileno = 0;
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     log_msg(1, "Comparing biggiefiles");
@@ -211 +211 @@
                        noof_biggiefiles);
     for (bigfileno = 0; bigfileno < noof_biggiefiles; bigfileno++) {
-        sprintf(tmp, "Comparing big file #%ld", bigfileno + 1);
+        mr_asprintf(&tmp, "Comparing big file #%ld", bigfileno + 1);
         log_msg(1, tmp);
         update_progress_form(tmp);
+        mr_free(tmp);
+
         res = compare_a_biggiefile(bigfileno);
         retval += res;
@@ -250 +252 @@
 
   /***  needs malloc *********/
-    char *command, *tmp, *filelist_name, *logfile,
-        *compressor_exe;
+    char *command = NULL;
+    char *tmp = NULL;
     char *archiver_exe = NULL;
-
-    malloc_string(command);
-    malloc_string(tmp);
-    malloc_string(filelist_name);
-    malloc_string(logfile);
-    malloc_string(compressor_exe);
+    char *filelist_name = NULL;
+    char *logfile = NULL;
+    char *compressor_exe = NULL;
 
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-    sprintf(logfile, "/tmp/afio.log.%d", current_tarball_number);
-    sprintf(filelist_name, MNT_CDROM "/archives/filelist.%d",
-            current_tarball_number);
-
+    mr_asprintf(&filelist_name, MNT_CDROM "/archives/filelist.%d", current_tarball_number);
     noof_lines = count_lines_in_file(filelist_name);
+    mr_free(filelist_name);
 
     if (strstr(tarball_fname, ".bz2")) {
-        strcpy(compressor_exe, "bzip2");
+        mr_asprintf(&compressor_exe, "bzip2");
     } else if (strstr(tarball_fname, ".gz")) {
-        strcpy(compressor_exe, "gzip");
+        mr_asprintf(&compressor_exe, "gzip");
     } else if (strstr(tarball_fname, ".lzo")) {
-        strcpy(compressor_exe, "lzop");
-    } else {
-        compressor_exe[0] = '\0';
+        mr_asprintf(&compressor_exe, "lzop");
     }
 
@@ -284 +279 @@
     }
 
-    if (compressor_exe[0]) {
-        strcpy(tmp, compressor_exe);
-        if (!find_home_of_exe(tmp)) {
+    if (compressor_exe) {
+        if (!find_home_of_exe(compressor_exe)) {
+            mr_free(compressor_exe);
+            mr_free(archiver_exe);
             fatal_error("(compare_a_tarball) Compression program missing");
         }
-        if (use_star)           // star
-        {
+        if (use_star) {
             if (!strcmp(compressor_exe, "bzip2")) {
                 mr_strcat(archiver_exe, " -bz");
             } else {
-                fatal_error
-                    ("(compare_a_tarball) Please use only bzip2 with star");
+                mr_free(compressor_exe);
+                mr_free(archiver_exe);
+                fatal_error("(compare_a_tarball) Please use only bzip2 with star");
             }
-        } else                  // afio
-        {
-            sprintf(compressor_exe, "-P %s -Z", tmp);
-        }
-    }
-// star -diff H=star -bz file=....
+        } else {
+            // afio
+            mr_free(compressor_exe);
+            mr_asprintf(&tmp, "%s", compressor_exe);
+            mr_asprintf(&compressor_exe, "-P %s -Z", tmp);
+            mr_free(tmp);
+        }
+    }
 
 #ifdef __FreeBSD__
@@ -309 +307 @@
 #define BUFSIZE (1024L*1024L)/TAPE_BLOCK_SIZE
 #endif
-    if (use_star)               // doesn't use compressor_exe
-    {
-        sprintf(command,
-                "%s -diff H=star file=%s >> %s 2>> %s",
-                archiver_exe, tarball_fname, logfile, logfile);
-    } else {
-        sprintf(command,
-                "%s -r -b %ld -M 16m -c %ld %s %s >> %s 2>> %s",
-                archiver_exe,
-                TAPE_BLOCK_SIZE,
-                BUFSIZE, compressor_exe, tarball_fname, logfile, logfile);
-    }
+    mr_asprintf(&logfile, "/tmp/afio.log.%d", current_tarball_number);
+
+    if (use_star) {
+        // doesn't use compressor_exe
+        mr_asprintf(&command, "%s -diff H=star file=%s >> %s 2>> %s", archiver_exe, tarball_fname, logfile, logfile);
+    } else {
+        mr_asprintf(&command, "%s -r -b %ld -M 16m -c %ld %s %s >> %s 2>> %s", archiver_exe, TAPE_BLOCK_SIZE, BUFSIZE, compressor_exe, tarball_fname, logfile, logfile);
+    }
+    mr_free(compressor_exe);
     paranoid_free(archiver_exe);
 
@@ -329 +324 @@
     if (res) {
         log_OS_error(command);
-        sprintf(tmp, "Warning - afio returned error = %d", res);
-        log_msg(2, tmp);
-    }
+        log_msg(2, "Warning - afio returned error = %d", res);
+    }
+    mr_free(command);
+
     if (length_of_file(logfile) > 5) {
-        sprintf(command,
-                "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> "MONDO_CACHE"/changed.txt",
-                logfile);
+        mr_asprintf(&command, "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> "MONDO_CACHE"/changed.txt", logfile);
         system(command);
+        mr_free(command);
+
         archiver_errors = count_lines_in_file(logfile);
     } else {
         archiver_errors = 0;
     }
-    sprintf(tmp, "%ld difference%c in fileset #%d          ",
-            archiver_errors, (archiver_errors != 1) ? 's' : ' ',
-            current_tarball_number);
     if (archiver_errors) {
-        sprintf(tmp,
-                "Differences found while processing fileset #%d       ",
-                current_tarball_number);
-        log_msg(1, tmp);
+        log_msg(1, "%ld difference%c in fileset #%d          ", archiver_errors, (archiver_errors != 1) ? 's' : ' ', current_tarball_number);
     }
     unlink(logfile);
-    paranoid_free(command);
-    paranoid_free(tmp);
-    paranoid_free(filelist_name);
-    paranoid_free(logfile);
-    paranoid_free(compressor_exe);
+    mr_free(logfile);
+
     return (retval);
 }
@@ -377 +364 @@
   /**  needs malloc **********/
 
-    char *tarball_fname, *progress_str, *tmp;
+    char *tarball_fname = NULL; 
+    char *progress_str = NULL;
+    char *tmp = NULL;
     char *mds = NULL;
     long max_val;
 
-    malloc_string(tarball_fname);
-    malloc_string(progress_str);
-    malloc_string(tmp);
 
     assert(bkpinfo != NULL);
     mvaddstr_and_log_it(g_currentY, 0, "Comparing archives");
+
+    malloc_string(tmp);
     read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
-
     max_val = atol(tmp);
+    paranoid_free(tmp);
+
     mds = media_descriptor_string(bkpinfo->backup_media_type);
-    sprintf(progress_str, "Comparing with %s #%d ", mds, g_current_media_number);
+    mr_asprintf(&progress_str, "Comparing with %s #%d ", mds, g_current_media_number);
 
     open_progress_form("Comparing files",
@@ -403 +392 @@
         insist_on_this_cd_number(g_current_media_number);
         update_progress_form(progress_str);
-        sprintf(tarball_fname,
-                MNT_CDROM "/archives/%d.afio.bz2", current_tarball_number);
+        mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.afio.bz2", current_tarball_number);
 
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.lzo",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.afio.lzo", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.gz",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.afio.gz", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.afio.", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.star.bz2",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.star.bz2", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.star.",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.star.", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
@@ -432 +420 @@
                 == 0) {
                 log_msg(2, "OK, I think I'm done with tarballs...");
+                mr_free(tarball_fname);
                 break;
             }
             log_msg(2, "OK, I think it's time for another CD...");
             g_current_media_number++;
-            sprintf(progress_str, "Comparing with %s #%d ", mds, g_current_media_number);
+
+            mr_free(progress_str);
+            mr_asprintf(&progress_str, "Comparing with %s #%d ", mds, g_current_media_number);
             log_to_screen(progress_str);
         } else {
@@ -444 +435 @@
             current_tarball_number++;
         }
-    }
+        mr_free(tarball_fname);
+    }
+    mr_free(progress_str);
     mr_free(mds);
 
@@ -453 +446 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(tarball_fname);
-    paranoid_free(progress_str);
-    paranoid_free(tmp);
     return (retval);
 }
@@ -478 +468 @@
 {
   /** needs malloc *********/
-    char *tmp, *cwd, *new, *command;
+    char *tmp = NULL;
+    char *cwd, *new;
+    char *command = NULL;
     int resA = 0;
     int resB = 0;
     long noof_changed_files;
 
-    malloc_string(tmp);
     malloc_string(cwd);
     malloc_string(new);
-    malloc_string(command);
 
     assert(bkpinfo != NULL);
@@ -501 +491 @@
     noof_changed_files = count_lines_in_file(MONDO_CACHE"/changed.txt");
     if (noof_changed_files) {
-        sprintf(tmp, "%ld files do not match the backup            ",
-                noof_changed_files);
-        //      mvaddstr_and_log_it( g_currentY++, 0, tmp );
+        mr_asprintf(&tmp, "%ld files do not match the backup            ", noof_changed_files);
         log_to_screen(tmp);
-        sprintf(command, "cat "MONDO_CACHE"/changed.txt >> %s", MONDO_LOGFILE);
+        mr_free(tmp);
+
+        mr_asprintf(&command, "cat "MONDO_CACHE"/changed.txt >> %s", MONDO_LOGFILE);
         paranoid_system(command);
-    } else {
-        sprintf(tmp, "All files match the backup                     ");
+        mr_free(command);
+    } else {
+        mr_asprintf(&tmp, "All files match the backup                     ");
         mvaddstr_and_log_it(g_currentY++, 0, tmp);
         log_to_screen(tmp);
-    }
-
-    paranoid_free(tmp);
+        mr_free(tmp);
+    }
+
     paranoid_free(cwd);
     paranoid_free(new);
-    paranoid_free(command);
 
     return (resA + resB);
@@ -544 +534 @@
     int res = 0;
     long q;
-    char *tmp;
+    char *tmp = NULL;
     char *new;
     char *cwd;
 
-    malloc_string(tmp);
     malloc_string(new);
     malloc_string(cwd);
@@ -575 +564 @@
     if (g_text_mode) {
         save_mountlist_to_disk(mountlist, g_mountlist_fname);
-        sprintf(tmp, "%s %s", find_my_editor(), g_mountlist_fname);
+        mr_asprintf(&tmp, "%s %s", find_my_editor(), g_mountlist_fname);
         res = system(tmp);
+        mr_free(tmp);
+
         load_mountlist(mountlist, g_mountlist_fname);
     } else {
@@ -622 +613 @@
         } else {
             q = count_lines_in_file(MONDO_CACHE"/changed.files");
-            sprintf(tmp, "%ld significant difference%s found.", q,
-                    (q != 1) ? "s" : "");
+            mr_asprintf(&tmp, "%ld significant difference%s found.", q, (q != 1) ? "s" : "");
             mvaddstr_and_log_it(g_currentY++, 0, tmp);
             log_to_screen(tmp);
-
-            strcpy(tmp,
-                   "Type 'less /tmp/changed.files' for a list of non-matching files");
+            mr_free(tmp);
+
+            mr_asprintf(&tmp, "Type 'less /tmp/changed.files' for a list of non-matching files");
             mvaddstr_and_log_it(g_currentY++, 0, tmp);
             log_to_screen(tmp);
+            mr_free(tmp);
 
             log_msg(2, "calling popup_changelist_from_file()");
@@ -647 +638 @@
 
     kill_petris();
-    paranoid_free(tmp);
     paranoid_free(new);
     paranoid_free(cwd);
@@ -670 +660 @@
 
   /** needs malloc **/
-    char *dir, *command;
+    char *dir;
+    char *command = NULL;
 
     assert(bkpinfo != NULL);
     malloc_string(dir);
-    malloc_string(command);
     getcwd(dir, MAX_STR_LEN);
     chdir(bkpinfo->restore_path);
 
-    sprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp",
-            bkpinfo->restore_path);
+    mr_asprintf(&command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp", bkpinfo->restore_path);
     run_program_and_log_output(command, FALSE);
+    mr_free(command);
+
     mvaddstr_and_log_it(g_currentY,
                         0, "Verifying archives against filesystem");
@@ -704 +695 @@
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     paranoid_free(dir);
-    paranoid_free(command);
     return (res);
 }
@@ -727 +717 @@
 {
     int res;
-    char *dir, *command;
+    char *dir;
+    char *command = NULL;
 
     assert(bkpinfo != NULL);
     malloc_string(dir);
-    malloc_string(command);
 
     getcwd(dir, MAX_STR_LEN);
     chdir(bkpinfo->restore_path);
-    sprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp",
-            bkpinfo->restore_path);
+    mr_asprintf(&command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp", bkpinfo->restore_path);
     run_program_and_log_output(command, FALSE);
+    mr_free(command);
+
     mvaddstr_and_log_it(g_currentY,
                         0, "Verifying archives against filesystem");
@@ -748 +739 @@
     }
     paranoid_free(dir);
-    paranoid_free(command);
     return (res);
 }

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

@@ -368 +368 @@
         log_msg(3, "Mommm! SME is being a dildo!");
     } else {
-        mr_asprintf(&mountpoint, mpt);
+        mr_asprintf(&mountpoint, "%s", mpt);
     }
 
@@ -408 +408 @@
         mr_free(command);
 
-        mr_asprintf(&command, "mount -t %s %s %s %s 2>> %s", format, device,
-                additional_parameters, mountdir, MONDO_LOGFILE);
+        mr_asprintf(&command, "mount -t %s %s %s %s 2>> %s", format, device, additional_parameters, mountdir, MONDO_LOGFILE);
         log_msg(2, "command='%s'", command);
     }
@@ -418 +417 @@
         log_msg(1, "Re-trying without the fancy extra parameters");
         mr_free(command);
-        mr_asprintf(&command, "mount -t %s %s %s 2>> %s", format, device,
-            mountdir, MONDO_LOGFILE);
+        mr_asprintf(&command, "mount -t %s %s %s 2>> %s", format, device, mountdir, MONDO_LOGFILE);
         res = run_program_and_log_output(command, TRUE);
     }
@@ -497 +495 @@
                 "Again with the /proc - why is this in your mountlist?");
         } else if (is_this_device_mounted(mountlist->el[lino].device)) {
-            mr_asprintf(&tmp, "%s is already mounted",
-                mountlist->el[lino].device);
+            mr_asprintf(&tmp, "%s is already mounted", mountlist->el[lino].device);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -607 +604 @@
         mr_asprintf(&mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
 #else
-        mr_asprintf(&mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->nfs_remote_dir,
-            bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        mr_asprintf(&mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
 
@@ -619 +615 @@
         mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
 #else
-        mr_asprintf(&mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s",
-            bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        mr_asprintf(&mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
     } else if (bkpinfo->backup_media_type == usb) {
@@ -1101 +1096 @@
     unlink(FILELIST_FULL_STUB);
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        mr_asprintf(&command, "tar -b %ld -zxf %s ./%s ./%s ./%s ./%s ./%s",
-            bkpinfo->internal_tape_block_size,
-            bkpinfo->media_device,
-            MOUNTLIST_FNAME_STUB,
-            BIGGIELIST_TXT_STUB,
-            FILELIST_FULL_STUB,
-            IWANTMYLVM_STUB,
-            MONDO_CFG_FILE_STUB);
+        mr_asprintf(&command, "tar -b %ld -zxf %s ./%s ./%s ./%s ./%s ./%s", bkpinfo->internal_tape_block_size, bkpinfo->media_device, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
         log_msg(1, "tarcommand = %s", command);
         run_program_and_log_output(command, 1);
@@ -1116 +1104 @@
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            mr_asprintf(&command,
-                "tar -b %ld -zxf %s %s %s %s %s %s",
-                bkpinfo->internal_tape_block_size,
-                bkpinfo->media_device,
-                MOUNTLIST_FNAME_STUB,
-                BIGGIELIST_TXT_STUB,
-                FILELIST_FULL_STUB,
-                IWANTMYLVM_STUB,
-                MONDO_CFG_FILE_STUB);
+            mr_asprintf(&command, "tar -b %ld -zxf %s %s %s %s %s %s", bkpinfo->internal_tape_block_size, bkpinfo->media_device, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
             log_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
@@ -1136 +1116 @@
         log_msg(2, "Back from iotcn");
         run_program_and_log_output("mount", 1);
-        mr_asprintf(&command,
-            "tar -zxf %s/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s",
-            MNT_CDROM,
-            MOUNTLIST_FNAME_STUB,
-            BIGGIELIST_TXT_STUB,
-            FILELIST_FULL_STUB,
-            IWANTMYLVM_STUB,
-            MONDO_CFG_FILE_STUB);
+        mr_asprintf(&command, "tar -zxf %s/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s", MNT_CDROM, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
 
         log_msg(1, "tarcommand = %s", command);
@@ -1152 +1125 @@
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            mr_asprintf(&command,
-                "tar -zxf %s/images/all.tar.gz %s %s %s %s %s",
-                MNT_CDROM,
-                MOUNTLIST_FNAME_STUB,
-                BIGGIELIST_TXT_STUB,
-                FILELIST_FULL_STUB,
-                IWANTMYLVM_STUB,
-                MONDO_CFG_FILE_STUB);
+            mr_asprintf(&command, "tar -zxf %s/images/all.tar.gz %s %s %s %s %s", MNT_CDROM, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
 
             log_msg(1, "tarcommand = %s", command);
@@ -1195 +1161 @@
     &&
     ask_me_yes_or_no("Do you want to retrieve the mountlist as well?")) {
-        mr_asprintf(&command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB,
-            bkpinfo->tmpdir);
+        mr_asprintf(&command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB, bkpinfo->tmpdir);
         paranoid_system(command);
         mr_free(command);
@@ -1225 +1190 @@
             mr_free(command);
         }
-        mr_asprintf(&command, "grep -E '^/dev/.*' %s > %s",
-                g_biggielist_txt, g_filelist_imagedevs);
+        mr_asprintf(&command, "grep -E '^/dev/.*' %s > %s", g_biggielist_txt, g_filelist_imagedevs);
         paranoid_system(command);
         mr_free(command);
@@ -2044 +2008 @@
                             "Well, I know a certain kitty-kitty who'll be sleeping with Mommy tonight...");
                 } else {
-                    mr_asprintf(&command, "umount " MNT_RESTORING "%s",
-                            mountlist->el[lino].mountpoint);
+                    mr_asprintf(&command, "umount " MNT_RESTORING "%s", mountlist->el[lino].mountpoint);
 
                     /* To support latest Ubuntu where /var is a separate FS 
@@ -2112 +2075 @@
     }
 
-    mr_asprintf(&command,
-            "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx ./%s ./%s ./%s ./%s ./%s",
-            dev,
-            bkpinfo->internal_tape_block_size,
-            1024L * 1024 * 32 / bkpinfo->internal_tape_block_size,
-            MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
-            BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
+    mr_asprintf(&command, "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx ./%s ./%s ./%s ./%s ./%s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
     log_msg(2, "command = '%s'", command);
     res = run_program_and_log_output(command, -1);
@@ -2129 +2086 @@
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            mr_asprintf(&command,
-                    "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s",
-                    dev,
-                    bkpinfo->internal_tape_block_size,
-                    1024L * 1024 * 32 / bkpinfo->internal_tape_block_size,
-                    MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
-                    BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
+            mr_asprintf(&command, "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
             log_msg(2, "command = '%s'", command);
             res = run_program_and_log_output(command, -1);
@@ -2226 +2177 @@
                 log_msg(2, "media_device is blank; assuming %s");
             }
-            mr_asprintf(&tmp, bkpinfo->media_device);
+            mr_asprintf(&tmp, "%s", bkpinfo->media_device);
             if (extract_cfg_file_and_mountlist_from_tape_dev
                 (bkpinfo->media_device)) {
@@ -2335 +2286 @@
             /* Is this code really useful ??? */
         if (extract_mountlist_stub) {
-            mr_asprintf(&command, "cp -f %s %s/%s", MOUNTLIST_FNAME_STUB,
-                    bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
+            mr_asprintf(&command, "cp -f %s %s/%s", MOUNTLIST_FNAME_STUB, bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
             run_program_and_log_output(command, FALSE);
             mr_free(command);

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

@@ -668 +668 @@
             strcpy(fstab_fname, "/tmp/fstab");
         }
-        mr_asprintf(&tmp1,
-                "label-partitions-as-necessary %s < %s >> %s 2>> %s",
-                g_mountlist_fname, fstab_fname, MONDO_LOGFILE,
-                MONDO_LOGFILE);
+        mr_asprintf(&tmp1, "label-partitions-as-necessary %s < %s >> %s 2>> %s", g_mountlist_fname, fstab_fname, MONDO_LOGFILE, MONDO_LOGFILE);
         res = system(tmp1);
         mr_free(tmp1);
@@ -811 +808 @@
     }
     if (!evaluate_mountlist(mountlist, tmpA, tmpB, tmpC)) {
-        mr_asprintf(&tmp,
-                "Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?",
-                tmpA, tmpB, tmpC);
+        mr_asprintf(&tmp, "Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?", tmpA, tmpB, tmpC);
         res = ask_me_yes_or_no(tmp);
         mr_free(tmp);
@@ -1293 +1288 @@
             }
             mds = media_descriptor_string(bkpinfo->backup_media_type);
-            mr_asprintf(&tmp, "Working on %s #%d, file #%ld, slice #%ld    ", mds,
-                    g_current_media_number, bigfileno + 1, sliceno);
+            mr_asprintf(&tmp, "Working on %s #%d, file #%ld, slice #%ld    ", mds, g_current_media_number, bigfileno + 1, sliceno);
             mr_free(mds);
             log_msg(2, tmp);
@@ -1329 +1323 @@
     if (use_ntfsprog_hack) {
         log_msg(3, "Waiting for ntfsclone to finish");
-        mr_asprintf(&tmp,
-                " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
+        mr_asprintf(&tmp, " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
         while (system(tmp) == 0) {
             sleep(1);
@@ -1464 +1457 @@
         use_ntfsprog_hack = TRUE;
         log_msg(2, "Calling ntfsclone in background because %s is a /dev entry", outfile_fname);
-        mr_asprintf(&sz_devfile, "%s/%d.%d.000", 
-                bkpinfo->tmpdir,
-                (int) (random() % 32768),
-                (int) (random() % 32768));
+        mr_asprintf(&sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir, (int) (random() % 32768), (int) (random() % 32768));
         mkfifo(sz_devfile, 0x770);
         strcpy(ntfsprog_fifo, sz_devfile);
@@ -1684 +1674 @@
             log_msg(3, "Saved fileset %ld's subset to %s", current_tarball_number, filelist_subset_fname);
         }
-        mr_asprintf(&screen_message, "Tarball #%ld --- %ld matches",
-                current_tarball_number, matches);
+        mr_asprintf(&screen_message, "Tarball #%ld --- %ld matches", current_tarball_number, matches);
         log_to_screen(screen_message);
         mr_free(screen_message);
@@ -2237 +2226 @@
             }
             g_current_media_number++;
-            mr_asprintf(&progress_str, "Restoring from %s #%d",
-                    media_descriptor_string(bkpinfo->backup_media_type),
-                    g_current_media_number);
+            mr_asprintf(&progress_str, "Restoring from %s #%d", media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number);
             log_to_screen(progress_str);
         } else {
-            mr_asprintf(&progress_str, "Restoring from fileset #%ld on %s #%d",
-                    current_tarball_number, mds, g_current_media_number);
+            mr_asprintf(&progress_str, "Restoring from fileset #%ld on %s #%d", current_tarball_number, mds, g_current_media_number);
             for (res = 999, attempts = 0; attempts < 3 && res != 0;
                  attempts++) {
@@ -2251 +2237 @@
                                               filelist);
             }
-            mr_asprintf(&tmp1, "%s #%d, fileset #%ld - restore ",
-                    mds, g_current_media_number, current_tarball_number);
+            mr_asprintf(&tmp1, "%s #%d, fileset #%ld - restore ", mds, g_current_media_number, current_tarball_number);
             if (res) {
                 mr_strcat(tmp1, "reported errors");
@@ -2381 +2366 @@
             p++;
         }
-        mr_asprintf(&tmp1, "Restoring big file %ld (%lld K)",
-                current_bigfile_number + 1, biggie_size / 1024);
+        mr_asprintf(&tmp1, "Restoring big file %ld (%lld K)", current_bigfile_number + 1, biggie_size / 1024);
         update_progress_form(tmp1);
         mr_free(tmp1);
@@ -2519 +2503 @@
         update_progress_form(progress_str);
         if (g_getfattr) {
-            mr_asprintf(&xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir,
-                current_afioball_number);
+            mr_asprintf(&xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
             unlink(xattr_fname);
         }