Bruce/bp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed buggy git ls-files line reading

Browse Source
This commit is contained in:
Bruce Hill 2021-01-18 12:30:55 -08:00
parent e03726b9a8
commit 218ea864e1
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bp.c
View File

@ -596,15 +596,17 @@ int main(int argc, char *argv[])
_exit(EXIT_FAILURE);
}
check(close(fds[STDOUT_FILENO]) == 0, "Failed to close write end of pipe");
char path[PATH_MAX+2] = {'\0'}; // path + \n + \0
while (read(fds[STDIN_FILENO], path, PATH_MAX+1) > 0) { // Iterate over chunks
for (char *nl; (nl = strchr(path, '\n')); ) { // Iterate over nl-terminated lines
*nl = '\0';
found += process_file(defs, path, pattern);
memmove(path, nl+1, sizeof(path)-(size_t)(nl+1-path));
}
FILE *fp = fdopen(fds[STDIN_FILENO], "r");
check(fp != NULL, "Could not open file descriptor");
char *path = NULL;
size_t size = 0;
ssize_t len = 0;
while ((len = getline(&path, &size, fp)) > 0) {
if (path[len-1] == '\n') path[len-1] = '\0';
found += process_file(defs, path, pattern);
}
check(close(fds[STDIN_FILENO]) == 0, "Failed to close read end of pipe");
if (path) xfree(&path);
check(fclose(fp) == 0, "Failed to close read end of pipe");
int status;
while (waitpid(child, &status, 0) != child) continue;
check((WIFEXITED(status) == 1) && (WEXITSTATUS(status) == 0),