Move 'protocols' routines from 'inet' into 'nss'

The getprotoby* and getprotoent* routines are entry points for nss
functionality.  This commit moves them from the 'inet' subdirectory to
'nss'.
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

diff --git a/inet/Makefile b/inet/Makefile
index 776cbfa0fd2ac5a1488e47f37859ac14a978d93b..dab7182a11db872575601f4542b3dbb63a62011f 100644 (file)
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -48,12 +48,6 @@ routines := \
   ether_ntoa_r \
   getipv4sourcefilter \
   getnameinfo \
-  getproto \
-  getproto_r \
-  getprtent \
-  getprtent_r \
-  getprtname \
-  getprtname_r \
   getrpcbyname \
   getrpcbyname_r \
   getrpcbynumber \
@@ -142,8 +136,6 @@ CFLAGS-getrpcent_r.c += -fexceptions
 CFLAGS-getrpcent.c += -fexceptions
 CFLAGS-getservent_r.c += -fexceptions
 CFLAGS-getservent.c += -fexceptions
-CFLAGS-getprtent_r.c += -fexceptions
-CFLAGS-getprtent.c += -fexceptions
 CFLAGS-either_ntoh.c += -fexceptions
 CFLAGS-either_hton.c += -fexceptions
 CFLAGS-in6_addr.c += $(config-cflags-wno-ignored-attributes)

