From 40a6c5c5eca05b5f65b1dc0c6d5c87fcd313fb2e Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Wed, 16 Mar 2011 17:23:00 -0400 Subject: [PATCH] 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 Signed-off-by: Dan McGee --- src/pacman/pacman.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 984bd1b7..073a0175 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1361,10 +1361,14 @@ int main(int argc, char *argv[]) cleanup(ret); } - /* we also support reading targets from stdin */ - if(!isatty(fileno(stdin))) { + /* we support reading targets from stdin if a cmdline parameter is '-' */ + if(!isatty(fileno(stdin)) && alpm_list_find_str(pm_targets, "-")) { char line[PATH_MAX]; 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) { if(isspace((unsigned char)line[i])) { /* avoid adding zero length arg when multiple spaces separate args */