Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › f8ce927
Use _PATH_BSHELL instead of /bin/sh
Bryan Drewery committed 13 years ago
commit f8ce9273163a429cd77e6b5fff2e8c13b8698b36
parent bcfa83c
2 files changed +5 -4
modified libpkg/pkg_elf.c
@@ -43,6 +43,7 @@
#ifndef BUNDLED_LIBELF

#include <link.h>

#endif
+ 
#include <paths.h>

#include <stdbool.h>

#include <string.h>

#include <unistd.h>
@@ -554,8 +555,8 @@ pkg_get_myarch(char *dest, size_t sz)
		return (EPKG_FATAL);

	}
- 
	if ((fd = open("/bin/sh", O_RDONLY)) < 0) {
- 
		pkg_emit_errno("open", "/bin/sh");
+ 
	if ((fd = open(_PATH_BSHELL, O_RDONLY)) < 0) {
+ 
		pkg_emit_errno("open", _PATH_BSHELL);

		snprintf(dest, sz, "%s", "unknown");

		return (EPKG_FATAL);

	}
modified libpkg/scripts.c
@@ -129,13 +129,13 @@ pkg_script_run(struct pkg * const pkg, pkg_script type)
				    STDIN_FILENO);

				posix_spawn_file_actions_addclose(&action, stdin_pipe[1]);
- 
				argv[0] = "sh";
+ 
				argv[0] = _PATH_BSHELL;

				argv[1] = "-s";

				argv[2] = NULL;



				use_pipe = 1;

			} else {
- 
				argv[0] = "sh";
+ 
				argv[0] = _PATH_BSHELL;

				argv[1] = "-c";

				argv[2] = sbuf_get(script_cmd);

				argv[3] = NULL;