This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Move sysdeps/unix/sysv/gethostname.c to sysdeps/posix/
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: libc-alpha at sourceware dot org
- Date: Sat, 21 Apr 2012 13:51:59 +0000 (UTC)
- Subject: Move sysdeps/unix/sysv/gethostname.c to sysdeps/posix/
The sysdeps/unix/sysv directory now contains only two C source files,
getdents.c and gethostname.c (plus syscalls.list and the "linux"
subdirectory). I've proposed the removal, as unused, of getdents.c in
<http://sourceware.org/ml/libc-alpha/2012-04/msg00778.html>. The
other C file there, gethostname.c, is actually used on Linux, but
there is nothing SysV-specific about it; using uname like it does is
generic POSIX. So I think sysdeps/posix is a better location for this
file.
I propose this patch to move this file to sysdeps/posix. Tested
x86_64.
2012-04-21 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/gethostname.c: Move to ...
* sysdeps/posix/gethostname.c: ... here.
diff --git a/sysdeps/posix/gethostname.c b/sysdeps/posix/gethostname.c
new file mode 100644
index 0000000..a63845b
--- /dev/null
+++ b/sysdeps/posix/gethostname.c
@@ -0,0 +1,48 @@
+/* Copyright (C) 1992, 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/utsname.h>
+
+/* Put the name of the current host in no more than LEN bytes of NAME.
+ The result is null-terminated if LEN is large enough for the full
+ name and the terminator. */
+int
+__gethostname (name, len)
+ char *name;
+ size_t len;
+{
+ struct utsname buf;
+ size_t node_len;
+
+ if (uname (&buf))
+ return -1;
+
+ node_len = strlen (buf.nodename) + 1;
+ memcpy (name, buf.nodename, len < node_len ? len : node_len);
+
+ if (node_len > len)
+ {
+ __set_errno (ENAMETOOLONG);
+ return -1;
+ }
+ return 0;
+}
+
+weak_alias (__gethostname, gethostname)
diff --git a/sysdeps/unix/sysv/gethostname.c b/sysdeps/unix/sysv/gethostname.c
deleted file mode 100644
index a63845b..0000000
--- a/sysdeps/unix/sysv/gethostname.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright (C) 1992, 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/utsname.h>
-
-/* Put the name of the current host in no more than LEN bytes of NAME.
- The result is null-terminated if LEN is large enough for the full
- name and the terminator. */
-int
-__gethostname (name, len)
- char *name;
- size_t len;
-{
- struct utsname buf;
- size_t node_len;
-
- if (uname (&buf))
- return -1;
-
- node_len = strlen (buf.nodename) + 1;
- memcpy (name, buf.nodename, len < node_len ? len : node_len);
-
- if (node_len > len)
- {
- __set_errno (ENAMETOOLONG);
- return -1;
- }
- return 0;
-}
-
-weak_alias (__gethostname, gethostname)
--
Joseph S. Myers
joseph@codesourcery.com