f4a670a91
Denys Vlasenko
2017-03-23
Subject
paste: delimiter list use should restart for each new output line
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/paste.c+4 -2
| @@ -36,11 +36,12 @@ static void paste_files(FILE** files, int file_cnt, char* delims, int del_cnt) | |
| { | |
| char *line; | |
| char delim; | |
| - | int del_idx = 0; |
| int active_files = file_cnt; | |
| int i; | |
| while (active_files > 0) { | |
| + | int del_idx = 0; |
| + | |
| for (i = 0; i < file_cnt; ++i) { | |
| if (files[i] == NULL) | |
| continue; | |
| @@ -70,10 +71,11 @@ static void paste_files_separate(FILE** files, char* delims, int del_cnt) | |
| { | |
| char *line, *next_line; | |
| char delim; | |
| - | int del_idx = 0; |
| int i; | |
| for (i = 0; files[i]; ++i) { | |
| + | int del_idx = 0; |
| + | |
| line = NULL; | |
| while ((next_line = xmalloc_fgetline(files[i])) != NULL) { | |
| if (line) { | |