From 1be726f88070930f7ff88e3124af6c9b513fdf53 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 22 May 2008 16:09:48 +0000 Subject: - rename to match the setdomainname filename --- libc/sysdeps/linux/common/getdnnm.c | 47 ------------------------------- libc/sysdeps/linux/common/getdomainname.c | 47 +++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 libc/sysdeps/linux/common/getdnnm.c create mode 100644 libc/sysdeps/linux/common/getdomainname.c diff --git a/libc/sysdeps/linux/common/getdnnm.c b/libc/sysdeps/linux/common/getdnnm.c deleted file mode 100644 index d98651a97..000000000 --- a/libc/sysdeps/linux/common/getdnnm.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2000-2006 Erik Andersen - * - * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. - */ - -#include -#include -#include -#include -#include -#include - -#if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_UNIX98) -/* Experimentally off - libc_hidden_proto(strlen) */ -/* Experimentally off - libc_hidden_proto(strcpy) */ -libc_hidden_proto(uname) - -libc_hidden_proto(getdomainname) -int getdomainname(char *name, size_t len) -{ - struct utsname uts; - - if (name == NULL) { - __set_errno(EINVAL); - return -1; - } - - if (uname(&uts) == -1) return -1; - -#ifdef __USE_GNU - if (strlen(uts.domainname)+1 > len) { -#else - if (strlen(uts.__domainname)+1 > len) { -#endif - __set_errno(EINVAL); - return -1; - } -#ifdef __USE_GNU - strcpy(name, uts.domainname); -#else - strcpy(name, uts.__domainname); -#endif - return 0; -} -libc_hidden_def(getdomainname) -#endif diff --git a/libc/sysdeps/linux/common/getdomainname.c b/libc/sysdeps/linux/common/getdomainname.c new file mode 100644 index 000000000..d98651a97 --- /dev/null +++ b/libc/sysdeps/linux/common/getdomainname.c @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2000-2006 Erik Andersen + * + * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. + */ + +#include +#include +#include +#include +#include +#include + +#if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_UNIX98) +/* Experimentally off - libc_hidden_proto(strlen) */ +/* Experimentally off - libc_hidden_proto(strcpy) */ +libc_hidden_proto(uname) + +libc_hidden_proto(getdomainname) +int getdomainname(char *name, size_t len) +{ + struct utsname uts; + + if (name == NULL) { + __set_errno(EINVAL); + return -1; + } + + if (uname(&uts) == -1) return -1; + +#ifdef __USE_GNU + if (strlen(uts.domainname)+1 > len) { +#else + if (strlen(uts.__domainname)+1 > len) { +#endif + __set_errno(EINVAL); + return -1; + } +#ifdef __USE_GNU + strcpy(name, uts.domainname); +#else + strcpy(name, uts.__domainname); +#endif + return 0; +} +libc_hidden_def(getdomainname) +#endif -- cgit v1.2.3