mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 23:10: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.
458 lines
9.6 KiB
C
458 lines
9.6 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 <assert.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <stdint.h>
|
|
#include <sys/types.h>
|
|
#include <rpc/rpc.h>
|
|
#include <rpcsvc/nis.h>
|
|
#include <shlib-compat.h>
|
|
|
|
#define DEFAULT_TTL 43200
|
|
|
|
/*
|
|
** Some functions for parsing the -D param and NIS_DEFAULTS Environ
|
|
*/
|
|
static nis_name
|
|
searchXYX (char *str, const char *what)
|
|
{
|
|
assert (strlen (what) == 6);
|
|
assert (strncmp (str, what, 6) == 0);
|
|
str += 6; /* Points to the begin of the parameters. */
|
|
|
|
int i = 0;
|
|
while (str[i] != '\0' && str[i] != ':')
|
|
++i;
|
|
if (i == 0) /* only "<WHAT>=" ? */
|
|
return strdup ("");
|
|
|
|
return strndup (str, i);
|
|
}
|
|
|
|
|
|
static nis_name
|
|
searchgroup (char *str)
|
|
{
|
|
return searchXYX (str, "group=");
|
|
}
|
|
|
|
|
|
static nis_name
|
|
searchowner (char *str)
|
|
{
|
|
return searchXYX (str, "owner=");
|
|
}
|
|
|
|
|
|
static uint32_t
|
|
searchttl (char *str)
|
|
{
|
|
char buf[strlen (str) + 1];
|
|
char *cptr, *dptr;
|
|
uint32_t time;
|
|
int i;
|
|
|
|
dptr = strstr (str, "ttl=");
|
|
if (dptr == NULL) /* should (could) not happen */
|
|
return DEFAULT_TTL;;
|
|
|
|
dptr += 4; /* points to the begin of the new ttl */
|
|
i = 0;
|
|
while (dptr[i] != '\0' && dptr[i] != ':')
|
|
i++;
|
|
if (i == 0) /* only "ttl=" ? */
|
|
return DEFAULT_TTL;
|
|
|
|
strncpy (buf, dptr, i);
|
|
buf[i] = '\0';
|
|
time = 0;
|
|
|
|
dptr = buf;
|
|
cptr = strchr (dptr, 'd');
|
|
if (cptr != NULL)
|
|
{
|
|
*cptr = '\0';
|
|
cptr++;
|
|
time += atoi (dptr) * 60 * 60 * 24;
|
|
dptr = cptr;
|
|
}
|
|
|
|
cptr = strchr (dptr, 'h');
|
|
if (cptr != NULL)
|
|
{
|
|
*cptr = '\0';
|
|
cptr++;
|
|
time += atoi (dptr) * 60 * 60;
|
|
dptr = cptr;
|
|
}
|
|
|
|
cptr = strchr (dptr, 'm');
|
|
if (cptr != NULL)
|
|
{
|
|
*cptr = '\0';
|
|
cptr++;
|
|
time += atoi (dptr) * 60;
|
|
dptr = cptr;
|
|
}
|
|
|
|
cptr = strchr (dptr, 's');
|
|
if (cptr != NULL)
|
|
*cptr = '\0';
|
|
|
|
time += atoi (dptr);
|
|
|
|
return time;
|
|
}
|
|
|
|
static unsigned int
|
|
searchaccess (char *str, unsigned int access)
|
|
{
|
|
char buf[strlen (str) + 1];
|
|
char *cptr;
|
|
unsigned int result = access;
|
|
int i;
|
|
int n, o, g, w;
|
|
|
|
cptr = strstr (str, "access=");
|
|
if (cptr == NULL)
|
|
return 0;
|
|
|
|
cptr += 7; /* points to the begin of the access string */
|
|
i = 0;
|
|
while (cptr[i] != '\0' && cptr[i] != ':')
|
|
i++;
|
|
if (i == 0) /* only "access=" ? */
|
|
return 0;
|
|
|
|
strncpy (buf, cptr, i);
|
|
buf[i] = '\0';
|
|
|
|
n = o = g = w = 0;
|
|
cptr = buf;
|
|
if (*cptr == ',') /* Fix for stupid Solaris scripts */
|
|
++cptr;
|
|
while (*cptr != '\0')
|
|
{
|
|
switch (*cptr)
|
|
{
|
|
case 'n':
|
|
n = 1;
|
|
break;
|
|
case 'o':
|
|
o = 1;
|
|
break;
|
|
case 'g':
|
|
g = 1;
|
|
break;
|
|
case 'w':
|
|
w = 1;
|
|
break;
|
|
case 'a':
|
|
o = g = w = 1;
|
|
break;
|
|
case '-':
|
|
cptr++; /* Remove "-" from beginning */
|
|
while (*cptr != '\0' && *cptr != ',')
|
|
{
|
|
switch (*cptr)
|
|
{
|
|
case 'r':
|
|
if (n)
|
|
result = result & ~(NIS_READ_ACC << 24);
|
|
if (o)
|
|
result = result & ~(NIS_READ_ACC << 16);
|
|
if (g)
|
|
result = result & ~(NIS_READ_ACC << 8);
|
|
if (w)
|
|
result = result & ~(NIS_READ_ACC);
|
|
break;
|
|
case 'm':
|
|
if (n)
|
|
result = result & ~(NIS_MODIFY_ACC << 24);
|
|
if (o)
|
|
result = result & ~(NIS_MODIFY_ACC << 16);
|
|
if (g)
|
|
result = result & ~(NIS_MODIFY_ACC << 8);
|
|
if (w)
|
|
result = result & ~(NIS_MODIFY_ACC);
|
|
break;
|
|
case 'c':
|
|
if (n)
|
|
result = result & ~(NIS_CREATE_ACC << 24);
|
|
if (o)
|
|
result = result & ~(NIS_CREATE_ACC << 16);
|
|
if (g)
|
|
result = result & ~(NIS_CREATE_ACC << 8);
|
|
if (w)
|
|
result = result & ~(NIS_CREATE_ACC);
|
|
break;
|
|
case 'd':
|
|
if (n)
|
|
result = result & ~(NIS_DESTROY_ACC << 24);
|
|
if (o)
|
|
result = result & ~(NIS_DESTROY_ACC << 16);
|
|
if (g)
|
|
result = result & ~(NIS_DESTROY_ACC << 8);
|
|
if (w)
|
|
result = result & ~(NIS_DESTROY_ACC);
|
|
break;
|
|
default:
|
|
return (~0U);
|
|
}
|
|
cptr++;
|
|
}
|
|
n = o = g = w = 0;
|
|
break;
|
|
case '+':
|
|
cptr++; /* Remove "+" from beginning */
|
|
while (*cptr != '\0' && *cptr != ',')
|
|
{
|
|
switch (*cptr)
|
|
{
|
|
case 'r':
|
|
if (n)
|
|
result = result | (NIS_READ_ACC << 24);
|
|
if (o)
|
|
result = result | (NIS_READ_ACC << 16);
|
|
if (g)
|
|
result = result | (NIS_READ_ACC << 8);
|
|
if (w)
|
|
result = result | (NIS_READ_ACC);
|
|
break;
|
|
case 'm':
|
|
if (n)
|
|
result = result | (NIS_MODIFY_ACC << 24);
|
|
if (o)
|
|
result = result | (NIS_MODIFY_ACC << 16);
|
|
if (g)
|
|
result = result | (NIS_MODIFY_ACC << 8);
|
|
if (w)
|
|
result = result | (NIS_MODIFY_ACC);
|
|
break;
|
|
case 'c':
|
|
if (n)
|
|
result = result | (NIS_CREATE_ACC << 24);
|
|
if (o)
|
|
result = result | (NIS_CREATE_ACC << 16);
|
|
if (g)
|
|
result = result | (NIS_CREATE_ACC << 8);
|
|
if (w)
|
|
result = result | (NIS_CREATE_ACC);
|
|
break;
|
|
case 'd':
|
|
if (n)
|
|
result = result | (NIS_DESTROY_ACC << 24);
|
|
if (o)
|
|
result = result | (NIS_DESTROY_ACC << 16);
|
|
if (g)
|
|
result = result | (NIS_DESTROY_ACC << 8);
|
|
if (w)
|
|
result = result | (NIS_DESTROY_ACC);
|
|
break;
|
|
default:
|
|
return (~0U);
|
|
}
|
|
cptr++;
|
|
}
|
|
n = o = g = w = 0;
|
|
break;
|
|
case '=':
|
|
cptr++; /* Remove "=" from beginning */
|
|
/* Clear */
|
|
if (n)
|
|
result = result & ~((NIS_READ_ACC + NIS_MODIFY_ACC
|
|
+ NIS_CREATE_ACC + NIS_DESTROY_ACC) << 24);
|
|
|
|
if (o)
|
|
result = result & ~((NIS_READ_ACC + NIS_MODIFY_ACC
|
|
+ NIS_CREATE_ACC + NIS_DESTROY_ACC) << 16);
|
|
if (g)
|
|
result = result & ~((NIS_READ_ACC + NIS_MODIFY_ACC
|
|
+ NIS_CREATE_ACC + NIS_DESTROY_ACC) << 8);
|
|
if (w)
|
|
result = result & ~(NIS_READ_ACC + NIS_MODIFY_ACC
|
|
+ NIS_CREATE_ACC + NIS_DESTROY_ACC);
|
|
while (*cptr != '\0' && *cptr != ',')
|
|
{
|
|
switch (*cptr)
|
|
{
|
|
case 'r':
|
|
if (n)
|
|
result = result | (NIS_READ_ACC << 24);
|
|
if (o)
|
|
result = result | (NIS_READ_ACC << 16);
|
|
if (g)
|
|
result = result | (NIS_READ_ACC << 8);
|
|
if (w)
|
|
result = result | (NIS_READ_ACC);
|
|
break;
|
|
case 'm':
|
|
if (n)
|
|
result = result | (NIS_MODIFY_ACC << 24);
|
|
if (o)
|
|
result = result | (NIS_MODIFY_ACC << 16);
|
|
if (g)
|
|
result = result | (NIS_MODIFY_ACC << 8);
|
|
if (w)
|
|
result = result | (NIS_MODIFY_ACC);
|
|
break;
|
|
case 'c':
|
|
if (n)
|
|
result = result | (NIS_CREATE_ACC << 24);
|
|
if (o)
|
|
result = result | (NIS_CREATE_ACC << 16);
|
|
if (g)
|
|
result = result | (NIS_CREATE_ACC << 8);
|
|
if (w)
|
|
result = result | (NIS_CREATE_ACC);
|
|
break;
|
|
case 'd':
|
|
if (n)
|
|
result = result | (NIS_DESTROY_ACC << 24);
|
|
if (o)
|
|
result = result | (NIS_DESTROY_ACC << 16);
|
|
if (g)
|
|
result = result | (NIS_DESTROY_ACC << 8);
|
|
if (w)
|
|
result = result | (NIS_DESTROY_ACC);
|
|
break;
|
|
default:
|
|
return result = (~0U);
|
|
}
|
|
cptr++;
|
|
}
|
|
n = o = g = w = 0;
|
|
break;
|
|
default:
|
|
return result = (~0U);
|
|
}
|
|
if (*cptr != '\0')
|
|
cptr++;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
nis_name
|
|
__nis_default_owner (char *defaults)
|
|
{
|
|
char *default_owner = NULL;
|
|
|
|
char *cptr = defaults;
|
|
if (cptr == NULL)
|
|
cptr = getenv ("NIS_DEFAULTS");
|
|
|
|
if (cptr != NULL)
|
|
{
|
|
char *dptr = strstr (cptr, "owner=");
|
|
if (dptr != NULL)
|
|
{
|
|
char *p = searchowner (dptr);
|
|
if (p == NULL)
|
|
return NULL;
|
|
default_owner = strdupa (p);
|
|
free (p);
|
|
}
|
|
}
|
|
|
|
return strdup (default_owner ?: nis_local_principal ());
|
|
}
|
|
libnsl_hidden_nolink_def (__nis_default_owner, GLIBC_2_1)
|
|
|
|
|
|
nis_name
|
|
__nis_default_group (char *defaults)
|
|
{
|
|
char *default_group = NULL;
|
|
|
|
char *cptr = defaults;
|
|
if (cptr == NULL)
|
|
cptr = getenv ("NIS_DEFAULTS");
|
|
|
|
if (cptr != NULL)
|
|
{
|
|
char *dptr = strstr (cptr, "group=");
|
|
if (dptr != NULL)
|
|
{
|
|
char *p = searchgroup (dptr);
|
|
if (p == NULL)
|
|
return NULL;
|
|
default_group = strdupa (p);
|
|
free (p);
|
|
}
|
|
}
|
|
|
|
return strdup (default_group ?: nis_local_group ());
|
|
}
|
|
libnsl_hidden_nolink_def (__nis_default_group, GLIBC_2_1)
|
|
|
|
|
|
uint32_t
|
|
__nis_default_ttl (char *defaults)
|
|
{
|
|
char *cptr, *dptr;
|
|
|
|
if (defaults != NULL)
|
|
{
|
|
dptr = strstr (defaults, "ttl=");
|
|
if (dptr != NULL)
|
|
return searchttl (defaults);
|
|
}
|
|
|
|
cptr = getenv ("NIS_DEFAULTS");
|
|
if (cptr == NULL)
|
|
return DEFAULT_TTL;
|
|
|
|
dptr = strstr (cptr, "ttl=");
|
|
if (dptr == NULL)
|
|
return DEFAULT_TTL;
|
|
|
|
return searchttl (cptr);
|
|
}
|
|
libnsl_hidden_nolink_def (__nis_default_ttl, GLIBC_2_1)
|
|
|
|
/* Default access rights are ----rmcdr---r---, but we could change
|
|
this with the NIS_DEFAULTS variable. */
|
|
unsigned int
|
|
__nis_default_access (char *param, unsigned int defaults)
|
|
{
|
|
unsigned int result;
|
|
char *cptr;
|
|
|
|
if (defaults == 0)
|
|
result = 0 | OWNER_DEFAULT | GROUP_DEFAULT | WORLD_DEFAULT;
|
|
else
|
|
result = defaults;
|
|
|
|
if (param != NULL && strstr (param, "access=") != NULL)
|
|
result = searchaccess (param, result);
|
|
else
|
|
{
|
|
cptr = getenv ("NIS_DEFAULTS");
|
|
if (cptr != NULL && strstr (cptr, "access=") != NULL)
|
|
result = searchaccess (cptr, result);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
libnsl_hidden_nolink_def (__nis_default_access, GLIBC_2_1)
|