Merge.
This commit is contained in:
commit
b90d2ba827
@ -437,28 +437,28 @@ main(int argc, char *argv[]) {
|
|||||||
|
|
||||||
/* command line args */
|
/* command line args */
|
||||||
for(i = 1; i < argc; i++)
|
for(i = 1; i < argc; i++)
|
||||||
if(!strncmp(argv[i], "-b", 3)) {
|
if(!strcmp(argv[i], "-b")) {
|
||||||
bottom = True;
|
bottom = True;
|
||||||
}
|
}
|
||||||
else if(!strncmp(argv[i], "-fn", 4)) {
|
else if(!strcmp(argv[i], "-fn")) {
|
||||||
if(++i < argc) font = argv[i];
|
if(++i < argc) font = argv[i];
|
||||||
}
|
}
|
||||||
else if(!strncmp(argv[i], "-nb", 4)) {
|
else if(!strcmp(argv[i], "-nb")) {
|
||||||
if(++i < argc) normbg = argv[i];
|
if(++i < argc) normbg = argv[i];
|
||||||
}
|
}
|
||||||
else if(!strncmp(argv[i], "-nf", 4)) {
|
else if(!strcmp(argv[i], "-nf")) {
|
||||||
if(++i < argc) normfg = argv[i];
|
if(++i < argc) normfg = argv[i];
|
||||||
}
|
}
|
||||||
else if(!strncmp(argv[i], "-p", 3)) {
|
else if(!strcmp(argv[i], "-p")) {
|
||||||
if(++i < argc) prompt = argv[i];
|
if(++i < argc) prompt = argv[i];
|
||||||
}
|
}
|
||||||
else if(!strncmp(argv[i], "-sb", 4)) {
|
else if(!strcmp(argv[i], "-sb")) {
|
||||||
if(++i < argc) selbg = argv[i];
|
if(++i < argc) selbg = argv[i];
|
||||||
}
|
}
|
||||||
else if(!strncmp(argv[i], "-sf", 4)) {
|
else if(!strcmp(argv[i], "-sf")) {
|
||||||
if(++i < argc) selfg = argv[i];
|
if(++i < argc) selfg = argv[i];
|
||||||
}
|
}
|
||||||
else if(!strncmp(argv[i], "-v", 3))
|
else if(!strcmp(argv[i], "-v"))
|
||||||
eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n");
|
eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n");
|
||||||
else
|
else
|
||||||
usage();
|
usage();
|
||||||
|
Loading…
Reference in New Issue
Block a user