X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Ftest-passwd.c;h=d47fb4ae5bef9dd796d1a54a9b9429e88ca28264;hb=9c9d475ff889ed8be02e8ce8c17da28b93278fca;hp=eaa884ff2ecb460769e3bcf0c48cc5373b440faa;hpb=ebc241816cc8e3eec7270a594bb1a607df32bcd6;p=xscreensaver diff --git a/driver/test-passwd.c b/driver/test-passwd.c index eaa884ff..d47fb4ae 100644 --- a/driver/test-passwd.c +++ b/driver/test-passwd.c @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 1998, 2001 Jamie Zawinski +/* xscreensaver, Copyright (c) 1998-2004 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -14,12 +14,6 @@ itself. */ -#define WHICH_PASS 100 -#define WHICH_SPLASH 101 -#define WHICH_TTY 102 - -#define WHICH WHICH_PASS - #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -58,10 +52,14 @@ void start_notice_events_timer (saver_info *si, Window w, Bool b) {} Bool handle_clientmessage (saver_info *si, XEvent *e, Bool u) { return False; } int BadWindow_ehandler (Display *dpy, XErrorEvent *error) { exit(1); } const char *signal_name(int signal) { return "???"; } -void restore_real_vroot (saver_info *si) {} +Bool restore_real_vroot (saver_info *si) { return False; } void store_saver_status (saver_info *si) {} void saver_exit (saver_info *si, int status, const char *core) { exit(status);} -int move_mouse_grab (saver_info *si, Window to, Cursor cursor) { return 0; } +int move_mouse_grab (saver_info *si, Window to, Cursor c, int ts) { return 0; } +int mouse_screen (saver_info *si) { return 0; } +void check_for_leaks (const char *where) { } +void exec_command (const char *shell, const char *command, int nice) { } +void shutdown_stderr (saver_info *si) { } const char *blurb(void) { return progname; } Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS; @@ -70,6 +68,7 @@ void get_screen_viewport (saver_screen_info *ssi, int *x_ret, int *y_ret, int *w_ret, int *h_ret, + int tx, int ty, Bool verbose_p) { *x_ret = 0; @@ -91,6 +90,12 @@ idle_timer (XtPointer closure, XtIntervalId *id) } +#ifdef __GNUC__ + __extension__ /* shut up about "string length is greater than the length + ISO C89 compilers are required to support" when including + the .ad file... */ +#endif + static char *fallback[] = { #include "XScreenSaver_ad.h" 0 @@ -99,6 +104,7 @@ static char *fallback[] = { int main (int argc, char **argv) { + enum { PASS, SPLASH, TTY } which; Widget toplevel_shell = 0; saver_screen_info ssip; saver_info sip; @@ -124,12 +130,23 @@ main (int argc, char **argv) if (*s) strcpy (progname, s+1); } + if (argc != 2) goto USAGE; + else if (!strcmp (argv[1], "pass")) which = PASS; + else if (!strcmp (argv[1], "splash")) which = SPLASH; + else if (!strcmp (argv[1], "tty")) which = TTY; + else + { + USAGE: + fprintf (stderr, "usage: %s [ pass | splash | tty ]\n", progname); + exit (1); + } + /* before hack_uid() for proper permissions */ lock_priv_init (argc, argv, True); hack_uid (si); - if (! lock_init (argc, argv, si->prefs.verbose_p)) + if (! lock_init (argc, argv, True)) { si->locking_disabled_p = True; si->nolock_reason = "error getting password"; @@ -137,79 +154,80 @@ main (int argc, char **argv) progclass = "XScreenSaver"; -#if (WHICH != WHICH_TTY) - toplevel_shell = XtAppInitialize (&si->app, progclass, 0, 0, - &argc, argv, fallback, - 0, 0); - - si->dpy = XtDisplay (toplevel_shell); - p->db = XtDatabase (si->dpy); - si->default_screen->toplevel_shell = toplevel_shell; - si->default_screen->screen = XtScreen(toplevel_shell); - si->default_screen->default_visual = - si->default_screen->current_visual = - DefaultVisualOfScreen(si->default_screen->screen); - si->default_screen->screensaver_window = - RootWindowOfScreen(si->default_screen->screen); - si->default_screen->current_depth = - visual_depth(si->default_screen->screen, - si->default_screen->current_visual); - - db = p->db; - XtGetApplicationNameAndClass (si->dpy, &progname, &progclass); - - load_init_file (&si->prefs); - -#endif /* (WHICH != 2) */ + if (which != TTY) + { + toplevel_shell = XtAppInitialize (&si->app, progclass, 0, 0, + &argc, argv, fallback, + 0, 0); + + si->dpy = XtDisplay (toplevel_shell); + p->db = XtDatabase (si->dpy); + si->default_screen->toplevel_shell = toplevel_shell; + si->default_screen->screen = XtScreen(toplevel_shell); + si->default_screen->default_visual = + si->default_screen->current_visual = + DefaultVisualOfScreen(si->default_screen->screen); + si->default_screen->screensaver_window = + RootWindowOfScreen(si->default_screen->screen); + si->default_screen->current_depth = + visual_depth(si->default_screen->screen, + si->default_screen->current_visual); + + db = p->db; + XtGetApplicationNameAndClass (si->dpy, &progname, &progclass); + + load_init_file (&si->prefs); + } p->verbose_p = True; while (1) { -#if WHICH == WHICH_PASS - if (unlock_p (si)) - fprintf (stderr, "%s: password correct\n", progname); + if (which == PASS) + { + if (unlock_p (si)) + fprintf (stderr, "%s: password correct\n", progname); + else + fprintf (stderr, "%s: password INCORRECT!\n", progname); + + XSync(si->dpy, False); + sleep (3); + } + else if (which == SPLASH) + { + XEvent event; + make_splash_dialog (si); + XtAppAddTimeOut (si->app, p->splash_duration + 1000, + idle_timer, (XtPointer) si); + while (si->splash_dialog) + { + XtAppNextEvent (si->app, &event); + if (event.xany.window == si->splash_dialog) + handle_splash_event (si, &event); + XtDispatchEvent (&event); + } + XSync (si->dpy, False); + sleep (1); + } + else if (which == TTY) + { + char *pass; + char buf[255]; + struct passwd *p = getpwuid (getuid ()); + printf ("\n%s: %s's password: ", progname, p->pw_name); + + pass = fgets (buf, sizeof(buf)-1, stdin); + if (!pass || !*pass) + exit (0); + if (pass[strlen(pass)-1] == '\n') + pass[strlen(pass)-1] = 0; + + if (passwd_valid_p (pass, True)) + printf ("%s: Ok!\n", progname); + else + printf ("%s: Wrong!\n", progname); + } else - fprintf (stderr, "%s: password INCORRECT!\n", progname); - - XSync(si->dpy, False); - sleep (3); -#elif WHICH == WHICH_SPLASH - { - XEvent event; - make_splash_dialog (si); - XtAppAddTimeOut (si->app, p->splash_duration + 1000, - idle_timer, (XtPointer) si); - while (si->splash_dialog) - { - XtAppNextEvent (si->app, &event); - if (event.xany.window == si->splash_dialog) - handle_splash_event (si, &event); - XtDispatchEvent (&event); - } - XSync (si->dpy, False); - sleep (1); - } -#elif WHICH == WHICH_TTY - { - char *pass; - char buf[255]; - struct passwd *p = getpwuid (getuid ()); - printf ("\n%s: %s's password: ", progname, p->pw_name); - - pass = fgets (buf, sizeof(buf)-1, stdin); - if (!pass || !*pass) - exit (0); - if (pass[strlen(pass)-1] == '\n') - pass[strlen(pass)-1] = 0; - - if (passwd_valid_p (pass, True)) - printf ("%s: Ok!\n", progname); - else - printf ("%s: Wrong!\n", progname); - } -#else -# error bogus WHICH value! -#endif + abort(); } }