From 8857675a881ea89e29900938e04330d2c718c08e Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 26 Sep 2006 20:56:42 +0000 Subject: [PATCH] (This was actually BE-65) Merged revisions 43708 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r43708 | russell | 2006-09-26 16:49:21 -0400 (Tue, 26 Sep 2006) | 7 lines Back in revision 4798, this message was changed from using ast_cli() to directly calling write(). During this change, checking if this was a remote console was removed. This caused this message about using "exit" or "quit" to exit an Asterisk console to come up in times where it did not make sense. This change restores the check to see if this is a remote console before printing the message. (fixes BE-4) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@43710 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/asterisk.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/main/asterisk.c b/main/asterisk.c index 2010c727fc..417036b52d 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -2816,19 +2816,17 @@ int main(int argc, char *argv[]) buf[strlen(buf)-1] = '\0'; consolehandler((char *)buf); - } else { - if (write(STDOUT_FILENO, "\nUse EXIT or QUIT to exit the asterisk console\n", - strlen("\nUse EXIT or QUIT to exit the asterisk console\n")) < 0) { - /* Whoa, stdout disappeared from under us... Make /dev/null's */ - int fd; - fd = open("/dev/null", O_RDWR); - if (fd > -1) { - dup2(fd, STDOUT_FILENO); - dup2(fd, STDIN_FILENO); - } else - ast_log(LOG_WARNING, "Failed to open /dev/null to recover from dead console. Bad things will happen!\n"); - break; - } + } else if (ast_opt_remote && (write(STDOUT_FILENO, "\nUse EXIT or QUIT to exit the asterisk console\n", + strlen("\nUse EXIT or QUIT to exit the asterisk console\n")) < 0)) { + /* Whoa, stdout disappeared from under us... Make /dev/null's */ + int fd; + fd = open("/dev/null", O_RDWR); + if (fd > -1) { + dup2(fd, STDOUT_FILENO); + dup2(fd, STDIN_FILENO); + } else + ast_log(LOG_WARNING, "Failed to open /dev/null to recover from dead console. Bad things will happen!\n"); + break; } }