Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 3aa8ed7
(lua_)scripts.c: gather remaining output after loop exits
Alex Richardson committed 5 years ago
commit 3aa8ed70b10abe14291ab0f25cf930e416b7e80f
parent b9e93e5
2 files changed +8 -0
modified libpkg/lua_scripts.c
@@ -341,6 +341,10 @@ pkg_lua_script_run(struct pkg * const pkg, pkg_lua_script type, bool upgrade)
			if (feof(f))

				break;

		}
+ 
		/* Gather any remaining output */
+ 
		while (!feof(f) && !ferror(f) && getline(&line, &linecap, f) > 0) {
+ 
			pkg_emit_message(line);
+ 
		}

		fclose(f);



		while (should_waitpid && waitpid(pid, &pstat, 0) == -1) {
modified libpkg/scripts.c
@@ -283,6 +283,10 @@ pkg_script_run(struct pkg * const pkg, pkg_script type, bool upgrade)
				if (feof(f))

					break;

			}
+ 
			/* Gather any remaining output */
+ 
			while (!feof(f) && !ferror(f) && getline(&line, &linecap, f) > 0) {
+ 
				pkg_emit_message(line);
+ 
			}

			fclose(f);



			while (should_waitpid && waitpid(pid, &pstat, 0) == -1) {