BSD 4_3_Net_2 release

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

diff --git a/usr/src/usr.bin/ftp/main.c b/usr/src/usr.bin/ftp/main.c
index dc65561..d3744fd 100644 (file)
--- a/usr/src/usr.bin/ftp/main.c
+++ b/usr/src/usr.bin/ftp/main.c
@@ -2,19 +2,33 @@
  * Copyright (c) 1985, 1989 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1985, 1989 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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


@@ -24,7 +38,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.16 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)main.c     5.18 (Berkeley) 3/1/91";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -45,8 +59,7 @@ static char sccsid[] = "@(#)main.c    5.16 (Berkeley) 6/1/90";
 #include <pwd.h>
 
 uid_t  getuid();
 #include <pwd.h>
 
 uid_t  getuid();

-sig_t  intr();
-sig_t  lostpeer();
+void   intr(), lostpeer();

 extern char *home;
 char   *getlogin();
 
 extern char *home;
 char   *getlogin();
 


@@ -141,14 +154,14 @@ main(argc, argv)
        }
 }
 
        }
 }
 

-sig_t
+void

 intr()
 {
 
        longjmp(toplevel, 1);
 }
 
 intr()
 {
 
        longjmp(toplevel, 1);
 }
 

-sig_t
+void

 lostpeer()
 {
        extern FILE *cout;
 lostpeer()
 {
        extern FILE *cout;


@@ -204,6 +217,7 @@ cmdscanner(top)
        int top;
 {
        register struct cmd *c;
        int top;
 {
        register struct cmd *c;

+       register int l;

        struct cmd *getcmd();
        extern int help();
 
        struct cmd *getcmd();
        extern int help();
 


@@ -214,13 +228,21 @@ cmdscanner(top)
                        printf("ftp> ");
                        (void) fflush(stdout);
                }
                        printf("ftp> ");
                        (void) fflush(stdout);
                }

-               if (gets(line) == 0) {
-                       if (feof(stdin) || ferror(stdin))
-                               quit();
+               if (fgets(line, sizeof line, stdin) == NULL)
+                       quit();
+               l = strlen(line);
+               if (l == 0)

                        break;
                        break;

-               }
-               if (line[0] == 0)
+               if (line[--l] == '\n') {
+                       if (l == 0)
+                               break;
+                       line[l] = '\0';
+               } else if (l == sizeof(line) - 2) {
+                       printf("sorry, input line too long\n");
+                       while ((l = getchar()) != '\n' && l != EOF)
+                               /* void */;

                        break;
                        break;

+               } /* else it was a line without a newline */

                makeargv();
                if (margc == 0) {
                        continue;
                makeargv();
                if (margc == 0) {
                        continue;


@@ -235,7 +257,7 @@ cmdscanner(top)
                        continue;
                }
                if (c->c_conn && !connected) {
                        continue;
                }
                if (c->c_conn && !connected) {

-                       printf ("Not connected.\n");
+                       printf("Not connected.\n");

                        continue;
                }
                (*c->c_handler)(margc, margv);
                        continue;
                }
                (*c->c_handler)(margc, margv);