Include program name in error messages.

1 files changed, 11 insertions, 7 deletions

diff --git a/lib-src/yow.c b/lib-src/yow.c
index 05ec9d43415..606074834cd 100644
--- a/lib-src/yow.c
+++ b/lib-src/yow.c
@@ -30,6 +30,11 @@
     &res;})
 #endif
 
+char *malloc(), *realloc();
+
+void yow();
+void setup_yow();
+
 int
 main (argc, argv)
      int argc;
@@ -37,7 +42,6 @@ main (argc, argv)
 {
   FILE *fp;
   char file[BUFSIZ];
-  void yow(), setup_yow();
 
   if (argc > 2 && !strcmp (argv[1], "-f"))
     strcpy (file, argv[2]);
@@ -49,6 +53,7 @@ main (argc, argv)
 #endif
 
   if ((fp = fopen(file, "r")) == NULL) {
+    fprintf(stderr, "yow: ");
     perror(file);
     exit(1);
   }
@@ -80,7 +85,7 @@ setup_yow(fp)
    * we explicitly skip that. */
   while ((c = getc(fp)) != SEP) {
     if (c == EOF) {
-      fprintf(stderr, "File contains no separators.\n");
+      fprintf(stderr, "yow: file contains no separators\n");
       exit(2);
     }
   }
@@ -89,7 +94,7 @@ setup_yow(fp)
     header_len -= AVG_LEN;      /* allow the first quotation to appear */
         
   if (fseek(fp, 0L, 2) == -1) {
-    perror("fseek 1");
+    perror("yow");
     exit(1);
   }
   len = ftell(fp) - header_len;
@@ -105,11 +110,10 @@ yow (fp)
   int c, i = 0;
   char *buf;
   unsigned int bufsize;
-  char *malloc(), *realloc();
 
   offset = rand() % len + header_len;
   if (fseek(fp, offset, 0) == -1) {
-    perror("fseek 2");
+    perror("yow");
     exit(1);
   }
 
@@ -134,7 +138,7 @@ yow (fp)
   bufsize = BUFSIZE;
   buf = malloc(bufsize);
   if (buf == (char *)0) {
-    fprintf(stderr, "can't allocate any memory\n");
+    fprintf(stderr, "yow: virtual memory exhausted\n");
     exit (3);
   }
 
@@ -147,7 +151,7 @@ yow (fp)
       bufsize *= 2;
       buf = realloc(buf, bufsize);
       if (buf == (char *)0) {
-        fprintf(stderr, "can't allocate more memory\n");
+        fprintf(stderr, "yow: virtual memory exhausted\n");
         exit (3);
       }
     }