From 1343dfa3140003f7b8250559485fc072238fdc19 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 7 Jun 2011 09:08:37 +0000 Subject: [PATCH] 2011-06-07 Sebastian Huber PR 1811/networking * ftpd/ftpd.c: Fixed reply format. --- cpukit/ChangeLog | 5 +++++ cpukit/ftpd/ftpd.c | 8 ++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index a53fa7e46d..d6d8360aa7 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2011-06-07 Sebastian Huber + + PR 1811/networking + * ftpd/ftpd.c: Fixed reply format. + 2011-05-26 Jennifer Averett PR 1796/cpukit diff --git a/cpukit/ftpd/ftpd.c b/cpukit/ftpd/ftpd.c index b0f22c480c..04b2612420 100644 --- a/cpukit/ftpd/ftpd.c +++ b/cpukit/ftpd/ftpd.c @@ -552,12 +552,8 @@ task_pool_release(FTPD_SessionInfo_t* info) static void send_reply(FTPD_SessionInfo_t *info, int code, char *text) { - char const* s = (info->xfer_mode == TYPE_A) ? "\r" : ""; - /* If a text reply exists, add it to the reply data. */ - if (text != NULL) - fprintf(info->ctrl_fp, "%d %.70s%s\n", code, text, s); - else - fprintf(info->ctrl_fp, "%d%s\n", code, s); + text = text != NULL ? text : ""; + fprintf(info->ctrl_fp, "%d %.70s\r\n", code, text); fflush(info->ctrl_fp); }