From 1501c7892ac347bb74333cf26ece06009fbb6b7c Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 22 May 2008 16:21:02 +0000 Subject: - rename to match the set*() function's filename --- libc/sysdeps/linux/common/gethostname.c | 37 +++++++++++++++++++++++++++++++++ libc/sysdeps/linux/common/gethstnm.c | 37 --------------------------------- 2 files changed, 37 insertions(+), 37 deletions(-) create mode 100644 libc/sysdeps/linux/common/gethostname.c delete mode 100644 libc/sysdeps/linux/common/gethstnm.c (limited to 'libc/sysdeps') diff --git a/libc/sysdeps/linux/common/gethostname.c b/libc/sysdeps/linux/common/gethostname.c new file mode 100644 index 000000000..8fc14ff32 --- /dev/null +++ b/libc/sysdeps/linux/common/gethostname.c @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2000-2006 Erik Andersen + * + * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. + */ + +#include +#include +#include +#include + +libc_hidden_proto(gethostname) + +/* Experimentally off - libc_hidden_proto(strlen) */ +/* Experimentally off - libc_hidden_proto(strcpy) */ +libc_hidden_proto(uname) + +int +gethostname(char *name, size_t len) +{ + struct utsname uts; + + if (name == NULL) { + __set_errno(EINVAL); + return -1; + } + + if (uname(&uts) == -1) return -1; + + if (strlen(uts.nodename)+1 > len) { + __set_errno(EINVAL); + return -1; + } + strcpy(name, uts.nodename); + return 0; +} +libc_hidden_def(gethostname) diff --git a/libc/sysdeps/linux/common/gethstnm.c b/libc/sysdeps/linux/common/gethstnm.c deleted file mode 100644 index 8fc14ff32..000000000 --- a/libc/sysdeps/linux/common/gethstnm.c +++ /dev/null @@ -1,37 +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 - -libc_hidden_proto(gethostname) - -/* Experimentally off - libc_hidden_proto(strlen) */ -/* Experimentally off - libc_hidden_proto(strcpy) */ -libc_hidden_proto(uname) - -int -gethostname(char *name, size_t len) -{ - struct utsname uts; - - if (name == NULL) { - __set_errno(EINVAL); - return -1; - } - - if (uname(&uts) == -1) return -1; - - if (strlen(uts.nodename)+1 > len) { - __set_errno(EINVAL); - return -1; - } - strcpy(name, uts.nodename); - return 0; -} -libc_hidden_def(gethostname) -- cgit v1.2.3