mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 04:50: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.
194 lines
6.4 KiB
C
194 lines
6.4 KiB
C
/* Initial program startup for running under the GNU Hurd.
|
|
Copyright (C) 1991-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
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 <errno.h>
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <hurd.h>
|
|
#include <hurd/exec_startup.h>
|
|
#include <sysdep.h>
|
|
#include <unistd.h>
|
|
#include <elf.h>
|
|
#include <set-hooks.h>
|
|
#include "hurdstartup.h"
|
|
#include <argz.h>
|
|
|
|
mach_port_t *_hurd_init_dtable;
|
|
mach_msg_type_number_t _hurd_init_dtablesize;
|
|
|
|
extern void __mach_init (void);
|
|
|
|
/* Entry point. This is the first thing in the text segment.
|
|
|
|
The exec server started the initial thread in our task with this spot the
|
|
PC, and a stack that is presumably big enough. We do basic Mach
|
|
initialization so mig-generated stubs work, and then do an exec_startup
|
|
RPC on our bootstrap port, to which the exec server responds with the
|
|
information passed in the exec call, as well as our original bootstrap
|
|
port, and the base address and size of the preallocated stack.
|
|
|
|
If using cthreads, we are given a new stack by cthreads initialization and
|
|
deallocate the stack set up by the exec server. On the new stack we call
|
|
`start1' (above) to do the rest of the startup work. Since the stack may
|
|
disappear out from under us in a machine-dependent way, we use a pile of
|
|
static variables to communicate the information from exec_startup to start1.
|
|
This is unfortunate but preferable to machine-dependent frobnication to copy
|
|
the state from the old stack to the new one. */
|
|
|
|
|
|
void
|
|
_hurd_startup (void **argptr, void (*main) (intptr_t *data))
|
|
{
|
|
error_t err;
|
|
mach_port_t in_bootstrap;
|
|
char *args, *env;
|
|
mach_msg_type_number_t argslen, envlen;
|
|
struct hurd_startup_data data;
|
|
char **argv, **envp;
|
|
int argc, envc;
|
|
intptr_t *argcptr;
|
|
vm_address_t addr;
|
|
|
|
/* Attempt to map page zero redzoned before we receive any RPC
|
|
data that might get allocated there. We can ignore errors. */
|
|
addr = 0;
|
|
__vm_map (__mach_task_self (),
|
|
&addr, __vm_page_size, 0, 0, MACH_PORT_NULL, 0, 1,
|
|
VM_PROT_NONE, VM_PROT_NONE, VM_INHERIT_COPY);
|
|
|
|
if (err = __task_get_special_port (__mach_task_self (), TASK_BOOTSTRAP_PORT,
|
|
&in_bootstrap))
|
|
LOSE;
|
|
|
|
if (in_bootstrap != MACH_PORT_NULL)
|
|
{
|
|
/* Call the exec server on our bootstrap port and
|
|
get all our standard information from it. */
|
|
|
|
argslen = envlen = 0;
|
|
data.dtablesize = data.portarraysize = data.intarraysize = 0;
|
|
|
|
err = __exec_startup_get_info (in_bootstrap,
|
|
&data.user_entry,
|
|
&data.phdr, &data.phdrsz,
|
|
&data.stack_base, &data.stack_size,
|
|
&data.flags,
|
|
&args, &argslen,
|
|
&env, &envlen,
|
|
&data.dtable, &data.dtablesize,
|
|
&data.portarray, &data.portarraysize,
|
|
&data.intarray, &data.intarraysize);
|
|
__mach_port_deallocate (__mach_task_self (), in_bootstrap);
|
|
}
|
|
|
|
if (err || in_bootstrap == MACH_PORT_NULL || (data.flags & EXEC_STACK_ARGS))
|
|
{
|
|
/* Either we have no bootstrap port, or the RPC to the exec server
|
|
failed, or whoever started us up passed the flag saying args are
|
|
on the stack. Try to snarf the args in the canonical Mach way.
|
|
Hopefully either they will be on the stack as expected, or the
|
|
stack will be zeros so we don't crash. */
|
|
|
|
argcptr = (intptr_t *) argptr;
|
|
argc = argcptr[0];
|
|
argv = (char **) &argcptr[1];
|
|
envp = &argv[argc + 1];
|
|
envc = 0;
|
|
while (envp[envc])
|
|
++envc;
|
|
}
|
|
else
|
|
{
|
|
/* Turn the block of null-separated strings we were passed for the
|
|
arguments and environment into vectors of pointers to strings. */
|
|
|
|
/* Count up the arguments so we can allocate ARGV. */
|
|
argc = __argz_count (args, argslen);
|
|
/* Count up the environment variables so we can allocate ENVP. */
|
|
envc = __argz_count (env, envlen);
|
|
|
|
/* There were some arguments. Allocate space for the vectors of
|
|
pointers and fill them in. We allocate the space for the
|
|
environment pointers immediately after the argv pointers because
|
|
the ELF ABI will expect it. */
|
|
argcptr = __alloca (sizeof (intptr_t)
|
|
+ (argc + 1 + envc + 1) * sizeof (char *)
|
|
+ sizeof (struct hurd_startup_data));
|
|
*argcptr = argc;
|
|
argv = (void *) (argcptr + 1);
|
|
__argz_extract (args, argslen, argv);
|
|
|
|
/* There was some environment. */
|
|
envp = &argv[argc + 1];
|
|
__argz_extract (env, envlen, envp);
|
|
}
|
|
|
|
if (err || in_bootstrap == MACH_PORT_NULL)
|
|
{
|
|
/* Either we have no bootstrap port, or the RPC to the exec server
|
|
failed. Set all our other variables to have empty information. */
|
|
|
|
data.flags = 0;
|
|
args = env = NULL;
|
|
argslen = envlen = 0;
|
|
data.dtable = NULL;
|
|
data.dtablesize = 0;
|
|
data.portarray = NULL;
|
|
data.portarraysize = 0;
|
|
data.intarray = NULL;
|
|
data.intarraysize = 0;
|
|
}
|
|
else if ((void *) &envp[envc + 1] == argv[0])
|
|
{
|
|
/* The arguments arrived on the stack from the kernel, but our
|
|
protocol requires some space after them for a `struct
|
|
hurd_startup_data'. Move them. */
|
|
struct
|
|
{
|
|
intptr_t count;
|
|
char *argv[argc + 1];
|
|
char *envp[envc + 1];
|
|
struct hurd_startup_data data;
|
|
} *args = alloca (sizeof *args);
|
|
if ((void *) &args[1] == (void *) argcptr)
|
|
args = alloca (-((char *) &args->data - (char *) args));
|
|
memmove (args, argcptr, (char *) &args->data - (char *) args);
|
|
argcptr = (void *) args;
|
|
argv = args->argv;
|
|
envp = args->envp;
|
|
}
|
|
|
|
{
|
|
struct hurd_startup_data *d = (void *) &envp[envc + 1];
|
|
|
|
if ((void *) d != argv[0])
|
|
{
|
|
*d = data;
|
|
_hurd_init_dtable = d->dtable;
|
|
_hurd_init_dtablesize = d->dtablesize;
|
|
}
|
|
|
|
(*main) (argcptr);
|
|
}
|
|
|
|
/* Should never get here. */
|
|
LOSE;
|
|
abort ();
|
|
}
|