mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 08:40:07 +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.
192 lines
5.0 KiB
C
192 lines
5.0 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 <nss.h>
|
|
#include <errno.h>
|
|
#include <ctype.h>
|
|
#include <netdb.h>
|
|
#include <string.h>
|
|
#include <netgroup.h>
|
|
#include <rpcsvc/nis.h>
|
|
|
|
#include "nss-nisplus.h"
|
|
|
|
#define NISENTRYVAL(idx, col, res) \
|
|
(NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val)
|
|
|
|
#define NISENTRYLEN(idx, col, res) \
|
|
(NIS_RES_OBJECT (res)[idx].EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len)
|
|
|
|
enum nss_status
|
|
_nss_nisplus_getnetgrent_r (struct __netgrent *result, char *buffer,
|
|
size_t buflen, int *errnop)
|
|
{
|
|
enum nss_status status;
|
|
|
|
/* Some sanity checks. */
|
|
if (result->data == NULL || result->data_size == 0)
|
|
return NSS_STATUS_NOTFOUND;
|
|
|
|
if (result->position == result->data_size)
|
|
return result->first ? NSS_STATUS_NOTFOUND : NSS_STATUS_RETURN;
|
|
|
|
unsigned int entrylen
|
|
= NISENTRYLEN (result->position, 1, (nis_result *) result->data);
|
|
if (entrylen > 0)
|
|
{
|
|
/* We have a list of other netgroups. */
|
|
|
|
result->type = group_val;
|
|
if (entrylen >= buflen)
|
|
{
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
strncpy (buffer, NISENTRYVAL (result->position, 1,
|
|
(nis_result *) result->data),
|
|
entrylen);
|
|
buffer[entrylen] = '\0';
|
|
result->val.group = buffer;
|
|
++result->position;
|
|
result->first = 0;
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
/* Before we can copy the entry to the private buffer we have to make
|
|
sure it is big enough. */
|
|
unsigned int hostlen
|
|
= NISENTRYLEN (result->position, 2, (nis_result *) result->data);
|
|
unsigned int userlen
|
|
= NISENTRYLEN (result->position, 3, (nis_result *) result->data);
|
|
unsigned int domainlen
|
|
= NISENTRYLEN (result->position, 4, (nis_result *) result->data);
|
|
if (hostlen + userlen + domainlen + 6 > buflen)
|
|
{
|
|
*errnop = ERANGE;
|
|
status = NSS_STATUS_TRYAGAIN;
|
|
}
|
|
else
|
|
{
|
|
char *cp = buffer;
|
|
|
|
result->type = triple_val;
|
|
|
|
if (hostlen == 0
|
|
|| NISENTRYVAL (result->position, 2,
|
|
(nis_result *) result->data)[0] == '\0')
|
|
result->val.triple.host = NULL;
|
|
else
|
|
{
|
|
result->val.triple.host = cp;
|
|
cp = __stpncpy (cp, NISENTRYVAL (result->position, 2,
|
|
(nis_result *) result->data),
|
|
hostlen);
|
|
*cp++ = '\0';
|
|
}
|
|
|
|
if (userlen == 0
|
|
|| NISENTRYVAL (result->position, 3,
|
|
(nis_result *) result->data)[0] == '\0')
|
|
result->val.triple.user = NULL;
|
|
else
|
|
{
|
|
result->val.triple.user = cp;
|
|
cp = __stpncpy (cp, NISENTRYVAL (result->position, 3,
|
|
(nis_result *) result->data),
|
|
userlen);
|
|
*cp++ = '\0';
|
|
}
|
|
|
|
if (domainlen == 0
|
|
|| NISENTRYVAL (result->position, 4,
|
|
(nis_result *) result->data)[0] == '\0')
|
|
result->val.triple.domain = NULL;
|
|
else
|
|
{
|
|
result->val.triple.domain = cp;
|
|
cp = __stpncpy (cp, NISENTRYVAL (result->position, 4,
|
|
(nis_result *) result->data),
|
|
domainlen);
|
|
*cp = '\0';
|
|
}
|
|
|
|
status = NSS_STATUS_SUCCESS;
|
|
|
|
/* Remember where we stopped reading. */
|
|
++result->position;
|
|
|
|
result->first = 0;
|
|
}
|
|
|
|
return status;
|
|
}
|
|
|
|
static void
|
|
internal_endnetgrent (struct __netgrent *netgrp)
|
|
{
|
|
nis_freeresult ((nis_result *) netgrp->data);
|
|
netgrp->data = NULL;
|
|
netgrp->data_size = 0;
|
|
netgrp->position = 0;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nisplus_setnetgrent (const char *group, struct __netgrent *netgrp)
|
|
{
|
|
char buf[strlen (group) + 25];
|
|
|
|
if (group == NULL || group[0] == '\0')
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
enum nss_status status = NSS_STATUS_SUCCESS;
|
|
|
|
snprintf (buf, sizeof (buf), "[name=%s],netgroup.org_dir", group);
|
|
|
|
netgrp->data = (char *) nis_list (buf, EXPAND_NAME, NULL, NULL);
|
|
|
|
if (netgrp->data == NULL)
|
|
{
|
|
__set_errno (ENOMEM);
|
|
status = NSS_STATUS_TRYAGAIN;
|
|
}
|
|
else if (niserr2nss (((nis_result *) netgrp->data)->status)
|
|
!= NSS_STATUS_SUCCESS)
|
|
{
|
|
status = niserr2nss (((nis_result *) netgrp->data)->status);
|
|
|
|
internal_endnetgrent (netgrp);
|
|
}
|
|
else
|
|
{
|
|
netgrp->data_size = ((nis_result *) netgrp->data)->objects.objects_len;
|
|
netgrp->position = 0;
|
|
netgrp->first = 1;
|
|
}
|
|
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nisplus_endnetgrent (struct __netgrent *netgrp)
|
|
{
|
|
internal_endnetgrent (netgrp);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|