Changeset 1645 in MondoRescue for branches/2.2.5/mondo/src/mondoarchive

Timestamp:

Sep 24, 2007, 3:04:43 AM (18 years ago)

Author:

Bruno Cornec

Message:

Render bkpinfo global (potential issue on thread, but should not be a problem as that structure is indeed static during archive)
Should solve the tmpdir issue from previous rev.
May still not compile

Location:

branches/2.2.5/mondo/src/mondoarchive

Files:

• main.c (modified) (9 diffs)
• mondo-cli.c (modified) (8 diffs)

branches/2.2.5/mondo/src/mondoarchive/main.c

@@ -146 +146 @@
 extern int g_loglevel;
 
+/* Reference to global bkpinfo */
+struct s_bkpinfo *bkpinfo;
+
 /****************** subroutines used only by main.c ******************/
 
@@ -261 +264 @@
 int main(int argc, char *argv[])
 {
-    struct s_bkpinfo *bkpinfo;
     char *tmp;
     int res, retval;
@@ -422 +424 @@
     }
 
-    if (pre_param_configuration(bkpinfo)) {
+    if (pre_param_configuration()) {
         fatal_error
             ("Pre-param initialization phase failed. Please review the error messages above, make the specified changes, then try again. Exiting...");
@@ -431 +433 @@
         g_text_mode = FALSE;
         setup_newt_stuff();
-        res = interactively_obtain_media_parameters_from_user(bkpinfo, TRUE);   /* yes, archiving */
+        res = interactively_obtain_media_parameters_from_user(TRUE);    /* yes, archiving */
         if (res) {
             fatal_error
@@ -437 +439 @@
         }
     } else {
-        res = handle_incoming_parameters(argc, argv, bkpinfo);
+        res = handle_incoming_parameters(argc, argv);
         if (res) {
             printf
@@ -449 +451 @@
 
 /* Finish configuring global structures */
-    if (post_param_configuration(bkpinfo)) {
+    if (post_param_configuration()) {
         fatal_error
             ("Post-param initialization phase failed. Perhaps bad parameters were supplied to mondoarchive? Please review the documentation, error messages and logs. Exiting...");
@@ -461 +463 @@
     /* If we're meant to backup then backup */
     if (bkpinfo->backup_data) {
-        res = backup_data(bkpinfo);
+        res = backup_data();
         retval += res;
         if (res) {
@@ -473 +475 @@
 /* If we're meant to verify then verify */
     if (bkpinfo->verify_data) {
-        res = verify_data(bkpinfo);
+        res = verify_data();
         if (res < 0) {
             sprintf(tmp, "%d difference%c found.", -res,
@@ -486 +488 @@
 /* Offer to write floppy disk images to physical disks */
     if (bkpinfo->backup_data && !g_skip_floppies) {
-        res = offer_to_write_boot_floppies_to_physical_disks(bkpinfo);
+        res = offer_to_write_boot_floppies_to_physical_disks();
         retval += res;
-//      res = offer_to_write_boot_ISO_to_physical_CD(bkpinfo);
+//      res = offer_to_write_boot_ISO_to_physical_CD();
 //      retval += res;
     }

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

@@ -210 +210 @@
 char *g_getfacl = NULL;
 char *g_getfattr = NULL;
+
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
 
 /**
@@ -223 +226 @@
  */
 int
-handle_incoming_parameters(int argc, char *argv[],
-                           struct s_bkpinfo *bkpinfo)
+handle_incoming_parameters(int argc, char *argv[])
 {
     /*@ int *** */
@@ -237 +239 @@
 
     malloc_string(tmp);
-    sensibly_set_tmpdir_and_scratchdir(bkpinfo);
+    sensibly_set_tmpdir_and_scratchdir();
     for (i = 0; i < 128; i++) {
         flag_val[i][0] = '\0';
@@ -252 +254 @@
     retval += res;
     if (!retval) {
-        res = process_switches(bkpinfo, flag_val, flag_set);
+        res = process_switches(flag_val, flag_set);
         retval += res;
     }
@@ -293 +295 @@
  * @bug Return code not needed.
  */
-int process_the_s_switch(struct s_bkpinfo *bkpinfo, char *value)
+int process_the_s_switch(char *value)
 {
     int j;
@@ -337 +339 @@
  */
 int
-process_switches(struct s_bkpinfo *bkpinfo,
-                 char flag_val[128][MAX_STR_LEN], bool flag_set[128])
+process_switches(char flag_val[128][MAX_STR_LEN], bool flag_set[128])
 {
 
@@ -602 +603 @@
                         ("For the moment, please don't specify a tape size. Mondo should handle end-of-tape gracefully anyway.");
                 }
-                if (process_the_s_switch(bkpinfo, flag_val['s'])) {
+                if (process_the_s_switch(flag_val['s'])) {
                     fatal_error("Bad -s switch");
                 }
@@ -616 +617 @@
     } else {                    /* CD size */
         if (flag_set['s']) {
-            if (process_the_s_switch(bkpinfo, flag_val['s'])) {
+            if (process_the_s_switch(flag_val['s'])) {
                 fatal_error("Bad -s switch");
             }