mirror of
git://sourceware.org/git/glibc.git
synced 2025-03-07 13:28:05 +08:00
The GNU Coding Standards specify that line breaks in expressions should go before an operator, not after one. This patch fixes various code to do this. It only changes code that appears to be mostly following GNU style anyway, not files and directories with substantially different formatting. It is not exhaustive even for files using GNU style (for example, changes to sysdeps files are deferred for subsequent cleanups). Some files changed are shared with gnulib, but most are specific to glibc. Changes were made manually, with places to change found by grep (so some cases, e.g. where the operator was followed by a comment at end of line, are particularly liable to have been missed by grep, but I did include cases where the operator was followed by backslash-newline). This patch generally does not attempt to address other coding style issues in the expressions changed (for example, missing spaces before '(', or lack of parentheses to ensure indentation of continuation lines properly reflects operator precedence). Tested for x86_64, and with build-many-glibcs.py. * benchtests/bench-memmem.c (simple_memmem): Break lines before rather than after operators. * benchtests/bench-skeleton.c (TIMESPEC_AFTER): Likewise. * crypt/md5.c (md5_finish_ctx): Likewise. * crypt/sha256.c (__sha256_finish_ctx): Likewise. * crypt/sha512.c (__sha512_finish_ctx): Likewise. * elf/cache.c (load_aux_cache): Likewise. * elf/dl-load.c (open_verify): Likewise. * elf/get-dynamic-info.h (elf_get_dynamic_info): Likewise. * elf/readelflib.c (process_elf_file): Likewise. * elf/rtld.c (dl_main): Likewise. * elf/sprof.c (generate_call_graph): Likewise. * hurd/ctty-input.c (_hurd_ctty_input): Likewise. * hurd/ctty-output.c (_hurd_ctty_output): Likewise. * hurd/dtable.c (reauth_dtable): Likewise. * hurd/getdport.c (__getdport): Likewise. * hurd/hurd/signal.h (_hurd_interrupted_rpc_timeout): Likewise. * hurd/hurd/sigpreempt.h (HURD_PREEMPT_SIGNAL_P): Likewise. * hurd/hurdfault.c (_hurdsig_fault_catch_exception_raise): Likewise. * hurd/hurdioctl.c (fioctl): Likewise. * hurd/hurdselect.c (_hurd_select): Likewise. * hurd/hurdsig.c (_hurdsig_abort_rpcs): Likewise. (STOPSIGS): Likewise. * hurd/hurdstartup.c (_hurd_startup): Likewise. * hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): Likewise. * hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise. * hurd/msgportdemux.c (msgport_server): Likewise. * hurd/setauth.c (_hurd_setauth): Likewise. * include/features.h (__GLIBC_USE_DEPRECATED_SCANF): Likewise. * libio/libioP.h [IO_DEBUG] (CHECK_FILE): Likewise. * locale/programs/ld-ctype.c (set_class_defaults): Likewise. * localedata/tests-mbwc/tst_swscanf.c (tst_swscanf): Likewise. * login/tst-utmp.c (do_check): Likewise. (simulate_login): Likewise. * mach/lowlevellock.h (lll_lock): Likewise. (lll_trylock): Likewise. * math/test-fenv.c (ALL_EXC): Likewise. * math/test-fenvinline.c (ALL_EXC): Likewise. * misc/sys/cdefs.h (__attribute_deprecated_msg__): Likewise. * nis/nis_call.c (__do_niscall3): Likewise. * nis/nis_callback.c (cb_prog_1): Likewise. * nis/nis_defaults.c (searchaccess): Likewise. * nis/nis_findserv.c (__nis_findfastest_with_timeout): Likewise. * nis/nis_ismember.c (internal_ismember): Likewise. * nis/nis_local_names.c (nis_local_principal): Likewise. * nis/nss_nis/nis-rpc.c (_nss_nis_getrpcbyname_r): Likewise. * nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_getnetgrent_r): Likewise. * nis/ypclnt.c (yp_match): Likewise. (yp_first): Likewise. (yp_next): Likewise. (yp_master): Likewise. (yp_order): Likewise. * nscd/hstcache.c (cache_addhst): Likewise. * nscd/initgrcache.c (addinitgroupsX): Likewise. * nss/nss_compat/compat-pwd.c (copy_pwd_changes): Likewise. (internal_getpwuid_r): Likewise. * nss/nss_compat/compat-spwd.c (copy_spwd_changes): Likewise. * posix/glob.h (__GLOB_FLAGS): Likewise. * posix/regcomp.c (peek_token): Likewise. (peek_token_bracket): Likewise. (parse_expression): Likewise. * posix/regexec.c (sift_states_iter_mb): Likewise. (check_node_accept_bytes): Likewise. * posix/tst-spawn3.c (do_test): Likewise. * posix/wordexp-test.c (testit): Likewise. * posix/wordexp.c (parse_tilde): Likewise. (exec_comm): Likewise. * posix/wordexp.h (__WRDE_FLAGS): Likewise. * resource/vtimes.c (TIMEVAL_TO_VTIMES): Likewise. * setjmp/sigjmp.c (__sigjmp_save): Likewise. * stdio-common/printf_fp.c (__printf_fp_l): Likewise. * stdio-common/tst-fileno.c (do_test): Likewise. * stdio-common/vfprintf-internal.c (vfprintf): Likewise. * stdlib/strfmon_l.c (__vstrfmon_l_internal): Likewise. * stdlib/strtod_l.c (round_and_return): Likewise. (____STRTOF_INTERNAL): Likewise. * stdlib/tst-strfrom.h (TEST_STRFROM): Likewise. * string/strcspn.c (STRCSPN): Likewise. * string/test-memmem.c (simple_memmem): Likewise. * termios/tcsetattr.c (tcsetattr): Likewise. * time/alt_digit.c (_nl_parse_alt_digit): Likewise. * time/asctime.c (asctime_internal): Likewise. * time/strptime_l.c (__strptime_internal): Likewise. * time/sys/time.h (timercmp): Likewise. * time/tzfile.c (__tzfile_compute): Likewise.
219 lines
5.9 KiB
C
219 lines
5.9 KiB
C
/* Copyright (C) 1997-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
|
|
|
|
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 <string.h>
|
|
#include <time.h>
|
|
#include <unistd.h>
|
|
#include <sys/ioctl.h>
|
|
#include <sys/socket.h>
|
|
#include <rpc/pmap_prot.h>
|
|
#include <rpc/pmap_clnt.h>
|
|
#include <rpcsvc/nis.h>
|
|
|
|
#include "nis_intern.h"
|
|
|
|
/* Private data kept per client handle, from sunrpc/clnt_udp.c */
|
|
struct cu_data
|
|
{
|
|
int cu_sock;
|
|
bool_t cu_closeit;
|
|
struct sockaddr_in cu_raddr;
|
|
int cu_rlen;
|
|
struct timeval cu_wait;
|
|
struct timeval cu_total;
|
|
struct rpc_err cu_error;
|
|
XDR cu_outxdrs;
|
|
u_int cu_xdrpos;
|
|
u_int cu_sendsz;
|
|
char *cu_outbuf;
|
|
u_int cu_recvsz;
|
|
char cu_inbuf[1];
|
|
};
|
|
|
|
|
|
/*
|
|
* 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_getnisport (struct sockaddr_in *address, u_long program,
|
|
u_long version, u_int protocol)
|
|
{
|
|
return __libc_rpc_getport (address, program, version, protocol, 1, 1);
|
|
}
|
|
|
|
/* This is now the public function, which should find the fastest server */
|
|
|
|
struct findserv_req
|
|
{
|
|
struct sockaddr_in sin;
|
|
uint32_t xid;
|
|
u_int server_nr;
|
|
u_int server_ep;
|
|
};
|
|
|
|
|
|
static long int
|
|
__nis_findfastest_with_timeout (dir_binding *bind,
|
|
const struct timeval *timeout)
|
|
{
|
|
static const struct timeval TIMEOUT00 = { 0, 0 };
|
|
struct findserv_req *pings;
|
|
struct sockaddr_in sin, saved_sin;
|
|
int found = -1;
|
|
uint32_t xid_seed;
|
|
int sock, dontblock = 1;
|
|
CLIENT *clnt;
|
|
u_long i, j, pings_count, pings_max, fastest = -1;
|
|
struct cu_data *cu;
|
|
|
|
pings_max = bind->server_len * 2; /* Reserve a little bit more memory
|
|
for multihomed hosts */
|
|
pings_count = 0;
|
|
pings = malloc (sizeof (struct findserv_req) * pings_max);
|
|
xid_seed = (uint32_t) (time (NULL) ^ getpid ());
|
|
|
|
if (__glibc_unlikely (pings == NULL))
|
|
return -1;
|
|
|
|
memset (&sin, '\0', sizeof (sin));
|
|
sin.sin_family = AF_INET;
|
|
for (i = 0; i < bind->server_len; i++)
|
|
for (j = 0; j < bind->server_val[i].ep.ep_len; ++j)
|
|
if (strcmp (bind->server_val[i].ep.ep_val[j].family, "inet") == 0)
|
|
if ((bind->server_val[i].ep.ep_val[j].proto == NULL)
|
|
|| (bind->server_val[i].ep.ep_val[j].proto[0] == '-')
|
|
|| (bind->server_val[i].ep.ep_val[j].proto[0] == '\0'))
|
|
{
|
|
sin.sin_addr.s_addr =
|
|
inetstr2int (bind->server_val[i].ep.ep_val[j].uaddr);
|
|
if (sin.sin_addr.s_addr == 0)
|
|
continue;
|
|
sin.sin_port = htons (__pmap_getnisport (&sin, NIS_PROG,
|
|
NIS_VERSION,
|
|
IPPROTO_UDP));
|
|
if (sin.sin_port == 0)
|
|
continue;
|
|
|
|
if (pings_count >= pings_max)
|
|
{
|
|
struct findserv_req *new_pings;
|
|
|
|
pings_max += 10;
|
|
new_pings = realloc (pings, sizeof (struct findserv_req) *
|
|
pings_max);
|
|
if (__glibc_unlikely (new_pings == NULL))
|
|
{
|
|
free (pings);
|
|
return -1;
|
|
}
|
|
pings = new_pings;
|
|
}
|
|
memcpy ((char *) &pings[pings_count].sin, (char *) &sin,
|
|
sizeof (sin));
|
|
memcpy ((char *)&saved_sin, (char *)&sin, sizeof(sin));
|
|
pings[pings_count].xid = xid_seed + pings_count;
|
|
pings[pings_count].server_nr = i;
|
|
pings[pings_count].server_ep = j;
|
|
++pings_count;
|
|
}
|
|
|
|
/* Make sure at least one server was assigned */
|
|
if (pings_count == 0)
|
|
{
|
|
free (pings);
|
|
return -1;
|
|
}
|
|
|
|
/* Create RPC handle */
|
|
sock = socket (AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP);
|
|
clnt = clntudp_create (&saved_sin, NIS_PROG, NIS_VERSION, *timeout, &sock);
|
|
if (clnt == NULL)
|
|
{
|
|
close (sock);
|
|
free (pings);
|
|
return -1;
|
|
}
|
|
auth_destroy (clnt->cl_auth);
|
|
clnt->cl_auth = authunix_create_default ();
|
|
cu = (struct cu_data *) clnt->cl_private;
|
|
ioctl (sock, FIONBIO, &dontblock);
|
|
/* Send to all servers the NULLPROC */
|
|
for (i = 0; i < pings_count; ++i)
|
|
{
|
|
/* clntudp_call() will increment, subtract one */
|
|
*((uint32_t *) (cu->cu_outbuf)) = pings[i].xid - 1;
|
|
memcpy ((char *) &cu->cu_raddr, (char *) &pings[i].sin,
|
|
sizeof (struct sockaddr_in));
|
|
/* Transmit to NULLPROC, return immediately. */
|
|
clnt_call (clnt, NULLPROC,
|
|
(xdrproc_t) xdr_void, (caddr_t) 0,
|
|
(xdrproc_t) xdr_void, (caddr_t) 0, TIMEOUT00);
|
|
}
|
|
|
|
while (found == -1) {
|
|
/* Receive reply from NULLPROC asynchronously. Note null inproc. */
|
|
int rc = clnt_call (clnt, NULLPROC,
|
|
(xdrproc_t) NULL, (caddr_t) 0,
|
|
(xdrproc_t) xdr_void, (caddr_t) 0,
|
|
*timeout);
|
|
if (RPC_SUCCESS == rc) {
|
|
uint32_t val;
|
|
memcpy (&val, cu->cu_inbuf, sizeof (uint32_t));
|
|
fastest = val - xid_seed;
|
|
if (fastest < pings_count) {
|
|
bind->server_used = pings[fastest].server_nr;
|
|
bind->current_ep = pings[fastest].server_ep;
|
|
found = 1;
|
|
}
|
|
} else {
|
|
/* clnt_perror(clnt, "__nis_findfastest"); */
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
auth_destroy (clnt->cl_auth);
|
|
clnt_destroy (clnt);
|
|
close (sock);
|
|
|
|
free (pings);
|
|
|
|
return found;
|
|
}
|
|
|
|
|
|
long int
|
|
__nis_findfastest (dir_binding *bind)
|
|
{
|
|
struct timeval timeout = { __NIS_PING_TIMEOUT_START, 0 };
|
|
long int found = -1;
|
|
long int retry = __NIS_PING_RETRY + 1;
|
|
|
|
while (retry--)
|
|
{
|
|
found = __nis_findfastest_with_timeout (bind, &timeout);
|
|
if (found != -1)
|
|
break;
|
|
timeout.tv_sec += __NIS_PING_TIMEOUT_INCREMENT;
|
|
}
|
|
|
|
return found;
|
|
}
|