Changeset 2247 in MondoRescue for branches/2.2.9/mondo/src/common

Timestamp:

Jul 5, 2009, 2:42:06 AM (16 years ago)

Author:

Bruno Cornec

Message:

r3148@localhost: bruno | 2009-06-30 14:26:19 +0200

• Adds an example of valgrind call for testing mondarchive
• Replace some malloc_strings with mr_asprintf

File:

• branches/2.2.9/mondo/src/common/libmondo-archive.c (modified) (47 diffs)

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

@@ -1686 +1686 @@
     char *result_sz = NULL;
     char *message_to_screen = NULL;
-    char *sz_blank_disk;
+    char *sz_blank_disk = NULL;
     char *fnam;
     char *tmp2;
@@ -1694 +1694 @@
 
     malloc_string(old_pwd);
-    malloc_string(sz_blank_disk);
     malloc_string(fnam);
     tmp = malloc(1200);
@@ -1792 +1791 @@
                 }
                 pause_for_N_seconds(5, "Letting DVD drive settle");
-                sprintf(sz_blank_disk, "dvd+rw-format -force %s",
+                mr_asprintf(&sz_blank_disk, "dvd+rw-format -force %s",
                         bkpinfo->media_device);
                 log_msg(3, "sz_blank_disk = '%s'", sz_blank_disk);
@@ -1813 +1812 @@
                         ("Format succeeded. Sleeping for 5 seconds to take a breath...");
                 }
+                mr_free(sz_blank_disk);
                 pause_for_N_seconds(5, "Letting DVD drive settle");
                 if (!bkpinfo->please_dont_eject) {
@@ -1968 +1968 @@
     }
     paranoid_free(old_pwd);
-    paranoid_free(sz_blank_disk);
     paranoid_free(fnam);
     paranoid_free(tmp);
     return (retval);
 }
-
-
-
-
-
-
-
 
 
@@ -2206 +2198 @@
     /*@ int ************************************************** */
     int retval = 0;
-    long int curr_set_no = 0;
+    long int curr_set_no = 0L;
     int res = 0;
 
     /*@ buffers ********************************************** */
-    char *curr_filelist_fname;
-    char *curr_afioball_fname;
-    char *curr_xattr_list_fname;
-    char *curr_acl_list_fname;
+    char *curr_filelist_fname = NULL;
+    char *curr_afioball_fname = NULL;
+    char *curr_xattr_list_fname = NULL;
+    char *curr_acl_list_fname = NULL;
     char *tmp = NULL;
     char *media_usage_comment = NULL;
-
-    malloc_string(curr_afioball_fname);
-    malloc_string(curr_filelist_fname);
-    malloc_string(curr_xattr_list_fname);
-    malloc_string(curr_acl_list_fname);
 
     log_to_screen("Archiving regular files");
@@ -2230 +2217 @@
                        get_last_filelist_number() + 1);
 
-    sprintf(curr_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir,
-            0L);
-
-    for (curr_set_no = 0; does_file_exist(curr_filelist_fname);
-         sprintf(curr_filelist_fname, FILELIST_FNAME_RAW_SZ,
-                 bkpinfo->tmpdir, ++curr_set_no)) {
+    for (; does_file_exist(curr_filelist_fname); curr_set_no++) {
         /* backup this set of files */
-        sprintf(curr_filelist_fname, FILELIST_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, curr_set_no);
-        sprintf(curr_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, curr_set_no, bkpinfo->zip_suffix);
+        mr_asprintf(&curr_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, curr_set_no);
+        if (! does_file_exist(curr_filelist_fname)) {
+            mr_free(curr_filelist_fname);
+            break;
+        }
+
+        mr_asprintf(&curr_afioball_fname, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, curr_set_no, bkpinfo->zip_suffix);
 
         log_msg(1, "EXAT'g set %ld", curr_set_no);
         if (g_getfattr) {
-            sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
+            mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
                 bkpinfo->tmpdir, curr_set_no);
             get_fattr_list(curr_filelist_fname, curr_xattr_list_fname);
         }
         if (g_getfacl) {
-            sprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
+            mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
                 bkpinfo->tmpdir, curr_set_no);
             get_acl_list(curr_filelist_fname, curr_acl_list_fname);
@@ -2264 +2249 @@
                     curr_set_no);
             log_to_screen(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
 
@@ -2302 +2287 @@
                 }
         }
