35c35
< static char copyright[] =
---
> static const char copyright[] =
40a41
> #if 0
41a43,45
> #endif
> static const char rcsid[] =
> "$Id$";
45d48
<
46a50
> #include <err.h>
50d53
< #include <string.h>
51a55,56
> #include <string.h>
> #include <unistd.h>
52a58,61
> int match __P((char *, char *));
> static void usage __P((void));
>
> int
69c78
< while ((ch = getopt(argc, argv, "f:s:?")) != -1)
---
> while ((ch = getopt(argc, argv, "f:s:")) != -1)
82,83c91
< fprintf(stderr, "usage: from [-f file] [-s sender] [user]\n");
< exit(1);
---
> usage();
93,97c101,102
< if (!(pwd = getpwuid(getuid()))) {
< (void)fprintf(stderr,
< "from: no password file entry for you.\n");
< exit(1);
< }
---
> if (!(pwd = getpwuid(getuid())))
> errx(1, "no password file entry for you");
110,111c115
< fprintf(stderr, "from: can't read %s.\n", file);
< exit(1);
---
> errx(1, "can't read %s", file);
125a130,137
> static void
> usage()
> {
> fprintf(stderr, "usage: from [-f file] [-s sender] [user]\n");
> exit(1);
> }
>
> int