BSD 4_4_Lite1 release

[unix-history] / usr / src / usr.bin / tn3270 / api / api_bsd.c

diff --git a/usr/src/usr.bin/tn3270/api/api_bsd.c b/usr/src/usr.bin/tn3270/api/api_bsd.c
index 113c840..46db372 100644 (file)
--- a/usr/src/usr.bin/tn3270/api/api_bsd.c
+++ b/usr/src/usr.bin/tn3270/api/api_bsd.c
@@ -1,27 +1,39 @@
-/*
- *     Copyright (c) 1984-1987 by the Regents of the
- *     University of California and by Gregory Glenn Minshall.
+/*-
+ * Copyright (c) 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- *     Permission to use, copy, modify, and distribute these
- *     programs and their documentation for any purpose and
- *     without fee is hereby granted, provided that this
- *     copyright and permission appear on all copies and
- *     supporting documentation, the name of the Regents of
- *     the University of California not be used in advertising
- *     or publicity pertaining to distribution of the programs
- *     without specific prior permission, and notice be given in
- *     supporting documentation that copying and distribution is
- *     by permission of the Regents of the University of California
- *     and by Gregory Glenn Minshall.  Neither the Regents of the
- *     University of California nor Gregory Glenn Minshall make
- *     representations about the suitability of this software
- *     for any purpose.  It is provided "as is" without
- *     express or implied warranty.
+ * 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

-static char sccsid[] = "@(#)api_bsd.c  1.9 (Berkeley) %G%";
-#endif /* not lint */
+static char sccsid[] = "@(#)api_bsd.c  8.2 (Berkeley) 1/7/94";
+#endif /* not lint */

 
 #if    defined(unix)
 
 
 #if    defined(unix)
 


@@ -55,13 +67,13 @@ char        *string;                /* if non-zero, where to connect to */
     struct sockaddr_in server;
     struct hostent *hp;
     struct storage_descriptor sd;
     struct sockaddr_in server;
     struct hostent *hp;
     struct storage_descriptor sd;

-    char *getenv();
+    extern char *getenv();

     char thehostname[100];
     char keyname[100];
     char inkey[100];
     FILE *keyfile;
     int sock;
     char thehostname[100];
     char keyname[100];
     char inkey[100];
     FILE *keyfile;
     int sock;

-    int port;
+    unsigned int port;

     int i;
 
     if (string == 0) {
     int i;
 
     if (string == 0) {


@@ -73,7 +85,8 @@ char  *string;                /* if non-zero, where to connect to */
        }
     }
 
        }
     }
 

-    if (sscanf(string, "%[^:]:%d:%s", thehostname, &port, keyname) != 3) {
+    if (sscanf(string, "%[^:]:%d:%s", thehostname,
+                               (int *)&port, keyname) != 3) {

        fprintf(stderr, "API3270 environmental variable has bad format.\n");
        return -1;
     }
        fprintf(stderr, "API3270 environmental variable has bad format.\n");
        return -1;
     }


@@ -89,10 +102,10 @@ char       *string;                /* if non-zero, where to connect to */
        fprintf(stderr, "%s specifies bad host name.\n", string);
        return -1;
     }
        fprintf(stderr, "%s specifies bad host name.\n", string);
        return -1;
     }

-    bcopy(hp->h_addr, &server.sin_addr, hp->h_length);
+    bcopy(hp->h_addr, (char *)&server.sin_addr, hp->h_length);

     server.sin_port = htons(port);
 
     server.sin_port = htons(port);
 

-    if (connect(sock, &server, sizeof server) < 0) {
+    if (connect(sock, (struct sockaddr *)&server, sizeof server) < 0) {

        perror("connecting to API server");
        return -1;
     }
        perror("connecting to API server");
        return -1;
     }


@@ -234,7 +247,7 @@ int length;
                return -1;
            }
            if (api_exch_outtype(EXCH_TYPE_BYTES, sd.length,
                return -1;
            }
            if (api_exch_outtype(EXCH_TYPE_BYTES, sd.length,

-                           sd.location) == -1) {
+                           (char *)sd.location) == -1) {

                return -1;
            }
            break;
                return -1;
            }
            break;


@@ -245,7 +258,7 @@ int length;
            }
            /* XXX Validty check HEREIS? */
            if (api_exch_intype(EXCH_TYPE_BYTES, sd.length,
            }
            /* XXX Validty check HEREIS? */
            if (api_exch_intype(EXCH_TYPE_BYTES, sd.length,

-                           sd.location) == -1) {
+                           (char *)sd.location) == -1) {

                return -1;
            }
            break;
                return -1;
            }
            break;