[commits] r7679 - in /fsf/trunk/libc: ChangeLog hurd/hurdsig.c hurd/report-wait.c sysdeps/mach/hurd/Makefile

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Jan  7 00:03:22 2009
New Revision: 7679

Log:
Import glibc-mainline for 2009-01-07

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/hurd/hurdsig.c
    fsf/trunk/libc/hurd/report-wait.c
    fsf/trunk/libc/sysdeps/mach/hurd/Makefile

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Jan  7 00:03:22 2009
@@ -1,3 +1,15 @@
+2009-01-07  Samuel Thibault  <samuel.thibault@xxxxxxxxxxxx>
+
+	* sysdeps/mach/hurd/Makefile (sysdep_headers) [subdir=socket]:
+	Add net/ethernet.h net/if_arp.h net/if_ether.h net/if_ppp.h
+	net/route.h.
+
+	* hurd/report-wait.c (describe_number): Use __stpcpy to prepend
+	flavor to description only when flavor is not NULL.
+
+	* hurd/hurdsig.c (signal_allowed): Unlock _hurd_dtable_lock
+	mutex after SIGIO/SIGURG lookup loop.
+
 2009-01-03  Samuel Thibault  <samuel.thibault@xxxxxxxxxxxx>
 
 	* bits/resource.h (PRIO_PROCESS, PRIO_PGRP, PRIO_USER): Add macros.

Modified: fsf/trunk/libc/hurd/hurdsig.c
==============================================================================
--- fsf/trunk/libc/hurd/hurdsig.c (original)
+++ fsf/trunk/libc/hurd/hurdsig.c Wed Jan  7 00:03:22 2009
@@ -1134,6 +1134,7 @@
 	      }
 	    _hurd_port_free (&_hurd_dtable[d]->port, &ulink, port);
 	  }
+	__mutex_unlock (&_hurd_dtable_lock);
 	/* If we found a lucky winner, we've set D to -1 in the loop.  */
 	if (lucky)
 	  goto win;

Modified: fsf/trunk/libc/hurd/report-wait.c
==============================================================================
--- fsf/trunk/libc/hurd/report-wait.c (original)
+++ fsf/trunk/libc/hurd/report-wait.c Wed Jan  7 00:03:22 2009
@@ -1,5 +1,5 @@
 /* Report on what a thread in our task is waiting for.
-   Copyright (C) 1996,1997,1999,2002,2005 Free Software Foundation, Inc.
+   Copyright (C) 1996,1997,1999,2002,2005,2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@
 describe_number (string_t description, const char *flavor, long int i)
 {
   unsigned long int j;
-  char *p = flavor ? description : __stpcpy (description, flavor);
+  char *p = flavor == NULL ? description : __stpcpy (description, flavor);
   char *end;
 
   /* Handle sign.  */

Modified: fsf/trunk/libc/sysdeps/mach/hurd/Makefile
==============================================================================
--- fsf/trunk/libc/sysdeps/mach/hurd/Makefile (original)
+++ fsf/trunk/libc/sysdeps/mach/hurd/Makefile Wed Jan  7 00:03:22 2009
@@ -1,4 +1,4 @@
-# Copyright (C) 1993,94,95,96,97,98,99,2000,2001,2002, 2003, 2004
+# Copyright (C) 1993,94,95,96,97,98,99,2000,2001,2002,2003,2004,2009
 #	Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -206,4 +206,9 @@
 sysdep_headers += nfs/nfs.h
 endif
 
+ifeq ($(subdir),socket)
+sysdep_headers += net/ethernet.h net/if_arp.h net/if_ether.h net/if_ppp.h \
+		  net/route.h
+endif
+
 endif	# in-Makerules