Add +flags for inverted match

Signed-off-by: Mattias Andrée <maandree@kth.se>

1 files changed, 37 insertions, 24 deletions

diff --git a/arg.h b/arg.h
index 0b23c53..b8169f3 100644
--- a/arg.h
+++ b/arg.h
@@ -10,38 +10,51 @@ extern char *argv0;
 
 /* use main(int argc, char *argv[]) */
 #define ARGBEGIN	for (argv0 = *argv, argv++, argc--;\
-					argv[0] && argv[0][0] == '-'\
-					&& argv[0][1];\
+					argv[0] && argv[0][1];\
 					argc--, argv++) {\
 				char argc_;\
 				char **argv_;\
 				int brk_;\
-				if (argv[0][1] == '-' && argv[0][2] == '\0') {\
-					argv++;\
-					argc--;\
-					break;\
-				}\
-				for (brk_ = 0, argv[0]++, argv_ = argv;\
-						argv[0][0] && !brk_;\
-						argv[0]++) {\
-					if (argv_ != argv)\
+				if (argv[0][0] == '-') {\
+					if (argv[0][1] == '-' && argv[0][2] == '\0') {\
+						argv++;\
+						argc--;\
 						break;\
-					argc_ = argv[0][0];\
-					switch (argc_)
+					}\
+					for (brk_ = 0, argv[0]++, argv_ = argv;\
+							argv[0][0] && !brk_;\
+							argv[0]++) {\
+						if (argv_ != argv)\
+							break;\
+						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 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			}\
+#define ARGEND				}\
+				} else {\
+					break;\
+				}\
 			}
 
 #define ARGC()		argc_