Changeset 1264 in MondoRescue

Timestamp:

Mar 24, 2007, 1:48:55 AM (17 years ago)

Author:

Bruno Cornec

Message:

• mr_exit used instead of exit
• mr_rs_clean_conf/mr_rs_cleanup/mr_ar_clean_conf/mr_ar_cleanup added
• compiltaion warnings suppressed
• Addition of mr_types (for boolean with typedef)
• struct mr_rs_conf added
• help_screen removed (useless)

Location:

branches/stable/mondo/src

Files:

• common/libmondo-filelist.c (modified) (3 diffs)
• common/newt-specific.c (modified) (2 diffs)
• include/mr_conf.h (modified) (1 diff)
• include/mr_types.h (added)
• include/my-stuff.h (modified) (1 diff)
• lib/mr_conf.c (modified) (2 diffs)
• lib/mr_err.c (modified) (1 diff)
• mondoarchive/mondo-cli-EXT.h (modified) (1 diff)
• mondoarchive/mondo-cli.c (modified) (1 diff)
• mondoarchive/mondo-cli.h (modified) (1 diff)
• mondoarchive/mondoarchive.c (modified) (4 diffs)
• mondorestore/mondo-prep.c (modified) (3 diffs)
• mondorestore/mondorestore.c (modified) (6 diffs)

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

@@ -1359 +1359 @@
                 "grep -Fv \"%s\" %s > %s.new 2> /dev/null", dir,
                 g_skeleton_filelist, g_skeleton_filelist);
-//    mr_msg(0, "fsm = %s", find_skeleton_marker);
         if (!system(find_skeleton_marker)) {
             percentage = (int) (skeleton_lino * 100 / g_skeleton_entries);
             skeleton_lino++;
-//        mr_msg(5, "Found %s", dir);
-//        mr_msg(2, "Incrementing skeleton_lino; now %ld/%ld (%d%%)", skeleton_lino, g_skeleton_entries, percentage);
             sprintf(find_skeleton_marker, "mv -f %s.new %s",
                     g_skeleton_filelist, g_skeleton_filelist);
-//        mr_msg(6, "fsm = %s", find_skeleton_marker);
             run_program_and_log_output(find_skeleton_marker, 8);
             time(&this_time);
@@ -1386 +1382 @@
     depth++;
 
-//  mr_msg(0, "Cataloguing %s", dir);
     if (sth[0] == ' ') {
         skip_these = sth;
@@ -1428 +1423 @@
                                 counter = 0;
                                 uberctr++;
+#ifndef _XWIN
                                 mr_asprintf(&strtmp, " %c ",
                                         special_dot_char(uberctr));
-#ifndef _XWIN
                                 if (!g_text_mode) {
                                     newtDrawRootText(77, g_noof_rows - 3,
                                                      strtmp);
-                                    mr_free(strtmp);
                                     newtRefresh();
                                 }
+                                mr_free(strtmp);
 #endif
                             }

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

@@ -21 +21 @@
 #include "mr_msg.h"
 #include "mr_str.h"
+#include "mr_err.h"
 
 #include "mondostructures.h"
@@ -398 +399 @@
     printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
     free_libmondo_global_strings();
-    exit(signal_code);
+    mr_exit(signal_code, "Execution run ended");
 }
 

branches/stable/mondo/src/include/mr_conf.h

@@ -79 +79 @@
 };
 
+/* mondorestore structure storing conf info 
+ * each field of the configuration file should have an entry here
+ */
+struct mr_rs_conf {
+    /* Default media size */
+    int media_size;
+    /* Default device of media */
+    char *media_device;
+    /* Is the CD tray manual ? */
+    bool manual_tray;
+    /* Default log level */
+    int log_level;
+    /* default prefix for ISO names */
+    char *prefix;
+    /* External tape blocksize */
+    int external_tape_blocksize;
+    /* Internal tape blocksize */
+    int internal_tape_blocksize;
+    /* Size in MB of the slices for biggiefiles */
+    int slice_size;
+    /* Boot loader to use */
+    char *boot_loader;
+    /* Differential backup ? */
+    bool differential;
+    /* Default compression tool */
+    char *compression_tool;
+    /* Which mode should be activated by default*/
+    char *ui_mode;
+    /* Activate automatic restore ? */
+    bool automatic_restore;
+    /* Images creation dir */
+    char *images_dir;
+};
+
 /* functions (public methods) */
 

branches/stable/mondo/src/include/my-stuff.h

