X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Fmts.c;h=37f6e237be4a207e8ca540a9127ff39d8c777a1e;hb=6bd76adcc81f4a725352c338a39212bcdefb0a4b;hp=cd2a3d8784589062cf80d2a9cea0115628beca76;hpb=c05210483d82bf5f3786725ff80e12444088a701;p=mmh diff --git a/sbr/mts.c b/sbr/mts.c index cd2a3d8..37f6e23 100644 --- a/sbr/mts.c +++ b/sbr/mts.c @@ -17,12 +17,9 @@ #include #include #include +#include #include -#ifdef HAVE_SYS_UTSNAME_H -# include -#endif - #define NOTOK (-1) #define OK 0 @@ -249,9 +246,6 @@ LocalName (void) { static char buffer[BUFSIZ] = ""; struct addrinfo hints, *res; -#ifdef HAVE_UNAME - struct utsname name; -#endif /* check if we have cached the local name */ if (buffer[0]) @@ -264,14 +258,8 @@ LocalName (void) strncpy (buffer, localname, sizeof(buffer)); } else { memset(buffer, 0, sizeof(buffer)); -#ifdef HAVE_UNAME - /* first get our local name */ - uname (&name); - strncpy (buffer, name.nodename, sizeof(buffer) - 1); -#else /* first get our local name */ gethostname (buffer, sizeof(buffer) - 1); -#endif /* now fully qualify our name */ memset(&hints, 0, sizeof(hints)); @@ -306,10 +294,6 @@ SystemName (void) { static char buffer[BUFSIZ] = ""; -#ifdef HAVE_UNAME - struct utsname name; -#endif - /* check if we have cached the system name */ if (buffer[0]) return buffer; @@ -322,12 +306,7 @@ SystemName (void) return buffer; } -#ifdef HAVE_UNAME - uname (&name); - strncpy (buffer, name.nodename, sizeof(buffer)); -#else gethostname (buffer, sizeof(buffer)); -#endif return buffer; }