Changeset 2316 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-files.c

Timestamp:

Aug 18, 2009, 2:34:29 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3327@localhost: bruno | 2009-08-04 00:17:46 +0200
popup_and_get_string and build_partition_name now return an allocated string

File:

• branches/2.2.10/mondo/src/common/libmondo-files.c (modified) (2 diffs)

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

@@ -306 +306 @@
             return (1);
         }
-        if (!popup_and_get_string
-            ("Kernel path",
-             "What is the full path and filename of your kernel, please?",
-             kernel, MAX_STR_LEN / 4)) {
-            fatal_error
-                ("Kernel not found. Please specify with the '-k' flag.");
-        }
-        mr_asprintf(&tmp, "User says kernel is at %s", kernel);
-        log_it(tmp);
+        tmp = popup_and_get_string("Kernel path", "What is the full path and filename of your kernel, please?", kernel);
+        if (tmp == NULL) {
+            fatal_error("Kernel not found. Please specify with the '-k' flag.");
+        }
+        strcpy(kernel, tmp);
         mr_free(tmp);
+
+        log_it("User says kernel is at %s", kernel);
     }
     return (0);
@@ -1184 +1182 @@
     }
 
-    mr_asprintf(tmp, "%s/NFS-DEV", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/NFS-DEV", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_dev);
     mr_free(nfs_dev);
     mr_free(tmp);
 
-    mr_asprintf(tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_ipaddr);
     mr_free(nfs_client_ipaddr);
     mr_free(tmp);
 
-    mr_asprintf(tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_netmask);
     mr_free(nfs_client_netmask);
     mr_free(tmp);
 
-    mr_asprintf(tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_broadcast);
     mr_free(nfs_client_broadcast);
     mr_free(tmp);
 
-    mr_asprintf(tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_defgw);
     mr_free(nfs_client_defgw);
     mr_free(tmp);
 
-    mr_asprintf(tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_server_ipaddr);
     mr_free(tmp);
     mr_free(nfs_server_ipaddr);
 
-    mr_asprintf(tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->nfs_mount);
     mr_free(tmp);
     mr_free(nfs_mount);
 
-    mr_asprintf(tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->nfs_remote_dir);
     mr_free(tmp);
 
-    mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->prefix);
     mr_free(tmp);