Changeset 1594 in MondoRescue for branches/stable/mondo/src/mondorestore

Timestamp:

Aug 26, 2007, 12:26:06 PM (18 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)

Location:

branches/stable/mondo/src/mondorestore

Files:

• mondo-rstr-compare.c (modified) (3 diffs)
• mondo-rstr-tools.c (modified) (8 diffs)
• mondorestore.c (modified) (3 diffs)

branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -298 +298 @@
     if (res) {
         log_OS_error(command);
-        log_msg(2, tmp);
+        mr_msg(2, tmp);
     }
     mr_free(command);
@@ -594 +594 @@
 
     kill_petris();
-    paranoid_free(new);
-    paranoid_free(cwd);
+    mr_free(new);
+    mr_free(cwd);
     return (retval);
 }
@@ -635 +635 @@
     if (bkpinfo->disaster_recovery
         && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-        strcpy(bkpinfo->media_device,
+        mr_allocstr(bkpinfo->media_device,
                last_line_of_file("/tmp/CDROM-LIVES-HERE"));
-    } else {
-        find_cdrom_device(bkpinfo->media_device, FALSE);
     }
     res = verify_tape_backups(bkpinfo);

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -674 +674 @@
         if (bkpinfo->disaster_recovery
             && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-            strcpy(bkpinfo->media_device,
+            mr_allocstr(bkpinfo->media_device,
                    last_line_of_file("/tmp/CDROM-LIVES-HERE"));
-        } else {
-            find_cdrom_device(bkpinfo->media_device, TRUE);
         }
 
@@ -725 +723 @@
                                FALSE);
     if (run_program_and_log_output("ls " MNT_RESTORING " /tmp", FALSE)) {
-        run_program_and_log_output("chmod 1777 " MNT_RESTORING "/tmp",
-                                   FALSE);
+        chmod(MNT_RESTORING "/tmp",1777 );
     }
     run_program_and_log_output("mkdir -p " MNT_RESTORING
                                "/var/run/console", FALSE);
-    run_program_and_log_output("chmod 777 " MNT_RESTORING "/dev/null",
-                               FALSE);
+    chmod(MNT_RESTORING "/dev/null",0777);
     run_program_and_log_output("cd " MNT_RESTORING
                                "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir \"$i\"/.disabled ; mv -f \"$i\"/.DCOP* \"$i\"/.MCOP* \"$i\"/.*authority \"$i\"/.kde/tmp* \"$i\"/.kde/socket* \"$i\"/.disabled/ ; done",
@@ -838 +834 @@
     if (bkpinfo->disaster_recovery) {
         if (bkpinfo->backup_media_type == cdstream) {
-            strcpy(bkpinfo->media_device, "/dev/cdrom");
-            bkpinfo->media_size = (long)1999*1024;
+            mr_allocstr(bkpinfo->media_device, "/dev/cdrom");
             bkpinfo->media_size = (long)650;    /* good guess */
         } else if (bkpinfo->backup_media_type == tape
@@ -846 +841 @@
                 fatal_error("Cannot get tape device name from cfg file");
             }
-            strcpy(bkpinfo->media_device, value);
+            mr_allocstr(bkpinfo->media_device, value);
             read_cfg_var(cfg_file, "media-size", value);
             bkpinfo->media_size = atol(value);
@@ -852 +847 @@
                     bkpinfo->media_device);
         } else {
-            strcpy(bkpinfo->media_device, "/dev/cdrom");    /* we don't really need this var */
-            bkpinfo->media_size = (long)1999*1024;  /* 650, probably, but we don't need this var anyway */
+            mr_allocstr(bkpinfo->media_device, "/dev/cdrom");   /* we don't really need this var */
             bkpinfo->media_size = (long)1999*1024;  /* 650, probably, but we don't need this var anyway */
             mr_msg(2, "Backup medium is CD-R[W]");
@@ -1019 +1013 @@
                             "Unable to mount isodir. Perhaps this is really a CD backup?");
                     bkpinfo->backup_media_type = cdr;
-                    strcpy(bkpinfo->media_device, "/dev/cdrom");    /* superfluous */
+                    mr_allocstr(bkpinfo->media_device, "/dev/cdrom");   /* superfluous */
                     bkpinfo->isodir[0] = '\0';
                     mr_free(iso_mnt);
@@ -2150 +2144 @@
 
             if (strlen(bkpinfo->media_device) == 0) {
-                strcpy(bkpinfo->media_device, "/dev/st0");
+                mr_allocstr(bkpinfo->media_device, "/dev/st0");
                 mr_msg(2, "media_device is blank; assuming %s",
                         bkpinfo->media_device);
@@ -2157 +2151 @@
             if (extract_cfg_file_and_mountlist_from_tape_dev
                 (bkpinfo->media_device)) {
-                strcpy(bkpinfo->media_device, "/dev/st0");
+                mr_allocstr(bkpinfo->media_device, "/dev/st0");
                 if (extract_cfg_file_and_mountlist_from_tape_dev
                     (bkpinfo->media_device)) {
-                    strcpy(bkpinfo->media_device, "/dev/osst0");
+                    mr_allocstr(bkpinfo->media_device, "/dev/osst0");
                     if (extract_cfg_file_and_mountlist_from_tape_dev
                         (bkpinfo->media_device)) {
-                        strcpy(bkpinfo->media_device, "/dev/ht0");
+                        mr_allocstr(bkpinfo->media_device, "/dev/ht0");
                         if (extract_cfg_file_and_mountlist_from_tape_dev
                             (bkpinfo->media_device)) {
                             mr_msg(3,
                                     "I tried lots of devices but none worked.");
-                            strcpy(bkpinfo->media_device, tmp);
+                            mr_allocstr(bkpinfo->media_device, tmp);
                         }
                     }

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -912 +912 @@
     }
     interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
-    if (!bkpinfo->media_device[0]) {
+    if (!bkpinfo->media_device) {
         mr_msg(2, "Warning - failed to find media dev");
     } else {
@@ -954 +954 @@
     }
     run_program_and_log_output("umount " MNT_CDROM, FALSE);
-    if ((!bkpinfo->please_dont_eject) && (bkpinfo->media_device != NULL)) {
+    if ((!bkpinfo->please_dont_eject) && (bkpinfo->media_device)) {
         eject_device(bkpinfo->media_device);
     }
@@ -3037 +3037 @@
     if (argc == 3 && strcmp(argv[1], "--paa") == 0) {
         g_current_media_number = atoi(argv[2]);
-        pause_and_ask_for_cdr(5, NULL);
+        pause_and_ask_for_cdr(5);
         paranoid_MR_finish(0);
     } else if (!bkpinfo->disaster_recovery) {   // live!