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

Timestamp:

Oct 24, 2006, 8:49:18 AM (17 years ago)

Author:

Bruno Cornec

Message:

Huge patch to introduce low level functions that will bw used everywhere (mr_free, mr_asprintf, ...)
Nearly linking now due to that.

File:

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

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

@@ -14 +14 @@
 #include <pthread.h>
 #endif
+#include "mr_mem.h"
 
 extern int g_loglevel;
@@ -82 +83 @@
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
-            asprintf(&tmp, "-%c %s", i, flag_val[i]);
+            mr_asprintf(&tmp, "-%c %s", i, flag_val[i]);
             log_msg(3, tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
     }
 //    }
-    asprintf(&tmp, "rm -Rf %s/mondo.tmp.*", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "rm -Rf %s/mondo.tmp.*", bkpinfo->tmpdir);
     paranoid_system(tmp);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
     paranoid_system(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     /* BERLIOS : Useless ???
@@ -103 +104 @@
     */
 
-    asprintf(&tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
     paranoid_system(tmp);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "mkdir -p %s", bkpinfo->scratchdir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "mkdir -p %s", bkpinfo->scratchdir);
     paranoid_system(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (bkpinfo->nfs_mount != NULL) {
@@ -139 +140 @@
     for (j = 1, p = value; j < MAX_NOOF_MEDIA && strchr(p, ',');
          j++, p = strchr(p, ',') + 1) {
-        asprintf(&tmp, p);
+        mr_asprintf(&tmp, p);
         q = strchr(tmp, ',');
         if (q != NULL) {
@@ -145 +146 @@
         }
         bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(tmp);
-        paranoid_free(tmp);
-
-        asprintf(&comment, "media_size[%d] = %ld", j,
+        mr_free(tmp);
+
+        mr_asprintf(&comment, "media_size[%d] = %ld", j,
                 bkpinfo->media_size[j]);
         log_msg(3, comment);
-        paranoid_free(comment);
+        mr_free(comment);
     }
     for (; j <= MAX_NOOF_MEDIA; j++) {
@@ -245 +246 @@
         }
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (flag_set['R']) {
@@ -257 +258 @@
         }
     }
-    paranoid_free(tmp1);
+    mr_free(tmp1);
 
     if (flag_set['W']) {
@@ -276 +277 @@
             bkpinfo->include_paths = NULL;
         }
-        asprintf(&tmp1, flag_val['I']);
+        mr_asprintf(&tmp1, flag_val['I']);
         p = tmp1;
         q = tmp1;
@@ -298 +299 @@
             }
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
 
         if (bkpinfo->include_paths == NULL) {
-            asprintf(&tmp1, "%s", flag_val['I']);
+            mr_asprintf(&tmp1, "%s", flag_val['I']);
         } else {
-            asprintf(&tmp1, "%s %s", bkpinfo->include_paths, flag_val['I']);
-        }
-        paranoid_alloc(bkpinfo->include_paths,tmp1);
-        paranoid_free(tmp1);
+            mr_asprintf(&tmp1, "%s %s", bkpinfo->include_paths, flag_val['I']);
+        }
+        mr_allocstr(bkpinfo->include_paths,tmp1);
+        mr_free(tmp1);
 
         log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
@@ -328 +329 @@
         }
         bkpinfo->make_filelist = FALSE;
-        paranoid_alloc(bkpinfo->include_paths, flag_val['J']);
+        mr_allocstr(bkpinfo->include_paths, flag_val['J']);
     }
 
@@ -384 +385 @@
         }
         flag_set['d'] = TRUE;
-        paranoid_free(tmp); // allocation from find_tape_device_and_size
-
-        asprintf(&tmp,
+        mr_free(tmp); // allocation from find_tape_device_and_size
+
+        mr_asprintf(&tmp,
                 _("You didn't specify a tape streamer device. I'm assuming %s"),
                 flag_val['d']);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         percent = 0;
     }
