summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--arg.h47
1 files changed, 27 insertions, 20 deletions
diff --git a/arg.h b/arg.h
index 6414822..ba3fb3f 100644
--- a/arg.h
+++ b/arg.h
@@ -3,39 +3,46 @@
* by 20h
*/
-#ifndef __ARG_H__
-#define __ARG_H__
+#ifndef ARG_H__
+#define ARG_H__
extern char *argv0;
-#define USED(x) ((void)(x))
-
+/* use main(int argc, char *argv[]) */
#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\
- argv[0] && argv[0][1]\
- && argv[0][0] == '-';\
+ 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
fb3a07017&follow=1'>fixed dmenu.1 version infoGravatar arg@10ksloc.org 1-1/+1 2006-08-07settle with greyGravatar arg@10ksloc.org 1-2/+2 2006-08-07next version is 0.3Gravatar arg@10ksloc.org 1-1/+1 2006-08-07also made my colors tasting better with my overall colorschemeGravatar arg@10ksloc.org 1-3/+3 2006-08-07next attempt for bright background switchGravatar arg@10ksloc.org 1-3/+3 2006-08-07Added tag 0.2 for changeset 656be0f47df545dfdd2e1e0663663b8b1b26f031Gravatar arg@10ksloc.org 1-0/+1 2006-08-07added stripping to dmenu targetGravatar arg@10ksloc.org 1-0/+1 2006-08-07fixed a bad mistake setting the dmenu border to False;Gravatar arg@10ksloc.org 1-1/+0 2006-08-07renamed some functions to make it more readableGravatar arg@10ksloc.org 1-9/+9 2006-08-07updated man pageGravatar arg@10ksloc.org 1-1/+1 2006-08-07updated man pageGravatar arg@10ksloc.org 1-0/+4 2006-08-07removed -t title crap from dmenuGravatar arg@10ksloc.org 2-57/+12 2006-08-05menu now also uses -OsGravatar arg@10ksloc.org 1-2/+2 2006-08-05small changeGravatar arg@10ksloc.org 1-1/+1 2006-08-04yet another fixGravatar arg@10ksloc.org 1-2/+2 2006-08-04fixed README of dmenuGravatar arg@10ksloc.org 1-27/+10 2006-08-04fixed dist targetGravatar arg@10ksloc.org 1-1/+1 2006-08-04removed config.hGravatar arg@10ksloc.org 1-9/+0