BSD 4_4_Lite1 release

[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 1589f49..4a840c2 100644 (file)
--- a/usr/src/bin/stty/stty.c
+++ b/usr/src/bin/stty/stty.c
@@ -1,36 +1,64 @@
 /*-
 /*-

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

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #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, 1994\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.28 (Berkeley) %G%";
+static char sccsid[] = "@(#)stty.c     8.3 (Berkeley) 4/2/94";

 #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: [-eg] [-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 +68,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 +80,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 +94,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));
 


@@ -103,6 +132,7 @@ args:       argc -= optind;
                        speed = atoi(*argv);
                        cfsetospeed(&i.t, speed);
                        cfsetispeed(&i.t, speed);
                        speed = atoi(*argv);
                        cfsetospeed(&i.t, speed);
                        cfsetispeed(&i.t, speed);

+                       i.set = 1;

                        continue;
                }
 
                        continue;
                }
 


@@ -111,12 +141,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);
+}