tfixing arg handling in dmenu (thanks to Sander for his report) - dmenu - Dmenu fork with xft fonts.
(HTM) git clone git://r-36.net/dmenu
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit f63327677421a07cca69b86c7dd5f01047fe14b1
(DIR) parent bb480fb4b0fd06207b2ee1b88eb32b8588e698dc
(HTM) Author: Anselm R. Garbe <arg@suckless.org>
Date: Mon, 23 Oct 2006 10:12:09 +0200
fixing arg handling in dmenu (thanks to Sander for his report)
Diffstat:
config.mk | 2 +-
main.c | 30 ++++++++++++++++++------------
2 files changed, 19 insertions(+), 13 deletions(-)
---
(DIR) diff --git a/config.mk b/config.mk
t@@ -1,5 +1,5 @@
# dmenu version
-VERSION = 1.3
+VERSION = 1.4
# Customize below to fit your system
(DIR) diff --git a/main.c b/main.c
t@@ -286,18 +286,24 @@ main(int argc, char *argv[]) {
timeout.tv_sec = 3;
/* command line args */
for(i = 1; i < argc; i++)
- if(!strncmp(argv[i], "-font", 6))
- font = argv[++i];
- else if(!strncmp(argv[i], "-normbg", 8))
- normbg = argv[++i];
- else if(!strncmp(argv[i], "-normfg", 8))
- normfg = argv[++i];
- else if(!strncmp(argv[i], "-selbg", 7))
- selbg = argv[++i];
- else if(!strncmp(argv[i], "-selfg", 7))
- selfg = argv[++i];
- else if(!strncmp(argv[i], "-t", 3))
- timeout.tv_sec = atoi(argv[++i]);
+ if(!strncmp(argv[i], "-font", 6)) {
+ if(++i < argc) font = argv[i];
+ }
+ else if(!strncmp(argv[i], "-normbg", 8)) {
+ if(++i < argc) normbg = argv[i];
+ }
+ else if(!strncmp(argv[i], "-normfg", 8)) {
+ if(++i < argc) normfg = argv[i];
+ }
+ else if(!strncmp(argv[i], "-selbg", 7)) {
+ if(++i < argc) selbg = argv[i];
+ }
+ else if(!strncmp(argv[i], "-selfg", 7)) {
+ if(++i < argc) selfg = argv[i];
+ }
+ else if(!strncmp(argv[i], "-t", 3)) {
+ if(++i < argc) timeout.tv_sec = atoi(argv[i]);
+ }
else if(!strncmp(argv[i], "-v", 3)) {
fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
exit(EXIT_SUCCESS);