@@ -32 +32 @@
 #include "mr_mem.h"
 #include "mr_msg.h"
-
-#if !defined(bool) && !defined(__cplusplus)
-/**
- * Create the illusion of a Boolean type.
- */
-#define bool unsigned char
-#define TRUE 1
-#define FALSE 0
-#endif
+#include "mr_types.h"
 
 #ifdef HAVE_CONFIG_H

branches/stable/mondo/src/lib/mr_conf.c

@@ -17 +17 @@
 #include <string.h>
 
+#include "mr_types.h"
 #include "mr_msg.h"
 #include "mr_mem.h"
@@ -278 +279 @@
 
 /*removes all comments from the buffer*/
-static void mr_conf_remove_comments() {
+static void mr_conf_remove_comments(void) {
     char *tmp_buf;              /*temporary buffer without comments */
     size_t length               /*initial length */ ;

branches/stable/mondo/src/lib/mr_err.c

@@ -19 +19 @@
 #include "mr_msg.h"
 
-/* This should be a pointer to func setup by the main function */
-    /* Highly incomplete function for the moment */
-static void mr_cleanup(void) {
-        /* We have to free all allocated memory */
-        /* We have to remove all temporary files */
-        /* We have to unmount what has been mounted */
-        /* We have to properly end newt */
-        /* We have to remind people of log files */
-        mr_msg_close();
-}
+/* Pointer to the right cleanup function provided by each main */
+extern void *mr_cleanup(void);
 
 /*

branches/stable/mondo/src/mondoarchive/mondo-cli-EXT.h

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

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

@@ -964 +964 @@
 
 /**
- * Print a not-so-helpful help message and exit.
- */
-void help_screen(void)
-{
-    mr_msg(1, "Type 'man mondo-archive' for more information\n");
-    exit(1);
-}
-
-
-/**
  * Terminate Mondo in response to a signal.
  * @param sig The signal number received.

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

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

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

@@ -27 +27 @@
 #include "mr_msg.h"
 #include "mr_file.h"
+#include "mr_err.h"
 #include "mr_conf.h"
 
@@ -127 +128 @@
 
 /* create the mr_ar_conf structure from mondo's conf file */
-static void mr_ar_store_conf(struct mr_ar_conf *mr_conf) {
+static void mr_ar_store_conf(struct mr_ar_conf *mr_cnf) {
     
-    mr_asprintf(mr_conf->iso_creation_cmd, mr_conf_sread("mondo_iso_creation_cmd"));
-    mr_asprintf(mr_conf->iso_creation_options, mr_conf_sread("mondo_iso_creation_options"));
-    mr_asprintf(mr_conf->iso_burning_cmd, mr_conf_sread("mondo_iso_burning_cmd"));
-    mr_asprintf(mr_conf->iso_burning_options, mr_conf_sread("mondo_iso_burning_options"));
-    iso_burning_speed = mr_conf_iread("mondo_iso_burning_speed");
-    media_size = mr_conf_iread("mondo_media_size");
-    mr_asprintf(mr_conf->media_device, mr_conf_sread("mondo_media_device"));
-    manual_tray = mr_conf_bread("mondo_manual_tray");
-    log_level = mr_conf_iread("mondo_log_level");
-    mr_asprintf(mr_conf->prefix, mr_conf_sread("mondo_prefix"));
-    external_tape_blocksize = mr_conf_iread("mondo_external_tape_blocksize");
-    internal_tape_blocksize = mr_conf_iread("mondo_internal_tape_blocksize");
-    slice_size = mr_conf_iread("mondo_slice_size");
-    mr_asprintf(mr_conf->deplist_file, mr_conf_sread("mondo_deplist_file"));
-    write_boot_floppy = mr_conf_bread("mondo_write_boot_floppy");
-    create_mindi_cd = mr_conf_bread("mondo_create_mindi_cd");
-    mr_asprintf(mr_conf->kernel, mr_conf_sread("mondo_kernel"));
-    mr_asprintf(mr_conf->additional_modules, mr_conf_sread("mondo_additional_modules"));
-    mr_asprintf(mr_conf->boot_loader, mr_conf_sread("mondo_boot_loader"));
-    differential = mr_conf_bread("mondo_differential");
-    mr_asprintf(mr_conf->compression_tool, mr_conf_sread("mondo_compression_tool"));
-    compression_level = mr_conf_iread("mondo_compression_level");
-    mr_asprintf(mr_conf->exclude_paths, mr_conf_sread("mondo_exclude_paths"));
-    mr_asprintf(mr_conf->include_paths, mr_conf_sread("mondo_include_paths"));
-    mr_asprintf(mr_conf->ui_mode, mr_conf_sread("mondo_ui_mode"));
-    automatic_restore = mr_conf_bread("mondo_automatic_restore");
-    mr_asprintf(mr_conf->scratch_dir, mr_conf_sread("mondo_scratch_dir"));
-    mr_asprintf(mr_conf->tmp_dir, mr_conf_sread("mondo_tmp_dir"));
-    mr_asprintf(mr_conf->images_dir, mr_conf_sread("mondo_images_dir"));
+    mr_asprintf(&mr_cnf->iso_creation_cmd, mr_conf_sread("mondo_iso_creation_cmd"));
+    mr_asprintf(&mr_cnf->iso_creation_options, mr_conf_sread("mondo_iso_creation_options"));
+    mr_asprintf(&mr_cnf->iso_burning_cmd, mr_conf_sread("mondo_iso_burning_cmd"));
+    mr_asprintf(&mr_cnf->iso_burning_options, mr_conf_sread("mondo_iso_burning_options"));
+    mr_cnf->iso_burning_speed = mr_conf_iread("mondo_iso_burning_speed");
+    mr_cnf->media_size = mr_conf_iread("mondo_media_size");
+    mr_asprintf(&mr_cnf->media_device, mr_conf_sread("mondo_media_device"));
+    mr_cnf->manual_tray = mr_conf_bread("mondo_manual_tray");
+    mr_cnf->log_level = mr_conf_iread("mondo_log_level");
+    mr_asprintf(&mr_cnf->prefix, mr_conf_sread("mondo_prefix"));
+    mr_cnf->external_tape_blocksize = mr_conf_iread("mondo_external_tape_blocksize");
+    mr_cnf->internal_tape_blocksize = mr_conf_iread("mondo_internal_tape_blocksize");
+    mr_cnf->slice_size = mr_conf_iread("mondo_slice_size");
+    mr_asprintf(&mr_cnf->deplist_file, mr_conf_sread("mondo_deplist_file"));
+    mr_cnf->write_boot_floppy = mr_conf_bread("mondo_write_boot_floppy");
+    mr_cnf->create_mindi_cd = mr_conf_bread("mondo_create_mindi_cd");
+    mr_asprintf(&mr_cnf->kernel, mr_conf_sread("mondo_kernel"));
+    mr_asprintf(&mr_cnf->additional_modules, mr_conf_sread("mondo_additional_modules"));
+    mr_asprintf(&mr_cnf->boot_loader, mr_conf_sread("mondo_boot_loader"));
+    mr_cnf->differential = mr_conf_bread("mondo_differential");
+    mr_asprintf(&mr_cnf->compression_tool, mr_conf_sread("mondo_compression_tool"));
+    mr_cnf->compression_level = mr_conf_iread("mondo_compression_level");
+    mr_asprintf(&mr_cnf->exclude_paths, mr_conf_sread("mondo_exclude_paths"));
+    mr_asprintf(&mr_cnf->include_paths, mr_conf_sread("mondo_include_paths"));
+    mr_asprintf(&mr_cnf->ui_mode, mr_conf_sread("mondo_ui_mode"));
+    mr_cnf->automatic_restore = mr_conf_bread("mondo_automatic_restore");
+    mr_asprintf(&mr_cnf->scratch_dir, mr_conf_sread("mondo_scratch_dir"));
+    mr_asprintf(&mr_cnf->tmp_dir, mr_conf_sread("mondo_tmp_dir"));
+    mr_asprintf(&mr_cnf->images_dir, mr_conf_sread("mondo_images_dir"));
+    mr_msg(5, "Directory for images is %s", mr_cnf->images_dir);
+}
+
+/* destroy the mr_ar_conf structure's content */
+static void mr_ar_clean_conf(struct mr_ar_conf *mr_cnf) {
+    
+    if (mr_cnf == NULL) {
+        return;
+    }
+    mr_free(mr_cnf->iso_creation_cmd);
+    mr_free(mr_cnf->iso_creation_options);
+    mr_free(mr_cnf->iso_burning_cmd);
+    mr_free(mr_cnf->iso_burning_options);
+    mr_free(mr_cnf->media_device);
+    mr_free(mr_cnf->prefix);
+    mr_free(mr_cnf->deplist_file);
+    mr_free(mr_cnf->kernel);
+    mr_free(mr_cnf->additional_modules);
+    mr_free(mr_cnf->boot_loader);
+    mr_free(mr_cnf->compression_tool);
+    mr_free(mr_cnf->exclude_paths);
+    mr_free(mr_cnf->include_paths);
+    mr_free(mr_cnf->ui_mode);
+    mr_free(mr_cnf->scratch_dir);
+    mr_free(mr_cnf->tmp_dir);
+    mr_free(mr_cnf->images_dir);
+}
+
+/* Create the pointer to the function called in mr_exit */
+void (*mr_cleanup)(void) = NULL;
+
+/* Cleanup all memory allocated in various structures */
+void mr_ar_cleanup(void) {
+    /* Highly incomplete function for the moment */
+    /* We have to free all allocated memory */
+    mr_ar_clean_conf(&mr_conf);
+    /* We have to remove all temporary files */
+    /* We have to unmount what has been mounted */
+    /* We have to properly end newt */
+    /* We have to remind people of log files */
+
+    mr_msg_close();
 }
 
@@ -184 +227 @@
     printf(_("Initializing..."));
 
+    /* Reference the right cleanup function for mr_exit */
+    mr_cleanup = mr_ar_cleanup;
+
     /* initialize log file with time stamp */
     /* We start with a loglevel of 4 - Adapted later on */
@@ -484 +530 @@
     } else {
         printf(_("See %s for details of backup run.\n"), MONDO_LOGFILE);
-        exit(retval);
+        mr_exit(retval, NULL);
     }
 

branches/stable/mondo/src/mondorestore/mondo-prep.c

@@ -520 +520 @@
   /** buffers ***********************************************************/
   char *devices = NULL;
-  char *strtmp  = NULL;
   char *level   = NULL;
   char *program = NULL;
@@ -624 +623 @@
     char *program2 = NULL;
     char *tmp = NULL;
-    char *tmp1 = NULL;
 #ifdef __FreeBSD__
     char *line = NULL;
@@ -1389 +1387 @@
     char *format = NULL;
     char *tmp = NULL;
-    char *tmp1 = NULL;
 
     /** end *************************************************************/

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -19 +19 @@
 #include "mr_msg.h"
 #include "mr_str.h"
+#include "mr_err.h"
 
 #include "mondostructures.h"
@@ -129 +130 @@
 extern int copy_from_src_to_dest(FILE * f_orig, FILE * f_archived,
                                  char direction);
+
+struct mr_rs_conf mr_conf;
+
+/* destroy the mr_rs_conf structure's content */
+static void mr_rs_clean_conf(struct mr_rs_conf *mr_cnf) {
+    
+    if (mr_cnf == NULL) {
+        return;
+    }
+    mr_free(&mr_cnf->media_device);
+    mr_free(&mr_cnf->prefix);
+    mr_free(&mr_cnf->boot_loader);
+    mr_free(&mr_cnf->compression_tool);
+    mr_free(&mr_cnf->ui_mode);
+    mr_free(&mr_cnf->images_dir);
+}
+
+/* Create the pointer to the function called in mr_exit */
+void (*mr_cleanup)(void) = NULL;
+
+/* Cleanup all memory allocated in various structures */
+void mr_rs_cleanup(void) {
+    /* Highly incomplete function for the moment */
+    /* We have to free all allocated memory */
+        /* Not allocated yet
+    mr_rs_clean_conf(&mr_conf);
+    */
+    /* We have to remove all temporary files */
+    /* We have to unmount what has been mounted */
+    /* We have to properly end newt */
+    /* We have to remind people of log files */
+
+    mr_msg_close();
+}
 
 /**************************************************************************
@@ -954 +989 @@
     int res = 0;
     int old_loglevel;
-    char *sz_msg = NULL;
     struct s_node *node = NULL;
 
@@ -1710 +1744 @@
 
   /** malloc add ***/
-    char *tmp = NULL;
     char *command = NULL;
     char *afio_fname = NULL;
@@ -2754 +2787 @@
 #endif
 
+    /* Reference the right cleanup function for mr_exit */
+    mr_cleanup = mr_rs_cleanup;
+
     if (getuid() != 0) {
         fprintf(stderr, _("Please run as root.\n"));
-        exit(127);
+        mr_exit(127, NULL);
     }
 
@@ -3205 +3241 @@
     unlink("/tmp/filelist.full.gz");
 
-    exit(retval);
+    mr_exit(retval, NULL);
 }