[git commit] Tweak GETOPT_RESET comment

Denys Vlasenko vda.linux at googlemail.com
Wed Apr 12 18:21:34 UTC 2017


commit: https://git.busybox.net/busybox/commit/?id=352ddd3d216131757ac278e97a09ce2f4d7f53f0
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 include/libbb.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/libbb.h b/include/libbb.h
index 11d022f..777a4a8 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -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).


More information about the busybox-cvs mailing list