removed useless chars, prepared release

diff --git a/LICENSE b/LICENSE
index 490492c..faf1c09 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -6,16 +6,16 @@ Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
 to deal in the Software without restriction, including without limitation
 the rights to use, copy, modify, merge, publish, distribute, sublicense,
 copy of this software and associated documentation files (the "Software"),
 to deal in the Software without restriction, including without limitation
 the rights to use, copy, modify, merge, publish, distribute, sublicense,

-and/or sell copies of the Software, and to permit persons to whom the 
+and/or sell copies of the Software, and to permit persons to whom the

 Software is furnished to do so, subject to the following conditions:
 
 Software is furnished to do so, subject to the following conditions:
 

-The above copyright notice and this permission notice shall be included in 
-all copies or substantial portions of the Software. 
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.

 
 

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

 DEALINGS IN THE SOFTWARE.
 DEALINGS IN THE SOFTWARE.

diff --git a/README b/README
index 5940337..a81290d 100644 (file)
--- a/README
+++ b/README
@@ -13,8 +13,8 @@ Installation
 Edit config.mk to match your local setup (slock is installed into
 the /usr/local namespace by default).
 
 Edit config.mk to match your local setup (slock is installed into
 the /usr/local namespace by default).
 

-Afterwards enter the following command to build and install slock (if
-necessary as root):
+Afterwards enter the following command to build and install slock
+(if necessary as root):

 
     make clean install
 
 
     make clean install
 

diff --git a/slock.c b/slock.c
index 40f1fbe..d576c0b 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -23,7 +23,7 @@
 #endif
 
 void
 #endif
 
 void

-eprint(const char *errstr, ...) {
+die(const char *errstr, ...) {

        va_list ap;
 
        va_start(ap, errstr);
        va_list ap;
 
        va_start(ap, errstr);


@@ -39,7 +39,7 @@ get_password() { /* only run as root */
        struct passwd *pw;
 
        if(geteuid() != 0)
        struct passwd *pw;
 
        if(geteuid() != 0)

-               eprint("slock: cannot retrieve password entry (make sure to suid slock)\n");
+               die("slock: cannot retrieve password entry (make sure to suid slock)\n");

        pw = getpwuid(getuid());
        endpwent();
        rval =  pw->pw_passwd;
        pw = getpwuid(getuid());
        endpwent();
        rval =  pw->pw_passwd;


@@ -55,7 +55,7 @@ get_password() { /* only run as root */
 
        /* drop privileges */
        if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0)
 
        /* drop privileges */
        if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0)

-               eprint("slock: cannot drop privileges\n");
+               die("slock: cannot drop privileges\n");

        return rval;
 }
 #endif
        return rval;
 }
 #endif


@@ -81,16 +81,16 @@ main(int argc, char **argv) {
        XSetWindowAttributes wa;
 
        if((argc == 2) && !strcmp("-v", argv[1]))
        XSetWindowAttributes wa;
 
        if((argc == 2) && !strcmp("-v", argv[1]))

-               eprint("slock-"VERSION", © 2006-2008 Anselm R Garbe\n");
+               die("slock-"VERSION", © 2006-2008 Anselm R Garbe\n");

        else if(argc != 1)
        else if(argc != 1)

-               eprint("usage: slock [-v]\n");
+               die("usage: slock [-v]\n");

 
 #ifndef HAVE_BSD_AUTH
        pws = get_password();
 #endif
 
        if(!(dpy = XOpenDisplay(0)))
 
 #ifndef HAVE_BSD_AUTH
        pws = get_password();
 #endif
 
        if(!(dpy = XOpenDisplay(0)))

-               eprint("slock: cannot open display\n");
+               die("slock: cannot open display\n");

        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 


@@ -144,13 +144,11 @@ main(int argc, char **argv) {
                        switch(ksym) {
                        case XK_Return:
                                passwd[len] = 0;
                        switch(ksym) {
                        case XK_Return:
                                passwd[len] = 0;

-

 #ifdef HAVE_BSD_AUTH
                                running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
 #else
                                running = strcmp(crypt(passwd, pws), pws);
 #endif
 #ifdef HAVE_BSD_AUTH
                                running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
 #else
                                running = strcmp(crypt(passwd, pws), pws);
 #endif

-

                                if (running != 0)
                                        XBell(dpy, 100);
                                len = 0;
                                if (running != 0)
                                        XBell(dpy, 100);
                                len = 0;