Merged revisions 72335 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r72335 | bbryant | 2007-06-27 18:03:01 -0500 (Wed, 27 Jun 2007) | 10 lines

Merged revisions 72333 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r72333 | bbryant | 2007-06-27 17:58:53 -0500 (Wed, 27 Jun 2007) | 2 lines

Reverted changes for earlier revisions 72259 to 72261. Issue #9654, #10010

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72337 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Brett Bryant
2007-06-27 23:04:06 +00:00
parent 4897378ff1
commit 2a46445481

View File

@@ -2232,9 +2232,6 @@ static void ast_remotecontrol(char * data)
for (;;) {
ebuf = (char *)el_gets(el, &num);
if (!ebuf && write(1, "", 1) < 0)
break;
if (!ast_strlen_zero(ebuf)) {
if (ebuf[strlen(ebuf)-1] == '\n')
ebuf[strlen(ebuf)-1] = '\0';
@@ -2961,9 +2958,6 @@ int main(int argc, char *argv[])
for (;;) {
buf = (char *)el_gets(el, &num);
if (!buf && write(1, "", 1) < 0)
goto lostterm;
if (buf) {
if (buf[strlen(buf)-1] == '\n')
buf[strlen(buf)-1] = '\0';
@@ -2986,6 +2980,5 @@ int main(int argc, char *argv[])
monitor_sig_flags(NULL);
lostterm:
return 0;
}