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

Timestamp:

Feb 14, 2007, 1:13:49 PM (17 years ago)

Author:

Bruno Cornec

Message:

Update trunk with the latest feedback from stable (obtained with meld) - First pass

File:

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

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

@@ -18 +18 @@
 #include "libmondo-stream-EXT.h"
 #include "mr_mem.h"
+#include "mr_msg.h"
 
 #include <sys/ioctl.h>
@@ -169 +170 @@
 bool am_I_in_disaster_recovery_mode(void)
 {
-    char *tmp, *comment;
+    char *tmp = NULL;
+    char *comment = NULL;
     bool is_this_a_ramdisk = FALSE;
 
@@ -219 +221 @@
  * @ingroup stringGroup
  */
-char *bkptype_to_string(t_bkptype bt)
+static char *bkptype_to_string(t_bkptype bt)
 {
     char *output = NULL;
-
-    mr_free(output);
 
     switch (bt) {
@@ -250 +250 @@
         mr_asprintf(&output, _("udev"));
         break;
+    case usb:
+        mr_asprintf(&output, _("usb"));
+        break;
     default:
         mr_asprintf(&output, _("default"));
@@ -268 +271 @@
 int eject_device(char *dev)
 {
-    char *command;
+    char *command = NULL;
     int res1 = 0, res2 = 0;
 
@@ -309 +312 @@
 int inject_device(char *dev)
 {
-    char *command;
+    char *command = NULL;
     int i;
 
@@ -337 +340 @@
 
     /*@ buffers *********************************************************** */
-    char *tmp;
-    bool ret;
+    char *tmp = NULL;
+    bool ret = FALSE;
 
     assert_string_is_neither_NULL_nor_zerolength(device);
@@ -380 +383 @@
 {
     /*@ buffers **************************************************** */
-    char *program;
+    char *program = NULL;
     char *incoming = NULL;
-    char *searchstr;
-    char *tmp;
+    char *searchstr = NULL;
+    char *tmp = NULL;
 
     /*@ ints ******************************************************* */
@@ -444 +447 @@
 {
     /*@ buffers **************************************************** */
-    char *command;
+    char *command = NULL;
 
     /*@ end vars *************************************************** */
@@ -475 +478 @@
 {
     /*@ buffers **************************************************** */
-    char *command;
+    char *command = NULL;
     /*@ end vars *************************************************** */
     int ret;
@@ -1148 +1151 @@
     /*@ buffers ***************************************************** */
     char *incoming = NULL;
-    char *device_with_tab;
-    char *device_with_space;
-    char *tmp;
+    char *device_with_tab = NULL;
+    char *device_with_space = NULL;
+    char *tmp = NULL;
     size_t n = 0;
 
@@ -1190 +1193 @@
         {
             paranoid_pclose(fin);
+            mr_free(incoming);
             return(TRUE);
         }
@@ -1232 +1236 @@
             mr_free(mddevice);
             mr_asprintf(&mddevice, "vn%ic", vndev++);
-
             mr_free(command);
             mr_asprintf(&command, "vnconfig %s %s", mddevice, fname);
@@ -1281 +1284 @@
          ("/sbin/sysctl -n kern.osreldate")) < 500000) {
         mr_asprintf(&command, "vnconfig -d %s", dname);
-        ret = system(command);
-        mr_free(command);
-        return(ret);
     } else {
         mr_asprintf(&command, "mdconfig -d -u %s", dname);
-        ret = system(command);
-        mr_free(command);
-        return(ret);
-    }
-     /*NOTREACHED*/ return 255;
+    }
+    ret = system(command);
+    mr_free(command);
+    return(ret);
 }
 #endif
@@ -1315 +1314 @@
 
     /*@ buffers ********************************************************* */
-    char *tmp;
-    char *request;
+    char *tmp = NULL;
+    char *request = NULL;
 
     assert(bkpinfo != NULL);
@@ -1328 +1327 @@
         return;
     }
-
     mr_asprintf(&tmp, "mkdir -p " MNT_CDROM);
     run_program_and_log_output(tmp, 5);
@@ -1708 +1706 @@
             mr_asprintf(&comment,
                     _("How much data (in Megabytes) will each media store?"));
-            if (!popup_and_get_string(_("Size"), comment, sz_size)) {
+            if (!popup_and_get_string(_("Size"), comment, sz_size, 5)) {
                 log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
             }
+            mr_free(comment);
             for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
                 bkpinfo->media_size[i] = atoi(sz_size);
@@ -1719 +1718 @@
                 finish(1);
             }
-            mr_free(comment);
         }
         if (bkpinfo->disaster_recovery) {
@@ -1769 +1767 @@
 
             mr_free(command);
-            mr_asprintf(&command, "echo hi > %s/%s/.dummy.txt",
-                     bkpinfo->isodir, bkpinfo->nfs_remote_dir);
+            mr_asprintf(&command, "echo hi > '%s/%s/.dummy.txt'", bkpinfo->isodir,
+                    bkpinfo->nfs_remote_dir);
         }
         mr_free(command);
@@ -1984 +1982 @@
     log_it("media size = %ld", bkpinfo->media_size[1]);
     log_it("media type = %s", bkpinfo->backup_media_string);
-    mr_free(tmp);
     log_it("prefix = %s", bkpinfo->prefix);
     log_it("compression = %ld", bkpinfo->compression_level);
@@ -2021 +2018 @@
            */
 }
-
-
 /* @} - end of utilityGroup */
+
 
 /**
@@ -2034 +2030 @@
 {
     char *tmp = NULL;
-    char *command = NULL;
-    char *sz = NULL;
+    char *command = NULL;
+    char *sz = NULL;
     int i = 0;
 
@@ -2086 +2082 @@
 bool set_dev_to_this_if_rx_OK(char *output, char *dev)
 {
-    char *command;
+    char *command = NULL;
 
     mr_free(output);
@@ -2142 +2138 @@
         mr_free(mountdev);
         mr_free(tmp);
-
         return (cd_number);
     }
@@ -2200 +2195 @@
  * @note Under Linux, all drives are examined, not just @p which_device.
  */
+char which_boot_loader(char *which_device)
+{
 #ifdef __FreeBSD__
-char which_boot_loader(char *which_device)
-{
     int count_lilos = 0;
     int count_grubs = 0;
@@ -2241 +2236 @@
         return ('U');
     }
-}
-
 #else
-
-char which_boot_loader(char *which_device)
-        /* which_device is allocated here and needs to be freed by caller */
-{
     /*@ buffer ***************************************************** */
     char *list_drives_cmd;
@@ -2310 +2299 @@
         return ('U');
     }
-}
-#endif
+#endif
+}
 
 
@@ -2435 +2424 @@
     mr_free(tmp);
     mr_msg(0, "Found %s partition table format type", output);
-    return (output);
-}
-
+    return(output);
+}
 /* @} - end of deviceGroup */