Changeset 1264 in MondoRescue for branches/stable/mondo/src/mondorestore/mondorestore.c

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)

File:

• branches/stable/mondo/src/mondorestore/mondorestore.c (modified) (6 diffs)

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