Changeset 1154 in MondoRescue

Timestamp:

Feb 13, 2007, 12:34:08 AM (17 years ago)

Author:

Bruno Cornec

Message:

trunk merge continues

File:

• branches/stable/mondo/src/common/libmondo-archive.c (modified) (46 diffs)

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

@@ -2406 +2406 @@
     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(&command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
-            biggielist);
+        mr_asprintf(&acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    }
+
+    mr_asprintf(&command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir, biggielist);
     paranoid_system(command);
     mr_free(command);
@@ -2434 +2430 @@
     if (g_getfattr) {
         get_fattr_list(biggielist, xattr_fname);
-        mr_asprintf(&command, "cp %s %s/archives/", xattr_fname,
-            bkpinfo->scratchdir);
+        mr_asprintf(&command, "cp %s %s/archives/", xattr_fname, bkpinfo->scratchdir);
         paranoid_system(command);
         mr_free(command);
@@ -2441 +2436 @@
     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);
         mr_free(command);
@@ -2453 +2447 @@
         mr_free(blah);
     }
+    if (g_getfattr) {
+        mr_free(xattr_fname);
+    }
+    if (g_getfacl) {
+        mr_free(acl_fname);
+    }
+
     res = make_slices_and_images(bkpinfo, biggielist);
+    mr_free(biggielist);
+
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         write_header_block_to_stream((off_t)0, "end-of-biggiefiles",
@@ -2465 +2468 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    mr_free(biggielist);
-    mr_free(xattr_fname);
-    mr_free(acl_fname);
     return (retval);
 }
@@ -2510 +2510 @@
 
     /*@ buffers ******************************************************** */
-    char *tmp, *curr_file, *cf;
+    char *tmp = NULL;
+    char *curr_file = NULL;
+    char *cf = NULL;
 
     /*@ long ************************************************************ */
@@ -2517 +2519 @@
 
     assert(bkpinfo != NULL);
-    malloc_string(curr_file);
-    tmp = mr_malloc(1200);
     would_occupy = space_occupied_by_cd(bkpinfo->scratchdir);
     va_start(ap, files_to_add); // initialize the variable arguments
@@ -2525 +2525 @@
             continue;
         }
-        strcpy(curr_file, cf);
+        mr_asprintf(&curr_file, cf);
         if (!does_file_exist(curr_file)) {
             mr_msg(1,
@@ -2534 +2534 @@
             would_occupy += length_of_file(curr_file) / 1024;
         }
+        mr_free(curr_file);
     }
     va_end(ap);
@@ -2541 +2542 @@
     }
     if (would_occupy / 1024 > bkpinfo->media_size[g_current_media_number]) {
-        res = write_iso_and_go_on(bkpinfo, FALSE);  /* FALSE because this is not the last CD we'll write */
+        /* FALSE because this is not the last CD we'll write */
+        res = write_iso_and_go_on(bkpinfo, FALSE);
         retval += res;
         if (res) {
@@ -2553 +2555 @@
             continue;
         }
-        strcpy(curr_file, cf);
-
-        sprintf(tmp, "mv -f %s %s/archives/", curr_file,
-                bkpinfo->scratchdir);
+        mr_asprintf(&curr_file, cf);
+
+        mr_asprintf(&tmp, "mv -f %s %s/archives/", curr_file,
+                 bkpinfo->scratchdir);
         res = run_program_and_log_output(tmp, 5);
         retval += res;
@@ -2564 +2566 @@
             mr_msg(8, "Moved %s to CD OK", tmp);
         }
+        mr_free(tmp);
+        mr_free(curr_file);
         //      unlink (curr_file);
     }
@@ -2572 +2576 @@
                 "Warning - errors occurred while I was adding files to CD dir");
     }
-    mr_free(tmp);
-    mr_free(curr_file);
     return (retval);
 }
 
 /* @} - end of LLarchiveGroup */
