about summary refs log tree commit diff
path: root/posix/tst-getopt_long1.c
diff options
context:
space:
mode:
authorZack Weinberg <zackw@panix.com>2017-04-01 17:13:45 -0400
committerZack Weinberg <zackw@panix.com>2017-04-07 07:51:52 -0400
commitaeacb9f9127cff0ed099026156ca35c025f343b7 (patch)
treebfb225c266f739bae9a3c96f9313801e305b98f5 /posix/tst-getopt_long1.c
parentdfbea09f96ce9e7a56f88c47d1593f07dc55c53c (diff)
downloadglibc-aeacb9f9127cff0ed099026156ca35c025f343b7.tar.gz
glibc-aeacb9f9127cff0ed099026156ca35c025f343b7.tar.xz
glibc-aeacb9f9127cff0ed099026156ca35c025f343b7.zip
getopt: merge from gnulib: alloca avoidance
In one place, glibc's getopt uses alloca to construct a linked list of
possibilities for an "ambiguous" long option.  In gnulib, malloc
should be used instead.  Providing for both cases complicates things a
fair bit.  Instead of merging straight across, therefore, I have
chosen to rewrite it using a boolean vector instead of a linked list.
There is then only one allocation that might need freeing; in glibc it
can honor __libc_use_alloca as usual, and in gnulib we define
__libc_use_alloca to always be false, so we don't need ifdefs in the
middle of the function.  This should also be slightly more efficient
in the normal case of long options being fully spelled out -- I think
most people aren't even aware they _can_ sometimes abbreviate long
options.

One interesting consequence is that the list of possibilities is now
printed in exactly the order they appear in the list of long options,
instead of the first possibility being shuffled to the end.  This
shouldn't be a big deal but it did break one test that relied on the
exact text of this error message.

(The reason the previous patch was "in aid of" merging from gnulib is
I didn't want to have to make this change in two places.)

(The patch looks bigger than it really is because there's a fair bit
of reindentation and code rearrangement.)

	* posix/getopt.c: When used standalone, define __libc_use_alloca
	as always false and alloca to abort if called.
	(process_long_option): Rewrite handling of ambiguous long options
	to use a single boolean vector, not a linked list; use
	__libc_use_alloca to decide whether to allocate this using alloca.

	* posix/tst-getopt_long1.c: Adjust text of expected error message.
Diffstat (limited to 'posix/tst-getopt_long1.c')
-rw-r--r--posix/tst-getopt_long1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/posix/tst-getopt_long1.c b/posix/tst-getopt_long1.c
index 3895ebd99b..6d8ef02ca4 100644
--- a/posix/tst-getopt_long1.c
+++ b/posix/tst-getopt_long1.c
@@ -56,7 +56,7 @@ do_test (void)
   printf ("message = \"%s\"\n", line);
 
   static const char expected[] = "\
-program: option '--on' is ambiguous; possibilities: '--one' '--onto' '--one-one'\n";
+program: option '--on' is ambiguous; possibilities: '--one' '--one-one' '--onto'\n";
 
   return c != '?' || strcmp (line, expected) != 0;
 }