Browse Source

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

master
Anselm R. Garbe 18 years ago
parent
commit
f633276774
2 changed files with 19 additions and 13 deletions
  1. +1
    -1
      config.mk
  2. +18
    -12
      main.c

+ 1
- 1
config.mk View File

@ -1,5 +1,5 @@
# dmenu version # dmenu version
VERSION = 1.3
VERSION = 1.4
# Customize below to fit your system # Customize below to fit your system


+ 18
- 12
main.c View File

@ -286,18 +286,24 @@ main(int argc, char *argv[]) {
timeout.tv_sec = 3; timeout.tv_sec = 3;
/* command line args */ /* command line args */
for(i = 1; i < argc; i++) 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)) { else if(!strncmp(argv[i], "-v", 3)) {
fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout); fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);


Loading…
Cancel
Save