1 files changed, 9 insertions, 7 deletions

diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index 49fc0f67..4dac5981 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -44,7 +44,6 @@
 #include "sync.h"
 #include "alpm.h"
 #include "deps.h"
-#include "cache.h"
 
 /** \addtogroup alpm_trans Transaction Functions
  * @brief Functions to manipulate libalpm transactions
@@ -107,7 +106,7 @@ static alpm_list_t *check_arch(alpm_list_t *pkgs)
 	for(i = pkgs; i; i = i->next) {
 		pmpkg_t *pkg = i->data;
 		const char *pkgarch = alpm_pkg_get_arch(pkg);
-		if(strcmp(pkgarch,arch) && strcmp(pkgarch,"any")) {
+		if(strcmp(pkgarch,arch) != 0 && strcmp(pkgarch,"any") != 0) {
 			char *string;
 			const char *pkgname = alpm_pkg_get_name(pkg);
 			const char *pkgver = alpm_pkg_get_version(pkg);
@@ -323,11 +322,11 @@ static int grep(const char *fn, const char *needle)
 	}
 	while(!feof(fp)) {
 		char line[1024];
-		int sline = sizeof(line)-1;
-		fgets(line, sline, fp);
-		if(feof(fp)) {
+		if(fgets(line, sizeof(line), fp) == NULL) {
 			continue;
 		}
+		/* TODO: this will not work if the search string
+		 * ends up being split across line reads */
 		if(strstr(line, needle)) {
 			fclose(fp);
 			return(1);
@@ -344,6 +343,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
 	char scriptfn[PATH_MAX];
 	char cmdline[PATH_MAX];
 	char tmpdir[PATH_MAX];
+	char *argv[] = { "sh", "-c", cmdline, NULL };
 	char *scriptpath;
 	int clean_tmpdir = 0;
 	int retval = 0;
@@ -371,7 +371,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
 
 	/* either extract or copy the scriptlet */
 	snprintf(scriptfn, PATH_MAX, "%s/.INSTALL", tmpdir);
-	if(!strcmp(script, "pre_upgrade") || !strcmp(script, "pre_install")) {
+	if(strcmp(script, "pre_upgrade") == 0 || strcmp(script, "pre_install") == 0) {
 		if(_alpm_unpack_single(installfn, tmpdir, ".INSTALL")) {
 			retval = 1;
 		}
@@ -401,7 +401,9 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
 				scriptpath, script, ver);
 	}
 
-	retval = _alpm_run_chroot(root, cmdline);
+	_alpm_log(PM_LOG_DEBUG, "executing \"%s\"\n", cmdline);
+
+	retval = _alpm_run_chroot(root, "/bin/sh", argv);
 
 cleanup:
 	if(clean_tmpdir && _alpm_rmrf(tmpdir)) {