[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[commits] r4903 - in /fsf/trunk/libc: ./ conform/data/ conform/data/net/ conform/data/netinet/ conform/data/sys/ nptl/ string/ string/...

To: commits@xxxxxxxxxx
Subject: [commits] r4903 - in /fsf/trunk/libc: ./ conform/data/ conform/data/net/ conform/data/netinet/ conform/data/sys/ nptl/ string/ string/...
From: eglibc@xxxxxxxxxx
Date: Wed, 16 Jan 2008 08:25:59 -0000

Author: eglibc
Date: Wed Jan 16 00:25:53 2008
New Revision: 4903

Log:
Import glibc-mainline for 2008-01-16

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/conform/data/fmtmsg.h-data
    fsf/trunk/libc/conform/data/ftw.h-data
    fsf/trunk/libc/conform/data/inttypes.h-data
    fsf/trunk/libc/conform/data/math.h-data
    fsf/trunk/libc/conform/data/net/if.h-data
    fsf/trunk/libc/conform/data/netinet/in.h-data
    fsf/trunk/libc/conform/data/signal.h-data
    fsf/trunk/libc/conform/data/sys/socket.h-data
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/tst-eintr2.c
    fsf/trunk/libc/string/bits/string2.h
    fsf/trunk/libc/string/tester.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Jan 16 00:25:53 2008
@@ -1,3 +1,20 @@
+2008-01-15  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* conform/data/fmtmsg.h-data: Add missing allows.
+	* conform/data/ftw.h-data: Likewise.
+	* conform/data/inttypes.h-data: Likewise.
+	* conform/data/math.h-data: Likewise.
+	* conform/data/signal.h-data: Likewise.
+	* conform/data/net/if.h-data: Likewise.
+	* conform/data/netinet/in.h-data: Likewise.
+	* conform/data/sys/socket.h-data: Likewise.
+
+	[BZ #5614]
+	* string/bits/string2.h (__strtok_r_1c): Always update *__NEXTP.
+	(__strtok_r): Simplify.
+	* string/tester.c (test_strtok_r): Add test case for futile search
+	with single-character seach string.
+
 2008-01-12  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* po/ko.po: Update from translation team.

Modified: fsf/trunk/libc/conform/data/fmtmsg.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/fmtmsg.h-data (original)
+++ fsf/trunk/libc/conform/data/fmtmsg.h-data Wed Jan 16 00:25:53 2008
@@ -59,4 +59,5 @@
 function int fmtmsg (long, const char*, int, const char*, const char*, const char*)
 
 allow *_t
+allow MM_*
 #endif

Modified: fsf/trunk/libc/conform/data/ftw.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/ftw.h-data (original)
+++ fsf/trunk/libc/conform/data/ftw.h-data Wed Jan 16 00:25:53 2008
@@ -22,4 +22,5 @@
 allow-header sys/stat.h
 
 allow *_t
+allow FTW*
 #endif

Modified: fsf/trunk/libc/conform/data/inttypes.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/inttypes.h-data (original)
+++ fsf/trunk/libc/conform/data/inttypes.h-data Wed Jan 16 00:25:53 2008
@@ -136,6 +136,8 @@
 macro UINTMAX_C
 
 // The following expressions are not entirely correct but the current
-// fnamtch implementation doesn't grok the right form.
+// poorfnmatch implementation doesn't grok the right form.
 allow INT*
 allow UINT*
+allow PRI[Xa-z]*
+allow SCN[Xa-z]*

Modified: fsf/trunk/libc/conform/data/math.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/math.h-data (original)
+++ fsf/trunk/libc/conform/data/math.h-data Wed Jan 16 00:25:53 2008
@@ -357,4 +357,6 @@
 #endif
 
 allow *_t
+// The following expressions are not entirely correct but the current
+// poorfnmatch implementation doesn't grok the right form.
 allow FP_*

Modified: fsf/trunk/libc/conform/data/net/if.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/net/if.h-data (original)
+++ fsf/trunk/libc/conform/data/net/if.h-data Wed Jan 16 00:25:53 2008
@@ -12,4 +12,5 @@
 function void if_freenameindex (struct if_nameindex*)
 
 allow *_t
+allow IF_*
 #endif

Modified: fsf/trunk/libc/conform/data/netinet/in.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/netinet/in.h-data (original)
+++ fsf/trunk/libc/conform/data/netinet/in.h-data Wed Jan 16 00:25:53 2008
@@ -59,7 +59,7 @@
 function uint16_t ntohs (uint16_t)
 
 allow-header inttypes.h
-allow-header arpa/inet.h
+allow-header sys/socket.h
 
 constant INET6_ADDRSTRLEN 46
 
@@ -83,8 +83,12 @@
 macro IN6_IS_ADDR_MC_ORGLOCAL
 macro IN6_IS_ADDR_MC_GLOBAL
 
+allow IMPLINK_*
 allow IN_*
+allow IN6_*
+allow INADDR_*
 allow IP_*
+allow IPV6_*
 allow IPPORT_*
 allow IPPROTO_*
 allow SOCK_*

Modified: fsf/trunk/libc/conform/data/signal.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/signal.h-data (original)
+++ fsf/trunk/libc/conform/data/signal.h-data Wed Jan 16 00:25:53 2008
@@ -180,6 +180,8 @@
 function int sigwait (const sigset_t*, int*)
 function int sigwaitinfo (const sigset_t*, siginfo_t*)
 
+// The following expressions are not entirely correct but the current
+// poorfnmatch implementation doesn't grok the right form.
 allow SIG*
 allow sa_*
 allow uc_*

Modified: fsf/trunk/libc/conform/data/sys/socket.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/sys/socket.h-data (original)
+++ fsf/trunk/libc/conform/data/sys/socket.h-data Wed Jan 16 00:25:53 2008
@@ -118,4 +118,10 @@
 allow cmsg_*
 allow l_*
 allow SO*
+allow AF_*
+allow CMSG_*
+allow MSG_*
+allow PF_*
+allow SCM_*
+allow SHUT_*
 #endif

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Wed Jan 16 00:25:53 2008
@@ -1,3 +1,8 @@
+2008-01-15  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* tst-eintr2.c (do_test): make sure that if mutex_lock in main
+	thread returns the program exits with an error code.
+
 2008-01-10  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* pthread-errnos.sym: Add EOVERFLOW.

Modified: fsf/trunk/libc/nptl/tst-eintr2.c
==============================================================================
--- fsf/trunk/libc/nptl/tst-eintr2.c (original)
+++ fsf/trunk/libc/nptl/tst-eintr2.c Wed Jan 16 00:25:53 2008
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2003.
 
@@ -109,7 +109,7 @@
   printf ("main: mutex_lock returned: %s\n",
 	  strerror_r (e, buf, sizeof (buf)));
 
-  return 0;
+  return 1;
 }
 
 #define EXPECTED_SIGNAL SIGALRM

Modified: fsf/trunk/libc/string/bits/string2.h
==============================================================================
--- fsf/trunk/libc/string/bits/string2.h (original)
+++ fsf/trunk/libc/string/bits/string2.h Wed Jan 16 00:25:53 2008
@@ -1,5 +1,5 @@
 /* Machine-independant string function optimizations.
-   Copyright (C) 1997-2003, 2004, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1997-2003, 2004, 2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1997.
 
@@ -1163,10 +1163,9 @@
 # ifndef _HAVE_STRING_ARCH_strtok_r
 #  define __strtok_r(s, sep, nextp) \
   (__extension__ (__builtin_constant_p (sep) && __string2_1bptr_p (sep)	      \
-		  ? (((__const char *) (sep))[0] != '\0'		      \
-		     && ((__const char *) (sep))[1] == '\0'		      \
-		     ? __strtok_r_1c (s, ((__const char *) (sep))[0], nextp)  \
-		     : __strtok_r (s, sep, nextp))			      \
+		  && ((__const char *) (sep))[0] != '\0'		      \
+		  && ((__const char *) (sep))[1] == '\0'		      \
+		  ? __strtok_r_1c (s, ((__const char *) (sep))[0], nextp)     \
 		  : __strtok_r (s, sep, nextp)))
 # endif
 
@@ -1189,8 +1188,8 @@
 	    __s[-1] = '\0';
 	    break;
 	  }
-      *__nextp = __s;
     }
+  *__nextp = __s;
   return __result;
 }
 # if defined __USE_POSIX || defined __USE_MISC

Modified: fsf/trunk/libc/string/tester.c
==============================================================================
--- fsf/trunk/libc/string/tester.c (original)
+++ fsf/trunk/libc/string/tester.c Wed Jan 16 00:25:53 2008
@@ -1,5 +1,5 @@
 /* Tester for string functions.
-   Copyright (C) 1995-2001, 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-2001, 2003, 2005, 2008 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
@@ -840,9 +840,13 @@
   equal(strtok_r((char *)NULL, ",", &cp), "c", 29);
   check(strtok_r((char *)NULL, ",", &cp) == NULL, 30);
   equal(one+6, "gh", 31);			/* Stomped past end? */
-  equal(one, "a", 32);			/* Stomped old tokens? */
+  equal(one, "a", 32);				/* Stomped old tokens? */
   equal(one+2, "b", 33);
   equal(one+4, "c", 34);
+  strcpy (one, ":::");
+  cp = NULL;
+  check (strtok_r (one, ":", &cp) == NULL, 35);	/* Must store pointer in cp. */
+  check (strtok_r (NULL, ":", &cp) == NULL, 36);
 }
 
 static void

Prev by Date: [commits] r4902 - in /branches/libdfp/libc: ./ dfp/ dfp/sysdeps/dfp/ dfp/sysdeps/dfp/math/ dfp/sysdeps/dfp/math/bits/ dfp/sysdeps/dfp/...
Next by Date: [commits] r4915 - in /fsf/trunk/libc: ./ bits/ conform/data/ conform/data/netinet/ inet/netinet/ posix/ resolv/ sysdeps/gnu/bits/ sysd...
Previous by thread: [commits] r4902 - in /branches/libdfp/libc: ./ dfp/ dfp/sysdeps/dfp/ dfp/sysdeps/dfp/math/ dfp/sysdeps/dfp/math/bits/ dfp/sysdeps/dfp/...
Next by thread: [commits] r4915 - in /fsf/trunk/libc: ./ bits/ conform/data/ conform/data/netinet/ inet/netinet/ posix/ resolv/ sysdeps/gnu/bits/ sysd...
Index(es):
- Date
- Thread