Deleted Added
full compact
19c19,20
< static char rcsid[] = "$Id$";
---
> static const char rcsid[] =
> "$Id: misc.c,v 1.5 1997/02/22 16:05:08 peter Exp $";
34a36
> #include <err.h>
177,180c179,180
< if (seteuid(ROOT_UID) < OK) {
< perror("seteuid");
< exit(ERROR_EXIT);
< }
---
> if (seteuid(ROOT_UID) < OK)
> err(ERROR_EXIT, "seteuid");
182,185c182,183
< if (setuid(ROOT_UID) < OK) {
< perror("setuid");
< exit(ERROR_EXIT);
< }
---
> if (setuid(ROOT_UID) < OK)
> err(ERROR_EXIT, "setuid");
198c196
< perror(CRONDIR);
---
> warn("%s", CRONDIR);
200c198
< fprintf(stderr, "%s: created\n", CRONDIR);
---
> warnx("%s: created", CRONDIR);
203,205c201
< fprintf(stderr, "%s: ", CRONDIR);
< perror("mkdir");
< exit(ERROR_EXIT);
---
> err(ERROR_EXIT, "%s: mkdir", CRONDIR);
208,217c204,207
< if (!(sb.st_mode & S_IFDIR)) {
< fprintf(stderr, "'%s' is not a directory, bailing out.\n",
< CRONDIR);
< exit(ERROR_EXIT);
< }
< if (chdir(CRONDIR) < OK) {
< fprintf(stderr, "cannot chdir(%s), bailing out.\n", CRONDIR);
< perror(CRONDIR);
< exit(ERROR_EXIT);
< }
---
> if (!(sb.st_mode & S_IFDIR))
> err(ERROR_EXIT, "'%s' is not a directory, bailing out", CRONDIR);
> if (chdir(CRONDIR) < OK)
> err(ERROR_EXIT, "cannot chdir(%s), bailing out", CRONDIR);
222c212
< perror(SPOOL_DIR);
---
> warn("%s", SPOOL_DIR);
224c214
< fprintf(stderr, "%s: created\n", SPOOL_DIR);
---
> warnx("%s: created", SPOOL_DIR);
227,229c217
< fprintf(stderr, "%s: ", SPOOL_DIR);
< perror("mkdir");
< exit(ERROR_EXIT);
---
> err(ERROR_EXIT, "%s: mkdir", SPOOL_DIR);
232,236c220,221
< if (!(sb.st_mode & S_IFDIR)) {
< fprintf(stderr, "'%s' is not a directory, bailing out.\n",
< SPOOL_DIR);
< exit(ERROR_EXIT);
< }
---
> if (!(sb.st_mode & S_IFDIR))
> err(ERROR_EXIT, "'%s' is not a directory, bailing out", SPOOL_DIR);
272d256
< fprintf(stderr, "%s: %s\n", ProgramName, buf);
274c258
< exit(ERROR_EXIT);
---
> errx(ERROR_EXIT, "%s", buf);
283d266
< fprintf(stderr, "%s: %s\n", ProgramName, buf);
285c268
< exit(ERROR_EXIT);
---
> errx(ERROR_EXIT, "%s", buf);
486,488c469
< fprintf(stderr, "%s: can't open log file\n",
< ProgramName);
< perror(LOG_FILE);
---
> warn("can't open log file %s", LOG_FILE);
507,508c488,489
< perror(LOG_FILE);
< fprintf(stderr, "%s: can't write to log file\n", ProgramName);
---
> warn("%s", LOG_FILE);
> warnx("can't write to log file");