Changeset 2321 in MondoRescue for branches/2.2.10/mondo/src/mondoarchive/mondoarchive.c

Timestamp:

Aug 18, 2009, 2:37:55 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3332@localhost: bruno | 2009-08-07 23:59:34 +0200

• bkpinfo->tmpchdir is now dynamically allocated
• reorganize how tmpdir and scratchdir are initialized and the startup of the main sections
• change of interface for maintain_collection_of_recent_archives, mondo_makefilelist, chop_filelist
• sensibly_set_tmpdir_and_scratchdir => sensibly_set_scratchdir
• reset_bkpinfo => init_bkpinfo
• add function mr_free_bkpinfo
• Fix a bug in mr_strtok
• mondoarchive seems to globally work. Newt stuff needs more testing

File:

• branches/2.2.10/mondo/src/mondoarchive/mondoarchive.c (modified) (12 diffs)

branches/2.2.10/mondo/src/mondoarchive/mondoarchive.c

@@ -170 +170 @@
     char *say_at_end = NULL;
 
-/* Make sure I'm root; abort if not */
-    if (getuid() != 0) {
-        fprintf(stderr, "Please run as root.\r\n");
-        exit(127);
-    }
-
-/* 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"))) {
-        printf("mondoarchive v%s\nSee man page for help\n", PACKAGE_VERSION);
-        exit(0);
-    }
-
 /* Initialize variables */
-
-    printf("Initializing...\n");
-    if (!(bkpinfo = malloc(sizeof(struct s_bkpinfo)))) {
-        fatal_error("Cannot malloc bkpinfo");
-    }
-    reset_bkpinfo();
 
     res = 0;
     retval = 0;
     diffs = 0;
-    malloc_libmondo_global_strings();
+
+    printf("Initializing...\n");
+
+    bkpinfo = (struct s_bkpinfo *)mr_malloc(sizeof(struct s_bkpinfo));
+    init_bkpinfo();
 
     /* initialize log file with time stamp */
@@ -201 +185 @@
     log_msg(0, "Time started: %s", mr_date());
 
+    /* Memory allocation is done in those functions */
+    malloc_libmondo_global_strings();
+    if (argc == 1) {
+        g_text_mode = FALSE;
+    } else {
+        g_text_mode = TRUE;
+    }
+    setup_newt_stuff();
+
+    /* Make sure I'm root; abort if not */
+    if (getuid() != 0) {
+        fatal_error("Please run as root.\n");
+    }
+
+    /* 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"))) {
+        printf("mondoarchive v%s\nSee man page for help\n", PACKAGE_VERSION);
+        finish(0);
+    }
+
+
     /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
     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 */
@@ -231 +236 @@
         g_loglevel = 10;
         g_text_mode = TRUE;
-        setup_newt_stuff();
         if (!strstr(argv[2], "filelist")) {
             printf("Sorry - filelist goes first\n");
@@ -242 +246 @@
     if (argc == 4 && !strcmp(argv[1], "setfattr")) {
         g_loglevel = 10;
-        g_text_mode = TRUE;
-        setup_newt_stuff();
         finish(set_fattr_list(argv[2], argv[3]));
     }
@@ -249 +251 @@
     if (argc == 3 && !strcmp(argv[1], "wildcards")) {
         g_loglevel = 10;
-        g_text_mode = TRUE;
-        setup_newt_stuff();
         malloc_string(tmp);
         turn_wildcard_chars_into_literal_chars(tmp, argv[2]);
@@ -260 +260 @@
     if (argc == 4 && !strcmp(argv[1], "getfacl")) {
         g_loglevel = 10;
-        g_text_mode = TRUE;
-        setup_newt_stuff();
         if (!strstr(argv[2], "filelist")) {
             printf("Sorry - filelist goes first\n");
@@ -272 +270 @@
     if (argc == 4 && !strcmp(argv[1], "setfacl")) {
         g_loglevel = 10;
-        g_text_mode = TRUE;
-        setup_newt_stuff();
         finish(set_acl_list(argv[2], argv[3]));
     }
@@ -279 +275 @@
     if (argc > 2 && !strcmp(argv[1], "find-cd")) {
         g_loglevel = 10;
-        g_text_mode = TRUE;
-        setup_newt_stuff();
         malloc_string(tmp);
         if (find_cdrw_device(tmp)) {
@@ -299 +293 @@
     if (argc > 2 && !strcmp(argv[1], "find-dvd")) {
         g_loglevel = 10;
-        g_text_mode = TRUE;
-        setup_newt_stuff();
         malloc_string(tmp);
         if (find_dvd_device(tmp, atoi(argv[2]))) {
@@ -331 +323 @@
 /* Process command line, if there is one. If not, ask user for info. */
     if (argc == 1) {
-        g_text_mode = FALSE;
-        setup_newt_stuff();
         res = interactively_obtain_media_parameters_from_user(TRUE);    /* yes, archiving */
         if (res) {
@@ -347 +337 @@
             finish(1);
         }
-        setup_newt_stuff();
     }
 
 /* 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...");
+    }
+
+    log_to_screen("BusyBox's sources are available from http://www.busybox.net");
 
     /* If we're meant to backup then backup */
@@ -412 +399 @@
     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);