1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-15 22:05:02 -05:00

Only read from stdin if '-' is provided as a target

This prevents a regression for people who enjoy piping yes to pacman to
avoid prompts.

Signed-off-by: Dave Reisner <d@falconindy.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dave Reisner 2011-03-16 17:23:00 -04:00 committed by Dan McGee
parent deed0286ef
commit 40a6c5c5ec

View File

@ -1361,10 +1361,14 @@ int main(int argc, char *argv[])
cleanup(ret); cleanup(ret);
} }
/* we also support reading targets from stdin */ /* we support reading targets from stdin if a cmdline parameter is '-' */
if(!isatty(fileno(stdin))) { if(!isatty(fileno(stdin)) && alpm_list_find_str(pm_targets, "-")) {
char line[PATH_MAX]; char line[PATH_MAX];
int i = 0; int i = 0;
/* remove the '-' from the list */
pm_targets = alpm_list_remove_str(pm_targets, "-", NULL);
while(i < PATH_MAX && (line[i] = (char)fgetc(stdin)) != EOF) { while(i < PATH_MAX && (line[i] = (char)fgetc(stdin)) != EOF) {
if(isspace((unsigned char)line[i])) { if(isspace((unsigned char)line[i])) {
/* avoid adding zero length arg when multiple spaces separate args */ /* avoid adding zero length arg when multiple spaces separate args */