Changeset 3193 in MondoRescue for branches/3.1/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.1/mondo/src/mondoarchive/mondoarchive.c (modified) (5 diffs)

branches/3.1/mondo/src/mondoarchive/mondoarchive.c

@@ -37 +37 @@
 extern t_bkptype g_backup_media_type;
 extern int g_loglevel;
+
 extern char *g_magicdev_command;
 
@@ -101 +102 @@
     log_msg(7, "Seven...");
     log_msg(8, "Eight...");
+    printf("See %s for details of backup run.\n", MONDO_LOGFILE);
 }
 
@@ -164 +166 @@
     FILE *fin = 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");
+
+    init_bkpinfo();
+
+    /* Memory allocation is done in those functions */
+    malloc_libmondo_global_strings();
 
     /* initialize log file with time stamp */
     unlink(MONDO_LOGFILE);
-    tmp = mr_date();
-    log_msg(0, "Time started: %s", tmp);
-    mr_free(tmp);
-
-    init_bkpinfo();
-
-    /* Memory allocation is done in those functions */
-    malloc_libmondo_global_strings();
+    log_msg(0, "Time started: %s", mr_date());
+
     if (argc == 1) {
         g_text_mode = FALSE;
@@ -188 +203 @@
     }
     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. */
@@ -449 +452 @@
 
     /* finalize log file with time stamp */
-    tmp = mr_date();
-    log_msg(0, "Time finished: %s", tmp);
-    mr_free(tmp);
+    log_msg(0, "Time finished: %s", mr_date());
 
     if (chdir("/tmp")) {