diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-06 21:03:10 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-06 21:03:10 +0000 |
commit | aa63308a8dafae0dde80352c20fea656dc273c43 (patch) | |
tree | 1c321b0d71535b319e9fa11deaecbabecdb79d33 | |
parent | 303c00556ddf9119994154ef45c7144f6d34406e (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42169 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | res/res_agi.c | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -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 e9b275ed0..de4c7be39 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); } |