1 files changed, 82 insertions, 61 deletions

diff --git a/src/pacman/util.c b/src/pacman/util.c
index 3d268031..c4773481 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -37,6 +37,9 @@
 #include <unistd.h>
 #include <limits.h>
 #include <wchar.h>
+#ifdef HAVE_TERMIOS_H
+#include <termios.h> /* tcflush */
+#endif
 
 #include <alpm.h>
 #include <alpm_list.h>
@@ -68,9 +71,9 @@ int trans_init(pmtransflag_t flags)
 			fprintf(stderr, _("  try running pacman-db-upgrade\n"));
 		}
 
-		return(-1);
+		return -1;
 	}
-	return(0);
+	return 0;
 }
 
 int trans_release(void)
@@ -78,28 +81,40 @@ int trans_release(void)
 	if(alpm_trans_release() == -1) {
 		pm_fprintf(stderr, PM_LOG_ERROR, _("failed to release transaction (%s)\n"),
 				alpm_strerrorlast());
-		return(-1);
+		return -1;
 	}
-	return(0);
+	return 0;
 }
 
 int needs_root(void)
 {
 	switch(config->op) {
 		case PM_OP_DATABASE:
-			return(1);
+			return 1;
 		case PM_OP_UPGRADE:
 		case PM_OP_REMOVE:
-			return(!config->print);
+			return !config->print;
 		case PM_OP_SYNC:
-			return(config->op_s_clean || config->op_s_sync ||
+			return (config->op_s_clean || config->op_s_sync ||
 					(!config->group && !config->op_s_info && !config->op_q_list &&
 					 !config->op_s_search && !config->print));
 		default:
-			return(0);
+			return 0;
 	}
 }
 
+/* discard unhandled input on the terminal's input buffer */
+static int flush_term_input(void) {
+#ifdef HAVE_TCFLUSH
+	if(isatty(fileno(stdin))) {
+		return(tcflush(fileno(stdin), TCIFLUSH));
+	}
+#endif
+
+	/* fail silently */
+	return 0;
+}
+
 /* gets the current screen column width */
 int getcols(void)
 {
@@ -125,24 +140,24 @@ int rmrf(const char *path)
 	DIR *dirp;
 
 	if(!unlink(path)) {
-		return(0);
+		return 0;
 	} else {
 		if(errno == ENOENT) {
-			return(0);
+			return 0;
 		} else if(errno == EPERM) {
 			/* fallthrough */
 		} else if(errno == EISDIR) {
 			/* fallthrough */
 		} else if(errno == ENOTDIR) {
-			return(1);
+			return 1;
 		} else {
 			/* not a directory */
-			return(1);
+			return 1;
 		}
 
 		dirp = opendir(path);
 		if(!dirp) {
-			return(1);
+			return 1;
 		}
 		for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
 			if(dp->d_ino) {
@@ -157,7 +172,7 @@ int rmrf(const char *path)
 		if(rmdir(path)) {
 			errflag++;
 		}
-		return(errflag);
+		return errflag;
 	}
 }
 
@@ -170,9 +185,9 @@ const char *mbasename(const char *path)
 {
 	const char *last = strrchr(path, '/');
 	if(last) {
-		return(last + 1);
+		return last + 1;
 	}
-	return(path);
+	return path;
 }
 
 /** Parse the dirname of a program from a path.
@@ -187,7 +202,7 @@ char *mdirname(const char *path)
 
 	/* null or empty path */
 	if(path == NULL || path == '\0') {
-		return(strdup("."));
+		return strdup(".");
 	}
 
 	ret = strdup(path);
@@ -196,11 +211,11 @@ char *mdirname(const char *path)
 	if(last != NULL) {
 		/* we found a '/', so terminate our string */
 		*last = '\0';
-		return(ret);
+		return ret;
 	}
 	/* no slash found */
 	free(ret);
-	return(strdup("."));
+	return strdup(".");
 }
 
 /* output a string, but wrap words properly with a specified indentation
@@ -286,7 +301,7 @@ char *strtrim(char *str)
 
 	if(str == NULL || *str == '\0') {
 		/* string is empty, so we're done. */
-		return(str);
+		return str;
 	}
 
 	while(isspace((unsigned char)*pch)) {
@@ -298,7 +313,7 @@ char *strtrim(char *str)
 
 	/* check if there wasn't anything but whitespace in the string. */
 	if(*str == '\0') {
-		return(str);
+		return str;
 	}
 
 	pch = (str + (strlen(str) - 1));
@@ -307,7 +322,7 @@ char *strtrim(char *str)
 	}
 	*++pch = '\0';
 
