Changeset 171 in MondoRescue for trunk/mondo/mondo/common/libmondo-archive.c

Timestamp:

Dec 8, 2005, 5:20:29 PM (18 years ago)

Author:

bcornec

Message:

memory management continues:

• mondoarchive handled completely
• bkpinfo, begining of dyn. alloc.
• lot of changes around memory everywhere

=> even if it compiles, i'm pretty sure it doesn't work yet (even not tried)

File:

• trunk/mondo/mondo/common/libmondo-archive.c (modified) (21 diffs)

trunk/mondo/mondo/common/libmondo-archive.c

@@ -298 +298 @@
     /*@ buffers ******************************************************** */
     char *command;
-    char *zipparams;
+    char *zipparams = NULL;
     char *tmp, *tmp1;
 
@@ -325 +325 @@
 
 
-        if (bkpinfo->compression_level > 0) {
+    if (bkpinfo->compression_level > 0) {
         asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);
         //       -b %ld, TAPE_BLOCK_SIZE
@@ -333 +333 @@
             asprintf(&tmp1, "%s -E %s", zipparams, tmp);
             paranoid_free(zipparams)
-                zipparams = tmp1;
+            zipparams = tmp1;
         } else {
-            asprintf(&zipparams, "");
+            asprintf(&zipparams, " ");
             log_msg(3, "%s not found. Cannot exclude zipfiles, etc.", tmp);
         }
         paranoid_free(tmp)
     } else {
-        asprintf(&zipparams, "");
+        asprintf(&zipparams, " ");
     }
 
@@ -582 +582 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         asprintf(&tape_size_sz, "%ld", bkpinfo->media_size[1]);
-        asprintf(&tape_device, "%s", bkpinfo->media_device);
+        asprintf(&tape_device, bkpinfo->media_device);
     } else {
-        asprintf(&tape_size_sz, "");
-        asprintf(&tape_device, "");
+        asprintf(&tape_size_sz, " ");
+        asprintf(&tape_device, " ");
     }
     if (bkpinfo->use_lzo) {
@@ -825 +825 @@
         asprintf(&tmp, " NONBOOTABLE");
     } else {
-        asprintf(&tmp, "");
+        asprintf(&tmp, " ");
     }
 
@@ -2007 +2007 @@
                        "Please wait. This may take some time.", "",
                        estimated_total_noof_slices);
+    paranoid_free(tmp);
+
     if (!(fin = fopen(biggielist_fname, "r"))) {
         log_OS_error("Unable to openin biggielist");
@@ -2078 +2080 @@
                                     noof_biggie_files, use_partimagehack);
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-                write_header_block_to_stream(0,
-                                             calc_checksum_of_file
-                                             (bigfile_fname),
-                                             BLK_STOP_A_BIGGIE);
+                tmp = calc_checksum_of_file(bigfile_fname);
+                write_header_block_to_stream(0, tmp, BLK_STOP_A_BIGGIE);
+                paranoid_free(tmp);
             }
             retval += res;
@@ -2090 +2091 @@
                 p = bigfile_fname;
             }
