Changeset 783 in MondoRescue for trunk/mondo/mondo/mondoarchive/main.c

Timestamp:

Aug 31, 2006, 5:09:20 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Massive rewrite continues for memory management.
• main structure should now have all parameters allocated dynamically
• new lib libmr.a + dir + build process reviewed to support it.
• new include subdir to host external definitions of the new lib
• code now compiles. Still one remaining link issues for mondorestore. This should allow for some tests soon.

(goal is to separate completely reviewed code and functions and provide clean interfaces)

File:

• trunk/mondo/mondo/mondoarchive/main.c (modified) (8 diffs)

trunk/mondo/mondo/mondoarchive/main.c

@@ -17 +17 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "../common/my-stuff.h"
+#include "my-stuff.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -33 +33 @@
 extern bool g_remount_cdrom_at_end, g_remount_floppy_at_end;
 extern char *g_mondo_home;
-extern char *g_tmpfs_mountpt;
 extern char *g_erase_tmpdir_and_scratchdir;
 extern double g_kernel_version;
@@ -41 +40 @@
 long diffs;
 
-extern t_bkptype g_backup_media_type;
 extern int g_loglevel;
 
 /****************** subroutines used only by main.c ******************/
 
+extern void mr_archive_init_conf(struct s_mr_conf *mr_conf);
 
 /**
@@ -131 +130 @@
 {
     struct s_bkpinfo *bkpinfo;
-    struct s_mrconf *mrconf;
     char *tmp;
     int res = 0;
@@ -147 +145 @@
     }
 
-/* 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")
@@ -155 +153 @@
     }
 
-/* Initialize variables */
-
+    /* Initialize variables */
     malloc_libmondo_global_strings();
-
-    /* Initialize Configuration Structure */
-    mrarchive_init_conf(mrconf);
 
     res = 0;
@@ -170 +164 @@
     }
 
-
-/* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
+    /* Initialize Configuration Structure */
+    mr_archive_init_conf(bkpinfo->mr_conf);
+
+
+    /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
     asprintf(&tmp, "/sbin:/usr/sbin:%s:/usr/local/sbin", getenv("PATH"));
     setenv("PATH", tmp, 1);
     paranoid_free(tmp);
 
-/* Add the ARCH environment variable for ia64 purposes */
+    /* Add the ARCH environment variable for ia64 purposes */
     setenv("ARCH", get_architecture(), 1);
 
@@ -331 +328 @@
     /* If we're meant to backup then backup */
     if (bkpinfo->backup_data) {
-        res = backup_data(bkpinfo, mrconf);
+        res = backup_data(bkpinfo);
         retval += res;
         if (res) {