/etc/securetty is checked, even when root logins across the net.

[unix-history] / usr / src / usr.bin / wc / wc.c

diff --git a/usr/src/usr.bin/wc/wc.c b/usr/src/usr.bin/wc/wc.c
index b947edb..227aa95 100644 (file)
--- a/usr/src/usr.bin/wc/wc.c
+++ b/usr/src/usr.bin/wc/wc.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)wc.c        4.2 (Berkeley) %G%";
+static char *sccsid = "@(#)wc.c        4.5 (Berkeley) %G%";

 /* wc line and word count */
 
 #include <stdio.h>
 /* wc line and word count */
 
 #include <stdio.h>


@@ -25,8 +25,6 @@ char **argv;
                        wd = argv[1]+1;
                        break;
                case 's':
                        wd = argv[1]+1;
                        break;
                case 's':

-                       if (argc == 2)
-                               goto usage;

                        lpp = atoi(argv[1]+2);
                        if (lpp <= 0)
                                goto usage;
                        lpp = atoi(argv[1]+2);
                        if (lpp <= 0)
                                goto usage;


@@ -39,8 +37,6 @@ char **argv;
                        uucp++;
                        break;
                case 'b':
                        uucp++;
                        break;
                case 'b':

-                       if (argc == 2)
-                               goto usage;

                        baud = atoi(argv[1]+2);
                        if (baud == 110)
                                cps = 10;
                        baud = atoi(argv[1]+2);
                        if (baud == 110)
                                cps = 10;


@@ -51,7 +47,7 @@ char **argv;
                        break;
                default:
                usage:
                        break;
                default:
                usage:

-                       fprintf(stderr, "Usage: wc [-lwcpt] [-v] [-u] [-s pagesize] [-b baudrate]\n");
+                       fprintf(stderr, "Usage: wc [-lwcpt] [-v] [-u] [-spagesize] [-bbaudrate]\n");

                        exit(1);
                }
                argc--;
                        exit(1);
                }
                argc--;


@@ -87,7 +83,7 @@ char **argv;
        fp = stdin;
        do {
                if(argc>1 && (fp=fopen(argv[i], "r")) == NULL) {
        fp = stdin;
        do {
                if(argc>1 && (fp=fopen(argv[i], "r")) == NULL) {

-                       fprintf(stderr, "wc: can't open %s\n", argv[i]);
+                       perror(argv[i]);

                        continue;
                }
                linect = 0;
                        continue;
                }
                linect = 0;


@@ -168,7 +164,7 @@ long num;
        if (verbose)
                printf("%ld\t", num);
        else
        if (verbose)
                printf("%ld\t", num);
        else

-               printf("%7ld", num);
+               printf(" %7ld", num);

 }
 
 prttime(secs)
 }
 
 prttime(secs)


@@ -195,5 +191,8 @@ long secs;
        } else {
                units = "se";
        }
        } else {
                units = "se";
        }

-       printf("%4.1f %2s\t", t, units);
+       if (verbose)
+               printf("%4.1f %2s\t", t, units);
+       else
+               printf(" %4.1f %2s", t, units);

 }
 }