Changeset 1917 in MondoRescue

Timestamp:

Apr 17, 2008, 1:29:45 AM (17 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)

Location:

branches/2.2.6/mondo/src

Files:

• common/Makefile.am (modified) (2 diffs)
• common/libmondo-cli-EXT.h (modified) (1 diff)
• common/libmondo-cli.c (modified) (7 diffs)
• common/libmondo-cli.h (modified) (1 diff)
• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-tools-EXT.h (modified) (1 diff)
• common/libmondo-tools.c (modified) (4 diffs)
• common/libmondo-tools.h (modified) (1 diff)
• common/mr_string.c (modified) (1 diff)
• mondoarchive/Makefile.am (modified) (1 diff)
• mondoarchive/main.c (modified) (3 diffs)
• mondoarchive/mondoarchive.h (modified) (1 diff)

branches/2.2.6/mondo/src/common/Makefile.am ¶

@@ -11 +11 @@
                        libmondo-mountlist.c libmondo-raid.c \
                        libmondo-stream.c libmondo-string.c libmondo-tools.c \
-                       libmondo-verify.c newt-specific.c \
+                       libmondo-verify.c newt-specific.c libmondo-cli.c \
                        libmondo-archive.h libmondo-devices.h \
                        libmondo-filelist.h libmondo-files.h libmondo-fork.h \
                        libmondo-gui.h libmondo-mountlist.h libmondo-raid.h \
                        libmondo-stream.h libmondo-string.h libmondo-tools.h \
-                       libmondo-verify.h libmondo-fifo.h \
+                       libmondo-verify.h libmondo-fifo.h libmondo-cli.h \
                        libmondo-archive-EXT.h my-stuff.h mondostructures.h \
                        libmondo-devices-EXT.h libmondo-fifo-EXT.h \
@@ -23 +23 @@
                        libmondo-mountlist-EXT.h libmondo-raid-EXT.h  \
                        libmondo-string-EXT.h libmondo-tools-EXT.h \
-                       libmondo-verify-EXT.h  libmondo-stream-EXT.h \
+                       libmondo-verify-EXT.h  libmondo-stream-EXT.h libmondo-cli-EXT.h \
                        newt-specific.h \
                        mr_string.c mr_string.h

branches/2.2.6/mondo/src/common/libmondo-cli-EXT.h ¶

@@ -1 @@
-/* mondo-cli-EXT.h */
+/* libmondo-cli-EXT.h */
 
 extern int handle_incoming_parameters(int argc, char *argv[]);

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 == '?') {

branches/2.2.6/mondo/src/common/libmondo-cli.h ¶

@@ -1 @@
-/* mondo-cli.h
+/* libmondo-cli.h
  * $Id$
  */

branches/2.2.6/mondo/src/common/libmondo-devices.c ¶

@@ -2177 +2177 @@
                 }
             } else {
-                sz_size = 0;
+                strcpy(sz_size, "0");
             }
             for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
                 bkpinfo->media_size[i] = atoi(sz_size);
             }
-            if (bkpinfo->media_size[0] <= 0) {
+            if (bkpinfo->media_size[0] < 0) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);

branches/2.2.6/mondo/src/common/libmondo-tools-EXT.h ¶

@@ -3 +3 @@
 extern void clean_up_KDE_desktop_if_necessary(void);
 extern long get_time();
+extern char *mr_date(void);
 extern void (*log_debug_msg) (int debug_level, const char *szFile,
                               const char *szFunction, int nLine,

branches/2.2.6/mondo/src/common/libmondo-tools.c ¶

@@ -180 +180 @@
 #include "libmondo-fork-EXT.h"
 #include "libmondo-raid-EXT.h"
+#include "libmondo-devices-EXT.h"
 #include <sys/socket.h>
 #include <netdb.h>
@@ -244 +245 @@
 
 extern bool am_I_in_disaster_recovery_mode(void);
+
+/* Return a string containing the date */
+char *mr_date(void) {
+
+        time_t tcurr;
+
+        tcurr = time(NULL);
+        return(ctime(&tcurr));
+}
+
+/*-----------------------------------------------------------*/
 
 
@@ -1001 +1013 @@
     memset((void *) bkpinfo, 0, sizeof(struct s_bkpinfo));
 
-    /* special case for tmpdir as used eveywhere after */
-    setup_tmpdir(NULL);
+    sensibly_set_tmpdir_and_scratchdir();
 
     bkpinfo->manual_cd_tray = FALSE;
@@ -1030 +1041 @@
     strcpy(bkpinfo->prefix, STD_PREFIX);
 
-    bkpinfo->scratchdir[0] = '\0';
     bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
     bkpinfo->optimal_set_size = 0;

branches/2.2.6/mondo/src/common/libmondo-tools.h ¶

@@ -6 +6 @@
 
 long get_time();
+char *mr_date(void);
 extern void (*log_debug_msg) (int debug_level, const char *szFile,
                               const char *szFunction, int nLine,

branches/2.2.6/mondo/src/common/mr_string.c ¶

@@ -3 +3 @@
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

branches/2.2.6/mondo/src/mondoarchive/Makefile.am ¶

@@ -4 +4 @@
 
 ## Headers
-noinst_HEADERS       = mondo-cli-EXT.h mondo-cli.h mondoarchive.h
+noinst_HEADERS       = mondoarchive.h
 
 ## The program
 sbin_PROGRAMS        = mondoarchive
-mondoarchive_SOURCES = main.c mondo-cli.c
+mondoarchive_SOURCES = main.c
 mondoarchive_LDADD   = ${top_builddir}/src/common/libmondo.a

branches/2.2.6/mondo/src/mondoarchive/main.c ¶

@@ -116 +116 @@
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
-#include "mondo-cli-EXT.h"
+#include "../common/libmondo-cli-EXT.h"
 #include "../common/libmondo-tools-EXT.h"
 #include "mondoarchive.h"
@@ -137 +137 @@
 
 /***************** global vars, used only by main.c ******************/
-bool g_skip_floppies;
+extern bool g_skip_floppies;
 long diffs;
 
 extern t_bkptype g_backup_media_type;
 extern int g_loglevel;
+
+/**
+ * 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;
+
+/* 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;
 
 /* Reference to global bkpinfo */
@@ -242 +256 @@
 }
 
-/* Return a string containing the date */
-char *mr_date(void) {
-    
-    time_t tcurr;
-
-    tcurr = time(NULL);
-    return(ctime(&tcurr));
-}
-
-/*-----------------------------------------------------------*/
-
-
 
 /**

branches/2.2.6/mondo/src/mondoarchive/mondoarchive.h ¶

@@ -9 +9 @@
  */
 char *MONDO_LOGFILE = "/var/log/mondoarchive.log";
+char *MONDO_OPTIONS = "0123456789A:B:C:DE:FGHI:J:K:LNOP:QRS:T:UVWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";
 
 /* No restriction on ps options */