Changeset 1917 in MondoRescue for branches/2.2.6/mondo/src/common/libmondo-cli.c

Timestamp:

Apr 17, 2008, 1:29:45 AM (16 years ago)

Author:

Bruno Cornec

Message:

mondo.libmondo-cli.patch (Mark Pinkerton <Mark.Pinkerton_at_emageon.com>) modified to not duplicate the newt initialization stuff (we should rather remove them in mondoarchive)

File:

• branches/2.2.6/mondo/src/common/libmondo-cli.c (modified) (7 diffs)

branches/2.2.6/mondo/src/common/libmondo-cli.c

@@ -162 +162 @@
 
 #include <pthread.h>
-#include "../common/my-stuff.h"
-#include "../common/mondostructures.h"
-#include "mondo-cli-EXT.h"
-#include "../common/libmondo.h"
-
-//static char cvsid[] = "$Id$";
+#include "my-stuff.h"
+#include "mondostructures.h"
+#include "libmondo-cli-EXT.h"
+#include "libmondo.h"
 
 extern int g_loglevel;
 extern bool g_text_mode;
-extern bool g_skip_floppies;    ///< Whether to skip the creation of boot disks
+bool g_skip_floppies;   ///< Whether to skip the creation of boot disks
 extern char g_startdir[MAX_STR_LEN];    ///< ????? @bug ?????
 extern bool g_sigpipe;
+extern char *MONDO_OPTIONS;
 
 /*@ file pointer **************************************************/
@@ -190 +189 @@
 
 extern void setup_tmpdir(char *path);
-
-/**
- * Whether we're restoring from ISOs. Obviously not, since this is the
- * backup program.
- * @note You @b MUST declare this variable somewhere in your program if
- * you use libmondo. Otherwise the link will fail.
- * @ingroup globalGroup
- */
-bool g_ISO_restore_mode = FALSE;
-
-
 extern double g_kernel_version;
 extern int g_current_media_number;
@@ -208 +196 @@
 /* Do we use extended attributes and acl ? 
  * By default no, use --acl & --attr options to force their usage */
-char *g_getfacl = NULL;
-char *g_getfattr = NULL;
+extern char *g_getfacl;
+extern char *g_getfattr;
 
 /* Reference to global bkpinfo */
@@ -239 +227 @@
 
     tmp = malloc(9*MAX_STR_LEN);
-    sensibly_set_tmpdir_and_scratchdir();
     for (i = 0; i < 128; i++) {
         flag_val[i][0] = '\0';
@@ -378 +365 @@
     if (flag_set['K']) {
         g_loglevel = atoi(flag_val['K']);
+            log_msg(1,"Loglevel forced to %s",g_loglevel);
         if (g_loglevel < 3) {
             g_loglevel = 3;
@@ -997 +985 @@
     }
 
-    i = flag_set['O'] + flag_set['V'];
-    if (i == 0) {
-        retval++;
-        log_to_screen("Specify backup (-O), verify (-V) or both (-OV).\n");
+    if ( ! bkpinfo->restore_data ) {
+        i = flag_set['O'] + flag_set['V'];
+        if (i == 0) {
+            retval++;
+            log_to_screen("Specify backup (-O), verify (-V) or both (-OV).\n");
+        }
     }
 
@@ -1045 +1035 @@
     }
     while ((opt =
-            getopt(argc, argv,
-                   "0123456789A:B:C:DE:FGHI:J:K:LNOP:QRS:T:UVWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z"))
+            getopt(argc, argv, MONDO_OPTIONS))
            != -1) {
         if (opt == '?') {