public
/
slock-bgimage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added dummy error handler to prevent X from terminating slock just in case

This commit is contained in:
anselm@garbe.us 2012-01-22 18:58:10 +01:00
parent ede2935e10
commit 5a5c581285
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
slock.c
View File

@ -46,7 +46,7 @@ die(const char *errstr, ...) {
#ifndef HAVE_BSD_AUTH #ifndef HAVE_BSD_AUTH
static const char * static const char *
get_password(void) { /* only run as root */ getpw(void) { /* only run as root */
const char *rval; const char *rval;
struct passwd *pw; struct passwd *pw;
@ -74,9 +74,9 @@ get_password(void) { /* only run as root */
static void static void
#ifdef HAVE_BSD_AUTH #ifdef HAVE_BSD_AUTH
read_password(Display *dpy) readpw(Display *dpy)
#else #else
read_password(Display *dpy, const char *pws) readpw(Display *dpy, const char *pws)
#endif #endif
{ {
char buf[32], passwd[256]; char buf[32], passwd[256];
@ -213,6 +213,11 @@ usage(void) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
static int
xerrordummy(Display *dpy, XErrorEvent *ee) {
return 0;
}
int int
main(int argc, char **argv) { main(int argc, char **argv) {
#ifndef HAVE_BSD_AUTH #ifndef HAVE_BSD_AUTH
@ -224,7 +229,7 @@ main(int argc, char **argv) {
struct st_lock **locks; struct st_lock **locks;
if((argc == 2) && !strcmp("-v", argv[1])) if((argc == 2) && !strcmp("-v", argv[1]))
die("slock-%s, © 2006-2008 Anselm R Garbe", VERSION); die("slock-%s, © 2006-2012 Anselm R Garbe", VERSION);
else if(argc != 1) else if(argc != 1)
usage(); usage();
@ -232,12 +237,13 @@ main(int argc, char **argv) {
die("no passwd entry for you"); die("no passwd entry for you");
#ifndef HAVE_BSD_AUTH #ifndef HAVE_BSD_AUTH
pws = get_password(); pws = getpw();
#endif #endif
if(!(dpy = XOpenDisplay(0))) if(!(dpy = XOpenDisplay(0)))
die("cannot open display"); die("cannot open display");
/* prevent default error handler to take over */
XSetErrorHandler(xerrordummy);
/* Get the number of screens in display "dpy" and blank them all. */ /* Get the number of screens in display "dpy" and blank them all. */
nscreens = ScreenCount(dpy); nscreens = ScreenCount(dpy);
locks = malloc(sizeof(struct st_lock *) * nscreens); locks = malloc(sizeof(struct st_lock *) * nscreens);
@ -251,9 +257,9 @@ main(int argc, char **argv) {
/* Everything is now blank. Now wait for the correct password. */ /* Everything is now blank. Now wait for the correct password. */
#ifdef HAVE_BSD_AUTH #ifdef HAVE_BSD_AUTH
read_password(dpy); readpw(dpy);
#else #else
read_password(dpy, pws); readpw(dpy, pws);
#endif #endif
/* Password ok, unlock everything and quit. */ /* Password ok, unlock everything and quit. */