From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 8 Aug 2012 16:56:56 +0000 (+0200)
Subject: Let args_init_from_gcc_atfile split on carriage return as well
X-Git-Tag: v3.2~103
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc75e5407da9ced13fec383873cc0e55ddef8030;p=thirdparty%2Fccache.git

Let args_init_from_gcc_atfile split on carriage return as well
---

diff --git a/args.c b/args.c
index cff4873ff..67c61160c 100644
--- a/args.c
+++ b/args.c
@@ -97,6 +97,7 @@ args_init_from_gcc_atfile(const char *filename)
 			}
 
 		case '\n':
+		case '\r':
 		case '\t':
 		case ' ':
 			if (quoting) {
diff --git a/test/test_args.c b/test/test_args.c
index 5c1b19d54..27c6fb9d0 100644
--- a/test/test_args.c
+++ b/test/test_args.c
@@ -63,7 +63,9 @@ TEST(args_init_from_string)
 TEST(args_init_from_gcc_atfile)
 {
 	struct args *args;
-	const char *argtext = "first sec\\\tond\tthi\\\\rd\nfourth  \tfif\\ th \"si'x\\\" th\" 'seve\nth'\\";
+	const char *argtext =
+		"first\rsec\\\tond\tthi\\\\rd\nfourth  \tfif\\ th \"si'x\\\" th\""
+		" 'seve\nth'\\";
 
 	create_file("gcc_atfile", argtext);