[src/netbsd-1-4]: src/usr.bin/ftp pullup 1.40->1.42 (lukem)

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d42965e32f19
branches:  netbsd-1-4
changeset: 468906:d42965e32f19
user:      perry <perry%NetBSD.org@localhost>
date:      Tue Jun 22 21:03:02 1999 +0000

description:
pullup 1.40->1.42 (lukem)

diffstat:

 usr.bin/ftp/main.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 61fe62c2919c -r d42965e32f19 usr.bin/ftp/main.c
--- a/usr.bin/ftp/main.c        Tue Jun 22 21:02:42 1999 +0000
+++ b/usr.bin/ftp/main.c        Tue Jun 22 21:03:02 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.40 1999/03/31 02:00:42 lukem Exp $  */
+/*     $NetBSD: main.c,v 1.40.2.1 1999/06/22 21:03:02 perry Exp $      */
 
 /*
  * Copyright (c) 1985, 1989, 1993, 1994
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.6 (Berkeley) 10/9/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.40 1999/03/31 02:00:42 lukem Exp $");
+__RCSID("$NetBSD: main.c,v 1.40.2.1 1999/06/22 21:03:02 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -164,7 +164,7 @@
        if (gatemode) {
                if (*gateserver == '\0') {
                        warnx(
-"Neither $FTPSERVER nor $GATE_SERVER is defined; disabling gate-ftp");
+"Neither $FTPSERVER nor GATE_SERVER is defined; disabling gate-ftp");
                        gatemode = 0;
                }
        }
@@ -177,10 +177,11 @@
        fromatty = isatty(fileno(stdin));
        ttyout = stdout;
        if (isatty(fileno(ttyout))) {
-               verbose = 1;            /* verbose if from a tty */
+               verbose = 1;            /* verbose if to a tty */
 #ifndef SMALL
                if (! dumbterm) {
-                       editing = 1;    /* editing mode on if tty is usable */
+                       if (fromatty)   /* editing mode on if tty is usable */
+                               editing = 1;
                        if (foregroundproc())
                                progress = 1;   /* progress bar on if fg */
                }