-            paranoid_free(tmp);
             if (res) {
                 asprintf(&tmp, "Archiving %s ... Failed!", bigfile_fname);
@@ -2772 +2772 @@
 /**
  * Make sure the user has a valid CD-R(W) in the CD drive.
- * @param cdrw_dev Set to the CD-R(W) device checked.
+ * @param cdrw_device Set to the CD-R(W) device checked.
  * @param keep_looping If TRUE, keep pestering user until they insist
  * or insert a correct CD; if FALSE, only check once.
  * @return 0 (there was an OK CD in the drive) or 1 (there wasn't).
  */
-int
-interrogate_disk_currently_in_cdrw_drive(char *cdrw_dev, bool keep_looping)
+char *interrogate_disk_currently_in_cdrw_drive()
 {
-    int res = 0;
-    char *bkp;
     char *cdrecord;
-
-    asprintf(&bkp, "%s", cdrw_dev);
-    if (find_cdrw_device(cdrw_dev)) {
-        strcpy(cdrw_dev, bkp);
-    } else {
+    char *cdrw_device;
+
+    if ((cdrw_device = find_cdrw_device()) != NULL) {
         if (!system("which cdrecord > /dev/null 2> /dev/null")) {
-            asprintf(&cdrecord, "cdrecord dev=%s -atip", cdrw_dev);
+            asprintf(&cdrecord, "cdrecord dev=%s -atip", cdrw_device);
         } else if (!system("which dvdrecord > /dev/null 2> /dev/null")) {
-            asprintf(&cdrecord, "cdrecord dev=%s -atip", cdrw_dev);
+            asprintf(&cdrecord, "cdrecord dev=%s -atip", cdrw_device);
         } else {
-            asprintf(&cdrecord, "%s", "");
-            log_msg(2, "Oh well. I guess I'll just pray then.");
+            asprintf(&cdrecord, " ");
+            log_msg(2, "Found no cdrecord nor dvdrecord in path.");
         }
         if (cdrecord[0]) {
-            if (!keep_looping) {
                 retract_CD_tray_and_defeat_autorun();
-                res = run_program_and_log_output(cdrecord, 5);
-            } else {
-                while ((res = run_program_and_log_output(cdrecord, 5))) {
-                    retract_CD_tray_and_defeat_autorun();
-                    if (ask_me_yes_or_no
-                        ("Unable to examine CD. Are you sure this is a valid CD-R(W) CD?"))
-                    {
-                        log_msg(1, "Well, he insisted...");
-                        break;
-                    }
-                }
-            }
+                run_program_and_log_output(cdrecord, 5);
         }
         paranoid_free(cdrecord);
     }
-    paranoid_free(bkp);
-//  retract_CD_tray_and_defeat_autorun();
-    return (res);
+    return(cdrw_device);
 }
 
@@ -2834 +2815 @@
     char *szmsg;
     char *cdrom_dev;
-    char *cdrw_dev;
+    char *cdrw_device = NULL;
     char *our_serial_str;
     bool ok_go_ahead_burn_it;
@@ -2844 +2825 @@
     char *szunmount;
 
-    malloc_string(cdrom_dev);
-    malloc_string(cdrw_dev);
-
     asprintf(&szmsg, "I am about to burn %s #%d",
              media_descriptor_string(g_backup_media_type),
@@ -2862 +2840 @@
   gotos_make_me_puke:
     ok_go_ahead_burn_it = TRUE;
-    if (!find_cdrom_device(cdrom_dev, FALSE)) {
+    cdrom_dev = find_cdrom_device(FALSE);
+    if (cdrom_dev != NULL) {
 /* When enabled, it made CD eject-and-retract when wrong CD inserted.. Weird
       log_msg(2, "paafcd: Retracting CD-ROM drive if possible" );
@@ -2880 +2859 @@
             log_to_screen("If there's a CD/DVD in the drive, it's blank.");
             asprintf(&our_serial_str, "%s", "");
-            /*
-               if (interrogate_disk_currently_in_cdrw_drive(cdrw_dev, FALSE))
-               {
-               ok_go_ahead_burn_it = FALSE;
-               log_to_screen("There isn't a writable CD/DVD in the drive.");
-               }
-               else
-               {
-               log_to_screen("Confirmed. There is a blank CD/DVD in the drive.");
-               }
-             */
         } else if (!does_file_exist(szcdno)
                    || !does_file_exist(szserfname)) {
@@ -2938 +2906 @@
                 "paafcd: Can't find CD-ROM drive. Perhaps it has a blank %s in it?",
                 media_descriptor_string(g_backup_media_type));
-        if (interrogate_disk_currently_in_cdrw_drive(cdrw_dev, FALSE)) {
+        if ((cdrw_device = interrogate_disk_currently_in_cdrw_drive(cdrw_device)) != NULL) {
             ok_go_ahead_burn_it = FALSE;
             log_to_screen("There isn't a writable %s in the drive.",
                           media_descriptor_string(g_backup_media_type));
         }
+        paranoid_free(cdrw_device);
     }
     paranoid_free(mtpt);
@@ -2967 +2936 @@
         log_msg(2, "paafcd: OK, going ahead and burning it.");
     }
+    paranoid_free(cdrom_dev);
 
     log_msg(2,
@@ -2974 +2944 @@
     log_to_screen("Proceeding w/ %s in drive.",
                   media_descriptor_string(g_backup_media_type));
-    paranoid_free(cdrom_dev);
-    paranoid_free(cdrw_dev);
     if (pmountable) {
         if (attempt_to_mount_returned_this) {
@@ -3497 +3465 @@
             && (bkpinfo->backup_media_type == cdr
                 || bkpinfo->backup_media_type == cdrw)) {
-            if (find_cdrom_device(tmp, FALSE))  // make sure find_cdrom_device() finds, records CD-R's loc
+            if ((tmp = find_cdrom_device(FALSE)) == NULL)   // make sure find_cdrom_device() finds, records CD-R's loc
             {
                 log_msg(3, "*Sigh* Mike, I hate your computer.");
@@ -3504 +3472 @@
             else {
                 log_msg(3, "Great. Found Mike's CD-ROM drive.");
+                paranoid_free(tmp);
             }
         }
@@ -3594 +3563 @@
                             "Verifying archives against live filesystem");
         if (bkpinfo->backup_media_type == cdstream) {
-            strcpy(bkpinfo->media_device, "/dev/cdrom");
+            paranoid_alloc(bkpinfo->media_device, 
+                            "/dev/cdrom");
         }
         verify_tape_backups(bkpinfo);
@@ -3608 +3578 @@
         g_current_media_number = cdno;
         if (bkpinfo->backup_media_type != iso) {
-            find_cdrom_device(bkpinfo->media_device, FALSE);    // replace 0,0,0 with /dev/cdrom
+            paranoid_free(bkpinfo->media_device);
+            bkpinfo->media_device = find_cdrom_device(FALSE);
         }
         chdir("/");
@@ -3647 +3618 @@
 
         run_program_and_log_output("umount " MNT_CDROM, FALSE);
-//        if (bkpinfo->backup_media_type != iso && !bkpinfo->please_dont_eject_when_restoring)
-//{
         eject_device(bkpinfo->media_device);
-//}
     }
     diffs = count_lines_in_file("/tmp/changed.files");