Skip to content

L
liblongpath-rsync
Commit bc72130d authored by Wayne Davison's avatar Wayne Davison
Browse files
Options

Got rid of O_TEXT_STR and added code to strip '\r' from the end of the 

lines we read.
parent 855decd3
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
exclude.c
View file @ bc72130d
...@@ -224,9 +224,9 @@ struct exclude_struct **make_exclude_list(const char *fname, ...@@ -224,9 +224,9 @@ struct exclude_struct **make_exclude_list(const char *fname,
char line[MAXPATHLEN]; char line[MAXPATHLEN];
if (strcmp(fname, "-")) { if (strcmp(fname, "-")) {
f = fopen(fname,"r" O_TEXT_STR); f = fopen(fname,"r");
} else { } else {
f = fdopen(0, "r" O_TEXT_STR); f = fdopen(0, "r");
} }
if (!f) { if (!f) {
if (fatal) { if (fatal) {
...@@ -241,7 +241,7 @@ struct exclude_struct **make_exclude_list(const char *fname, ...@@ -241,7 +241,7 @@ struct exclude_struct **make_exclude_list(const char *fname,
while (fgets(line,MAXPATHLEN,f)) { while (fgets(line,MAXPATHLEN,f)) {
int l = strlen(line); 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; line[l] = 0;
if (line[0] && (line[0] != ';') && (line[0] != '#')) { if (line[0] && (line[0] != ';') && (line[0] != '#')) {
/* Skip lines starting with semicolon or pound. /* Skip lines starting with semicolon or pound.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment