mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-01-22 22:08:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Open the file in BINARY fd mode, handle the normal line-ending characters

Browse Source 
better than before, and add support for the new --from0 option (which changes
the line separator to a null).
This commit is contained in:
Wayne Davison
2003-03-30 23:00:40 +00:00
parent 24d0fcde7f
commit ccdff3ebbf
1 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
exclude.c
View File

@@ -220,15 +220,16 @@ struct exclude_struct **make_exclude_list(const char *fname,
int fatal, int include)
{
struct exclude_struct **list=list1;
FILE *f;
int fd;
char line[MAXPATHLEN];
char *eob = line + MAXPATHLEN - 1;
extern int eol_nulls;
if (strcmp(fname, "-")) {
f = fopen(fname,"r");
} else {
f = fdopen(0, "r");
}
if (!f) {
if (strcmp(fname, "-") != 0)
fd = open(fname, O_RDONLY|O_BINARY);
else
fd = 0;
if (fd < 0) {
if (fatal) {
rsyserr(FERROR, errno,
"failed to open %s file %s",
@@ -239,18 +240,31 @@ struct exclude_struct **make_exclude_list(const char *fname,
return list;
}
while (fgets(line,MAXPATHLEN,f)) {
int l = strlen(line);
while (l && (line[l-1] == '\n' || line[l-1] == '\r')) l--;
line[l] = 0;
if (line[0] && (line[0] != ';') && (line[0] != '#')) {
while (1) {
char ch, *s = line;
int cnt;
while (1) {
if ((cnt = read(fd, &ch, 1)) <= 0) {
if (cnt < 0 && errno == EINTR)
continue;
break;
}
if (eol_nulls? !ch : (ch == '\n' || ch == '\r'))
break;
if (s < eob)
*s++ = ch;
}
*s = '\0';
if (*line && *line != ';' && *line != '#') {
/* Skip lines starting with semicolon or pound.
It probably wouldn't cause any harm to not skip
them but there's no need to save them. */
* It probably wouldn't cause any harm to not skip
* them but there's no need to save them. */
add_exclude_list(line,&list,include);
}
if (cnt <= 0)
break;
}
fclose(f);
close(fd);
return list;
}