svn commit: trunk/busybox: archival/libunarchive shell

vda at busybox.net vda at busybox.net
Thu Feb 14 08:52:31 UTC 2008


Author: vda
Date: 2008-02-14 00:52:30 -0800 (Thu, 14 Feb 2008)
New Revision: 21013

Log:
tar: do "short EOF" compat only if CONFIG_DESKTOP.
ash: add a comment about new minor bug



Modified:
   trunk/busybox/archival/libunarchive/get_header_tar.c
   trunk/busybox/shell/README


Changeset:
Modified: trunk/busybox/archival/libunarchive/get_header_tar.c
===================================================================
--- trunk/busybox/archival/libunarchive/get_header_tar.c	2008-02-14 01:17:01 UTC (rev 21012)
+++ trunk/busybox/archival/libunarchive/get_header_tar.c	2008-02-14 08:52:30 UTC (rev 21013)
@@ -90,15 +90,22 @@
 
  again_after_align:
 
+#if ENABLE_DESKTOP
 	i = full_read(archive_handle->src_fd, &tar, 512);
 	/* if GNU tar sees EOF in above read, it says:
 	 * "tar: A lone zero block at N", where N = kilobyte
 	 * where EOF was met (not EOF block, actual EOF!),
-	 * and tar will exit with error code 0! Mimic exit(0): */
+	 * and tar will exit with error code 0.
+	 * We will mimic exit(0), although we will not mimic
+	 * the message and we don't check whether we indeed
+	 * saw zero block directly before this. */
 	if (i == 0)
 		xfunc_error_retval = 0;
 	if (i != 512)
 		bb_error_msg_and_die("short read");
+#else
+	xread(archive_handle->src_fd, &tar, 512);
+#endif
 	archive_handle->offset += 512;
 
 	/* If there is no filename its an empty header */

Modified: trunk/busybox/shell/README
===================================================================
--- trunk/busybox/shell/README	2008-02-14 01:17:01 UTC (rev 21012)
+++ trunk/busybox/shell/README	2008-02-14 08:52:30 UTC (rev 21013)
@@ -1,5 +1,9 @@
 Various bits of what is known about busybox shells, in no particular order.
 
+2008-02-14
+ash: does not restore tty pgrp if killed by HUP. Symptom: Midnigth Commander
+is backgrounded if you started ash under it, and then killed it with HUP.
+
 2007-11-23
 hush: fixed bogus glob handling; fixed exec <"$1"; added test and echo builtins
 




More information about the busybox-cvs mailing list