From d7d427e9027823ebe69b6fa4026532b1523432a8 Mon Sep 17 00:00:00 2001
From: Jack Halford <jack@crans.org>
Date: Sun, 12 Nov 2017 15:20:51 +0100
Subject: [PATCH] added sample data for user 'a'

---
 ftp/data/a/hello.txt         | 1 +
 ftp/data/a/testdir/emptyfile | 0
 ftp/srcs/client/cli_help.c   | 2 +-
 ftp/srcs/client/client.c     | 4 ++--
 ftp/srcs/server/crlf.c       | 6 ++++--
 5 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 ftp/data/a/hello.txt
 create mode 100644 ftp/data/a/testdir/emptyfile

diff --git a/ftp/data/a/hello.txt b/ftp/data/a/hello.txt
new file mode 100644
index 00000000..944ea50b
--- /dev/null
+++ b/ftp/data/a/hello.txt
@@ -0,0 +1 @@
+Hello ftp world
diff --git a/ftp/data/a/testdir/emptyfile b/ftp/data/a/testdir/emptyfile
new file mode 100644
index 00000000..e69de29b
diff --git a/ftp/srcs/client/cli_help.c b/ftp/srcs/client/cli_help.c
index 3c27963e..97b6956b 100644
--- a/ftp/srcs/client/cli_help.c
+++ b/ftp/srcs/client/cli_help.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/11/09 14:04:01 by jhalford          #+#    #+#             */
-/*   Updated: 2017/11/12 15:02:32 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/11/12 15:09:21 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/ftp/srcs/client/client.c b/ftp/srcs/client/client.c
index bd4fe338..92ad482e 100644
--- a/ftp/srcs/client/client.c
+++ b/ftp/srcs/client/client.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/04/02 19:18:31 by jhalford          #+#    #+#             */
-/*   Updated: 2017/11/12 14:56:28 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/11/12 15:14:18 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -29,7 +29,7 @@ t_cmd_map	g_cli_cmd[] =
 	{"debug", cli_debug, "set debugging level"},
 	{0, 0, 0},
 };
-int		g_debug = 1;
+int		g_debug = 0;
 
 t_cmd_map	*get_cmd(char *cmd)
 {
diff --git a/ftp/srcs/server/crlf.c b/ftp/srcs/server/crlf.c
index 9d7897b4..39608e0a 100644
--- a/ftp/srcs/server/crlf.c
+++ b/ftp/srcs/server/crlf.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/11/08 19:52:07 by jhalford          #+#    #+#             */
-/*   Updated: 2017/11/12 14:45:09 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/11/12 15:13:42 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -54,9 +54,11 @@ int		ftp_recv(int sock, char **msg)
 	buf[ret] = 0;
 	if (buf[ret - 1] == '\n' && buf[ret - 2] == '\r')
 		buf[ret - 2] = 0;
+	else if (buf[ret - 1] == '\n')
+		buf[ret - 1] = 0;
 	else
 	{
-		console_msg(2, "recv'd non-crlf message '%s'", buf);
+		console_msg(2, "recv'd non-crlf/lf message '%s'", buf);
 		return (1);
 	}
 	*msg = ft_strdup(buf);