fixing arg handling in dmenu (thanks to Sander for his report)

diff --git a/config.mk b/config.mk
index 63fbad33de5ea7e904edee61c7a554a6fefbaf78..e0be79f26e41937736babd092f1a3c36fc79f26c 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 1.3
+VERSION = 1.4
 
 # Customize below to fit your system
 

diff --git a/main.c b/main.c
index 3fa1e54801ee5d9a770e192eecb8f6af7f00acb6..1d37f70d8ebe89b814680c4fff6f60f837ea9cd7 100644 (file)
--- a/main.c
+++ b/main.c
@@ -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);