[commits] r4576 - in /fsf/trunk/libc: ./ inet/ login/ malloc/ manual/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Dec 18 00:04:37 2007
New Revision: 4576

Log:
Import glibc-mainline for 2007-12-18

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/inet/ether_line.c
    fsf/trunk/libc/login/forkpty.c
    fsf/trunk/libc/login/openpty.c
    fsf/trunk/libc/login/pty.h
    fsf/trunk/libc/malloc/malloc.c
    fsf/trunk/libc/manual/terminal.texi

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Dec 18 00:04:37 2007
@@ -1,3 +1,21 @@
+2007-12-17  Roland McGrath  <roland@xxxxxxxxxx>
+
+	* inet/ether_line.c (ether_line): Remove unused variable.
+
+2007-12-17  Samuel Thibault  <samuel.thibault@xxxxxxxxxxxx>
+
+	* login/forkpty.c (forkpty): Add const qualifier to parameters termp
+	and winp.
+	* login/openpty.c (openpty): Likewise.
+	* login/pty.h (openpty, forkpty): Likewise.
+	* manual/terminal.texi (openpty, forkpty): Likewise.
+
+2007-12-17  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* malloc/malloc.c (public_cALLOc): For arena other than
+	main_arena, count all bytes inside the mprotect_size range of the
+	heap as uninitialized.
+
 2007-12-16  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* elf/tst-execstack.c (do_test): Don't fail if SELinux forbids

Modified: fsf/trunk/libc/inet/ether_line.c
==============================================================================
--- fsf/trunk/libc/inet/ether_line.c (original)
+++ fsf/trunk/libc/inet/ether_line.c Tue Dec 18 00:04:37 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1999, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1999,2002,2007 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
@@ -26,10 +26,7 @@
 int
 ether_line (const char *line, struct ether_addr *addr, char *hostname)
 {
-  size_t cnt;
-  char *cp;
-
-  for (cnt = 0; cnt < 6; ++cnt)
+  for (size_t cnt = 0; cnt < 6; ++cnt)
     {
       unsigned int number;
       char ch;

Modified: fsf/trunk/libc/login/forkpty.c
==============================================================================
--- fsf/trunk/libc/login/forkpty.c (original)
+++ fsf/trunk/libc/login/forkpty.c Tue Dec 18 00:04:37 2007
@@ -27,8 +27,8 @@
 forkpty (amaster, name, termp, winp)
      int *amaster;
      char *name;
-     struct termios *termp;
-     struct winsize *winp;
+     const struct termios *termp;
+     const struct winsize *winp;
 {
   int master, slave, pid;
 

Modified: fsf/trunk/libc/login/openpty.c
==============================================================================
--- fsf/trunk/libc/login/openpty.c (original)
+++ fsf/trunk/libc/login/openpty.c Tue Dec 18 00:04:37 2007
@@ -84,8 +84,8 @@
    according to TERMP and WINP.  Return handles for both ends in
    AMASTER and ASLAVE, and return the name of the slave end in NAME.  */
 int
-openpty (int *amaster, int *aslave, char *name, struct termios *termp,
-	 struct winsize *winp)
+openpty (int *amaster, int *aslave, char *name,
+	 const struct termios *termp, const struct winsize *winp)
 {
 #ifdef PATH_MAX
   char _buf[PATH_MAX];

Modified: fsf/trunk/libc/login/pty.h
==============================================================================
--- fsf/trunk/libc/login/pty.h (original)
+++ fsf/trunk/libc/login/pty.h Tue Dec 18 00:04:37 2007
@@ -32,12 +32,14 @@
    attributes according to TERMP and WINP and return handles for both
    ends in AMASTER and ASLAVE.  */
 extern int openpty (int *__amaster, int *__aslave, char *__name,
-		    struct termios *__termp, struct winsize *__winp) __THROW;
+		    const struct termios *__termp,
+		    const struct winsize *__winp) __THROW;
 
 /* Create child process and establish the slave pseudo terminal as the
    child's controlling terminal.  */
 extern int forkpty (int *__amaster, char *__name,
-		    struct termios *__termp, struct winsize *__winp) __THROW;
+		    const struct termios *__termp,
+		    const struct winsize *__winp) __THROW;
 
 __END_DECLS
 

Modified: fsf/trunk/libc/malloc/malloc.c
==============================================================================
--- fsf/trunk/libc/malloc/malloc.c (original)
+++ fsf/trunk/libc/malloc/malloc.c Tue Dec 18 00:04:37 2007
@@ -3886,6 +3886,12 @@
       oldtopsize < mp_.sbrk_base + av->max_system_mem - (char *)oldtop)
     oldtopsize = (mp_.sbrk_base + av->max_system_mem - (char *)oldtop);
 #endif
+  if (av != &main_arena)
+    {
+      heap_info *heap = heap_for_ptr (oldtop);
+      if (oldtopsize < (char *) heap + heap->mprotect_size - (char *) oldtop)
+	oldtopsize = (char *) heap + heap->mprotect_size - (char *) oldtop;
+    }
 #endif
   mem = _int_malloc(av, sz);
 

Modified: fsf/trunk/libc/manual/terminal.texi
==============================================================================
--- fsf/trunk/libc/manual/terminal.texi (original)
+++ fsf/trunk/libc/manual/terminal.texi Tue Dec 18 00:04:37 2007
@@ -2075,7 +2075,7 @@
 
 @comment pty.h
 @comment BSD
-@deftypefun int openpty (int *@var{amaster}, int *@var{aslave}, char *@var{name}, struct termios *@var{termp}, struct winsize *@var{winp})
+@deftypefun int openpty (int *@var{amaster}, int *@var{aslave}, char *@var{name}, const struct termios *@var{termp}, const struct winsize *@var{winp})
 This function allocates and opens a pseudo-terminal pair, returning the
 file descriptor for the master in @var{*amaster}, and the file
 descriptor for the slave in @var{*aslave}.  If the argument @var{name}
@@ -2106,7 +2106,7 @@
 
 @comment pty.h
 @comment BSD
-@deftypefun int forkpty (int *@var{amaster}, char *@var{name}, struct termios *@var{termp}, struct winsize *@var{winp})
+@deftypefun int forkpty (int *@var{amaster}, char *@var{name}, const struct termios *@var{termp}, const struct winsize *@var{winp})
 This function is similar to the @code{openpty} function, but in
 addition, forks a new process (@pxref{Creating a Process}) and makes the
 newly opened slave pseudo-terminal device the controlling terminal