From 8bb17660d7cf6b0ebeb9ed0a390b183c367b926c Mon Sep 17 00:00:00 2001 From: Automerge script Date: Wed, 6 Sep 2006 21:03:10 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42169 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 2 +- res/res_agi.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f273c65926..e0921fdf84 100644 --- a/Makefile +++ b/Makefile @@ -593,7 +593,7 @@ datafiles: all exit 1; \ fi; \ done - for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \ + for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-* sounds/hours* sounds/minute* sounds/second* ; do \ if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ else \ diff --git a/res/res_agi.c b/res/res_agi.c index e9b275ed0b..de4c7be393 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -2047,7 +2047,8 @@ static int agi_exec_full(struct ast_channel *chan, void *data, int enhanced, int agi.ctrl = fds[0]; agi.audio = efd; res = run_agi(chan, argv[0], &agi, pid, dead); - close(fds[1]); + if (fds[1] != fds[0]) + close(fds[1]); if (efd > -1) close(efd); } -- 2.47.2