cleanups, add manual page

[unix-history] / usr / src / usr.bin / telnet / utilities.c

diff --git a/usr/src/usr.bin/telnet/utilities.c b/usr/src/usr.bin/telnet/utilities.c
index 5dbfd73..e186582 100644 (file)
--- a/usr/src/usr.bin/telnet/utilities.c
+++ b/usr/src/usr.bin/telnet/utilities.c
@@ -1,9 +1,32 @@
+/*
+ * 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)utilities.c        1.7 (Berkeley) %G%";
+#endif /* not lint */
+

 #define        TELOPTS
 #include <arpa/telnet.h>
 #include <sys/types.h>
 
 #include <ctype.h>
 
 #define        TELOPTS
 #include <arpa/telnet.h>
 #include <sys/types.h>
 
 #include <ctype.h>
 

+#include "general.h"
+

 #include "ring.h"
 
 #include "externs.h"
 #include "ring.h"
 
 #include "externs.h"


@@ -140,7 +163,7 @@ int length;                 /* length of suboption data */
            switch (pointer[1]) {
            case TELQUAL_IS:
                {
            switch (pointer[1]) {
            case TELQUAL_IS:
                {

-                   char tmpbuf[sizeof subbuffer];
+                   char tmpbuf[SUBBUFSIZE];

                    int minlen = min(length, sizeof tmpbuf);
 
                    memcpy(tmpbuf, pointer+2, minlen);
                    int minlen = min(length, sizeof tmpbuf);
 
                    memcpy(tmpbuf, pointer+2, minlen);


@@ -153,7 +176,8 @@ int length;                 /* length of suboption data */
                break;
            default:
                fprintf(NetTrace,
                break;
            default:
                fprintf(NetTrace,

-                               "- unknown qualifier %d (0x%x).\n", pointer[1]);
+                               "- unknown qualifier %d (0x%x).\n",
+                               pointer[1], pointer[1]);

            }
            break;
        default:
            }
            break;
        default: