Changeset 541 in MondoRescue for branches/stable/mondo/mondo/common

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

Location:

branches/stable/mondo/mondo/common

Files:

• Makefile.am (modified) (2 diffs)
• X-specific-EXT.h (copied) (copied from branches/stable/mondo/mondo/common/X-specific-EXT.h )
• X-specific.c (copied) (copied from branches/stable/mondo/mondo/common/X-specific.c )
• X-specific.cpp (copied) (copied from branches/stable/mondo/mondo/common/X-specific.cpp )
• X-specific.h (copied) (copied from branches/stable/mondo/mondo/common/X-specific.h )
• config.h (copied) (copied from branches/stable/mondo/mondo/common/config.h )
• lib-common-externs.h (copied) (copied from branches/stable/mondo/mondo/common/lib-common-externs.h )
• libmondo-archive-EXT.h (modified) (2 diffs)
• libmondo-archive.c (modified) (35 diffs)
• libmondo-archive.h (modified) (2 diffs)
• libmondo-conf.c (deleted)
• libmondo-conf.h (deleted)
• libmondo-devices.c (modified) (41 diffs)
• libmondo-fifo.c (modified) (3 diffs)
• libmondo-filelist.c (modified) (14 diffs)
• libmondo-files.c (modified) (8 diffs)
• libmondo-fork.c (modified) (7 diffs)
• libmondo-gui-EXT.h (copied) (copied from branches/stable/mondo/mondo/common/libmondo-gui-EXT.h )
• libmondo-gui.c (copied) (copied from branches/stable/mondo/mondo/common/libmondo-gui.c )
• libmondo-gui.h (copied) (copied from branches/stable/mondo/mondo/common/libmondo-gui.h )
• libmondo-mountlist.c (modified) (3 diffs)
• libmondo-msg.c (deleted)
• libmondo-raid.c (modified) (3 diffs)
• libmondo-stream.c (modified) (15 diffs)
• libmondo-string.c (modified) (7 diffs)
• libmondo-tools.c (modified) (17 diffs)
• libmondo-verify.c (modified) (14 diffs)
• libmondo.h (modified) (1 diff)
• mondostructures.h (modified) (3 diffs)
• my-stuff.h (modified) (9 diffs)
• newt-specific.c (modified) (21 diffs)

branches/stable/mondo/mondo/common/Makefile.am

@@ -9 +9 @@
 libmondo_a_SOURCES  = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
                        libmondo-filelist.c libmondo-files.c libmondo-fork.c \
-                       libmondo-mountlist.c libmondo-raid.c libmondo-msg.c \
+                       libmondo-mountlist.c libmondo-raid.c \
                        libmondo-stream.c libmondo-string.c libmondo-tools.c \
                        libmondo-verify.c newt-specific.c \
                        libmondo-archive.h libmondo-devices.h \
                        libmondo-filelist.h libmondo-files.h libmondo-fork.h \
-                       libmondo-mountlist.h libmondo-raid.h \
+                       libmondo-gui.h libmondo-mountlist.h libmondo-raid.h \
                        libmondo-stream.h libmondo-string.h libmondo-tools.h \
                        libmondo-verify.h libmondo-fifo.h \
@@ -20 +20 @@
                        libmondo-devices-EXT.h libmondo-fifo-EXT.h \
                        libmondo-files-EXT.h libmondo-fork-EXT.h \
-                       libmondo-filelist-EXT.h \
+                       libmondo-gui-EXT.h libmondo-filelist-EXT.h \
                        libmondo-mountlist-EXT.h libmondo-raid-EXT.h  \
                        libmondo-string-EXT.h libmondo-tools-EXT.h \

branches/stable/mondo/mondo/common/libmondo-archive-EXT.h

@@ -15 +15 @@
 extern int make_slices_and_images(struct s_bkpinfo *bkpinfo,
                                   char *biggielist_fname);
-extern int make_iso_fs(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *destfile);
+extern int make_iso_fs(struct s_bkpinfo *bkpinfo, char *destfile);
 extern int make_afioballs_and_images(struct s_bkpinfo *bkpinfo);
 extern int (*move_files_to_cd) (struct s_bkpinfo *, char *, ...);
@@ -41 +41 @@
                                           char *filelist, char *fname,
                                           int setno);
-extern void setenv_mondo_share(void);
+extern void setenv_mondo_lib(void);

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

@@ -179 +179 @@
 #include "libmondo-devices-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "newt-specific-EXT.h"
+#include "libmondo-gui-EXT.h"
 #include "libmondo-fork-EXT.h"
 #include "libmondo-files-EXT.h"
@@ -186 +186 @@
 #include "libmondo-verify-EXT.h"
 #include "libmondo-archive.h"
+#include "lib-common-externs.h"
 #include <sys/sem.h>
 #include <sys/types.h>
@@ -580 +581 @@
  * @ingroup archiveGroup
  */
