Changeset 1264 in MondoRescue for branches/stable/mondo/src/mondoarchive

Timestamp:

Mar 24, 2007, 1:48:55 AM (18 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/mondoarchive

Files:

• mondo-cli-EXT.h (modified) (1 diff)
• mondo-cli.c (modified) (1 diff)
• mondo-cli.h (modified) (1 diff)
• mondoarchive.c (modified) (4 diffs)

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