diff --git a/inet/Versions b/inet/Versions
index 051b305e48f401c585e33f360943c44b6d6f021c..c0c64e1543cdc80dd0aa6e6dcec79ac9ee4b2559 100644 (file)
--- a/inet/Versions
+++ b/inet/Versions
@@ -15,8 +15,6 @@ libc {
 
     # g*
     getdomainname;
-    getprotobyname; getprotobyname_r; getprotobynumber;
-    getprotobynumber_r; getprotoent; getprotoent_r;
     getservbyname; getservbyname_r; getservbyport;
     getservbyport_r; getservent; getservent_r;
 
@@ -48,8 +46,7 @@ libc {
     # g*
     getaliasbyname_r; getaliasent_r; gethostbyaddr_r; gethostbyname2_r;
     gethostbyname_r; gethostent_r; getnetbyaddr_r; getnetbyname_r;
-    getnetent_r; getprotobyname_r; getprotobynumber_r;
-    getprotoent_r; getservbyname_r;
+    getnetent_r; getservbyname_r;
     getservbyport_r;
     getservent_r;
   }

diff --git a/inet/getproto.c b/inet/getproto.c
deleted file mode 100644 (file)
index 297d67d..0000000
--- a/inet/getproto.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (C) 1996-2023 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
-   <https://www.gnu.org/licenses/>.  */
-
-#include <netdb.h>
-
-
-#define LOOKUP_TYPE    struct protoent
-#define FUNCTION_NAME  getprotobynumber
-#define DATABASE_NAME  protocols
-#define ADD_PARAMS     int proto
-#define ADD_VARIABLES  proto
-#define BUFLEN         1024
-
-/* There is no nscd support for the protocols file.  */
-#undef USE_NSCD
-
-#include "../nss/getXXbyYY.c"

diff --git a/inet/getproto_r.c b/inet/getproto_r.c
deleted file mode 100644 (file)
index 789d3dd..0000000
--- a/inet/getproto_r.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (C) 1996-2023 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
-   <https://www.gnu.org/licenses/>.  */
-
-#include <netdb.h>
-
-
-#define LOOKUP_TYPE            struct protoent
-#define FUNCTION_NAME          getprotobynumber
-#define DATABASE_NAME          protocols
-#define ADD_PARAMS             int proto
-#define ADD_VARIABLES          proto
-
-/* There is no nscd support for the protocols file.  */
-#undef USE_NSCD
-
-#include "../nss/getXXbyYY_r.c"

diff --git a/inet/getprtent.c b/inet/getprtent.c
deleted file mode 100644 (file)
index 83df7d8..0000000
--- a/inet/getprtent.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright (C) 1996-2023 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
-   <https://www.gnu.org/licenses/>.  */
-
-#include <netdb.h>
-
-
-#define LOOKUP_TYPE    struct protoent
-#define        GETFUNC_NAME    getprotoent
-#define BUFLEN         1024
-
-/* There is no nscd support for the protocols file.  */
-#undef USE_NSCD
-
-#include "../nss/getXXent.c"

diff --git a/inet/getprtent_r.c b/inet/getprtent_r.c
deleted file mode 100644 (file)
index 39975ca..0000000
--- a/inet/getprtent_r.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 1996-2023 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
-   <https://www.gnu.org/licenses/>.  */
-
-#include <netdb.h>
-
-
-#define LOOKUP_TYPE            struct protoent
-#define SETFUNC_NAME           setprotoent
-#define        GETFUNC_NAME            getprotoent
-#define        ENDFUNC_NAME            endprotoent
-#define DATABASE_NAME          protocols
-#define STAYOPEN               int stayopen
-#define STAYOPEN_VAR           stayopen
-
-/* There is no nscd support for the protocols file.  */
-#undef USE_NSCD
-
-#include "../nss/getXXent_r.c"

diff --git a/inet/getprtname.c b/inet/getprtname.c
deleted file mode 100644 (file)
index 8206347..0000000
--- a/inet/getprtname.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (C) 1996-2023 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
-   <https://www.gnu.org/licenses/>.  */
-
-#include <netdb.h>
-
-
-#define LOOKUP_TYPE    struct protoent
-#define FUNCTION_NAME  getprotobyname
-#define DATABASE_NAME  protocols
-#define ADD_PARAMS     const char *name
-#define ADD_VARIABLES  name
-#define BUFLEN         1024
-
-/* There is no nscd support for the protocols file.  */
-#undef USE_NSCD
-
-#include "../nss/getXXbyYY.c"

diff --git a/inet/getprtname_r.c b/inet/getprtname_r.c
deleted file mode 100644 (file)
index a69d6a5..0000000
--- a/inet/getprtname_r.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (C) 1996-2023 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
-   <https://www.gnu.org/licenses/>.  */
-
-#include <netdb.h>
-
-
-#define LOOKUP_TYPE            struct protoent
-#define FUNCTION_NAME          getprotobyname
-#define DATABASE_NAME          protocols
-#define ADD_PARAMS             const char *name
-#define ADD_VARIABLES          name
-
-/* There is no nscd support for the protocols file.  */
-#undef USE_NSCD
-
-#include "../nss/getXXbyYY_r.c"

diff --git a/nss/Makefile b/nss/Makefile
index 023a11fa4becdc80179d13cbc102ee704c88ea4a..df22d3655c97b49b9ee76d111de15e0e0c3db40e 100644 (file)
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -178,6 +178,21 @@ CFLAGS-getnetent.c += -fexceptions
 CFLAGS-getnetent_r.c += -fexceptions
 endif
 
+# protocols routines:
+routines += \
+  getproto \
+  getproto_r \
+  getprtent \
+  getprtent_r \
+  getprtname \
+  getprtname_r \
+  # routines
+
+ifeq ($(have-thread-library),yes)
+CFLAGS-getprtent_r.c += -fexceptions
+CFLAGS-getprtent.c += -fexceptions
+endif
+
 # pwd routines:
 routines += \
   fgetpwent \

diff --git a/nss/Versions b/nss/Versions
index 95219f0fc780c8c63293a91065972ae9b59faf40..c5de97fb53d8d6657835f58aecc6393fd829e0aa 100644 (file)
--- a/nss/Versions
+++ b/nss/Versions
@@ -27,6 +27,8 @@ libc {
     getnetgrent; getnetgrent_r;
     getnetbyaddr; getnetbyaddr_r; getnetbyname; getnetbyname_r;
     getnetent; getnetent_r;
+    getprotobyname; getprotobyname_r; getprotobynumber;
+    getprotobynumber_r; getprotoent; getprotoent_r;
     getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r;
     getspent; getspent_r; getspnam; getspnam_r;
 
@@ -58,6 +60,7 @@ libc {
     # g*
     getgrent_r; getgrgid_r; getgrnam_r;
     getnetgrent_r;
+    getprotobyname_r; getprotobynumber_r; getprotoent_r;
     getpwent_r; getpwuid_r; getpwnam_r;
     getspent_r; getspnam_r;
   }

diff --git a/nss/getproto.c b/nss/getproto.c
new file mode 100644 (file)
index 0000000..297d67d
--- /dev/null
+++ b/nss/getproto.c
@@ -0,0 +1,31 @@
+/* Copyright (C) 1996-2023 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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <netdb.h>
+
+
+#define LOOKUP_TYPE    struct protoent
+#define FUNCTION_NAME  getprotobynumber
+#define DATABASE_NAME  protocols
+#define ADD_PARAMS     int proto
+#define ADD_VARIABLES  proto
+#define BUFLEN         1024
+
+/* There is no nscd support for the protocols file.  */
+#undef USE_NSCD
+
+#include "../nss/getXXbyYY.c"

diff --git a/nss/getproto_r.c b/nss/getproto_r.c
new file mode 100644 (file)
index 0000000..789d3dd
--- /dev/null
+++ b/nss/getproto_r.c
@@ -0,0 +1,30 @@
+/* Copyright (C) 1996-2023 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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <netdb.h>
+
+
+#define LOOKUP_TYPE            struct protoent
+#define FUNCTION_NAME          getprotobynumber
+#define DATABASE_NAME          protocols
+#define ADD_PARAMS             int proto
+#define ADD_VARIABLES          proto
+
+/* There is no nscd support for the protocols file.  */
+#undef USE_NSCD
+
+#include "../nss/getXXbyYY_r.c"

diff --git a/nss/getprtent.c b/nss/getprtent.c
new file mode 100644 (file)
index 0000000..83df7d8
--- /dev/null
+++ b/nss/getprtent.c
@@ -0,0 +1,28 @@
+/* Copyright (C) 1996-2023 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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <netdb.h>
+
+
+#define LOOKUP_TYPE    struct protoent
+#define        GETFUNC_NAME    getprotoent
+#define BUFLEN         1024
+
+/* There is no nscd support for the protocols file.  */
+#undef USE_NSCD
+
+#include "../nss/getXXent.c"

diff --git a/nss/getprtent_r.c b/nss/getprtent_r.c
new file mode 100644 (file)
index 0000000..39975ca
--- /dev/null
+++ b/nss/getprtent_r.c
@@ -0,0 +1,32 @@
+/* Copyright (C) 1996-2023 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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <netdb.h>
+
+
+#define LOOKUP_TYPE            struct protoent
+#define SETFUNC_NAME           setprotoent
+#define        GETFUNC_NAME            getprotoent
+#define        ENDFUNC_NAME            endprotoent
+#define DATABASE_NAME          protocols
+#define STAYOPEN               int stayopen
+#define STAYOPEN_VAR           stayopen
+
+/* There is no nscd support for the protocols file.  */
+#undef USE_NSCD
+
+#include "../nss/getXXent_r.c"

diff --git a/nss/getprtname.c b/nss/getprtname.c
new file mode 100644 (file)
index 0000000..8206347
--- /dev/null
+++ b/nss/getprtname.c
@@ -0,0 +1,31 @@
+/* Copyright (C) 1996-2023 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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <netdb.h>
+
+
+#define LOOKUP_TYPE    struct protoent
+#define FUNCTION_NAME  getprotobyname
+#define DATABASE_NAME  protocols
+#define ADD_PARAMS     const char *name
+#define ADD_VARIABLES  name
+#define BUFLEN         1024
+
+/* There is no nscd support for the protocols file.  */
+#undef USE_NSCD
+
+#include "../nss/getXXbyYY.c"

diff --git a/nss/getprtname_r.c b/nss/getprtname_r.c
new file mode 100644 (file)
index 0000000..a69d6a5
--- /dev/null
+++ b/nss/getprtname_r.c
@@ -0,0 +1,30 @@
+/* Copyright (C) 1996-2023 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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <netdb.h>
+
+
+#define LOOKUP_TYPE            struct protoent
+#define FUNCTION_NAME          getprotobyname
+#define DATABASE_NAME          protocols
+#define ADD_PARAMS             const char *name
+#define ADD_VARIABLES          name
+
+/* There is no nscd support for the protocols file.  */
+#undef USE_NSCD
+
+#include "../nss/getXXbyYY_r.c"