diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-29 11:20:00 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-29 11:20:00 +0200 |
commit | 1d448cff653a9a68f6320d01c9f0505385aa38bd (patch) | |
tree | d6495337a913676898b51fa9f3f3cb83bce8a00c /libbb | |
parent | 3d0e7794ebf73c0dd1485c0df406084c46c3da1f (diff) |
provide safe_gethostname() for non-linux systems
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/safe_gethostname.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libbb/safe_gethostname.c b/libbb/safe_gethostname.c index e93254b2b..05e095448 100644 --- a/libbb/safe_gethostname.c +++ b/libbb/safe_gethostname.c @@ -59,12 +59,16 @@ char* FAST_FUNC safe_gethostname(void) */ char* FAST_FUNC safe_getdomainname(void) { -/* The field domainname of struct utsname is Linux specific. */ #if defined(__linux__) +/* The field domainname of struct utsname is Linux specific. */ struct utsname uts; uname(&uts); return xstrndup(!uts.domainname[0] ? "?" : uts.domainname, sizeof(uts.domainname)); #else - return xstrdup("?"); + /* We really don't care about people with domain names wider than most screens */ + char buf[256]; + int r = getdomainname(buf, sizeof(buf)); + buf[sizeof(buf)-1] = '\0'; + return xstrdup(r < 0 ? "?" : buf); #endif } |