-
-
-
-
-
-
 
 
@@ -2601 +2597 @@
 {
     /*@ buffer ************************************************************ */
-    char *tmp;
-    char *comment;
-    char *bootdisk_dev;
-    char *datadisk_dev;
-    char *bootdisk_file;
-    char *rootdisk_file;
+    char *tmp = NULL;
+    char *comment = NULL;
+    char *bootdisk_dev =NULL;
+    char *datadisk_dev = NULL;
+    char *bootdisk_file = NULL;
+    char *rootdisk_file = NULL;
 
     /*@ int *************************************************************** */
@@ -2616 +2612 @@
     bool root_disk_exists = FALSE;
 
-    malloc_string(tmp);
-    malloc_string(comment);
-    malloc_string(bootdisk_dev);
-    malloc_string(datadisk_dev);
-    malloc_string(rootdisk_file);
-    malloc_string(bootdisk_file);
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(imagesdir);
-
 
     if (!ask_me_yes_or_no
@@ -2635 +2624 @@
         system("/usr/sbin/fdcontrol -F 1722 /dev/fd0.1722");
 #endif
-        strcpy(bootdisk_dev, DEFAULT_1722MB_DISK);
+        mr_asprintf(&bootdisk_dev, DEFAULT_1722MB_DISK);
     } else if (does_device_exist(BACKUP_1722MB_DISK)) {
-        sprintf(bootdisk_dev, "/dev/fd0H1722");
+        mr_asprintf(&bootdisk_dev, "/dev/fd0H1722");
     } else {
         mr_msg(1, "Warning - can't find a 1.72MB floppy device *sigh*");
-        strcpy(bootdisk_dev, DEFAULT_1722MB_DISK);
-//      return (1);
-    }
-    strcpy(datadisk_dev, "/dev/fd0");
+        mr_asprintf(&bootdisk_dev, DEFAULT_1722MB_DISK);
+    }
+    mr_asprintf(&datadisk_dev, "/dev/fd0");
     if (!does_device_exist(datadisk_dev)) {
         mr_msg(1, "Warning - can't find a 1.44MB floppy device *sigh*");
-        strcpy(datadisk_dev, "/dev/fd0");
-//      return (1);
-    }
-    format_first =
-        ask_me_yes_or_no
+    }
+    format_first = ask_me_yes_or_no
         ("Do you want me to format the disks before I write to them?");
 
-/* boot disk */
+    /* boot disk */
     if (ask_me_OK_or_cancel("About to write boot disk")) {
         log_to_screen("Writing boot floppy");
 #ifdef __FreeBSD__
-        sprintf(tmp, "%s/mindi-kern.1722.img", imagesdir);
+        mr_asprintf(&tmp, "%s/mindi-kern.1722.img", imagesdir);
         if (format_first) {
             format_disk(bootdisk_dev);
         }
         res += write_image_to_floppy(bootdisk_dev, tmp);
+        mr_free(tmp);
+
         if (ask_me_OK_or_cancel("About to write 1.44MB mfsroot disk")) {
             log_to_screen("Writing mfsroot floppy");
@@ -2667 +2654 @@
                 format_disk(datadisk_dev);
             }
-            sprintf(tmp, "%s/mindi-mfsroot.1440.img", imagesdir);
+            mr_asprintf(&tmp, "%s/mindi-mfsroot.1440.img", imagesdir);
             write_image_to_floppy(datadisk_dev, tmp);
+            mr_free(tmp);
         }
 #else
-        sprintf(bootdisk_file, "%s/mindi-bootroot.1722.img", imagesdir);
+        mr_asprintf(&bootdisk_file, "%s/mindi-bootroot.1722.img", imagesdir);
         if (does_file_exist(bootdisk_file)) {
             if (format_first) {
@@ -2678 +2666 @@
             res += write_image_to_floppy(bootdisk_dev, bootdisk_file);
         } else {
-            sprintf(bootdisk_file, "%s/mindi-boot.1440.img", imagesdir);
-            sprintf(rootdisk_file, "%s/mindi-root.1440.img", imagesdir);
+            mr_free(bootdisk_file);
+            mr_asprintf(&bootdisk_file, "%s/mindi-boot.1440.img", imagesdir);
+            mr_asprintf(&rootdisk_file, "%s/mindi-root.1440.img", imagesdir);
             root_disk_exists = TRUE;
             if (!does_file_exist(rootdisk_file)
@@ -2687 +2676 @@
                 log_to_screen
                     ("Failed to find boot/root floppy images. Oh dear.");
+                mr_free(bootdisk_file);
+                mr_free(rootdisk_file);
+                mr_free(bootdisk_dev);
                 return (1);
             }
@@ -2692 +2684 @@
                 format_disk(datadisk_dev);
             }
-            /*
-               sprintf(tmp, "cat %s > %s", bootdisk_file, datadisk_dev);
-               res += run_external_binary_with_percentage_indicator_NEW("Writing boot floppy", tmp);
-             */
             res += write_image_to_floppy(datadisk_dev, bootdisk_file);
             if (ask_me_OK_or_cancel("About to write root disk")) {
@@ -2702 +2690 @@
                     format_disk(datadisk_dev);
                 }
-                sprintf(tmp, "cat %s > %s", rootdisk_file, datadisk_dev);
+                mr_asprintf(&tmp, "cat %s > %s", rootdisk_file, datadisk_dev);
                 mr_msg(1, "tmp = '%s'", tmp);
                 res +=
@@ -2708 +2696 @@
                     ("Writing root floppy", tmp);
 //              res += write_image_to_floppy (datadisk_dev, rootdisk_file);
-            }
-        }
+                mr_free(tmp);
+            }
+            mr_free(rootdisk_file);
+            
+        }
+        mr_free(bootdisk_file);
 #endif
     }
