aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnselm R. Garbe2007-02-23 14:39:54 +0100
committerAnselm R. Garbe2007-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 @@
# dmenu version
-VERSION = 2.4.2
+VERSION = 2.5
# Customize below to fit your system
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[]) {
XModifierKeymap *modmap;
XSetWindowAttributes wa;
- if(isatty(STDIN_FILENO)) {
+ if(argc == 2 && !strncmp("-v", argv[1], 3))
+ eprint("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");
+ else if(isatty(STDIN_FILENO)) {
fputs("error: dmenu can't run in an interactive shell\n", stdout);
usage();
}
@@ -445,8 +447,6 @@ main(int argc, char *argv[]) {
else if(!strncmp(argv[i], "-sf", 4)) {
if(++i < argc) selfg = argv[i];
}
- else if(!strncmp(argv[i], "-v", 3))
- eprint("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");
else
usage();
setlocale(LC_CTYPE, "");