+        if (g_getfattr) {
+            mr_free(curr_xattr_list_fname);
+        }
+        if (g_getfacl) {
+            mr_free(curr_acl_list_fname);
+        }
         retval += res;
         g_current_progress++;
@@ -2311 +2302 @@
                     curr_set_no);
             log_to_screen(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
             fatal_error
                 ("Is your hard disk is full? If not, please send the author the logfile.");
         }
+        mr_free(curr_filelist_fname);
+        mr_free(curr_afioball_fname);
     }
     close_progress_form();
@@ -2324 +2317 @@
     }
     log_to_screen(tmp);
-    paranoid_free(tmp);
-    paranoid_free(curr_filelist_fname);
-    paranoid_free(curr_afioball_fname);
-    paranoid_free(curr_xattr_list_fname);
-    paranoid_free(curr_acl_list_fname);
+    mr_free(tmp);
     return (retval);
 }
@@ -2397 +2386 @@
 
     /*@ buffers ************************************************** */
-    char *biggielist;
-    char *command;
-    char *blah;
-    char *xattr_fname;
-    char *acl_fname;
+    char *biggielist = NULL;
+    char *command = NULL;
+    char *blah = NULL;
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
 
     assert(bkpinfo != NULL);
     /* slice big files */
-    malloc_string(biggielist);
-    malloc_string(xattr_fname);
-    malloc_string(acl_fname);
     mvaddstr_and_log_it(g_currentY, 0,
                         "Archiving large files to media           ");
-    sprintf(biggielist, "%s/archives/biggielist.txt", bkpinfo->scratchdir);
+    mr_asprintf(&biggielist, "%s/archives/biggielist.txt", bkpinfo->scratchdir);
     if (g_getfattr) {
-        sprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+        mr_asprintf(&xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
     }
     if (g_getfacl) {
-        sprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+        mr_asprintf(&acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
     }
 
@@ -2421 +2407 @@
             biggielist);
     paranoid_system(command);
-    paranoid_free(command);
+    mr_free(command);
 
     mr_asprintf(&blah, "biggielist = %s", biggielist);
     log_msg(2, blah);
-    paranoid_free(blah);
+    mr_free(blah);
 
     if (!does_file_exist(biggielist)) {
@@ -2436 +2422 @@
             bkpinfo->scratchdir);
         paranoid_system(command);
-        paranoid_free(command);
+        mr_free(command);
     }
     if (g_getfacl) {
         get_acl_list(biggielist, acl_fname);
-        mr_asprintf(&command, "cp %s %s/archives/", acl_fname,
-             bkpinfo->scratchdir);
+        mr_asprintf(&command, "cp %s %s/archives/", acl_fname, bkpinfo->scratchdir);
         paranoid_system(command);
-        paranoid_free(command);
+        mr_free(command);
     }
 
@@ -2450 +2435 @@
         mr_asprintf(&blah, "%ld", count_lines_in_file(biggielist));
         write_header_block_to_stream((off_t)0, blah, BLK_START_BIGGIEFILES);
-        paranoid_free(blah);
+        mr_free(blah);
     }
     res = make_slices_and_images(biggielist);
@@ -2464 +2449 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(blah);
-    paranoid_free(biggielist);
-    paranoid_free(command);
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
+    mr_free(biggielist);
+    mr_free(xattr_fname);
+    mr_free(acl_fname);
     return (retval);
 }
