1 files changed, 32 insertions, 18 deletions

diff --git a/src/pacman/util.c b/src/pacman/util.c
index 557696b0..31966caa 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -143,7 +143,7 @@ int rmrf(const char *path)
 			if(dp->d_ino) {
 				char name[PATH_MAX];
 				sprintf(name, "%s/%s", path, dp->d_name);
-				if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) {
+				if(strcmp(dp->d_name, "..") != 0 && strcmp(dp->d_name, ".") != 0) {
 					errflag += rmrf(name);
 				}
 			}
@@ -531,10 +531,10 @@ void display_targets(const alpm_list_t *pkgs, int install)
 			double mbsize = 0.0;
 			mbsize = alpm_pkg_get_size(pkg) / (1024.0 * 1024.0);
 
-			asprintf(&str, "%s-%s [%.2f MB]", alpm_pkg_get_name(pkg),
+			pm_asprintf(&str, "%s-%s [%.2f MB]", alpm_pkg_get_name(pkg),
 					alpm_pkg_get_version(pkg), mbsize);
 		} else {
-			asprintf(&str, "%s-%s", alpm_pkg_get_name(pkg),
+			pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(pkg),
 					alpm_pkg_get_version(pkg));
 		}
 		targets = alpm_list_add(targets, str);
@@ -545,7 +545,7 @@ void display_targets(const alpm_list_t *pkgs, int install)
 	mbisize = isize / (1024.0 * 1024.0);
 
 	if(install) {
-		asprintf(&str, _("Targets (%d):"), alpm_list_count(targets));
+		pm_asprintf(&str, _("Targets (%d):"), alpm_list_count(targets));
 		list_display(str, targets);
 		free(str);
 		printf("\n");
@@ -555,7 +555,7 @@ void display_targets(const alpm_list_t *pkgs, int install)
 			printf(_("Total Installed Size:   %.2f MB\n"), mbisize);
 		}
 	} else {
-		asprintf(&str, _("Remove (%d):"), alpm_list_count(targets));
+		pm_asprintf(&str, _("Remove (%d):"), alpm_list_count(targets));
 		list_display(str, targets);
 		free(str);
 		printf("\n");
@@ -589,14 +589,14 @@ static char *pkg_get_location(pmpkg_t *pkg)
 			dburl = alpm_db_get_url(db);
 			if(dburl) {
 				char *pkgurl = NULL;
-				asprintf(&pkgurl, "%s/%s", dburl, alpm_pkg_get_filename(pkg));
+				pm_asprintf(&pkgurl, "%s/%s", dburl, alpm_pkg_get_filename(pkg));
 				return(pkgurl);
 			}
 		case PM_OP_UPGRADE:
 			return(strdup(alpm_pkg_get_filename(pkg)));
 		default:
 			string = NULL;
-			asprintf(&string, "%s-%s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg));
+			pm_asprintf(&string, "%s-%s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg));
 			return(string);
 	}
 }
@@ -647,11 +647,10 @@ void print_packages(const alpm_list_t *packages)
 			char *size;
 			double mbsize = 0.0;
 			mbsize = pkg_get_size(pkg) / (1024.0 * 1024.0);
-			asprintf(&size, "%.2f", mbsize);
+			pm_asprintf(&size, "%.2f", mbsize);
 			string = strreplace(temp, "%s", size);
 			free(size);
 			free(temp);
-			temp = string;
 		}
 		printf("%s\n",string);
 		free(string);
@@ -690,7 +689,6 @@ void display_optdepends(pmpkg_t *pkg)
 static int question(short preset, char *fmt, va_list args)
 {
 	char response[32];
-	int sresponse = sizeof(response)-1;
 	FILE *stream;
 
 	if(config->noconfirm) {
@@ -713,15 +711,15 @@ static int question(short preset, char *fmt, va_list args)
 		return(preset);
 	}
 
-	if(fgets(response, sresponse, stdin)) {
+	if(fgets(response, sizeof(response), stdin)) {
 		strtrim(response);
 		if(strlen(response) == 0) {
 			return(preset);
 		}
 
-		if(!strcasecmp(response, _("Y")) || !strcasecmp(response, _("YES"))) {
+		if(strcasecmp(response, _("Y")) == 0 || strcasecmp(response, _("YES")) == 0) {
 			return(1);
-		} else if (!strcasecmp(response, _("N")) || !strcasecmp(response, _("NO"))) {
+		} else if (strcasecmp(response, _("N")) == 0 || strcasecmp(response, _("NO")) == 0) {
 			return(0);
 		}
 	}
@@ -778,6 +776,22 @@ int pm_fprintf(FILE *stream, pmloglevel_t level, const char *format, ...)
 	return(ret);
 }
 
+int pm_asprintf(char **string, const char *format, ...)
+{
+	int ret = 0;
+	va_list args;
+
+	/* print the message using va_arg list */
+	va_start(args, format);
+	if(vasprintf(string, format, args) == -1) {
+		pm_fprintf(stderr, PM_LOG_ERROR,  _("failed to allocate string\n"));
+		ret = -1;
+	}
+	va_end(args);
+
+	return(ret);
+}
+
 int pm_vasprintf(char **string, pmloglevel_t level, const char *format, va_list args)
 {
 	int ret = 0;
@@ -794,16 +808,16 @@ int pm_vasprintf(char **string, pmloglevel_t level, const char *format, va_list
 	/* print a prefix to the message */
 	switch(level) {
 		case PM_LOG_DEBUG:
-			asprintf(string, "debug: %s", msg);
+			pm_asprintf(string, "debug: %s", msg);
 			break;
 		case PM_LOG_ERROR:
-			asprintf(string, _("error: %s"), msg);
+			pm_asprintf(string, _("error: %s"), msg);
 			break;
 		case PM_LOG_WARNING:
-			asprintf(string, _("warning: %s"), msg);
+			pm_asprintf(string, _("warning: %s"), msg);
 			break;
 		case PM_LOG_FUNCTION:
-			asprintf(string, _("function: %s"), msg);
+			pm_asprintf(string, _("function: %s"), msg);
 			break;
 		default:
 			break;
@@ -824,7 +838,7 @@ int pm_vfprintf(FILE *stream, pmloglevel_t level, const char *format, va_list ar
 
 #if defined(PACMAN_DEBUG)
 	/* If debug is on, we'll timestamp the output */
-  if(config->logmask & PM_LOG_DEBUG) {
+	if(config->logmask & PM_LOG_DEBUG) {
 		time_t t;
 		struct tm *tmp;
 		char timestr[10] = {0};