Changeset 1200 in MondoRescue

Timestamp:

Feb 25, 2007, 1:28:17 AM (17 years ago)

Author:

Bruno Cornec

Message:

Merge trunk emory management for mondo-rstr-compare.c and .h

Location:

branches/stable/mondo/src/mondorestore

Files:

• mondo-restore-EXT.h (modified) (1 diff)
• mondo-restore.h (modified) (1 diff)
• mondo-rstr-compare-EXT.h (modified) (1 diff)
• mondo-rstr-compare.c (modified) (29 diffs)
• mondo-rstr-compare.h (modified) (1 diff)
• mondo-rstr-newt.h (modified) (5 diffs)
• mondo-rstr-tools-EXT.h (modified) (2 diffs)
• mondo-rstr-tools.h (modified) (2 diffs)
• mondoprep.h (modified) (3 diffs)
• mr-externs.h (modified) (1 diff)

branches/stable/mondo/src/mondorestore/mondo-restore-EXT.h

@@ -29 +29 @@
                          struct raidlist_itself *);
 extern void sort_mountlist_by_device(struct mountlist_itself *);
-extern void find_pathname_of_executable_preferably_in_RESTORING(char *,
-                                                                char *,
-                                                                char *);
 extern int interactive_mode(struct s_bkpinfo *, struct mountlist_itself *,
                             struct raidlist_itself *);

branches/stable/mondo/src/mondorestore/mondo-restore.h

@@ -10 +10 @@
 int catchall_mode(struct s_bkpinfo *, struct mountlist_itself *,
                   struct raidlist_itself *);
-void find_pathname_of_executable_preferably_in_RESTORING(char *, char *,
-                                                         char *);
 int interactive_mode(struct s_bkpinfo *, struct mountlist_itself *,
                      struct raidlist_itself *);

branches/stable/mondo/src/mondorestore/mondo-rstr-compare-EXT.h

@@ -1 @@
-/* mondo-rstr-compare-EXT.h */
+/* 
+ * $Id$
+**/
 
 

branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -8 +8 @@
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
-//#include "../../config.h"
 #include "mr_msg.h"
+#include "mr_mem.h"
 #include "mr-externs.h"
 #include "mondo-rstr-compare.h"
@@ -33 +33 @@
 {
 
-    FILE *fin;
-    FILE *fout;
+    FILE *fin = NULL;
+    FILE *fout = NULL;
 
   /** needs malloc *******/
-    char *checksum_ptr;
-    char *original_cksum_ptr;
-    char *bigfile_fname_ptr;
-    char *tmp_ptr;
-    char *command_ptr;
-
-    char *checksum, *original_cksum, *bigfile_fname, *tmp, *command;
-
-    char *p;
-    int i;
+    char *checksum = NULL;
+    char *original_cksum = NULL;
+    char *bigfile_fname = NULL;
+    char *tmp = NULL;
+    char *command = NULL;
+
+    char *p = NULL;
+    int i = 0;
+    size_t n = 0;
     int retval = 0;
 
     struct s_filename_and_lstat_info biggiestruct;
 
-    malloc_string(checksum);
-    malloc_string(original_cksum);
-    malloc_string(bigfile_fname);
-    malloc_string(tmp);
-    malloc_string(command);
-    malloc_string(checksum_ptr);
-    malloc_string(original_cksum_ptr);
-    malloc_string(bigfile_fname_ptr);
-    malloc_string(command_ptr);
-    malloc_string(tmp_ptr);
-
-  /*********************************************************************
-   * allocate memory clear test                sab 16 feb 2003         *
-   *********************************************************************/
     assert(bkpinfo != NULL);
-    memset(checksum_ptr, '\0', sizeof(checksum));
-    memset(original_cksum_ptr, '\0', sizeof(original_cksum));
-    memset(bigfile_fname_ptr, '\0', sizeof(bigfile_fname));
-    memset(tmp_ptr, '\0', sizeof(tmp));
-    memset(command_ptr, '\0', sizeof(command));
-  /** end **/
 
     if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
@@ -77 +56 @@
             insist_on_this_cd_number(bkpinfo, (++g_current_media_number));
         } else {
-            sprintf(tmp_ptr,
-                    "No CD's left. No biggiefiles left. No prob, Bob.");
-            mr_msg(2, tmp_ptr);
+            mr_msg(2, "No CD's left. No biggiefiles left. No problem.");
             return (0);
         }
     }
     if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
