Chris Torek's fixes to make ftp stop using gets()

[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 41474ce..1533d52 100644 (file)
--- a/usr/src/usr.bin/ftp/main.c
+++ b/usr/src/usr.bin/ftp/main.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.16 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.17 (Berkeley) %G%";

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


@@ -192,6 +192,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();
 


@@ -202,13 +203,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;


@@ -223,7 +232,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);