From: Matt Stofko <matt@mjslabs.com>
Date: Wed, 30 Jan 2013 01:13:05 +0000 (-0800)
Subject: Handle both GNU/WIN32 and BSD getopt reinit
X-Git-Tag: v1.12.0~14
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbc09afebc3d04a31c7787a7c5e9241503bd1376;p=yubikey-personalization

Handle both GNU/WIN32 and BSD getopt reinit

This allows all the tests to pass on systems that use the BSD version of getopt which uses optind = 1 and optreset to reinitialize getopt.
---

diff --git a/tests/test_args_to_config.c b/tests/test_args_to_config.c
index 87e84ae..7e43873 100644
--- a/tests/test_args_to_config.c
+++ b/tests/test_args_to_config.c
@@ -123,7 +123,13 @@ int _test_config (YKP_CONFIG *cfg, YK_STATUS *st, int argc, char **argv)
 	int rc;
 
 	ykp_errno = 0;
-	optind = 0; /* getopt reinit */
+
+/* getopt reinit (BSD systems use optreset and a different optind value) */
+#if defined(__GLIBC__) || defined(_WIN32)
+	optind = 0;
+#else
+	optind = optreset = 1;
+#endif
 
 	/* copy version number from st into cfg */
 	assert(ykp_configure_for(cfg, 1, st) == 1);
@@ -308,7 +314,13 @@ int _test_non_config_args(void)
 	int argc = 7;
 
 	ykp_errno = 0;
-	optind = 0; /* getopt reinit */
+
+/* getopt reinit (BSD systems use optreset and a different optind value) */
+#if defined(__GLIBC__) || defined(_WIN32)
+	optind = 0;
+#else
+	optind = optreset = 1;
+#endif
 
 	/* copy version number from st into cfg */
   ykp_configure_version(cfg, st);