Changeset 941 in MondoRescue for branches

Timestamp:

Nov 18, 2006, 1:12:12 AM (17 years ago)

Author:

Bruno Cornec

Message:

Fix a bug in libmondo-fifo.c where potentially no buffer content could let mondo running forever in case of an exception

Location:

branches/stable

Files:

• mindi/mindi (modified) (3 diffs)
• mondo/src/common/libmondo-fifo.c (modified) (1 diff)
• mondo/src/common/libmondo-filelist.c (modified) (1 diff)

branches/stable/mindi/mindi

@@ -102 +102 @@
 
 FDISKLOG=$MINDI_TMP/parted2fdisk.log
-touch $FDISKLOG
 
 # Purge from potential old run
@@ -479 +478 @@
 
     # Creates a tar file containing all required files
-    for i in /etc/fstab /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log $FDISKLOG ; do
+    for i in /etc/fstab /etc/lilo.conf /etc/raidtab $LOGFILE /var/log/mondo-archive.log ; do
         [ -e "$i" ] && cp -f $i $MINDI_TMP
     done
@@ -2773 +2772 @@
         rm -rf $MINDI_TMP
         MINDI_TMP=$MONDO_TMP
+        FDISKLOG=$MINDI_TMP/parted2fdisk.log
         CACHE_LOC=$3
         if [ _"$CACHE_LOC" != _"" ]; then

branches/stable/mondo/src/common/libmondo-fifo.c

@@ -241 +241 @@
     char *command;
 
+    if (g_sz_call_to_buffer == NULL) {
+        return;
+    }
+    if (strcmp(g_sz_call_to_buffer,"") == 0) {
+        return;
+    }
     malloc_string(tmp);
     malloc_string(command);
     paranoid_system("sync");
     sprintf(command,
-            "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options,
-            g_sz_call_to_buffer);
+            "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options, g_sz_call_to_buffer);
     log_msg(2, "kill_buffer() --- command = %s", command);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));

branches/stable/mondo/src/common/libmondo-filelist.c

@@ -207 +207 @@
     log_to_screen("Dividing filelist into sets. Please wait.");
     i = 0;
-/*
-  if (find_home_of_exe("getfattr")) 
-    { i++; log_to_screen ("NEW! Recording extended attributes."); }
-  if (find_home_of_exe("getfacl"))
-    { i++; log_to_screen ("NEW! Recording ACL information."); }
-  if (i)
-    { i=0; log_to_screen ("This will take more time. Please be patient."); }
-*/
     sprintf(filelist, "%s/archives/filelist.full", bkpinfo->scratchdir);
     sprintf(cksumlist, "%s/cklist.full", bkpinfo->tmpdir);