From fc5f4a97487fffc7f5451d216f278d83a8259efe Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 9 Sep 2000 07:59:23 +0000 Subject: Update. 2000-09-09 Ulrich Drepper * sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Use uname before trying to read /proc. Patch by Matt Wilson . * include/sys/utsname.h: Declare __uname. * sysdeps/generic/uname.c: Make uname a weak alias of __uname. * sysdeps/mach/hurd/uname.c: Likewise. * sysdeps/unix/syscalls.list: Likewise. * iconv/gconv_dl.c (do_release_shlib): Rewrite condition for unloading a bit. 2000-09-08 Ulrich Drepper * posix/getopt.c (_getopt_internal): When long_only is set always recognize conflicts just like before. 2000-09-08 Franz Sirl * sysdeps/ia64/Makefile (sysdep-rtld-routines): New variable. --- posix/getopt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'posix/getopt.c') diff --git a/posix/getopt.c b/posix/getopt.c index 2ad4ee961c..a6d2d042c7 100644 --- a/posix/getopt.c +++ b/posix/getopt.c @@ -673,7 +673,8 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only) pfound = p; indfound = option_index; } - else if (pfound->has_arg != p->has_arg + else if (long_only + || pfound->has_arg != p->has_arg || pfound->flag != p->flag || pfound->val != p->val) /* Second or later nonexact match found. */ -- cgit 1.4.1