date and time created 88/10/21 11:13:20 by bostic

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

diff --git a/usr/src/usr.bin/tty/tty.c b/usr/src/usr.bin/tty/tty.c
index 0dcc4cb..ad05d1e 100644 (file)
--- a/usr/src/usr.bin/tty/tty.c
+++ b/usr/src/usr.bin/tty/tty.c
@@ -1,19 +1,53 @@
-static char *sccsid = "@(#)tty.c       4.1 (Berkeley) %G%";

 /*
 /*

- * Type tty name
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
  */
 

-char   *ttyname();
+#ifndef lint
+char copyright[] =
+"@(#) Copyright (c) 1988 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)tty.c      4.2 (Berkeley) %G%";
+#endif /* not lint */
+
+#include <stdio.h>

 
 main(argc, argv)
 
 main(argc, argv)

-char **argv;
+       int argc;
+       char **argv;

 {
 {

-       register char *p;
+       int ch, sflag;
+       char *t, *ttyname();
+
+       sflag = 0;
+       while ((ch = getopt(argc, argv, "s")) != EOF)
+               switch((char)ch) {
+               case 's':
+                       sflag = 1;
+                       break;
+               case '?':
+               default:
+                       fputs("usage: tty [-s]\n", stderr);
+                       exit(1);
+               }

 
 

-       p = ttyname(0);
-       if(argc==2 && !strcmp(argv[1], "-s"))
-               ;
-       else
-               printf("%s\n", (p? p: "not a tty"));
-       exit(p? 0: 1);
+       t = ttyname(0);
+       if (!sflag)
+               puts(t ? t : "not a tty");
+       exit(t ? 0 : 1);

 }
 }