--- src/bin/cat/cat.c 2004/07/27 16:12:38 1.9 +++ src/bin/cat/cat.c 2004/07/27 16:21:52 1.10 @@ -69,6 +69,14 @@ static void raw_cat (int); static int udom_open (const char *path, int flags); #endif +static void +usage(void) +{ + fprintf(stderr, + "usage: cat [-benstuv] [-] [file ...]\n"); + exit(EXIT_FAILURE); +} + int main(int argc, char **argv) { @@ -100,9 +108,7 @@ main(int argc, char **argv) vflag = 1; break; default: - fprintf(stderr, - "usage: cat [-benstuv] [-] [file ...]\n"); - exit(1); + usage(); /* NOTREACHED */ } argv += optind; @@ -288,11 +294,11 @@ udom_open(const char *path, int flags) switch (flags & O_ACCMODE) { case O_RDONLY: if (shutdown(fd, SHUT_WR) == -1) - perror("cat"); + warn(NULL); break; case O_WRONLY: if (shutdown(fd, SHUT_RD) == -1) - perror("cat"); + warn(NULL); break; default: break;