Changeset 3193 in MondoRescue for branches/3.2/mondo/src/mondoarchive/mondoarchive.c

Timestamp:

Sep 29, 2013, 9:31:34 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Finish with backports from 3.1 for now. Still some work to do, but we will now make that version compile and work again and serve as a base

so the gettext patch can be added

File:

• branches/3.2/mondo/src/mondoarchive/mondoarchive.c (modified) (18 diffs)

branches/3.2/mondo/src/mondoarchive/mondoarchive.c

@@ -10 +10 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -32 +33 @@
 
 /***************** global vars, used only by main.c ******************/
-long diffs;
+long diffs = 0L;
 
 extern t_bkptype g_backup_media_type;
 extern int g_loglevel;
+
+extern char *g_magicdev_command;
 
 /**
@@ -74 +77 @@
     char *tmp = NULL;
 
-    log_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org",
-            PACKAGE_VERSION);
+    log_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org", PACKAGE_VERSION);
     log_msg(0, "running %s binaries", get_architecture());
     tmp = get_uname_m();
     log_msg(0, "running on %s architecture", tmp);
     mr_free(tmp);
-    log_msg(0,
-            "-----------------------------------------------------------");
-    log_msg(0,
-            "NB: Mondo logs almost everything, so don't panic if you see");
-    log_msg(0,
-            "some error messages.  Please read them carefully before you");
-    log_msg(0,
-            "decide to break out in a cold sweat.    Despite (or perhaps");
-    log_msg(0,
-            "because of) the wealth of messages. some users are inclined");
-    log_msg(0,
-            "to stop reading this log. If Mondo stopped for some reason,");
-    log_msg(0,
-            "chances are it's detailed here.  More than likely there's a");
-    log_msg(0,
-            "message at the very end of this log that will tell you what");
-    log_msg(0,
-            "is wrong. Please read it!                          -Devteam");
-    log_msg(0,
-            "-----------------------------------------------------------");
+    log_msg(0, "-----------------------------------------------------------");
+    log_msg(0, "NB: Mondo logs almost everything, so don't panic if you see");
+    log_msg(0, "some error messages.  Please read them carefully before you");
+    log_msg(0, "decide to break out in a cold sweat.    Despite (or perhaps");
+    log_msg(0, "because of) the wealth of messages. some users are inclined");
+    log_msg(0, "to stop reading this log. If Mondo stopped for some reason,");
+    log_msg(0, "chances are it's detailed here.  More than likely there's a");
+    log_msg(0, "message at the very end of this log that will tell you what");
+    log_msg(0, "is wrong. Please read it!                          -Devteam");
+    log_msg(0, "-----------------------------------------------------------");
 
     log_msg(0, "Zero...");
@@ -113 +105 @@
 }
 
-
-extern char *g_magicdev_command;
 
 /**
@@ -170 +160 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
-    int res, retval;
+    int res = 0;
+    int i = 0;
+    int retval = 0;
     char *say_at_end = NULL;
     FILE *fin = NULL;
@@ -181 +173 @@
 
 /* If -V, -v or --version then echo version no. and quit */
