Changeset 1086 in MondoRescue for trunk/mondo/src/common/libmondo-devices.c

Timestamp:

Feb 2, 2007, 11:21:27 PM (17 years ago)

Author:

Bruno Cornec

Message:

log_msg => mr_msg in trunk

File:

• trunk/mondo/src/common/libmondo-devices.c (modified) (59 diffs)

trunk/mondo/src/common/libmondo-devices.c

@@ -133 +133 @@
     }
 
-    log_msg(4, "(mount_CDROM_here --- device=%s, mountpoint=%s", device,
+    mr_msg(4, "(mount_CDROM_here --- device=%s, mountpoint=%s", device,
             mountpoint);
     /*@ end vars *************************************************** */
@@ -145 +145 @@
 #endif
 
-    log_msg(4, command);
+    mr_msg(4, command);
     if (strncmp(device, "/dev/", 5) == 0) {
         retract_CD_tray_and_defeat_autorun();
     }
     retval = system(command);
-    log_msg(1, "system(%s) returned %d", command, retval);
+    mr_msg(1, "system(%s) returned %d", command, retval);
     mr_free(command);
 
@@ -174 +174 @@
     mr_asprintf(&tmp, where_is_root_mounted());
     mr_asprintf(&comment, "root is mounted at %s\n", tmp);
-    log_msg(0, comment);
+    mr_msg(0, comment);
     mr_free(comment);
 
-    log_msg(0,
+    mr_msg(0,
             "No, Schlomo, that doesn't mean %s is the root partition. It's just a debugging message. Relax. It's part of am_I_in_disaster_recovery_mode().",
             tmp);
@@ -208 +208 @@
         is_this_a_ramdisk = TRUE;
     }
-    log_msg(1, "Is this a ramdisk? result = %d", is_this_a_ramdisk);
+    mr_msg(1, "Is this a ramdisk? result = %d", is_this_a_ramdisk);
     return (is_this_a_ramdisk);
 }
@@ -291 +291 @@
 #endif
 
-    log_msg(3, "Ejecting %s", dev);
+    mr_msg(3, "Ejecting %s", dev);
     res2 = run_program_and_log_output(command, 1);
     mr_free(command);
@@ -543 +543 @@
     }
     if (res) {
-        log_msg(1, _("mount failed"));
-    } else {
-        log_msg(1, _("mount succeeded with %s"), dev);
+        mr_msg(1, _("mount failed"));
+    } else {
+        mr_msg(1, _("mount succeeded with %s"), dev);
     }
     mr_free(dev);
