tyler/suckless-slock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed useless chars, prepared release

Browse Source
This commit is contained in:
Anselm R Garbe 2008-07-29 19:08:18 +01:00
parent c0fdcb8afc
commit 1460b14f45
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -13,8 +13,8 @@ Installation
Edit config.mk to match your local setup (slock is installed into Edit config.mk to match your local setup (slock is installed into
the /usr/local namespace by default). the /usr/local namespace by default).
Afterwards enter the following command to build and install slock (if Afterwards enter the following command to build and install slock
necessary as root): (if necessary as root):
make clean install make clean install

14
slock.c
View File

@ -23,7 +23,7 @@
#endif #endif
void void
eprint(const char *errstr, ...) { die(const char *errstr, ...) {
va_list ap; va_list ap;
va_start(ap, errstr); va_start(ap, errstr);
@ -39,7 +39,7 @@ get_password() { /* only run as root */
struct passwd *pw; struct passwd *pw;
if(geteuid() != 0) 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()); pw = getpwuid(getuid());
endpwent(); endpwent();
rval = pw->pw_passwd; rval = pw->pw_passwd;
@ -55,7 +55,7 @@ get_password() { /* only run as root */
/* drop privileges */ /* drop privileges */
if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0) 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; return rval;
} }
#endif #endif
@ -81,16 +81,16 @@ main(int argc, char **argv) {
XSetWindowAttributes wa; XSetWindowAttributes wa;
if((argc == 2) && !strcmp("-v", argv[1])) 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 #ifndef HAVE_BSD_AUTH
pws = get_password(); pws = get_password();
#endif #endif
if(!(dpy = XOpenDisplay(0))) if(!(dpy = XOpenDisplay(0)))
eprint("slock: cannot open display\n"); die("slock: cannot open display\n");
screen = DefaultScreen(dpy); screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen); root = RootWindow(dpy, screen);
@ -144,13 +144,11 @@ main(int argc, char **argv) {
switch(ksym) { switch(ksym) {
case XK_Return: case XK_Return:
passwd[len] = 0; passwd[len] = 0;
#ifdef HAVE_BSD_AUTH #ifdef HAVE_BSD_AUTH
running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd); running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
#else #else
running = strcmp(crypt(passwd, pws), pws); running = strcmp(crypt(passwd, pws), pws);
#endif #endif
if (running != 0) if (running != 0)
XBell(dpy, 100); XBell(dpy, 100);
len = 0; len = 0;