From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Wed, 1 Aug 2007 23:30:54 +0000 (-0000)
Subject: patch: fix bad line ending handling ("Nguyen Thai Ngoc Duy" <pclouds@gmail.com>)
X-Git-Tag: 1_7_0~83
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fc77eb54e791c7d636c20993ec81396052af84f0;p=oweals%2Fbusybox.git

patch: fix bad line ending handling ("Nguyen Thai Ngoc Duy" <pclouds@gmail.com>)
---

diff --git a/editors/patch.c b/editors/patch.c
index f65bbf4f9..5f7f7d028 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -96,7 +96,7 @@ int patch_main(int argc, char **argv)
 		ret = 0;
 	}
 
-	patch_line = xmalloc_fgets(patch_file);
+	patch_line = xmalloc_getline(patch_file);
 	while (patch_line) {
 		FILE *src_stream;
 		FILE *dst_stream;
@@ -115,7 +115,7 @@ int patch_main(int argc, char **argv)
 		 */
 		while (patch_line && strncmp(patch_line, "--- ", 4) != 0) {
 			free(patch_line);
-			patch_line = xmalloc_fgets(patch_file);
+			patch_line = xmalloc_getline(patch_file);
 		}
 		/* FIXME: patch_line NULL check?? */
 
@@ -123,7 +123,7 @@ int patch_main(int argc, char **argv)
 		original_filename = extract_filename(patch_line, patch_level);
 		free(patch_line);
 
-		patch_line = xmalloc_fgets(patch_file);
+		patch_line = xmalloc_getline(patch_file);
 		/* FIXME: NULL check?? */
 		if (strncmp(patch_line, "+++ ", 4) != 0) {
 			ret = 2;