aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnselm R. Garbe <arg@suckless.org>2007-02-23 14:39:54 +0100
committerAnselm R. Garbe <arg@suckless.org>2007-02-23 14:39:54 +0100
commit6b5b580affe4f1f5315afd375c86a87d44799778 (patch)
treec940cdf8073a18ba441bf38720e99fe0aac1f19d
parentd8b48d64e168d515ade6631e75ce202f26e00f2d (diff)
fixed a bug when dmenu is run with -v
-rw-r--r--config.mk2
-rw-r--r--main.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/config.mk b/config.mk
index a0ef56a..7ae7dde 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
1# dmenu version 1# dmenu version
2VERSION = 2.4.2 2VERSION = 2.5
3 3
4# Customize below to fit your system 4# Customize below to fit your system
5 5
diff --git a/main.c b/main.c
index c1d48dd..cd0e2b5 100644
--- a/main.c
+++ b/main.c
@@ -418,7 +418,9 @@ main(int argc, char *argv[]) {
418 XModifierKeymap *modmap; 418 XModifierKeymap *modmap;
419 XSetWindowAttributes wa; 419 XSetWindowAttributes wa;
420 420
421 if(isatty(STDIN_FILENO)) { 421 if(argc == 2 && !strncmp("-v", argv[1], 3))
422 eprint("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");
423 else if(isatty(STDIN_FILENO)) {
422 fputs("error: dmenu can't run in an interactive shell\n", stdout); 424 fputs("error: dmenu can't run in an interactive shell\n", stdout);
423 usage(); 425 usage();
424 } 426 }
@@ -445,8 +447,6 @@ main(int argc, char *argv[]) {
445 else if(!strncmp(argv[i], "-sf", 4)) { 447 else if(!strncmp(argv[i], "-sf", 4)) {
446 if(++i < argc) selfg = argv[i]; 448 if(++i < argc) selfg = argv[i];
447 } 449 }
448 else if(!strncmp(argv[i], "-v", 3))
449 eprint("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");
450 else 450 else
451 usage(); 451 usage();
452 setlocale(LC_CTYPE, ""); 452 setlocale(LC_CTYPE, "");