commit 34ea6ae10a85943cce120b36df06b006f2d8d7fa
parent a42f9093621848ccf7a7849e041713374e679781
Author: sin <sin@2f30.org>
Date: Thu, 14 Nov 2013 10:47:07 +0000
Add support for obsolete -NUM arguments in arg.h
Fix naming, _brk, _argc and _argv are reserved for the
implementation.
Thanks to nsz@port70.net for reporting this, the mail excerpt below.
"actually __.* and _[A-Z].* are reserved for any usage and _.* is
reserved for file scope identifiers"
We just rename them to brk_, argc_ and argv_.
Diffstat:
| M | arg.h | | | 37 | +++++++++++++++++++++++++------------ |
1 file changed, 25 insertions(+), 12 deletions(-)
diff --git a/arg.h b/arg.h
@@ -13,38 +13,51 @@ extern char *argv0;
argv[0] && argv[0][1]\
&& argv[0][0] == '-';\
argc--, argv++) {\
- char _argc;\
- char **_argv;\
- int _brk;\
+ 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;\
+ for (brk_ = 0, argv[0]++, argv_ = argv;\
+ argv[0][0] && !brk_;\
argv[0]++) {\
- if (_argv != argv)\
+ if (argv_ != argv)\
break;\
- _argc = argv[0][0];\
- switch (_argc)
+ 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 ARGEND }\
}
-#define ARGC() _argc
+#define ARGC() argc_
+
+#define ARGNUMF(base) (brk_ = 1, estrtol(argv[0], (base)))
#define EARGF(x) ((argv[0][1] == '\0' && argv[1] == NULL)?\
((x), abort(), (char *)0) :\
- (_brk = 1, (argv[0][1] != '\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')?\
+ (brk_ = 1, (argv[0][1] != '\0')?\
(&argv[0][1]) :\
(argc--, argv++, argv[0])))
#endif
-
