From e6a08d59161ff14543f8d2f924cc0a380718345d Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@kth.se>
Date: Thu, 19 Oct 2017 15:37:26 +0200
Subject: Fix arg.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@kth.se>
---
 arg.h | 34 +---------------------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

(limited to 'arg.h')

diff --git a/arg.h b/arg.h
index a88cce2..79d054c 100644
--- a/arg.h
+++ b/arg.h
@@ -10,7 +10,7 @@ extern char *argv0;
 
 /* use main(int argc, char *argv[]) */
 #define ARGBEGIN	for (argv0 = *argv, argv++, argc--;\
-					argv[0] && argv[0][1];\
+					argv[0] && argv[0][0] && argv[0][1];\
 					argc--, argv++) {\
 				char argc_;\
 				char **argv_;\
@@ -29,48 +29,16 @@ extern char *argv0;
 						argc_ = argv[0][0];\
 						switch (argc_)
 
-/* Handles obsolete -NUM syntax */
-#define ARGNUM					case '0':\
-						case '1':\
-						case '2':\
-						case '3':\
-						case '4':\
-						case '5':\
-						case '6':\
-						case '7':\
-						case '8':\
-						case '9'
-
-#define ARGALT(SYMBOL)			}\
-				} else if (argv[0][0] == SYMBOL) {\
-					for (brk_ = 0, argv[0]++, argv_ = argv;\
-							argv[0][0] && !brk_;\
-							argv[0]++) {\
-						if (argv_ != argv)\
-							break;\
-						argc_ = argv[0][0];\
-						switch (argc_)
-
 #define ARGEND				}\
 				} else {\
 					break;\
 				}\
 			}
 
-#define ARGC()		argc_
-
-#define ARGNUMF()	(brk_ = 1, estrtonum(argv[0], 0, INT_MAX))
-
 #define EARGF(x)	((argv[0][1] == '\0' && argv[1] == NULL)?\
 				((x), abort(), (char *)0) :\
 				(brk_ = 1, (argv[0][1] != '\0')?\
 					(&argv[0][1]) :\
 					(argc--, argv++, argv[0])))
 
-#define ARGF()		((argv[0][1] == '\0' && argv[1] == NULL)?\
-				(char *)0 :\
-				(brk_ = 1, (argv[0][1] != '\0')?\
-					(&argv[0][1]) :\
-					(argc--, argv++, argv[0])))
-
 #endif
-- 
cgit v1.2.3-70-g09d2