[commits] r9439 - in /fsf/trunk/libc: ChangeLog posix/unistd.h sysdeps/unix/sysv/linux/ptsname.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Dec 10 00:04:49 2009
New Revision: 9439

Log:
Import glibc-mainline for 2009-12-10

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/posix/unistd.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/ptsname.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Dec 10 00:04:49 2009
@@ -1,4 +1,17 @@
-2009-12-08  Ulrich Drepper  <drepper@xxxxxxxxxx>
+2009-12-09  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	[BZ #11046]
+	* sysdeps/unix/sysv/linux/ptsname.c (__ptsname_internal): Fix kernel
+	version check.
+
+2009-11-05  Bruno Haible  <bruno@xxxxxxxxx>
+
+	[BZ #11056]
+	* posix/unistd.h (execve, fexecve, execv, execvp, execvpe): Mark the
+	argv argument as non-NULL.
+	(execle, execl, execlp): Mark the first ARG argument as non-NULL.
+
+-2009-12-08  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/bits/socket.h: Define mmsghdr and declare
 	recvmmsg.

Modified: fsf/trunk/libc/posix/unistd.h
==============================================================================
--- fsf/trunk/libc/posix/unistd.h (original)
+++ fsf/trunk/libc/posix/unistd.h Thu Dec 10 00:04:49 2009
@@ -544,47 +544,47 @@
 /* Replace the current process, executing PATH with arguments ARGV and
    environment ENVP.  ARGV and ENVP are terminated by NULL pointers.  */
 extern int execve (__const char *__path, char *__const __argv[],
-		   char *__const __envp[]) __THROW __nonnull ((1));
+		   char *__const __envp[]) __THROW __nonnull ((1, 2));
 
 #ifdef __USE_XOPEN2K8
 /* Execute the file FD refers to, overlaying the running program image.
    ARGV and ENVP are passed to the new program, as for `execve'.  */
 extern int fexecve (int __fd, char *__const __argv[], char *__const __envp[])
-     __THROW;
+     __THROW __nonnull ((2));
 #endif
 
 
 /* Execute PATH with arguments ARGV and environment from `environ'.  */
 extern int execv (__const char *__path, char *__const __argv[])
-     __THROW __nonnull ((1));
+     __THROW __nonnull ((1, 2));
 
 /* Execute PATH with all arguments after PATH until a NULL pointer,
    and the argument after that for environment.  */
 extern int execle (__const char *__path, __const char *__arg, ...)
-     __THROW __nonnull ((1));
+     __THROW __nonnull ((1, 2));
 
 /* Execute PATH with all arguments after PATH until
    a NULL pointer and environment from `environ'.  */
 extern int execl (__const char *__path, __const char *__arg, ...)
-     __THROW __nonnull ((1));
+     __THROW __nonnull ((1, 2));
 
 /* Execute FILE, searching in the `PATH' environment variable if it contains
    no slashes, with arguments ARGV and environment from `environ'.  */
 extern int execvp (__const char *__file, char *__const __argv[])
-     __THROW __nonnull ((1));
+     __THROW __nonnull ((1, 2));
 
 /* Execute FILE, searching in the `PATH' environment variable if
    it contains no slashes, with all arguments after FILE until a
    NULL pointer and environment from `environ'.  */
 extern int execlp (__const char *__file, __const char *__arg, ...)
-     __THROW __nonnull ((1));
+     __THROW __nonnull ((1, 2));
 
 #ifdef __USE_GNU
 /* Execute FILE, searching in the `PATH' environment variable if it contains
    no slashes, with arguments ARGV and environment from `environ'.  */
 extern int execvpe (__const char *__file, char *__const __argv[],
 		    char *__const __envp[])
-     __THROW __nonnull ((1));
+     __THROW __nonnull ((1, 2));
 #endif
 
 

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/ptsname.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/ptsname.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/ptsname.c Thu Dec 10 00:04:49 2009
@@ -128,7 +128,7 @@
 	}
 
       ptyno = minor (stp->st_rdev);
-#if __LINUX_KERNEL_VERSION >= 131443
+#if __LINUX_KERNEL_VERSION < 131443
       /* This is for the old BSD pseudo terminals.  As of Linux
 	 2.1.115 these are no longer supported.  */
       if (major (stp->st_rdev) == 4)