-        sprintf(tmp_ptr,
-                "Cannot open bigfile %ld (%s)'s info file",
-                bigfileno + 1, bigfile_fname_ptr);
-        log_to_screen(tmp_ptr);
+        log_to_screen(_("Cannot open bigfile %ld (%s)'s info file"),
+                bigfileno + 1, slice_fname(bigfileno, 0, ARCHIVES_PATH, ""));
         return (1);
     }
@@ -93 +68 @@
     paranoid_fclose(fin);
 
-    strcpy(checksum_ptr, biggiestruct.checksum);
-    strcpy(bigfile_fname_ptr, biggiestruct.filename);
-
-    mr_msg(2, "biggiestruct.filename = %s", biggiestruct.filename);
-    mr_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum);
-
-    sprintf(tmp_ptr, "Comparing %s", bigfile_fname_ptr);
+    mr_asprintf(&bigfile_fname, biggiestruct.filename);
+    mr_msg(2, "biggiestruct.filename = %s", bigfile_fname);
+    if (!biggiestruct.checksum[0]) {
+        mr_msg(2, "Warning - %s has no checksum", bigfile_fname);
+    } else {
+        mr_asprintf(&checksum, biggiestruct.checksum);
+        mr_msg(2, "biggiestruct.checksum = %s", checksum);
+    }
 
     if (!g_text_mode) {
-        newtDrawRootText(0, 22, tmp_ptr);
+        mr_asprintf(&tmp, _("Comparing %s"), bigfile_fname);
+        newtDrawRootText(0, 22, tmp);
         newtRefresh();
-    }
-    if (!checksum[0]) {
-        mr_msg(2, "Warning - %s has no checksum", bigfile_fname_ptr);
-    }
-    if (!strncmp(bigfile_fname_ptr, "/dev/", 5)) {
-        strcpy(original_cksum_ptr, "IGNORE");
-    } else {
-        sprintf(command_ptr,
-                "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors.txt",
-                MNT_RESTORING, bigfile_fname_ptr);
-    }
-    mr_msg(2, command_ptr);
-    paranoid_system
-        ("cat /tmp/errors >> /tmp/mondo-restore.log 2> /dev/null");
-    if (system(command_ptr)) {
+        mr_free(tmp);
+    }
+
+    if (!strncmp(bigfile_fname, "/dev/", 5)) {
+        mr_msg(2, _("Ignoring device %s"), bigfile_fname);
+        mr_free(bigfile_fname);
+        return(0);
+    }
+    mr_asprintf(&command,
+            "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors.txt",
+            MNT_RESTORING, bigfile_fname);
+    mr_msg(2, command);
+    if (system(command)) {
         log_OS_error("Warning - command failed");
-        original_cksum[0] = '\0';
+        paranoid_system("cat /tmp/errors >> /tmp/mondo-restore.log 2> /dev/null");
+        mr_free(command);
+        mr_free(bigfile_fname);
         return (1);
     } else {
+        mr_free(command);
         if (!(fin = fopen("/tmp/md5sum.txt", "r"))) {
-            mr_msg(2,
-                    "Unable to open /tmp/md5sum.txt; can't get live checksum");
-            original_cksum[0] = '\0';
+            mr_msg(2, "Unable to open /tmp/md5sum.txt; can't get live checksum");
+            mr_free(bigfile_fname);
             return (1);
         } else {
-            fgets(original_cksum_ptr, MAX_STR_LEN - 1, fin);
+            mr_getline(&original_cksum, &n, fin);
             paranoid_fclose(fin);
-            for (i = strlen(original_cksum_ptr);
+            for (i = strlen(original_cksum);
                  i > 0 && original_cksum[i - 1] < 32; i--);
             original_cksum[i] = '\0';
-            p = (char *) strchr(original_cksum_ptr, ' ');
+            p = (char *) strchr(original_cksum, ' ');
             if (p) {
                 *p = '\0';
@@ -140 +117 @@
         }
     }
-    sprintf(tmp_ptr, "bigfile #%ld ('%s') ", bigfileno + 1,
-            bigfile_fname_ptr);
-    if (!strcmp(checksum_ptr, original_cksum_ptr) != 0) {
-        strcat(tmp_ptr, " ... OK");
-    } else {
-        strcat(tmp_ptr, "... changed");
+    if (!strcmp(checksum, original_cksum) != 0) {
+        mr_msg(1, "bigfile #%ld ('%s') ... OK", bigfileno + 1, bigfile_fname);
+    } else {
+        mr_msg(1, "bigfile #%ld ('%s') ... changed", bigfileno + 1, bigfile_fname);
         retval++;
     }
-    mr_msg(1, tmp_ptr);
+    mr_free(original_cksum);
+    mr_free(checksum);
+
     if (retval) {
         if (!(fout = fopen("/tmp/changed.txt", "a"))) {
             fatal_error("Cannot openout changed.txt");
         }
-        fprintf(fout, "%s\n", bigfile_fname_ptr);
+        fprintf(fout, "%s\n", bigfile_fname);
         paranoid_fclose(fout);
     }
-
-    mr_free(original_cksum_ptr);
-    mr_free(original_cksum);
-    mr_free(bigfile_fname_ptr);
     mr_free(bigfile_fname);
-    mr_free(checksum_ptr);
-    mr_free(checksum);
-    mr_free(command_ptr);
-    mr_free(command);
-    mr_free(tmp_ptr);
-    mr_free(tmp);
 
     return (retval);
@@ -184 +151 @@
 {
     int retval = 0;
-    int res;
-    long noof_biggiefiles, bigfileno = 0;
-    char tmp[MAX_STR_LEN];
+    int res = 0;
+    long noof_biggiefiles = 0L, bigfileno = 0L;
+    char *tmp = NULL;
 
     assert(bkpinfo != NULL);
@@ -202 +169 @@
     }
     mvaddstr_and_log_it(g_currentY, 0,
-                        "Comparing large files                                                  ");
-    open_progress_form("Comparing large files",
-                       "I am now comparing the large files",
-                       "against the filesystem. Please wait.", "",
+                        _
+                        ("Comparing large files                                                  "));
+    open_progress_form(_("Comparing large files"),
+                       _("I am now comparing the large files"),
+                       _("against the filesystem. Please wait."), "",
                        noof_biggiefiles);
     for (bigfileno = 0; bigfileno < noof_biggiefiles; bigfileno++) {
-        sprintf(tmp, "Comparing big file #%ld", bigfileno + 1);
+        mr_asprintf(&tmp, "Comparing big file #%ld", bigfileno + 1);
         mr_msg(1, tmp);
         update_progress_form(tmp);
+        mr_free(tmp);
+
         res = compare_a_biggiefile(bkpinfo, bigfileno);
         retval += res;
@@ -216 +186 @@
     }
     close_progress_form();
+    /* BERLIOS: useless ?
     return (0);
+    */
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     return (retval);
@@ -241 +213 @@
 {
     int retval = 0;
-    int res;
-    long noof_lines;
-    long archiver_errors;
-    bool use_star;
-
-  /***  needs malloc *********/
-    char *command, *tmp, *filelist_name, *logfile, *archiver_exe,
-        *compressor_exe;
-
-    malloc_string(command);
-    malloc_string(tmp);
-    malloc_string(filelist_name);
-    malloc_string(logfile);
-    malloc_string(archiver_exe);
-    malloc_string(compressor_exe);
+    int res = 0;
+    long noof_lines = 0L;
+    long archiver_errors = 0L;
+    bool use_star = FALSE;
+
+    char *command = NULL;
+    char *tmp = NULL;
+    char *filelist_name = NULL;
+    char *logfile = NULL;
+    char *archiver_exe = NULL;
+    char *compressor_exe = NULL;
 
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-    sprintf(logfile, "/tmp/afio.log.%d", current_tarball_number);
-    sprintf(filelist_name, MNT_CDROM "/archives/filelist.%d",
+    mr_asprintf(&filelist_name, MNT_CDROM "/archives/filelist.%d",
             current_tarball_number);
 
     noof_lines = count_lines_in_file(filelist_name);
+    mr_free(filelist_name);
 
     if (strstr(tarball_fname, ".bz2")) {
-        strcpy(compressor_exe, "bzip2");
+        mr_asprintf(&compressor_exe, "bzip2");
     } else if (strstr(tarball_fname, ".gz")) {
-        strcpy(compressor_exe, "gzip");
+        mr_asprintf(&compressor_exe, "gzip");
     } else if (strstr(tarball_fname, ".lzo")) {
-        strcpy(compressor_exe, "lzop");
-    } else {
-        compressor_exe[0] = '\0';
+        mr_asprintf(&compressor_exe, "lzop");
+    } else {
+        compressor_exe = NULL;
     }
 
     if (use_star) {
-        strcpy(archiver_exe, "star");
-    } else {
-        strcpy(archiver_exe, "afio");
-    }
-
-    if (compressor_exe[0]) {
-        strcpy(tmp, compressor_exe);
-        if (!find_home_of_exe(tmp)) {
+        mr_asprintf(&archiver_exe, "star -bz");
+    } else {
+        mr_asprintf(&archiver_exe, "afio");
+    }
+
+    if (compressor_exe != NULL) {
+        if (!find_home_of_exe(compressor_exe)) {
             fatal_error("(compare_a_tarball) Compression program missing");
         }
-        if (use_star)           // star
-        {
-            if (!strcmp(compressor_exe, "bzip2")) {
-                strcat(archiver_exe, " -bz");
-            } else {
+        if (use_star) {
+            if (strcmp(compressor_exe, "bzip2")) {
                 fatal_error
                     ("(compare_a_tarball) Please use only bzip2 with star");
             }
-        } else                  // afio
-        {
-            sprintf(compressor_exe, "-P %s -Z", tmp);
-        }
-    }
-// star -diff H=star -bz file=....
+        } else {
+            tmp = compressor_exe;
+            mr_asprintf(&compressor_exe, "-P %s -Z", tmp);
+            mr_free(tmp);
+        }
+    }
 
 #ifdef __FreeBSD__
@@ -306 +270 @@
 #define BUFSIZE (1024L*1024L)/TAPE_BLOCK_SIZE
 #endif
+
+    mr_asprintf(&logfile, "/tmp/afio.log.%d", current_tarball_number);
     if (use_star)               // doesn't use compressor_exe
     {
-        sprintf(command,
+        mr_asprintf(&command,
                 "%s -diff H=star file=%s >> %s 2>> %s",
                 archiver_exe, tarball_fname, logfile, logfile);
     } else {
-        sprintf(command,
+        mr_asprintf(&command,
                 "%s -r -b %ld -M 16m -c %ld %s %s >> %s 2>> %s",
                 archiver_exe,
@@ -319 +285 @@
     }
 #undef BUFSIZE
+    mr_free(archiver_exe);
+    mr_free(compressor_exe);
 
     res = system(command);
@@ -324 +292 @@
     if (res) {
         log_OS_error(command);
-        sprintf(tmp, "Warning - afio returned error = %d", res);
-    }
+    }
+    mr_free(command);
+
     if (length_of_file(logfile) > 5) {
-        sprintf(command,
+        mr_asprintf(&command,
                 "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vx \"dev/.*\" >> /tmp/changed.txt",
                 logfile);
         system(command);
+        mr_free(command);
         archiver_errors = count_lines_in_file(logfile);
     } else {
         archiver_errors = 0;
     }
-    sprintf(tmp, "%ld difference%c in fileset #%d          ",
-            archiver_errors, (archiver_errors != 1) ? 's' : ' ',
-            current_tarball_number);
     if (archiver_errors) {
-        sprintf(tmp,
-                "Differences found while processing fileset #%d       ",
+        mr_msg(1, "Differences found while processing fileset #%d       ",
                 current_tarball_number);
-        mr_msg(1, tmp);
     }
     unlink(logfile);
-    mr_free(command);
-    mr_free(tmp);
-    mr_free(filelist_name);
     mr_free(logfile);
-    malloc_string(archiver_exe);
-    malloc_string(compressor_exe);
     return (retval);
 }
@@ -367 +327 @@
 {
     int retval = 0;
-    int res;
+    int res = 0;
     int current_tarball_number = 0;
 
-  /**  needs malloc **********/
-
-    char *tarball_fname, *progress_str, *tmp;
-    long max_val;
-
-    malloc_string(tarball_fname);
-    malloc_string(progress_str);
+    char *tarball_fname = NULL;
+    char *progress_str = NULL;
+    char *tmp = NULL;
+    long max_val = 0L;
+
+    assert(bkpinfo != NULL);
+    mvaddstr_and_log_it(g_currentY, 0, _("Comparing archives"));
     malloc_string(tmp);
-
-    assert(bkpinfo != NULL);
-    mvaddstr_and_log_it(g_currentY, 0, "Comparing archives");
     read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
 
     max_val = atol(tmp);
-    sprintf(progress_str, "Comparing with %s #%d ",
-            media_descriptor_string(bkpinfo->backup_media_type),
+    mr_free(tmp);
+
+    mr_asprintf(&progress_str, _("Comparing with %s #%d "),
+            bkpinfo->backup_media_string,
             g_current_media_number);
 
-    open_progress_form("Comparing files",
-                       "Comparing tarballs against filesystem.",
-                       "Please wait. This may take some time.",
+    open_progress_form(_("Comparing files"),
+                       _("Comparing tarballs against filesystem."),
+                       _("Please wait. This may take some time."),
                        progress_str, max_val);
 
@@ -398 +357 @@
         insist_on_this_cd_number(bkpinfo, g_current_media_number);
         update_progress_form(progress_str);
-        sprintf(tarball_fname,
+        mr_asprintf(&tarball_fname,
                 MNT_CDROM "/archives/%d.afio.bz2", current_tarball_number);
 
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.lzo",
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.afio.lzo",
                     current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.",
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.afio.",
                     current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.star.bz2",
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.star.bz2",
                     current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.star.",
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.star.",
                     current_tarball_number);
         }
@@ -423 +386 @@
                 == 0) {
                 mr_msg(2, "OK, I think I'm done with tarballs...");
+                mr_free(tarball_fname);
                 break;
             }
             mr_msg(2, "OK, I think it's time for another CD...");
             g_current_media_number++;
-            sprintf(progress_str, "Comparing with %s #%d ",
-                    media_descriptor_string(bkpinfo->backup_media_type),
+            mr_free(progress_str);
+            mr_asprintf(&progress_str, _("Comparing with %s #%d "),
+                    bkpinfo->backup_media_string,
                     g_current_media_number);
             log_to_screen(progress_str);
         } else {
             res = compare_a_tarball(tarball_fname, current_tarball_number);
-
             g_current_progress++;
             current_tarball_number++;
         }
-    }
+        mr_free(tarball_fname);
+    }
+    mr_free(progress_str);
     close_progress_form();
+
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-    mr_free(tarball_fname);
-    mr_free(progress_str);
-    mr_free(tmp);
+        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
+    }
     return (retval);
 }
@@ -469 +433 @@
 {
   /** needs malloc *********/
-    char *tmp, *cwd, *new, *command;
+    char *tmp = NULL;
+    char *cwd = NULL;
+    char *new = NULL;
+    char *command = NULL;
     int resA = 0;
     int resB = 0;
-    long noof_changed_files;
-
-    malloc_string(tmp);
+    long noof_changed_files = 0L;
+
     malloc_string(cwd);
     malloc_string(new);
-    malloc_string(command);
 
     assert(bkpinfo != NULL);
@@ -484 +449 @@
     chdir(bkpinfo->restore_path);
     getcwd(new, MAX_STR_LEN - 1);
-    sprintf(tmp, "new path is %s", new);
     insist_on_this_cd_number(bkpinfo, g_current_media_number);
     unlink("/tmp/changed.txt");
@@ -493 +457 @@
     noof_changed_files = count_lines_in_file("/tmp/changed.txt");
     if (noof_changed_files) {
-        sprintf(tmp, "%ld files do not match the backup            ",
+        log_to_screen(_("%ld files do not match the backup            "),
                 noof_changed_files);
-        //      mvaddstr_and_log_it( g_currentY++, 0, tmp );
-        log_to_screen(tmp);
-        sprintf(command, "cat /tmp/changed.txt >> %s", MONDO_LOGFILE);
+        mr_asprintf(&command, "cat /tmp/changed.txt >> %s", MONDO_LOGFILE);
         paranoid_system(command);
-    } else {
-        sprintf(tmp, "All files match the backup                     ");
+        mr_free(command);
+    } else {
+        mr_asprintf(&tmp, _("All files match the backup                     "));
         mvaddstr_and_log_it(g_currentY++, 0, tmp);
         log_to_screen(tmp);
-    }
-
-    mr_free(tmp);
+        mr_free(tmp);
+    }
+
     mr_free(cwd);
     mr_free(new);
-    mr_free(command);
 
     return (resA + resB);
@@ -516 +478 @@
  *END_COMPARE_TO_CD                                                       *
  **************************************************************************/
-
-
 
 
@@ -535 +495 @@
 {
     int retval = 0;
-    long q;
-    char *tmp;
-
-    malloc_string(tmp);
+    long q = 0L;
+    char *tmp = NULL;
 
   /**************************************************************************
@@ -550 +508 @@
     while (get_cfg_file_from_archive(bkpinfo)) {
         if (!ask_me_yes_or_no
-            ("Failed to find config file/archives. Choose another source?"))
+            (_
+             ("Failed to find config file/archives. Choose another source?")))
         {
             fatal_error("Unable to find config file/archives. Aborting.");
@@ -559 +518 @@
     read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
     g_current_media_number = 1;
-    mvaddstr_and_log_it(1, 30, "Comparing Automatically");
+    mvaddstr_and_log_it(1, 30, _("Comparing Automatically"));
     iamhere("Pre-MAD");
     retval = mount_all_devices(mountlist, FALSE);
@@ -578 +537 @@
         mvaddstr_and_log_it(g_currentY++,
                             0,
-                            "Warning - differences found during the compare phase");
+                            _
+                            ("Warning - differences found during the compare phase"));
     }
 
@@ -585 +545 @@
     if (count_lines_in_file("/tmp/changed.txt") > 0) {
         mvaddstr_and_log_it(g_currentY++, 0,
-                            "Differences found while files were being compared.");
+                            _
+                            ("Differences found while files were being compared."));
         streamline_changes_file("/tmp/changed.files", "/tmp/changed.txt");
         if (count_lines_in_file("/tmp/changed.files") <= 0) {
             mvaddstr_and_log_it(g_currentY++, 0,
-                                "...but they were logfiles and temporary files. Your archives are fine.");
-            log_to_screen
-                ("The differences were logfiles and temporary files. Your archives are fine.");
+                                _
+                                ("...but they were logfiles and temporary files. Your archives are fine."));
+            log_to_screen(_
+                          ("The differences were logfiles and temporary files. Your archives are fine."));
         } else {
             q = count_lines_in_file("/tmp/changed.files");
-            sprintf(tmp, "%ld significant difference%s found.", q,
+            mr_asprintf(&tmp, _("%ld significant difference%s found."), q,
                     (q != 1) ? "s" : "");
             mvaddstr_and_log_it(g_currentY++, 0, tmp);
             log_to_screen(tmp);
-
-            strcpy(tmp,
-                   "Type 'less /tmp/changed.files' for a list of non-matching files");
+            mr_free(tmp);
+
+            mr_asprintf(&tmp,
+                   _("Type 'less /tmp/changed.files' for a list of non-matching files"));
             mvaddstr_and_log_it(g_currentY++, 0, tmp);
             log_to_screen(tmp);
+            mr_free(tmp);
 
             mr_msg(2, "calling popup_changelist_from_file()");
@@ -610 +574 @@
     } else {
         log_to_screen
-            ("No significant differences were found. Your backup is perfect.");
+            (_
+             ("No significant differences were found. Your backup is perfect."));
     }
     kill_petris();
-    mr_free(tmp);
     return (retval);
 }
@@ -620 +584 @@
  *END_COMPARE_MODE                                                        *
  **************************************************************************/
+
 
 /**
@@ -633 +598 @@
     int res;
 
+    char *dir = NULL;
+    char *command = NULL;
+
+    assert(bkpinfo != NULL);
   /** needs malloc **/
-    char *dir, *command;
-
-    assert(bkpinfo != NULL);
     malloc_string(dir);
-    malloc_string(command);
     getcwd(dir, MAX_STR_LEN);
     chdir(bkpinfo->restore_path);
 
-    sprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp",
+    mr_asprintf(&command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp",
             bkpinfo->restore_path);
     run_program_and_log_output(command, FALSE);
+    mr_free(command);
+
     mvaddstr_and_log_it(g_currentY,
-                        0, "Verifying archives against filesystem");
+                        0, _("Verifying archives against filesystem"));
 
     if (bkpinfo->disaster_recovery
@@ -666 +633 @@
     }
 
-    mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     mr_free(dir);
-    mr_free(command);
     return (res);
 }
@@ -690 +656 @@
 int compare_to_tape(struct s_bkpinfo *bkpinfo)
 {
-    int res;
-    char *dir, *command;
+    int res = 0;
+    char *dir = NULL;
+    char *command = NULL;
 
     assert(bkpinfo != NULL);
     malloc_string(dir);
-    malloc_string(command);
 
     getcwd(dir, MAX_STR_LEN);
     chdir(bkpinfo->restore_path);
-    sprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp",
+    mr_asprintf(&command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp",
             bkpinfo->restore_path);
     run_program_and_log_output(command, FALSE);
+    mr_free(command);
+
     mvaddstr_and_log_it(g_currentY,
-                        0, "Verifying archives against filesystem");
+                        0, _("Verifying archives against filesystem"));
     res = verify_tape_backups(bkpinfo);
     chdir(dir);
     if (res) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     mr_free(dir);
-    mr_free(command);
     return (res);
 }

branches/stable/mondo/src/mondorestore/mondo-rstr-compare.h

@@ -1 @@
-/* mondo-rstr-compare.h
+/*
  * $Id$
- */
+**/
 
 

branches/stable/mondo/src/mondorestore/mondo-rstr-newt.h

@@ -1 @@
-/***************************************************************************
-                          mondo-rstr-newt.h  -  description
-                             -------------------
-    begin                : Sat Apr 20 2002
-    copyright            : (C) 2002 by Stan Benoit
-    email                : troff@nakedsoul.org
-    cvsid                : $Id$
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
+/*
+ * $Id$
+**/
 
 #include "my-stuff.h"
@@ -27 +12 @@
 #endif /*__FreeBSD__*/
 
-#define NO_FLAWS_DETECTED "No flaws detected in mountlist at this time. Hit 'OK' to proceed."
+#define NO_FLAWS_DETECTED _("No flaws detected in mountlist at this time. Hit 'OK' to proceed.")
 
 
@@ -46 +31 @@
 extern long get_phys_size_of_drive(char *);
 extern bool is_this_device_mounted(char *);
+extern void mr_strip_spaces(char *);
 extern void initialize_raidrec(struct raid_device_record *);
 extern int make_list_of_drives(struct mountlist_itself *,
@@ -72 +58 @@
     g_current_progress, g_currentY;
 extern bool g_ISO_restore_mode;
-
-
-/* my global variables */
-
-//extern newtComponent g_progressForm, g_blurb1, g_blurb2, g_blurb3, g_label,
-//  g_timeline, g_percentline, g_scale;
-//extern char err_log_lines[NOOF_ERR_LINES][MAX_STR_LEN], g_blurb_str_1[MAX_STR_LEN] =
-//  "", g_blurb_str_2[MAX_STR_LEN] = "", g_blurb_str_3[MAX_STR_LEN] = "";
-//newtComponent g_isoform_main =
-//  NULL, g_isoform_header, g_isoform_scale, g_isoform_timeline,
-//  g_isoform_pcline;
-//long g_isoform_starttime;
-//int g_isoform_old_progress = -1;
-//char g_isoform_header_str[MAX_STR_LEN];
-//int g_mysterious_dot_counter;
-
-
-
-
 
 /* my subroutines */
@@ -195 +162 @@
 char *strip_path(char *);
 
-
-
-
 /* -------------------------------------------------------------------- */
 

branches/stable/mondo/src/mondorestore/mondo-rstr-tools-EXT.h

@@ -1 @@
-/* mondo-rstr-tools-EXT.h
+/*
  * $Id: mondo-rstr-tools-EXT.h
- */
+**/
 
 extern void free_MR_global_filenames(void);
@@ -26 +26 @@
 extern void set_signals(int on);
 extern void setup_MR_global_filenames(struct s_bkpinfo *bkpinfo);
-//extern void setup_signals(int);
 extern void terminate_daemon(int);
 extern void termination_in_progress(int);

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.h

@@ -1 @@
-/* mondo-rstr-tools.h
+/*
  * $Id: mondo-rstr-tools.h
- */
+**/
 
 void free_global_filenames(void);
@@ -26 +26 @@
 void set_signals(int on);
 void setup_global_filenames(struct s_bkpinfo *bkpinfo);
-//void setup_signals(int);
 void twenty_seconds_til_yikes(void);
 int run_raw_mbr(bool offer_to_hack_scripts, char *bd);

branches/stable/mondo/src/mondorestore/mondoprep.h

@@ -1 @@
-/***************************************************************************
-                          mondoprep.h  -  description
-                             -------------------
-    begin                : Sat Apr 20 2002
-    copyright            : (C) 2002 by Stan Benoit
-    email                : troff@nakedsoul.org
-    cvsid                : $Id$
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/*
+ * $Id$
+**/
 
 
@@ -28 +14 @@
 extern bool ask_me_yes_or_no(char *);
 extern long get_phys_size_of_drive(char *);
-//extern void log_to_screen (char *);
 extern void update_progress_form(char *);
 extern void open_progress_form(char *, char *, char *, char *, long);
@@ -41 +26 @@
 extern off_t length_of_file(char *);
 extern long noof_lines_that_match_wildcard(char *, char *);
-//extern char *slice_fname (long, long, bool, char *);
 extern char *last_line_of_file(char *);
 extern void log_file_end_to_screen(char *, char *);

branches/stable/mondo/src/mondorestore/mr-externs.h

@@ -71 +71 @@
 extern int read_header_block_from_stream(long long *, char *, int *);
 extern void save_filelist(struct s_node *, char *);
+extern void mr_strip_spaces(char *);
 extern int strcmp_inc_numbers(char *, char *);
 extern char *slice_fname(long, long, char *, char *);