Changeset 2296 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.c

Timestamp:

Jul 23, 2009, 2:53:30 PM (15 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

File:

• branches/2.2.10/mondo/src/common/libmondo-archive.c (modified) (14 diffs)

branches/2.2.10/mondo/src/common/libmondo-archive.c

@@ -350 +350 @@
     paranoid_free(command);
 
-    mr_asprintf(&command, "afio -o -b %ld -M 16m %s %s < %s 2>> %s",
-            TAPE_BLOCK_SIZE, zipparams, fname, filelist, MONDO_LOGFILE);
+    mr_asprintf(&command, "afio -o -b %ld -M 16m %s %s < %s 2>> %s", TAPE_BLOCK_SIZE, zipparams, fname, filelist, MONDO_LOGFILE);
     paranoid_free(zipparams);
 
@@ -867 +866 @@
     log_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
 
-    mr_asprintf(&command,
-/*     "mindi --custom 2=%s 3=%s/images 4=\"%s\" 5=\"%s\" \
+/*     "mindi 1=%s --custom 2=%s 3=%s/images 4=\"%s\" 5=\"%s\" \
 6=\"%s\" 7=%ld 8=\"%s\" 9=\"%s\" 10=\"%s\" \
 11=\"%s\" 12=%s 13=%ld 14=\"%s\" 15=\"%s\" 16=\"%s\" 17=\"%s\" 18=%ld 19=%d",*/
-            "mindi %s --custom %s %s/images '%s' '%s' \
+    mr_asprintf(&command, "mindi %s --custom %s %s/images '%s' '%s' \
 '%s' %ld '%s' '%s' '%s' \
 '%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s'", tmp2, bkpinfo->tmpdir,    // parameter #2
@@ -1076 +1074 @@
                 this_thread_no, archiving_set_no);
         if (g_getfattr) {
-            mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, archiving_set_no);
+            mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
             get_fattr_list(archiving_filelist_fname, curr_xattr_list_fname);
             mr_free(curr_xattr_list_fname);
         }
         if (g_getfacl) {
-            mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, archiving_set_no);
+            mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
             get_acl_list(archiving_filelist_fname, curr_acl_list_fname);
             mr_free(curr_acl_list_fname);
@@ -1097 +1093 @@
 
         if (res) {
-            mr_asprintf(&tmp,
-                    "Errors occurred while archiving set %ld. Please review logs.",
-                    archiving_set_no);
+            mr_asprintf(&tmp, "Errors occurred while archiving set %ld. Please review logs.", archiving_set_no);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -1427 +1421 @@
             } else {
                 // store set N
-                mr_asprintf(&storing_filelist_fname, FILELIST_FNAME_RAW_SZ,
-                        bkpinfo->tmpdir, storing_set_no);
-                mr_asprintf(&storing_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
-                        bkpinfo->tmpdir, storing_set_no, bkpinfo->zip_suffix);
+                mr_asprintf(&storing_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, storing_set_no);
+                mr_asprintf(&storing_afioball_fname, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, storing_set_no, bkpinfo->zip_suffix);
                 if (g_getfattr) {
-                    mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
-                        bkpinfo->tmpdir, storing_set_no);
+                    mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, storing_set_no);
                 }
                 if (g_getfacl) {
-                    mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
-                        bkpinfo->tmpdir, storing_set_no);
+                    mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, storing_set_no);
                 }
 
