diff options
author | tmpfile <tmpfile@users.noreply.github.com> | 2017-06-17 15:56:08 -0300 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2017-06-27 16:22:41 +0300 |
commit | 4e0a7b0dcda8c4d9f97125339b25da3572e30576 (patch) | |
tree | 68668c1570a84b98552c4dcf3bb574dfde5cae6e | |
parent | dd8633df2eb043dd66d75cd15b80f4d1ed5b2112 (diff) | |
download | mkinitfs-4e0a7b0dcda8c4d9f97125339b25da3572e30576.tar.bz2 mkinitfs-4e0a7b0dcda8c4d9f97125339b25da3572e30576.tar.xz |
mkinitfs: sync arg.h with upstream
For reference: http://git.r-36.net/nldev/tree/arg.h
-rw-r--r-- | arg.h | 49 |
1 files changed, 29 insertions, 20 deletions
@@ -3,37 +3,46 @@ * by 20h */ -#ifndef __ARG_H__ -#define __ARG_H__ +#ifndef ARG_H__ +#define ARG_H__ -#define USED(x) ((void)(x)) +extern char *argv0; -#define ARGBEGIN for (argv++, argc--;\ - argv[0] && argv[0][1]\ - && argv[0][0] == '-';\ +/* use main(int argc, char *argv[]) */ +#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\ + argv[0] && argv[0][0] == '-'\ + && argv[0][1];\ argc--, argv++) {\ - char _argc;\ - char **_argv;\ + char argc_;\ + char **argv_;\ + int brk_;\ if (argv[0][1] == '-' && argv[0][2] == '\0') {\ argv++;\ argc--;\ break;\ }\ - for (argv[0]++, _argv = argv; argv[0][0];\ + 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_) #define ARGEND }\ - USED(_argc);\ - }\ - USED(argv);\ - USED(argc); + } -#define EARGF(x) ((argv[1] == NULL)? ((x), abort(), (char *)0) :\ - (argc--, argv++, argv[0])) +#define ARGC() argc_ -#endif +#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 |