mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 13:00:06 +00:00
34a5a1460e
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.
280 lines
6.4 KiB
C
280 lines
6.4 KiB
C
/* Copyright (C) 1996-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
|
|
|
|
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 <nss.h>
|
|
#include <netdb.h>
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <libc-lock.h>
|
|
#include <rpcsvc/yp.h>
|
|
#include <rpcsvc/ypclnt.h>
|
|
|
|
#include "nss-nis.h"
|
|
|
|
/* Get the declaration of the parser function. */
|
|
#define ENTNAME rpcent
|
|
#define EXTERN_PARSER
|
|
#include <nss/nss_files/files-parse.c>
|
|
|
|
__libc_lock_define_initialized (static, lock)
|
|
|
|
static intern_t intern;
|
|
|
|
|
|
static void
|
|
internal_nis_endrpcent (intern_t *intern)
|
|
{
|
|
struct response_t *curr = intern->next;
|
|
|
|
while (curr != NULL)
|
|
{
|
|
struct response_t *last = curr;
|
|
curr = curr->next;
|
|
free (last);
|
|
}
|
|
|
|
intern->next = intern->start = NULL;
|
|
}
|
|
|
|
static enum nss_status
|
|
internal_nis_setrpcent (intern_t *intern)
|
|
{
|
|
char *domainname;
|
|
struct ypall_callback ypcb;
|
|
enum nss_status status;
|
|
|
|
if (yp_get_default_domain (&domainname))
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
internal_nis_endrpcent (intern);
|
|
|
|
ypcb.foreach = _nis_saveit;
|
|
ypcb.data = (char *) intern;
|
|
status = yperr2nss (yp_all (domainname, "rpc.bynumber", &ypcb));
|
|
|
|
/* Mark the last buffer as full. */
|
|
if (intern->next != NULL)
|
|
intern->next->size = intern->offset;
|
|
|
|
intern->next = intern->start;
|
|
intern->offset = 0;
|
|
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_setrpcent (int stayopen)
|
|
{
|
|
enum nss_status status;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
status = internal_nis_setrpcent (&intern);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_endrpcent (void)
|
|
{
|
|
__libc_lock_lock (lock);
|
|
|
|
internal_nis_endrpcent (&intern);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
static enum nss_status
|
|
internal_nis_getrpcent_r (struct rpcent *rpc, char *buffer, size_t buflen,
|
|
int *errnop, intern_t *intern)
|
|
{
|
|
struct parser_data *pdata = (void *) buffer;
|
|
int parse_res;
|
|
char *p;
|
|
|
|
if (intern->start == NULL)
|
|
internal_nis_setrpcent (intern);
|
|
|
|
if (intern->next == NULL)
|
|
/* Not one entry in the map. */
|
|
return NSS_STATUS_NOTFOUND;
|
|
|
|
/* Get the next entry until we found a correct one. */
|
|
do
|
|
{
|
|
struct response_t *bucket = intern->next;
|
|
|
|
if (__glibc_unlikely (intern->offset >= bucket->size))
|
|
{
|
|
if (bucket->next == NULL)
|
|
return NSS_STATUS_NOTFOUND;
|
|
|
|
/* We look at all the content in the current bucket. Go on
|
|
to the next. */
|
|
bucket = intern->next = bucket->next;
|
|
intern->offset = 0;
|
|
}
|
|
|
|
for (p = &bucket->mem[intern->offset]; isspace (*p); ++p)
|
|
++intern->offset;
|
|
|
|
size_t len = strlen (p) + 1;
|
|
if (__glibc_unlikely (len > buflen))
|
|
{
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
/* We unfortunately have to copy the data in the user-provided
|
|
buffer because that buffer might be around for a very long
|
|
time and the servent structure must remain valid. If we would
|
|
rely on the BUCKET memory the next 'setservent' or 'endservent'
|
|
call would destroy it.
|
|
|
|
The important thing is that it is a single NUL-terminated
|
|
string. This is what the parsing routine expects. */
|
|
p = memcpy (buffer, &bucket->mem[intern->offset], len);
|
|
|
|
parse_res = _nss_files_parse_rpcent (p, rpc, pdata, buflen, errnop);
|
|
if (__glibc_unlikely (parse_res == -1))
|
|
return NSS_STATUS_TRYAGAIN;
|
|
|
|
intern->offset += len;
|
|
}
|
|
while (!parse_res);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getrpcent_r (struct rpcent *rpc, char *buffer, size_t buflen,
|
|
int *errnop)
|
|
{
|
|
enum nss_status status;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
status = internal_nis_getrpcent_r (rpc, buffer, buflen, errnop, &intern);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getrpcbyname_r (const char *name, struct rpcent *rpc,
|
|
char *buffer, size_t buflen, int *errnop)
|
|
{
|
|
if (name == NULL)
|
|
{
|
|
*errnop = EINVAL;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
intern_t data = { NULL, NULL, 0 };
|
|
enum nss_status status = internal_nis_setrpcent (&data);
|
|
if (__glibc_unlikely (status != NSS_STATUS_SUCCESS))
|
|
return status;
|
|
|
|
int found = 0;
|
|
while (!found
|
|
&& ((status = internal_nis_getrpcent_r (rpc, buffer, buflen, errnop,
|
|
&data)) == NSS_STATUS_SUCCESS))
|
|
{
|
|
if (strcmp (rpc->r_name, name) == 0)
|
|
found = 1;
|
|
else
|
|
{
|
|
int i = 0;
|
|
|
|
while (rpc->r_aliases[i] != NULL)
|
|
{
|
|
if (strcmp (rpc->r_aliases[i], name) == 0)
|
|
{
|
|
found = 1;
|
|
break;
|
|
}
|
|
else
|
|
++i;
|
|
}
|
|
}
|
|
}
|
|
|
|
internal_nis_endrpcent (&data);
|
|
|
|
if (__glibc_unlikely (!found && status == NSS_STATUS_SUCCESS))
|
|
return NSS_STATUS_NOTFOUND;
|
|
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getrpcbynumber_r (int number, struct rpcent *rpc,
|
|
char *buffer, size_t buflen, int *errnop)
|
|
{
|
|
char *domain;
|
|
if (__glibc_unlikely (yp_get_default_domain (&domain)))
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
char buf[32];
|
|
int nlen = snprintf (buf, sizeof (buf), "%d", number);
|
|
|
|
char *result;
|
|
int len;
|
|
int yperr = yp_match (domain, "rpc.bynumber", buf, nlen, &result, &len);
|
|
|
|
if (__glibc_unlikely (yperr != YPERR_SUCCESS))
|
|
{
|
|
enum nss_status retval = yperr2nss (yperr);
|
|
|
|
if (retval == NSS_STATUS_TRYAGAIN)
|
|
*errnop = errno;
|
|
return retval;
|
|
}
|
|
|
|
if (__glibc_unlikely ((size_t) (len + 1) > buflen))
|
|
{
|
|
free (result);
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
char *p = strncpy (buffer, result, len);
|
|
buffer[len] = '\0';
|
|
while (isspace (*p))
|
|
++p;
|
|
free (result);
|
|
|
|
int parse_res = _nss_files_parse_rpcent (p, rpc, (void *) buffer, buflen,
|
|
errnop);
|
|
if (__glibc_unlikely (parse_res < 1))
|
|
{
|
|
if (parse_res == -1)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
else
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
else
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|