+    mr_free(bootdisk_dev);
+
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         log_to_screen
@@ -2718 +2712 @@
     }
     for (i = 1; i < 99; i++) {
-        sprintf(tmp, "%s/mindi-data-%d.img", imagesdir, i);
+        mr_asprintf(&tmp, "%s/mindi-data-%d.img", imagesdir, i);
         mr_msg(3, tmp);
         if (!does_file_exist(tmp)) {
@@ -2724 +2718 @@
             break;
         }
-        sprintf(comment, "About to write data disk #%d", i);
+        mr_asprintf(&comment, "About to write data disk #%d", i);
         if (ask_me_OK_or_cancel(comment)) {
-            sprintf(comment, "Writing data disk #%3d", i);
+            mr_free(comment);
+            mr_asprintf(&comment, "Writing data disk #%3d", i);
             log_to_screen(comment);
+            mr_free(comment);
             if (format_first) {
                 res += format_disk(datadisk_dev);
@@ -2733 +2729 @@
             res += write_image_to_floppy(datadisk_dev, tmp);
         }
-    }
+        mr_free(tmp);
+    }
+    /* In case of break free mem as well */
     mr_free(tmp);
-    mr_free(comment);
-    mr_free(bootdisk_dev);
     mr_free(datadisk_dev);
     return (res);
 }
-
-
-
-
-
-
 
 
@@ -2758 +2748 @@
  */
 
-int offer_to_write_boot_floppies_to_physical_disks(struct s_bkpinfo
-                                                   *bkpinfo)
-{
+int offer_to_write_boot_floppies_to_physical_disks(struct s_bkpinfo *bkpinfo) {
+    
     int res = 0;
 
@@ -2773 +2762 @@
 #else
         if (!does_file_exist("/var/cache/mindi/mindi-bootroot.1722.img")
-            && !does_file_exist("/var/cache/mindi/mindi-boot.1440.img"))
+            && !does_file_exist("/var/cache/mindi/mindi-boot.1440.img")
+            && !does_file_exist("/var/cache/mindi/mindi-boot.2880.img")
+            && !does_file_exist("/var/cache/mindi/mindi-boot.5760.img"))
 #endif
         {
@@ -2793 +2784 @@
     return (res);
 }
-
-
 
 
@@ -2834 +2823 @@
     char start_chr;
     char stop_chr;
-    char *curr_file, *cf;
+    char *curr_file = NULL;
+    char *cf = NULL;
     /*@ long long ****************************************************** */
     off_t length_of_incoming_file = (off_t)0;
@@ -2841 +2831 @@
 
     assert(bkpinfo != NULL);
-    malloc_string(curr_file);
     va_start(ap, files_to_add);
     for (cf = files_to_add; cf != NULL; cf = va_arg(ap, char *)) {
@@ -2847 +2836 @@
             continue;
         }
-        strcpy(curr_file, cf);
+        mr_asprintf(&curr_file, cf);
         if (!does_file_exist(curr_file)) {
             mr_msg(1,
@@ -2853 +2842 @@
                     curr_file);
         }
-/* create header chars */
+        /* create header chars */
         start_chr = BLK_START_AN_AFIO_OR_SLICE;
         stop_chr = BLK_STOP_AN_AFIO_OR_SLICE;
-/* ask for new tape if necessary */
+        /* ask for new tape if necessary */
         length_of_incoming_file = length_of_file(curr_file);
         write_header_block_to_stream(length_of_incoming_file, curr_file,
@@ -2870 +2859 @@
         retval += res;
         unlink(curr_file);
-/* write closing header */
+        mr_free(curr_file);
+        /* write closing header */
         write_header_block_to_stream((off_t)0, "finished-writing-file", stop_chr);
     }
@@ -2879 +2869 @@
                 "Warning - errors occurred while I was adding file to tape");
     }
