mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-21 00:50:04 +00:00
0413b54c02
1997-08-10 18:48 Ulrich Drepper <drepper@cygnus.com> * Makeconfig: Define build-programs to no if not set and $(config-os) is none. * Makerules (+depfiles): Don't add $(others) if not build-programs. * Rules (others): Don't depend on $(install-bin), $(install-rootbin) and $(install-sbin) if not build-programs. * Makefile (subdirs): Remove login. * sysdeps/mach/hurd/Subdirs: Add login. * sysdeps/unix/Subdirs: Add login. * sysdeps/generic/sys/mman.h: Test feature macros before defining non-POSIX things. Add MAP_FAILED. * sysdeps/unix/bsd/osf/sys/mman.h: Likewise. * sysdeps/unix/bsd/sun/sunos4/sys/mman.h: Likewise. * sysdeps/unix/bsd/ultrix4/sys/mman.h: Likewise. * sysdeps/unix/sysv/irix4/sys/mman.h: Likewise. * sysdeps/unix/sysv/linux/sys/mman.h: Rewrite to not use kernel header but bits/mman.h. Test feature macros before definitions non-POSIX functions. * sysdeps/unix/sysv/linux/alpha/bits/mman.h: New file. * sysdeps/unix/sysv/linux/i386/bits/mman.h: New file. * sysdeps/unix/sysv/linux/m68k/bits/mman.h: New file. * sysdeps/unix/sysv/linux/mips/bits/mman.h: New file. * sysdeps/unix/sysv/linux/powerpc/bits/mman.h: New file. * sysdeps/unix/sysv/linux/sparc/bits/mman.h: New file. * sysdeps/unix/sysv/linux/sparc64/bits/mman.h: New file. * sysdeps/unix/sysv/linux/alpha/Dist: Add bits/mman.h. * sysdeps/unix/sysv/linux/i386/Dist: Likewise. * sysdeps/unix/sysv/linux/m68k/Dist: Likewise. * sysdeps/unix/sysv/linux/mips/Dist: Likewise. * sysdeps/unix/sysv/linux/powerpc/Dist: Likewise. * sysdeps/unix/sysv/linux/sparc/Dist: Likewise. * sysdeps/unix/sysv/linux/sparc64/Dist: New file. Likewise. * catgets/open_catalog.c (__open_catalog): Compare result of mmap with MAP_FAILED and not -1. * elf/dl-load.c (_dl_map_object_from_fd): Likewise. * elf/dl-minimal.c (malloc): Likewise. * elf/dl-misc.c (_dl_sysdep_read_whole_file): Likewise. * locale/loadlocale.c (_nl_load_locale): Likewise. * locale/programs/localedef.c: Likewise. * malloc/malloc.c (mmap_chunk): Likewise. (new_heap): Likewise. * string/stratcliff.c: Likewise. * string/tester.c: Add tests for stpcpy. * gmon/gmon.c (__monstartup): Use calloc instead of malloc+memset. * gmon/sys/gmon.h: Add prototype for write_profiling. * elf/dl-profile.c: Add decsriptions and implement reading of existing data in profiling file. * gmon/sys/gmon_out.h (GMON_SHOBJ_VERSION): New macro for shared lib profiling data. * sysdeps/stub/bits/libc-lock.h (__libc_once_define): Add new first parameter for class. * inet/inet_ntoa.c: Make once control variable static. Correctly handle case where key cannot be retrieved. * inet/Makefile (tests): Add tst-ntoa. * inet/tst-ntoa.c: New file. * manual/time.texi: Document localtime_r, gmtime_r, asctime_r, and ctime_r. Mention that tzname values must not be changed. * manual/users.texi: Document UTMP/WTMP handling functions. Mainly written by Mark Kettenis. * math/libm-test.c (cbrt_test): Add test for number with aboslute value < 1.0. * nss/nss_files/files-XXX.c (internal_setent): If opening of file failed with EGAIN return NSS_STATUS_TRYAGAIN. * nss/nss_files/files-alias.c (internal_setent): Likewise. * sysdeps/generic/bits/utmp.h: Pretty print. * sysdeps/i386/i586/strcpy.S: New file. Much faster implementation. * sysdeps/i386/i586/stpcpy.S: New file. * sysdeps/i386/i686/Implies: Don't fall back on i586 versions since these are less efficient than i486/i386 versions. * sysdeps/libm-i387/e_rem_pio2.c: Add empty file to prevent the version from libm-ieee754 be compiled since the later is not needed. * sysdeps/libm-i387/e_rem_pio2f.c: Likewise. * sysdeps/libm-i387/e_rem_pio2l.c: Likewise. * sysdeps/libm-i387/k_rem_pio2.c: Likewise. * sysdeps/libm-i387/k_rem_pio2f.c: Likewise. * sysdeps/libm-i387/k_rem_pio2l.c: Likewise. * sysdeps/m68k/fpu/e_rem_pio2.c: Likewise. * sysdeps/m68k/fpu/e_rem_pio2f.c: Likewise. * sysdeps/m68k/fpu/e_rem_pio2l.c: Likewise. * sysdeps/m68k/fpu/k_rem_pio2.c: Likewise. * sysdeps/m68k/fpu/k_rem_pio2f.c: Likewise. * sysdeps/m68k/fpu/k_rem_pio2l.c: Likewise. * sysdeps/libm-i387/s_cbrt.S: Fix several bugs. * sysdeps/libm-i387/s_cbrtf.S: Likewise. * sysdeps/libm-i387/s_cbrtl.S: Likewise. * sysdeps/unix/sysv/linux/if_index.c (if_indextoname): Correct little bug. * sysdeps/unix/sysv/linux/bits/socket.h (struct msghdr): Make field msg_iovlen of type int. * time/tzfile.c: Change return type of __tzstring to char *. * time/tzset.c: Likewise. Change definition of __tzstring. * time/tzset.c: Interpret no DST information in user provided time zone specification as it is meant: no DST. Patch by Paul Eggert <eggert@twinsun.com>. 1997-07-20 03:01 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/elf/dl-load.c (add_name_to_object): New procedure. (_dl_map_object_from_fd): Use add_name_to_object. (_dl_map_object): If an object's SONAME is used to resolve a dependency, add it to the list of the object's names. * inet/getnameinfo.c: Make `domain' non-const. * sysdeps/unix/sysv/linux/powerpc/kernel_termios.c: Clean up. * math/test-fenv.c (feenv_nomask_test): Don't execute if FE_NOMASK_ENV is not defined, or if fesetenv(FE_NOMASK_ENV) sets errno to ENOSYS. * sysdeps/powerpc/dl-machine.h: Print proper error message on unknown reloc type (rather than using assert). * sysdeps/unix/sysv/linux/powerpc/profil-counter.h: New file. * sysdeps/unix/sysv/linux/powerpc/profil.c: Deleted. 1997-07-16 12:47 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/powerpc/bits/fenv.h (feraiseexcept): New optimising macro. (feclearexcept): New optimising macro. (FE_NOMASK_ENV): Change to procedure so it can enable exceptions. (FE_ENABLED_ENV): Add. (FE_NONIEEE_ENV): Add. * sysdeps/powerpc/bits/fenv_const.c: Add __fe_enabled_env, __fe_nonieee_env; delete __fe_nomask_env. * sysdeps/powerpc/bits/fe_nomask.c: New file (stub warning until it gets implemented in the kernel). * sysdeps/powerpc/fraiseenv.c: Deal with chips that don't have FE_INVALID_SOFTWARE implemented. Use macros for bit names for clarity. * sysdeps/powerpc/fsetexcptflag.c: Likewise. * io/ftw.c: Don't compare holes in structures. * sysdeps/unix/sysv/linux/sys/sysmacros.h: Cast the result of the macros to `int', because otherwise it might be `long long' which the calling code is probably not expecting. * sysdeps/libm-ieee754/s_lround.c [NO_LONG_DOUBLE]: Fix a few bugs, document the existence of some more. * sysdeps/powerpc/s_llrint.c: New file. * sysdeps/powerpc/s_lrint.c: New file. * sysdeps/powerpc/s_llround.c: New file. * sysdeps/powerpc/s_lround.c: New file. * sysdeps/powerpc/s_sqrt.c: New file. * sysdeps/powerpc/s_sqrtf.c: New file. * sysdeps/powerpc/w_sqrt.s: New empty file. * sysdeps/powerpc/w_sqrtf.s: New empty file. * sysdeps/powerpc/t_sqrt.c: New file. * sysdeps/powerpc/test-arithf.c: New file. * sysdeps/powerpc/Makefile [subdir=math]: Add t_sqrt to support routines. Add test-arithf to test programs. * sysdeps/powerpc/bits/mathdef.h: Add FP_ILOGB0, FP_ILOGBNAN. * sysdeps/powerpc/strcmp.s: Simplify drastically. Now much neater, and possibly faster (or possibly slower, depending on input). 1997-06-08 22:55 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/powerpc/fenvbits.h: Correct FE_DFL_ENV and FE_NOMASK_ENV macros. * sysdeps/powerpc/s_rint.c: New file. 1997-05-22 08:47 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/powerpc/Makefile [subdir=math]: Add q_* routines. * sysdeps/powerpc/Dist: Add quad_float.h. * sysdeps/powerpc/q_dtoq.c: New file. * sysdeps/powerpc/q_itoq.c: New file. * sysdeps/powerpc/q_lltoq.c: New file. * sysdeps/powerpc/q_neg.c: New file. * sysdeps/powerpc/q_qtoi.c: New file. * sysdeps/powerpc/q_qtoll.c: New file. * sysdeps/powerpc/q_qtos.c: New file. * sysdeps/powerpc/q_qtou.c: New file. * sysdeps/powerpc/q_qtoull.c: New file. * sysdeps/powerpc/q_stoq.c: New file. * sysdeps/powerpc/q_ulltoq.c: New file. * sysdeps/powerpc/q_utoq.c: New file. * sysdeps/powerpc/quad_float.h: New file. * sysdeps/powerpc/test-arith.c: New file. * sysdeps/powerpc/fpu_control.h: Fix _FPU_GETCW. * sysdeps/powerpc/fegetround.c: Use mcrfs to be faster and not require a stack frame. * sysdeps/powerpc/bits/fenv.h: Include inline macro for fegetround. 1997-05-18 05:55 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/powerpc/fenv_libc.h (fegetenv_register, fesetenv_register): Add 'volatile'. (set_fpscr_bit, reset_fpscr_bit): New macros, FPSCR_* constants to use with them. * sysdeps/powerpc/s_copysign.S: New file. * sysdeps/powerpc/s_copysignf.s: New file. * sysdeps/powerpc/s_fabs.S: New file. * sysdeps/powerpc/s_fabsf.s: New file. * sysdeps/powerpc/s_isnan.c: New file. * sysdeps/powerpc/s_isnanf.s: New file. * sysdeps/powerpc/s_rintf.c: New file. * sysdeps/powerpc/fenvbits.h: Make FE_INVALID the summary bit in the FPSCR, not the enable bit. * sysdeps/powerpc/fraiseexcpt.c: Consequent change to the above. * sysdeps/powerpc/fclrexcpt.c: Correct. * sysdeps/powerpc/fsetexcptflag.c: Correct. * sysdeps/powerpc/ftestexcpt.c: Is now much simpler. * sysdeps/powerpc/fgetexcptflg.c: Simplify. * sysdeps/powerpc/strlen.s: Schedule better, save 3 clocks :-). * sysdeps/powerpc/dl-machine.h (elf_machine_rela): Add comment explaining some reentrancy issues with lazy PLT entries. 1997-08-09 13:04 Mark Kettenis <kettenis@phys.uva.nl> * login/logout.c (logout): utmpname returns -1 on error. * login/libutil.map: Remove updwtmp. * login/getutline.c: Rename getutline to __getutline and make getutline a weak alias. Make getutxline a weak alias for __getutline. * login/getutid.c: Rename getutid to __getutid and make getutid a weak alias. Make getutxid a weak alias for __getutid. * libc.map: Add getutxid, getutxline. * login/utmpname.c (__utmpname): Reset backend right after backend endutent call. * login/utmp_file.c: Reordered functions. Remove unecessary header files. (getutent_r_file, pututline_file): Do not call setutent_file. At this point the file is guaranteed to be open (assert!). (getutid_r_file, getutline_r_file): Remove check for validity of file descriptor. At this point the file is guaranteed to be open. (getutent_r_file, internal_getut_r, getutline_r_file, pututline_file, updwtmp_file): Do not wait when unlocking file. * login/utmp_daemon.c: General cleanup and a bit of reordering. (getutent_r_daemon, pututline_daemon): Do not call setutent_daemon. At this point the socket is guaranteed to be open (assert!). (getutid_r_daemon, getutline_r_daemon): Do not check if daemon_sock is valid. At this point the socket is guaranteed to be open (assert!). * login/getutline_r.c: Remove unnecessary header files. (__getutline_r): Do not call backend setutent. * login/getutid_r.c: Remove unnecessary header files. (__getutid_r): Do not call backend setutent. * login/getutent_r.c: Remove unneccesary header files. (__libc_utmp_unknown_functions): Added getutid_r_unknown, getutline_r_unknown. (setutent_unknown): Only set file backend if setutent for the file backend was successful. (getutent_r_unknown, pututline_unknown): Call setutent_unknown instead of __setutent. Report failure if no backend was selected. (getutid_r_unknown): New function. (getutline_r_unknown): New function. (__endutent): Reset backend. This makes sure all backends are checked on the next setutent call. 1997-08-08 20:20 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis_cache.c: Replace dummy functions. * libc.map: Add xdr_sizeof symbol. * sunrpc/Makefile: Add xdr_sizeof to routines. * sunrpc/rpc/xdr.h: Add xdr_sizeof prototype. * sunrpc/xdr_sizeof.c: New, from tirpc 2.3. 1997-08-08 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/mach/bits/libc-lock.h (__libc_once): Define correctly. 1997-08-07 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/mach/hurd/profil.c (fetch_samples): Put parens in the right place. 1997-08-06 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/mach/hurd/profil.c (fetch_samples): Do arithmetic on PC's in long long to avoid overflow. 1997-08-07 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/mach/bits/libc-lock.h (__libc_once, __libc_once_define): New macros. 1997-08-06 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nis/Makefile (headers): Remove bits/nislib.h. 1997-08-06 14:54 Ulrich Drepper <drepper@cygnus.com> * sysdeps/mach/hurd/Subdirs: Add login. 1997-08-06 14:23 Klaus Espenlaub <kespenla@hydra.informatik.uni-ulm.de> * db/hash/hash.c (init_hash): Don't use stat() if it doesn't provide the preferred block size. * login/programs/database.c (store_state_entry): Don't compile if there is no ut_type field. (store_state_entry, store_process_entry): Use the ut_tv field for timestamps if supported. * login/programs/utmpdump.c (print_entry): Always use ut_tv field. * login/programs/xtmp.c: Fix numerous xtmp/utmp typos. Use the ut_tv field for timestamps if supported. * login/programs/xtmp.h: Fix xtmp/utmp typo. * sysdeps/posix/defs.c (stdstream): Change (PTR) to (void *). * sysdeps/stub/connect.c (connect): Change to __connect, add alias. * sysdeps/stub/send.c (send): Likewise. * sysdeps/stub/s_exp2f.c: Emit correct stub_warning(). * sysdeps/stub/statfs.c: Move stub_warning() to the usual place. * sysdeps/stub/init-first.c: Add definition of __libc_pid. 1997-08-05 13:28 Philip Blundell <pb@spring.nexus.co.uk> * sysdeps/standalone/arm/bits/errno.h: Add EISDIR, EOPNOTSUPP; tidy up formatting. * Makefile (subdirs): Remove `login'. * sysdeps/unix/Subdirs: New file; build `login' subdirectory for Unix systems. 1997-08-05 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/generic/bits/utmpx.h: New file. * sysdeps/mach/hurd/Dist: Add some files. * sysdeps/mips/Dist: Likewise. * sysdeps/mips/mips64/Dist: Likewise. * sysdeps/sparc/Dist: Likewise. * sysdeps/unix/sysv/linux/mips/Dist: Likewise. * sysdeps/unix/sysv/linux/sparc/Dist: Likewise. * sysdeps/mips/mipsel/Dist: New file. * sysdeps/sparc64/elf/Dist: New file. * sysdeps/unix/sysv/linux/sparc64/Dist: New file. 1997-08-05 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libc.map: Add missing symbols. 1997-08-05 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/socket.texi: Correct typos. * manual/math.texi: Correct typos. * manual/time.texi (Formatting Date and Time): Likewise. 1997-08-04 13:06 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * gmon/gmon.c (write_gmon): New function; guts from _mcleanup. (_mcleanup): Use write_gmon. (write_profiling): This function can be safely called at any time to write a current histogram without interfering with ongoing profiling. * sysdeps/mach/hurd/profil.c (fetch_samples): Initialize NSAMPLES. 1997-08-01 17:53 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/mach/hurd/profil.c (fetch_samples): Sample buffer need not be vm_deallocated; it's a stack buffer. (profil_vm_deallocate): Delete prototype. (#include <../mach/RPC_vm_deallocate_rpc.c>): Drop this inclusion. * sysdeps/mach/hurd/Makefile ($(common-objpfx)hurd/../mach/RPC_vm_deallocate_rpc.c): Delete this rule. * sysdeps/mach/hurd/profil.c (fetch_samples): New function, guts from profile_waiter. (profile_waiter): Use fetch_samples. (profil): When turning off profiling, fetch the last bunch of samples before disabling PC sampling. (fetch_samples): Add prototype. 1997-07-30 12:53 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/mach/hurd/Makefile: Give normal rules for the mach RPC source included by profil.c instead of trying to use before-compile grot. 1997-07-23 15:04 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/mach/hurd/profil.c (profile_waiter): Do vm_deallocate after releasing lock. Use special RPC stubs and avoid assert, thus making this function entirely independent of the threadvar mechanism and of cthreads. (lock): Convert to be a spin lock instead of a mutex, so that the waiter thread need not use cthreads. Use a fork prepare hook instead of _hurd_fork_locks to make sure we are clean before forking. (fork_profil_child): Renamed from fork_profil. (profil_reply_port): New variable. (profil_vm_deallocate, profil_task_get_sampled_pcs): Special RPC stubs made by special hacks. * sysdeps/mach/hurd/Makefile (before-compile): Add the mach RPC source files that profil.c needs if we are in the gmon directory. * mach/setup-thread.c (__mach_setup_thread): Delete avoidance of a cthreads bug that hasn't existed for two years. * stdio-common/printf_fp.c (__printf_fp): Correct rounding of numbers * locale/programs/locale.c (print_escaped): New function. * time/australasia: Likewise. (open_database, synchronize_database, initialize_database): * nss/nss_files/files-netgrp.c (_nss_netgroup_parseline): Don't * Makerules (load-map-file): Currectly handle missing map file. cannot rely on M_SQRT2 being defined. (log1p): Use __M_SQRT2 not M_SQRT2.
477 lines
11 KiB
C
477 lines
11 KiB
C
/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>
|
|
and Paul Janzen <pcj@primenet.com>, 1996.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <utmp.h>
|
|
|
|
#include "utmp-private.h"
|
|
|
|
|
|
/* Descriptor for the file and position. */
|
|
static int file_fd = -1;
|
|
static off_t file_offset;
|
|
|
|
/* Cache for the last read entry. */
|
|
static struct utmp last_entry;
|
|
|
|
|
|
/* Functions defined here. */
|
|
static int setutent_file (void);
|
|
static int getutent_r_file (struct utmp *buffer, struct utmp **result);
|
|
static int getutid_r_file (const struct utmp *key, struct utmp *buffer,
|
|
struct utmp **result);
|
|
static int getutline_r_file (const struct utmp *key, struct utmp *buffer,
|
|
struct utmp **result);
|
|
static struct utmp *pututline_file (const struct utmp *data);
|
|
static void endutent_file (void);
|
|
static int updwtmp_file (const char *file, const struct utmp *utmp);
|
|
|
|
/* Jump table for file functions. */
|
|
struct utfuncs __libc_utmp_file_functions =
|
|
{
|
|
setutent_file,
|
|
getutent_r_file,
|
|
getutid_r_file,
|
|
getutline_r_file,
|
|
pututline_file,
|
|
endutent_file,
|
|
updwtmp_file
|
|
};
|
|
|
|
|
|
static int
|
|
setutent_file (void)
|
|
{
|
|
if (file_fd < 0)
|
|
{
|
|
const char *file_name = __libc_utmp_file_name;
|
|
|
|
if (strcmp (__libc_utmp_file_name, _PATH_UTMP) == 0
|
|
&& __access (_PATH_UTMP "x", F_OK) == 0)
|
|
file_name = _PATH_UTMP "x";
|
|
else if (strcmp (__libc_utmp_file_name, _PATH_WTMP) == 0
|
|
&& __access (_PATH_WTMP "x", F_OK) == 0)
|
|
file_name = _PATH_WTMP "x";
|
|
|
|
file_fd = open (file_name, O_RDWR);
|
|
if (file_fd == -1)
|
|
{
|
|
/* Hhm, read-write access did not work. Try read-only. */
|
|
file_fd = open (file_name, O_RDONLY);
|
|
if (file_fd == -1)
|
|
{
|
|
perror (_("while opening UTMP file"));
|
|
return 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
lseek (file_fd, 0, SEEK_SET);
|
|
file_offset = 0;
|
|
|
|
#if _HAVE_UT_TYPE - 0
|
|
/* Make sure the entry won't match. */
|
|
last_entry.ut_type = -1;
|
|
#endif
|
|
|
|
return 1;
|
|
}
|
|
|
|
|
|
static int
|
|
getutent_r_file (struct utmp *buffer, struct utmp **result)
|
|
{
|
|
ssize_t nbytes;
|
|
struct flock fl; /* Information struct for locking. */
|
|
|
|
assert (file_fd >= 0);
|
|
|
|
if (file_offset == -1l)
|
|
{
|
|
/* Not available. */
|
|
*result = NULL;
|
|
return -1;
|
|
}
|
|
|
|
/* XXX The following is not perfect. Instead of locking the file itself
|
|
Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl> suggests to
|
|
use an extra locking file. */
|
|
/* XXX I think using an extra locking file does not solve the
|
|
problems. Instead we should set an alarm, which causes fcntl to
|
|
fail, as in ../nis/lckcache.c.
|
|
Mark Kettenis <kettenis@phys.uva.nl>. */
|
|
|
|
/* Try to get the lock. */
|
|
memset (&fl, '\0', sizeof (struct flock));
|
|
fl.l_type = F_RDLCK;
|
|
fl.l_whence = SEEK_SET;
|
|
fcntl (file_fd, F_SETLK, &fl);
|
|
|
|
/* Read the next entry. */
|
|
nbytes = read (file_fd, &last_entry, sizeof (struct utmp));
|
|
|
|
/* And unlock the file. */
|
|
fl.l_type = F_UNLCK;
|
|
fcntl (file_fd, F_SETLKW, &fl);
|
|
|
|
if (nbytes != sizeof (struct utmp))
|
|
{
|
|
file_offset = -1l;
|
|
*result = NULL;
|
|
return -1;
|
|
}
|
|
|
|
/* Update position pointer. */
|
|
file_offset += sizeof (struct utmp);
|
|
|
|
memcpy (buffer, &last_entry, sizeof (struct utmp));
|
|
*result = buffer;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int
|
|
proc_utmp_eq (const struct utmp *entry, const struct utmp *match)
|
|
{
|
|
return
|
|
(
|
|
#if _HAVE_UT_TYPE - 0
|
|
(entry->ut_type == INIT_PROCESS
|
|
|| entry->ut_type == LOGIN_PROCESS
|
|
|| entry->ut_type == USER_PROCESS
|
|
|| entry->ut_type == DEAD_PROCESS)
|
|
&&
|
|
(match->ut_type == INIT_PROCESS
|
|
|| match->ut_type == LOGIN_PROCESS
|
|
|| match->ut_type == USER_PROCESS
|
|
|| match->ut_type == DEAD_PROCESS)
|
|
&&
|
|
#endif
|
|
#if _HAVE_UT_ID - 0
|
|
(entry->ut_id[0] && match->ut_id[0]
|
|
? strncmp (entry->ut_id, match->ut_id, sizeof match->ut_id) == 0
|
|
: strncmp (entry->ut_line, match->ut_line, sizeof match->ut_line) == 0)
|
|
#else
|
|
strncmp (entry->ut_line, match->ut_line, sizeof match->ut_line) == 0
|
|
#endif
|
|
);
|
|
}
|
|
|
|
static int
|
|
internal_getut_r (const struct utmp *id, struct utmp *buffer)
|
|
{
|
|
int result = -1;
|
|
struct flock fl;
|
|
|
|
/* Try to get the lock. */
|
|
memset (&fl, '\0', sizeof (struct flock));
|
|
fl.l_type = F_RDLCK;
|
|
fl.l_whence = SEEK_SET;
|
|
fcntl (file_fd, F_SETLKW, &fl);
|
|
|
|
#if _HAVE_UT_TYPE - 0
|
|
if (id->ut_type == RUN_LVL || id->ut_type == BOOT_TIME
|
|
|| id->ut_type == OLD_TIME || id->ut_type == NEW_TIME)
|
|
{
|
|
/* Search for next entry with type RUN_LVL, BOOT_TIME,
|
|
OLD_TIME, or NEW_TIME. */
|
|
|
|
while (1)
|
|
{
|
|
/* Read the next entry. */
|
|
if (read (file_fd, buffer, sizeof (struct utmp))
|
|
!= sizeof (struct utmp))
|
|
{
|
|
__set_errno (ESRCH);
|
|
file_offset = -1l;
|
|
goto unlock_return;
|
|
}
|
|
file_offset += sizeof (struct utmp);
|
|
|
|
if (id->ut_type == buffer->ut_type)
|
|
break;
|
|
}
|
|
}
|
|
else
|
|
#endif /* _HAVE_UT_TYPE */
|
|
{
|
|
/* Search for the next entry with the specified ID and with type
|
|
INIT_PROCESS, LOGIN_PROCESS, USER_PROCESS, or DEAD_PROCESS. */
|
|
|
|
while (1)
|
|
{
|
|
/* Read the next entry. */
|
|
if (read (file_fd, buffer, sizeof (struct utmp))
|
|
!= sizeof (struct utmp))
|
|
{
|
|
__set_errno (ESRCH);
|
|
file_offset = -1l;
|
|
goto unlock_return;
|
|
}
|
|
file_offset += sizeof (struct utmp);
|
|
|
|
if (proc_utmp_eq (buffer, id))
|
|
break;
|
|
}
|
|
}
|
|
|
|
result = 0;
|
|
|
|
unlock_return:
|
|
/* And unlock the file. */
|
|
fl.l_type = F_UNLCK;
|
|
fcntl (file_fd, F_SETLK, &fl);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
/* For implementing this function we don't use the getutent_r function
|
|
because we can avoid the reposition on every new entry this way. */
|
|
static int
|
|
getutid_r_file (const struct utmp *id, struct utmp *buffer,
|
|
struct utmp **result)
|
|
{
|
|
assert (file_fd >= 0);
|
|
|
|
if (file_offset == -1l)
|
|
{
|
|
*result = NULL;
|
|
return -1;
|
|
}
|
|
|
|
if (internal_getut_r (id, &last_entry) < 0)
|
|
{
|
|
*result = NULL;
|
|
return -1;
|
|
}
|
|
|
|
memcpy (buffer, &last_entry, sizeof (struct utmp));
|
|
*result = buffer;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* For implementing this function we don't use the getutent_r function
|
|
because we can avoid the reposition on every new entry this way. */
|
|
static int
|
|
getutline_r_file (const struct utmp *line, struct utmp *buffer,
|
|
struct utmp **result)
|
|
{
|
|
struct flock fl;
|
|
|
|
assert (file_fd >= 0);
|
|
|
|
if (file_offset == -1l)
|
|
{
|
|
*result = NULL;
|
|
return -1;
|
|
}
|
|
|
|
/* Try to get the lock. */
|
|
memset (&fl, '\0', sizeof (struct flock));
|
|
fl.l_type = F_RDLCK;
|
|
fl.l_whence = SEEK_SET;
|
|
fcntl (file_fd, F_SETLKW, &fl);
|
|
|
|
while (1)
|
|
{
|
|
/* Read the next entry. */
|
|
if (read (file_fd, &last_entry, sizeof (struct utmp))
|
|
!= sizeof (struct utmp))
|
|
{
|
|
__set_errno (ESRCH);
|
|
file_offset = -1l;
|
|
*result = NULL;
|
|
goto unlock_return;
|
|
}
|
|
file_offset += sizeof (struct utmp);
|
|
|
|
/* Stop if we found a user or login entry. */
|
|
if (
|
|
#if _HAVE_UT_TYPE - 0
|
|
(last_entry.ut_type == USER_PROCESS
|
|
|| last_entry.ut_type == LOGIN_PROCESS)
|
|
&&
|
|
#endif
|
|
!strncmp (line->ut_line, last_entry.ut_line, sizeof line->ut_line))
|
|
break;
|
|
}
|
|
|
|
memcpy (buffer, &last_entry, sizeof (struct utmp));
|
|
*result = buffer;
|
|
|
|
unlock_return:
|
|
/* And unlock the file. */
|
|
fl.l_type = F_UNLCK;
|
|
fcntl (file_fd, F_SETLK, &fl);
|
|
|
|
return ((*result == NULL) ? -1 : 0);
|
|
}
|
|
|
|
|
|
static struct utmp *
|
|
pututline_file (const struct utmp *data)
|
|
{
|
|
struct flock fl; /* Information struct for locking. */
|
|
struct utmp buffer;
|
|
struct utmp *pbuf;
|
|
int found;
|
|
|
|
assert (file_fd >= 0);
|
|
|
|
/* Find the correct place to insert the data. */
|
|
if (file_offset > 0
|
|
&& (
|
|
#if _HAVE_UT_TYPE - 0
|
|
(last_entry.ut_type == data->ut_type
|
|
&& (last_entry.ut_type == RUN_LVL
|
|
|| last_entry.ut_type == BOOT_TIME
|
|
|| last_entry.ut_type == OLD_TIME
|
|
|| last_entry.ut_type == NEW_TIME))
|
|
||
|
|
#endif
|
|
proc_utmp_eq (&last_entry, data)))
|
|
found = 1;
|
|
else
|
|
found = internal_getut_r (data, &buffer);
|
|
|
|
/* Try to lock the file. */
|
|
memset (&fl, '\0', sizeof (struct flock));
|
|
fl.l_type = F_WRLCK;
|
|
fl.l_whence = SEEK_SET;
|
|
fcntl (file_fd, F_SETLK, &fl);
|
|
|
|
if (found < 0)
|
|
{
|
|
/* We append the next entry. */
|
|
file_offset = lseek (file_fd, 0, SEEK_END);
|
|
if (file_offset % sizeof (struct utmp) != 0)
|
|
{
|
|
file_offset -= file_offset % sizeof (struct utmp);
|
|
ftruncate (file_fd, file_offset);
|
|
|
|
if (lseek (file_fd, 0, SEEK_END) < 0)
|
|
{
|
|
pbuf = NULL;
|
|
goto unlock_return;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* We replace the just read entry. */
|
|
file_offset -= sizeof (struct utmp);
|
|
lseek (file_fd, file_offset, SEEK_SET);
|
|
}
|
|
|
|
/* Write the new data. */
|
|
if (write (file_fd, data, sizeof (struct utmp)) != sizeof (struct utmp)
|
|
/* If we appended a new record this is only partially written.
|
|
Remove it. */
|
|
&& found < 0)
|
|
{
|
|
(void) ftruncate (file_fd, file_offset);
|
|
pbuf = NULL;
|
|
}
|
|
else
|
|
{
|
|
file_offset += sizeof (struct utmp);
|
|
pbuf = (struct utmp *) data;
|
|
}
|
|
|
|
unlock_return:
|
|
/* And unlock the file. */
|
|
fl.l_type = F_UNLCK;
|
|
fcntl (file_fd, F_SETLK, &fl);
|
|
|
|
return pbuf;
|
|
}
|
|
|
|
|
|
static void
|
|
endutent_file (void)
|
|
{
|
|
assert (file_fd >= 0);
|
|
|
|
close (file_fd);
|
|
file_fd = -1;
|
|
}
|
|
|
|
|
|
static int
|
|
updwtmp_file (const char *file, const struct utmp *utmp)
|
|
{
|
|
int result = -1;
|
|
struct flock fl;
|
|
off_t offset;
|
|
int fd;
|
|
|
|
/* Open WTMP file. */
|
|
fd = open (file, O_WRONLY);
|
|
if (fd < 0)
|
|
return -1;
|
|
|
|
/* Try to get the lock. */
|
|
memset (&fl, '\0', sizeof (struct flock));
|
|
fl.l_type = F_WRLCK;
|
|
fl.l_whence = SEEK_SET;
|
|
fcntl (fd, F_SETLK, &fl);
|
|
|
|
/* Remember original size of log file. */
|
|
offset = lseek (fd, 0, SEEK_END);
|
|
if (offset % sizeof (struct utmp) != 0)
|
|
{
|
|
offset -= offset % sizeof (struct utmp);
|
|
ftruncate (fd, offset);
|
|
|
|
if (lseek (fd, 0, SEEK_END) < 0)
|
|
goto unlock_return;
|
|
}
|
|
|
|
/* Write the entry. If we can't write all the bytes, reset the file
|
|
size back to the original size. That way, no partial entries
|
|
will remain. */
|
|
if (write (fd, utmp, sizeof (struct utmp)) != sizeof (struct utmp))
|
|
{
|
|
ftruncate (fd, offset);
|
|
goto unlock_return;
|
|
}
|
|
|
|
result = 0;
|
|
|
|
unlock_return:
|
|
/* And unlock the file. */
|
|
fl.l_type = F_UNLCK;
|
|
fcntl (fd, F_SETLKW, &fl);
|
|
|
|
/* Close WTMP file. */
|
|
close (fd);
|
|
|
|
return result;
|
|
}
|