mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-28 20:23:35 +08: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.
152 lines
4.4 KiB
C
152 lines
4.4 KiB
C
/* Check posix_spawn add file actions.
|
|
Copyright (C) 2016-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 <stdio.h>
|
|
#include <spawn.h>
|
|
#include <error.h>
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/wait.h>
|
|
#include <sys/resource.h>
|
|
#include <fcntl.h>
|
|
#include <paths.h>
|
|
|
|
#include <support/check.h>
|
|
#include <support/temp_file.h>
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
/* The test checks if posix_spawn open file action close the file descriptor
|
|
before opening a new one in case the input file descriptor is already
|
|
opened. It does by exhausting all file descriptors on the process before
|
|
issue posix_spawn. It then issues a posix_spawn for '/bin/sh echo $$'
|
|
and add two rules:
|
|
|
|
1. Redirect stdout to a temporary filepath
|
|
2. Redirect stderr to stdout
|
|
|
|
If the implementation does not close the file 1. will fail with
|
|
EMFILE. */
|
|
|
|
struct rlimit rl;
|
|
int max_fd = 24;
|
|
int ret;
|
|
|
|
/* Set maximum number of file descriptor to a low value to avoid open
|
|
too many files in environments where RLIMIT_NOFILE is large and to
|
|
limit the array size to track the opened file descriptors. */
|
|
|
|
if (getrlimit (RLIMIT_NOFILE, &rl) == -1)
|
|
FAIL_EXIT1 ("getrlimit (RLIMIT_NOFILE): %m");
|
|
|
|
max_fd = (rl.rlim_cur < max_fd ? rl.rlim_cur : max_fd);
|
|
rl.rlim_cur = max_fd;
|
|
|
|
if (setrlimit (RLIMIT_NOFILE, &rl) == 1)
|
|
FAIL_EXIT1 ("setrlimit (RLIMIT_NOFILE): %m");
|
|
|
|
/* Exhauste the file descriptor limit with temporary files. */
|
|
int files[max_fd];
|
|
int nfiles = 0;
|
|
for (;;)
|
|
{
|
|
int fd = create_temp_file ("tst-spawn3.", NULL);
|
|
if (fd == -1)
|
|
{
|
|
if (errno != EMFILE)
|
|
FAIL_EXIT1 ("create_temp_file: %m");
|
|
break;
|
|
}
|
|
files[nfiles++] = fd;
|
|
}
|
|
|
|
posix_spawn_file_actions_t a;
|
|
if (posix_spawn_file_actions_init (&a) != 0)
|
|
FAIL_EXIT1 ("posix_spawn_file_actions_init");
|
|
|
|
/* Executes a /bin/sh echo $$ 2>&1 > ${objpfx}tst-spawn3.pid . */
|
|
const char pidfile[] = OBJPFX "tst-spawn3.pid";
|
|
if (posix_spawn_file_actions_addopen (&a, STDOUT_FILENO, pidfile, O_WRONLY
|
|
| O_CREAT | O_TRUNC, 0644) != 0)
|
|
FAIL_EXIT1 ("posix_spawn_file_actions_addopen");
|
|
|
|
if (posix_spawn_file_actions_adddup2 (&a, STDOUT_FILENO, STDERR_FILENO) != 0)
|
|
FAIL_EXIT1 ("posix_spawn_file_actions_adddup2");
|
|
|
|
/* Since execve (called by posix_spawn) might require to open files to
|
|
actually execute the shell script, setup to close the temporary file
|
|
descriptors. */
|
|
for (int i=0; i<nfiles; i++)
|
|
{
|
|
if (posix_spawn_file_actions_addclose (&a, files[i]))
|
|
FAIL_EXIT1 ("posix_spawn_file_actions_addclose");
|
|
}
|
|
|
|
char *spawn_argv[] = { (char *) _PATH_BSHELL, (char *) "-c",
|
|
(char *) "echo $$", NULL };
|
|
pid_t pid;
|
|
if ((ret = posix_spawn (&pid, _PATH_BSHELL, &a, NULL, spawn_argv, NULL))
|
|
!= 0)
|
|
{
|
|
errno = ret;
|
|
FAIL_EXIT1 ("posix_spawn: %m");
|
|
}
|
|
|
|
int status;
|
|
int err = waitpid (pid, &status, 0);
|
|
if (err != pid)
|
|
FAIL_EXIT1 ("waitpid: %m");
|
|
|
|
/* Close the temporary files descriptor so it can check posix_spawn
|
|
output. */
|
|
for (int i=0; i<nfiles; i++)
|
|
{
|
|
if (close (files[i]))
|
|
FAIL_EXIT1 ("close: %m");
|
|
}
|
|
|
|
int pidfd = open (pidfile, O_RDONLY);
|
|
if (pidfd == -1)
|
|
FAIL_EXIT1 ("open: %m");
|
|
|
|
char buf[64];
|
|
ssize_t n;
|
|
if ((n = read (pidfd, buf, sizeof (buf))) < 0)
|
|
FAIL_EXIT1 ("read: %m");
|
|
|
|
unlink (pidfile);
|
|
|
|
/* We only expect to read the PID. */
|
|
char *endp;
|
|
long int rpid = strtol (buf, &endp, 10);
|
|
if (*endp != '\n')
|
|
FAIL_EXIT1 ("*endp != \'n\'");
|
|
if (endp == buf)
|
|
FAIL_EXIT1 ("read empty line");
|
|
|
|
if (rpid != pid)
|
|
FAIL_EXIT1 ("found \"%s\", expected pid %ld\n", buf, (long int) pid);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#include <support/test-driver.c>
|