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

Timestamp:

Sep 17, 2009, 3:45:24 AM (15 years ago)

Author:

Bruno Cornec

Message:

Removes some malloc_string static allocation

File:

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

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

@@ -979 +979 @@
 void *create_afio_files_in_background(void *inbuf)
 {
-    long int archiving_set_no;
-    char *archiving_filelist_fname;
-    char *archiving_afioball_fname;
+    long int archiving_set_no = 0L;
+    char *archiving_filelist_fname = NULL;
+    char *archiving_afioball_fname = NULL;
     char *curr_xattr_list_fname = NULL;
     char *curr_acl_list_fname = NULL;
@@ -994 +994 @@
     int this_thread_no = g_current_thread_no++;
 
-    malloc_string(archiving_filelist_fname);
-    malloc_string(archiving_afioball_fname);
     p_last_set_archived = (int *) inbuf;
     p_archival_threads_running = (int *) (inbuf + 4);
@@ -1002 +1000 @@
     bkpinfo_bis = (struct s_bkpinfo *) (inbuf + BKPINFO_LOC_OFFSET);
 
-    sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, 0L);
-    for (archiving_set_no = 0; does_file_exist(archiving_filelist_fname);
-         sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no)) {
+    mr_asprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, 0L);
+
+    while (does_file_exist(archiving_filelist_fname)) {
         if (g_exiting) {
+            mr_free(archiving_filelist_fname);
             fatal_error("Execution run aborted (pthread)");
         }
         if (archiving_set_no >= MAX_NOOF_SETS_HERE) {
+            mr_free(archiving_filelist_fname);
             fatal_error("Maximum number of filesets exceeded. Adjust MAX_NOOF_SETS_HERE, please.");
         }
         if (!semaphore_p()) {
             log_msg(3, "P sem failed (pid=%d)", (int) getpid());
+            mr_free(archiving_filelist_fname);
             fatal_error("Cannot get semaphore P");
         }
@@ -1020 +1021 @@
         *p_next_set_to_archive = *p_next_set_to_archive + 1;
         if (!semaphore_v()) {
+            mr_free(archiving_filelist_fname);
             fatal_error("Cannot get semaphore V");
         }
 
         /* backup this set of files */
-        sprintf(archiving_afioball_fname, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no, bkpinfo->zip_suffix);
-        sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
+        mr_asprintf(archiving_afioball_fname, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no, bkpinfo->zip_suffix);
+        mr_free(archiving_filelist_fname);
+        mr_asprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
         if (!does_file_exist(archiving_filelist_fname)) {
-            log_msg(3,
-                    "%s[%d:%d] - well, I would archive %d, except that it doesn't exist. I'll stop now.",
-                    FORTY_SPACES, getpid(), this_thread_no,
-                    archiving_set_no);
+            log_msg(3, "[%d:%d] - well, I would archive %d, except that it doesn't exist. I'll stop now.", getpid(), this_thread_no, archiving_set_no);
             break;
         }
@@ -1036 +1036 @@
         mr_asprintf(tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
         if (does_file_exist(tmp)) {
-            log_msg(4, "%s[%d:%d] - waiting for storer", FORTY_SPACES,
-                    getpid(), this_thread_no);
+            log_msg(4, "[%d:%d] - waiting for storer", getpid(), this_thread_no);
             while (does_file_exist(tmp)) {
                 sleep(1);
@@ -1045 +1044 @@
         mr_free(tmp);
 
-        log_msg(4, "%s[%d:%d] - EXATing %d...", FORTY_SPACES, getpid(),
-                this_thread_no, archiving_set_no);
+        log_msg(4, "[%d:%d] - EXATing %d...", getpid(), 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);
@@ -1058 +1057 @@
         }
 
-        log_msg(4, "%s[%d:%d] - archiving %d...", FORTY_SPACES, getpid(),
-                this_thread_no, archiving_set_no);
-        res =
-            archive_this_fileset(archiving_filelist_fname,
-                                 archiving_afioball_fname,
-                                 archiving_set_no);
+        log_msg(4, "[%d:%d] - archiving %d...", getpid(), this_thread_no, archiving_set_no);
+        res = archive_this_fileset(archiving_filelist_fname, archiving_afioball_fname, archiving_set_no);
+        mr_free(archiving_afioball_fname);
+
         retval += res;
 
@@ -1069 +1066 @@
             log_to_screen("Errors occurred while archiving set %ld. Please review logs.", archiving_set_no);
         }
+
         if (!semaphore_p()) {
+            mr_free(archiving_filelist_fname);
             fatal_error("Cannot get semaphore P");
         }
@@ -1080 +1079 @@
 
         if (!semaphore_v()) {
+            mr_free(archiving_filelist_fname);
             fatal_error("Cannot get semaphore V");
         }
-        log_msg(4, "%s[%d:%d] - archived %d OK", FORTY_SPACES, getpid(),
-                this_thread_no, archiving_set_no);
+        log_msg(4, "[%d:%d] - archived %d OK", getpid(), this_thread_no, archiving_set_no);
         archiving_set_no++;
-    }
+
+        mr_free(archiving_filelist_fname);
+        mr_asprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
+    }
+    mr_free(archiving_filelist_fname);
+
     if (!semaphore_p()) {
         fatal_error("Cannot get semaphore P");
@@ -1093 +1097 @@
         fatal_error("Cannot get semaphore V");
     }
-    log_msg(3, "%s[%d:%d] - exiting", FORTY_SPACES, getpid(),
-            this_thread_no);
-    paranoid_free(archiving_filelist_fname);
-    paranoid_free(archiving_afioball_fname);
+    log_msg(3, "[%d:%d] - exiting", getpid(), this_thread_no);
     pthread_exit(NULL);
 }
@@ -1327 +1328 @@
     assert(bkpinfo != NULL);
     malloc_string(result_str);
-    transfer_block =
-        malloc(sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
+    transfer_block = malloc(sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
     memset((void *) transfer_block, 0,
            sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
@@ -1638 +1638 @@
     char *message_to_screen = NULL;
     char *sz_blank_disk = NULL;
-    char *fnam;
     char *tmp2 = NULL;
     char *tmp3 = NULL;
@@ -1645 +1644 @@
 
     malloc_string(old_pwd);
-    malloc_string(fnam);
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(destfile);
@@ -1879 +1877 @@
     }
     paranoid_free(old_pwd);
-    paranoid_free(fnam);
     return (retval);
 }
@@ -2529 +2526 @@
 /**
  * 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 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) {
-    int res = 0;
-    char *bkp = NULL;
+ * @return the CD-R(W) device checked or NULL
+ */
+char *interrogate_disk_currently_in_cdrw_drive(char *cdrw_dev) {
     char *cdrecord = NULL;
-
-    mr_asprintf(bkp, "%s", cdrw_dev);
-    if (find_cdrw_device(cdrw_dev)) {
-        strcpy(cdrw_dev, bkp);
-    } else {
+    char *cdrw_dev = NULL;
+
+    cdrw_dev = find_cdrw_device();
+    if (cdrw_dev != NULL) {
         if (!system("which cdrecord > /dev/null 2> /dev/null")) {
             mr_asprintf(cdrecord, "cdrecord dev=%s -atip", cdrw_dev);
@@ -2551 +2542 @@
         }
         if (cdrecord != NULL) {
-            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;
-                    }
-                }
+            retract_CD_tray_and_defeat_autorun();
+            if (run_program_and_log_output(cdrecord, 5)) {
+                /* As it didn't work, return NULL */
+                mr_free(cdrw_dev);
             }
         }
-    }
-    mr_free(bkp);
-
-    mr_free(cdrecord);
-    return (res);
+        mr_free(cdrecord);
+    }
+    return(cdrw_dev);
 }
 
