Changeset 541 in MondoRescue for branches/stable/mondo/mondo/common/libmondo-filelist.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/common/libmondo-filelist.c (modified) (14 diffs)

branches/stable/mondo/mondo/common/libmondo-filelist.c

@@ -110 +110 @@
 #include "my-stuff.h"
 #include "mondostructures.h"
+#include "lib-common-externs.h"
 #include "libmondo-filelist.h"
 #include "libmondo-string-EXT.h"
 #include "libmondo-files-EXT.h"
 #include "libmondo-fork-EXT.h"
-#include "newt-specific-EXT.h"
+#include "libmondo-gui-EXT.h"
 #include "libmondo-tools-EXT.h"
 
@@ -202 +203 @@
     malloc_string(cksumlist);
     malloc_string(tmp);
-    mvaddstr_and_log_it(g_currentY, 0, _("Dividing filelist into sets"));
-
-    log_to_screen(_("Dividing filelist into sets. Please wait."));
+    mvaddstr_and_log_it(g_currentY, 0, "Dividing filelist into sets");
+
+    log_to_screen("Dividing filelist into sets. Please wait.");
     i = 0;
 /*
@@ -502 +503 @@
     if (depth == 0) {
         open_evalcall_form("Freeing memory");
-        log_to_screen(_("Freeing memory formerly occupied by filelist"));
+        log_to_screen("Freeing memory formerly occupied by filelist");
     }
     depth++;
@@ -940 +941 @@
 /* add here */
     if (!(newnode = (struct s_node *) malloc(sizeof(struct s_node)))) {
-        log_to_screen(_("failed to malloc"));
+        log_to_screen("failed to malloc");
         depth--;
         return (1);
@@ -972 +973 @@
             (node->down =
              (struct s_node *) malloc(sizeof(struct s_node)))) {
-            log_to_screen(_("%s - failed to malloc"), string_to_add);
+            log_to_screen("%s - failed to malloc", string_to_add);
             return (1);
         }
@@ -1025 +1026 @@
         fatal_error("filelist does not exist -- cannot load it");
     }
-    log_to_screen(_("Loading filelist"));
+    log_to_screen("Loading filelist");
     sprintf(command_to_open_fname, "gzip -dc %s", filelist_fname);
     sprintf(tmp, "zcat %s | wc -l", filelist_fname);
@@ -1032 +1033 @@
         atol(call_program_and_get_last_line_of_output(tmp));
     if (lines_in_filelist < 3) {
-        log_to_screen(_("Warning - surprisingly short filelist."));
+        log_to_screen("Warning - surprisingly short filelist.");
     }
     g_original_noof_lines_in_filelist = lines_in_filelist;
@@ -1049 +1050 @@
         return (NULL);
     }
-    open_evalcall_form(_("Loading filelist from disk"));
+    open_evalcall_form("Loading filelist from disk");
     for (fgets(fname, MAX_STR_LEN, pin); !feof(pin);
          fgets(fname, MAX_STR_LEN, pin)) {
@@ -1166 +1167 @@
     assert(outfname != NULL);   // will be zerolength if save_filelist() is called by itself
     if (depth == 0) {
-        log_to_screen(_("Saving filelist"));
+        log_to_screen("Saving filelist");
         if (!(fout = fopen(outfname, "w"))) {
             fatal_error("Cannot openout/save filelist");
         }
         lines_in_filelist = g_original_noof_lines_in_filelist;  /* set by load_filelist() */
-        open_evalcall_form(_("Saving selection to disk"));
+        open_evalcall_form("Saving selection to disk");
     }
     for (node = filelist; node != NULL; node = node->right) {
@@ -1451 +1452 @@
     if (bkpinfo->make_filelist) {
         mvaddstr_and_log_it(g_currentY, 0,
-                            _("Making catalog of files to be backed up"));
+                            "Making catalog of files to be backed up");
     } else {
         mvaddstr_and_log_it(g_currentY, 0,
-                            _("Using supplied catalog of files to be backed up"));
+                            "Using supplied catalog of files to be backed up");
     }
 
@@ -1475 +1476 @@
         log_OS_error("Call to mondo-makefilelist failed");
         *p_res++;
-        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
+        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
     return (res);
@@ -1571 +1572 @@
 #ifndef _XWIN
                 if (!g_text_mode) {
-                    sprintf(tmp, _("Reading %-68s"), dir);
+                    sprintf(tmp, "Reading %-68s", dir);
                     newtDrawRootText(0, g_noof_rows - 3, tmp);
                 }
@@ -1705 +1706 @@
                        char *userdef_filelist)
 {
-    char sz_datefile_wildcard[] = "/var/cache/mondo/difflevel.%d";
+    char sz_datefile_wildcard[] = "/var/cache/mondo-archive/difflevel.%d";
     char *p, *q;
     char sz_datefile[80];
@@ -1774 +1775 @@
         sprintf(exclude_paths, " %s %s %s %s %s %s . .. \
 " MNT_CDROM " " MNT_FLOPPY " /media/cdrom /media/cdrecorder \
-/proc /sys /tmp /var/cache/mondo /var/cache/mindi", excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+/proc /sys /root/images/mondo /root/images/mindi ", excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
 
         log_msg(2, "Excluding paths = '%s'", exclude_paths);