diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2016-08-26 06:32:11 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2016-08-26 06:32:11 +0000 |
| commit | d25d9ad03fbd3bb94cb2e9e17e7f89baf8c3d991 (patch) | |
| tree | 47c2b78a9206a17b4ae3d414bf824ffa1f57dc34 | |
| parent | 2c09fb8ca9ece75dd2ed6e191e61b99e0df0f63e (diff) | |
trim down some NBBY references. 8 bits ought to be enough for anyone.
| -rw-r--r-- | libexec/ftpd/ftpcmd.y | 6 | ||||
| -rw-r--r-- | libexec/ftpd/ftpd.c | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y index 80b86c667f3..b8bce1930b4 100644 --- a/libexec/ftpd/ftpcmd.y +++ b/libexec/ftpd/ftpcmd.y @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpcmd.y,v 1.63 2016/08/14 22:56:29 guenther Exp $ */ +/* $OpenBSD: ftpcmd.y,v 1.64 2016/08/26 06:32:10 tedu Exp $ */ /* $NetBSD: ftpcmd.y,v 1.7 1996/04/08 19:03:11 jtc Exp $ */ /* @@ -574,7 +574,7 @@ cmd | SYST check_login CRLF { if ($2) - reply(215, "UNIX Type: L%d", NBBY); + reply(215, "UNIX Type: L8"); } /* @@ -833,7 +833,7 @@ type_code | L { cmd_type = TYPE_L; - cmd_bytesz = NBBY; + cmd_bytesz = 8; } | L SP byte_size { diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index b53cda1f7ae..723933c7bb8 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpd.c,v 1.218 2016/08/14 22:56:29 guenther Exp $ */ +/* $OpenBSD: ftpd.c,v 1.219 2016/08/26 06:32:10 tedu Exp $ */ /* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */ /* @@ -1827,11 +1827,7 @@ statcmd(void) if (type == TYPE_A || type == TYPE_E) printf(", FORM: %s", formnames[form]); if (type == TYPE_L) -#if NBBY == 8 - printf(" %d", NBBY); -#else - printf(" %d", bytesize); /* need definition! */ -#endif + printf(" 8"); printf("; STRUcture: %s; transfer MODE: %s\r\n", strunames[stru], modenames[mode]); ispassive = 0; |