more info from John Gardner about ASCII control chars in roff(7) input

[mandoc.git] / compat_getsubopt.c

diff --git a/compat_getsubopt.c b/compat_getsubopt.c
index 1a7ec6e80f042ae38cb186509e6d2dd48525f207..c442f87ecab7d28eb3eb55318894b1a7dd7fad7f 100644 (file)
--- a/compat_getsubopt.c
+++ b/compat_getsubopt.c
@@ -1,9 +1,4 @@
-#ifdef HAVE_GETSUBOPT
-
-int dummy;
-
-#else
-
+/*     $Id: compat_getsubopt.c,v 1.6 2020/06/15 01:37:15 schwarze Exp $ */
 /*     $OpenBSD: getsubopt.c,v 1.4 2005/08/08 08:05:36 espie Exp $     */
 
 /*-
@@ -34,23 +29,17 @@ int dummy;
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+#include "config.h"
 
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 
-/*
- * The SVID interface to getsubopt provides no way of figuring out which
- * part of the suboptions list wasn't matched.  This makes error messages
- * tricky...  The extern variable suboptarg is a pointer to the token
- * which didn't match.
- */
-char *suboptarg;
-
 int
 getsubopt(char **optionp, char * const *tokens, char **valuep)
 {
        int cnt;
+       char *suboptarg;
        char *p;
 
        suboptarg = *valuep = NULL;
@@ -96,5 +85,3 @@ getsubopt(char **optionp, char * const *tokens, char **valuep)
                        return(cnt);
        return(-1);
 }
-
-#endif