Attachment 16927 Details for Bug 30876 – file.diff

[patch] file.diff

file.diff (text/plain), 1.03 KB, created by Simon J. Gerraty on 2001-09-27 19:40:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon J. Gerraty

Created: 2001-09-27 19:40:04 UTC

Size: 1.03 KB

patch

obsolete

>Index: buffer.c
>===================================================================
>retrieving revision 1.1.1.1
>diff -u -p -r1.1.1.1 buffer.c
>--- buffer.c	1997/02/26 02:34:43	1.1.1.1
>+++ buffer.c	2001/09/19 16:17:31
>@@ -1254,6 +1254,20 @@ close_archive ()
>   if (f_verify)
>     verify_volume ();
> 
>+#ifndef __MSDOS__
>+  /*
>+   * closing the child's pipe before reading EOF guarantees that it
>+   * will be unhappy - SIGPIPE, or exit 1.
>+   * Either way it can screw us, so play nice.
>+   */
>+  if (childpid && ar_reading) {
>+      char buf[BUFSIZ];
>+      
>+      while ((c = read(archive, buf, sizeof(buf))) > 0)
>+	  continue;
>+  }
>+#endif
>+      
>   if ((c = rmtclose (archive)) < 0)
>     msg_perror ("Warning: can't close %s(%d,%d)", ar_files[cur_ar_file], archive, c);
> 
>@@ -1291,9 +1305,11 @@ close_archive ()
> 		   */
> 		  /* Do nothing. */
> 		}
>-	      else if (WEXITSTATUS (status))
>+	      else if (WEXITSTATUS (status)) {
> 		msg ("child returned status %d",
> 		     WEXITSTATUS (status));
>+		  exit (EX_BADARCH);
>+	      }
> 	    }
> 	}
>     }

Actions: View | Diff

Attachments on bug 30876: 16927