prettyness police

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

diff --git a/usr/src/bin/stty/stty.c b/usr/src/bin/stty/stty.c
index 63ca64a..7dcda3c 100644 (file)
--- a/usr/src/bin/stty/stty.c
+++ b/usr/src/bin/stty/stty.c
@@ -1,36 +1,38 @@
 /*-
 /*-

- * Copyright (c) 1989, 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * %sccs.include.redist.c%
  */
 
 #ifndef lint
  *
  * %sccs.include.redist.c%
  */
 
 #ifndef lint

-char copyright[] =
-"@(#) Copyright (c) 1989, 1991 The Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1989, 1991, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";

 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)stty.c     5.31 (Berkeley) %G%";
+static char sccsid[] = "@(#)stty.c     8.2 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>

-#include <fcntl.h>
+
+#include <ctype.h>
+#include <err.h>

 #include <errno.h>
 #include <errno.h>

-#include <unistd.h>
+#include <fcntl.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <ctype.h>

 #include <stdlib.h>
 #include <string.h>
 #include <stdlib.h>
 #include <string.h>

+#include <unistd.h>
+

 #include "stty.h"
 #include "extern.h"
 
 #include "stty.h"
 #include "extern.h"
 

-char *usage = "usage: stty: [-a|-e|-g] [-f file] [options]";
-
+int

 main(argc, argv) 
        int argc;
 main(argc, argv) 
        int argc;

-       char **argv;
+       char *argv[];

 {
        struct info i;
        enum FMT fmt;
 {
        struct info i;
        enum FMT fmt;


@@ -40,7 +42,8 @@ main(argc, argv)
        i.fd = STDIN_FILENO;
 
        opterr = 0;
        i.fd = STDIN_FILENO;
 
        opterr = 0;

-       while (strspn(argv[optind], "-aefg") == strlen(argv[optind]) &&
+       while (optind < argc &&
+           strspn(argv[optind], "-aefg") == strlen(argv[optind]) &&

            (ch = getopt(argc, argv, "aef:g")) != EOF)
                switch(ch) {
                case 'a':               /* undocumented: POSIX compatibility */
            (ch = getopt(argc, argv, "aef:g")) != EOF)
                switch(ch) {
                case 'a':               /* undocumented: POSIX compatibility */


@@ -51,7 +54,7 @@ main(argc, argv)
                        break;
                case 'f':
                        if ((i.fd = open(optarg, O_RDONLY | O_NONBLOCK)) < 0)
                        break;
                case 'f':
                        if ((i.fd = open(optarg, O_RDONLY | O_NONBLOCK)) < 0)

-                               err("%s: %s", optarg, strerror(errno));
+                               err(1, "%s", optarg);

                        break;
                case 'g':
                        fmt = GFLAG;
                        break;
                case 'g':
                        fmt = GFLAG;


@@ -65,9 +68,9 @@ args: argc -= optind;
        argv += optind;
 
        if (ioctl(i.fd, TIOCGETD, &i.ldisc) < 0)
        argv += optind;
 
        if (ioctl(i.fd, TIOCGETD, &i.ldisc) < 0)

-               err("TIOCGETD: %s", strerror(errno));
+               err(1, "TIOCGETD");

        if (tcgetattr(i.fd, &i.t) < 0)
        if (tcgetattr(i.fd, &i.t) < 0)

-               err("tcgetattr: %s", strerror(errno));
+               err(1, "tcgetattr");

        if (ioctl(i.fd, TIOCGWINSZ, &i.win) < 0)
                warn("TIOCGWINSZ: %s\n", strerror(errno));
 
        if (ioctl(i.fd, TIOCGWINSZ, &i.win) < 0)
                warn("TIOCGWINSZ: %s\n", strerror(errno));
 


@@ -112,12 +115,21 @@ args:     argc -= optind;
                        continue;
                }
 
                        continue;
                }
 

-               err("illegal option -- %s\n%s", *argv, usage);
+               warnx("illegal option -- %s", *argv);
+               usage();

        }
 
        if (i.set && tcsetattr(i.fd, 0, &i.t) < 0)
        }
 
        if (i.set && tcsetattr(i.fd, 0, &i.t) < 0)

-               err("tcsetattr: %s", strerror(errno));
+               err(1, "tcsetattr");

        if (i.wset && ioctl(i.fd, TIOCSWINSZ, &i.win) < 0)
        if (i.wset && ioctl(i.fd, TIOCSWINSZ, &i.win) < 0)

-               warn("TIOCSWINSZ: %s", strerror(errno));
+               warn("TIOCSWINSZ");

        exit(0);
 }
        exit(0);
 }

+
+void
+usage()
+{
+
+       (void)fprintf(stderr, "usage: stty: [-a|-e|-g] [-f file] [options]\n");
+       exit (1);
+}