@@ -2580 +2563 @@
 
 
-
-
 /**
  * @addtogroup LLarchiveGroup
@@ -2686 +2667 @@
                                              bool keep_looping)
 {
-    char *tmp;
     int res = 0;
     char *bkp = NULL;
-    char *cdrecord;
-
-    malloc_string(tmp);
-    malloc_string(cdrecord);
+    char *cdrecord = NULL;
+
     mr_asprintf(&bkp, cdrw_dev);
     if (find_cdrw_device(cdrw_dev)) {
@@ -2698 +2676 @@
     } else {
         if (!system("which cdrecord > /dev/null 2> /dev/null")) {
-            sprintf(cdrecord, "cdrecord dev=%s -atip", cdrw_dev);
+            mr_asprintf(&cdrecord, "cdrecord dev=%s -atip", cdrw_dev);
         } else if (!system("which dvdrecord > /dev/null 2> /dev/null")) {
-            sprintf(cdrecord, "cdrecord dev=%s -atip", cdrw_dev);
+            mr_asprintf(&cdrecord, "cdrecord dev=%s -atip", cdrw_dev);
         } else {
-            cdrecord[0] = '\0';
             log_msg(2, "Oh well. I guess I'll just pray then.");
         }
-        if (cdrecord[0]) {
+        if (cdrecord != NULL) {
             if (!keep_looping) {
                 retract_CD_tray_and_defeat_autorun();
@@ -2724 +2701 @@
     mr_free(bkp);
 
-//  retract_CD_tray_and_defeat_autorun();
-    paranoid_free(tmp);
-    paranoid_free(cdrecord);
+    mr_free(cdrecord);
     return (res);
 }
-
-
-
-
-
-
-
 
 
@@ -2748 +2716 @@
 
     /*@ buffers ********************************************* */
-    char *tmp;
-    char *szmsg;
+    char *tmp = NULL;
     char *cdrom_dev;
     char *cdrw_dev;
@@ -2756 +2723 @@
     int cd_number = -1;
     int attempt_to_mount_returned_this = 999;
-    char *mtpt;
+    char *mtpt = NULL;
     char *szcdno;
     char *szserfname;
@@ -2762 +2729 @@
     char *mds = NULL;
 
-    malloc_string(tmp);
-    malloc_string(szmsg);
     malloc_string(cdrom_dev);
     malloc_string(cdrw_dev);
-    malloc_string(mtpt);
     malloc_string(szcdno);
     malloc_string(szserfname);
@@ -2772 +2736 @@
 
     mds = media_descriptor_string(g_backup_media_type);
-    sprintf(szmsg, "I am about to burn %s #%d", mds, g_current_media_number);
+    mr_asprintf(&tmp, "I am about to burn %s #%d", mds, g_current_media_number);
     mr_free(mds);
