Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › b2ef3ed
Simplify code testing for socket being closed
Baptiste Daroussin committed 6 years ago
commit b2ef3ede4670d629d939d5dd735fd3961f6d013e
parent 96c302c
2 files changed +6 -10
modified libpkg/lua_scripts.c
@@ -226,7 +226,6 @@ pkg_lua_script_run(struct pkg * const pkg, pkg_lua_script type, bool upgrade)
#endif

	struct pollfd pfd;

	int cur_pipe[2];
- 
	int r;

	char *line = NULL;

	FILE *f;

	ssize_t linecap = 0;
@@ -312,11 +311,10 @@ pkg_lua_script_run(struct pkg * const pkg, pkg_lua_script type, bool upgrade)
			}

			if (pfd.revents & (POLLERR|POLLHUP))

				break;
- 
			r = getline(&line, &linecap, f);
- 
			if (r == 0 && feof(f))
- 
				break;
- 
			if (r > 0)
+ 
			if (getline(&line, &linecap, f) > 0)

				pkg_emit_message(line);
+ 
			if (feof(f))
+ 
				break;

		}

		fclose(f);
modified libpkg/scripts.c
@@ -63,7 +63,6 @@ pkg_script_run(struct pkg * const pkg, pkg_script type, bool upgrade)
	int ret = EPKG_OK;

	int fd = -1;

	int stdin_pipe[2] = {-1, -1};
- 
	int r;

	posix_spawn_file_actions_t action;

	bool use_pipe = 0;

	bool debug = false;
@@ -254,11 +253,10 @@ pkg_script_run(struct pkg * const pkg, pkg_script type, bool upgrade)
				}

				if (pfd.revents & (POLLERR|POLLHUP))

					break;
- 
				r = getline(&line, &linecap, f);
- 
				if (r == 0 && feof(f))
- 
					break;
- 
				if (r > 0)
+ 
				if (getline(&line, &linecap, f) > 0)

					pkg_emit_message(line);
+ 
				if (feof(f))
+ 
					break;

			}

			fclose(f);