diff options
author | Kris Maglione <jg@suckless.org> | 2007-05-23 16:44:15 -0400 |
---|---|---|
committer | Kris Maglione <jg@suckless.org> | 2007-05-23 16:44:15 -0400 |
commit | 8369e1736b4778e766f55d5476bbbd38a8b46331 (patch) | |
tree | f051269edffeccf4ed843b3649e29f7b647efac3 | |
parent | c04b688cc0fdfdf28eec8ca0133b7a89065ce499 (diff) | |
parent | 4ebd7c4a219bae1a0d38a7c85e5299d0cef81c95 (diff) |
Merge.
-rw-r--r-- | main.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -437,28 +437,28 @@ main(int argc, char *argv[]) { | |||
437 | 437 | ||
438 | /* command line args */ | 438 | /* command line args */ |
439 | for(i = 1; i < argc; i++) | 439 | for(i = 1; i < argc; i++) |
440 | if(!strncmp(argv[i], "-b", 3)) { | 440 | if(!strcmp(argv[i], "-b")) { |
441 | bottom = True; | 441 | bottom = True; |
442 | } | 442 | } |
443 | else if(!strncmp(argv[i], "-fn", 4)) { | 443 | else if(!strcmp(argv[i], "-fn")) { |
444 | if(++i < argc) font = argv[i]; | 444 | if(++i < argc) font = argv[i]; |
445 | } | 445 | } |
446 | else if(!strncmp(argv[i], "-nb", 4)) { | 446 | else if(!strcmp(argv[i], "-nb")) { |
447 | if(++i < argc) normbg = argv[i]; | 447 | if(++i < argc) normbg = argv[i]; |
448 | } | 448 | } |
449 | else if(!strncmp(argv[i], "-nf", 4)) { | 449 | else if(!strcmp(argv[i], "-nf")) { |
450 | if(++i < argc) normfg = argv[i]; | 450 | if(++i < argc) normfg = argv[i]; |
451 | } | 451 | } |
452 | else if(!strncmp(argv[i], "-p", 3)) { | 452 | else if(!strcmp(argv[i], "-p")) { |
453 | if(++i < argc) prompt = argv[i]; | 453 | if(++i < argc) prompt = argv[i]; |
454 | } | 454 | } |
455 | else if(!strncmp(argv[i], "-sb", 4)) { | 455 | else if(!strcmp(argv[i], "-sb")) { |
456 | if(++i < argc) selbg = argv[i]; | 456 | if(++i < argc) selbg = argv[i]; |
457 | } | 457 | } |
458 | else if(!strncmp(argv[i], "-sf", 4)) { | 458 | else if(!strcmp(argv[i], "-sf")) { |
459 | if(++i < argc) selfg = argv[i]; | 459 | if(++i < argc) selfg = argv[i]; |
460 | } | 460 | } |
461 | else if(!strncmp(argv[i], "-v", 3)) | 461 | else if(!strcmp(argv[i], "-v")) |
462 | eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n"); | 462 | eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n"); |
463 | else | 463 | else |
464 | usage(); | 464 | usage(); |