diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-02-28 03:18:23 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-02-28 03:18:23 +0000 |
| commit | 675d62ac876ffe4719580d45b8c9469934ccf6d7 (patch) | |
| tree | e666bd4a1d816842c070e4928715d66b82655fc2 /libc/sysdeps/linux/common/getdnnm.c | |
| parent | fd666fca933f7241ff75d06ff36c9282fd443335 (diff) | |
| download | uClibc-alpine-675d62ac876ffe4719580d45b8c9469934ccf6d7.tar.bz2 uClibc-alpine-675d62ac876ffe4719580d45b8c9469934ccf6d7.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libc/sysdeps/linux/common/getdnnm.c')
| -rw-r--r-- | libc/sysdeps/linux/common/getdnnm.c | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/libc/sysdeps/linux/common/getdnnm.c b/libc/sysdeps/linux/common/getdnnm.c index aa4215f84..d4caec6ad 100644 --- a/libc/sysdeps/linux/common/getdnnm.c +++ b/libc/sysdeps/linux/common/getdnnm.c @@ -1,15 +1,24 @@ -#define uname __uname +/* + * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> + * + * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. + */ +#include <features.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #include <errno.h> -#define __USE_GNU #include <sys/utsname.h> +libc_hidden_proto(getdomainname) -int attribute_hidden -__getdomainname(char *name, size_t len) +libc_hidden_proto(strlen) +libc_hidden_proto(strcpy) +libc_hidden_proto(uname) + +int +getdomainname(char *name, size_t len) { struct utsname uts; @@ -20,11 +29,19 @@ __getdomainname(char *name, size_t len) if (uname(&uts) == -1) return -1; - if (__strlen(uts.domainname)+1 > len) { +#ifdef __USE_GNU + if (strlen(uts.domainname)+1 > len) { +#else + if (strlen(uts.__domainname)+1 > len) { +#endif __set_errno(EINVAL); return -1; } - __strcpy(name, uts.domainname); +#ifdef __USE_GNU + strcpy(name, uts.domainname); +#else + strcpy(name, uts.__domainname); +#endif return 0; } -strong_alias(__getdomainname,getdomainname) +libc_hidden_def(getdomainname) |