Changeset 1645 in MondoRescue for branches/2.2.5/mondo/src/mondoarchive/mondo-cli.c

Timestamp:

Sep 24, 2007, 3:04:43 AM (17 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

File:

• branches/2.2.5/mondo/src/mondoarchive/mondo-cli.c (modified) (8 diffs)

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