mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-17 18:40:14 +00:00
50304ef057
1998-07-16 10:23 Ulrich Drepper <drepper@cygnus.com> * argp/argp-fmtstream.c: Unify names of used global functions. * argp/argp-help.c: Likewise. * assert/assert-perr.c: Likewise * assert/assert.c: Likewise * dirent/scandir.c: Likewise * dirent/scandir64.c: Likewise * dirent/versionsort.c: Likewise * dirent/versionsort64.c: Likewise * gmon/bb_exit_func.c: Likewise. * gmon/gmon.c: Likewise. * grp/initgroups.c: Likewise. * iconv/gconv_conf.c: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent_r.c: Likewise. * inet/inet_ntoa.c: Likewise. * inet/rcmd.c: Likewise. * inet/rexec.c: Likewise. * inet/ruserpass.c: Likewise. * io/fts.c: Likewise. * io/ftw.c: Likewise. * io/ftw64.c: Likewise. * io/getdirname.c: Likewise. * io/getwd.c: Likewise. * io/lockf.c: Likewise. * libio/iofdopen.c: Likewise. * libio/iopopen.c: Likewise. * login/utmp_daemon.c: Likewise. * malloc/mtrace.c: Likewise. * malloc/obstack.c * misc/daemon.c: Likewise. * misc/efgcvt_r.c: Likewise. * misc/err.c: Likewise. * misc/error.c: Likewise. * misc/fstab.c: Likewise. * misc/getpass.c: Likewise. * misc/getttyent.c: Likewise. * misc/mntent_r.c: Likewise. * misc/search.h: Likewise. * misc/syslog.c: Likewise. * nscd/nscd_getgr_r.c: Likewise. * nscd/nscd_getpw_r.c: Likewise. * posix/getpgrp.c: Likewise. * posix/wordexp.c: Likewise. * pwd/fgetpwent_r.c: Likewise. * pwd/getpw.c: Likewise. * resolv/herror.c: Likewise. * resolv/res_init.c: Likewise. * shadow/fgetspent_r.c: Likewise. * shadow/lckpwdf.c: Likewise. * signal/sigrelse.c: Likewise. * stdio-common/asprintf.c: Likewise. * stdio-common/dprintf.c: Likewise. * stdio-common/getw.c: Likewise. * stdio-common/putw.c: Likewise. * stdio-common/snprintf.c: Likewise. * stdio-common/sprintf.c: Likewise. * stdio-common/sscanf.c: Likewise. * stdlib/lrand48_r.c: Likewise. * stdlib/mrand48_r.c: Likewise. * string/argz-replace.c: Likewise. * string/envz.c: Likewise. * sunrpc/auth_des.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/clnt_gen.c: Likewise. * sunrpc/clnt_perr.c: Likewise. * sunrpc/clnt_simp.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/get_myaddr.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/netname.c: Likewise. * sunrpc/openchild.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/rpc_dtable.c: Likewise. * sunrpc/rtime.c: Likewise. * sunrpc/svc_run.c: Likewise. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/svcauth_des.c: Likewise. * sunrpc/xdr_array.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * sunrpc/xdr_stdio.c: Likewise. * sysdeps/generic/abort.c: Likewise. * sysdeps/generic/dl-sysdep.c: Likewise. * sysdeps/generic/fstatfs64.c: Likewise. * sysdeps/generic/ftruncate64.c: Likewise. * sysdeps/generic/getrlimit64.c: Likewise. * sysdeps/generic/glob.c: Likewise. * sysdeps/generic/prof-freq.c: Likewise. * sysdeps/generic/putenv.c: Likewise. * sysdeps/generic/statfs64.c: Likewise. * sysdeps/generic/ttyname_r.c: Likewise. * sysdeps/generic/utmp_file.c: Likewise. * sysdeps/generic/vlimit.c: Likewise. * sysdeps/generic/vtimes.c: Likewise. * sysdeps/posix/cuserid.c: Likewise. * sysdeps/posix/euidaccess.c: Likewise. * sysdeps/posix/mkstemp.c: Likewise. * sysdeps/posix/mktemp.c: Likewise. * sysdeps/posix/pread.c: Likewise. * sysdeps/posix/pread64.c: Likewise. * sysdeps/posix/profil.c: Likewise. * sysdeps/posix/pwrite.c: Likewise. * sysdeps/posix/pwrite64.c: Likewise. * sysdeps/posix/sigblock.c: Likewise. * sysdeps/posix/sigpause.c: Likewise. * sysdeps/posix/ttyname.c: Likewise. * sysdeps/posix/ttyname_r.c: Likewise. * sysdeps/posix/waitid.c: Likewise. * sysdeps/unix/getlogin_r.c: Likewise. * sysdeps/unix/grantpt.c: Likewise. * sysdeps/unix/rewinddir.c: Likewise. * sysdeps/unix/sysv/linux/gethostid.c: Likewise. * sysdeps/unix/sysv/linux/getpt.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/ptsname.c: Likewise. * sysdeps/unix/sysv/linux/sendmsg.c: Likewise. * sysdeps/unix/sysv/linux/statvfs.c: Likewise. * sysdeps/unix/sysv/linux/ttyname.c: Likewise. * sysdeps/unix/sysv/linux/ttyname_r.c: Likewise. * sysdeps/unix/sysv/linux/ulimit.c: Likewise. * sysdeps/unix/sysv/linux/unlockpt.c: Likewise. * sysvipc/sys/shm.h: Likewise. * time/ctime_r.c: Likewise. * time/strptime.c: Likewise. * wcsmbs/mbrlen.c: Likewise. * wcsmbs/wcsdup.c: Likewise. * wcsmbs/wcsxfrm.c: Likewise. * wctype/wcfuncs.c: Likewise. * sysdeps/unix/sysv/linux/i386/socker.S: Change to honor NO_WEAK_ALIAS. * sysdeps/unix/sysv/linux/accept.S: Don't generate __ name. * sysdeps/unix/sysv/linux/bind.S: Likewise. * sysdeps/unix/sysv/linux/getsockname.S: Likewise. * sysdeps/unix/sysv/linux/listen.S: Likewise. * sysdeps/unix/sysv/linux/recvfrom.S: Likewise. * sysdeps/unix/sysv/linux/sendto.S: Likewise. * sysdeps/unix/sysv/linux/setsockopt.S: Likewise. * grp/fgetgrent_r.c: Use explicit locking of the stream. * elf/Makefile (rtld-routines): Add dl-environ. * sysdeps/generic/dl-environ.c: New file. * libio/Makefile [REENTRANT] (routines): Add iofputs_u. * libio/Versions: Add fputs_unlocked. * libio/iofputs_u.c: New file. * libio/stdio.h: Add prototype for fputs_unlocked. * sunrpc/rpc/auth.h: Use __PMT instead of __P in type definitions. * sunrpc/rpc/clnt.h: Likewise. * sunrpc/rpc/pmap_clnt.h: Likewise. * sunrpc/rpc/svc.h: Likewise. * sunrpc/rpc/xdr.h: Likewise. * sysdeps/i386/memchr.S: Correct for more strict gas. * sysdeps/i386/fpu/bits/mathinline.h: Likewise. * sysdeps/libm-i387/i686/s_fdim.S: Likewise. * sysdeps/libm-i387/i686/s_fdimf.S: Likewise. * sysdeps/libm-i387/i686/s_fdiml.S: Likewise. 1998-07-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * configure.in: Change message for binutils version from 2.8.1.0.17->2.8.1.0.23. 1998-07-15 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h: Define LOC. Patch by John Tobey <jtobey@banta-im.com>.
472 lines
12 KiB
C
472 lines
12 KiB
C
/* Copyright (C) 1996, 1997, 1998 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 <signal.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;
|
|
|
|
|
|
/* Locking timeout. */
|
|
#ifndef TIMEOUT
|
|
# define TIMEOUT 1
|
|
#endif
|
|
|
|
/* Do-nothing handler for locking timeout. */
|
|
static void timeout_handler (int signum) {};
|
|
|
|
#define LOCK_FILE(fd, type) \
|
|
{ \
|
|
struct flock fl; \
|
|
struct sigaction action, old_action; \
|
|
unsigned int old_timeout; \
|
|
\
|
|
/* Cancel any existing alarm. */ \
|
|
old_timeout = alarm (0); \
|
|
\
|
|
/* Establish signal handler. */ \
|
|
action.sa_handler = timeout_handler; \
|
|
sigemptyset (&action.sa_mask); \
|
|
action.sa_flags = 0; \
|
|
__sigaction (SIGALRM, &action, &old_action); \
|
|
\
|
|
alarm (TIMEOUT); \
|
|
\
|
|
/* Try to get the lock. */ \
|
|
memset (&fl, '\0', sizeof (struct flock)); \
|
|
fl.l_type = (type); \
|
|
fl.l_whence = SEEK_SET; \
|
|
__fcntl ((fd), F_SETLKW, &fl)
|
|
|
|
#define UNLOCK_FILE(fd) \
|
|
/* Unlock the file. */ \
|
|
fl.l_type = F_UNLCK; \
|
|
__fcntl ((fd), F_SETLKW, &fl); \
|
|
\
|
|
/* Reset the signal handler and alarm. */ \
|
|
__sigaction (SIGALRM, &old_action, NULL); \
|
|
alarm (old_timeout); \
|
|
} while (0)
|
|
|
|
|
|
/* 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
|
|
};
|
|
|
|
|
|
#ifndef TRANSFORM_UTMP_FILE_NAME
|
|
# define TRANSFORM_UTMP_FILE_NAME(file_name) (file_name)
|
|
#endif
|
|
|
|
static int
|
|
setutent_file (void)
|
|
{
|
|
if (file_fd < 0)
|
|
{
|
|
const char *file_name;
|
|
|
|
file_name = TRANSFORM_UTMP_FILE_NAME (__libc_utmp_file_name);
|
|
|
|
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)
|
|
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;
|
|
|
|
assert (file_fd >= 0);
|
|
|
|
if (file_offset == -1l)
|
|
{
|
|
/* Not available. */
|
|
*result = NULL;
|
|
return -1;
|
|
}
|
|
|
|
LOCK_FILE (file_fd, F_RDLCK);
|
|
|
|
/* Read the next entry. */
|
|
nbytes = __read (file_fd, &last_entry, sizeof (struct utmp));
|
|
|
|
UNLOCK_FILE (file_fd);
|
|
|
|
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;
|
|
|
|
LOCK_FILE (file_fd, F_RDLCK);
|
|
|
|
#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:
|
|
UNLOCK_FILE (file_fd);
|
|
|
|
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)
|
|
{
|
|
assert (file_fd >= 0);
|
|
|
|
if (file_offset == -1l)
|
|
{
|
|
*result = NULL;
|
|
return -1;
|
|
}
|
|
|
|
LOCK_FILE (file_fd, F_RDLCK);
|
|
|
|
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:
|
|
UNLOCK_FILE (file_fd);
|
|
|
|
return ((*result == NULL) ? -1 : 0);
|
|
}
|
|
|
|
|
|
static struct utmp *
|
|
pututline_file (const struct utmp *data)
|
|
{
|
|
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);
|
|
|
|
LOCK_FILE (file_fd, F_WRLCK);
|
|
|
|
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. */
|
|
if (found < 0)
|
|
(void) __ftruncate (file_fd, file_offset);
|
|
pbuf = NULL;
|
|
}
|
|
else
|
|
{
|
|
file_offset += sizeof (struct utmp);
|
|
pbuf = (struct utmp *) data;
|
|
}
|
|
|
|
unlock_return:
|
|
UNLOCK_FILE (file_fd);
|
|
|
|
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;
|
|
off_t offset;
|
|
int fd;
|
|
|
|
/* Open WTMP file. */
|
|
fd = __open (file, O_WRONLY);
|
|
if (fd < 0)
|
|
return -1;
|
|
|
|
LOCK_FILE (fd, F_WRLCK);
|
|
|
|
/* 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:
|
|
UNLOCK_FILE (fd);
|
|
|
|
/* Close WTMP file. */
|
|
__close (fd);
|
|
|
|
return result;
|
|
}
|