@@ -568 +568 @@
     if (g_cdrw_drive_is_here != NULL) {
         mr_asprintf(&cdrw_device, g_cdrw_drive_is_here);
-        log_msg(3, "Been there, done that. Returning %s", cdrw_device);
+        mr_msg(3, "Been there, done that. Returning %s", cdrw_device);
         return(cdrw_device);
     }
     if (g_backup_media_type == dvd) {
-        log_msg(1,
+        mr_msg(1,
                 "This is dumb. You're calling find_cdrw_device() but you're backing up to DVD. WTF?");
         return(NULL);
@@ -652 +652 @@
     if ((g_cdrom_drive_is_here != NULL) && !isdigit(g_cdrom_drive_is_here[0])) {
         mr_asprintf(&output, g_cdrom_drive_is_here);
-        log_msg(3, "Been there, done that. Returning %s", output);
+        mr_msg(3, "Been there, done that. Returning %s", output);
         return(output);
     }
     if ((the_last_place_i_found_it != NULL) && !try_to_mount) {
         mr_asprintf(&output, the_last_place_i_found_it);
-        log_msg(3,
+        mr_msg(3,
                 "find_cdrom_device() --- returning last found location - '%s'",
                 output);
@@ -674 +674 @@
     if (!tmp) {
         mr_asprintf(&output, "/dev/cdrom");
-        log_msg(4, "Can't find cdrecord; assuming %s", output);
+        mr_msg(4, "Can't find cdrecord; assuming %s", output);
         if (!does_device_exist(output)) {
-            log_msg(4, "That didn't work. Sorry.");
+            mr_msg(4, "That didn't work. Sorry.");
             mr_free(cdr_exe);
             mr_free(output);
@@ -690 +690 @@
     fin = popen(command, "r");
     if (!fin) {
-        log_msg(4, "command=%s", command);
+        mr_msg(4, "command=%s", command);
         log_OS_error("Cannot popen command");
         mr_free(cdr_exe);
@@ -730 +730 @@
 #ifndef __FreeBSD__
     if (strlen(phrase_two) == 0) {
-        log_msg(4, "Not running phase two. String is empty.");
+        mr_msg(4, "Not running phase two. String is empty.");
     } else {
         mr_asprintf(&command, "dmesg | grep \"%s\" 2> /dev/null", phrase_two);
         fin = popen(command, "r");
         if (!fin) {
-            log_msg(4, "Cannot run 2nd command - non-fatal, fortunately");
+            mr_msg(4, "Cannot run 2nd command - non-fatal, fortunately");
         } else {
             for (mr_getline(&tmp, &n, fin); !feof(fin);
                  mr_getline(&tmp, &n, fin)) {
-                log_msg(5, "--> '%s'", tmp);
+                mr_msg(5, "--> '%s'", tmp);
                 if (tmp[0] != ' ' && tmp[1] != ' ') {
                     p = strchr(tmp, ':');
@@ -747 +747 @@
                             mr_free(dvd_last_resort);
                             mr_asprintf(&dvd_last_resort, "/dev/%s", tmp);
-                            log_msg(4,
+                            mr_msg(4,
                                     "Ignoring '%s' because it's a DVD drive",
                                     tmp);
@@ -767 +767 @@
 #ifdef __FreeBSD__
     if (!found_it) {
-        log_msg(4, "OK, approach 2");
+        mr_msg(4, "OK, approach 2");
         if (!(found_it = set_dev_to_this_if_rx_OK(output, "/dev/cdrom"))) {
             if (!
@@ -804 +804 @@
     if (dvd_last_resort != NULL) {
         if (!found_it && strlen(dvd_last_resort) > 0) {
-            log_msg(4, "Well, I'll use the DVD - %s - as a last resort",
+            mr_msg(4, "Well, I'll use the DVD - %s - as a last resort",
                     dvd_last_resort);
             mr_free(output);
@@ -817 +817 @@
                 strrchr(output, '/') + 1);
         if (system(tmp) == 0) {
-            log_msg(4,
+            mr_msg(4,
                     "%s is not right. It's being SCSI-emulated. Continuing.",
                     output);
@@ -827 +827 @@
 
     if (found_it) {
-        log_msg(4, "(find_cdrom_device) --> '%s'", output);
+        mr_msg(4, "(find_cdrom_device) --> '%s'", output);
         if (!does_device_exist(output)) {
-            log_msg(4, "OK, I was wrong, I haven't found it... yet.");
+            mr_msg(4, "OK, I was wrong, I haven't found it... yet.");
             found_it = FALSE;
             mr_free(output);
@@ -836 +836 @@
 
     if (!found_it) {
-        log_msg(4, "OK, approach 2");
+        mr_msg(4, "OK, approach 2");
         if (!(found_it = set_dev_to_this_if_rx_OK(output, "/dev/scd0"))) {
             if (!(found_it = set_dev_to_this_if_rx_OK(output, "/dev/sr0"))) {
@@ -882 +882 @@
     if (found_it && try_to_mount) {
         if (! mount_CDROM_here(output, mountpoint)) {
-            log_msg(4, "[Cardigans] I've changed my mind");
+            mr_msg(4, "[Cardigans] I've changed my mind");
             found_it = FALSE;
             mr_free(output);
@@ -888 +888 @@
             mr_asprintf(&tmp, "%s/archives", mountpoint);
             if (!does_file_exist(tmp)) {
-                log_msg(4, "[Cardigans] I'll take it back");
+                mr_msg(4, "[Cardigans] I'll take it back");
                 found_it = FALSE;
                 mr_free(output);
@@ -895 +895 @@
                 paranoid_system(command);
                 mr_free(command);
-                log_msg(4, "I'm confident the Mondo CD is in %s", output);
+                mr_msg(4, "I'm confident the Mondo CD is in %s", output);
             }
             mr_free(tmp);
@@ -905 +905 @@
     if (found_it) {
         if (!does_file_exist(output)) {
-            log_msg(3, "I still haven't found it.");
+            mr_msg(3, "I still haven't found it.");
             mr_free(output);
             return(NULL);
         }
-        log_msg(3, "(find_cdrom_device) --> '%s'", output);
+        mr_msg(3, "(find_cdrom_device) --> '%s'", output);
         mr_asprintf(&the_last_place_i_found_it, output);
         mr_free(g_cdrom_drive_is_here);
@@ -921 +921 @@
     mr_free(cdr_exe);
 
-    log_msg(1, "command=%s", command);
+    mr_msg(1, "command=%s", command);
     mr_asprintf(&tmp, call_program_and_get_last_line_of_output(command));
     mr_free(command);
@@ -927 +927 @@
     if (tmp[0]) {
         output = tmp;
-        log_msg(4, "Finally found it at %s", output);
+        mr_msg(4, "Finally found it at %s", output);
     } else {
         mr_free(tmp);
         mr_free(output);
-        log_msg(4, "Still couldn't find it.");
+        mr_msg(4, "Still couldn't find it.");
     }
     return(output);
@@ -945 +945 @@
     if (g_dvd_drive_is_here != NULL) {
         mr_asprintf(&output, g_dvd_drive_is_here);
-        log_msg(3, "Been there, done that. Returning %s", output);
+        mr_msg(3, "Been there, done that. Returning %s", output);
         return (output);
     }
@@ -952 +952 @@
             ("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
         );
-    log_msg(5, "tmp = '%s'", tmp);
+    mr_msg(5, "tmp = '%s'", tmp);
     if (!tmp[0]) {
         mr_free(tmp);
@@ -969 +969 @@
         mr_free(g_dvd_drive_is_here);
         mr_asprintf(&g_dvd_drive_is_here, output);
-        log_msg(2, "I think DVD is at %s", output);
-    } else {
-        log_msg(2, "I cannot find DVD");
+        mr_msg(2, "I think DVD is at %s", output);
+    } else {
+        mr_msg(2, "I cannot find DVD");
     }
 
@@ -1032 +1032 @@
 
     if (outvalB <= 0) {
-        log_msg(1, "Error getting size of %s: %s", drive, strerror(errno));
+        mr_msg(1, "Error getting size of %s: %s", drive, strerror(errno));
 #if linux
     fileid = open(drive, O_RDONLY);
@@ -1041 +1041 @@
                 cylindersize = hdgeo.heads * hdgeo.sectors / 2;
                 outvalA = cylindersize * cylinders / 1024;
-                log_msg(2, "Got Harddisk geometry, C:%d, H:%d, S:%d",
+                mr_msg(2, "Got Harddisk geometry, C:%d, H:%d, S:%d",
                         hdgeo.cylinders, hdgeo.heads, hdgeo.sectors);
                 gotgeo = 1;
             } else {
-                log_msg(1, "Harddisk geometry wrong");
+                mr_msg(1, "Harddisk geometry wrong");
             }
         } else {
-            log_msg(1,
+            mr_msg(1,
                     "Error in ioctl() getting new hard disk geometry (%s), resizing in unsafe mode",
                     strerror(errno));
@@ -1054 +1054 @@
         close(fileid);
     } else {
-        log_msg(1, "Failed to open %s for reading: %s", drive,
+        mr_msg(1, "Failed to open %s for reading: %s", drive,
                 strerror(errno));
     }
     if (!gotgeo) {
-        log_msg(1, "Failed to get harddisk geometry, using old mode");
+        mr_msg(1, "Failed to get harddisk geometry, using old mode");
     }
 #endif
@@ -1067 +1067 @@
     outvalC = (outvalA > outvalB) ? outvalA : outvalB;
 
-//  log_msg (5, "drive = %s, error = %s", drive, strerror (errno));
+//  mr_msg (5, "drive = %s, error = %s", drive, strerror (errno));
 //  fatal_error ("GPSOD: Unable to get size of drive");
-    log_msg(1, "%s --> %ld or %ld --> %ld", drive, outvalA, outvalB,
+    mr_msg(1, "%s --> %ld or %ld --> %ld", drive, outvalA, outvalB,
             outvalC);
 
@@ -1164 +1164 @@
 //  assert_string_is_neither_NULL_nor_zerolength(device_raw);
     if (device_raw[0] != '/' && !strstr(device_raw, ":/")) {
-        log_msg(1, "%s needs to have a '/' prefixed - I'll do it",
+        mr_msg(1, "%s needs to have a '/' prefixed - I'll do it",
                 device_raw);
         mr_asprintf(&tmp, "/%s", device_raw);
@@ -1170 +1170 @@
         mr_asprintf(&tmp, device_raw);
     }
-    log_msg(1, "Is %s mounted?", tmp);
+    mr_msg(1, "Is %s mounted?", tmp);
     if (!strcmp(tmp, "/proc") || !strcmp(tmp, "proc")) {
-        log_msg(1,
+        mr_msg(1,
                 "I don't know how the heck /proc made it into the mountlist. I'll ignore it.");
         return (FALSE);
@@ -1201 +1201 @@
     mr_free(device_with_space);
 
-    log_msg(4, "tmp (command) = '%s'", tmp);
+    mr_msg(4, "tmp (command) = '%s'", tmp);
     if (!system(tmp)) {
         mr_free(tmp);
@@ -1321 +1321 @@
     assert(cd_number_i_want > 0);
 
-//  log_msg(3, "Insisting on CD number %d", cd_number_i_want);
+//  mr_msg(3, "Insisting on CD number %d", cd_number_i_want);
 
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        log_msg(3,
+        mr_msg(3,
                 "No need to insist_on_this_cd_number when the backup type isn't CD-R(W) or NFS or ISO");
         return;
@@ -1335 +1335 @@
     if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso
         || bkpinfo->backup_media_type == nfs) {
-        log_msg(3, "Remounting CD");
+        mr_msg(3, "Remounting CD");
         g_ISO_restore_mode = TRUE;
 // FIXME --- I'm tempted to do something about this...
@@ -1352 +1352 @@
                     cd_number_i_want);
             if (does_file_exist(tmp)) {
-                log_msg(1,
+                mr_msg(1,
                         "FIXME - hacking bkpinfo->isodir from '%s' to /tmp/isodir",
                         bkpinfo->isodir);
@@ -1358 +1358 @@
             }
         }
-        log_msg(3, "Mounting %s at %s", tmp, MNT_CDROM);
+        mr_msg(3, "Mounting %s at %s", tmp, MNT_CDROM);
         if (! mount_CDROM_here(tmp, MNT_CDROM)) {
             fatal_error("Mommy!");
@@ -1365 +1365 @@
     }
     if ((res = what_number_cd_is_this(bkpinfo)) != cd_number_i_want) {
-        log_msg(3, "Currently, we hold %d but we want %d", res,
+        mr_msg(3, "Currently, we hold %d but we want %d", res,
                 cd_number_i_want);
         mr_asprintf(&tmp, "Insisting on %s #%d",
@@ -1373 +1373 @@
                 bkpinfo->backup_media_string,
                 cd_number_i_want);
-        log_msg(3, tmp);
+        mr_msg(3, tmp);
         mr_free(tmp);
 
@@ -1403 +1403 @@
         mr_free(request);
 
-        log_msg(1, "Thankyou. Proceeding...");
+        mr_msg(1, "Thankyou. Proceeding...");
         g_current_media_number = cd_number_i_want;
     }
@@ -1452 +1452 @@
     }
     bkpinfo->backup_media_string = bkptype_to_string(bkpinfo->backup_media_type);
-    log_msg(3, "media type = %s",bkpinfo->backup_media_string);
+    mr_msg(3, "media type = %s",bkpinfo->backup_media_string);
 
     if (archiving_to_media) {
@@ -1490 +1490 @@
                 mr_asprintf(&tmp, "1");
                 mr_asprintf(&sz_size, "%d", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4582 MB
-                log_msg(1, "Setting to DVD defaults");
+                mr_msg(1, "Setting to DVD defaults");
             } else if (bkpinfo->backup_media_type == usb) {
                 strcpy(bkpinfo->media_device, VANILLA_USB_DEVICE);
@@ -1498 +1498 @@
                 mr_asprintf(&tmp, "4");
                 mr_asprintf(&sz_size, "650");
-                log_msg(1, "Setting to CD defaults");
+                mr_msg(1, "Setting to CD defaults");
             }
             if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
@@ -1534 +1534 @@
         if (bkpinfo->disaster_recovery) {
             mr_allocstr(bkpinfo->media_device, "/dev/cdrom");
-            log_msg(2, "CD-ROM device assumed to be at %s",
+            mr_msg(2, "CD-ROM device assumed to be at %s",
                     bkpinfo->media_device);
         } else if (bkpinfo->restore_data
@@ -1541 +1541 @@
                 mr_asprintf(&bkpinfo->media_device, "/dev/cdrom");
             }                   // just for the heck of it :)
-            log_msg(1, "bkpinfo->media_device = %s",
+            mr_msg(1, "bkpinfo->media_device = %s",
                     bkpinfo->media_device);
             tmp = find_cdrom_device(FALSE);
@@ -1547 +1547 @@
                 || (tmp != NULL)) {
                 mr_allocstr(bkpinfo->media_device, tmp);
-                log_msg(1, "bkpinfo->media_device = %s",
+                mr_msg(1, "bkpinfo->media_device = %s",
                         bkpinfo->media_device);
                 mr_asprintf(&comment,
@@ -1561 +1561 @@
             mr_free(tmp);
 
-            log_msg(2, "%s device found at %s",
+            mr_msg(2, "%s device found at %s",
                     bkpinfo->backup_media_string,
                     bkpinfo->media_device);
@@ -1607 +1607 @@
         mr_free(bkpinfo->media_device);
         if (find_tape_device_and_size(bkpinfo->media_device, sz_size)) {
-            log_msg(3, _("Ok, using vanilla scsi tape."));
+            mr_msg(3, _("Ok, using vanilla scsi tape."));
             mr_allocstr(bkpinfo->media_device,VANILLA_SCSI_TAPE"0" );
             if ((fin = fopen(bkpinfo->media_device, "r"))) {
@@ -1647 +1647 @@
         }
         mr_free(tmp);
-        log_msg(4, "sz_size = %s", sz_size);
+        mr_msg(4, "sz_size = %s", sz_size);
         mr_free(sz_size);
         bkpinfo->media_size[0] = 0;
-        log_msg(4, "media_size[0] = %ld", bkpinfo->media_size[0]);
+        mr_msg(4, "media_size[0] = %ld", bkpinfo->media_size[0]);
         if (bkpinfo->media_size[0] <= 0) {
             bkpinfo->media_size[0] = 0;
@@ -1781 +1781 @@
             finish(1);
         }
-        log_msg(3, "prefix set to %s", bkpinfo->prefix);
+        mr_msg(3, "prefix set to %s", bkpinfo->prefix);
 
         for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
             bkpinfo->media_size[i] = 650;
         }
-        log_msg(3, "Just set nfs_remote_dir to %s",
+        mr_msg(3, "Just set nfs_remote_dir to %s",
                 bkpinfo->nfs_remote_dir);
-        log_msg(3, "isodir is still %s", bkpinfo->isodir);
+        mr_msg(3, "isodir is still %s", bkpinfo->isodir);
         break;
 
@@ -1828 +1828 @@
             finish(1);
         }
-        log_msg(3, "prefix set to %s", bkpinfo->prefix);
+        mr_msg(3, "prefix set to %s", bkpinfo->prefix);
         break;
     default:
@@ -1974 +1974 @@
 #else
     if (bkpinfo->backup_media_type == nfs) {
-        log_msg(3, "I think the NFS mount is mounted at %s",
+        mr_msg(3, "I think the NFS mount is mounted at %s",
                 bkpinfo->isodir);
     }
@@ -1997 +1997 @@
             fatal_error("Media size is less than zero.");
         } else {
-            log_msg(2, "Warning - media size is less than zero.");
+            mr_msg(2, "Warning - media size is less than zero.");
             bkpinfo->media_size[0] = 0;
         }
@@ -2092 +2092 @@
         return (FALSE);
     }
-    log_msg(10, "Injecting %s", dev);
+    mr_msg(10, "Injecting %s", dev);
     inject_device(dev);
     if (!does_file_exist(dev)) {
-        log_msg(10, "%s doesn't exist. Returning FALSE.", dev);
+        mr_msg(10, "%s doesn't exist. Returning FALSE.", dev);
         return (FALSE);
     }
@@ -2103 +2103 @@
         && !run_program_and_log_output(command, FALSE)) {
         mr_asprintf(&output, dev);
-        log_msg(4, "Found it - %s", dev);
+        mr_msg(4, "Found it - %s", dev);
         mr_free(command);
         return (TRUE);
     } else {
-        log_msg(4, "It's not %s", dev);
+        mr_msg(4, "It's not %s", dev);
         mr_free(command);
         return (FALSE);
@@ -2365 +2365 @@
         lstat(curr_fname, &statbuf);
         while (S_ISLNK(statbuf.st_mode)) {
-            log_msg(1, "curr_fname = %s", curr_fname);
+            mr_msg(1, "curr_fname = %s", curr_fname);
             mr_asprintf(&command, "file %s", curr_fname);
             tmp = call_program_and_get_last_line_of_output(command);
@@ -2376 +2376 @@
             for (p = scratch; *p != '\0' && *p != '\''; p++);
             *p = '\0';
-            log_msg(0, "curr_fname %s --> '%s' --> %s", curr_fname, tmp, scratch);
+            mr_msg(0, "curr_fname %s --> '%s' --> %s", curr_fname, tmp, scratch);
             mr_free(tmp);
 
@@ -2419 +2419 @@
     char *fdisk = NULL;
 
-    log_msg(0, "Looking for partition table format type");
+    mr_msg(0, "Looking for partition table format type");
     mr_asprintf(&fdisk, "/sbin/parted2fdisk");
-    log_msg(1, "Using %s", fdisk);
+    mr_msg(1, "Using %s", fdisk);
     mr_asprintf(&command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
     mr_free(fdisk);
@@ -2434 +2434 @@
     }
     mr_free(tmp);
-    log_msg(0, "Found %s partition table format type", output);
+    mr_msg(0, "Found %s partition table format type", output);
     return (output);
 }