mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-09 23:00:07 +00: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.
111 lines
3.1 KiB
C
111 lines
3.1 KiB
C
/* 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 <ctype.h>
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <pwd.h>
|
|
|
|
#define flockfile(s) _IO_flockfile (s)
|
|
#define funlockfile(s) _IO_funlockfile (s)
|
|
|
|
/* Define a line parsing function using the common code
|
|
used in the nss_files module. */
|
|
|
|
#define STRUCTURE passwd
|
|
#define ENTNAME pwent
|
|
struct pwent_data {};
|
|
|
|
#include <nss/nss_files/files-parse.c>
|
|
LINE_PARSER
|
|
(,
|
|
STRING_FIELD (result->pw_name, ISCOLON, 0);
|
|
if (line[0] == '\0'
|
|
&& (result->pw_name[0] == '+' || result->pw_name[0] == '-'))
|
|
{
|
|
/* This a special case. We allow lines containing only a `+' sign
|
|
since this is used for nss_compat. All other services will
|
|
reject this entry later. Initialize all other fields now. */
|
|
result->pw_passwd = NULL;
|
|
result->pw_uid = 0;
|
|
result->pw_gid = 0;
|
|
result->pw_gecos = NULL;
|
|
result->pw_dir = NULL;
|
|
result->pw_shell = NULL;
|
|
}
|
|
else
|
|
{
|
|
STRING_FIELD (result->pw_passwd, ISCOLON, 0);
|
|
if (result->pw_name[0] == '+' || result->pw_name[0] == '-')
|
|
{
|
|
INT_FIELD_MAYBE_NULL (result->pw_uid, ISCOLON, 0, 10, , 0)
|
|
INT_FIELD_MAYBE_NULL (result->pw_gid, ISCOLON, 0, 10, , 0)
|
|
}
|
|
else
|
|
{
|
|
INT_FIELD (result->pw_uid, ISCOLON, 0, 10,)
|
|
INT_FIELD (result->pw_gid, ISCOLON, 0, 10,)
|
|
}
|
|
STRING_FIELD (result->pw_gecos, ISCOLON, 0);
|
|
STRING_FIELD (result->pw_dir, ISCOLON, 0);
|
|
result->pw_shell = line;
|
|
}
|
|
)
|
|
|
|
|
|
/* Read one entry from the given stream. */
|
|
int
|
|
__fgetpwent_r (FILE *stream, struct passwd *resbuf, char *buffer,
|
|
size_t buflen, struct passwd **result)
|
|
{
|
|
char *p;
|
|
|
|
flockfile (stream);
|
|
do
|
|
{
|
|
buffer[buflen - 1] = '\xff';
|
|
p = fgets_unlocked (buffer, buflen, stream);
|
|
if (p == NULL && feof_unlocked (stream))
|
|
{
|
|
funlockfile (stream);
|
|
*result = NULL;
|
|
__set_errno (ENOENT);
|
|
return errno;
|
|
}
|
|
if (p == NULL || buffer[buflen - 1] != '\xff')
|
|
{
|
|
funlockfile (stream);
|
|
*result = NULL;
|
|
__set_errno (ERANGE);
|
|
return errno;
|
|
}
|
|
|
|
/* Skip leading blanks. */
|
|
while (isspace (*p))
|
|
++p;
|
|
} while (*p == '\0' || *p == '#' /* Ignore empty and comment lines. */
|
|
/* Parse the line. If it is invalid, loop to
|
|
get the next line of the file to parse. */
|
|
|| ! parse_line (p, resbuf, (void *) buffer, buflen, &errno));
|
|
|
|
funlockfile (stream);
|
|
|
|
*result = resbuf;
|
|
return 0;
|
|
}
|
|
weak_alias (__fgetpwent_r, fgetpwent_r)
|