* Fixed bad merge (that's why sail was broken).

git-svn-id: file:///srv/svn/joey/bsdgames-trunk@5177 a4a2c43b-8ac3-0310-8836-e0e880c912e2
This commit is contained in:
joey
2001-12-29 19:48:57 +00:00
parent b05333c9fe
commit 0a887df528
19 changed files with 420 additions and 440 deletions

View File

@@ -1,4 +1,4 @@
/* $NetBSD: get_names.c,v 1.4 2000/07/03 03:57:41 matt Exp $ */
/* $NetBSD: get_names.c,v 1.6 2001/02/05 00:42:15 christos Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved. The Berkeley software License Agreement
@@ -7,7 +7,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: get_names.c,v 1.4 2000/07/03 03:57:41 matt Exp $");
__RCSID("$NetBSD: get_names.c,v 1.6 2001/02/05 00:42:15 christos Exp $");
#endif /* not lint */
#include "bsd.h"
@@ -23,10 +23,9 @@ __RCSID("$NetBSD: get_names.c,v 1.4 2000/07/03 03:57:41 matt Exp $");
# include "hunt.h"
# include "talk_ctl.h"
extern CTL_MSG msg;
/* according to SUSv2, hostnames can't be longer then 256 characters */
#ifndef MAXHOSTNAMELEN
#define MAXHOSTNAMELEN 256
#endif
static char hostname[MAXHOSTNAMELEN + 1];
char *my_machine_name;
@@ -62,8 +61,13 @@ get_local_name(my_name)
/* look up the address of the local host */
hp = gethostbyname(my_machine_name);
if (hp == (struct hostent *) 0) {
printf("This machine doesn't exist. Boy, am I confused!\n");
exit(-1);
# ifdef LOG
syslog(LOG_ERR,
"This machine doesn't exist. Boy, am I confused!");
# else
perror("This machine doesn't exist. Boy, am I confused!");
# endif
exit(1);
}
memcpy(&my_machine_addr, hp->h_addr, hp->h_length);
/* find the daemon portal */
@@ -78,7 +82,7 @@ get_local_name(my_name)
# else
perror("This machine doesn't support talk");
# endif
exit(-1);
exit(1);
}
daemon_port = sp->s_port;
}