@@ -1491 +1481 @@
                 mr_free(media_usage_comment);
                 if (res) {
-                    mr_asprintf(&tmp, "Failed to add archive %ld's files to CD dir\n",
-                        storing_set_no);
+                    mr_asprintf(&tmp, "Failed to add archive %ld's files to CD dir\n", storing_set_no);
                     log_to_screen(tmp);
                     paranoid_free(tmp);
@@ -1717 +1706 @@
 
     if (bkpinfo->call_before_iso[0] != '\0') {
-        mr_asprintf(&message_to_screen, "Running pre-ISO call for CD#%d",
-                g_current_media_number);
+        mr_asprintf(&message_to_screen, "Running pre-ISO call for CD#%d", g_current_media_number);
         res =
             eval_call_to_make_ISO(bkpinfo->call_before_iso,
@@ -1763 +1751 @@
             retval += res;
 #ifdef DVDRWFORMAT
-            mr_asprintf(&tmp,
-                    "tail -n8 %s | grep 'blank=full.*dvd-compat.*DAO'",
-                    MONDO_LOGFILE);
+            mr_asprintf(&tmp, "tail -n8 %s | grep 'blank=full.*dvd-compat.*DAO'", MONDO_LOGFILE);
             if (g_backup_media_type == dvd
                 && (res || !run_program_and_log_output(tmp, 1))) {
@@ -2089 +2075 @@
                         "Calling ntfsclone in background because %s is an NTFS partition",
                         bigfile_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);
                 ntfsprog_fifo = sz_devfile;
@@ -2774 +2758 @@
             mr_asprintf(&tmp, "cat %s 2> /dev/null", szserfname);
             mr_free(our_serial_str);
-            mr_asprintf(&our_serial_str, "%s",
-                   call_program_and_get_last_line_of_output(tmp));
+            mr_asprintf(&our_serial_str, "%s", call_program_and_get_last_line_of_output(tmp));
             mr_free(tmp);
             // FIXME - should be able to use last_line_of_file(), surely?
@@ -2812 +2795 @@
         eject_device(cdrom_dev);
         mds = media_descriptor_string(g_backup_media_type);
-        mr_asprintf(&tmp, "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.", 
-                mds, g_current_media_number, mds);
+        mr_asprintf(&tmp, "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.", mds, g_current_media_number, mds);
         mr_free(mds);
 
@@ -3114 +3096 @@
                 mr_asprintf(&tmp, "Problem with slice # %ld", slice_num);
             } else {
-                mr_asprintf(&tmp, "%s - Bigfile #%ld, slice #%ld compressed OK          ", biggie_filename, biggie_file_number + 1,
-                        slice_num);
+                mr_asprintf(&tmp, "%s - Bigfile #%ld, slice #%ld compressed OK          ", biggie_filename, biggie_file_number + 1, slice_num);
             }
 #ifndef _XWIN
@@ -3351 +3332 @@
     if (space_occupied_by_cd(bkpinfo->scratchdir) / 1024 >
         bkpinfo->media_size[g_current_media_number]) {
-        mr_asprintf(&tmp1,
-                "Warning! CD is too big. It occupies %ld KB, which is more than the %ld KB allowed.",
-                (long) space_occupied_by_cd(bkpinfo->scratchdir),
+        mr_asprintf(&tmp1, "Warning! CD is too big. It occupies %ld KB, which is more than the %ld KB allowed.", (long) space_occupied_by_cd(bkpinfo->scratchdir),
                 (long) bkpinfo->media_size[g_current_media_number]);
         log_to_screen(tmp1);
         mr_free(tmp1);
     }
-    mr_asprintf(&isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir,
-            bkpinfo->nfs_remote_dir, bkpinfo->prefix,
-            g_current_media_number);
+    mr_asprintf(&isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
     for (that_one_was_ok = FALSE; !that_one_was_ok;) {
         if (bkpinfo->backup_media_type != usb) {
@@ -3421 +3398 @@
     }
     wipe_archives(bkpinfo->scratchdir);
-    mr_asprintf(&tmp1, "rm -Rf %s/images/*gz %s/images/*data*img",
-            bkpinfo->scratchdir, bkpinfo->scratchdir);
+    mr_asprintf(&tmp1, "rm -Rf %s/images/*gz %s/images/*data*img", bkpinfo->scratchdir, bkpinfo->scratchdir);
     if (system(tmp1)) {
         log_msg