Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

print the "xxx bare linefeeds" message after the progressmeter. noted by dan@

This commit is contained in:
lukem 1999-05-04 14:12:37 +00:00
parent 62a2dac0d8
commit 25bacdd4ea
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr.bin/ftp/ftp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ftp.c,v 1.42 1999/04/28 13:35:40 lukem Exp $ */
/* $NetBSD: ftp.c,v 1.43 1999/05/04 14:12:37 lukem Exp $ */
/*
* Copyright (c) 1985, 1989, 1993, 1994
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94";
#else
__RCSID("$NetBSD: ftp.c,v 1.42 1999/04/28 13:35:40 lukem Exp $");
__RCSID("$NetBSD: ftp.c,v 1.43 1999/05/04 14:12:37 lukem Exp $");
#endif
#endif /* not lint */
@ -992,13 +992,6 @@ done:
contin2: ;
}
break2:
if (bare_lfs) {
fprintf(ttyout,
"WARNING! %d bare linefeeds received in ASCII mode.\n",
bare_lfs);
fputs("File may not have transferred correctly.\n",
ttyout);
}
if (hash && (!progress || filesize < 0)) {
if (bytes < hashbytes)
(void)putc('#', ttyout);
@ -1022,6 +1015,12 @@ break2:
(void)signal(SIGPIPE, oldintp);
(void)fclose(din);
(void)getreply(0);
if (bare_lfs) {
fprintf(ttyout,
"WARNING! %d bare linefeeds received in ASCII mode.\n",
bare_lfs);
fputs("File may not have transferred correctly.\n", ttyout);
}
if (bytes >= 0 && is_retr) {
if (bytes > 0)
ptransfer(0);