Changeset 1932 in MondoRescue for branches/2.2.6/mondo

Timestamp:

May 7, 2008, 11:54:58 AM (17 years ago)

Author:

Bruno Cornec

Message:

Attempt to solve #244 by ignoring SIGPIPE during big file restore with gzip

Location:

branches/2.2.6/mondo/src

Files:

• common/libmondo-cli.c (modified) (1 diff)
• mondorestore/mondorestore.c (modified) (3 diffs)

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

@@ -170 +170 @@
 extern bool g_text_mode;
 extern char g_startdir[MAX_STR_LEN];    ///< ????? @bug ?????
-extern bool g_sigpipe;
 extern char *MONDO_OPTIONS;
 

branches/2.2.6/mondo/src/mondorestore/mondorestore.c

@@ -54 +54 @@
  * @{
  */
-/**
- * If TRUE, then SIGPIPE was just caught.
- * Set by the signal handler; cleared after it's handled.
- */
-bool g_sigpipe_caught = FALSE;
 
 /**
@@ -1490 +1485 @@
         sprintf(command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe,
                 file_to_openout, MONDO_LOGFILE);
+        if (strcmp(bkpinfo->zip_exe, "gzip") == 0) {
+            /* Ignore SIGPIPE for gzip as it causes errors on big files
+             * Cf: http://trac.mondorescue.org/ticket/244
+             */
+            signal(SIGPIPE,SIG_IGN);
+        }
     }
     sprintf(tmp, "Pipe command = '%s'", command);
@@ -1542 +1543 @@
     }
     paranoid_pclose(pout);
+
+    if (bkpinfo->zip_exe[0]) {
+        if (strcmp(bkpinfo->zip_exe, "gzip") == 0) {
+            /* Re-enable SIGPIPE for gzip
+             */
+            signal(SIGPIPE, terminate_daemon);
+        }
+    }
 
     log_msg(1, "pathname_of_last_file_restored is now %s",