Changeset 1187 in MondoRescue

Timestamp:

Feb 20, 2007, 3:03:33 AM (17 years ago)

Author:

Bruno Cornec

Message:

Merge trunk memory management for mondoarchive
Rename main.c to mondoarchive.c

Location:

branches/stable/mondo/src/mondoarchive

Files:

• Makefile.am (modified) (1 diff)
• mondo-cli.c (modified) (6 diffs)
• mondoarchive.c (moved) (moved from branches/stable/mondo/src/mondoarchive/main.c ) (19 diffs)

branches/stable/mondo/src/mondoarchive/Makefile.am

@@ -11 +11 @@
 ## The program
 sbin_PROGRAMS        = mondoarchive
-mondoarchive_SOURCES = main.c mondo-cli.c
+mondoarchive_SOURCES = mondoarchive.c mondo-cli.c
 mondoarchive_LDADD   = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -10 +10 @@
 /** @def BOOT_LOADER_CHARS The characters allowed for boot loader on this platform. */
 
+#include "my-stuff.h"
+#include "mondostructures.h"
+#include "mondo-cli-EXT.h"
+#include "libmondo.h"
 #include <pthread.h>
-#include "my-stuff.h"
-#include "../common/mondostructures.h"
-#include "mondo-cli-EXT.h"
-#include "../common/libmondo.h"
 #include "mr_mem.h"
 #include "mr_msg.h"
@@ -50 +50 @@
  */
 bool g_ISO_restore_mode = FALSE;
-
 
 extern double g_kernel_version;
@@ -80 +79 @@
     int res = 0;
     int retval = 0;
-    int i = 0, j;
+    int i = 0, j = 0;
 
     /*@ buffers *************** */
-    char *tmp;
+    char *tmp = NULL;
     char flag_val[128][MAX_STR_LEN];
     bool flag_set[128];
 
-    malloc_string(tmp);
     sensibly_set_tmpdir_and_scratchdir(bkpinfo);
+
     for (i = 0; i < 128; i++) {
         flag_val[i][0] = '\0';
         flag_set[i] = FALSE;
     }
-    //  strcpy (bkpinfo->tmpdir, "/root/images/mondo");
-    //  strcpy (bkpinfo->scratchdir, "/home");
     for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
         bkpinfo->media_size[j] = 650;
@@ -113 +110 @@
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
-            sprintf(tmp, "-%c %s", i, flag_val[i]);
-            mr_msg(3, tmp);
+            mr_msg(3, "-%c %s", i, flag_val[i]);
         }
     }
 //    }
-    sprintf(tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
     paranoid_system(tmp);
-    sprintf(tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
     paranoid_system(tmp);
+    mr_free(tmp);
+
     sprintf(bkpinfo->tmpdir + strlen(bkpinfo->tmpdir), "/tmp.mondo.%ld",
             random() % 32767);
     sprintf(bkpinfo->scratchdir + strlen(bkpinfo->scratchdir),
             "/mondo.scratch.%ld", random() % 32767);
-    sprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
+
+    mr_asprintf(&tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
     paranoid_system(tmp);
-    sprintf(tmp, "mkdir -p %s", bkpinfo->scratchdir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "mkdir -p %s", bkpinfo->scratchdir);
     paranoid_system(tmp);
     mr_free(tmp);
     return (retval);
 }
-
-
 
 
@@ -165 +166 @@
         bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(p);
     }
-//      bkpinfo->media_size[0] = bkpinfo->media_size[MAX_NOOF_MEDIA];
     for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
         if (bkpinfo->media_size[j] <= 0) {
@@ -174 +174 @@
     return (0);
 }
-
 
 

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -22 +22 @@
 #include "mondo-cli-EXT.h"
 
+#include "mr_mem.h"
 #include "mr_str.h"
 #include "mr_msg.h"
@@ -112 +113 @@
         ("umount `mount | grep shm | grep mondo | cut -d' ' -f3`", 2);
     unmount_supermounts_if_necessary(); // for Mandrake users whose CD-ROMs are supermounted
-    //  stop_autofs_if_necessary(); // for Xandros users
     mount_boot_if_necessary();  // for Gentoo users with non-mounted /boot partitions
     clean_up_KDE_desktop_if_necessary();    // delete various misc ~/.* files that get in the way
 }
-
 
 
@@ -124 +123 @@
 void distro_specific_kludges_at_end_of_mondoarchive(void)
 {
-//  char tmp[500];
     mr_msg(2, "Restarting magicdev if necessary");
     sync();
     restart_magicdev_if_necessary();    // for RH+Gnome users
 
-    mr_msg(2, "Restarting autofs if necessary");
-    sync();
-    //  restart_autofs_if_necessary(); // for Xandros users
-
     mr_msg(2, "Restarting supermounts if necessary");
     sync();
@@ -140 +134 @@
     sync();
     unmount_boot_if_necessary();    // for Gentoo users
-
-//  mr_msg( 2, "Cleaning up KDE desktop");
-//  clean_up_KDE_desktop_if_necessary();
 }
 
@@ -158 +149 @@
     struct stat stbuf;
     char *tmp = NULL;
-    int res, retval;
-    char *say_at_end;
-
+    int res = 0;
+    int retval = 0;
+    char *say_at_end = NULL;
+
+#ifdef ENABLE_NLS
+    setlocale(LC_ALL, "");
+    (void) textdomain("mondo");
+#endif
 /* Make sure I'm root; abort if not */
     if (getuid() != 0) {
-        fprintf(stderr, "Please run as root.\r\n");
+        fprintf(stderr, _("Please run as root.\n"));
         exit(127);
     }
 
-/* If -V, -v or --version then echo version no. and quit */
+    /* If -V, -v or --version then echo version no. and quit */
     if (argc == 2
         && (!strcmp(argv[argc - 1], "-v") || !strcmp(argv[argc - 1], "-V")
             || !strcmp(argv[argc - 1], "--version"))) {
-        printf("mondoarchive v%s\nSee man page for help\n", PACKAGE_VERSION);
+        printf(_("mondoarchive v%s\nSee man page for help\n"), PACKAGE_VERSION);
         exit(0);
     }
 
-/* Initialize variables */
-
+    /* Initialize variables */
     malloc_libmondo_global_strings();
-    malloc_string(say_at_end);
 
     res = 0;
     retval = 0;
     diffs = 0;
-    say_at_end[0] = '\0';
-    printf("Initializing...\n");
+    printf(_("Initializing...\n"));
 
     /* initialize log file with time stamp */
@@ -225 +218 @@
         setup_newt_stuff();
         if (!strstr(argv[2], "filelist")) {
-            printf("Sorry - filelist goes first\n");
+            mr_msg(1,_("Sorry - filelist goes first\n"));
             finish(1);
         } else {
@@ -255 +248 @@
         setup_newt_stuff();
         if (!strstr(argv[2], "filelist")) {
-            printf("Sorry - filelist goes first\n");
+            mr_msg(1,_("Sorry - filelist goes first\n"));
             finish(1);
         } else {
@@ -275 +268 @@
         malloc_string(tmp);
         if (find_cdrw_device(tmp)) {
-            printf("Failed to find CDR-RW drive\n");
-        } else {
-            printf("CD-RW is at %s\n", tmp);
+            mr_msg(1,_("Failed to find CDR-RW drive\n"));
+        } else {
+            mr_msg(1,_("CD-RW is at %s\n"), tmp);
         }
         tmp[0] = '\0';
         if (find_cdrom_device(tmp, atoi(argv[2]))) {
-            printf("Failed to find CD-ROM drive\n");
-        } else {
-            printf("CD-ROM is at %s\n", tmp);
+            mr_msg(1,_("Failed to find CD-ROM drive\n"));
+        } else {
+            mr_msg(1,_("CD-ROM is at %s\n"), tmp);
         }
         mr_free(tmp);
@@ -295 +288 @@
         malloc_string(tmp);
         if (find_dvd_device(tmp, atoi(argv[2]))) {
-            printf("Failed to find DVD drive\n");
-        } else {
-            printf("DVD is at %s\n", tmp);
+            mr_msg(1,_("Failed to find DVD drive\n"));
+        } else {
+            mr_msg(1,_("DVD is at %s\n"), tmp);
         }
         mr_free(tmp);
@@ -309 +302 @@
     if (argc > 2 && !strcmp(argv[1], "test-dev")) {
         if (is_dev_an_NTFS_dev(argv[2])) {
-            printf("%s is indeed an NTFS dev\n", argv[2]);
-        } else {
-            printf("%s is _not_ an NTFS dev\n", argv[2]);
+            mr_msg(1,_("%s is indeed an NTFS dev\n"), argv[2]);
+        } else {
+            mr_msg(1,_("%s is _not_ an NTFS dev\n"), argv[2]);
         }
         finish(0);
@@ -335 +328 @@
         res = handle_incoming_parameters(argc, argv, bkpinfo);
         if (res) {
-            printf
-                ("Errors were detected in the command line you supplied.\n");
-            printf("Please review the log file - " MONDO_LOGFILE "\n");
+            mr_msg(1,
+                _("Errors were detected in the command line you supplied.\n"));
+            mr_msg(1,_("Please review the log file - %s \n"),MONDO_LOGFILE);
             mr_msg(1, "Mondoarchive will now exit.");
             finish(1);
@@ -351 +344 @@
 
     log_to_screen
-        ("BusyBox's sources are available from http://www.busybox.net");
+        (_("BusyBox's sources are available from http://www.busybox.net"));
+
     sprintf(g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir,
             bkpinfo->scratchdir);
@@ -360 +354 @@
         retval += res;
         if (res) {
-            strcat(say_at_end,
-                   "Data archived. Please check the logs, just as a precaution. ");
-        } else {
-            strcat(say_at_end, "Data archived OK. ");
-        }
-    }
-
-/* If we're meant to verify then verify */
+            mr_strcat(say_at_end,
+                   _("Data archived. Please check the logs, just as a precaution. "));
+        } else {
+            mr_strcat(say_at_end, _("Data archived OK. "));
+        }
+    }
+
+    /* If we're meant to verify then verify */
     if (bkpinfo->verify_data) {
         res = verify_data(bkpinfo);
         if (res < 0) {
-            mr_asprintf(&tmp, "%d difference%c found.", -res,
+            mr_strcat(say_at_end, _("%d difference%c found."), -res,
                     (-res != 1) ? 's' : ' ');
-            strcat(say_at_end, tmp);
-            log_to_screen(tmp);
-            mr_free(tmp);
             res = 0;
         }
@@ -381 +372 @@
     }
 
-/* Offer to write floppy disk images to physical disks */
+    /* Offer to write floppy disk images to physical disks */
     if (bkpinfo->backup_data && !g_skip_floppies) {
         res = offer_to_write_boot_floppies_to_physical_disks(bkpinfo);
         retval += res;
-//      res = offer_to_write_boot_ISO_to_physical_CD(bkpinfo);
-//      retval += res;
-    }
-
-/* Report result of entire operation (success? errors?) */
+    }
+
+    /* Report result of entire operation (success? errors?) */
     if (!retval) {
         mvaddstr_and_log_it(g_currentY++, 0,
-                            "Backup and/or verify ran to completion. Everything appears to be fine.");
+                            _("Backup and/or verify ran to completion. Everything appears to be fine."));
     } else {
         mvaddstr_and_log_it(g_currentY++, 0,
-                            "Backup and/or verify ran to completion. However, errors did occur.");
+                            _("Backup and/or verify ran to completion. However, errors did occur."));
     }
 
     if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
         log_to_screen
-            ("/var/cache/mindi/mondorescue.iso, a boot/utility CD, is available if you want it.");
+            (_("/var/cache/mindi/mondorescue.iso, a boot/utility CD, is available if you want it."));
     }
 
@@ -407 +396 @@
         if (g_text_mode) {
             log_to_screen
-                ("Type 'less /tmp/changed.files' to see which files don't match the archives");
+                (_("Type 'less /tmp/changed.files' to see which files don't match the archives"));
         } else {
             mr_msg(1,
-                    "Type 'less /tmp/changed.files' to see which files don't match the archives");
+                    _("Type 'less /tmp/changed.files' to see which files don't match the archives"));
             mr_msg(2, "Calling popup_changelist_from_file()");
             popup_changelist_from_file("/tmp/changed.files");
@@ -419 +408 @@
     }
     log_to_screen(say_at_end);
+    mr_free(say_at_end);
+
     mr_asprintf(&tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
     run_program_and_log_output(tmp, TRUE);
@@ -429 +420 @@
     system("rm -Rf /tmp.mondo.* /mondo.scratch.*");
     if (!retval) {
-        printf("Mondoarchive ran OK.\n");
+        printf(_("Mondoarchive ran OK.\n"));
     } else {
-        printf("Errors occurred during backup. Please check logfile.\n");
+        printf(_("Errors occurred during backup. Please check logfile.\n"));
     }
     distro_specific_kludges_at_end_of_mondoarchive();
@@ -439 +430 @@
     system(g_erase_tmpdir_and_scratchdir);
     free_libmondo_global_strings();
-    mr_free(say_at_end);
     mr_free(bkpinfo);
 
@@ -453 +443 @@
 
     /* finalize log file with time stamp */
-    mr_msg(0, "Time finished: %s", mr_date());
+    mr_msg(1, "Time finished: %s", mr_date());
     mr_msg_close();
 
     if (!g_text_mode) {
         popup_and_OK
-            ("Mondo Archive has finished its run. Please press ENTER to return to the shell prompt.");
-        log_to_screen("See %s for details of backup run.", MONDO_LOGFILE);
+            (_("Mondo Archive has finished its run. Please press ENTER to return to the shell prompt."));
+        log_to_screen(_("See %s for details of backup run."), MONDO_LOGFILE);
         finish(retval);
     } else {
-        printf("See %s for details of backup run.\n", MONDO_LOGFILE);
+        printf(_("See %s for details of backup run.\n"), MONDO_LOGFILE);
         exit(retval);
     }