-	return(str);
+	return str;
 }
 
 /* Replace all occurances of 'needle' with 'replace' in 'str', returning
@@ -321,7 +336,7 @@ char *strreplace(const char *str, const char *needle, const char *replace)
 	size_t newsz;
 
 	if(!str) {
-		return(NULL);
+		return NULL;
 	}
 
 	p = str;
@@ -334,7 +349,7 @@ char *strreplace(const char *str, const char *needle, const char *replace)
 
 	/* no occurences of needle found */
 	if(!list) {
-		return(strdup(str));
+		return strdup(str);
 	}
 	/* size of new string = size of old string + "number of occurences of needle"
 	 * x "size difference between replace and needle" */
@@ -342,7 +357,7 @@ char *strreplace(const char *str, const char *needle, const char *replace)
 		alpm_list_count(list) * (replacesz - needlesz);
 	newstr = malloc(newsz);
 	if(!newstr) {
-		return(NULL);
+		return NULL;
 	}
 	*newstr = '\0';
 
@@ -368,7 +383,7 @@ char *strreplace(const char *str, const char *needle, const char *replace)
 	}
 	*newp = '\0';
 
-	return(newstr);
+	return newstr;
 }
 
 /** Splits a string into a list of strings using the chosen character as
@@ -388,7 +403,7 @@ alpm_list_t *strsplit(const char *str, const char splitchar)
 	while((str = strchr(str, splitchar))) {
 		dup = strndup(prev, (size_t)(str - prev));
 		if(dup == NULL) {
-			return(NULL);
+			return NULL;
 		}
 		list = alpm_list_add(list, dup);
 
@@ -398,11 +413,11 @@ alpm_list_t *strsplit(const char *str, const char splitchar)
 
 	dup = strdup(prev);
 	if(dup == NULL) {
-		return(NULL);
+		return NULL;
 	}
 	list = alpm_list_add(list, dup);
 
-	return(list);
+	return list;
 }
 
 static int string_length(const char *s)
@@ -411,7 +426,7 @@ static int string_length(const char *s)
 	wchar_t *wcstr;
 
 	if(!s) {
-		return(0);
+		return 0;
 	}
 	/* len goes from # bytes -> # chars -> # cols */
 	len = strlen(s) + 1;
@@ -420,7 +435,7 @@ static int string_length(const char *s)
 	len = wcswidth(wcstr, len);
 	free(wcstr);
 
-	return(len);
+	return len;
 }
 
 void string_display(const char *title, const char *string)
@@ -568,11 +583,11 @@ static off_t pkg_get_size(pmpkg_t *pkg)
 {
 	switch(config->op) {
 		case PM_OP_SYNC:
-			return(alpm_pkg_download_size(pkg));
+			return alpm_pkg_download_size(pkg);
 		case PM_OP_UPGRADE:
-			return(alpm_pkg_get_size(pkg));
+			return alpm_pkg_get_size(pkg);
 		default:
-			return(alpm_pkg_get_isize(pkg));
+			return alpm_pkg_get_isize(pkg);
 	}
 }
 
@@ -588,14 +603,14 @@ static char *pkg_get_location(pmpkg_t *pkg)
 			if(dburl) {
 				char *pkgurl = NULL;
 				pm_asprintf(&pkgurl, "%s/%s", dburl, alpm_pkg_get_filename(pkg));
-				return(pkgurl);
+				return pkgurl;
 			}
 		case PM_OP_UPGRADE:
-			return(strdup(alpm_pkg_get_filename(pkg)));
+			return strdup(alpm_pkg_get_filename(pkg));
 		default:
 			string = NULL;
 			pm_asprintf(&string, "%s-%s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg));
-			return(string);
+			return string;
 	}
 }
 
@@ -657,7 +672,7 @@ void print_packages(const alpm_list_t *packages)
  * alpm "compare func" signature */
 int str_cmp(const void *s1, const void *s2)
 {
-	return(strcmp(s1, s2));
+	return strcmp(s1, s2);
 }
 
 void display_new_optdepends(pmpkg_t *oldpkg, pmpkg_t *newpkg)
@@ -726,13 +741,13 @@ static int parseindex(char *s, int *val, int min, int max)
 		if(n < min || n > max) {
 			fprintf(stderr, _("Invalid value: %d is not between %d and %d\n"),
 					n, min, max);
-			return(-1);
+			return -1;
 		}
 		*val = n;
-		return(0);
+		return 0;
 	} else {
 		fprintf(stderr, _("Invalid number: %s\n"), s);
-		return(-1);
+		return -1;
 	}
 }
 
@@ -773,14 +788,14 @@ static int multiselect_parse(char *array, int count, char *response)
 		}
 
 		if(parseindex(starts, &start, 1, count) != 0)
