This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.14-85-gecaddd6
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 7 Jul 2011 01:29:17 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-85-gecaddd6
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via ecaddd66991f5dc237f26cfdef51507019cfcc01 (commit)
via 01636b2140cd1281202b89f7103249ed598065c4 (commit)
from 9895c8bc62759a2d7abf95654fb2aefe5677a930 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ecaddd66991f5dc237f26cfdef51507019cfcc01
commit ecaddd66991f5dc237f26cfdef51507019cfcc01
Author: Ulrich Drepper <drepper@gmail.com>
Date: Wed Jul 6 21:29:02 2011 -0400
Rebuild configure scripts
diff --git a/nptl/sysdeps/pthread/configure b/nptl/sysdeps/pthread/configure
index 3f7dcd6..6b3c79b 100644
--- a/nptl/sysdeps/pthread/configure
+++ b/nptl/sysdeps/pthread/configure
@@ -122,7 +122,7 @@ fi
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
} # ac_fn_c_try_link
@@ -148,7 +148,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for forced unwind support" >&5
$as_echo_n "checking for forced unwind support... " >&6; }
-if test "${libc_cv_forced_unwind+set}" = set; then :
+if ${libc_cv_forced_unwind+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -182,7 +182,7 @@ if test $libc_cv_forced_unwind = yes; then
CFLAGS="$CFLAGS -Werror -fexceptions"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C cleanup handling" >&5
$as_echo_n "checking for C cleanup handling... " >&6; }
-if test "${libc_cv_c_cleanup+set}" = set; then :
+if ${libc_cv_c_cleanup+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/nptl/sysdeps/x86_64/configure b/nptl/sysdeps/x86_64/configure
index 4639c22..ee04715 100644
--- a/nptl/sysdeps/x86_64/configure
+++ b/nptl/sysdeps/x86_64/configure
@@ -85,7 +85,7 @@ $as_echo X/"$0" |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for .cfi_personality and .cfi_lsda pseudo-ops" >&5
$as_echo_n "checking for .cfi_personality and .cfi_lsda pseudo-ops... " >&6; }
-if test "${libc_cv_asm_cfi_personality+set}" = set; then :
+if ${libc_cv_asm_cfi_personality+:} false; then :
$as_echo_n "(cached) " >&6
else
cat > conftest.s <<EOF
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index d05bd13..816289a 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -112,7 +112,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
@@ -175,7 +175,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -242,7 +242,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking installed Linux kernel header files" >&5
$as_echo_n "checking installed Linux kernel header files... " >&6; }
-if test "${libc_cv_linux2010+set}" = set; then :
+if ${libc_cv_linux2010+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/sysdeps/x86_64/elf/configure b/sysdeps/x86_64/elf/configure
index cb8db2d..c3c8f56 100644
--- a/sysdeps/x86_64/elf/configure
+++ b/sysdeps/x86_64/elf/configure
@@ -87,7 +87,7 @@ if test "$usetls" != no; then
# Check for support of thread-local storage handling in assembler and linker.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86-64 TLS support" >&5
$as_echo_n "checking for x86-64 TLS support... " >&6; }
-if test "${libc_cv_x86_64_tls+set}" = set; then :
+if ${libc_cv_x86_64_tls+:} false; then :
$as_echo_n "(cached) " >&6
else
cat > conftest.s <<\EOF
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=01636b2140cd1281202b89f7103249ed598065c4
commit 01636b2140cd1281202b89f7103249ed598065c4
Author: Ulrich Drepper <drepper@gmail.com>
Date: Wed Jul 6 21:27:14 2011 -0400
Handle W; without long options in getopt
diff --git a/ChangeLog b/ChangeLog
index 547cd4e..6ac3ae0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-06 Ulrich Drepper <drepper@gmail.com>
+
+ [BZ #12922]
+ * posix/getopt.c (_getopt_internal_r): When "W;" is in short options
+ but no long options are defined, just return 'W'.
+
2011-06-22 Marek Polacek <mpolacek@redhat.com>
[BZ #9696]
diff --git a/NEWS b/NEWS
index 1e1e220..dd5565f 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.15
* The following bugs are resolved with this release:
- 9696, 12874, 12885, 12907, 12935
+ 9696, 12874, 12885, 12907, 12922, 12935
* New program pldd to list loaded object of a process
Implemented by Ulrich Drepper.
diff --git a/posix/getopt.c b/posix/getopt.c
index db89abf..3fa5a4d 100644
--- a/posix/getopt.c
+++ b/posix/getopt.c
@@ -871,6 +871,9 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
/* Convenience. Treat POSIX -W foo same as long option --foo */
if (temp[0] == 'W' && temp[1] == ';')
{
+ if (longopts == NULL)
+ goto no_longs;
+
char *nameend;
const struct option *p;
const struct option *pfound = NULL;
@@ -1086,8 +1089,10 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
}
return pfound->val;
}
- d->__nextchar = NULL;
- return 'W'; /* Let the application handle it. */
+
+ no_longs:
+ d->__nextchar = NULL;
+ return 'W'; /* Let the application handle it. */
}
if (temp[1] == ':')
{
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
NEWS | 2 +-
nptl/sysdeps/pthread/configure | 6 +++---
nptl/sysdeps/x86_64/configure | 2 +-
posix/getopt.c | 9 +++++++--
sysdeps/unix/sysv/linux/configure | 6 +++---
sysdeps/x86_64/elf/configure | 2 +-
7 files changed, 22 insertions(+), 11 deletions(-)
hooks/post-receive
--
GNU C Library master sources