referred to LICENSE file

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index 9fab328..9c10958 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,7 +1,4 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI-MMVII Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and license details. */

 #include "dmenu.h"
 #include <ctype.h>
 #include <locale.h>
 #include "dmenu.h"
 #include <ctype.h>
 #include <locale.h>


@@ -136,6 +133,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);


@@ -436,29 +435,29 @@ 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))
-                       eprint("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");
+               else if(!strcmp(argv[i], "-v"))
+                       eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n");

                else
                        usage();
        setlocale(LC_CTYPE, "");
                else
                        usage();
        setlocale(LC_CTYPE, "");