Changeset 2330 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-cli.c

Timestamp:

Aug 18, 2009, 3:20:49 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3341@localhost: bruno | 2009-08-13 22:36:24 +0200

• Replacement of some strcpy
• Change allocation done in resolve_softlinks_to_get_to_actual_device_file(), where_is_root_mounted(), bkptype_to_string(), which_boot_loader()

File:

• branches/2.2.10/mondo/src/common/libmondo-cli.c (modified) (3 diffs)

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

@@ -908 +908 @@
         }
         if (!flag_set['d']) {
-            if ((tmp = find_dvd_device(flag_val['d'])) != NULL) {
-                strcpy(flag_val['d'],tmp);
-                mr_free(tmp);
+            if ((tmp1 = find_dvd_device(flag_val['d'])) != NULL) {
+                strcpy(flag_val['d'],tmp1);
+                mr_free(tmp1);
                 flag_set['d'] = TRUE;
                 log_to_screen("I guess DVD drive is at %s", flag_val['d']);
@@ -1323 +1323 @@
     if (flag_set['f']) {
         mr_free(bkpinfo->boot_device);
-        mr_asprintf(bkpinfo->boot_device, "%s", resolve_softlinks_to_get_to_actual_device_file(flag_val['f']));
+        bkpinfo->boot_device = resolve_softlinks_to_get_to_actual_device_file(flag_val['f']);
     }
 
@@ -1332 +1332 @@
 
     if (flag_set['Q']) {
-        i = which_boot_loader(tmp);
-        log_msg(3, "boot loader is %c, residing at %s", i, tmp);
-        printf("boot loader is %c, residing at %s\n", i, tmp);
+        i = which_boot_loader(tmp1);
+        log_msg(3, "boot loader is %c, residing at %s", i, tmp1);
+        printf("boot loader is %c, residing at %s\n", i, tmp1);
+        mr_free(tmp1);
         finish(0);
     }