-    if (argc == 2
-        && (!strcmp(argv[argc - 1], "-v") || !strcmp(argv[argc - 1], "-V")
-            || !strcmp(argv[argc - 1], "--version"))) {
+    if (argc == 2 && (!strcmp(argv[argc - 1], "-v") || !strcmp(argv[argc - 1], "-V") || !strcmp(argv[argc - 1], "--version"))) {
         printf("mondoarchive v%s\nSee man page for help\n", PACKAGE_VERSION);
         exit(0);
@@ -196 +186 @@
     reset_bkpinfo();
 
-    res = 0;
-    retval = 0;
-    diffs = 0;
+    /* Memory allocation is done in those functions */
     malloc_libmondo_global_strings();
 
@@ -208 +196 @@
     mr_asprintf(tmp1,"%s:/sbin:/usr/sbin:/usr/local/sbin",getenv("PATH"));
     setenv("PATH", tmp1, 1);
-    paranoid_free(tmp1);
+    mr_free(tmp1);
 
     /* Add the ARCH environment variable for ia64 purposes */
     mr_asprintf(tmp1,"%s",get_architecture());
     setenv("ARCH", tmp1, 1);
-    paranoid_free(tmp1);
+    mr_free(tmp1);
 
     /* Add MONDO_SHARE environment variable for mindi */
@@ -255 +243 @@
         g_text_mode = TRUE;
         setup_newt_stuff();
-        malloc_string(tmp);
-        turn_wildcard_chars_into_literal_chars(tmp, argv[2]);
-        printf("in=%s; out=%s\n", argv[2], tmp);
-        paranoid_free(tmp);
+        tmp1 = mr_stresc(argv[2], "[]*?", '\\');
+        printf("in=%s; out=%s\n", argv[2], tmp1);
+        mr_free(tmp1);
         finish(1);
     }
@@ -311 +298 @@
             printf("CD-ROM is at %s\n", tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
         finish(0);
     }
@@ -325 +312 @@
             printf("DVD is at %s\n", tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
         finish(0);
     }
@@ -343 +330 @@
 
     if (pre_param_configuration()) {
-        fatal_error
-            ("Pre-param initialization phase failed. Please review the error messages above, make the specified changes, then try again. Exiting...");
-    }
-
-/* Process command line, if there is one. If not, ask user for info. */
+        fatal_error("Pre-param initialization phase failed. Please review the error messages above, make the specified changes, then try again. Exiting...");
+    }
+
+    /* Process command line, if there is one. If not, ask user for info. */
     if (argc == 1) {
         g_text_mode = FALSE;
@@ -353 +339 @@
         res = interactively_obtain_media_parameters_from_user(TRUE);    /* yes, archiving */
         if (res) {
-            fatal_error
-                ("Syntax error. Please review the parameters you have supplied and try again.");
+            fatal_error("Syntax error. Please review the parameters you have supplied and try again.");
         }
     } else {
         res = handle_incoming_parameters(argc, argv);
         if (res) {
-            printf
-                ("Errors were detected in the command line you supplied.\n");
+            printf("Errors were detected in the command line you supplied.\n");
             printf("Please review the log file - %s\n", MONDO_LOGFILE );
             log_msg(1, "Mondoarchive will now exit.");
@@ -370 +354 @@
 /* Finish configuring global structures */
     if (post_param_configuration()) {
-        fatal_error
-            ("Post-param initialization phase failed. Perhaps bad parameters were supplied to mondoarchive? Please review the documentation, error messages and logs. Exiting...");
-    }
-
-    log_to_screen
-        ("BusyBox's sources are available from http://www.busybox.net");
+        fatal_error("Post-param initialization phase failed. Perhaps bad parameters were supplied to mondoarchive? Please review the documentation, error messages and logs. Exiting...");
+    }
 
     /* If we're meant to backup then backup */
@@ -392 +372 @@
         res = verify_data();
         if (res < 0) {
-            mr_asprintf(tmp, "%d difference%c found.", -res,
-                    (-res != 1) ? 's' : ' ');
+            mr_asprintf(tmp, "%d difference%c found.", -res, (-res != 1) ? 's' : ' ');
             mr_asprintf(say_at_end, "%s", tmp);
             log_to_screen(tmp);
@@ -430 +409 @@
     if (say_at_end != NULL) {
         log_to_screen(say_at_end);
-        paranoid_free(say_at_end);
+        mr_free(say_at_end);
     }
     mr_asprintf(tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
@@ -437 +416 @@
     if (bkpinfo->backup_media_type == usb) {
         log_msg(1, "Unmounting USB device.");
+        if (bkpinfo->media_device == NULL) {
+            fatal_error("USB device set to NULL");
+        }
         mr_asprintf(tmp, "umount %s1", bkpinfo->media_device);
         run_program_and_log_output(tmp, TRUE);
@@ -471 +453 @@
 
     if (!g_text_mode) {
-        popup_and_OK
-            ("Mondo Archive has finished its run. Please press ENTER to return to the shell prompt.");
+        popup_and_OK("Mondo Archive has finished its run. Please press ENTER to return to the shell prompt.");
         log_to_screen("See %s for details of backup run.", MONDO_LOGFILE);
     } else {