[BZ #5222]

2007-10-28  Ulrich Drepper  <drepper@redhat.com>
	[BZ #5222]
	* elf/dl-load.c (_dl_rtld_di_serinfo): Correct handling of short
	path elements in counting mode.

13 files changed, 35 insertions, 32 deletions

diff --git a/BUGS b/BUGS
index d0d5056ffc..6d6ce83772 100644
--- a/BUGS
+++ b/BUGS
@@ -1,7 +1,7 @@
 	    List of known bugs (certainly very incomplete)
 	    ----------------------------------------------
 
-Time-stamp: <2005-09-23 13:25:42 drepper>
+Time-stamp: <2007-10-27 18:37:51 drepper>
 
 This following list contains those bugs which I'm aware of.  Please
 make sure that bugs you report are not listed here.  If you can fix one
@@ -12,12 +12,10 @@ GNU project.  There is an easy to use WWW interface available at
 
        http://sourceware.org/bugzilla/
 
-I would appreciate it very much if you could verify the problem was not
-reported before by looking through the database.  To make the information
-in this database as useful as possible please report bugs always using the
-`glibcbug' shell script which gets installed with GNU libc.  Before reporting
-a bug please check the FAQ since it discusses also a lot of problematic
-situations.
+I would appreciate it very much if you could verify the problem was
+not reported before by looking through the database. Before reporting
+a bug please check the FAQ since it discusses also a lot of
+problematic situations.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/ChangeLog b/ChangeLog
index a350fb7924..2d9b1132e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-28  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5222]
+	* elf/dl-load.c (_dl_rtld_di_serinfo): Correct handling of short
+	path elements in counting mode.
+
 2007-10-27  Andreas Jaeger  <aj@suse.de>
 
 	[BZ #5040]
diff --git a/FAQ.in b/FAQ.in
index 227132bc08..d0b2805ca7 100644
--- a/FAQ.in
+++ b/FAQ.in
@@ -287,12 +287,12 @@ down the build process and need more disk space.
 failure should be looked into.  Depending on the failures, you probably
 should not install the library at all.
 
-You should consider using the `glibcbug' script to report the failure,
-providing as much detail as possible.  If you run a test directly, please
-remember to set up the environment correctly.  You want to test the compiled
-library - and not your installed one.  The best way is to copy the exact
-command line which failed and run the test from the subdirectory for this
-test in the sources.
+You should consider reporting it in bugzilla
+<http://sourceware.org/bugzilla/> providing as much detail as possible.
+If you run a test directly, please remember to set up the environment
+correctly. You want to test the compiled library - and not your installed
+one. The best way is to copy the exact command line which failed and run
+the test from the subdirectory for this test in the sources.
 
 There are some failures which are not directly related to the GNU libc:
 - Some compilers produce buggy code.  No compiler gets single precision
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 98d25b827d..94531b271f 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -2274,7 +2274,7 @@ _dl_rtld_di_serinfo (struct link_map *loader, Dl_serinfo *si, bool counting)
 	      if (counting)
 		{
 		  si->dls_cnt++;
-		  si->dls_size += r->dirnamelen < 2 ? r->dirnamelen : 2;
+		  si->dls_size += MAX (2, r->dirnamelen);
 		}
 	      else
 		{
diff --git a/intl/locale.alias b/intl/locale.alias
index 1a24c9e614..05c979c280 100644
--- a/intl/locale.alias
+++ b/intl/locale.alias
@@ -1,5 +1,5 @@
 # Locale name alias data base.
-# Copyright (C) 1996-2001,2003 Free Software Foundation, Inc.
+# Copyright (C) 1996-2001,2003,2007 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,10 +21,9 @@
 # A single line contains two fields: an alias and a substitution value.
 # All entries are case independent.
 
-# Note: This file is far from being complete.  If you have a value for
-# your own site which you think might be useful for others too, share
-# it with the rest of us.  Send it using the `glibcbug' script to
-# bugs@gnu.org.
+# Note: This file is obsolete and is kept around for the time being for
+# backward compatibility.  Nobody should rely on the names defined here.
+# Locales should always be specified by their full name.
 
 bokmal		nb_NO.ISO-8859-1
 bokmål		nb_NO.ISO-8859-1
diff --git a/manual/libc.texinfo b/manual/libc.texinfo
index e36d0ce7e2..d268cb997b 100644
--- a/manual/libc.texinfo
+++ b/manual/libc.texinfo
@@ -18,9 +18,9 @@
 @comment %**end of header (This is for running Texinfo on a region.)
 
 @c sold 0.06/1.09, print run out 21may96
-@set EDITION 0.11
-@set VERSION 2.7
-@set UPDATED 2007-09-09
+@set EDITION 0.12
+@set VERSION 2.8
+@set UPDATED 2007-10-27
 @set ISBN 1-882114-55-8
 
 @copying
diff --git a/manual/process.texi b/manual/process.texi
index c17c4b0eab..1946793dec 100644
--- a/manual/process.texi
+++ b/manual/process.texi
@@ -277,7 +277,7 @@ a file as a process image.  You can use these functions to make a child
 process execute a new program after it has been forked.
 
 To see the effects of @code{exec} from the point of view of the called
-program, @xref{Program Basics}.
+program, see @ref{Program Basics}.
 
 @pindex unistd.h
 The functions in this family differ in how you specify the arguments,
diff --git a/manual/socket.texi b/manual/socket.texi
index f2f62adc4f..25f45a17f1 100644
--- a/manual/socket.texi
+++ b/manual/socket.texi
@@ -2070,7 +2070,7 @@ access to connect to the socket.
 
 @comment sys/socket.h
 @comment BSD
-@deftypefun int listen (int @var{socket}, unsigned int @var{n})
+@deftypefun int listen (int @var{socket}, int @var{n})
 The @code{listen} function enables the socket @var{socket} to accept
 connections, thus making it a server socket.
 
diff --git a/manual/startup.texi b/manual/startup.texi
index 79c79683f7..bccc708667 100644
--- a/manual/startup.texi
+++ b/manual/startup.texi
@@ -31,7 +31,7 @@ system, and telling the system the program is done.
 
 A program starts another program with the @code{exec} family of system calls.
 This chapter looks at program startup from the execee's point of view.  To
-see the event from the execor's point of view, @xref{Executing a File}.
+see the event from the execor's point of view, see @ref{Executing a File}.
 
 @menu
 * Program Arguments::           Parsing your program's command-line arguments.
@@ -309,9 +309,9 @@ character, since this is assumed to terminate the string.
 
 The value of an environment variable can be accessed with the
 @code{getenv} function.  This is declared in the header file
-@file{stdlib.h}.  All of the following functions can be safely used in
-multi-threaded programs.  It is made sure that concurrent modifications
-to the environment do not lead to errors.
+@file{stdlib.h}.  Modifications of enviroment variables are not
+allowed in Multi-threaded programs.  The @code{getenv} function
+can be safely used in multi-threaded programs
 @pindex stdlib.h
 
 @comment stdlib.h
diff --git a/manual/stdio.texi b/manual/stdio.texi
index a39262cbc6..6748513549 100644
--- a/manual/stdio.texi
+++ b/manual/stdio.texi
@@ -3907,7 +3907,7 @@ In GNU C, there is a special construct you can use to let the compiler
 know that a function uses a @code{scanf}-style format string.  Then it
 can check the number and types of arguments in each call to the
 function, and warn you when they do not match the format string.
-For details, @xref{Function Attributes, , Declaring Attributes of Functions,
+For details, see @ref{Function Attributes, , Declaring Attributes of Functions,
 gcc.info, Using GNU CC}.
 
 @node EOF and Errors
diff --git a/manual/sysinfo.texi b/manual/sysinfo.texi
index 293e4181d1..bf8b138dad 100644
--- a/manual/sysinfo.texi
+++ b/manual/sysinfo.texi
@@ -78,7 +78,7 @@ canonical FQDN.
 
 In some contexts, the host name is called a ``node name.''
 
-For more information on DNS host naming, @xref{Host Names}.
+For more information on DNS host naming, see @ref{Host Names}.
 
 @pindex hostname
 @pindex hostid
diff --git a/manual/syslog.texi b/manual/syslog.texi
index 3d7def83f7..02c8e28a7a 100644
--- a/manual/syslog.texi
+++ b/manual/syslog.texi
@@ -90,7 +90,7 @@ more meaning than the system administrator gives to it.
 @item priority
 This tells how important the content of the message is.  Examples of
 defined priority values are: debug, informational, warning, critical.
-For the complete list, @xref{syslog; vsyslog}.  Except for
+For the complete list, see @ref{syslog; vsyslog}.  Except for
 the fact that the priorities have a defined order, the meaning of each
 of these priorities is entirely determined by the system administrator.
 
diff --git a/manual/time.texi b/manual/time.texi
index a3e8438bce..64763a2d21 100644
--- a/manual/time.texi
+++ b/manual/time.texi
@@ -212,7 +212,7 @@ Note that the clock can wrap around.  On a 32bit system with
 same value approximately every 72 minutes.
 
 For additional functions to examine a process' use of processor time,
-and to control it, @xref{Resource Usage And Limitation}.
+and to control it, see @ref{Resource Usage And Limitation}.
 
 
 @menu