[Glibc-bsd-commits] r2625 - trunk/glibc-ports/kfreebsd

[Petr Salinger]

Author: ps-guest
Date: 2009-07-14 11:32:44 +0000 (Tue, 14 Jul 2009)
New Revision: 2625

Added:
   trunk/glibc-ports/kfreebsd/getdomain.c
   trunk/glibc-ports/kfreebsd/setdomain.c
Removed:
   trunk/glibc-ports/kfreebsd/getdomainname.c
   trunk/glibc-ports/kfreebsd/setdomainname.c
Log:
rename {g,s}etdomainname.c -> {g,s}etdomain.c
otherwise the stub is generated, leads to FTBFS of tua



Copied: trunk/glibc-ports/kfreebsd/getdomain.c (from rev 2624, trunk/glibc-ports/kfreebsd/getdomainname.c)
===================================================================
--- trunk/glibc-ports/kfreebsd/getdomain.c	                        (rev 0)
+++ trunk/glibc-ports/kfreebsd/getdomain.c	2009-07-14 11:32:44 UTC (rev 2625)
@@ -0,0 +1,51 @@
+/* Copyright (C) 2009 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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <unistd.h>
+#include <sys/sysctl.h>
+#include <errno.h>
+
+/* Put the name of the current domain 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
+__getdomainname (char *name, size_t len)
+{
+  /* Fetch the "kern.domainname" sysctl value.  */
+  int request[2] = { CTL_KERN, KERN_NISDOMAINNAME };
+  size_t result_len = len;
+
+  if (__sysctl (request, 2, name, &result_len, NULL, 0) < 0)
+    {
+      if (errno == ENOMEM)
+	__set_errno (ENAMETOOLONG);
+      return -1;
+    }
+
+  if (result_len >= len)
+    {
+      __set_errno (ENAMETOOLONG);
+      return -1;
+    }
+
+  name[result_len] = '\0';
+  return 0;
+}
+
+weak_alias (__getdomainname getdomainname)

Deleted: trunk/glibc-ports/kfreebsd/getdomainname.c
===================================================================
--- trunk/glibc-ports/kfreebsd/getdomainname.c	2009-07-11 17:51:07 UTC (rev 2624)
+++ trunk/glibc-ports/kfreebsd/getdomainname.c	2009-07-14 11:32:44 UTC (rev 2625)
@@ -1,51 +0,0 @@
-/* Copyright (C) 2009 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, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <unistd.h>
-#include <sys/sysctl.h>
-#include <errno.h>
-
-/* Put the name of the current domain 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
-__getdomainname (char *name, size_t len)
-{
-  /* Fetch the "kern.domainname" sysctl value.  */
-  int request[2] = { CTL_KERN, KERN_NISDOMAINNAME };
-  size_t result_len = len;
-
-  if (__sysctl (request, 2, name, &result_len, NULL, 0) < 0)
-    {
-      if (errno == ENOMEM)
-	__set_errno (ENAMETOOLONG);
-      return -1;
-    }
-
-  if (result_len >= len)
-    {
-      __set_errno (ENAMETOOLONG);
-      return -1;
-    }
-
-  name[result_len] = '\0';
-  return 0;
-}
-
-weak_alias (__getdomainname getdomainname)

Copied: trunk/glibc-ports/kfreebsd/setdomain.c (from rev 2624, trunk/glibc-ports/kfreebsd/setdomainname.c)
===================================================================
--- trunk/glibc-ports/kfreebsd/setdomain.c	                        (rev 0)
+++ trunk/glibc-ports/kfreebsd/setdomain.c	2009-07-14 11:32:44 UTC (rev 2625)
@@ -0,0 +1,37 @@
+/* Copyright (C) 2002 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Bruno Haible <bruno at clisp.org>, 2002.
+
+   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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <unistd.h>
+#include <sys/sysctl.h>
+
+/* Set the name of the current domain to NAME, which is LEN bytes long
+   (excluding a possible trailing NUL byte).  This call is restricted to
+   the super-user.  */
+
+int
+setdomainname (const char *name, size_t len)
+{
+  /* Set the "kern.domainname" sysctl value.  */
+  int request[2] = { CTL_KERN, KERN_NISDOMAINNAME };
+
+  if (__sysctl (request, 2, NULL, NULL, (void *) name, len) < 0)
+    return -1;
+
+  return 0;
+}

Deleted: trunk/glibc-ports/kfreebsd/setdomainname.c
===================================================================
--- trunk/glibc-ports/kfreebsd/setdomainname.c	2009-07-11 17:51:07 UTC (rev 2624)
+++ trunk/glibc-ports/kfreebsd/setdomainname.c	2009-07-14 11:32:44 UTC (rev 2625)
@@ -1,37 +0,0 @@
-/* Copyright (C) 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Bruno Haible <bruno at clisp.org>, 2002.
-
-   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, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <unistd.h>
-#include <sys/sysctl.h>
-
-/* Set the name of the current domain to NAME, which is LEN bytes long
-   (excluding a possible trailing NUL byte).  This call is restricted to
-   the super-user.  */
-
-int
-setdomainname (const char *name, size_t len)
-{
-  /* Set the "kern.domainname" sysctl value.  */
-  int request[2] = { CTL_KERN, KERN_NISDOMAINNAME };
-
-  if (__sysctl (request, 2, NULL, NULL, (void *) name, len) < 0)
-    return -1;
-
-  return 0;
-}