=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/check.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- src/usr.bin/sudo/Attic/check.c 2003/04/01 15:47:51 1.9 +++ src/usr.bin/sudo/Attic/check.c 2003/04/03 19:15:34 1.10 @@ -57,6 +57,11 @@ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ +#ifdef HAVE_ERR_H +# include +#else +# include "emul/err.h" +#endif /* HAVE_ERR_H */ #include #include #include @@ -67,7 +72,7 @@ #include "sudo.h" #ifndef lint -static const char rcsid[] = "$Sudo: check.c,v 1.211 2003/04/01 14:58:55 millert Exp $"; +static const char rcsid[] = "$Sudo: check.c,v 1.212 2003/04/02 18:25:19 millert Exp $"; #endif /* lint */ /* Status codes for timestamp_status() */ @@ -269,9 +274,7 @@ oflow: /* We pre-allocate enough space, so this should never happen. */ - (void) fprintf(stderr, "%s: internal error, expand_prompt() overflow\n", - Argv[0]); - exit(1); + errx(1, "internal error, expand_prompt() overflow"); } /* @@ -543,15 +546,13 @@ else status = rmdir(timestampdir); if (status == -1 && errno != ENOENT) { - log_error(NO_EXIT, "can't remove %s (%s), will reset to epoch", + log_error(NO_EXIT, "can't remove %s (%s), will reset to Epoch", ts, strerror(errno)); remove = FALSE; } } - if (!remove && touch(ts, 0) == -1) { - (void) fprintf(stderr, "%s: can't reset %s to epoch: %s\n", - Argv[0], ts, strerror(errno)); - } + if (!remove && touch(ts, 0) == -1) + err(1, "can't reset %s to Epoch", ts); } free(timestampdir);