mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-28 12:13:37 +08:00
80d9be8122
This patch converts various miscellaneous functions definitions in glibc, found with grep and not covered by my previous scripted conversions, from old-style K&R to prototype-style. These changes were made manually. This is not necessarily exhaustive as formatting variants may have prevented my grep from finding some such definitions. Regarding the changes to files from GMP, they may originally have been omitted when removing __STDC__ conditionals because of the files coming from another package, but (a) GMP no longer has __STDC__ conditionals there anyway and (b) we don't try to keep these files verbatim in sync with GMP (and there are licensing differences), so making the change to them in glibc seems reasonable. Tested for x86_64 and x86 (testsuite - this patch affects files containing assertions). * debug/fortify_fail.c (__fortify_fail): Convert to prototype-style function definition. Use internal_function. * libio/genops.c (save_for_backup): Convert to prototype-style function definition. * libio/wgenops.c (save_for_wbackup): Likewise. * login/grantpt.c (grantpt): Likewise. * login/ptsname.c (ptsname): Likewise. (__ptsname_r): Likewise. * login/unlockpt.c (unlockpt): Likewise. * mach/msgserver.c (__mach_msg_server): Likewise. * misc/efgcvt.c (__APPEND (FUNC_PREFIX, fcvt)): Likewise. (__APPEND (FUNC_PREFIX, ecvt)): Likewise. (__APPEND (FUNC_PREFIX, gcvt)): Likewise. * misc/efgcvt_r.c (__APPEND (FUNC_PREFIX, fcvt_r)): Likewise. (__APPEND (FUNC_PREFIX, ecvt_r)): Likewise. * nptl/cleanup_compat.c (_pthread_cleanup_push): Likewise. * nptl/cleanup_defer_compat.c (_pthread_cleanup_push_defer): Likewise. * nptl/libc_pthread_init.c (__libc_pthread_init): Likewise. Use internal_function. * nptl/pthread_atfork.c (__pthread_atfork): Convert to prototype-style function definition. * nptl/pthread_create.c (__pthread_create_2_1): Likewise. [SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)] (__pthread_create_2_0): Likewise. * nptl/pthread_key_create.c (__pthread_key_create): Likewise. * nptl/register-atfork.c (__register_atfork): Likewise. * posix/glob.c (glob): Likewise. * posix/regcomp.c (re_comp): Likewise. * posix/regexec.c (re_exec): Likewise. * stdlib/add_n.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * stdlib/cmp.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * stdlib/divmod_1.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * stdlib/divrem.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * stdlib/lshift.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * stdlib/mod_1.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * stdlib/mul.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * stdlib/mul_n.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * stdlib/rshift.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * stdlib/strtod.c (INTERNAL (STRTOF)): Convert to prototype-style function definition. (STRTOF): Likewise. * stdlib/strtod_l.c (__STRTOF): Likewise. * stdlib/strtol.c (INTERNAL (strtol)): Likewise. * stdlib/strtol_l.c (INTERNAL (__strtol_l)): Likewise. (__strtol_l): Likewise. * stdlib/sub_n.c [__STDC__]: Make code unconditional. [!__STDC__]: Remove conditional code. * string/memrchr.c (MEMRCHR): Convert to prototype-style function definition. * string/strcasecmp.c (LOCALE_PARAM_DECL): Remove macro. [USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument type. (__strcasecmp): Convert to prototype-style function definition. * string/strncase.c (LOCALE_PARAM_DECL): Remove macro. [USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument type. (__strncasecmp): Convert to prototype-style function definition. * sunrpc/pm_getport.c (__libc_rpc_getport): Likewise. * sunrpc/xdr.c (xdr_union): Likewise. * sunrpc/xdr_array.c (xdr_array): Likewise. * sunrpc/xdr_ref.c (xdr_reference): Likewise. * sysdeps/m68k/m680x0/fpu/s_atan.c (__CONCATX(__,FUNC)): Likewise. * sysdeps/m68k/m680x0/fpu/s_isinf.c (__CONCATX(__,FUNC)): Likewise. * sysdeps/m68k/m680x0/fpu/s_scalbn.c (__CONCATX(__scalbn,suffix): Likewise. * sysdeps/m68k/m680x0/fpu/s_sincos.c (CONCATX(__,FUNC)): Likewise. * sysdeps/unix/sysv/linux/i386/scandir64.c (__old_scandir64): Likewise. * time/strftime_l.c (LOCALE_PARAM_DECL): Remove macro. (LOCALE_PARAM_PROTO): Likewise. [_LIBC && USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument type. (ut_argument_spec): Remove macro. (ut_argument_spec_iso): Rename to ut_argument_spec. (memcpy_lowcase): Use LOCALE_PARAM in declaration. Convert to prototype-style function definition. (memcpy_uppcase): Likewise. (__strftime_internal): Likewise. (my_strftime): Likewise. * time/strptime_l.c (LOCALE_PARAM_PROTO): Remove macro. (LOCALE_PARAM_DECL): Likewise. [_LIBC] (LOCALE_PARAM): Include argument type. (__strptime_internal): Convert to prototype-style function definition. (strptime): Likewise. * wcsmbs/wcscasecmp.c (LOCALE_PARAM_DECL): Remove macro. [USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument type. (__wcscasecmp): Convert to prototype-style function definition. * wcsmbs/wcsncase.c (LOCALE_PARAM_DECL): Remove macro. [USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument type. (__wcsncasecmp): Convert to prototype-style function definition.
156 lines
4.8 KiB
C
156 lines
4.8 KiB
C
/*
|
|
* pmap_getport.c
|
|
* Client interface to pmap rpc service.
|
|
*
|
|
* Copyright (c) 2010, Oracle America, Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer in the documentation and/or other materials
|
|
* provided with the distribution.
|
|
* * Neither the name of the "Oracle America, Inc." nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
|
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
|
|
* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <stdbool.h>
|
|
#include <unistd.h>
|
|
#include <rpc/rpc.h>
|
|
#include <rpc/pmap_prot.h>
|
|
#include <rpc/pmap_clnt.h>
|
|
#include <sys/socket.h>
|
|
|
|
/*
|
|
* Create a socket that is locally bound to a non-reserve port. For
|
|
* any failures, -1 is returned which will cause the RPC code to
|
|
* create the socket.
|
|
*/
|
|
int
|
|
internal_function
|
|
__get_socket (struct sockaddr_in *saddr)
|
|
{
|
|
int so = __socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
|
|
if (so < 0)
|
|
return -1;
|
|
|
|
struct sockaddr_in laddr;
|
|
socklen_t namelen = sizeof (laddr);
|
|
laddr.sin_family = AF_INET;
|
|
laddr.sin_port = 0;
|
|
laddr.sin_addr.s_addr = htonl (INADDR_ANY);
|
|
|
|
int cc = __bind (so, (struct sockaddr *) &laddr, namelen);
|
|
if (__glibc_unlikely (cc < 0))
|
|
{
|
|
fail:
|
|
__close (so);
|
|
return -1;
|
|
}
|
|
|
|
cc = __connect (so, (struct sockaddr *) saddr, namelen);
|
|
if (__glibc_unlikely (cc < 0))
|
|
goto fail;
|
|
|
|
return so;
|
|
}
|
|
|
|
|
|
/*
|
|
* Find the mapped port for program,version.
|
|
* Internal version with additional parameters.
|
|
* Calls the pmap service remotely to do the lookup.
|
|
* Returns 0 if no map exists.
|
|
*/
|
|
u_short
|
|
internal_function
|
|
__libc_rpc_getport (struct sockaddr_in *address, u_long program,
|
|
u_long version, u_int protocol, time_t timeout_sec,
|
|
time_t tottimeout_sec)
|
|
{
|
|
const struct timeval timeout = {timeout_sec, 0};
|
|
const struct timeval tottimeout = {tottimeout_sec, 0};
|
|
|
|
u_short port = 0;
|
|
int socket = -1;
|
|
CLIENT *client;
|
|
struct pmap parms;
|
|
bool closeit = false;
|
|
|
|
address->sin_port = htons (PMAPPORT);
|
|
if (protocol == IPPROTO_TCP)
|
|
{
|
|
/* Don't need a reserved port to get ports from the portmapper. */
|
|
socket = __get_socket(address);
|
|
if (socket != -1)
|
|
closeit = true;
|
|
client = clnttcp_create (address, PMAPPROG, PMAPVERS, &socket,
|
|
RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
|
|
}
|
|
else
|
|
client = clntudp_bufcreate (address, PMAPPROG, PMAPVERS, timeout,
|
|
&socket, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
|
|
if (client != (CLIENT *) NULL)
|
|
{
|
|
struct rpc_createerr *ce = &get_rpc_createerr ();
|
|
parms.pm_prog = program;
|
|
parms.pm_vers = version;
|
|
parms.pm_prot = protocol;
|
|
parms.pm_port = 0; /* not needed or used */
|
|
if (CLNT_CALL (client, PMAPPROC_GETPORT, (xdrproc_t)xdr_pmap,
|
|
(caddr_t)&parms, (xdrproc_t)xdr_u_short,
|
|
(caddr_t)&port, tottimeout) != RPC_SUCCESS)
|
|
{
|
|
ce->cf_stat = RPC_PMAPFAILURE;
|
|
clnt_geterr (client, &ce->cf_error);
|
|
}
|
|
else if (port == 0)
|
|
{
|
|
ce->cf_stat = RPC_PROGNOTREGISTERED;
|
|
}
|
|
CLNT_DESTROY (client);
|
|
}
|
|
/* We only need to close the socket here if we opened it. */
|
|
if (closeit)
|
|
(void) __close (socket);
|
|
address->sin_port = 0;
|
|
return port;
|
|
}
|
|
#ifdef EXPORT_RPC_SYMBOLS
|
|
libc_hidden_def (__libc_rpc_getport)
|
|
#else
|
|
libc_hidden_nolink_sunrpc (__libc_rpc_getport, GLIBC_PRIVATE)
|
|
#endif
|
|
|
|
|
|
/*
|
|
* Find the mapped port for program,version.
|
|
* Calls the pmap service remotely to do the lookup.
|
|
* Returns 0 if no map exists.
|
|
*/
|
|
u_short
|
|
pmap_getport (struct sockaddr_in *address, u_long program, u_long version,
|
|
u_int protocol)
|
|
{
|
|
return __libc_rpc_getport (address, program, version, protocol, 5, 60);
|
|
}
|
|
libc_hidden_nolink_sunrpc (pmap_getport, GLIBC_2_0)
|