-			return(-1);
+			return -1;
 
 		if(!ends) {
 			array[start-1] = include;
 		} else {
 			int d;
 			if(parseindex(ends, &end, start, count) != 0) {
-				return(-1);
+				return -1;
 			}
 			for(d = start; d <= end; d++) {
 				array[d-1] = include;
@@ -788,7 +803,7 @@ static int multiselect_parse(char *array, int count, char *response)
 		}
 	}
 
-	return(0);
+	return 0;
 }
 
 int multiselect_question(char *array, int count)
@@ -815,6 +830,8 @@ int multiselect_question(char *array, int count)
 			break;
 		}
 
+		flush_term_input();
+
 		if(fgets(response, sizeof(response), stdin)) {
 			strtrim(response);
 			if(strlen(response) > 0) {
@@ -826,7 +843,7 @@ int multiselect_question(char *array, int count)
 		}
 		break;
 	}
-	return(0);
+	return 0;
 }
 
 int select_question(int count)
@@ -852,19 +869,21 @@ int select_question(int count)
 			break;
 		}
 
+		flush_term_input();
+
 		if(fgets(response, sizeof(response), stdin)) {
 			strtrim(response);
 			if(strlen(response) > 0) {
 				int n;
 				if(parseindex(response, &n, 1, count) != 0)
 					continue;
-				return(n-1);
+				return (n - 1);
 			}
 		}
 		break;
 	}
 
-	return(preset-1);
+	return (preset - 1);
 }
 
 
@@ -895,23 +914,25 @@ static int question(short preset, char *fmt, va_list args)
 
 	if(config->noconfirm) {
 		fprintf(stream, "\n");
-		return(preset);
+		return preset;
 	}
 
 	fflush(stream);
+	flush_term_input();
+
 	if(fgets(response, sizeof(response), stdin)) {
 		strtrim(response);
 		if(strlen(response) == 0) {
-			return(preset);
+			return preset;
 		}
 
 		if(strcasecmp(response, _("Y")) == 0 || strcasecmp(response, _("YES")) == 0) {
-			return(1);
+			return 1;
 		} else if (strcasecmp(response, _("N")) == 0 || strcasecmp(response, _("NO")) == 0) {
-			return(0);
+			return 0;
 		}
 	}
-	return(0);
+	return 0;
 }
 
 int yesno(char *fmt, ...)
@@ -923,7 +944,7 @@ int yesno(char *fmt, ...)
 	ret = question(1, fmt, args);
 	va_end(args);
 
-	return(ret);
+	return ret;
 }
 
 int noyes(char *fmt, ...)
@@ -935,7 +956,7 @@ int noyes(char *fmt, ...)
 	ret = question(0, fmt, args);
 	va_end(args);
 
-	return(ret);
+	return ret;
 }
 
 int pm_printf(pmloglevel_t level, const char *format, ...)
@@ -948,7 +969,7 @@ int pm_printf(pmloglevel_t level, const char *format, ...)
 	ret = pm_vfprintf(stdout, level, format, args);
 	va_end(args);
 
-	return(ret);
+	return ret;
 }
 
 int pm_fprintf(FILE *stream, pmloglevel_t level, const char *format, ...)
@@ -961,7 +982,7 @@ int pm_fprintf(FILE *stream, pmloglevel_t level, const char *format, ...)
 	ret = pm_vfprintf(stream, level, format, args);
 	va_end(args);
 
-	return(ret);
+	return ret;
 }
 
 int pm_asprintf(char **string, const char *format, ...)
@@ -977,7 +998,7 @@ int pm_asprintf(char **string, const char *format, ...)
 	}
 	va_end(args);
 
-	return(ret);
+	return ret;
 }
 
 int pm_vasprintf(char **string, pmloglevel_t level, const char *format, va_list args)
@@ -1013,7 +1034,7 @@ int pm_vasprintf(char **string, pmloglevel_t level, const char *format, va_list
 	}
 	free(msg);
 
-	return(ret);
+	return ret;
 }
 
 int pm_vfprintf(FILE *stream, pmloglevel_t level, const char *format, va_list args)
@@ -1061,7 +1082,7 @@ int pm_vfprintf(FILE *stream, pmloglevel_t level, const char *format, va_list ar
 
 	/* print the message using va_arg list */
 	ret = vfprintf(stream, format, args);
-	return(ret);
+	return ret;
 }
 
 #ifndef HAVE_STRNDUP
@@ -1070,7 +1091,7 @@ static size_t strnlen(const char *s, size_t max)
 {
     register const char *p;
     for(p = s; *p && max--; ++p);
-    return(p - s);
+    return (p - s);
 }
 
 char *strndup(const char *s, size_t n)
@@ -1082,7 +1103,7 @@ char *strndup(const char *s, size_t n)
     return NULL;
 
   new[len] = '\0';
-  return (char *) memcpy(new, s, len);
+  return (char *)memcpy(new, s, len);
 }
 #endif