summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-03-29 09:20:00 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-03-29 09:20:00 (GMT)
commit1d448cff653a9a68f6320d01c9f0505385aa38bd (patch)
treed6495337a913676898b51fa9f3f3cb83bce8a00c
parent3d0e7794ebf73c0dd1485c0df406084c46c3da1f (diff)
downloadbusybox-1d448cff653a9a68f6320d01c9f0505385aa38bd.tar.gz
busybox-1d448cff653a9a68f6320d01c9f0505385aa38bd.tar.bz2
provide safe_gethostname() for non-linux systems
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--libbb/safe_gethostname.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libbb/safe_gethostname.c b/libbb/safe_gethostname.c
index e93254b..05e0954 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
}