-    mr_free(curr_file);
     return (retval);
 }
 
 /* @} - end of LLarchiveGroup */
-
 
 
@@ -2946 +2934 @@
 
 
-
-
-
-
-
-
-
 /**
  * Asks the user to put a CD-R(W) in the drive.
@@ -2963 +2944 @@
 
     /*@ buffers ********************************************* */
-    char *tmp;
-    char *szmsg;
-    char *cdrom_dev;
-    char *cdrw_dev;
-    char *our_serial_str;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *szmsg = NULL;
+    char *cdrom_dev = NULL;
+    char *cdrw_dev = NULL;
+    char *our_serial_str = NULL;
     bool ok_go_ahead_burn_it;
     int cd_number = -1;
     int attempt_to_mount_returned_this = 999;
-    char *mtpt;
-    char *szcdno;
-    char *szserfname;
-    char *szunmount;
+    char *mtpt = NULL;
+    char *szcdno = NULL;
+    char *szserfname = NULL;
+    char *szunmount = NULL;
 
     malloc_string(tmp);
@@ -3122 +3104 @@
 
 
-
-
-
-
-
-
 /**
  * Set the <tt>N</tt>th bit of @c array to @c true_or_false.
@@ -3155 +3131 @@
 
 /* @} - end of utilityGroup */
-
-
-
-
-
-
 
 
@@ -3189 +3159 @@
 
     /*@ buffers ************************************************** */
-    char *tmp, *checksum_line, *command;
-    char *tempblock;
-    char *curr_slice_fname_uncompressed;
-    char *curr_slice_fname_compressed;
-    char *file_to_archive;
-    char *file_to_openin;
+    char *tmp = NULL;
+    char *checksum_line = NULL;
+    char *command = NULL;
+    char *tempblock = NULL;
+    char *curr_slice_fname_uncompressed = NULL;
+    char *curr_slice_fname_compressed = NULL;
+    char *file_to_archive = NULL;
+    char *file_to_openin = NULL;
     /*@ pointers ************************************************** */
-    char *pB;
-    FILE *fin, *fout;
+    char *pB = NULL;
+    FILE *fin = NULL;
+    FILE *fout = NULL;
 
     /*@ bool ****************************************************** */
@@ -3208 +3181 @@
     long optimal_set_size;
     bool should_I_compress_slices;
-    char *suffix;               // for compressed slices
+    char *suffix = NULL;                // for compressed slices
 
     /*@ long long ************************************************** */
@@ -3218 +3191 @@
     int retval = 0;
     int res = 0;
+    size_t n = 0;
 
     /*@ structures ************************************************** */
@@ -3230 +3204 @@
     malloc_string(curr_slice_fname_compressed);
     malloc_string(file_to_archive);
-    malloc_string(suffix);
     command = mr_malloc(MAX_STR_LEN * 8);
 
@@ -3239 +3212 @@
     if (is_this_file_compressed(biggie_filename)
         || bkpinfo->compression_level == 0) {
-        suffix[0] = '\0';
+        mr_asprintf(&suffix, "");
         //      log_it("%s is indeed compressed :-)", filename);
         should_I_compress_slices = FALSE;
     } else {
-        strcpy(suffix, bkpinfo->zip_suffix);
+        mr_asprintf(&suffix, bkpinfo->zip_suffix);
         should_I_compress_slices = TRUE;
     }
@@ -3389 +3362 @@
                         slice_num);
             }
-#ifndef _XWIN
             if (!g_text_mode) {
                 newtDrawRootText(0, g_noof_rows - 2, tmp);
@@ -3396 +3368 @@
                 mr_msg(2, tmp);
             }
-#else
-            mr_msg(2, tmp);
-#endif
             strcpy(file_to_archive, curr_slice_fname_compressed);
             g_current_progress++;
@@ -3447 +3416 @@
     return (retval);
 }
-
-
-
-