[src/netbsd-1-4]: src/usr.bin/ftp pull up rev 1.50 from trunk. (cgd)

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

details:   https://anonhg.NetBSD.org/src/rev/6e8cc05d87ed
branches:  netbsd-1-4
changeset: 469056:6e8cc05d87ed
user:      cgd <cgd%NetBSD.org@localhost>
date:      Fri Jun 25 01:15:42 1999 +0000

description:
pull up rev 1.50 from trunk. (cgd)

diffstat:

 usr.bin/ftp/util.c |  22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diffs (99 lines):

diff -r 20d6c30ec1dd -r 6e8cc05d87ed usr.bin/ftp/util.c
--- a/usr.bin/ftp/util.c        Fri Jun 25 01:15:32 1999 +0000
+++ b/usr.bin/ftp/util.c        Fri Jun 25 01:15:42 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.46.2.1 1999/06/22 21:03:25 perry Exp $      */
+/*     $NetBSD: util.c,v 1.46.2.2 1999/06/25 01:15:42 cgd Exp $        */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: util.c,v 1.46.2.1 1999/06/22 21:03:25 perry Exp $");
+__RCSID("$NetBSD: util.c,v 1.46.2.2 1999/06/25 01:15:42 cgd Exp $");
 #endif /* not lint */
 
 /*
@@ -759,7 +759,7 @@
 }
 #endif /* not HAVE_TIMEGM */
 
-#ifndef        SMALL
+#ifndef        NO_PROGRESS
 
 /*
  * return non-zero if we're the current foreground process
@@ -787,7 +787,7 @@
 
        progressmeter(0);
 }
-#endif /* SMALL */
+#endif /* NO_PROGRESS */
 
 
 /*
@@ -806,14 +806,16 @@
  *   with flag = 0
  * - After the transfer, call with flag = 1
  */
+#ifndef        NO_PROGRESS
 static struct timeval start;
 static struct timeval lastupdate;
+#endif
 
 void
 progressmeter(flag)
        int flag;
 {
-#ifndef        SMALL
+#ifndef        NO_PROGRESS
        static off_t lastsize;
        struct timeval now, td, wait;
        off_t cursize, abbrevsize, bytespersec;
@@ -932,7 +934,7 @@
                (void)putc('\n', ttyout);
        }
        fflush(ttyout);
-#endif /* SMALL */
+#endif /* NO_PROGRESS */
 }
 
 /*
@@ -947,7 +949,7 @@
 ptransfer(siginfo)
        int siginfo;
 {
-#ifndef        SMALL
+#ifndef        NO_PROGRESS
        struct timeval now, td, wait;
        double elapsed;
        off_t bytespersec;
@@ -1020,7 +1022,7 @@
        }
        len += snprintf(buf + len, sizeof(buf) - len, "\n");
        (void)write(siginfo ? STDERR_FILENO : fileno(ttyout), buf, len);
-#endif /* SMALL */
+#endif /* NO_PROGRESS */
 }
 
 /*
@@ -1099,7 +1101,7 @@
 /*
  * Setup or cleanup EditLine structures
  */
-#ifndef SMALL
+#ifndef NO_EDITCOMPLETE
 void
 controlediting()
 {
@@ -1140,7 +1142,7 @@
                }
        }
 }
-#endif /* !SMALL */
+#endif /* !NO_EDITCOMPLETE */
 
 /*
  * Parse the specified socket buffer size.