352ddd3d2
Denys Vlasenko
2017-04-12
Subject
Tweak GETOPT_RESET comment
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/libbb.h+3 -5
| @@ -1176,19 +1176,17 @@ extern const char *applet_long_options; | |
| #endif | |
| extern uint32_t option_mask32; | |
| extern uint32_t getopt32(char **argv, const char *applet_opts, ...) FAST_FUNC; | |
| - | |
| - | |
| /* BSD-derived getopt() functions require that optind be set to 1 in | |
| * order to reset getopt() state. This used to be generally accepted | |
| * way of resetting getopt(). However, glibc's getopt() | |
| * has additional getopt() state beyond optind (specifically, glibc | |
| - | * extensions ('+' and '-' at the start of the string), and requires |
| + | * extensions such as '+' and '-' at the start of the string), and requires |
| * that optind be set to zero to reset its state. BSD-derived versions | |
| * of getopt() misbehaved if optind is set to 0 in order to reset getopt(), | |
| * and glibc's getopt() used to coredump if optind is set 1 in order | |
| * to reset getopt(). | |
| - | * Then BSD introduced additional variable "optreset" which |
| - | * be set to 1 in order to reset getopt(). Sigh. Standards, anyone? |
| + | * Then BSD introduced additional variable "optreset" which should be |
| + | * set to 1 in order to reset getopt(). Sigh. Standards, anyone? |
| * | |
| * By ~2008, OpenBSD 3.4 was changed to survive glibc-like optind = 0 | |
| * (to interpret it as if optreset was set). | |