Adding the form of -r1, which will result in -r 1 in arg.h.

This commit is contained in:
Christoph Lohmann 2012-11-27 21:17:10 +01:00
parent ffa2dbeb64
commit d488a80a1e

29
arg.h
View file

@ -1,26 +1,30 @@
/* /*
* See LICENSE file for copyright and license details. * Copy me if you can.
* by 20h
*/ */
#ifndef __CMD_H__ #ifndef __ARG_H__
#define __CMD_H__ #define __ARG_H__
extern char *argv0; extern char *argv0;
#define USED(x) ((void)(x)) #define USED(x) ((void)(x))
/* use main(int argc, char *argv[]) */
#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\ #define ARGBEGIN for (argv0 = *argv, argv++, argc--;\
argv[0] && argv[0][1]\ argv[0] && argv[0][1]\
&& argv[0][0] == '-';\ && argv[0][0] == '-';\
argc--, argv++) {\ argc--, argv++) {\
char _argc;\ char _argc;\
char **_argv;\ char **_argv;\
int brk;\
if (argv[0][1] == '-' && argv[0][2] == '\0') {\ if (argv[0][1] == '-' && argv[0][2] == '\0') {\
argv++;\ argv++;\
argc--;\ argc--;\
break;\ break;\
}\ }\
for (argv[0]++, _argv = argv; argv[0][0];\ for (brk = 0, argv[0]++, _argv = argv;\
argv[0][0] && !brk;\
argv[0]++) {\ argv[0]++) {\
if (_argv != argv)\ if (_argv != argv)\
break;\ break;\
@ -33,8 +37,19 @@ extern char *argv0;
USED(argv);\ USED(argv);\
USED(argc); USED(argc);
#define EARGF(x) ((argv[1] == NULL)? ((x), abort(), (char *)0) :\ #define ARGC() _argc
(argc--, argv++, argv[0]))
#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 #endif