From 79054638367242952ed67201b4b0665fb9ed4463 Mon Sep 17 00:00:00 2001 From: Norbert Warmuth Date: Sun, 11 Oct 1998 19:19:03 +0000 Subject: [PATCH] Sun Oct 11 20:21:20 1998 Peter Kleiweg * mfmt.c (main): When there are an even number of empty lines between messages, all goes well, but when the number of empty lines between messages is odd, the program fails. Sun Oct 11 20:11:16 1998 Norbert Warmuth * setup.c: Option ftpfs_use_unix_list_options was saved from and restored to the wrong variable (ftpfs_use_passive_connections). --- src/ChangeLog | 11 +++++++++++ src/mfmt.c | 4 +++- src/setup.c | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 25b179b12..ecdd074a0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +Sun Oct 11 20:21:20 1998 Peter Kleiweg + + * mfmt.c (main): When there are an even number of empty lines + between messages, all goes well, but when the number of empty + lines between messages is odd, the program fails. + +Sun Oct 11 20:11:16 1998 Norbert Warmuth + + * setup.c: Option ftpfs_use_unix_list_options was saved from + and restored to the wrong variable (ftpfs_use_passive_connections). + Mon Oct 5 21:33:14 1998 Norbert Warmuth * screen.c (parse_display_format): Don't dereference NULL pointer diff --git a/src/mfmt.c b/src/mfmt.c index 53277109e..665414308 100644 --- a/src/mfmt.c +++ b/src/mfmt.c @@ -70,7 +70,9 @@ main (void) case newline: if (c == 'F') state = seen_f; - else { + else if (c == '\n') + putchar ('\n'); + else { state = plain; putchar (c); } diff --git a/src/setup.c b/src/setup.c index 0fd266c2b..c38edc7cd 100644 --- a/src/setup.c +++ b/src/setup.c @@ -226,7 +226,7 @@ static struct { { "ftpfs_retry_seconds", &ftpfs_retry_seconds }, { "ftpfs_always_use_proxy", &ftpfs_always_use_proxy }, { "ftpfs_use_passive_connections", &ftpfs_use_passive_connections }, - { "ftpfs_use_unix_list_options", &ftpfs_use_passive_connections }, + { "ftpfs_use_unix_list_options", &ftpfs_use_unix_list_options }, #endif #endif #ifdef USE_INTERNAL_EDIT