X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fpaste.c;h=3920859d6cfba439f57c4fa51b93f21415fbfb70;hb=876c121ccb479d667a1ab00d0cb2d9cb1c298e7d;hp=54e15c9a0991830c2afb367713cb3908a23aa5fb;hpb=f1db95abfbe3621241d1f797d312d7b0981fbac9;p=oweals%2Fbusybox.git diff --git a/coreutils/paste.c b/coreutils/paste.c index 54e15c9a0..3920859d6 100644 --- a/coreutils/paste.c +++ b/coreutils/paste.c @@ -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) { @@ -125,7 +127,7 @@ int paste_main(int argc UNUSED_PARAM, char **argv) (--argv)[0] = (char*) "-"; for (i = 0; argv[i]; ++i) { argv[i] = (void*) fopen_or_warn_stdin(argv[i]); - if (!argv[i]) + if (!argv[i]) xfunc_die(); }