speedie/spmenu
2
0
Fork 1
Code Issues 1 Pull requests Packages Projects Releases 15 Wiki Activity

clear up some possible errors

Browse source
This commit is contained in:
speedie 2023-04-07 18:45:22 +02:00
parent 68b58325d4
commit 319f37254f
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libs/argv.c
View file

@ -21,6 +21,7 @@ readargs(int argc, char *argv[])
globalcolors = 1; globalcolors = 1;
} else if (!strcmp(argv[j], "-ngbc") || (!strcmp(argv[j], "--no-global-colors"))) { } else if (!strcmp(argv[j], "-ngbc") || (!strcmp(argv[j], "--no-global-colors"))) {
globalcolors = 0; globalcolors = 0;
#if USECONFIG
} else if (!strcmp(argv[j], "-cf") || (!strcmp(argv[j], "--config-file"))) { // specify a config file } else if (!strcmp(argv[j], "-cf") || (!strcmp(argv[j], "--config-file"))) { // specify a config file
if (argv[j+1]) { if (argv[j+1]) {
cconf = 1; cconf = 1;
@ -28,6 +29,7 @@ readargs(int argc, char *argv[])
} else { } else {
die("This argument requires a second argument.\n"); die("This argument requires a second argument.\n");
} }
#endif
} }
} }
@ -177,9 +179,11 @@ readargs(int argc, char *argv[])
|| !strcmp(argv[i], "-ngbc") || !strcmp(argv[i], "-ngbc")
|| !strcmp(argv[i], "--global-colors") || !strcmp(argv[i], "--global-colors")
|| !strcmp(argv[i], "--no-global-colors") || !strcmp(argv[i], "--no-global-colors")
#if USECONFIG
|| !strcmp(argv[i], "-cf") || !strcmp(argv[i], "-cf")
|| !strcmp(argv[i], "--config-file") || !strcmp(argv[i], "--config-file")
|| !strcmp(argv[i], argconf) || !strcmp(argv[i], argconf)
#endif
)) ))
continue; continue;
else else
@ -364,9 +368,11 @@ readargs(int argc, char *argv[])
|| !strcmp(argv[i], "-ngbc") || !strcmp(argv[i], "-ngbc")
|| !strcmp(argv[i], "--global-colors") || !strcmp(argv[i], "--global-colors")
|| !strcmp(argv[i], "--no-global-colors") || !strcmp(argv[i], "--no-global-colors")
#if USECONFIG
|| !strcmp(argv[i], "-cf") || !strcmp(argv[i], "-cf")
|| !strcmp(argv[i], "--config-file") || !strcmp(argv[i], "--config-file")
|| !strcmp(argv[i], argconf) || !strcmp(argv[i], argconf)
#endif
)) ))
continue; continue;
else else
@ -475,7 +481,10 @@ usage(void)
"spmenu -ib, --image-bottom Position the image at the bottom\n" "spmenu -ib, --image-bottom Position the image at the bottom\n"
"spmenu -ic, --image-center Position the image in the center\n" "spmenu -ic, --image-center Position the image in the center\n"
"spmenu -itc, --image-topcenter Position the image in the top center\n" "spmenu -itc, --image-topcenter Position the image in the top center\n"
"spmenu -wm, --managed, --x11-client Spawn spmenu as a window manager controlled client/window. Useful for testing\n" , stdout);
// general/config related
fputs("spmenu -wm, --managed, --x11-client Spawn spmenu as a window manager controlled client/window. Useful for testing\n"
"spmenu -nwm, --unmanaged Don't spawn spmenu as a window manager controlled client/window. Useful for testing\n" "spmenu -nwm, --unmanaged Don't spawn spmenu as a window manager controlled client/window. Useful for testing\n"
"spmenu -cf, --config-file <file> Set config file to load to <file>\n" "spmenu -cf, --config-file <file> Set config file to load to <file>\n"
"spmenu -lcfg, --load-config Load spmenu configuration (~/.config/spmenu/spmenu.conf, ~/.spmenu or ~/.config/spmenu/spmenurc)\n" "spmenu -lcfg, --load-config Load spmenu configuration (~/.config/spmenu/spmenu.conf, ~/.spmenu or ~/.config/spmenu/spmenurc)\n"