Fix the uptodate logic (uptodate if !find newer dirs than the cache).

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index c63ac08..22ef71b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -135,6 +135,8 @@ initfont(const char *fontstr) {
        char *def, **missing;
        int i, n;
 
        char *def, **missing;
        int i, n;
 

+       if(!fontstr || fontstr[0] == '\0')
+               eprint("error, cannot load font: '%s'\n", fontstr);

        missing = NULL;
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        missing = NULL;
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);


@@ -435,28 +437,28 @@ main(int argc, char *argv[]) {
 
        /* command line args */
        for(i = 1; i < argc; i++)
 
        /* command line args */
        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");
                else
                        usage();
                        eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n");
                else
                        usage();