-    log_to_screen(szmsg);
+    log_to_screen(tmp);
+    mr_free(tmp);
     if (g_current_media_number < ask_for_one_if_more_than_this) {
         return;
@@ -2789 +2754 @@
       retract_CD_tray_and_defeat_autorun();
 */
-        sprintf(tmp, "umount %s", cdrom_dev);
+        mr_asprintf(&tmp, "umount %s", cdrom_dev);
         run_program_and_log_output(tmp, 1);
         sprintf(szcdno, "%s/archives/THIS-CD-NUMBER", mtpt);
@@ -2795 +2760 @@
         sprintf(szunmount, "umount %s", mtpt);
         cd_number = -1;
-        sprintf(tmp, "mount %s %s", cdrom_dev, mtpt);
+        mr_asprintf(&tmp, "mount %s %s", cdrom_dev, mtpt);
         mr_asprintf(&our_serial_str, "%s", "");
-        if ((attempt_to_mount_returned_this =
-             run_program_and_log_output(tmp, 1))) {
+        attempt_to_mount_returned_this = run_program_and_log_output(tmp, 1);
+        mr_free(tmp);
+        if (attempt_to_mount_returned_this) {
             log_msg(4, "Failed to mount %s at %s", cdrom_dev, mtpt);
             log_to_screen("If there's a CD/DVD in the drive, it's blank.");
@@ -2824 +2790 @@
 
             cd_number = atoi(last_line_of_file(szcdno));
-            sprintf(tmp, "cat %s 2> /dev/null", szserfname);
+            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_free(tmp);
             // FIXME - should be able to use last_line_of_file(), surely?
         }
@@ -2863 +2830 @@
         eject_device(cdrom_dev);
         mds = media_descriptor_string(g_backup_media_type);
-        sprintf(tmp,
+        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);
@@ -2869 +2836 @@
 
         popup_and_OK(tmp);
+        mr_free(tmp);
         goto gotos_make_me_puke;
     } else {
@@ -2878 +2846 @@
             "paafcd: OK, I assume I have a blank/reusable %s in the drive...", mds);
 
-    //  if (ask_for_one_if_more_than_this>1) { popup_and_OK(szmsg); }
-
     log_to_screen("Proceeding w/ %s in drive.", mds);
     mr_free(mds);
 
-    paranoid_free(tmp);
-    paranoid_free(szmsg);
     paranoid_free(cdrom_dev);
     paranoid_free(cdrw_dev);
@@ -3007 +2971 @@
     assert_string_is_neither_NULL_nor_zerolength(biggie_filename);
     malloc_string(checksum_line);
-    command = malloc(MAX_STR_LEN * 8);
 
     biggiestruct.for_backward_compatibility = '\n';
     biggiestruct.use_ntfsprog = use_ntfsprog;
-    if (!(tempblock = (char *) malloc(256 * 1024))) {
-        fatal_error("malloc error 256*1024");
-    }
     optimal_set_size = bkpinfo->optimal_set_size;
     if (is_this_file_compressed(biggie_filename)
@@ -3037 +2997 @@
             fatal_error("ntfsresize not found");
         }
-        sprintf(command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", biggie_filename);
+        mr_asprintf(&command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", biggie_filename);
         log_it("command = %s", command);
         mr_asprintf(&tmp, call_program_and_get_last_line_of_output(command));
+        mr_free(command);
         log_it("res of it = %s", tmp); 
         totallength = (off_t)atoll(tmp);
@@ -3046 +3007 @@
         file_to_openin = biggie_filename;
         if (strchr(biggie_filename,'\'') != NULL) {
-            sprintf(command, "md5sum \"%s\"", biggie_filename);
+            mr_asprintf(&command, "md5sum \"%s\"", biggie_filename);
         } else {
-            sprintf(command, "md5sum '%s'", biggie_filename);
+            mr_asprintf(&command, "md5sum '%s'", biggie_filename);
         }
         if (!(fin = popen(command, "r"))) {
@@ -3055 +3016 @@
             return (1);
         }
+        mr_free(command);
         (void) fgets(checksum_line, MAX_STR_LEN, fin);
         pclose(fin);
@@ -3093 +3055 @@
         paranoid_free(tmp);
 
-        paranoid_free(tempblock);
         paranoid_free(checksum_line);
-        paranoid_free(command);
         mr_free(suffix);
         return (1);
@@ -3109 +3069 @@
     }
     i = bkpinfo->optimal_set_size / 256;
+    if (!(tempblock = (char *) malloc(256 * 1024))) {
+        fatal_error("malloc error 256*1024");
+    }
     for (slice_num = 1; !finished; slice_num++) {
         mr_asprintf(&curr_slice_fname_uncompressed, "%s",
@@ -3149 +3112 @@
             }
             if (should_I_compress_slices && bkpinfo->compression_level > 0) {
-                sprintf(command, "%s -%d %s", bkpinfo->zip_exe,
+                mr_asprintf(&command, "%s -%d %s", bkpinfo->zip_exe,
                         bkpinfo->compression_level,
                         curr_slice_fname_uncompressed);
@@ -3158 +3121 @@
                 //          did_I_compress_slice = TRUE;
             } else {
-                sprintf(command, "mv %s %s 2>> %s",
+                mr_asprintf(&command, "mv %s %s 2>> %s",
                         curr_slice_fname_uncompressed,
                         curr_slice_fname_compressed, MONDO_LOGFILE);
@@ -3164 +3127 @@
                 //          did_I_compress_slice = FALSE;
             }
+            mr_free(command);
+
             retval += res;
             if (res) {
@@ -3228 +3193 @@
         }
     }
+    mr_free(tempblock);
     mr_free(suffix);
     paranoid_fclose(fin);
@@ -3239 +3205 @@
     paranoid_free(tmp);
 
-    paranoid_free(tempblock);
     paranoid_free(checksum_line);
-    paranoid_free(command);
     return (retval);
 }
-
-
-
-
 
 
@@ -3265 +3225 @@
 {
     /*@ buffers ********************************************* */
-    char *tmp;
-    char *dir;
-
-    malloc_string(tmp);
-    malloc_string(dir);
+    char *tmp = NULL;
+    char *dir = NULL;
+
     assert_string_is_neither_NULL_nor_zerolength(d);
 
-    sprintf(dir, "%s/archives", d);
-    sprintf(tmp, "find %s -name '*.afio*' -exec rm -f '{}' \\;", dir);
+    mr_asprintf(&dir, "%s/archives", d);
+    mr_asprintf(&tmp, "find %s -name '*.afio*' -exec rm -f '{}' \\;", dir);
     run_program_and_log_output(tmp, FALSE);
-    sprintf(tmp, "find %s -name '*list.[0-9]*' -exec rm -f '{}' \\;", dir);
+    mr_free(tmp);
+    mr_asprintf(&tmp, "find %s -name '*list.[0-9]*' -exec rm -f '{}' \\;", dir);
     run_program_and_log_output(tmp, FALSE);
-    sprintf(tmp, "find %s -name 'slice*' -exec rm -f '{}' \\;", dir);
+    mr_free(tmp);
+    mr_asprintf(&tmp, "find %s -name 'slice*' -exec rm -f '{}' \\;", dir);
     run_program_and_log_output(tmp, FALSE);
-    sprintf(tmp, "rm -f %s/cklist*", dir);
+    mr_free(tmp);
+    mr_asprintf(&tmp, "rm -f %s/cklist*", dir);
     run_program_and_log_output(tmp, FALSE);
-    sprintf(tmp, "rm -f %s/zero", dir);
+    mr_free(tmp);
+    mr_asprintf(&tmp, "rm -f %s/zero", dir);
     run_program_and_log_output(tmp, FALSE);
+    mr_free(tmp);
     log_msg(1, "Wiped %s's archives", dir);
-    sprintf(tmp, "ls -l %s", dir);
+    mr_asprintf(&tmp, "ls -l %s", dir);
+    mr_free(dir);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
-    paranoid_free(dir);
+    mr_free(tmp);
 }
-
 
 
@@ -3523 +3485 @@
 {
     int res = 0, retval = 0, cdno = 0;
-    char *tmp;
+    char *tmp = NULL;
     char *mds = NULL;
     long diffs = 0;
 
-    malloc_string(tmp);
     assert(bkpinfo != NULL);
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -3543 +3504 @@
         log_msg(2,
                 "Not verifying again. Per-CD/ISO verification already carried out.");
-        sprintf(tmp, "cat %s/changed.files > %s/changed.files 2> /dev/null",bkpinfo->tmpdir, MONDO_CACHE);
+        mr_asprintf(&tmp, "cat %s/changed.files > %s/changed.files 2> /dev/null",bkpinfo->tmpdir, MONDO_CACHE);
         paranoid_system(tmp);
+        mr_free(tmp);
     } else {
         g_current_media_number = cdno;
@@ -3565 +3527 @@
             if (res) {
                 mds = media_descriptor_string(bkpinfo->backup_media_type);
-                sprintf(tmp,
+                mr_asprintf(&tmp,
                         "Warnings/errors were reported while checking %s #%d", mds, g_current_media_number);
                 mr_free(mds);
                 log_to_screen(tmp);
+                mr_free(tmp);
 
             }
         }
-/*
-      sprintf (tmp,
-           "cat %s | grep \"afio: \" | cut -d'\"' -f2 | sort -u | awk '{print \"/\"$0;};' | tr -s '/' '/' | grep -vx \"/afio:.*\" > /tmp/changed.files",
-           MONDO_LOGFILE);
-      system (tmp);
-*/
-        sprintf(tmp,
+        mr_asprintf(&tmp,
                 "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s/changed.files",
                 MONDO_LOGFILE, MONDO_CACHE);
         (void)system(tmp);
-
-        sprintf(tmp,
+        mr_free(tmp);
+
+        mr_asprintf(&tmp,
                 "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s/changed.files",
                 MONDO_LOGFILE, MONDO_CACHE);
         (void)system(tmp);
+        mr_free(tmp);
         run_program_and_log_output("umount " MNT_CDROM, FALSE);
 //    if (bkpinfo->backup_media_type != iso && !bkpinfo->please_dont_eject_when_restoring)
@@ -3593 +3552 @@
 //}
     }
-    sprintf(tmp, "%s/changed.files", MONDO_CACHE);
+    mr_asprintf(&tmp, "%s/changed.files", MONDO_CACHE);
     diffs = count_lines_in_file(tmp);
+    mr_free(tmp);
 
     if (diffs > 0) {
@@ -3601 +3561 @@
         }
     }
-    paranoid_free(tmp);
     return (retval);
 }