install with -s

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

diff --git a/usr/src/usr.bin/ftp/ftp.c b/usr/src/usr.bin/ftp/ftp.c
index 09bd0ef..f5b68ee 100644 (file)
--- a/usr/src/usr.bin/ftp/ftp.c
+++ b/usr/src/usr.bin/ftp/ftp.c
@@ -1,6 +1,12 @@
+/*
+ * Copyright (c) 1980 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ */
+

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)ftp.c      4.15 (Berkeley) %G%";
-#endif
+static char sccsid[] = "@(#)ftp.c      5.1 (Berkeley) %G%";
+#endif not lint

 
 #include <sys/param.h>
 #include <sys/stat.h>
 
 #include <sys/param.h>
 #include <sys/stat.h>


@@ -59,7 +65,7 @@ hookup(host, port)
        }
        hostname = hp->h_name;
        hisctladdr.sin_family = hp->h_addrtype;
        }
        hostname = hp->h_name;
        hisctladdr.sin_family = hp->h_addrtype;

-       s = socket(hp->h_addrtype, SOCK_STREAM, 0, 0);
+       s = socket(hp->h_addrtype, SOCK_STREAM, 0);

        if (s < 0) {
                perror("ftp: socket");
                return (0);
        if (s < 0) {
                perror("ftp: socket");
                return (0);


@@ -488,7 +494,7 @@ noport:
                data_addr.sin_port = 0; /* let system pick one */ 
        if (data != -1)
                (void) close (data);
                data_addr.sin_port = 0; /* let system pick one */ 
        if (data != -1)
                (void) close (data);

-       data = socket(AF_INET, SOCK_STREAM, 0, 0);
+       data = socket(AF_INET, SOCK_STREAM, 0);

        if (data < 0) {
                perror("ftp: socket");
                return (1);
        if (data < 0) {
                perror("ftp: socket");
                return (1);