Fix gethostname calls (bug #4198, with mods)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5600 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-05-08 16:44:25 +00:00
parent fa0f44a347
commit 00bcbaaa05
6 changed files with 17 additions and 17 deletions

View File

@@ -273,12 +273,12 @@ static pthread_t lthread;
static void *netconsole(void *vconsole)
{
struct console *con = vconsole;
char hostname[256];
char hostname[MAXHOSTNAMELEN]="";
char tmp[512];
int res;
struct pollfd fds[2];
if (gethostname(hostname, sizeof(hostname)))
if (gethostname(hostname, sizeof(hostname)-1))
strncpy(hostname, "<Unknown>", sizeof(hostname)-1);
snprintf(tmp, sizeof(tmp), "%s/%d/%s\n", hostname, ast_mainpid, ASTERISK_VERSION);
fdprint(con->fd, tmp);
@@ -1026,7 +1026,7 @@ static char *cli_prompt(EditLine *el)
memset(prompt, 0, sizeof(prompt));
while (*t != '\0' && *p < sizeof(prompt)) {
if (*t == '%') {
char hostname[256];
char hostname[MAXHOSTNAMELEN]="";
int i;
struct timeval tv;
struct tm tm;
@@ -1668,7 +1668,7 @@ int main(int argc, char *argv[])
{
int c;
char filename[80] = "";
char hostname[256];
char hostname[MAXHOSTNAMELEN]="";
char tmp[80];
char * xarg = NULL;
int x;
@@ -1693,7 +1693,7 @@ int main(int argc, char *argv[])
option_remote++;
option_nofork++;
}
if (gethostname(hostname, sizeof(hostname)))
if (gethostname(hostname, sizeof(hostname)-1))
strncpy(hostname, "<Unknown>", sizeof(hostname)-1);
ast_mainpid = getpid();
ast_ulaw_init();