Changeset 541 in MondoRescue for branches/stable/mondo/mondo/mondoarchive/main.c

Timestamp:

May 13, 2006, 8:47:23 PM (18 years ago)

Author:

bcornec

Message:

Stable is reverted to r436 (2.0.7) to put it in line with 2.0.8 and start from there over

File:

• branches/stable/mondo/mondo/mondoarchive/main.c (modified) (17 diffs)

branches/stable/mondo/mondo/mondoarchive/main.c

@@ -247 +247 @@
 {
     struct s_bkpinfo *bkpinfo;
-    struct s_mrconf *mrconf;
     char *tmp;
     int res, retval;
     char *say_at_end;
 
-#ifdef ENABLE_NLS
-    setlocale(LC_ALL, "");
-    (void) textdomain("mondo");
-#endif
 /* Make sure I'm root; abort if not */
     if (getuid() != 0) {
-        fprintf(stderr, _("Please run as root.\n"));
+        fprintf(stderr, "Please run as root.\r\n");
         exit(127);
     }
@@ -266 +261 @@
         && (!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);
+        printf("mondoarchive v%s\nSee man page for help\n", PACKAGE_VERSION);
         exit(0);
     }
@@ -275 +270 @@
     malloc_string(tmp);
     malloc_string(say_at_end);
-
-    /* Initialize Configuration Structure */
-    mrarchive_init_conf(mrconf);
 
     res = 0;
@@ -283 +275 @@
     diffs = 0;
     say_at_end[0] = '\0';
-    printf(_("Initializing...\n"));
+    printf("Initializing...\n");
     if (!(bkpinfo = malloc(sizeof(struct s_bkpinfo)))) {
         fatal_error("Cannot malloc bkpinfo");
@@ -329 +321 @@
         setup_newt_stuff();
         if (!strstr(argv[2], "filelist")) {
-            printf(_("Sorry - filelist goes first\n"));
+            printf("Sorry - filelist goes first\n");
             finish(1);
         } else {
@@ -358 +350 @@
         setup_newt_stuff();
         if (!strstr(argv[2], "filelist")) {
-            printf(_("Sorry - filelist goes first\n"));
+            printf("Sorry - filelist goes first\n");
             finish(1);
         } else {
@@ -378 +370 @@
         setup_newt_stuff();
         if (find_cdrw_device(tmp)) {
-            printf(_("Failed to find CDR-RW drive\n"));
-        } else {
-            printf(_("CD-RW is at %s\n"), tmp);
+            printf("Failed to find CDR-RW drive\n");
+        } else {
+            printf("CD-RW is at %s\n", tmp);
         }
         tmp[0] = '\0';
         if (find_cdrom_device(tmp, atoi(argv[2]))) {
-            printf(_("Failed to find CD-ROM drive\n"));
-        } else {
-            printf(_("CD-ROM is at %s\n"), tmp);
+            printf("Failed to find CD-ROM drive\n");
+        } else {
+            printf("CD-ROM is at %s\n", tmp);
         }
         finish(0);
@@ -396 +388 @@
         setup_newt_stuff();
         if (find_dvd_device(tmp, atoi(argv[2]))) {
-            printf(_("Failed to find DVD drive\n"));
-        } else {
-            printf(_("DVD is at %s\n"), tmp);
+            printf("Failed to find DVD drive\n");
+        } else {
+            printf("DVD is at %s\n", tmp);
         }
         finish(0);
@@ -409 +401 @@
     if (argc > 2 && !strcmp(argv[1], "test-dev")) {
         if (is_dev_an_NTFS_dev(argv[2])) {
-            printf(_("%s is indeed an NTFS dev\n"), argv[2]);
-        } else {
-            printf(_("%s is _not_ an NTFS dev\n"), argv[2]);
+            printf("%s is indeed an NTFS dev\n", argv[2]);
+        } else {
+            printf("%s is _not_ an NTFS dev\n", argv[2]);
         }
         finish(0);
@@ -434 +426 @@
         if (res) {
             printf
-                (_("Errors were detected in the command line you supplied.\n"));
-            printf(_("Please review the log file - %s \n"),MONDO_LOGFILE);
+                ("Errors were detected in the command line you supplied.\n");
+            printf("Please review the log file - " MONDO_LOGFILE "\n");
             log_msg(1, "Mondoarchive will now exit.");
             finish(1);
@@ -449 +441 @@
 
     log_to_screen
-        (_("BusyBox's sources are available from http://www.busybox.net"));
+        ("BusyBox's sources are available from http://www.busybox.net");
     sprintf(g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir,
             bkpinfo->scratchdir);
@@ -461 +453 @@
       finish(0);
 */
-        res = backup_data(bkpinfo, mrconf);
+        res = backup_data(bkpinfo);
         retval += res;
         if (res) {
             strcat(say_at_end,
-                   _("Data archived. Please check the logs, just as a precaution. "));
-        } else {
-            strcat(say_at_end, _("Data archived OK. "));
+                   "Data archived. Please check the logs, just as a precaution. ");
+        } else {
+            strcat(say_at_end, "Data archived OK. ");
         }
     }
@@ -475 +467 @@
         res = verify_data(bkpinfo);
         if (res < 0) {
-            sprintf(tmp, _("%d difference%c found."), -res,
+            sprintf(tmp, "%d difference%c found.", -res,
                     (-res != 1) ? 's' : ' ');
             strcat(say_at_end, tmp);
@@ -495 +487 @@
     if (!retval) {
         mvaddstr_and_log_it(g_currentY++, 0,
-                            _("Backup and/or verify ran to completion. Everything appears to be fine."));
+                            "Backup and/or verify ran to completion. Everything appears to be fine.");
     } else {
         mvaddstr_and_log_it(g_currentY++, 0,
-                            _("Backup and/or verify ran to completion. However, errors did occur."));
-    }
-
-    if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
+                            "Backup and/or verify ran to completion. However, errors did occur.");
+    }
+
+    if (does_file_exist("/root/images/mindi/mondorescue.iso")) {
         log_to_screen
-            (_("/var/cache/mindi/mondorescue.iso, a boot/utility CD, is available if you want it."));
+            ("/root/images/mindi/mondorescue.iso, a boot/utility CD, is available if you want it.");
     }
 
@@ -510 +502 @@
         if (g_text_mode) {
             log_to_screen
-                (_("Type 'less /tmp/changed.files' to see which files don't match the archives"));
+                ("Type 'less /tmp/changed.files' to see which files don't match the archives");
         } else {
             log_msg(1,
-                    _("Type 'less /tmp/changed.files' to see which files don't match the archives"));
+                    "Type 'less /tmp/changed.files' to see which files don't match the archives");
             log_msg(2, "Calling popup_changelist_from_file()");
             popup_changelist_from_file("/tmp/changed.files");
@@ -531 +523 @@
     system("rm -Rf /tmp.mondo.* /mondo.scratch.*");
     if (!retval) {
-        printf(_("Mondoarchive ran OK.\n"));
+        printf("Mondoarchive ran OK.\n");
     } else {
-        printf(_("Errors occurred during backup. Please check logfile.\n"));
+        printf("Errors occurred during backup. Please check logfile.\n");
     }
     distro_specific_kludges_at_end_of_mondoarchive();
@@ -557 +549 @@
     if (!g_text_mode) {
         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);
+            ("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);
         finish(retval);
     } else {
-        printf(_("See %s for details of backup run.\n"), MONDO_LOGFILE);
+        printf("See %s for details of backup run.\n", MONDO_LOGFILE);
         exit(retval);
     }