-int backup_data(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int backup_data(struct s_bkpinfo *bkpinfo)
 {
     int retval = 0, res = 0;
@@ -643 +644 @@
     sprintf(tmp, "rm -f %s/images/*.iso", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, 1);
-    retval += make_those_afios_phase(bkpinfo,mrconf);   // backup regular files
+    retval += make_those_afios_phase(bkpinfo);  // backup regular files
     retval += make_those_slices_phase(bkpinfo); // backup BIG files
     retval += do_that_final_phase(bkpinfo); // clean up
@@ -1014 +1015 @@
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
-        sprintf(command, "mkdir -p /var/cache/mindi/");
+        sprintf(command, "mkdir -p /root/images/mindi/");
         log_msg(2, command);
         run_program_and_log_output(command, FALSE);
         sprintf(command,
-                "cp -f %s/images/mindi.iso /var/cache/mindi/mondorescue.iso",
+                "cp -f %s/images/mindi.iso /root/images/mindi/mondorescue.iso",
                 bkpinfo->scratchdir);
         log_msg(2, command);
@@ -1252 +1253 @@
  * @ingroup MLarchiveGroup
  */
-int do_that_final_phase(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int do_that_final_phase(struct s_bkpinfo *bkpinfo)
 {
 
@@ -1273 +1274 @@
         /* write final ISO */
     {
-        res = write_final_iso_if_necessary(bkpinfo, mrconf);
+        res = write_final_iso_if_necessary(bkpinfo);
         retval += res;
         if (res) {
@@ -1563 +1564 @@
  * @return The number of errors encountered (0 for success)
  */
-int make_afioballs_and_images(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int make_afioballs_and_images(struct s_bkpinfo *bkpinfo)
 {
 
@@ -1619 +1620 @@
     log_to_screen("Archiving regular files");
     log_msg(5, "Go, Shorty. It's your birthday.");
-    open_progress_form(_("Backing up filesystem"),
-                       _("I am backing up your live filesystem now."),
-                       _("Please wait. This may take a couple of hours."),
-                       _("Working..."),
+    open_progress_form("Backing up filesystem",
+                       "I am backing up your live filesystem now.",
+                       "Please wait. This may take a couple of hours.",
+                       "Working...",
                        get_last_filelist_number(bkpinfo) + 1);
 
@@ -1707 +1708 @@
             } else {
                 res =
-                    move_files_to_cd(bkpinfo, mrconf, storing_filelist_fname,
+                    move_files_to_cd(bkpinfo, storing_filelist_fname,
                                      curr_xattr_list_fname,
                                      curr_acl_list_fname,
@@ -1785 +1786 @@
  * @return The number of errors encountered (0 for success)
  */
-int make_iso_fs(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *destfile)
+int make_iso_fs(struct s_bkpinfo *bkpinfo, char *destfile)
 {
     /*@ int ********************************************** */
@@ -1848 +1849 @@
     tmp3 = NULL;
     if (bkpinfo->backup_media_type == iso && bkpinfo->manual_cd_tray) {
-        popup_and_OK(_("Please insert new media and press Enter."));
+        popup_and_OK("Please insert new media and press Enter.");
     }
 
@@ -2005 +2006 @@
 #ifdef __IA64__
                 log_msg(1, "IA64 --> elilo");
-                asprintf(&tmp2,"mkisofs -no-emul-boot -b images/mindi-bootroot.%s.img -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", mrconf->ia64_boot_size);
                 res = eval_call_to_make_ISO(bkpinfo,
                                             //-b images/mindi-boot.2880.img
-                                            tmp2,
+                                            "mkisofs -no-emul-boot -b images/mindi-bootroot."
+                                            IA64_BOOT_SIZE
+                                            ".img -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .",
                                             destfile,
                                             g_current_media_number,
@@ -2016 +2018 @@
 // FIXME --- change mkisofs string to MONDO_MKISOFS_REGULAR_SYSLINUX/LILO depending on bkpinfo->make_cd_usE_lilo
 // and add ' .' at end
-                paranoid_free(tmp2);
                 log_msg(1, "Non-ia64 --> lilo");
                 res =
@@ -2150 +2151 @@
  */
 int
-make_slices_and_images(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *biggielist_fname)
+make_slices_and_images(struct s_bkpinfo *bkpinfo, char *biggielist_fname)
 {
 
@@ -2223 +2224 @@
         } else {
 // Call ntfsclone (formerly partimagehack) if it's a /dev entry (i.e. a partition to be imaged)
-            log_msg(2, "bigfile_fname = '%s'", bigfile_fname);
+            log_msg(2, "bigfile_fname = %s", bigfile_fname);
             use_ntfsprog = FALSE;
             if (!strncmp(bigfile_fname, "/dev/", 5)
@@ -2269 +2270 @@
             }
             res =
-                slice_up_file_etc(bkpinfo, mrconf, bigfile_fname,
+                slice_up_file_etc(bkpinfo, bigfile_fname,
                                   ntfsprog_fifo, biggie_file_number,
                                   noof_biggie_files, use_ntfsprog);
@@ -2321 +2322 @@
  * @see make_afioballs_and_images
  */
-int make_afioballs_and_images_OLD(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int make_afioballs_and_images_OLD(struct s_bkpinfo *bkpinfo)
 {
 
@@ -2349 +2350 @@
     log_to_screen("Archiving regular files");
 
-    open_progress_form(_("Backing up filesystem"),
-                       _("I am backing up your live filesystem now."),
-                       _("Please wait. This may take a couple of hours."),
-                       _("Working..."),
+    open_progress_form("Backing up filesystem",
+                       "I am backing up your live filesystem now.",
+                       "Please wait. This may take a couple of hours.",
+                       "Working...",
                        get_last_filelist_number(bkpinfo) + 1);
 
@@ -2403 +2404 @@
         } else {
             res =
-                move_files_to_cd(bkpinfo, mrconf, curr_filelist_fname,
+                move_files_to_cd(bkpinfo, curr_filelist_fname,
                                  curr_xattr_list_fname,
                                  curr_acl_list_fname, curr_afioball_fname,
@@ -2448 +2449 @@
  * @ingroup MLarchiveGroup
  */
-int make_those_afios_phase(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int make_those_afios_phase(struct s_bkpinfo *bkpinfo)
 {
     /*@ int ******************************************* */
@@ -2465 +2466 @@
         log_msg(1,
                 "Using single-threaded make_afioballs_and_images() to suit b0rken FreeBSD 5.0");
-        res = make_afioballs_and_images_OLD(bkpinfo, mrconf);
+        res = make_afioballs_and_images_OLD(bkpinfo);
 #else
-        res = make_afioballs_and_images_OLD(bkpinfo, mrconf);
+        res = make_afioballs_and_images_OLD(bkpinfo);
 #endif
         write_header_block_to_stream(0, "stop-afioballs",
                                      BLK_STOP_AFIOBALLS);
     } else {
-        res = make_afioballs_and_images(bkpinfo, mrconf);
+        res = make_afioballs_and_images(bkpinfo);
     }
 
@@ -2575 +2576 @@
  * transfer files over the network) or leave it as is.
  */
-int (*move_files_to_cd) (struct s_bkpinfo *, struct s_mrconf *mrconf, char *, ...) =
+int (*move_files_to_cd) (struct s_bkpinfo *, char *, ...) =
     _move_files_to_cd;
 
@@ -2596 +2597 @@
  * @return The number of errors encountered (0 for success)
  */
-int _move_files_to_cd(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *files_to_add, ...)
+int _move_files_to_cd(struct s_bkpinfo *bkpinfo, char *files_to_add, ...)
 {
 
@@ -2635 +2636 @@
     }
     if (would_occupy / 1024 > bkpinfo->media_size[g_current_media_number]) {
-        res = write_iso_and_go_on(bkpinfo, struct s_mrconf *mrconf, FALSE); /* FALSE because this is not the last CD we'll write */
+        res = write_iso_and_go_on(bkpinfo, FALSE);  /* FALSE because this is not the last CD we'll write */
         retval += res;
         if (res) {
@@ -2685 +2686 @@
  * @c backup_media_type field is used in this function.
  * @param imagesdir The directory containing the floppy images (usually
- * /var/cache/mindi).
+ * /root/images/mindi).
  *
  * @return The number of errors encountered (0 for success)
@@ -2864 +2865 @@
     if (!bkpinfo->nonbootable_backup) {
 #ifdef __FreeBSD__
-        if (!does_file_exist("/var/cache/mindi/mindi-kern.1722.img"))
+        if (!does_file_exist("/root/images/mindi/mindi-kern.1722.img"))
 #else
-        if (!does_file_exist("/var/cache/mindi/mindi-bootroot.1722.img")
-            && !does_file_exist("/var/cache/mindi/mindi-boot.1440.img")
-            && !does_file_exist("/var/cache/mindi/mindi-boot.2880.img")
-            && !does_file_exist("/var/cache/mindi/mindi-boot.5760.img"))
+        if (!does_file_exist("/root/images/mindi/mindi-bootroot.1722.img")
+            && !does_file_exist("/root/images/mindi/mindi-boot.1440.img"))
 #endif
         {
             mvaddstr_and_log_it(g_currentY++, 74, "No Imgs");
-            if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
+            if (does_file_exist("/root/images/mindi/mondorescue.iso")) {
                 popup_and_OK
-                    ("Boot+data floppy creation failed. However, FYI, you may burn /var/cache/mindi/mondorescue.iso to a CD and boot from that instead if you wish.");
+                    ("Boot+data floppy creation failed. However, FYI, you may burn /root/images/mindi/mondorescue.iso to a CD and boot from that instead if you wish.");
                 res++;
             }
         } else {
-            offer_to_write_floppies(bkpinfo, "/var/cache/mindi");
+            offer_to_write_floppies(bkpinfo, "/root/images/mindi");
             mvaddstr_and_log_it(g_currentY++, 74, "Done.");
         }
@@ -3279 +3278 @@
  */
 int
-slice_up_file_etc(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *biggie_filename,
+slice_up_file_etc(struct s_bkpinfo *bkpinfo, char *biggie_filename,
                   char *ntfsprog_fifo, long biggie_file_number,
                   long noof_biggie_files, bool use_ntfsprog)
@@ -3409 +3408 @@
     } else {
         res =
-            move_files_to_cd(bkpinfo, mrconf,
+            move_files_to_cd(bkpinfo,
                              slice_fname(biggie_file_number, 0,
                                          bkpinfo->tmpdir, ""), NULL);
@@ -3511 +3510 @@
             res = move_files_to_stream(bkpinfo, file_to_archive, NULL);
         } else {
-            res = move_files_to_cd(bkpinfo, mrconf, file_to_archive, NULL);
+            res = move_files_to_cd(bkpinfo, file_to_archive, NULL);
         }
         retval += res;
@@ -3603 +3602 @@
  * however, this occurs rarely.
  */
-int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo)
 {
     /*@ int ***************************************************** */
@@ -3624 +3623 @@
     }
 #endif
-    res = write_iso_and_go_on(bkpinfo, struct s_mrconf *mrconf, TRUE);
+    res = write_iso_and_go_on(bkpinfo, TRUE);
 #ifndef _XWIN
     if (!g_text_mode) {
@@ -3653 +3652 @@
  * @see make_iso_fs
  */
-int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, bool last_cd)
+int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, bool last_cd)
 {
     /*@ pointers **************************************************** */
@@ -3729 +3728 @@
             g_current_media_number);
     for (that_one_was_ok = FALSE; !that_one_was_ok;) {
-        res = make_iso_fs(bkpinfo, mrconf, isofile);
+        res = make_iso_fs(bkpinfo, isofile);
         if (g_current_media_number == 1 && !res
             && (bkpinfo->backup_media_type == cdr
@@ -4031 +4030 @@
 setenv("MONDO_SHARE", MONDO_SHARE, 1);
 }
-
-void mrarchive_init_conf(struct s_mrconf *mrconf) {
-    char *command = NULL;
-    FILE *conffd = NULL;
-    FILE *fin = NULL;
-    int n = 0;
-    char *param = NULL;
-
-    mrconf = (struct s_mrconf *)malloc(sizeof(struct s_mrconf));
-    if (mrconf == NULL) {
-            fatal_error("Unable to malloc mrconf");
-    }
-    /* Default for everything int : 0 char * : NULL */
-
-    /* mindi conf parameters also needed in mondo */
-    mrconf->ia64_boot_size = 0;
-
-    asprintf(&command, "mindi -printvar IA64_BOOT_SIZE");
-    fin = popen(command, "r");
-    getline(&param, &n, fin);
-    pclose(fin);
-    paranoid_free(command);
-    mrconf->ia64_boot_size = atoi(param);
-    paranoid_free(param);
-
-    mrconf->iso_creation_cmd = NULL;
-
-    /* Finds mondo conf file */
-    mrconf_open(MONDO_CONF_DIR"/mondo.conf");
-
-    /* mondo conf parameters needed */
-    mrconf->iso_creation_cmd = mrconf_sread(iso_creation_cmd);
-
-    mrconf_close();

branches/stable/mondo/mondo/common/libmondo-archive.h

@@ -17 +17 @@
 int make_slices_and_images(struct s_bkpinfo *bkpinfo,
                            char *biggielist_fname);
-int make_iso_fs(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *destfile);
+int make_iso_fs(struct s_bkpinfo *bkpinfo, char *destfile);
 int make_afioballs_and_images(struct s_bkpinfo *bkpinfo);
 extern int (*move_files_to_cd) (struct s_bkpinfo *, char *, ...);
@@ -42 +42 @@
 int archive_this_fileset_with_star(struct s_bkpinfo *bkpinfo,
                                    char *filelist, char *fname, int setno);
-void setenv_mondo_share(void);
+void setenv_mondo_lib(void);

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

@@ -232 +232 @@
 #include "libmondo-files-EXT.h"
 #include "libmondo-devices.h"
+#include "lib-common-externs.h"
 #include "libmondo-string-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "newt-specific-EXT.h"
+#include "libmondo-gui-EXT.h"
 #include "libmondo-fork-EXT.h"
 #include "libmondo-stream-EXT.h"
@@ -351 +352 @@
             && !does_file_exist("/tmp/mountlist.txt.sample")) {
             log_to_screen
-                (_("Using /dev/root is stupid of you but I'll forgive you."));
+                ("Using /dev/root is stupid of you but I'll forgive you.");
             is_this_a_ramdisk = FALSE;
         }
@@ -379 +380 @@
     switch (bt) {
     case none:
-        strcpy(output, _("none"));
+        strcpy(output, "none");
         break;
     case iso:
-        strcpy(output, _("iso"));
+        strcpy(output, "iso");
         break;
     case cdr:
-        strcpy(output, _("cdr"));
+        strcpy(output, "cdr");
         break;
     case cdrw:
-        strcpy(output, _("cdrw"));
+        strcpy(output, "cdrw");
         break;
     case cdstream:
-        strcpy(output, _("cdstream"));
+        strcpy(output, "cdstream");
         break;
     case nfs:
-        strcpy(output, _("nfs"));
+        strcpy(output, "nfs");
         break;
     case tape:
-        strcpy(output, _("tape"));
+        strcpy(output, "tape");
         break;
     case udev:
-        strcpy(output, _("udev"));
+        strcpy(output, "udev");
         break;
     default:
-        strcpy(output, _("default"));
+        strcpy(output, "default");
     }
     return (output);
@@ -694 +695 @@
     if (!dev[0] || (res = mount_CDROM_here(dev, mountpoint))) {
         if (!popup_and_get_string
-            (_("CD-ROM device"), _("Please enter your CD-ROM's /dev device"),
+            ("CD-ROM device", "Please enter your CD-ROM's /dev device",
              dev, MAX_STR_LEN / 4)) {
             res = 1;
@@ -702 +703 @@
     }
     if (res) {
-        log_msg(1, _("mount failed"));
+        log_msg(1, "mount failed");
     } else {
-        log_msg(1, _("mount succeeded with %s"), dev);
+        log_msg(1, "mount succeeded with %s", dev);
     }
     paranoid_free(dev);
@@ -1771 +1772 @@
             }
             if (res) {
-                log_to_screen(_("WARNING - failed to unmount CD-ROM drive"));
+                log_to_screen("WARNING - failed to unmount CD-ROM drive");
             }
             if (!bkpinfo->please_dont_eject) {
@@ -1779 +1780 @@
             }
             if (res) {
-                log_to_screen(_("WARNING - failed to eject CD-ROM disk"));
+                log_to_screen("WARNING - failed to eject CD-ROM disk");
             }
             popup_and_OK(request);
@@ -1840 +1841 @@
         which_backup_media_type(bkpinfo->restore_data);
     if (bkpinfo->backup_media_type == none) {
-        log_to_screen(_("User has chosen not to backup the PC"));
+        log_to_screen("User has chosen not to backup the PC");
         finish(1);
     }
     if (bkpinfo->backup_media_type == tape && bkpinfo->restore_data) {
-        popup_and_OK(_("Please remove CD/floppy from drive(s)"));
+        popup_and_OK("Please remove CD/floppy from drive(s)");
     }
     log_msg(3, "media type = %s",
@@ -1879 +1880 @@
         if (archiving_to_media) {
             if (ask_me_yes_or_no
-                (_("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")))
+                ("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?"))
             {
                 bkpinfo->manual_cd_tray = TRUE;
@@ -1885 +1886 @@
             if ((bkpinfo->compression_level =
                  which_compression_level()) == -1) {
-                log_to_screen(_("User has chosen not to backup the PC"));
+                log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
-            sprintf(comment, _("What speed is your %s (re)writer?"),
+            sprintf(comment, "What speed is your %s (re)writer?",
                     media_descriptor_string(bkpinfo->backup_media_type));
             if (bkpinfo->backup_media_type == dvd) {
@@ -1902 +1903 @@
             }
             if (bkpinfo->backup_media_type != dvd) {
-                if (!popup_and_get_string(_("Speed"), comment, tmp, 4)) {
-                    log_to_screen(_("User has chosen not to backup the PC"));
+                if (!popup_and_get_string("Speed", comment, tmp, 4)) {
+                    log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
@@ -1909 +1910 @@
             bkpinfo->cdrw_speed = atoi(tmp);    // if DVD then this shouldn't ever be used anyway :)
             sprintf(comment,
-                    _("How much data (in Megabytes) will each %s store?"),
+                    "How much data (in Megabytes) will each %s store?",
                     media_descriptor_string(bkpinfo->backup_media_type));
             if (!popup_and_get_string("Size", comment, sz_size, 5)) {
-                log_to_screen(_("User has chosen not to backup the PC"));
+                log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
@@ -1919 +1920 @@
             }
             if (bkpinfo->media_size[0] <= 0) {
-                log_to_screen(_("User has chosen not to backup the PC"));
+                log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
@@ -1940 +1941 @@
                         bkpinfo->media_device);
                 sprintf(comment,
-                        _("Please specify your %s drive's /dev entry"),
+                        "Please specify your %s drive's /dev entry",
                         media_descriptor_string(bkpinfo->
                                                 backup_media_type));
                 if (!popup_and_get_string
-                    (_("Device?"), comment, bkpinfo->media_device,
+                    ("Device?", comment, bkpinfo->media_device,
                      MAX_STR_LEN / 4)) {
-                    log_to_screen(_("User has chosen not to backup the PC"));
+                    log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
@@ -1959 +1960 @@
             if (bkpinfo->media_device[0]) {
                 sprintf(tmp,
-                        _("I think I've found your %s burner at SCSI node %s; am I right on the money?"),
+                        "I think I've found your %s burner at SCSI node %s; am I right on the money?",
                         media_descriptor_string(bkpinfo->
                                                 backup_media_type),
@@ -1969 +1970 @@
             if (!bkpinfo->media_device[0]) {
                 if (g_kernel_version < 2.6) {
-                    i = popup_and_get_string(_("Device node?"),
-                                             _("What is the SCSI node of your CD (re)writer, please?"),
+                    i = popup_and_get_string("Device node?",
+                                             "What is the SCSI node of your CD (re)writer, please?",
                                              bkpinfo->media_device,
                                              MAX_STR_LEN / 4);
                 } else {
-                    i = popup_and_get_string(_("/dev entry?"),
-                                             _("What is the /dev entry of your CD (re)writer, please?"),
+                    i = popup_and_get_string("/dev entry?",
+                                             "What is the /dev entry of your CD (re)writer, please?",
                                              bkpinfo->media_device,
                                              MAX_STR_LEN / 4);
                 }
                 if (!i) {
-                    log_to_screen(_("User has chosen not to backup the PC"));
+                    log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
@@ -1993 +1994 @@
     case udev:
         if (!ask_me_yes_or_no
-            (_("This option is for advanced users only. Are you sure?"))) {
-            log_to_screen(_("User has chosen not to backup the PC"));
+            ("This option is for advanced users only. Are you sure?")) {
+            log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
@@ -2000 +2001 @@
 
         if (find_tape_device_and_size(bkpinfo->media_device, sz_size)) {
-            log_msg(3, _("Ok, using vanilla scsi tape."));
+            log_msg(3, "Ok, using vanilla scsi tape.");
             strcpy(bkpinfo->media_device, VANILLA_SCSI_TAPE);
             if ((fin = fopen(bkpinfo->media_device, "r"))) {
@@ -2018 +2019 @@
             }
             sprintf(tmp,
-                    _("I think I've found your tape streamer at %s; am I right on the money?"),
+                    "I think I've found your tape streamer at %s; am I right on the money?",
                     bkpinfo->media_device);
         }
         if (bkpinfo->media_device[0]) {
             sprintf(tmp,
-                    _("I think I've found your tape streamer at %s; am I right on the money?"),
+                    "I think I've found your tape streamer at %s; am I right on the money?",
                     bkpinfo->media_device);
             if (!ask_me_yes_or_no(tmp)) {
@@ -2031 +2032 @@
         if (!bkpinfo->media_device[0]) {
             if (!popup_and_get_string
-                (_("Device name?"),
-                 _("What is the /dev entry of your tape streamer?"),
+                ("Device name?",
+                 "What is the /dev entry of your tape streamer?",
                  bkpinfo->media_device, MAX_STR_LEN / 4)) {
-                log_to_screen(_("User has chosen not to backup the PC"));
+                log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
@@ -2040 +2041 @@
         sprintf(tmp, "ls -l %s", bkpinfo->media_device);
         if (run_program_and_log_output(tmp, FALSE)) {
-            log_to_screen(_("User has not specified a valid /dev entry"));
+            log_to_screen("User has not specified a valid /dev entry");
             finish(1);
         }
@@ -2068 +2069 @@
             if ((bkpinfo->compression_level =
                  which_compression_level()) == -1) {
-                log_to_screen(_("User has chosen not to backup the PC"));
+                log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
@@ -2089 +2090 @@
         {
             if (!popup_and_get_string
-                (_("NFS dir."),
-                 _("Please enter path and directory where archives are stored remotely. (Mondo has taken a guess at the correct value. If it is incorrect, delete it and type the correct one.)"),
+                ("NFS dir.",
+                 "Please enter path and directory where archives are stored remotely. (Mondo has taken a guess at the correct value. If it is incorrect, delete it and type the correct one.)",
                  bkpinfo->nfs_mount, MAX_STR_LEN / 4)) {
-                log_to_screen(_("User has chosen not to backup the PC"));
+                log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
@@ -2098 +2099 @@
                 if ((bkpinfo->compression_level =
                      which_compression_level()) == -1) {
-                    log_to_screen(_("User has chosen not to backup the PC"));
+                    log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
@@ -2113 +2114 @@
 
             sprintf(comment,
-                    _("How much data (in Megabytes) will each media store?"));
-            if (!popup_and_get_string(_("Size"), comment, sz_size, 5)) {
-                log_to_screen(_("User has chosen not to backup the PC"));
+                    "How much data (in Megabytes) will each media store?");
+            if (!popup_and_get_string("Size", comment, sz_size, 5)) {
+                log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
@@ -2122 +2123 @@
             }
             if (bkpinfo->media_size[0] <= 0) {
-                log_to_screen(_("User has chosen not to backup the PC"));
+                log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
@@ -2129 +2130 @@
             system("umount /tmp/isodir 2> /dev/null");
             if (!popup_and_get_string
-                (_("NFS share"), _("Which remote NFS share should I mount?"),
+                ("NFS share", "Which remote NFS share should I mount?",
                  bkpinfo->nfs_mount, MAX_STR_LEN)) {
-                log_to_screen(_("User has chosen not to backup the PC"));
+                log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
@@ -2148 +2149 @@
         if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
             popup_and_OK
-                (_("Please mount that partition before you try to backup to or restore from it."));
+                ("Please mount that partition before you try to backup to or restore from it.");
             finish(1);
         }
         strcpy(tmp, bkpinfo->nfs_remote_dir);
         if (!popup_and_get_string
-            (_("Directory"), _("Which directory within that mountpoint?"), tmp,
+            ("Directory", "Which directory within that mountpoint?", tmp,
              MAX_STR_LEN)) {
-            log_to_screen(_("User has chosen not to backup the PC"));
+            log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
@@ -2166 +2167 @@
             strcpy(tmp, bkpinfo->nfs_remote_dir);
             sprintf(prompt,
-                    _("Directory '%s' under mountpoint '%s' does not exist or is not writable. You can fix this or change the directory and retry or cancel the backup."),
+                    "Directory '%s' under mountpoint '%s' does not exist or is not writable. You can fix this or change the directory and retry or cancel the backup.",
                     bkpinfo->nfs_remote_dir, bkpinfo->isodir);
             if (!popup_and_get_string
-                (_("Directory"), prompt, tmp, MAX_STR_LEN)) {
-                log_to_screen(_("User has chosen not to backup the PC"));
+                ("Directory", prompt, tmp, MAX_STR_LEN)) {
+                log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
@@ -2180 +2181 @@
         }
         if (!popup_and_get_string
-            (_("Prefix."),
-             _("Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files"),
+            ("Prefix.",
+             "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files",
             bkpinfo->prefix, MAX_STR_LEN / 4)) {
-            log_to_screen(_("User has chosen not to backup the PC"));
+            log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
@@ -2199 +2200 @@
         if (!bkpinfo->disaster_recovery) {
             if (!popup_and_get_string
-                (_("Storage dir."),
-                 _("Please enter the full path that contains your ISO images.  Example: /mnt/raid0_0"),
+                ("Storage dir.",
+                 "Please enter the full path that contains your ISO images.  Example: /mnt/raid0_0",
                  bkpinfo->isodir, MAX_STR_LEN / 4)) {
-                log_to_screen(_("User has chosen not to backup the PC"));
+                log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
@@ -2208 +2209 @@
                 if ((bkpinfo->compression_level =
                      which_compression_level()) == -1) {
-                    log_to_screen(_("User has chosen not to backup the PC"));
+                    log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
                 if (!popup_and_get_string
-                    (_("ISO size."),
-                     _("Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s or DVD's you plan to backup to."),
+                    ("ISO size.",
+                     "Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s or DVD's you plan to backup to.",
                      sz_size, 16)) {
-                    log_to_screen(_("User has chosen not to backup the PC"));
+                    log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
@@ -2222 +2223 @@
                 }
                 if (!popup_and_get_string
-                    (_("Prefix."),
-                     _("Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files"),
+                    ("Prefix.",
+                     "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files",
                      bkpinfo->prefix, MAX_STR_LEN / 4)) {
                     log_to_screen("User has chosen not to backup the PC");
@@ -2258 +2259 @@
 #ifdef __FreeBSD__
             if (!popup_and_get_string
-                (_("Boot device"),
-                 _("What is your boot device? (e.g. /dev/ad0)"),
+                ("Boot device",
+                 "What is your boot device? (e.g. /dev/ad0)",
                  bkpinfo->boot_device, MAX_STR_LEN / 4)) {
-                log_to_screen(_("User has chosen not to backup the PC"));
+                log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
@@ -2267 +2268 @@
 #else
             if (!popup_and_get_string
-                (_("Boot device"),
-                 _("What is your boot device? (e.g. /dev/hda)"),
+                ("Boot device",
+                 "What is your boot device? (e.g. /dev/hda)",
                  bkpinfo->boot_device, MAX_STR_LEN / 4)) {
-                log_to_screen(_("User has chosen not to backup the PC"));
+                log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
@@ -2290 +2291 @@
             if (i == 'U') {
                 if (ask_me_yes_or_no
-                    (_("Unidentified boot loader. Shall I restore it byte-for-byte at restore time and hope for the best?")))
+                    ("Unidentified boot loader. Shall I restore it byte-for-byte at restore time and hope for the best?"))
                 {
                     i = 'R';    // raw
                 } else {
                     log_to_screen
-                        (_("I cannot find your boot loader. Please run mondoarchive with parameters."));
+                        ("I cannot find your boot loader. Please run mondoarchive with parameters.");
                     finish(1);
                 }
@@ -2303 +2304 @@
         strcpy(bkpinfo->include_paths, "/");
         if (!popup_and_get_string
-            (_("Backup paths"),
-             _("Please enter paths which you want me to backup. The default is '/' (i.e. everything)."),
+            ("Backup paths",
+             "Please enter paths which you want me to backup. The default is '/' (i.e. everything).",
              bkpinfo->include_paths, MAX_STR_LEN)) {
-            log_to_screen(_("User has chosen not to backup the PC"));
+            log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
@@ -2322 +2323 @@
         if (strlen(tmp) > 2) {
             if (!popup_and_get_string
-                (_("NTFS partitions"),
-                 _("Please enter/confirm the NTFS partitions you wish to backup as well."),
+                ("NTFS partitions",
+                 "Please enter/confirm the NTFS partitions you wish to backup as well.",
                  tmp, MAX_STR_LEN / 4)) {
-                log_to_screen(_("User has chosen not to backup the PC"));
+                log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
@@ -2333 +2334 @@
 
         if (!popup_and_get_string
-            (_("Exclude paths"),
-             _("Please enter paths which you do NOT want to backup. Separate them with spaces. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup."),
+            ("Exclude paths",
+             "Please enter paths which you do NOT want to backup. Separate them with spaces. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup.",
              bkpinfo->exclude_paths, MAX_STR_LEN)) {
-            log_to_screen(_("User has chosen not to backup the PC"));
+            log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
@@ -2343 +2344 @@
         bkpinfo->verify_data =
             ask_me_yes_or_no
-            (_("Will you want to verify your backups after Mondo has created them?"));
+            ("Will you want to verify your backups after Mondo has created them?");
 
 #ifndef __FreeBSD__
         if (!ask_me_yes_or_no
-            (_("Are you confident that your kernel is a sane, sensible, standard Linux kernel? Say 'no' if you are using a Gentoo <1.4 or Debian <3.0, please.")))
+            ("Are you confident that your kernel is a sane, sensible, standard Linux kernel? Say 'no' if you are using a Gentoo <1.4 or Debian <3.0, please."))
 #endif
         {
@@ -2354 +2355 @@
 
         if (!ask_me_yes_or_no
-            (_("Are you sure you want to proceed? Hit 'no' to abort."))) {
-            log_to_screen(_("User has chosen not to backup the PC"));
+            ("Are you sure you want to proceed? Hit 'no' to abort.")) {
+            log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }

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

@@ -178 +178 @@
     if (!res) {
         bufsize++;
-        sprintf(tmp, _("Negotiated max buffer of %d MB "), bufsize);
+        sprintf(tmp, "Negotiated max buffer of %d MB ", bufsize);
         log_to_screen(tmp);
     } else {
@@ -184 +184 @@
         res = 0;
         log_to_screen
-            (_("Cannot negotiate a buffer of ANY size. Using dd instead."));
+            ("Cannot negotiate a buffer of ANY size. Using dd instead.");
     }
     if (direction == 'r') {
@@ -220 +220 @@
     if (run_program_and_log_output(command, 1)) {
         fres = NULL;
-        log_to_screen(_("Failed to open tape streamer. Buffer error."));
-    } else {
-        log_to_screen(_("Buffer successfully started."));
+        log_to_screen("Failed to open tape streamer. Buffer error.");
+    } else {
+        log_to_screen("Buffer successfully started.");
     }
 

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);

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

@@ -88 +88 @@
 #include "libmondo-files.h"
 
+#include "lib-common-externs.h"
+
 #include "libmondo-tools-EXT.h"
-#include "newt-specific-EXT.h"
+#include "libmondo-gui-EXT.h"
 #include "libmondo-devices-EXT.h"
 #include "libmondo-fork-EXT.h"
@@ -360 +362 @@
     while (!kernel[0]) {
         if (!ask_me_yes_or_no
-            (_("Kernel not found or invalid. Choose another?"))) {
+            ("Kernel not found or invalid. Choose another?")) {
             return (1);
         }
         if (!popup_and_get_string
-            (_("Kernel path"),
-             _("What is the full path and filename of your kernel, please?"),
+            ("Kernel path",
+             "What is the full path and filename of your kernel, please?",
              kernel, MAX_STR_LEN / 4)) {
             fatal_error
@@ -573 +575 @@
 
     if (!does_file_exist(filename)) {
-        sprintf(tmp, "Trying to get last line of nonexistent file (%s)",
+        sprintf(tmp, "Tring to get last line of nonexistent file (%s)",
                 filename);
         log_it(tmp);
@@ -662 +664 @@
         log_OS_error("Unable to openout cksumlist");
         paranoid_fclose(fin);
-        log_to_screen(_("Can't open checksum list"));
+        log_to_screen("Can't open checksum list");
         return (1);
     }
@@ -687 +689 @@
                     time_taken * 100 / (long) (percentage) - time_taken;
                 sprintf(tmp,
-                        _("%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s"),
+                        "%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s\r",
                         percentage, (int) (time_taken / 60),
                         (int) (time_taken % 60),
@@ -1027 +1029 @@
     sprintf(command, "which %s > /dev/null 2> /dev/null", fname);
     sprintf(errorstr,
-            _("Please install '%s'. I cannot find it on your system."),
+            "Please install '%s'. I cannot find it on your system.",
             fname);
     if (system(command)) {
         log_to_screen(errorstr);
         log_to_screen
-            (_("There may be hyperlink at http://www.mondorescue.com which"));
-        log_to_screen(_("will take you to the relevant (missing) package."));
+            ("There may be hyperlink at http://www.mondorescue.com which");
+        log_to_screen("will take you to the relevant (missing) package.");
         return (1);
     } else {
@@ -1148 +1150 @@
         fatal_error("Failed to copy Mondo's stuff to scratchdir");
     }
-
-    /* i18n */
-    sprintf(command, CP_BIN " --parents /usr/share/locale/*/LC_MESSAGES/mondo.mo %s",bkpinfo->scratchdir);
-    log_msg(4, "command = %s", command);
-    run_program_and_log_output(command, 1);
 
     sprintf(tmp, "%s/payload.tgz", g_mondo_home);
@@ -1387 +1384 @@
     if (scratchLL <= 1) {
         sprintf(tmp,
-                _("Your backup will probably occupy a single %s. Maybe two."),
+                "Your backup will probably occupy a single %s. Maybe two.",
                 media_descriptor_string(bkpinfo->backup_media_type));
     } else if (scratchLL > 4) {
         sprintf(tmp,
-                _("Your backup will occupy one meeeeellion media! (maybe %s)"),
+                "Your backup will occupy one meeeeellion media! (maybe %s)",
                 number_to_text((int) (scratchLL + 1)));
     } else {
-        sprintf(tmp, _("Your backup will occupy approximately %s media."),
+        sprintf(tmp, "Your backup will occupy approximately %s media.",
                 number_to_text((int) (scratchLL + 1)));
     }

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

@@ -106 +106 @@
 #include "libmondo-fork.h"
 #include "libmondo-string-EXT.h"
-#include "newt-specific-EXT.h"
+#include "libmondo-gui-EXT.h"
 #include "libmondo-files-EXT.h"
 #include "libmondo-tools-EXT.h"
+#include "lib-common-externs.h"
 
 /*@unused@*/
@@ -162 +163 @@
 
 
-#define MONDO_POPMSG  _("Your PC will not retract the CD tray automatically. Please call mondoarchive with the -m (manual CD tray) flag.")
+#define MONDO_POPMSG  "Your PC will not retract the CD tray automatically. Please call mondoarchive with the -m (manual CD tray) flag."
 
 /**
@@ -233 +234 @@
 
     log_to_screen
-        (_("Please be patient. Do not be alarmed by on-screen inactivity."));
+        ("Please be patient. Do not be alarmed by on-screen inactivity.");
     log_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'",
             what_i_am_doing);
@@ -261 +262 @@
         if (retval) {
             log_msg(2, "Basic call '%s' returned an error.", basic_call);
-            popup_and_OK(_("Press ENTER to continue."));
+            popup_and_OK("Press ENTER to continue.");
             popup_and_OK
-                (_("mkisofs and/or cdrecord returned an error. CD was not created"));
+                ("mkisofs and/or cdrecord returned an error. CD was not created");
         }
     }
@@ -447 +448 @@
     if (!(fin = popen(command, "r"))) {
         log_OS_error("Unable to popen-in command");
-        sprintf(tmp, _("Failed utterly to call '%s'"), command);
+        sprintf(tmp, "Failed utterly to call '%s'", command);
         log_to_screen(tmp);
         return (1);
     }
     if (!does_file_exist(lockfile)) {
-        log_to_screen(_("Waiting for external binary to start"));
+        log_to_screen("Waiting for external binary to start");
         for (i = 0; i < 60 && !does_file_exist(lockfile); sleep(1), i++) {
             log_msg(3, "Waiting for lockfile %s to exist", lockfile);
@@ -711 +712 @@
         if (pcno <= 5 && last_pcno > 40) {
             close_evalcall_form();
-            strcpy(title, _("Verifying..."));
+            strcpy(title, "Verifying...");
             open_evalcall_form(title);
         }
@@ -799 +800 @@
         if (pcno <= 5 && last_pcno >= 40) {
             close_evalcall_form();
-            strcpy(title, _("Verifying..."));
+            strcpy(title, "Verifying...");
             open_evalcall_form(title);
         }

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

@@ -53 +53 @@
 #include "mondostructures.h"
 #include "libmondo-mountlist.h"
+#include "lib-common-externs.h"
 #include "libmondo-raid-EXT.h"
 #include "libmondo-devices-EXT.h"
 #include "libmondo-tools-EXT.h"
 #include "libmondo-string-EXT.h"
-#include "newt-specific-EXT.h"
+#include "libmondo-gui-EXT.h"
 
 /*@unused@*/
@@ -950 +951 @@
     if (!(fin = fopen(fname, "r"))) {
         log_it("Unable to open mountlist - '%s'", fname);
-        log_to_screen(_("Cannot open mountlist"));
+        log_to_screen("Cannot open mountlist");
         paranoid_free(incoming);
         paranoid_free(siz);
@@ -993 +994 @@
             && mountlist->el[items].device[0] != '#') {
             if (items >= ARBITRARY_MAXIMUM) {
-                log_to_screen(_("Too many lines in mountlist.. ABORTING"));
+                log_to_screen("Too many lines in mountlist.. ABORTING");
                 finish(1);
             }

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

@@ -42 +42 @@
 #include "my-stuff.h"
 #include "mondostructures.h"
-#include "newt-specific-EXT.h"
+#include "libmondo-gui-EXT.h"
 #include "libmondo-files-EXT.h"
 #include "libmondo-tools-EXT.h"
 #include "libmondo-string-EXT.h"
+#include "lib-common-externs.h"
 #include "libmondo-raid.h"
 
@@ -957 +958 @@
                     ("Oh my gosh. You actually think a YOTTABYTE will get you anywhere? What're you going to do with 1,208,925,819,614,629,174,706,176 bytes?!?!");
                 popup_and_OK
-                    (_("That sizespec is more than 1,208,925,819,614,629,174,706,176 bytes. You have a shocking amount of data. Please send a screenshot to the list :-)"));
+                    ("That sizespec is more than 1,208,925,819,614,629,174,706,176 bytes. You have a shocking amount of data. Please send a screenshot to the list :-)");
                 return size * sign * 1024 * 1024 * 1024 * 1024 * 1024 *
                     1024 * 1024 * 1024;
@@ -1112 +1113 @@
         // FIXME --- the above line does not allow for spare disks
         log_to_screen
-            (_("FIXME - create_raidtab_from_mdstat does not allow for spare disks"));
+            ("FIXME - create_raidtab_from_mdstat does not allow for spare disks");
     }
     raidlist->entries = i;

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

@@ -100 +100 @@
 #include "mondostructures.h"
 #include "libmondo-devices.h"
+#include "lib-common-externs.h"
 #include "libmondo-stream.h"
 #include "libmondo-string-EXT.h"
 #include "libmondo-files-EXT.h"
-#include "newt-specific-EXT.h"
+#include "libmondo-gui-EXT.h"
 #include "libmondo-fork-EXT.h"
 #include "libmondo-tools-EXT.h"
@@ -518 +519 @@
         //      log_it("g_current_media_number = %d", g_current_media_number);
         sprintf(tmp,
-                _("When the tape drive goes quiet, please insert volume %d in this series."),
+                "When the tape drive goes quiet, please insert volume %d in this series.",
                 tapeno);
         popup_and_OK(tmp);
-        open_evalcall_form(_("Waiting while the tape drive settles"));
-    } else {
-        open_evalcall_form(_("Waiting while the tape drive rewinds"));
+        open_evalcall_form("Waiting while the tape drive settles");
+    } else {
+        open_evalcall_form("Waiting while the tape drive rewinds");
     }
 
@@ -730 +731 @@
                                 bkpinfo->internal_tape_block_size))) {
         log_OS_error(g_tape_fifo);
-        log_to_screen(_("Cannot openin stream device"));
+        log_to_screen("Cannot openin stream device");
         return (1);
     }
-    log_to_screen(_("Reading stream"));
+    log_to_screen("Reading stream");
     log_it("stream device = '%s'", bkpinfo->media_device);
 /* skip data disks */
     open_evalcall_form("Skipping data disks on stream");
-    log_to_screen(_("Skipping data disks on stream"));
+    log_to_screen("Skipping data disks on stream");
     if (!(fout = fopen(outfname, "w"))) {
         log_OS_error(outfname);
-        log_to_screen(_("Cannot openout datadisk all.tar.gz file"));
+        log_to_screen("Cannot openout datadisk all.tar.gz file");
         return (-1);
     }
     if (!(datablock = (char *) malloc(256 * 1024))) {
-        log_to_screen(_("Unable to malloc 256*1024"));
+        log_to_screen("Unable to malloc 256*1024");
         exit(1);
     }
@@ -821 +822 @@
         return (0);
     } else {
-        log_to_screen(_("Failed to openout to cdstream (fifo)"));
+        log_to_screen("Failed to openout to cdstream (fifo)");
         return (1);
     }
@@ -854 +855 @@
          open_device_via_buffer(tapedev, 'w', internal_tape_block_size))) {
         log_OS_error(g_tape_fifo);
-        log_to_screen(_("Cannot openin stream device"));
+        log_to_screen("Cannot openin stream device");
         return (1);
     }
@@ -997 +998 @@
     if (!fout) {
         log_OS_error(outfname);
-        log_to_screen(_("Cannot openout file"));
+        log_to_screen("Cannot openout file");
         return (1);
     }
@@ -1055 +1056 @@
     }
     if (strcmp(temp_cksum, actual_cksum)) {
-        sprintf(tmp, _("actual cksum=%s; recorded cksum=%s"), actual_cksum,
+        sprintf(tmp, "actual cksum=%s; recorded cksum=%s", actual_cksum,
                 temp_cksum);
         log_to_screen(tmp);
-        sprintf(tmp, _("%s (%ld K) is corrupt on tape"), temp_fname,
+        sprintf(tmp, "%s (%ld K) is corrupt on tape", temp_fname,
                 (long) orig_size >> 10);
         log_to_screen(tmp);
@@ -1210 +1211 @@
         log_it("mediasize = %ld", mediasize);
         we_need_a_new_tape = TRUE;
-        log_to_screen(_("Should have started a new tape/CD already"));
+        log_to_screen("Should have started a new tape/CD already");
     }
     if ((g_tape_posK + length_of_incoming_file / 1024) >> 10 >=
@@ -1367 +1368 @@
                                 bkpinfo->internal_tape_block_size))) {
         log_OS_error(g_tape_fifo);
-        log_to_screen(_("Cannot openin stream device"));
+        log_to_screen("Cannot openin stream device");
         return (1);
     }
@@ -1405 +1406 @@
     if (g_current_media_number > MAX_NOOF_MEDIA) {
         res++;
-        log_to_screen(_("Too many tapes. Man, you need to use nfs!"));
+        log_to_screen("Too many tapes. Man, you need to use nfs!");
     }
     if (bkpinfo->backup_media_type == cdstream) {
@@ -1417 +1418 @@
         g_tape_stream = popen(command, "w");
         if (!g_tape_stream) {
-            log_to_screen(_("Failed to openout to cdstream (fifo)"));
+            log_to_screen("Failed to openout to cdstream (fifo)");
             return (1);
         }
@@ -1427 +1428 @@
                                     bkpinfo->internal_tape_block_size))) {
             log_OS_error(g_tape_fifo);
-            log_to_screen(_("Cannot openin stream device"));
+            log_to_screen("Cannot openin stream device");
             return (1);
         }
@@ -1512 +1513 @@
     /*@ end vars *************************************************** */
 
-    open_evalcall_form(_("Writing data disks to tape"));
-    log_to_screen(_("Writing data disks to tape"));
+    open_evalcall_form("Writing data disks to tape");
+    log_to_screen("Writing data disks to tape");
     log_it("Data disks = %s", fname);
     if (!does_file_exist(fname)) {
-        sprintf(tmp, _("Cannot find %s"), fname);
+        sprintf(tmp, "Cannot find %s", fname);
         log_to_screen(tmp);
         return (1);
@@ -1705 +1706 @@
     if (!g_tape_stream) {
         log_to_screen
-            (_("You're not backing up to tape. Why write a tape header?"));
+            ("You're not backing up to tape. Why write a tape header?");
         return (1);
     }
@@ -1750 +1751 @@
 
     /*@ end vars *************************************************** */
-    sprintf(tmp, _("Wrong marker! (Should be %s, "),
+    sprintf(tmp, "Wrong marker! (Should be %s, ",
             marker_to_string(should_be));
-    sprintf(tmp + strlen(tmp), _("is actually %s)"), marker_to_string(it_is));
+    sprintf(tmp + strlen(tmp), "is actually %s)", marker_to_string(it_is));
     log_to_screen(tmp);
 }

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

@@ -65 +65 @@
 #include "mondostructures.h"
 #include "libmondo-string.h"
+#include "lib-common-externs.h"
 #include "libmondo-files-EXT.h"
-#include "newt-specific-EXT.h"
+#include "libmondo-gui-EXT.h"
 #include "libmondo-tools-EXT.h"
 
@@ -296 +297 @@
             ("Oh my gosh. You actually think a YOTTABYTE will get you anywhere? What're you going to do with 1,208,925,819,614,629,174,706,176 bytes of data?!?!");
         popup_and_OK
-            (_("That sizespec is more than 1,208,925,819,614,629,174,706,176 bytes. You have a shocking amount of data. Please send a screenshot to the list :-)"));
+            ("That sizespec is more than 1,208,925,819,614,629,174,706,176 bytes. You have a shocking amount of data. Please send a screenshot to the list :-)");
         fatal_error("Integer overflow.");
     } else if (ch != 'm' && ch != 'M') {
@@ -983 +984 @@
     sev = 3;
     sprintf(reason,
-            _("Changed since backup. Consider running a differential backup in a day or two."));
+            "Changed since backup. Consider running a differential backup in a day or two.");
     if (!strncmp(filename, "/var/", 5)) {
         sev = 2;
         sprintf(reason,
-                _("/var's contents will change regularly, inevitably."));
+                "/var's contents will change regularly, inevitably.");
     }
     if (!strncmp(filename, "/home", 5)) {
         sev = 2;
         sprintf(reason,
-                _("It's in your /home partiton. Therefore, it is important."));
+                "It's in your /home partiton. Therefore, it is important.");
     }
     if (!strncmp(filename, "/usr/", 5)) {
         sev = 3;
         sprintf(reason,
-                _("You may have installed/removed software during the backup."));
+                "You may have installed/removed software during the backup.");
     }
     if (!strncmp(filename, "/etc/", 5)) {
         sev = 3;
         sprintf(reason,
-                _("Do not edit config files while backing up your PC."));
+                "Do not edit config files while backing up your PC.");
     }
     if (!strcmp(filename, "/etc/adjtime")
         || !strcmp(filename, "/etc/mtab")) {
         sev = 1;
-        sprintf(reason, _("This file changes all the time. It's OK."));
+        sprintf(reason, "This file changes all the time. It's OK.");
     }
     if (!strncmp(filename, "/root/", 6)) {
         sev = 3;
-        sprintf(reason, _("Were you compiling/editing something in /root?"));
+        sprintf(reason, "Were you compiling/editing something in /root?");
     }
     if (!strncmp(filename, "/root/.", 7)) {
         sev = 2;
-        sprintf(reason, _("Temp or 'dot' files changed in /root."));
+        sprintf(reason, "Temp or 'dot' files changed in /root.");
     }
     if (!strncmp(filename, "/var/lib/", 9)) {
         sev = 2;
-        sprintf(reason, _("Did you add/remove software during backing?"));
+        sprintf(reason, "Did you add/remove software during backing?");
     }
     if (!strncmp(filename, "/var/lib/rpm", 12)) {
         sev = 3;
-        sprintf(reason, _("Did you add/remove software during backing?"));
+        sprintf(reason, "Did you add/remove software during backing?");
     }
     if (!strncmp(filename, "/var/lib/slocate", 16)) {
         sev = 1;
         sprintf(reason,
-                _("The 'update' daemon ran during backup. This does not affect the integrity of your backup."));
+                "The 'update' daemon ran during backup. This does not affect the integrity of your backup.");
     }
     if (!strncmp(filename, "/var/log/", 9)
@@ -1035 +1036 @@
         sev = 1;
         sprintf(reason,
-                _("Log files change frequently as the computer runs. Fret not."));
+                "Log files change frequently as the computer runs. Fret not.");
     }
     if (!strncmp(filename, "/var/spool", 10)) {
         sev = 1;
         sprintf(reason,
-                _("Background processes or printers were active. This does not affect the integrity of your backup."));
+                "Background processes or printers were active. This does not affect the integrity of your backup.");
     }
     if (!strncmp(filename, "/var/spool/mail", 10)) {
         sev = 2;
-        sprintf(reason, _("Mail was sent/received during backup."));
+        sprintf(reason, "Mail was sent/received during backup.");
     }
     if (filename[strlen(filename) - 1] == '~') {
         sev = 1;
         sprintf(reason,
-                _("Backup copy of another file which was modified recently."));
+                "Backup copy of another file which was modified recently.");
     }
     if (strstr(filename, "cache")) {
         sev = 1;
         sprintf(reason,
-                _("Part of a cache of data. Caches change from time to time. Don't worry."));
+                "Part of a cache of data. Caches change from time to time. Don't worry.");
     }
     if (!strncmp(filename, "/var/run/", 9)
@@ -1131 +1132 @@
 //    { fatal_error( "percentage_media_full_comment() - unknown media size"); }
     {
-        sprintf(outstr, _("Volume %d: %s kilobytes archived so far"),
+        sprintf(outstr, "Volume %d: %s kilobytes archived so far",
                 g_current_media_number, pos_w_commas);
         return (outstr);
@@ -1144 +1145 @@
             percentage = 100;
         }
-        sprintf(outstr, _("Volume %d: ["), g_current_media_number);
+        sprintf(outstr, "Volume %d: [", g_current_media_number);
     } else {
         percentage =
@@ -1160 +1161 @@
     }
     j = (int) strlen(outstr);
-    sprintf(outstr + j, _("] %d%% used"), percentage);
+    sprintf(outstr + j, "] %d%% used", percentage);
     paranoid_free(pos_w_commas);
     paranoid_free(tmp);

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

@@ -174 +174 @@
 #include "my-stuff.h"
 #include "mondostructures.h"
+#include "lib-common-externs.h"
 #include "libmondo-tools.h"
-#include "newt-specific-EXT.h"
+#include "libmondo-gui-EXT.h"
 #include "libmondo-files-EXT.h"
 #include "libmondo-fork-EXT.h"
@@ -270 +271 @@
         newtSuspend();
 #endif
-    printf(_("ASSERTION FAILED: `%s'\n"), exp);
-    printf(_("\tat %s:%d in %s\n\n"), file, line, function);
-    printf(_("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? "));
+    printf("ASSERTION FAILED: `%s'\n", exp);
+    printf("\tat %s:%d in %s\n\n", file, line, function);
+    printf("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? ");
     do {
         is_valid = TRUE;
@@ -299 +300 @@
         case '\n':
             printf
-                (_("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? "));
+                ("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? ");
             break;
         default:
             is_valid = FALSE;
-            printf(_("Invalid choice.\n"));
+            printf("Invalid choice.\n");
             break;
         }
@@ -472 +473 @@
 #endif
 }
+
+
+/**
+ * Log a trace message to the trace file.
+ * @bug This function seems orphaned. Please remove.
+ */
+void log_trace(char *o)
+{
+    /*@ pointers **************************************************** */
+    FILE *fout;
+
+    /*@ buffers ***************************************************** */
+    char output[MAX_STR_LEN];
+
+    /*@ int    ****************************************************** */
+    int i;
+
+    /*@ end vars *************************************************** */
+
+    if (o[0] == '\0') {
+        return;
+    }
+    strcpy(output, o);
+    i = (int) strlen(output);
+    if (i <= 0) {
+        return;
+    }
+    if (output[i - 1] < 32) {
+        output[i - 1] = '\0';
+    }
+    if (g_text_mode
+        /* && !strstr(last_line_of_file(MONDO_LOGFILE),output) */ ) {
+        printf("%s\n", output);
+    }
+
+    fout = fopen(MONDO_TRACEFILE, "a");
+    if (fout) {
+        fprintf(fout, "%s\n", output);
+        paranoid_fclose(fout);
+    } else {
+        log_OS_error("Cannot write to tracefile");
+    }
+}
+
+
+
 
 
@@ -923 +970 @@
         strcpy(bkpinfo->isodir, "/");
     } else {
-        strcpy(bkpinfo->isodir, "/var/cache/mondo/iso");
+        strcpy(bkpinfo->isodir, "/root/images/mondo");
     }
     strcpy(bkpinfo->prefix, STD_PREFIX);
@@ -1022 +1069 @@
     if (atol(tmp) < 35000) {
         retval++;
-        log_to_screen(_("You must have at least 32MB of RAM to use Mondo."));
+        log_to_screen("You must have at least 32MB of RAM to use Mondo.");
     }
     if (atol(tmp) < 66000) {
         log_to_screen
-            (_("WARNING! You have very little RAM. Please upgrade to 64MB or more."));
-    }
-#endif
-
-    if ((Lres = free_space_on_given_partition("/var/cache/mondo")) == -1) /* {
+            ("WARNING! You have very little RAM. Please upgrade to 64MB or more.");
+    }
+#endif
+
+    if ((Lres = free_space_on_given_partition("/root")) == -1) {
         Lres = free_space_on_given_partition("/");
     }
-    */
     log_it("Free space on given partition = %ld MB", Lres);
 
     if (Lres < 50) {
-        fatal_error("Your /var/cache/mondo partition has <50MB free. Please adjust your partition table to something saner."); 
+        run_program_and_log_output
+            ("rm -Rf /root/images/mindi; mkdir -p /home/root/images/mindi; mkdir -p /root/images; ln -sf /home/root/images/mindi /root/images/mindi",
+             3);
+        //      fatal_error("Your / (or /root) partition has <50MB free. Please adjust your partition table to something saner."); 
     }
 
@@ -1051 +1100 @@
         ("grep ramdisk /proc/devices", FALSE)) {
         if (!ask_me_yes_or_no
-            (_("Your kernel has no ramdisk support. That's mind-numbingly stupid but I'll allow it if you're planning to use a failsafe kernel. Are you?")))
+            ("Your kernel has no ramdisk support. That's mind-numbingly stupid but I'll allow it if you're planning to use a failsafe kernel. Are you?"))
         {
             //          retval++;
             log_to_screen
-                (_("It looks as if your kernel lacks ramdisk and initrd support."));
+                ("It looks as if your kernel lacks ramdisk and initrd support.");
             log_to_screen
-                (_("I'll allow you to proceed but FYI, if I'm right, your kernel is broken."));
+                ("I'll allow you to proceed but FYI, if I'm right, your kernel is broken.");
         }
     }
@@ -1079 +1128 @@
         !run_program_and_log_output
         ("mount | grep -w dos | grep -v /dev/fd | grep -v nexdisk", 0)) {
-        log_to_screen(_("I think you have a Windows 9x partition."));
+        log_to_screen("I think you have a Windows 9x partition.");
         retval += whine_if_not_found("parted");
 #ifndef __IA64__
@@ -1085 +1134 @@
         // retval += 
         if (!find_home_of_exe("ms-sys")) {
-            log_to_screen(_("Please install ms-sys just in case."));
+            log_to_screen("Please install ms-sys just in case.");
         }
 #endif
@@ -1095 +1144 @@
         } else {
             log_to_screen
-                (_("Your system lacks the 'cmp' binary. I'll create a dummy cmp for you."));
+                ("Your system lacks the 'cmp' binary. I'll create a dummy cmp for you.");
             if (run_program_and_log_output
                 ("cp -f `which true` /usr/bin/cmp", 0)) {
@@ -1110 +1159 @@
         if (strstr(tmp, "autofs")) {
             log_to_screen
-                (_("Your CD-ROM is mounted via autofs. I therefore cannot tell"));
+                ("Your CD-ROM is mounted via autofs. I therefore cannot tell");
             log_to_screen
-                (_("if a CD actually is inserted. If a CD is inserted, please"));
-            log_to_screen(_("eject it. Thank you."));
+                ("if a CD actually is inserted. If a CD is inserted, please");
+            log_to_screen("eject it. Thank you.");
             log_it
                 ("Ignoring autofs CD-ROM 'mount' since we hope nothing's in it.");
@@ -1139 +1188 @@
             retval++;
             log_to_screen
-                (_("Please find out what happened to /etc/modules.conf"));
+                ("Please find out what happened to /etc/modules.conf");
         }
     }
@@ -1152 +1201 @@
 
     if (run_program_and_log_output("mindi -V", 1)) {
-        log_to_screen(_("Could not ascertain mindi's version number."));
+        log_to_screen("Could not ascertain mindi's version number.");
         log_to_screen
-            (_("You have not installed Mondo and/or Mindi properly."));
-        log_to_screen(_("Please uninstall and reinstall them both."));
+            ("You have not installed Mondo and/or Mindi properly.");
+        log_to_screen("Please uninstall and reinstall them both.");
         fatal_error("Please reinstall Mondo and Mindi.");
     }
@@ -1161 +1210 @@
         ("mindi --makemountlist /tmp/mountlist.txt.test", 5)) {
         log_to_screen
-            (_("Mindi --makemountlist /tmp/mountlist.txt.test failed for some reason."));
+            ("Mindi --makemountlist /tmp/mountlist.txt.test failed for some reason.");
         log_to_screen
-            (_("Please run that command by hand and examine /var/log/mindi.log"));
+            ("Please run that command by hand and examine /var/log/mindi.log");
         log_to_screen
-            (_("for more information. Perhaps your /etc/fstab file is insane."));
+            ("for more information. Perhaps your /etc/fstab file is insane.");
         log_to_screen
-            (_("Perhaps Mindi's MakeMountlist() subroutine has a bug. We'll see."));
+            ("Perhaps Mindi's MakeMountlist() subroutine has a bug. We'll see.");
         retval++;
     }
@@ -1174 +1223 @@
         && !does_file_exist("/etc/raidtab")) {
         log_to_screen
-            (_("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat"));
+            ("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat");
         create_raidtab_from_mdstat("/etc/raidtab", "/proc/mdstat");
     }
 
     if (retval) {
-        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 (retval);
@@ -1443 +1492 @@
 }
 
+
+/**
+ * The standard log_debug_msg() (log_msg() also due to a macro). Writes some describing
+ * information to the logfile.
+ */
+void standard_log_debug_msg(int debug_level, const char *szFile,
+                            const char *szFunction, int nLine,
+                            const char *fmt, ...)
+{
+    va_list args;
+    int i;
+    static int depth = 0;
+    char *tmp;
+    FILE *fout;
+
+    if (depth > 5) {
+        depth--;
+        return;
+    }
+    depth++;
+
+    malloc_string(tmp);
+
+    if (debug_level <= g_loglevel) {
+        va_start(args, fmt);
+        if (!(fout = fopen(MONDO_LOGFILE, "a"))) {
+            return;
+        }                       // fatal_error("Failed to openout to logfile - sheesh..."); }
+
+        // add tabs to distinguish log levels
+        if (debug_level > 0) {
+            for (i = 1; i < debug_level; i++)
+                fprintf(fout, "\t");
+            if (getpid() == g_main_pid)
+                fprintf(fout, "[Main] %s->%s#%d: ", szFile, szFunction,
+                        nLine);
+            else if (getpid() == g_buffer_pid && g_buffer_pid > 0)
+                fprintf(fout, "[Buff] %s->%s#%d: ", szFile, szFunction,
+                        nLine);
+            else
+                fprintf(fout, "[TH=%d] %s->%s#%d: ", getpid(), szFile,
+                        szFunction, nLine);
+        }
+        vfprintf(fout, fmt, args);
+
+        // do not slow down the progran if standard debug level
+        // must be enabled: if no flush, the log won't be up-to-date if there
+        // is a segfault
+        //if (g_dwDebugLevel != 1)
+
+        va_end(args);
+        fprintf(fout, "\n");
+        paranoid_fclose(fout);
+    }
+    depth--;
+    paranoid_free(tmp);
+}
+
+/**
+ * Function pointer to the @c log_debug_msg function to use. Points to standard_log_debug_msg() by default.
+ */
+void (*log_debug_msg) (int, const char *, const char *, int, const char *,
+                       ...) = standard_log_debug_msg;
+
+
 /**
  * If @p y, malloc @p x, else free @p x.
@@ -1472 +1586 @@
         paranoid_free(g_magicdev_command);
     }
+
+    /*
+       char**list_of_arrays[] = {
+       &g_boot_mountpt,
+       &g_mondo_home,
+       &g_tmpfs_mountpt,
+       &g_erase_tmpdir_and_scratchdir,
+       &g_serial_string,
+       &g_magicdev_command,
+       NULL};
+
+       char**ppcurr;
+       int i;
+
+       for(i=0;list_of_arrays[i];i++)
+       {
+       log_msg(5, "Allocating %d", i);
+       ppcurr = list_of_arrays[i];
+       if (mal)
+       { *ppcurr = malloc(MAX_STR_LEN); }
+       else
+       {
+       if (*ppcurr)
+       {
+       free(*ppcurr);
+       }
+       }
+       }
+       log_msg(5, "Returning");
+     */
 }
 

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

@@ -103 +103 @@
 #include "mondostructures.h"
 #include "libmondo-verify.h"
-#include "newt-specific-EXT.h"
+#include "libmondo-gui-EXT.h"
 #include "libmondo-files-EXT.h"
 #include "libmondo-fork-EXT.h"
@@ -110 +110 @@
 #include "libmondo-devices-EXT.h"
 #include "libmondo-tools-EXT.h"
+#include "lib-common-externs.h"
 
 /*@unused@*/
@@ -757 +758 @@
                     orig_cksum);
             log_msg(2, tmp);
-            sprintf(tmp, _("%s has changed on live filesystem"),
+            sprintf(tmp, "%s has changed on live filesystem",
                     biggie_fname);
             log_to_screen(tmp);
@@ -810 +811 @@
     sprintf(curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
             bkpinfo->tmpdir);
-    log_to_screen(_("Verifying regular archives on tape"));
+    log_to_screen("Verifying regular archives on tape");
     total_afioballs = get_last_filelist_number(bkpinfo) + 1;
-    open_progress_form(_("Verifying filesystem"),
-                       _("I am verifying archives against your live filesystem now."),
-                       _("Please wait. This may take a couple of hours."), "",
+    open_progress_form("Verifying filesystem",
+                       "I am verifying archives against your live filesystem now.",
+                       "Please wait. This may take a couple of hours.", "",
                        total_afioballs);
     res = read_header_block_from_stream(&size, fname, &ctrl_chr);
@@ -853 +854 @@
         res = verify_an_afioball_from_stream(bkpinfo, fname, size);
         if (res) {
-            sprintf(tmp, _("Afioball %ld differs from live filesystem"),
+            sprintf(tmp, "Afioball %ld differs from live filesystem",
                     current_afioball_number);
             log_to_screen(tmp);
@@ -937 +938 @@
     noof_biggiefiles = (long) size;
     log_msg(1, "noof_biggiefiles = %ld", noof_biggiefiles);
-    open_progress_form(_("Verifying big files"), comment,
-                       _("Please wait. This may take some time."), "",
+    open_progress_form("Verifying big files", comment,
+                       "Please wait. This may take some time.", "",
                        noof_biggiefiles);
     for (res = read_header_block_from_stream(&size, orig_fname, &ctrl_chr);
@@ -954 +955 @@
             p++;
         }
-        sprintf(comment, _("Verifying bigfile #%ld (%ld K)"),
+        sprintf(comment, "Verifying bigfile #%ld (%ld K)",
                 current_biggiefile_number, (long) size >> 10);
         update_progress_form(comment);
@@ -1019 +1020 @@
 
     sprintf(mountpoint, "%s/cdrom", bkpinfo->tmpdir);
-    sprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir,
-            bkpinfo->prefix, g_current_media_number);
+    sprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->nfs_remote_dir,
+            bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
 
     mkdir(mountpoint, 1777);
@@ -1030 +1031 @@
         log_msg(2, tmp);
         if (bkpinfo->manual_cd_tray) {
-            popup_and_OK(_("Please push CD tray closed."));
+            popup_and_OK("Please push CD tray closed.");
         }
         if (find_and_mount_actual_cd(bkpinfo, mountpoint)) {
-            log_to_screen(_("failed to mount actual CD"));
+            log_to_screen("failed to mount actual CD");
             return (1);
         }
@@ -1043 +1044 @@
         mddevice = make_vn(fname);
         if (ret) {
-            sprintf(tmp, _("make_vn of %s failed; unable to verify ISO\n"),
+            sprintf(tmp, "make_vn of %s failed; unable to verify ISO\n",
                     fname);
             log_to_screen(tmp);
@@ -1054 +1055 @@
 #endif
         if (run_program_and_log_output(command, FALSE)) {
-            sprintf(tmp, _("%s failed; unable to mount ISO image\n"),
+            sprintf(tmp, "%s failed; unable to mount ISO image\n",
                     command);
             log_to_screen(tmp);
@@ -1132 +1133 @@
 
     log_msg(3, "verify_tape_backups --- starting");
-    log_to_screen(_("Verifying backups"));
+    log_to_screen("Verifying backups");
     openin_tape(bkpinfo);
 /* verify archives themselves */
@@ -1157 +1158 @@
             && length_of_file(changed_files_fname) > 2) {
             log_to_screen
-                (_("Warning - unable to check logfile to derive list of changed files"));
+                ("Warning - unable to check logfile to derive list of changed files");
         } else {
             log_to_screen
-                (_("No differences found. Therefore, no 'changed.files' text file."));
+                ("No differences found. Therefore, no 'changed.files' text file.");
         }
     }
@@ -1176 +1177 @@
         log_msg(0, tmp);
         log_to_screen
-            (_("See /tmp/changed.files for a list of nonmatching files."));
+            ("See /tmp/changed.files for a list of nonmatching files.");
         log_to_screen
-            (_("The files probably changed on filesystem, not on backup media."));
+            ("The files probably changed on filesystem, not on backup media.");
         //      retval++;
     }

branches/stable/mondo/mondo/common/libmondo.h

@@ -9 +9 @@
 #include "libmondo-files-EXT.h"
 #include "libmondo-fork-EXT.h"
-#include "newt-specific-EXT.h"
+#include "libmondo-gui-EXT.h"
 #include "libmondo-mountlist-EXT.h"
 #include "libmondo-raid-EXT.h"

branches/stable/mondo/mondo/common/mondostructures.h

@@ -477 +477 @@
    * If you do nothing, "/" will be used.
    */
-    char include_paths[MAX_STR_LEN*4];
+    char include_paths[MAX_STR_LEN];
 
   /**
@@ -484 +484 @@
    * the scratchdir, and the tempdir are automatically excluded.
    */
-    char exclude_paths[MAX_STR_LEN*4];
+    char exclude_paths[MAX_STR_LEN];
 
   /**
@@ -801 +801 @@
     struct s_mdrec el[MAXIMUM_RAID_DEVS];
 };
-
-struct s_mrconf {
-    int ia64_boot_size;
-    char *iso_creation_cmd;
-};

branches/stable/mondo/mondo/common/my-stuff.h

@@ -1 @@
-/*
- * Common defines across the project
- *
- *  $Id$
- */
-
-#ifndef _MY_STUFF_H_
-#define _MY_STUFF_H_
-
-/* BERLIOS
+/* my-stuff.h
+   $Id$
+.
+
+
+07/14
+- ARCH_THREADS is now 2; buffers, 4
+
+07/10
+- added acl, xattr stuff
+
+06/19
+- added AUX_VER
+
+06/14
+- added DO_MBR_PLEASE
+
+04/17
+- replaced INTERNAL_TAPE_BLK_SIZE with g_internal_tape_block_size
+  and DEFAULT_INTERNAL_TAPE_BLOCK_SIZE
+
+04/13
+- log_msg is now calling standard_log_debug_msg, not the alias (log_debug_msg)
+
+04/03/2004
+- added star and SELINUX support
+
+11/20/2003
+- boot from isolinux.bin, not mindi-boot.2880.img
+
+11/15
+- reduced SLICE_SIZE from 8192 to 4096
+
+10/08
+- set p-i-h volsize to 1GB
+
+10/21
+- added MNT_CDROM and FREELOADER
+
+10/11
+- added DEFAULT_DVD_DISK_SIZE
+- added PARTIMAGE_DEBUG_LEVEL
+
+09/27
+- better logging
+
+09/24
+- added MR_LOGFILE="/tmp/mondo-restore.log"
+
+09/22
+- added bool, FALSE, TRUE
+
+09/20
+- increasd PPCFG_RAMDISK_SIZE to 150
+
+09/12
+- reduced MAX_STR_LEN from 512 to 460
+
+09/10
+- moved PPCFG_RAMDISK_SIZE here
+
+09/05
+- better config.h stuff
+
+06/05
+- changed fgrep to grep
+
+05/19
+- added CP_BIN
+
+05/05
+- added #include <sys/param.h> and sys/sem.h and ioctl.h
+
+05/03
+- added kill_anything_like_this()
+
+04/24/2003
+- added *STUB #define's
+
+11/22/2002
+- added INTERNAL_TAPE_BLK_SIZE
+
+10/10
+- use #define to create XMondo-friendly log file name if appropriate
+
+08/30
+- changed ARBITRARY_MAXIMUM to 512
+
+08/26
+- set MAX_STR_LEN at 512 but halved it within many _structures_
+- changed ARBITRARY_MAXIMUM to 128
+
+08/08
+- added '#include <signal.h>'
+- added WELCOME_STRING
+
+06/19
+- changed tape block size from 8192 to 65536
+
+04/08
+- added manual_cd_tray flag to bkpinfo
+
+03/31
+- added restore_path to struct s_bkpinfo
+
+03/21
+- updated version# to 1.42
+
+02/20
+- added bkpinfo->using_cdstream
+
+02/06
+- added MONDO_VERSION
+
+02/02
+- added MONDO_CFG_FILE
+- added SLICE_SIZE
+
+01/31
+- removed MINDI_HOME: it is unnecessary
+- replaced MONDO_HOME with variable g_mondo_home
+
+01/25
+- added MONDO_HOME, MINDI_HOME
+
+01/21
+- added s_node{} structure
+
+01/17
+- added sys/shm.h, types.h, ipc.h
+
+01/02/2002
+- added that groovy bkpinfo{} stuff
+
+11/29/2001
+- added raidlist{} struct
+
+08/27
+- stuff
+*/
+
 #define HAVE_MALLOC 1
-*/
+
 
 // Extra info for ACLs and SELINUX users
@@ -27 +158 @@
  * Create the illusion of a Boolean type.
  */
-#define bool unsigned char
+#define bool int
 #define TRUE 1
 #define FALSE 0
 #endif
 
-/* BERLIOS
+#ifndef _MY_STUFF_H_
+#define _MY_STUFF_H_
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-*/
 
 #ifndef __FreeBSD__
@@ -49 +181 @@
 #include <stdio.h>
 #include <stdlib.h>
-/* BERLIOS
 #ifndef  __USE_FILE_OFFSET64
 #define  __USE_FILE_OFFSET64
@@ -56 +187 @@
 #define  __USE_LARGEFILE64
 #endif
-*/
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -66 +196 @@
 #include <unistd.h>
 #include <signal.h>
+//#include <curses.h>
 #include <newt.h>
 #include <ctype.h>
@@ -72 +203 @@
 #include <assert.h>
 
-/*
 #if defined(DEBUG) && !__cplusplus
 int count;
-char trace_log[255];
+char trace_log[255];            /*buffer for logging */
 char *trace_log_ptr;
-#endif
-*/
-
-#define STD_PREFIX "mondorescue"
+#endif                          /* DEBUG */
+
+#define IA64_BOOT_SIZE "8192"   /* Should be coherent with mindi */
+#define STD_PREFIX "mondorescue"    /* Should be coherent with mindi */
 
 /**
@@ -123 +253 @@
 #define CRC_M16 0xA001          ///< Mask for crc16.
 #define CRC_MTT 0x1021          ///< Mask for crc-ccitt.
+
+#define FALSE 0                 ///< The ubiquitous FALSE macro.
+#define TRUE 1                  ///< The even more ubiquitous TRUE macro.
 
 #define SCREEN_LENGTH 25        ///< The default size of the screen.
@@ -212 +345 @@
  * @c growisofs command to generate a bootable DVD using isolinux, except for the directory to image.
  */
-#define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -use-the-force-luke -J -no-emul-boot -boot-load-size 4 -b isolinux.bin --boot-info-table -c boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_ -v"
+#define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -speed=1 -use-the-force-luke -J -no-emul-boot -boot-load-size 4 -b isolinux.bin --boot-info-table -c boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_ -v"
 
 /**
  * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
      */// -b images/mindi-boot.2880.img
-#define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke -no-emul-boot -b images/mindi-boot.2880.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
+#define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -speed=1 -use-the-force-luke -no-emul-boot -b images/mindi-boot.2880.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
 
 /**
  * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
      */// -b images/mindi-boot.2880.img
-#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -no-emul-boot -b isolinux.bin -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
+#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -speed=1 -no-emul-boot -b isolinux.bin -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
 
 /**
  * @c growisofs command to generate a nonbootable DVD, except for the directory to image.
  */
-#define MONDO_GROWISOFS_NONBOOT          "growisofs -use-the-force-luke -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
+#define MONDO_GROWISOFS_NONBOOT          "growisofs -speed=1 -use-the-force-luke -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
 
 /**
  * Welcome string displayed at the top of the newt interface.
  */
-#define WELCOME_STRING _("W E L C O M E   T O   M O N D O   R E S C U E")
+#define WELCOME_STRING "W E L C O M E   T O   M O N D O   R E S C U E"
 
 /**
@@ -393 +526 @@
 #define DEFAULT_MR_LOGLEVEL 4
 
-#ifdef ENABLE_NLS  
-# include <libintl.h>  
-# undef _  
-# define _(String) dgettext (PACKAGE, String)
-# ifdef gettext_noop  
-#  define N_(String) gettext_noop (String)  
-# else  
-#  define N_(String) (String)  
-# endif  
-#else  
-# define textdomain(String) (String)  
-# define gettext(String) (String)  
-# define dgettext(Domain,Message) (Message)  
-# define dcgettext(Domain,Message,Type) (Message)  
-# define bindtextdomain(Domain,Directory) (Domain)  
-# define _(String) (String)  
-# define N_(String) (String)  
-
-#endif 
-
-
-
 #endif                          /* _MY_STUFF_H_ */

branches/stable/mondo/mondo/common/newt-specific.c

@@ -118 +118 @@
 #include "libmondo-tools-EXT.h"
 #include "libmondo-fork-EXT.h"
-#include "newt-specific-EXT.h"
+#include "libmondo-gui-EXT.h"
+#include "lib-common-externs.h"
 
 /*@unused@*/
@@ -226 +227 @@
                     tmp[i - 1] = '\0';
                 }
-                if (strstr(_("yesYES"), tmp)) {
+                if (strstr("yesYES", tmp)) {
                     paranoid_free(tmp);
                     return (TRUE);
-                } else if (strstr(_("NOno"), tmp)) {
+                } else if (strstr("NOno", tmp)) {
                     paranoid_free(tmp);
                     return (FALSE);
@@ -235 +236 @@
                     system("sync");
                     printf
-                        (_("Please enter either YES or NO (or yes or no, or y or n, or...)\n"));
+                        ("Please enter either YES or NO (or yes or no, or y or n, or...)\n");
                 }
             }
         } else {
             paranoid_free(tmp);
-            return (popup_with_buttons(prompt, _("Yes"), _("No")));
+            return (popup_with_buttons(prompt, "Yes", "No"));
         }
     }
@@ -272 +273 @@
                 tmp[i - 1] = '\0';
             }
-            if (strstr(_("okOKOkYESyes"), tmp)) {
+            if (strstr("okOKOkYESyes", tmp)) {
                 paranoid_free(tmp);
                 return (TRUE);
@@ -281 +282 @@
         } else {
             paranoid_free(tmp);
-            return (popup_with_buttons(prompt, _(" Okay "), _("Cancel")));
+            return (popup_with_buttons(prompt, " Okay ", "Cancel"));
         }
     }
@@ -425 +426 @@
             ("gzip -9c /var/log/mondo-archive.log > /tmp/MA.log.gz 2> /dev/null");
         printf
-                (_("If you require technical support, please contact the mailing list.\n"));
-        printf(_("See http://www.mondorescue.org for details.\n"));
+                ("If you require technical support, please contact the mailing list.\n");
+        printf("See http://www.mondorescue.org for details.\n");
         printf
-                (_("The list's members can help you, if you attach that file to your e-mail.\n"));
-        printf(_("Log file: %s\n"), MONDO_LOGFILE);
+                ("The list's members can help you, if you attach that file to your e-mail.\n");
+        printf("Log file: %s\n", MONDO_LOGFILE);
         if (does_file_exist("/tmp/MA.log.gz")) {
             printf
-                (_("FYI, I have gzipped the log and saved it to /tmp/MA.log.gz\n"));
-        }
-        printf(_("Mondo has aborted.\n"));
+                ("FYI, I have gzipped the log and saved it to /tmp/MA.log.gz\n");
+        }
+        printf("Mondo has aborted.\n");
         register_pid(0, "mondo");   // finish() does this too, FYI
         if (!g_main_pid) {
@@ -489 +490 @@
 //  system("clear");
 //  iamhere("Finished calling newtFinished");
-        printf(_("Execution run ended; result=%d\n"), signal);
-        printf(_("Type 'less %s' to see the output log\n"), MONDO_LOGFILE);
+        printf("Execution run ended; result=%d\n", signal);
+        printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
         free_libmondo_global_strings();
         exit(signal);
@@ -782 +783 @@
             while (((ch = getchar()) != '\n') && (ch != EOF));
         } else {
-            (void) popup_with_buttons(prompt, _(" OK "), "");
+            (void) popup_with_buttons(prompt, " OK ", "");
         }
     }
@@ -842 +843 @@
 #endif
             );
-        b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, _("  OK  "));
-        b_2 = newtButton(18, newtTextboxGetNumLines(text) + 4, _("Cancel"));
+        b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, "  OK  ");
+        b_2 = newtButton(18, newtTextboxGetNumLines(text) + 4, "Cancel");
         //  newtOpenWindow (8, 5, 54, newtTextboxGetNumLines (text) + 9, title);
         newtCenteredWindow(54, newtTextboxGetNumLines(text) + 9, title);
@@ -930 +931 @@
         }
         //  newtOpenWindow (25, 5, 46, newtTextboxGetNumLines (text) + 7, "Alert");
-        newtCenteredWindow(46, newtTextboxGetNumLines(text) + 7, _("Alert"));
+        newtCenteredWindow(46, newtTextboxGetNumLines(text) + 7, "Alert");
         myForm = newtForm(NULL, NULL, 0);
         newtFormAddComponents(myForm, text, b_1, b_2, NULL);
@@ -996 +997 @@
             newtCls();
             newtPushHelpLine
-                (_("Welcome to Mondo Rescue, by Hugo Rabson and the Internet. All rights reversed."));
+                ("Welcome to Mondo Rescue, by Hugo Rabson and the Internet. All rights reversed.");
             /*  newtDrawRootText(28,0,"Welcome to Mondo Rescue"); */
             newtDrawRootText(18, 0, WELCOME_STRING);
@@ -1074 +1075 @@
             g_isoform_old_progress = percentage;
             sprintf(timeline_str,
-                    _("%2ld:%02ld taken            %2ld:%02ld remaining"),
+                    "%2ld:%02ld taken            %2ld:%02ld remaining",
                     time_taken / 60, time_taken % 60, time_remaining / 60,
                     time_remaining % 60);
             if (percentage < 3) {
-                sprintf(pcline_str, _(" Working"));
+                sprintf(pcline_str, " Working");
                 for (j = 0; j < g_mysterious_dot_counter; j++) {
                     strcat(pcline_str, ".");
@@ -1088 +1089 @@
                         special_dot_char(g_mysterious_dot_counter));
             } else {
-                sprintf(pcline_str, _(" %3d%% done              %3d%% to go"),
+                sprintf(pcline_str, " %3d%% done              %3d%% to go",
                         percentage, 100 - percentage);
             }
@@ -1234 +1235 @@
 
         if (g_text_mode) {
-            printf(_("---progress-form---1--- %s%s"), blurb1, "\r\n");
-            printf(_("---progress-form---2--- %s%s"), blurb2, "\r\n");
-            printf(_("---progress-form---3--- %s%s"), blurb3, "\r\n");
-            printf(_("---progress-form---E---\n"));
+            printf("---progress-form---1--- %s\r\n", blurb1);
+            printf("---progress-form---2--- %s\r\n", blurb2);
+            printf("---progress-form---3--- %s\r\n", blurb3);
+            printf("---progress-form---E---\n");
             sprintf(taskprogress, "TASK:  [");
             for (i = 0; i < percentage; i += 5) {
@@ -1246 +1247 @@
             }
             if (percentage > 100) {
-                log_msg(2, _("percentage = %d"), percentage);
+                log_msg(2, "percentage = %d", percentage);
             }
             sprintf(taskprogress + strlen(taskprogress),
                     "] %3d%c", percentage, '%');
             sprintf(taskprogress + strlen(taskprogress),
-                    _(" done; %2ld:%02ld to go"),
+                    " done; %2ld:%02ld to go",
                     time_remaining / 60, time_remaining % 60);
-            printf(_("---progress-form---4--- %s\r\n"), taskprogress);
+            printf("---progress-form---4--- %s\r\n", taskprogress);
         } else {
             center_string(blurb1, 54);
@@ -1329 +1330 @@
         if (g_text_mode) {
             for (backup_type = none; backup_type == none;) {
-                printf(_("Backup type ("));
+                printf("Backup type (");
                 for (i = 0; possible_responses[i]; i++) {
                     printf("%c%s", (i == 0) ? '\0' : ' ',
@@ -1351 +1352 @@
         if (restoring) {
             strcpy(title_sz,
-                   _("Please choose the backup media from which you want to read data."));
-            strcpy(minimsg_sz, _("Read from:"));
+                   "Please choose the backup media from which you want to read data.");
+            strcpy(minimsg_sz, "Read from:");
         } else {
             strcpy(title_sz,
-                   _("Please choose the backup media to which you want to archive data."));
-            strcpy(minimsg_sz, _("Backup to:"));
+                   "Please choose the backup media to which you want to archive data.");
+            strcpy(minimsg_sz, "Backup to:");
         }
         newtPushHelpLine(title_sz);
         //  newtOpenWindow (23, 3, 34, 17, minimsg_sz);
         newtCenteredWindow(34, 17, minimsg_sz);
-        b1 = newtButton(1, 1, _("CD-R disks "));
-        b2 = newtButton(17, 1, _("CD-RW disks"));
-        b3 = newtButton(1, 9, _("Tape drive "));
-        b4 = newtButton(17, 5, _("CD streamer"));
-        b5 = newtButton(1, 5, _(" DVD disks "));
-        b6 = newtButton(17, 9, _(" NFS mount "));
-        b7 = newtButton(1, 13, _(" Hard disk "));
-        b8 = newtButton(17, 13, _("    Exit   "));
+        b1 = newtButton(1, 1, "CD-R disks ");
+        b2 = newtButton(17, 1, "CD-RW disks");
+        b3 = newtButton(1, 9, "Tape drive ");
+        b4 = newtButton(17, 5, "CD streamer");
+        b5 = newtButton(1, 5, " DVD disks ");
+        b6 = newtButton(17, 9, " NFS mount ");
+        b7 = newtButton(1, 13, " Hard disk ");
+        b8 = newtButton(17, 13, "    Exit   ");
         myForm = newtForm(NULL, NULL, 0);
         newtFormAddComponents(myForm, b1, b5, b3, b7, b2, b4, b6, b8,
@@ -1426 +1427 @@
         newtDrawRootText(18, 0, WELCOME_STRING);
         newtPushHelpLine
-            (_("   Please specify the level of compression that you want."));
+            ("   Please specify the level of compression that you want.");
         //  newtOpenWindow (23, 3, 34, 13, "How much compression?");
-        newtCenteredWindow(34, 13, _("How much compression?"));
-        b1 = newtButton(4, 1, _("Maximum"));
-        b2 = newtButton(18, 1, _("Average"));
-        b3 = newtButton(4, 5, _("Minimum"));
-        b4 = newtButton(18, 5, _(" None  "));
-        b5 = newtButton(4, 9, _("         Exit        "));
+        newtCenteredWindow(34, 13, "How much compression?");
+        b1 = newtButton(4, 1, "Maximum");
+        b2 = newtButton(18, 1, "Average");
+        b3 = newtButton(4, 5, "Minumum");
+        b4 = newtButton(18, 5, " None  ");
+        b5 = newtButton(4, 9, "         Exit        ");
         myForm = newtForm(NULL, NULL, 0);
         newtFormAddComponents(myForm, b1, b3, b2, b4, b5, NULL);
@@ -1514 +1515 @@
         paranoid_fclose(fin);
         if (filelist->entries >= ARBITRARY_MAXIMUM) {
-            log_to_screen(_("Arbitrary limits suck, man!"));
+            log_to_screen("Arbitrary limits suck, man!");
             paranoid_free(tmp);
             return (1);
@@ -1656 +1657 @@
         }
         sprintf(differ_sz,
-                _("  %d files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list."),
+                "  %d files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.",
                 i);
         newtPushHelpLine(differ_sz);
-        bClose = newtCompactButton(10, 15, _(" Close  "));
-        bSelect = newtCompactButton(30, 15, _(" Select "));
-        sprintf(tmp, "%-10s               %-20s", _("Priority"), _("Filename"));
+        bClose = newtCompactButton(10, 15, " Close  ");
+        bSelect = newtCompactButton(30, 15, " Select ");
+        sprintf(tmp, "%-10s               %-20s", "Priority", "Filename");
         headerMsg = newtLabel(2, 1, tmp);
-        newtOpenWindow(5, 4, 70, 16, _("Non-matching files"));
+        newtOpenWindow(5, 4, 70, 16, "Non-matching files");
         myForm = newtForm(NULL, NULL, 0);
         newtFormAddComponents(myForm, headerMsg, fileListbox, bClose,
@@ -1677 +1678 @@
                      i++);
                 if (i == filelist->entries && filelist->entries > 0) {
-                    log_to_screen(_("I don't know what that button does!"));
+                    log_to_screen("I don't know what that button does!");
                 } else {
                     currline = i;