trailing comment after #else or #endif

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

diff --git a/usr/src/usr.bin/tset/tset.c b/usr/src/usr.bin/tset/tset.c
index 67b6999..716d86b 100644 (file)
--- a/usr/src/usr.bin/tset/tset.c
+++ b/usr/src/usr.bin/tset/tset.c
@@ -12,10 +12,11 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)tset.c     5.20 (Berkeley) %G%";
+static char sccsid[] = "@(#)tset.c     5.22 (Berkeley) %G%";

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

+#include <sys/ioctl.h>

 #include <termios.h>
 #include <errno.h>
 #include <unistd.h>
 #include <termios.h>
 #include <errno.h>
 #include <unistd.h>


@@ -153,15 +154,10 @@ main(argc, argv)
                        tcsetattr(STDERR_FILENO, TCSADRAIN, &mode);
        }
 
                        tcsetattr(STDERR_FILENO, TCSADRAIN, &mode);
        }
 

-       /*
-        * The termcap file generally has a two-character name first in each
-        * entry followed by more descriptive names.  If we ended up with the
-        * first one, we switch to the second one for setting or reporting
-        * information.
-        */
-       p = strpbrk(tcapbuf, "|:");
-       if (p && *p != ':' && !strncmp(ttype, tcapbuf, p - tcapbuf)) {
-               t = ++p;
+       /* Get the terminal name from the entry. */
+       p = tcapbuf;
+       if (p != NULL && *p != ':') {
+               t = p;

                if (p = strpbrk(p, "|:")) {
                        savech = *p;
                        *p = '\0';
                if (p = strpbrk(p, "|:")) {
                        savech = *p;
                        *p = '\0';