summary refs log tree commit diff
path: root/posix/getopt.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-09-09 07:59:23 +0000
committerUlrich Drepper <drepper@redhat.com>2000-09-09 07:59:23 +0000
commitfc5f4a97487fffc7f5451d216f278d83a8259efe (patch)
tree0eb3a6efb5f6edc33aa21687390e3547d179f1b5 /posix/getopt.c
parentd0e1a1221dff0e8e77cd5d39b980267a0ec92bfd (diff)
downloadglibc-fc5f4a97487fffc7f5451d216f278d83a8259efe.tar.gz
glibc-fc5f4a97487fffc7f5451d216f278d83a8259efe.tar.xz
glibc-fc5f4a97487fffc7f5451d216f278d83a8259efe.zip
Update.
2000-09-09  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Use uname
	before trying to read /proc.
	Patch by Matt Wilson <msw@redhat.com>.
	* 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  <drepper@redhat.com>

	* posix/getopt.c (_getopt_internal): When long_only is set always
	recognize conflicts just like before.

2000-09-08  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>

	* sysdeps/ia64/Makefile (sysdep-rtld-routines): New variable.
Diffstat (limited to 'posix/getopt.c')
-rw-r--r--posix/getopt.c3
1 files changed, 2 insertions, 1 deletions
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.  */