[PATCH] Correct usage information

diff --git a/ktee-net.c b/ktee-net.c
index 18ee443b08f9da20a85d94cfa395521772c86683..766531eaa68f020505d6e684af46b3f8e81ecec0 100644 (file)
--- a/ktee-net.c
+++ b/ktee-net.c
@@ -33,7 +33,7 @@ static int do_splice(int infd, int outfd, unsigned int len, char *msg)
 
 static int usage(char *name)
 {
-       fprintf(stderr, "%s: hostname:port\n", name);
+       fprintf(stderr, "... | %s: hostname:port\n", name);
        return 1;
 }
 
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
                return error("stat");
        if (!S_ISFIFO(sb.st_mode)) {
                fprintf(stderr, "stdin must be a pipe\n");
-               return 1;
+               return usage(argv[0]);
        }
 
        hname = strdup(argv[1]);

diff --git a/ktee.c b/ktee.c
index 1b934d58cfcc68f8b7f169d609f0cf519fca97e9..dda5c086ca21bfff61f5bde6ae6484fde16f7351 100644 (file)
--- a/ktee.c
+++ b/ktee.c
@@ -30,21 +30,25 @@ static int do_splice(int infd, int outfd, unsigned int len, char *msg)
        return 0;
 }
 
+static int usage(char *name)
+{
+       fprintf(stderr, "... | %s: outfile\n", name);
+       return 1;
+}
+
 int main(int argc, char *argv[])
 {
        struct stat sb;
        int fd;
 
-       if (argc < 2) {
-               fprintf(stderr, "%s: outfile\n", argv[0]);
-               return 1;
-       }
+       if (argc < 2)
+               return usage(argv[0]);
 
        if (fstat(STDIN_FILENO, &sb) < 0)
                return error("stat");
        if (!S_ISFIFO(sb.st_mode)) {
                fprintf(stderr, "stdout must be a pipe\n");
-               return 1;
+               return usage(argv[0]);
        }
 
        fd = open(argv[1], O_WRONLY | O_CREAT | O_TRUNC, 0644);

diff --git a/splice-in.c b/splice-in.c
index 8ac851bcde73f45a6ba9f610f47e1b47d7b64465..82c47c44587e953105a9771eae6a7fd7b74340f7 100644 (file)
--- a/splice-in.c
+++ b/splice-in.c
@@ -10,14 +10,25 @@
 
 #include "splice.h"
 
+static int usage(char *name)
+{
+       fprintf(stderr, "%s: infile | ...\n", name);
+       return 1;
+}
+
 int main(int argc, char *argv[])
 {
        struct stat sb;
        int fd;
 
-       if (argc < 2) {
-               printf("%s: infile\n", argv[0]);
-               return 1;
+       if (argc < 2)
+               return usage(argv[0]);
+
+       if (fstat(STDOUT_FILENO, &sb) < 0)
+               return error("stat");
+       if (!S_ISFIFO(sb.st_mode)) {
+               fprintf(stderr, "stdout must be a pipe\n");
+               return usage(argv[0]);
        }
 
        fd = open(argv[1], O_RDONLY);

diff --git a/splice-net.c b/splice-net.c
index 3166150ee3cf159be203f815f10021a4d98097e0..c7df53487e8fa2372fea36cc093a82cb33bf18f2 100644 (file)
--- a/splice-net.c
+++ b/splice-net.c
@@ -17,6 +17,12 @@
 
 #include "splice.h"
 
+static int usage(char *name)
+{
+       fprintf(stderr, "%s: target port\n", name);
+       return 1;
+}
+
 int main(int argc, char *argv[])
 {
        struct sockaddr_in addr;
@@ -24,16 +30,14 @@ int main(int argc, char *argv[])
        int fd, ret;
        struct stat sb;
 
-       if (argc < 3) {
-               printf("%s: target port\n", argv[0]);
-               return 1;
-       }
+       if (argc < 3)
+               return usage(argv[0]);
 
        if (fstat(STDIN_FILENO, &sb) < 0)
                return error("stat");
        if (!S_ISFIFO(sb.st_mode)) {
                fprintf(stderr, "stdin must be a pipe\n");
-               return 1;
+               return usage(argv[0]);
        }
 
        port = atoi(argv[2]);

diff --git a/splice-out.c b/splice-out.c
index 5b369e13f5888f4dc5369edd0d2bfc5b061e1072..b388b86b3b56cb4781c5b5e42caaf42dba9f15aa 100644 (file)
--- a/splice-out.c
+++ b/splice-out.c
@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/stat.h>
 
 #include "splice.h"
 
@@ -12,7 +13,7 @@ static int splice_flags;
 
 static int usage(char *name)
 {
-       fprintf(stderr, "%s: [-m] out_file\n", name);
+       fprintf(stderr, "... | %s: [-m] out_file\n", name);
        return 1;
 }
 
@@ -36,8 +37,16 @@ static int parse_options(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
+       struct stat sb;
        int fd, index;
 
+       if (fstat(STDIN_FILENO, &sb) < 0)
+               return error("stat");
+       if (!S_ISFIFO(sb.st_mode)) {
+               fprintf(stderr, "stdin must be a pipe\n");
+               return usage(argv[0]);
+       }
+
        index = parse_options(argc, argv);
        if (index == -1 || index + 1 > argc)
                return usage(argv[0]);

diff --git a/vmsplice.c b/vmsplice.c
index 037240a07a4355d5e6d277e47f82d7aa97ba63de..72befbe3869430569612bf4a336e49f4374e9f05 100644 (file)
--- a/vmsplice.c
+++ b/vmsplice.c
@@ -66,7 +66,7 @@ int do_vmsplice(int fd, void *b1, void *b2, int len)
 
 static int usage(char *name)
 {
-       fprintf(stderr, "%s: [-c(lear)] [-u(nalign)\n", name);
+       fprintf(stderr, "%s: [-c(lear)] [-u(nalign)] | ...\n", name);
        return 1;
 }
 
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
                return error("stat");
        if (!S_ISFIFO(sb.st_mode)) {
                fprintf(stderr, "stdout must be a pipe\n");
-               return 1;
+               return usage(argv[0]);
        }
 
        b1 = ALIGN(malloc(SPLICE_SIZE + align_mask));