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

Timestamp:

Aug 18, 2009, 3:13:54 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3335@localhost: bruno | 2009-08-08 23:04:12 +0200

• Change mr_asprintf to avoid the need of pointer and be consistent with the other mr_mem functions

File:

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

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

@@ -111 +111 @@
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
-            mr_asprintf(tmp, "-%c %s", i, flag_val[i]);
-            log_msg(3, tmp);
-            mr_free(tmp);
+            log_msg(3, "-%c %s", i, flag_val[i]);
         }
     }
@@ -150 +148 @@
     int j;
     char tmp[MAX_STR_LEN], *p; 
-    char *comment = NULL;
 
     assert(bkpinfo != NULL);
@@ -161 +158 @@
         *(strchr(tmp, ',')) = '\0';
         bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(tmp);
-        mr_asprintf(comment, "media_size[%d] = %ld", j, bkpinfo->media_size[j]);
-        log_msg(3, comment);
-        mr_free(comment);
+        log_msg(3, "media_size[%d] = %ld", j, bkpinfo->media_size[j]);
     }
     for (; j <= MAX_NOOF_MEDIA; j++) {
@@ -837 +832 @@
         }
         bkpinfo->make_filelist = FALSE;
-        mr_asprintf(p, "%s", flag_val['J']);
-        mr_free(bkpinfo->include_paths);
-        bkpinfo->include_paths = p;
+        mr_asprintf(bkpinfo->include_paths, "%s", flag_val['J']);
     }
 
@@ -878 +871 @@
             log_msg(3, "flag_val['c'] = %s", flag_val['c']);
             log_msg(3, "flag_val['w'] = %s", flag_val['w']);
-//    log_msg(3, "flag_set['r'] = %i", flag_set['r'] );
+            // log_msg(3, "flag_set['r'] = %i", flag_set['r'] );
             if (flag_set['c']) {
                 bkpinfo->cdrw_speed = atoi(flag_val['c']);
@@ -902 +895 @@
         flag_set['d'] = TRUE;
         strcpy(flag_val['d'], p);
-        mr_free(p);
-        mr_asprintf(tmp1, "You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']);
-        log_to_screen(tmp1);
-        mr_free(tmp1);
+        log_to_screen("You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']);
         percent = 0;
     }
@@ -1004 +994 @@
             p--;
             *p = '\0';
-            mr_asprintf(q,"%s",bkpinfo->nfs_mount);
-            bkpinfo->nfs_user = q;
+            mr_asprintf(bkpinfo->nfs_user,"%s",p);
             strcpy(bkpinfo->nfs_mount,tmp);
         }
         mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->nfs_mount);
         mr_free(bkpinfo->isodir);
-        mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
-        bkpinfo->isodir = tmp2;
+        mr_asprintf(bkpinfo->isodir, "%s", call_program_and_get_last_line_of_output(tmp1));
         mr_free(tmp1);
 
@@ -1025 +1013 @@
                 mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->nfs_mount);
                 mr_free(bkpinfo->isodir);
-                mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
-                bkpinfo->isodir = tmp2;
+                mr_asprintf(bkpinfo->isodir, "%s", call_program_and_get_last_line_of_output(tmp1));
                 mr_free(tmp1);
 
@@ -1213 +1200 @@
             && !does_file_exist(bkpinfo->kernel_path)) {
             retval++;
-            mr_asprintf(tmp1, "You specified kernel '%s', which does not exist\n", bkpinfo->kernel_path);
-            log_to_screen(tmp1);
-            mr_free(tmp1);
+            log_to_screen("You specified kernel '%s', which does not exist\n", bkpinfo->kernel_path);
         }
     }
@@ -1221 +1206 @@
     if (flag_set['p']) {
         mr_free(bkpinfo->prefix);
-        mr_asprintf(tmp1, "%s", flag_val['p']);
-        bkpinfo->prefix = tmp1;
+        mr_asprintf(bkpinfo->prefix, "%s", flag_val['p']);
         log_msg(1,"Prefix forced to %s",bkpinfo->prefix);
     }
@@ -1229 +1213 @@
         if (flag_set['i']) {
             mr_free(bkpinfo->isodir);
-            mr_asprintf(tmp2, "%s", flag_val['d']);
-            bkpinfo->isodir = tmp2;
+            mr_asprintf(bkpinfo->isodir, "%s", flag_val['d']);
             mr_asprintf(tmp1, "ls -l %s", bkpinfo->isodir);
             if (run_program_and_log_output(tmp1, 2)) {
@@ -1256 +1239 @@
         if (i) {
             retval++;
-            mr_asprintf(tmp2, "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
-            log_to_screen(tmp2);
-            mr_free(tmp2);
+            log_to_screen(tmp2, "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
         }
         unlink(tmp1);
@@ -1297 +1278 @@
 
     if (flag_set['S']) {
-        mr_asprintf(tmp1, "%s/mondo.scratch.%ld", flag_val['S'], random() % 32768);
-        mr_free(bkpinfo->scratchdir);
-        bkpinfo->scratchdir = tmp1;
+        mr_asprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%ld", flag_val['S'], random() % 32768);
     }
 
@@ -1510 +1489 @@
             if (flag_set[opt]) {
                 bad_switches = TRUE;
-                mr_asprintf(tmp, "Switch -%c previously defined as %s\n", opt, flag_val[opt]);
-                log_to_screen(tmp);
-                mr_free(tmp);
+                log_to_screen("Switch -%c previously defined as %s\n", opt, flag_val[opt]);
             } else {
                 flag_set[opt] = TRUE;
@@ -1526 +1503 @@
                         if (strchr(flag_val[opt], '/')
                             && flag_val[opt][0] != '/') {
-                            mr_asprintf(tmp, "-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
-                            log_to_screen(tmp);
-                            mr_free(tmp);
+                            log_to_screen("-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
                             bad_switches = TRUE;
                         }
@@ -1539 +1514 @@
     for (i = optind; i < argc; i++) {
         bad_switches = TRUE;
-        mr_asprintf(tmp, "Invalid arg -- %s\n", argv[i]);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("Invalid arg -- %s\n", argv[i]);
     }
     return (bad_switches);
@@ -1615 +1588 @@
     free_MR_global_filenames();
 
-    fatal_error
-        ("MondoRescue is terminating in response to a signal from the OS");
+    fatal_error("MondoRescue is terminating in response to a signal from the OS");
     finish(254);                // just in case
 }
@@ -1629 +1601 @@
 void set_signals(int on)
 {
-    int signals[] =
-        { SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT, SIGKILL, SIGSTOP, 0 };
+    int signals[] = { SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT, SIGKILL, SIGSTOP, 0 };
     int i;