@@ -2586 +2566 @@
     char *tmp = NULL;
     char *cdrom_dev = NULL;
-    char *cdrw_dev;
+    char *cdrw_dev = NULL;
     char *our_serial_str = NULL;
     bool ok_go_ahead_burn_it;
@@ -2592 +2572 @@
     int attempt_to_mount_returned_this = 999;
     char *mtpt = NULL;
-    char *szcdno;
-    char *szserfname;
-    char *szunmount;
+    char *szcdno = NULL;
+    char *szserfname = NULL;
+    char *szunmount = NULL;
     char *mds = NULL;
-
-    malloc_string(cdrw_dev);
-    malloc_string(szcdno);
-    malloc_string(szserfname);
-    malloc_string(szunmount);
 
     mds = media_descriptor_string(g_backup_media_type);
@@ -2621 +2596 @@
         mr_asprintf(tmp, "umount %s", cdrom_dev);
         run_program_and_log_output(tmp, 1);
-        sprintf(szcdno, "%s/archives/THIS-CD-NUMBER", mtpt);
-        sprintf(szserfname, "%s/archives/SERIAL-STRING", mtpt);
-        sprintf(szunmount, "umount %s", mtpt);
+        mr_asprintf(szcdno, "%s/archives/THIS-CD-NUMBER", mtpt);
+        mr_asprintf(szserfname, "%s/archives/SERIAL-STRING", mtpt);
+        mr_asprintf(szunmount, "umount %s", mtpt);
         cd_number = -1;
         mr_asprintf(tmp, "mount %s %s", cdrom_dev, mtpt);
@@ -2629 +2604 @@
         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.");
-            /*
-               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)) {
+        } else if (!does_file_exist(szcdno) || !does_file_exist(szserfname)) {
             mds = media_descriptor_string(g_backup_media_type);
-            log_to_screen
-                ("%s has data on it but it's probably not a Mondo CD.", mds);
+            log_to_screen("%s has data on it but it's probably not a Mondo CD.", mds);
             mr_free(mds);
         } else {
@@ -2664 +2627 @@
             // FIXME - should be able to use last_line_of_file(), surely?
         }
+        mr_free(szcdno);
+        mr_free(szserfname);
+
         run_program_and_log_output(szunmount, 1);
+        mr_free(szunmount);
+
         log_msg(2, "paafcd: cd_number = %d", cd_number);
         log_msg(2, "our serial str = %s; g_serial_string = %s", our_serial_str, g_serial_string);
@@ -2686 +2654 @@
         log_msg(2,
                 "paafcd: Can't find CD-ROM drive. Perhaps it has a blank %s in it?", mds);
-        if (interrogate_disk_currently_in_cdrw_drive(cdrw_dev, FALSE)) {
+        cdrw_dev = interrogate_disk_currently_in_cdrw_drive();
+        if (cdrw_dev == NULL) {
             ok_go_ahead_burn_it = FALSE;
             log_to_screen("There isn't a writable %s in the drive.", mds);
         }
+        mr_free(cdrw_dev);
         mr_free(mds);
     }
@@ -2709 +2679 @@
 
     mds = media_descriptor_string(g_backup_media_type);
-    log_msg(2,
-            "paafcd: OK, I assume I have a blank/reusable %s in the drive...", mds);
+    log_msg(2, "paafcd: OK, I assume I have a blank/reusable %s in the drive...", mds);
 
     log_to_screen("Proceeding w/ %s in drive.", mds);
     mr_free(mds);
 
-    paranoid_free(cdrw_dev);
     paranoid_free(mtpt);
-    paranoid_free(szcdno);
-    paranoid_free(szserfname);
-    paranoid_free(szunmount);
     if (pmountable) {
         if (attempt_to_mount_returned_this) {
@@ -2729 +2694 @@
 
 }
-
-
-
-
-
-
 
 
@@ -2764 +2723 @@
 
 /* @} - end of utilityGroup */
-
-
-
-
-
-