mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08:00
a04549c194
This patch makes further coding style fixes where code was breaking lines after an operator, contrary to the GNU Coding Standards. As with the previous patch, it is limited to files following a reasonable approximation to GNU style already, and is not exhaustive; more such issues remain to be fixed. Tested for x86_64, and with build-many-glibcs.py. * dirent/dirent.h [!_DIRENT_HAVE_D_NAMLEN && _DIRENT_HAVE_D_RECLEN] (_D_ALLOC_NAMLEN): Break lines before rather than after operators. * elf/cache.c (print_cache): Likewise. * gshadow/fgetsgent_r.c (__fgetsgent_r): Likewise. * htl/pt-getattr.c (__pthread_getattr_np): Likewise. * hurd/hurdinit.c (_hurd_setproc): Likewise. * hurd/hurdkill.c (_hurd_sig_post): Likewise. * hurd/hurdlookup.c (__file_name_lookup_under): Likewise. * hurd/hurdsig.c (_hurd_internal_post_signal): Likewise. (reauth_proc): Likewise. * hurd/lookup-at.c (__file_name_lookup_at): Likewise. (__file_name_split_at): Likewise. (__directory_name_split_at): Likewise. * hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise. * hurd/port2fd.c (_hurd_port2fd): Likewise. * iconv/gconv_dl.c (do_print): Likewise. * inet/netinet/in.h (struct sockaddr_in): Likewise. * libio/wstrops.c (_IO_wstr_seekoff): Likewise. * locale/setlocale.c (new_composite_name): Likewise. * malloc/memusagestat.c (main): Likewise. * misc/fstab.c (fstab_convert): Likewise. * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt): Likewise. * nss/nss_compat/compat-grp.c (getgrent_next_nss): Likewise. (getgrent_next_file): Likewise. (internal_getgrnam_r): Likewise. (internal_getgrgid_r): Likewise. * nss/nss_compat/compat-initgroups.c (getgrent_next_nss): Likewise. (internal_getgrent_r): Likewise. * nss/nss_compat/compat-pwd.c (getpwent_next_nss_netgr): Likewise. (getpwent_next_nss): Likewise. (getpwent_next_file): Likewise. (internal_getpwnam_r): Likewise. (internal_getpwuid_r): Likewise. * nss/nss_compat/compat-spwd.c (getspent_next_nss_netgr): Likewise. (getspent_next_nss): Likewise. (internal_getspnam_r): Likewise. * pwd/fgetpwent_r.c (__fgetpwent_r): Likewise. * shadow/fgetspent_r.c (__fgetspent_r): Likewise. * string/strchr.c (STRCHR): Likewise. * string/strchrnul.c (STRCHRNUL): Likewise. * sysdeps/aarch64/fpu/fpu_control.h (_FPU_FPCR_IEEE): Likewise. * sysdeps/aarch64/sfp-machine.h (_FP_CHOOSENAN): Likewise. * sysdeps/csky/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/generic/memcopy.h (PAGE_COPY_FWD_MAYBE): Likewise. * sysdeps/generic/symbol-hacks.h (__stack_chk_fail_local): Likewise. * sysdeps/gnu/netinet/ip_icmp.h (ICMP_INFOTYPE): Likewise. * sysdeps/gnu/updwtmp.c (TRANSFORM_UTMP_FILE_NAME): Likewise. * sysdeps/gnu/utmp_file.c (TRANSFORM_UTMP_FILE_NAME): Likewise. * sysdeps/hppa/jmpbuf-unwind.h (_JMPBUF_UNWINDS): Likewise. * sysdeps/mach/hurd/bits/stat.h (S_ISPARE): Likewise. * sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_start): Likewise. (open_file): Likewise. * sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c (pthread_mutexattr_setprotocol): Likewise. * sysdeps/mach/hurd/ioctl.c (__ioctl): Likewise. * sysdeps/mach/hurd/mmap.c (__mmap): Likewise. * sysdeps/mach/hurd/ptrace.c (ptrace): Likewise. * sysdeps/mach/hurd/spawni.c (__spawni): Likewise. * sysdeps/microblaze/dl-machine.h (elf_machine_type_class): Likewise. (elf_machine_rela): Likewise. * sysdeps/mips/mips32/sfp-machine.h (_FP_CHOOSENAN): Likewise. * sysdeps/mips/mips64/sfp-machine.h (_FP_CHOOSENAN): Likewise. * sysdeps/mips/sys/asm.h (multiple #if conditionals): Likewise. * sysdeps/posix/rename.c (rename): Likewise. * sysdeps/powerpc/novmx-sigjmp.c (__novmx__sigjmp_save): Likewise. * sysdeps/powerpc/sigjmp.c (__vmx__sigjmp_save): Likewise. * sysdeps/s390/fpu/fenv_libc.h (FPC_VALID_MASK): Likewise. * sysdeps/s390/utf8-utf16-z9.c (gconv_end): Likewise. * sysdeps/unix/grantpt.c (grantpt): Likewise. * sysdeps/unix/sysv/linux/a.out.h (N_TXTOFF): Likewise. * sysdeps/unix/sysv/linux/updwtmp.c (TRANSFORM_UTMP_FILE_NAME): Likewise. * sysdeps/unix/sysv/linux/utmp_file.c (TRANSFORM_UTMP_FILE_NAME): Likewise. * sysdeps/x86/cpu-features.c (get_common_indices): Likewise. * time/tzfile.c (__tzfile_compute): Likewise.
129 lines
3.7 KiB
C
129 lines
3.7 KiB
C
/* Lookup helper function for Hurd implementation of *at functions.
|
|
Copyright (C) 2006-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 <hurd.h>
|
|
#include <hurd/lookup.h>
|
|
#include <hurd/fd.h>
|
|
#include <string.h>
|
|
#include <fcntl.h>
|
|
|
|
file_t
|
|
__file_name_lookup_at (int fd, int at_flags,
|
|
const char *file_name, int flags, mode_t mode)
|
|
{
|
|
error_t err;
|
|
file_t result;
|
|
int empty = at_flags & AT_EMPTY_PATH;
|
|
|
|
at_flags &= ~AT_EMPTY_PATH;
|
|
|
|
err = __hurd_at_flags (&at_flags, &flags);
|
|
if (err)
|
|
return (__hurd_fail (err), MACH_PORT_NULL);
|
|
|
|
if (fd == AT_FDCWD || file_name[0] == '/')
|
|
return __file_name_lookup (file_name, flags, mode);
|
|
|
|
if (empty != 0 && file_name[0] == '\0')
|
|
{
|
|
enum retry_type doretry;
|
|
char retryname[1024]; /* XXX string_t LOSES! */
|
|
|
|
err = HURD_DPORT_USE (fd, __dir_lookup (port, "", flags, mode,
|
|
&doretry, retryname,
|
|
&result));
|
|
|
|
if (! err)
|
|
err = __hurd_file_name_lookup_retry (&_hurd_ports_use, &__getdport,
|
|
NULL, doretry, retryname,
|
|
flags, mode, &result);
|
|
|
|
return err ? (__hurd_dfail (fd, err), MACH_PORT_NULL) : result;
|
|
}
|
|
|
|
file_t startdir;
|
|
error_t use_init_port (int which, error_t (*operate) (mach_port_t))
|
|
{
|
|
return (which == INIT_PORT_CWDIR ? (*operate) (startdir)
|
|
: _hurd_ports_use (which, operate));
|
|
}
|
|
|
|
err = HURD_DPORT_USE (fd, (startdir = port,
|
|
__hurd_file_name_lookup (&use_init_port,
|
|
&__getdport, NULL,
|
|
file_name,
|
|
flags,
|
|
mode & ~_hurd_umask,
|
|
&result)));
|
|
|
|
return err ? (__hurd_dfail (fd, err), MACH_PORT_NULL) : result;
|
|
}
|
|
|
|
file_t
|
|
__file_name_split_at (int fd, const char *file_name, char **name)
|
|
{
|
|
error_t err;
|
|
file_t result;
|
|
|
|
if (fd == AT_FDCWD || file_name[0] == '/')
|
|
return __file_name_split (file_name, name);
|
|
|
|
err = __hurd_file_name_split (&_hurd_ports_use, &__getdport, 0,
|
|
file_name, &result, name);
|
|
|
|
file_t startdir;
|
|
error_t use_init_port (int which, error_t (*operate) (mach_port_t))
|
|
{
|
|
return (which == INIT_PORT_CWDIR ? (*operate) (startdir)
|
|
: _hurd_ports_use (which, operate));
|
|
}
|
|
|
|
err = HURD_DPORT_USE (fd, (startdir = port,
|
|
__hurd_file_name_split (&use_init_port,
|
|
&__getdport, 0,
|
|
file_name,
|
|
&result, name)));
|
|
|
|
return err ? (__hurd_dfail (fd, err), MACH_PORT_NULL) : result;
|
|
}
|
|
|
|
file_t
|
|
__directory_name_split_at (int fd, const char *directory_name, char **name)
|
|
{
|
|
error_t err;
|
|
file_t result;
|
|
|
|
if (fd == AT_FDCWD || directory_name[0] == '/')
|
|
return __directory_name_split (directory_name, name);
|
|
|
|
file_t startdir;
|
|
error_t use_init_port (int which, error_t (*operate) (mach_port_t))
|
|
{
|
|
return (which == INIT_PORT_CWDIR ? (*operate) (startdir)
|
|
: _hurd_ports_use (which, operate));
|
|
}
|
|
|
|
err = HURD_DPORT_USE (fd, (startdir = port,
|
|
__hurd_directory_name_split (&use_init_port,
|
|
&__getdport, 0,
|
|
directory_name,
|
|
&result, name)));
|
|
|
|
return err ? (__hurd_dfail (fd, err), MACH_PORT_NULL) : result;
|
|
}
|