[Glibc-bsd-commits] r2777 - in trunk/kfreebsd-7/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2009-09-04 12:02:07 +0000 (Fri, 04 Sep 2009)
New Revision: 2777

Modified:
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/patches/904_dev_full.diff
Log:
Extend 904_dev_full.diff to support non-blocking mode of /dev/full, /dev/null, /dev/zero
fixes "FAIL: tail-2/pid" in coreutils 7.5



Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2009-09-03 12:50:38 UTC (rev 2776)
+++ trunk/kfreebsd-7/debian/changelog	2009-09-04 12:02:07 UTC (rev 2777)
@@ -1,9 +1,14 @@
 kfreebsd-7 (7.2-7) unstable; urgency=low
 
+  [ Aurelien Jarno ]
   * Don't ship /boot/kernel, but create it in the postinst if symlinks are
     enabled.
   * Add 914_psm.diff to debian/series.
 
+  [ Petr Salinger ]
+  * Extend 904_dev_full.diff to support non-blocking mode
+    of /dev/full, /dev/null, /dev/zero
+
  -- Aurelien Jarno <aurel32 at debian.org>  Mon, 31 Aug 2009 22:05:09 +0200
 
 kfreebsd-7 (7.2-6) unstable; urgency=low

Modified: trunk/kfreebsd-7/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/904_dev_full.diff	2009-09-03 12:50:38 UTC (rev 2776)
+++ trunk/kfreebsd-7/debian/patches/904_dev_full.diff	2009-09-04 12:02:07 UTC (rev 2777)
@@ -1,5 +1,6 @@
 
-Status: Rejected in upstream (kern/68961)
+Status: FIONBIO/FIOASYNC is in http://www.freebsd.org/cgi/query-pr.cgi?pr=138526
+	/dev/full already rejected in upstream (kern/68961)
 
 Index: src/sys/dev/null/null.c
 ===================================================================
@@ -37,7 +38,7 @@
  static struct cdevsw zero_cdevsw = {
  	.d_version =	D_VERSION,
  	.d_read =	zero_read,
-@@ -81,6 +92,15 @@
+@@ -81,11 +92,25 @@
  
  /* ARGSUSED */
  static int
@@ -48,11 +49,21 @@
 +	return (ENOSPC);
 +}
 +
++#include <sys/filio.h>
 +/* ARGSUSED */
 +static int
  null_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t data __unused,
      int flags __unused, struct thread *td)
  {
+ 	int error;
+ 
++	if (cmd == FIONBIO)
++		return 0;
++	if ((cmd == FIOASYNC) && ((*(int *)data) == 0))
++		return 0;
+ 	if (cmd != DIOCSKERNELDUMP)
+ 		return (ENOIOCTL);
+ 	error = priv_check(td, PRIV_SETDUMPER);
 @@ -117,12 +137,15 @@
  		zbuf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK | M_ZERO);
  		null_dev = make_dev(&null_cdevsw, NULL_MINOR, UID_ROOT,