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

Timestamp:

Aug 18, 2009, 5:28:18 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3369@localhost: bruno | 2009-08-18 16:57:27 +0200

• Transform bout 100 strcpy in dyn. allocation. Quality is improving
• function figure_out_kernel_path_interactively_if_necessary now return a dynamically allocated string
• mondoarchive checked with valgrind in text an newt modes

File:

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

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

@@ -886 +886 @@
     if ((flag_set['t'] && !flag_set['d']) && (! bkpinfo->restore_data)) {
         log_it("Hmm! No tape drive specified. Let's see what we can do.");
-        if ((tmp1 = find_tape_device_and_size(NULL)) == NULL) {
+        if ((tmp1 = mr_find_tape_device()) == NULL) {
             fatal_error("Tape device not specified. I couldn't find it either.");
         }
@@ -1191 +1191 @@
 
     if (flag_set['x']) {
-        mr_asprintf(bkpinfo->image_devs, flag_val['x']);
+        mr_asprintf(bkpinfo->image_devs, "%s", flag_val['x']);
         if ((run_program_and_log_output("which ntfsclone", 2)) && (! bkpinfo->restore_data)) {
             fatal_error("Please install ntfsprogs package/tarball.");
@@ -1202 +1202 @@
 
     if ((flag_set['k']) && (! bkpinfo->restore_data)) {
+        mr_free(bkpinfo->kernel_path);
         mr_asprintf(bkpinfo->kernel_path, "%s", flag_val['k']);
         if (!strcmp(bkpinfo->kernel_path, "failsafe")) {
@@ -1552 +1553 @@
     case SIGKILL:
         mr_asprintf(tmp, "SIGKILL");
-        mr_asprintf(tmp2,
-               "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
+        mr_asprintf(tmp2, "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
         break;
     case SIGTERM:
@@ -1565 +1565 @@
     case SIGSEGV:
         mr_asprintf(tmp, "SIGSEGV");
-        mr_asprintf(tmp2,
-               "Internal programming error. Please send a backtrace as well as your log.");
+        mr_asprintf(tmp2, "Internal programming error. Please send a backtrace as well as your log.");
         break;
     case SIGPIPE: