Changeset 1188 in MondoRescue for trunk

Timestamp:

Feb 20, 2007, 3:03:55 AM (18 years ago)

Author:

Bruno Cornec

Message:

Stable merges again

Location:

trunk/mondo/src/mondoarchive

Files:

• Makefile.am (modified) (3 diffs)
• mondo-cli-EXT.h (modified) (1 diff)
• mondo-cli.c (modified) (4 diffs)
• mondoarchive.c (moved) (moved from trunk/mondo/src/mondoarchive/main.c ) (19 diffs)

trunk/mondo/src/mondoarchive/Makefile.am

@@ -1 @@
-## $Id$
 ##
 ## $Id$
@@ -5 +4 @@
 ## Process with Automake to generate Makefile.in
 ##
-AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/src/include
+AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/src/include -I${top_builddir}/src/common
 
 ## Headers
@@ -12 +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

trunk/mondo/src/mondoarchive/mondo-cli-EXT.h

@@ -11 +11 @@
                                                *flag_val[128],
                                                bool flag_set[128]);
-extern void help_screen();
+extern void help_screen(void);
 extern void terminate_daemon(int sig);
 extern void set_signals(int on);

trunk/mondo/src/mondoarchive/mondo-cli.c

@@ -11 +11 @@
 
 #include "my-stuff.h"
-#include "../common/mondostructures.h"
+#include "mondostructures.h"
 #include "mondo-cli-EXT.h"
-#include "../common/libmondo.h"
+#include "libmondo.h"
 #ifndef S_SPLINT_S
 #include <pthread.h>
 #endif
 #include "mr_mem.h"
+#include "mr_msg.h"
+
+//static char cvsid[] = "$Id$";
 
 extern int g_loglevel;
@@ -23 +26 @@
 extern bool g_skip_floppies;    ///< Whether to skip the creation of boot disks
 extern bool g_cd_recovery;
-extern double g_kernel_version;
-extern char *resolve_softlinks_to_get_to_actual_device_file(char *);
 
 /**
@@ -63 +64 @@
     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];
     bool flag_set[128];
@@ -95 +96 @@
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
-            mr_asprintf(&tmp, "-%c %s", i, flag_val[i]);
-            mr_msg(3, tmp);
-            mr_free(tmp);
+            mr_msg(3, "-%c %s", i, flag_val[i]);
         }
     }

trunk/mondo/src/mondoarchive/mondoarchive.c

@@ -26 +26 @@
 #include "mr_mem.h"
 #include "mr_str.h"
+#include "mr_msg.h"
 #include "mr_file.h"
 
@@ -57 +58 @@
  * Print a "don't panic" message to the log and a message about the logfile to the screen.
  */
-void welcome_to_mondoarchive()
+void welcome_to_mondoarchive(void)
 {
     mr_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org",
@@ -100 +101 @@
  * of the day.
  */
-void distro_specific_kludges_at_start_of_mondoarchive()
+void distro_specific_kludges_at_start_of_mondoarchive(void)
 {
     mr_msg(2, "Unmounting old ramdisks if necessary");
@@ -115 +116 @@
  * Undo whatever was done by distro_specific_kludges_at_start_of_mondoarchive().
  */
-void distro_specific_kludges_at_end_of_mondoarchive()
+void distro_specific_kludges_at_end_of_mondoarchive(void)
 {
     mr_msg(2, "Restarting magicdev if necessary");
@@ -142 +143 @@
     struct s_bkpinfo *bkpinfo;
     struct stat stbuf;
-    char *tmp;
+    char *tmp = NULL;
     int res = 0;
     int retval = 0;
@@ -172 +173 @@
     diffs = 0;
     printf(_("Initializing...\n"));
-    bkpinfo = mr_malloc(sizeof(struct s_bkpinfo));
-
-    /* Initialize Configuration Structure */
-    mr_archive_init_conf(bkpinfo->mr_conf);
 
     /* initialize log file with time stamp */
@@ -182 +179 @@
     mr_msg(0, "Time started: %s", mr_date());
 
-    /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
-    mr_asprintf(&tmp, "/sbin:/usr/sbin:%s:/usr/local/sbin", getenv("PATH"));
-    setenv("PATH", tmp, 1);
-    mr_free(tmp);
+    bkpinfo = mr_malloc(sizeof(struct s_bkpinfo));
+
+    /* Initialize Configuration Structure */
+    mr_archive_init_conf(bkpinfo->mr_conf);
 
     /* Add the ARCH environment variable for ia64 purposes */
@@ -191 +188 @@
 
     /* Add MONDO_SHARE + others environment variable for mindi */
-    setenv_mondo_share();
+    setenv_mondo_var();
 
     if (stat(MONDO_CACHE, &stbuf) != 0) {
         mr_mkdir(MONDO_CACHE,0x755);
     }
+
+    /* BERLIOS: Hardcoded to be improved */
+    unlink(MONDO_CACHE"/mindi.conf");
+    unlink(MONDORESTORECFG);
 
     /* Configure the bkpinfo structure, global file paths, etc. */
@@ -203 +204 @@
     register_pid(g_main_pid, "mondo");
     set_signals(TRUE);          // catch SIGTERM, etc.
-    run_program_and_log_output("date", 1);
     run_program_and_log_output("dmesg -n1", TRUE);
 
@@ -209 +209 @@
     welcome_to_mondoarchive();
     distro_specific_kludges_at_start_of_mondoarchive();
-    // BERLIOS : too early, bkpinfo is not initialized ??
-    //s-printf(g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
     g_kernel_version = get_kernel_version();
 
@@ -218 +216 @@
         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 {
@@ -247 +245 @@
         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 {
@@ -266 +264 @@
         setup_newt_stuff();
         if ((tmp = find_cdrw_device()) == NULL) {
-            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);
         }
         mr_free(tmp);
 
         if ((tmp = find_cdrom_device(FALSE)) == NULL) {
-            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);
@@ -286 +284 @@
         setup_newt_stuff();
         if ((tmp = find_dvd_device()) == NULL) {
-            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);
@@ -300 +298 @@
     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);
@@ -312 +310 @@
     }
 
-/* Process command line, if there is one. If not, ask user for info. */
+    /* Process command line, if there is one. If not, ask user for info. */
     if (argc == 1) {
         g_text_mode = FALSE;
@@ -324 +322 @@
         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 - %s \n"),MONDO_LOGFILE);
+            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);
@@ -347 +345 @@
         retval += res;
         if (res) {
-            mr_asprintf(&say_at_end,
+            mr_strcat(say_at_end,
                    _("Data archived. Please check the logs, just as a precaution. "));
         } else {
-            mr_asprintf(&say_at_end, _("Data archived OK. "));
-        }
-    }
-
-/* If we're meant to verify then verify */
+            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(&say_at_end, _("%d difference%c found."), -res,
+            mr_strcat(say_at_end, _("%d difference%c found."), -res,
                     (-res != 1) ? 's' : ' ');
             res = 0;
@@ -426 +424 @@
     system(g_erase_tmpdir_and_scratchdir);
     free_libmondo_global_strings();
-    mr_free((void *)bkpinfo);
+    mr_free(bkpinfo);
 
     unlink("/tmp/filelist.full");
     unlink("/tmp/filelist.full.gz");
 
-    run_program_and_log_output("date", 1);
 
     /* 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) {