From: Wayne Davison <wayned@samba.org>
Date: Sun, 26 Jan 2003 20:10:23 +0000 (+0000)
Subject: Got rid of O_TEXT_STR and added code to strip '\r' from the end of the
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/bc72130d71b534516ab7839ca6223b15d392bf5c

Got rid of O_TEXT_STR and added code to strip '\r' from the end of the
lines we read.
---

diff --git a/exclude.c b/exclude.c
index 848d5613..e1b25886 100644
--- a/exclude.c
+++ b/exclude.c
@@ -224,9 +224,9 @@ struct exclude_struct **make_exclude_list(const char *fname,
 	char line[MAXPATHLEN];
 
 	if (strcmp(fname, "-")) {
-		f = fopen(fname,"r" O_TEXT_STR);
+		f = fopen(fname,"r");
 	} else {
-		f = fdopen(0, "r" O_TEXT_STR);
+		f = fdopen(0, "r");
 	}
 	if (!f) {
 		if (fatal) {
@@ -241,7 +241,7 @@ struct exclude_struct **make_exclude_list(const char *fname,
 
 	while (fgets(line,MAXPATHLEN,f)) {
 		int l = strlen(line);
-		if (l && line[l-1] == '\n') l--;
+		while (l && (line[l-1] == '\n' || line[l-1] == '\r')) l--;
 		line[l] = 0;
 		if (line[0] && (line[0] != ';') && (line[0] != '#')) {
 			/* Skip lines starting with semicolon or pound.