Changeset 1594 in MondoRescue for branches/stable/mondo/src/common/libmondo-archive.c

Timestamp:

Aug 26, 2007, 12:26:06 PM (17 years ago)

Author:

Bruno Cornec

Message:

Use of conf file entries (iso_burning_*, media_device, media_size)
and adapatation of the rest of the code to that (including bkpinfo)

File:

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

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

@@ -54 +54 @@
     struct seminfo *__buf;
 };
+#endif
 #endif                          /* __FreeBSD__ */
 
@@ -1218 +1219 @@
  * @param bkpinfo The backup information structure. Fields used:
  * - @c backup_media_type
- * - @c cdrw_speed
+ * - @c writer_speed
  * - @c prefix
  * - @c isodir
@@ -1258 +1259 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         if (bkpinfo->backup_media_type == cdstream) {
-            openout_cdstream(bkpinfo->media_device, bkpinfo->cdrw_speed);
+            openout_cdstream(bkpinfo->media_device, bkpinfo->writer_speed);
         } else {
             openout_tape(bkpinfo->media_device, bkpinfo->internal_tape_block_size); /* sets g_tape_stream */
@@ -1582 +1583 @@
     char *tmp = NULL;
     char *old_pwd;
-    char *result_sz = NULL;
     char *message_to_screen = NULL;
     char *sz_blank_disk = NULL;
     char *tmp2 = NULL;
     char *tmp3 = NULL;
-    bool cd_is_mountable;
 
     malloc_string(old_pwd);
@@ -1608 +1607 @@
     mr_free(tmp);
 
-    if (bkpinfo->backup_media_type == iso && bkpinfo->manual_cd_tray) {
+    if (bkpinfo->backup_media_type != iso && bkpinfo->manual_cd_tray) {
         popup_and_OK(_("Please insert new media and press Enter."));
     }
@@ -1616 +1615 @@
     /* BERLIOS: Do not ignore getcwd result */
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
-    mr_asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
-    run_program_and_log_output(tmp, FALSE);
-    mr_free(tmp);
+    chmod(bkpinfo->scratchdir,0755);
     chdir(bkpinfo->scratchdir);
 
@@ -1643 +1640 @@
 
         /* if g_current_media_number >= 2 then pause & ask */
-        pause_and_ask_for_cdr(2, &cd_is_mountable);
+        if (bkpinfo->backup_media_type != iso) {
+            pause_and_ask_for_cdr(2);
+        }
         if (retval) {
             log_to_screen
@@ -1649 +1648 @@
         } else {
             res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_make_iso,
-                                        bkpinfo->scratchdir,
-                                        g_current_media_number,
+                                        destfile, g_current_media_number,
                                         MONDO_LOGFILE, message_to_screen);
             if (res) {
@@ -1712 +1710 @@
                 res =
                     eval_call_to_make_ISO(bkpinfo, bkpinfo->call_make_iso,
-                                          bkpinfo->scratchdir,
+                                          destfile,
                                           g_current_media_number,
                                           MONDO_LOGFILE,
@@ -2469 +2467 @@
                                              bool keep_looping)
 {
-    char *tmp;
     int res = 0;
-    char *bkp;
-    char *cdrecord;
-
-    malloc_string(tmp);
+    char *bkp = NULL;
+    char *cdrecord = NULL;
+
     malloc_string(bkp);
-    malloc_string(cdrecord);
     strcpy(bkp, cdrw_dev);
     if (find_cdrw_device(cdrw_dev)) {
@@ -2482 +2477 @@
     } 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, "dvdrecord dev=%s -atip", cdrw_dev);
         } else {
-            cdrecord[0] = '\0';
             mr_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();
@@ -2505 +2499 @@
             }
         }
+        mr_free(cdrecord);
     }
 //  retract_CD_tray_and_defeat_autorun();
-    mr_free(tmp);
-    mr_free(cdrecord);
     mr_free(bkp);
     return (res);
@@ -2517 +2510 @@
  * Asks the user to put a CD-R(W) in the drive.
  * @param ask_for_one_if_more_than_this (unused)
- * @param pmountable If non-NULL, pointed-to value is set to TRUE if the CD is mountable, FALSE otherwise.
  */
 void
-pause_and_ask_for_cdr(int ask_for_one_if_more_than_this, bool * pmountable)
+pause_and_ask_for_cdr(int ask_for_one_if_more_than_this)
 {
 
@@ -2537 +2529 @@
     char *szunmount = NULL;
 
-    malloc_string(tmp);
     malloc_string(szmsg);
     malloc_string(cdrom_dev);
@@ -2566 +2557 @@
       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);
+        mr_free(tmp);
         sprintf(szcdno, "%s/archives/THIS-CD-NUMBER", mtpt);
         sprintf(szserfname, "%s/archives/SERIAL-STRING", mtpt);
@@ -2573 +2565 @@
         cd_number = -1;
         our_serial_str[0] = '\0';
-        sprintf(tmp, "mount %s %s", cdrom_dev, mtpt);
-        if ((attempt_to_mount_returned_this =
-             run_program_and_log_output(tmp, 1))) {
+        mr_asprintf(&tmp, "mount %s %s", cdrom_dev, mtpt);
+        attempt_to_mount_returned_this = run_program_and_log_output(tmp, 1);
+        mr_free(tmp);
+        if (attempt_to_mount_returned_this) {
             mr_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)) {
@@ -2598 +2580 @@
                           media_descriptor_string(g_backup_media_type));
             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);
             strcpy(our_serial_str,
                    call_program_and_get_last_line_of_output(tmp));
+            mr_free(tmp);
             // FIXME - should be able to use last_line_of_file(), surely?
         }
@@ -2634 +2617 @@
     }
 
-/*
-  if (g_current_media_number > ask_for_one_if_more_than_this)
-    {
-      ok_go_ahead_burn_it = FALSE;
-      log_it("paafcd: %d > %d, so I'll definitely pause.", g_current_media_number > ask_for_one_if_more_than_this);
-    }
-*/
-
     if (!ok_go_ahead_burn_it) {
         eject_device(cdrom_dev);
-        sprintf(tmp,
+        mr_asprintf(&tmp,
                 "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.",
                 media_descriptor_string(g_backup_media_type),
@@ -2650 +2625 @@
                 media_descriptor_string(g_backup_media_type));
         popup_and_OK(tmp);
+        mr_free(tmp);
         goto gotos_make_me_puke;
     } else {
@@ -2663 +2639 @@
     log_to_screen("Proceeding w/ %s in drive.",
                   media_descriptor_string(g_backup_media_type));
-    mr_free(tmp);
     mr_free(szmsg);
     mr_free(cdrom_dev);
@@ -2672 +2647 @@
     mr_free(our_serial_str);
     mr_free(szunmount);
-    if (pmountable) {
-        if (attempt_to_mount_returned_this) {
-            *pmountable = FALSE;
-        } else {
-            *pmountable = TRUE;
-        }
-    }
-
 }
 
@@ -3300 +3267 @@
         mvaddstr_and_log_it(g_currentY, 0,
                             "Verifying archives against live filesystem");
-        if (bkpinfo->backup_media_type == cdstream) {
-            strcpy(bkpinfo->media_device, "/dev/cdrom");
-        }
         verify_tape_backups(bkpinfo);
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
@@ -3314 +3278 @@
     } else {
         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
-        }
         chdir("/");
         for (cdno = 1; cdno < 99 && bkpinfo->verify_data; cdno++) {