Changeset 2009 in MondoRescue for trunk/mondo/src/mondoarchive/mondo-cli.c

Timestamp:

Aug 11, 2008, 3:05:15 AM (16 years ago)

Author:

Bruno Cornec

Message:

Commit ald modifs in trunk - just in case

File:

• trunk/mondo/src/mondoarchive/mondo-cli.c (modified) (16 diffs)

trunk/mondo/src/mondoarchive/mondo-cli.c

@@ -140 +140 @@
 {
     int j;
-    char *tmp;
-    char *p;
-    char *q;
-    char *comment;
+    char *tmp = NULL;
+    char *p = NULL;
+    char *q = NULL;
 
     assert(bkpinfo != NULL);
@@ -159 +158 @@
         mr_free(tmp);
 
-        mr_asprintf(&comment, "media_size[%d] = %ld", j,
+        mr_msg(3, "media_size[%d] = %ld", j,
                 bkpinfo->media_size[j]);
-        mr_msg(3, comment);
-        mr_free(comment);
     }
     for (; j <= MAX_NOOF_MEDIA; j++) {
@@ -201 +198 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
+    char *tmp2 = NULL;
     char *psz = NULL;
     char *p = NULL;
@@ -398 +396 @@
         mr_free(tmp); // allocation from find_tape_device_and_size
 
-        mr_asprintf(&tmp,
+        mr_asprintf(&tmp2,
                 _("You didn't specify a tape streamer device. I'm assuming %s"),
                 flag_val['d']);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen(tmp2);
+        mr_free(tmp2);
         percent = 0;
     }
@@ -481 +479 @@
             mr_allocstr(bkpinfo->nfs_remote_dir,"/");
         }
-        mr_asprintf(&tmp, "mount | grep -E '^%s .*$' | cut -d' ' -f3",
+        mr_asprintf(&tmp2, "mount | grep -E '^%s .*$' | cut -d' ' -f3",
                 bkpinfo->nfs_mount);
         mr_free(bkpinfo->isodir);
-        bkpinfo->isodir = call_program_and_get_last_line_of_output(tmp);
-        mr_free(tmp);
+        bkpinfo->isodir = call_program_and_get_last_line_of_output(tmp2);
+        mr_free(tmp2);
 
         if (strlen(bkpinfo->isodir) < 3) {
@@ -642 +640 @@
             if (!does_file_exist(bkpinfo->kernel_path)) {
                 retval++;
-                mr_asprintf(&tmp,
+                mr_asprintf(&tmp2,
                     _("You specified kernel '%s', which does not exist\n"),
                     bkpinfo->kernel_path);
-                log_to_screen(tmp);
-                mr_free(tmp);
+                log_to_screen(tmp2);
+                mr_free(tmp2);
             }
         } else {
@@ -660 +658 @@
         if (flag_set['i']) {
             mr_allocstr(bkpinfo->isodir,flag_val['d']);
-            mr_asprintf(&tmp, "ls -l %s", bkpinfo->isodir);
-            if (run_program_and_log_output(tmp, FALSE)) {
+            mr_asprintf(&tmp2, "ls -l %s", bkpinfo->isodir);
+            if (run_program_and_log_output(tmp2, FALSE)) {
                 fatal_error
                     ("output folder does not exist - please create it");
             }
-            mr_free(tmp);
+            mr_free(tmp2);
         } else if (flag_set['n']) {
             mr_allocstr(bkpinfo->nfs_remote_dir,flag_val['d']);
@@ -674 +672 @@
 
     if (flag_set['n']) {
-        mr_asprintf(&tmp, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
+        mr_asprintf(&tmp2, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
                 bkpinfo->nfs_remote_dir);
-        if (run_program_and_log_output(tmp, FALSE)) {
+        if (run_program_and_log_output(tmp2, FALSE)) {
             retval++;
-            mr_free(tmp);
-            mr_asprintf(&tmp,
+            mr_free(tmp2);
+            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(tmp);
-        }
-        mr_free(tmp);
+            log_to_screen(tmp2);
+        }
+        mr_free(tmp2);
     }
 
@@ -730 +728 @@
         mr_free(bkpinfo->tmpdir);
         bkpinfo->tmpdir = tmp;
-        mr_asprintf(&tmp, "touch %s/.foo.dat", flag_val['T']);
-        if (run_program_and_log_output(tmp, 1)) {
+        mr_asprintf(&tmp2, "touch %s/.foo.dat", flag_val['T']);
+        if (run_program_and_log_output(tmp2, 1)) {
             retval++;
             log_to_screen
@@ -737 +735 @@
             fatal_error("I cannot write to the tempdir you specified.");
         }
-        mr_free(tmp);
-
-        mr_asprintf(&tmp, "ln -sf %s/.foo.dat %s/.bar.dat", flag_val['T'],
+        mr_free(tmp2);
+
+        mr_asprintf(&tmp2, "ln -sf %s/.foo.dat %s/.bar.dat", flag_val['T'],
                 flag_val['T']);
-        if (run_program_and_log_output(tmp, 1)) {
+        if (run_program_and_log_output(tmp2, 1)) {
             retval++;
             log_to_screen
@@ -747 +745 @@
             fatal_error("I cannot write to the tempdir you specified.");
         }
-        mr_free(tmp);
+        mr_free(tmp2);
     }
 
@@ -788 +786 @@
         mr_allocstr(bkpinfo->boot_device,tmp);
     }
+
     if (flag_set['Q']) {
-        if (tmp == NULL) {
-            printf("-f option required when using -Q\n");
-            finish(-1);
-        }
-        i = which_boot_loader(tmp);
-        mr_msg(3, "boot loader is %c, residing at %s", i, tmp);
-        printf(_("boot loader is %c, residing at %s\n"), i, tmp);
-        mr_free(tmp);
+        if (bkpinfo->boot_device == NULL) {
+            fatal_error("-f option required when using -Q\n");
+        }
+        i = which_boot_loader(bkpinfo->boot_device);
+        mr_msg(3, "boot loader is %c, residing at %s", i, bkpinfo->boot_device);
+        log_to_screen(_("boot loader is %c, residing at %s\n"), i, tmp);
         finish(0);
     }
-    mr_free(tmp);
 
     if (flag_set['P']) {
@@ -880 +876 @@
     return (retval);
 }
-
 
 
@@ -901 +896 @@
     /*@ ints ** */
     int opt = 0;
-    char *tmp;
+    char *tmp = NULL;
     int i = 0;
-    int len;
+    int len = 0;
 
     /*@ bools *** */
@@ -965 +960 @@
 
 
-
-
 /**
  * Print a not-so-helpful help message and exit.
  */
-void help_screen()
+void help_screen(void)
 {
     mr_msg(1, "Type 'man mondo-archive' for more information\n");
@@ -983 +976 @@
 void terminate_daemon(int sig)
 {
-    char *tmp;
-    char *tmp2;
+    char *tmp = NULL;
+    char *tmp2 = NULL;
 
     switch (sig) {