From 5c3d973a4ae3b94db65a8198759ea911a6e097e8 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Wed, 10 Dec 2008 20:25:42 +0000
Subject: Import OpenBSD's getopt(3) to workaround broken glibc version.

---
 cmd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'cmd.c')

diff --git a/cmd.c b/cmd.c
index 525df0bf..00560933 100644
--- a/cmd.c
+++ b/cmd.c
@@ -1,4 +1,4 @@
-/* $Id: cmd.c,v 1.65 2008-09-26 06:45:26 nicm Exp $ */
+/* $Id: cmd.c,v 1.66 2008-12-10 20:25:41 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -19,7 +19,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-#include <getopt.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -159,10 +158,11 @@ cmd_parse(int argc, char **argv, char **cause)
 		xasprintf(cause, "unknown command: %s", argv[0]);
 		return (NULL);
 	}
-
+	
+	optreset = 1;
 	optind = 1;
 	if (entry->parse == NULL) {
-		while ((opt = getopt(argc, argv, GETOPT_PREFIX "")) != EOF) {
+		while ((opt = getopt(argc, argv, "")) != -1) {
 			switch (opt) {
 			default:
 				goto usage;
-- 
cgit