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

Timestamp:

Oct 24, 2006, 8:49:18 AM (18 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/main.c (modified) (10 diffs)

trunk/mondo/src/mondoarchive/main.c

@@ -21 +21 @@
 #include "../common/libmondo.h"
 #include "mondo-cli-EXT.h"
+
+#include "mr_mem.h"
 
 // for CVS
@@ -185 +187 @@
 
     /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
-    asprintf(&tmp, "/sbin:/usr/sbin:%s:/usr/local/sbin", getenv("PATH"));
+    mr_asprintf(&tmp, "/sbin:/usr/sbin:%s:/usr/local/sbin", getenv("PATH"));
     setenv("PATH", tmp, 1);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     /* Add the ARCH environment variable for ia64 purposes */
@@ -236 +238 @@
         turn_wildcard_chars_into_literal_chars(tmp, argv[2]);
         printf("in=%s; out=%s\n", argv[2], tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         finish(1);
     }
@@ -268 +270 @@
             printf(_("CD-RW is at %s\n"), tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if ((tmp = find_cdrom_device(FALSE)) == NULL) {
@@ -275 +277 @@
             printf(_("CD-ROM is at %s\n"), tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
         finish(0);
     }
@@ -288 +290 @@
             printf(_("DVD is at %s\n"), tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
         finish(0);
     }
@@ -345 +347 @@
         retval += res;
         if (res) {
-            asprintf(&say_at_end,
+            mr_asprintf(&say_at_end,
                    _("Data archived. Please check the logs, just as a precaution. "));
         } else {
-            asprintf(&say_at_end, _("Data archived OK. "));
+            mr_asprintf(&say_at_end, _("Data archived OK. "));
         }
     }
@@ -356 +358 @@
         res = verify_data(bkpinfo);
         if (res < 0) {
-            asprintf(&say_at_end, _("%d difference%c found."), -res,
+            mr_asprintf(&say_at_end, _("%d difference%c found."), -res,
                     (-res != 1) ? 's' : ' ');
             res = 0;
@@ -399 +401 @@
     }
     log_to_screen(say_at_end);
-    paranoid_free(say_at_end);
-
-    asprintf(&tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
+    mr_free(say_at_end);
+
+    mr_asprintf(&tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
     run_program_and_log_output(tmp, TRUE);
-    paranoid_free(tmp);
-
-    asprintf(&g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir,
+    mr_free(tmp);
+
+    mr_asprintf(&g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir,
             bkpinfo->scratchdir);
     run_program_and_log_output(g_erase_tmpdir_and_scratchdir, TRUE);
@@ -424 +426 @@
     system(g_erase_tmpdir_and_scratchdir);
     free_libmondo_global_strings();
-    paranoid_free(bkpinfo);
+    mr_free((void *)bkpinfo);
 
     unlink("/tmp/filelist.full");