Move sysdeps/unix/sysv/gethostname.c to sysdeps/posix/.

diff --git a/ChangeLog b/ChangeLog
index b33dbf226e81f1c52d8f5fad50528ea1c48bb3d6..1152f8c690d2046de0b8894084a2563de15ec8ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-04-23  Joseph Myers  <joseph@codesourcery.com>
 
+       * sysdeps/unix/sysv/gethostname.c: Move to ...
+       * sysdeps/posix/gethostname.c: ... here.
+
        * sysdeps/unix/execve.S: Remove file.
 
        * sysdeps/unix/_exit.S: Remove file.

diff --git a/sysdeps/posix/gethostname.c b/sysdeps/posix/gethostname.c
new file mode 100644 (file)
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 (file)
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)