@@ -412 +413 @@
         }
         if (!flag_set['s']) {
-            asprintf(&flag_val['s'], "%dm", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4582 MB
+            mr_asprintf(&flag_val['s'], "%dm", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4582 MB
             log_to_screen
                 (_("You did not specify a size (-s) for DVD. I'm guessing %s."),
@@ -454 +455 @@
     }
     if (flag_set['n']) {
-        paranoid_alloc(bkpinfo->nfs_mount,flag_val['n']);
+        mr_allocstr(bkpinfo->nfs_mount,flag_val['n']);
         if (!flag_set['d']) {
-            paranoid_alloc(bkpinfo->nfs_remote_dir,"/");
-        }
-        asprintf(&tmp, "mount | grep -x \"%s .*\" | cut -d' ' -f3",
+            mr_allocstr(bkpinfo->nfs_remote_dir,"/");
+        }
+        mr_asprintf(&tmp, "mount | grep -x \"%s .*\" | cut -d' ' -f3",
                 bkpinfo->nfs_mount);
-        paranoid_free(bkpinfo->isodir);
+        mr_free(bkpinfo->isodir);
         bkpinfo->isodir = call_program_and_get_last_line_of_output(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (strlen(bkpinfo->isodir) < 3) {
@@ -503 +504 @@
 
     if (flag_set['E']) {
-        asprintf(&tmp1, flag_val['E']);
+        mr_asprintf(&tmp1, flag_val['E']);
         p = tmp1;
         q = tmp1;
@@ -531 +532 @@
             }
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
 
         if (bkpinfo->exclude_paths == NULL) {
-            asprintf(&tmp1, "%s", flag_val['E']);
+            mr_asprintf(&tmp1, "%s", flag_val['E']);
         } else {
-            asprintf(&tmp1, "%s %s", bkpinfo->exclude_paths, flag_val['E']);
-        }
-        paranoid_alloc(bkpinfo->exclude_paths,tmp1);
-        paranoid_free(tmp1);
+            mr_asprintf(&tmp1, "%s %s", bkpinfo->exclude_paths, flag_val['E']);
+        }
+        mr_allocstr(bkpinfo->exclude_paths,tmp1);
+        mr_free(tmp1);
     }
 
@@ -550 +551 @@
         psz = list_of_NFS_mounts_only();
         if (bkpinfo->exclude_paths != NULL) {
-            asprintf(&tmp1, "%s %s", bkpinfo->exclude_paths, psz);
+            mr_asprintf(&tmp1, "%s %s", bkpinfo->exclude_paths, psz);
         } else {
-            asprintf(&tmp1, "%s", psz);
-        }
-        paranoid_free(psz);
-        paranoid_alloc(bkpinfo->exclude_paths, tmp1);
-        paranoid_free(tmp1);
+            mr_asprintf(&tmp1, "%s", psz);
+        }
+        mr_free(psz);
+        mr_allocstr(bkpinfo->exclude_paths, tmp1);
+        mr_free(tmp1);
 
         log_msg(3, "-N means we're now excluding %s",
@@ -563 +564 @@
 
     if (flag_set['b']) {
-        asprintf(&psz, flag_val['b']);
+        mr_asprintf(&psz, flag_val['b']);
         log_msg(1, "psz = '%s'", psz);
         if (psz[strlen(psz) - 1] == 'k') {
@@ -571 +572 @@
             itbs = atol(psz);
         }
-        paranoid_free(psz);
+        mr_free(psz);
 
         log_msg(1, "'%s' --> %ld", flag_val['b'], itbs);
@@ -592 +593 @@
 
     if (flag_set['x']) {
-        paranoid_alloc(bkpinfo->image_devs,flag_val['x']);
+        mr_allocstr(bkpinfo->image_devs,flag_val['x']);
         if (run_program_and_log_output("which ntfsclone", 2)) {
             fatal_error("Please install ntfsprogs package/tarball.");
@@ -604 +605 @@
     if (flag_set['k']) {
         if (strcasecmp(flag_val['k'], "FAILSAFE")) {
-            paranoid_alloc(bkpinfo->kernel_path,"FAILSAFE");
+            mr_allocstr(bkpinfo->kernel_path,"FAILSAFE");
 
             if (!does_file_exist(bkpinfo->kernel_path)) {
                 retval++;
-                asprintf(&tmp,
+                mr_asprintf(&tmp,
                     _("You specified kernel '%s', which does not exist\n"),
                     bkpinfo->kernel_path);
                 log_to_screen(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
             }
         } else {
-            paranoid_alloc(bkpinfo->kernel_path,flag_val['k']);
+            mr_allocstr(bkpinfo->kernel_path,flag_val['k']);
         }
     }
 
     if (flag_set['p']) {
-        paranoid_alloc(bkpinfo->prefix,flag_val['p']);
+        mr_allocstr(bkpinfo->prefix,flag_val['p']);
     }
 
     if (flag_set['d']) {        /* backup directory (if ISO/NFS) */
         if (flag_set['i']) {
-            paranoid_alloc(bkpinfo->isodir,flag_val['d']);
-            asprintf(&tmp, "ls -l %s", bkpinfo->isodir);
+            mr_allocstr(bkpinfo->isodir,flag_val['d']);
+            mr_asprintf(&tmp, "ls -l %s", bkpinfo->isodir);
             if (run_program_and_log_output(tmp, FALSE)) {
                 fatal_error
                     ("output folder does not exist - please create it");
             }
-            paranoid_free(tmp);
+            mr_free(tmp);
         } else if (flag_set['n']) {
-            paranoid_alloc(bkpinfo->nfs_remote_dir,flag_val['d']);
+            mr_allocstr(bkpinfo->nfs_remote_dir,flag_val['d']);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
 
-            paranoid_alloc(bkpinfo->media_device, flag_val['d']);
+            mr_allocstr(bkpinfo->media_device, flag_val['d']);
         }
     }
 
     if (flag_set['n']) {
-        asprintf(&tmp, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
+        mr_asprintf(&tmp, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
                 bkpinfo->nfs_remote_dir);
         if (run_program_and_log_output(tmp, FALSE)) {
             retval++;
-            paranoid_free(tmp);
-            asprintf(&tmp,
+            mr_free(tmp);
+            mr_asprintf(&tmp,
                     _("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);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
 
@@ -664 +665 @@
             }
         } else if ((tmp = find_cdrw_device()) ==  NULL) {
-            paranoid_alloc(bkpinfo->media_device, tmp);
-            paranoid_free(tmp);
+            mr_allocstr(bkpinfo->media_device, tmp);
+            mr_free(tmp);
             retval++;
             log_to_screen
@@ -671 +672 @@
         } else {
             flag_set['d'] = TRUE;
-            asprintf(&flag_val['d'], bkpinfo->media_device);
+            mr_asprintf(&flag_val['d'], bkpinfo->media_device);
         }
     }
@@ -689 +690 @@
     j = (int) random() % 32768;
     if (flag_set['S']) {
-        asprintf(&tmp, "%s/mondo.scratch.%d", flag_val['S'], j);
-        paranoid_free(bkpinfo->scratchdir);
+        mr_asprintf(&tmp, "%s/mondo.scratch.%d", flag_val['S'], j);
+        mr_free(bkpinfo->scratchdir);
         bkpinfo->scratchdir = tmp;
     }
     if (flag_set['T']) {
-        asprintf(&tmp, "%s/mondo.tmp.%d", flag_val['T'], j);
-        paranoid_free(bkpinfo->tmpdir);
+        mr_asprintf(&tmp, "%s/mondo.tmp.%d", flag_val['T'], j);
+        mr_free(bkpinfo->tmpdir);
         bkpinfo->tmpdir = tmp;
-        asprintf(&tmp, "touch %s/.foo.dat", flag_val['T']);
+        mr_asprintf(&tmp, "touch %s/.foo.dat", flag_val['T']);
         if (run_program_and_log_output(tmp, 1)) {
             retval++;
@@ -704 +705 @@
             fatal_error("I cannot write to the tempdir you specified.");
         }
-        paranoid_free(tmp);
-
-        asprintf(&tmp, "ln -sf %s/.foo.dat %s/.bar.dat", flag_val['T'],
+        mr_free(tmp);
+
+        mr_asprintf(&tmp, "ln -sf %s/.foo.dat %s/.bar.dat", flag_val['T'],
                 flag_val['T']);
         if (run_program_and_log_output(tmp, 1)) {
@@ -714 +715 @@
             fatal_error("I cannot write to the tempdir you specified.");
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
 
     if (flag_set['A']) {
-        paranoid_alloc(bkpinfo->call_after_iso,flag_val['A']);
+        mr_allocstr(bkpinfo->call_after_iso,flag_val['A']);
     }
     if (flag_set['B']) {
-        paranoid_alloc(bkpinfo->call_before_iso,flag_val['B']);
+        mr_allocstr(bkpinfo->call_before_iso,flag_val['B']);
     }
     if (flag_set['F']) {
@@ -753 +754 @@
     if (flag_set['f']) {
         tmp = resolve_softlinks_to_get_to_actual_device_file(flag_val['f']);
-        paranoid_alloc(bkpinfo->boot_device,tmp);
+        mr_allocstr(bkpinfo->boot_device,tmp);
     }
     if (flag_set['Q']) {
@@ -763 +764 @@
         log_msg(3, "boot loader is %c, residing at %s", i, tmp);
         printf(_("boot loader is %c, residing at %s\n"), i, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         finish(0);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (flag_set['P']) {
-        paranoid_alloc(bkpinfo->postnuke_tarball,flag_val['P']);
+        mr_allocstr(bkpinfo->postnuke_tarball,flag_val['P']);
     }
 
@@ -883 +884 @@
             if (flag_set[optopt]) {
                 bad_switches = TRUE;
-                asprintf(&tmp, _("Switch -%c previously defined as %s\n"), opt,
+                mr_asprintf(&tmp, _("Switch -%c previously defined as %s\n"), opt,
                         flag_val[i]);
                 log_to_screen(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
             } else {
                 flag_set[opt] = TRUE;
@@ -900 +901 @@
                         if (strchr(flag_val[opt], '/')
                             && flag_val[opt][0] != '/') {
-                            asprintf(&tmp,
+                            mr_asprintf(&tmp,
                                     _("-%c flag --- must be absolute path --- '%s' isn't absolute"),
                                     opt, flag_val[opt]);
                             log_to_screen(tmp);
-                            paranoid_free(tmp);
+                            mr_free(tmp);
                             bad_switches = TRUE;
                         }
                     }
-                    asprintf(&flag_val[opt], optarg);
+                    mr_asprintf(&flag_val[opt], optarg);
                 }
             }
@@ -915 +916 @@
     for (i = optind; i < argc; i++) {
         bad_switches = TRUE;
-        asprintf(&tmp, _("Invalid arg -- %s\n"), argv[i]);
+        mr_asprintf(&tmp, _("Invalid arg -- %s\n"), argv[i]);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     return (bad_switches);
@@ -946 +947 @@
     switch (sig) {
     case SIGINT:
-        asprintf(&tmp, _("SIGINT signal received from OS"));
-        asprintf(&tmp2, _("You interrupted me :-)"));
+        mr_asprintf(&tmp, _("SIGINT signal received from OS"));
+        mr_asprintf(&tmp2, _("You interrupted me :-)"));
         break;
     case SIGKILL:
-        asprintf(&tmp, _("SIGKILL signal received from OS"));
-        asprintf(&tmp2,
+        mr_asprintf(&tmp, _("SIGKILL signal received from OS"));
+        mr_asprintf(&tmp2,
                _("I seriously have no clue how this signal even got to me. Something's wrong with your system."));
         break;
     case SIGTERM:
-        asprintf(&tmp, _("SIGTERM signal received from OS"));
-        asprintf(&tmp2, _("Got terminate signal"));
+        mr_asprintf(&tmp, _("SIGTERM signal received from OS"));
+        mr_asprintf(&tmp2, _("Got terminate signal"));
         break;
     case SIGHUP:
-        asprintf(&tmp, _("SIGHUP signal received from OS"));
-        asprintf(&tmp2, _("Hangup on line"));
+        mr_asprintf(&tmp, _("SIGHUP signal received from OS"));
+        mr_asprintf(&tmp2, _("Hangup on line"));
         break;
     case SIGSEGV:
-        asprintf(&tmp, _("SIGSEGV signal received from OS"));
-        asprintf(&tmp2,
+        mr_asprintf(&tmp, _("SIGSEGV signal received from OS"));
+        mr_asprintf(&tmp2,
                _("Internal programming error. Please send a backtrace as well as your log."));
         break;
     case SIGPIPE:
-        asprintf(&tmp, _("SIGPIPE signal received from OS"));
-        asprintf(&tmp2, _("Pipe was broken"));
+        mr_asprintf(&tmp, _("SIGPIPE signal received from OS"));
+        mr_asprintf(&tmp2, _("Pipe was broken"));
         break;
     case SIGABRT:
-        asprintf(&tmp, _("SIGABRT signal received from OS"));
-        asprintf(&tmp2,
+        mr_asprintf(&tmp, _("SIGABRT signal received from OS"));
+        mr_asprintf(&tmp2,
                 _("Abort - probably failed assertion. I'm sleeping for a few seconds so you can read the message."));
         break;
     default:
-        asprintf(&tmp, _("(Unknown)"));
-        asprintf(&tmp2, _("(Unknown)"));
+        mr_asprintf(&tmp, _("(Unknown)"));
+        mr_asprintf(&tmp2, _("(Unknown)"));
     }
 
     log_to_screen(tmp);
     log_to_screen(tmp2);
-    paranoid_free(tmp);
-    paranoid_free(tmp2);
+    mr_free(tmp);
+    mr_free(tmp2);
     if (sig == SIGABRT) {
         sleep(10);