Changeset 489 in MondoRescue for trunk/mondo

Timestamp:

Apr 19, 2006, 11:02:43 AM (18 years ago)

Author:

bcornec

Message:

svn merge -r 463:482 $SVN_M/branches/stable
svn merge -r 485:488 $SVN_M/branches/stable

Location:

trunk/mondo

Files:

• configure.in (modified) (1 diff)
• distributions/mandriva/spec.m4 (modified) (1 diff)
• distributions/rpm/changelog (copied) (copied from branches/stable/mondo/distributions/rpm/changelog )
• mondo/mondoarchive/mondo-cli.c (modified) (4 diffs)
• mondo/mondorestore/mondo-restore.c (modified) (2 diffs)

trunk/mondo/configure.in

@@ -72 +72 @@
         AC_CHECK_LIB(pthread, pthread_create, true, [echo "*** Cannot find -lpthread."; echo "*** Please make sure you have the linuxthreads glibc add-on installed."; exit 1])
         PTHREAD="-lpthread"
-        CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
+        CFLAGS="$CFLAGS -Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
         ;;
     *)

trunk/mondo/distributions/mandriva/spec.m4

@@ -8 +8 @@
 define(`GRP', `Archiving/Backup')dnl
 dnl OBS is replaced vy what is being obsoleted
-define(`OBS', Obsoletes:    libmondo <= 2.04)dnl
+define(`OBS', `Obsoletes:   libmondo <= 2.04
+Provides:   libmondo')dnl

trunk/mondo/mondo/mondoarchive/mondo-cli.c

@@ -217 +217 @@
     char *tmp;
     char *tmp2;
+    char *tmp1;
     char *psz;
 
@@ -300 +301 @@
             strcat(bkpinfo->include_paths, " ");
         }
-        if (stat(flag_val['I'], &buf) != 0) {
-            log_msg("ERROR ! %s doesn't exist", flag_val['I']);
-            fatal_error("ERROR ! You specified a directory to include which doesn't exist");
-        }
+        asprintf(&tmp1, flag_val['I']);
+        char *p = tmp1;
+        char *q = tmp1;
+
+        /* Cut the flag_val['I'] in parts containing all paths to test them */
+        while (p != NULL) {
+            q = strchr(p, ' ');
+            if (q != NULL) {
+                *q = '\0';
+                p = q+1 ;
+                if (stat(p, &buf) != 0) {
+                    log_msg(1, "ERROR ! %s doesn't exist", p);
+                    fatal_error("ERROR ! You specified a directory to include which doesn't exist");
+                }
+            } else {
+                if (stat(p, &buf) != 0) {
+                    log_msg(1, "ERROR ! %s doesn't exist", p);
+                    fatal_error("ERROR ! You specified a directory to include which doesn't exist");
+                }
+                p = NULL;
+            }
+        }
+        paranoid_free(tmp1);
+
         strncpy(bkpinfo->include_paths + strlen(bkpinfo->include_paths),
                 flag_val['I'],
@@ -516 +537 @@
             strcat(bkpinfo->exclude_paths, " ");
         }
-        if (stat(flag_val['E'], &buf) != 0) {
-            log_msg(1, "WARNING ! %s doesn't exist", flag_val['E']);
-        }
+        asprintf(&tmp1, flag_val['E']);
+        char *p = tmp1;
+        char *q = tmp1;
+
+        /* Cut the flag_val['E'] in parts containing all paths to test them */
+        while (p != NULL) {
+            q = strchr(p, ' ');
+            if (q != NULL) {
+                *q = '\0';
+                p = q+1 ;
+                if (stat(p, &buf) != 0) {
+                    log_msg(1, "WARNING ! %s doesn't exist", p);
+                }
+            } else {
+                if (stat(p, &buf) != 0) {
+                    log_msg(1, "WARNING ! %s doesn't exist", p);
+                }
+                p = NULL;
+            }
+        }
+        paranoid_free(tmp1);
+
         strncpy(bkpinfo->exclude_paths + strlen(bkpinfo->exclude_paths),
                 flag_val['E'],
@@ -763 +803 @@
         &&
         !run_program_and_log_output
-        ("grep -i suse /etc/issue.net | grep 64", TRUE)) {
+        ("egrep -i suse /etc/issue.net | egrep '9.0' | grep 64", TRUE)) {
         bkpinfo->make_cd_use_lilo = TRUE;
         log_to_screen

trunk/mondo/mondo/mondorestore/mondo-restore.c

@@ -1980 +1980 @@
                 filelist_name);
         log_msg(2,
-                "This is a bit silly (ask Hugo to fix mondo-makefilelist, please)");
+                "This is a bit silly (ask dev-team to fix mondo-makefilelist, please)");
         log_msg(2,
                 "but it's non-critical. It's cosmetic. Don't worry about it.");
@@ -2057 +2057 @@
             if (filelist_subset_fname[0] != '\0') {
                 sprintf(command,
-                        "afio -i -M 8m -b %ld -c %ld %s -w %s %s",
+                        "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s",
                         TAPE_BLOCK_SIZE,
                         BUFSIZE, executable, filelist_subset_fname,