mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 07:10:06 +00:00
6591c33562
1998-01-30 19:58 Ulrich Drepper <drepper@cygnus.com> * include/cpio.h: Move to ... * posix/cpio.h: ...here. * locale/programs/ld-collate.c: Fix typo. * signal/signal.h: Declare _sys_siglist with NSIG+1 elements. * stdio-common/tiformat.c: Add checks for %#.0o and friends. * login/utmp_file.c (pututline_file): Don't always report success if similar entry is found. Patch by Mark M. Kettenis. 1998-01-30 16:06 Philip Blundell <pb@nexus.co.uk> * manual/Makefile: Don't try to install the info files if makeinfo is not available. 1998-01-30 12:05 Philip Blundell <pb@nexus.co.uk> * sysdeps/unix/sysv/linux/bits/ioctls.h: Include a copy of the kernel's network ioctls, rather than using <linux/sockios.h> to get them. This way we are sure of maintaining compatibility if the kernel interface should change. 1998-01-30 15:52 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/Dist: Add netrose/rose.h. 1998-01-25 19:54 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/netrose/rose.h: New file. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Install it. 1998-01-27 22:29 Zack Weinberg <zack@rabi.phys.columbia.edu> Implement System V pseudoterminal handling. * login/Makefile (routines): Add getpt, grantpt, unlockpt, ptsname. (libutil-routines): Remove pty. Add openpty, forkpty. (distribute): New internal header pty-internal.h. (others): Add the helper program, pt_chown. (install-others): Install it, in $(libexecdir), mode 4755. * login/pty-internal.h: New file. * login/openpty.c: New file. * login/forkpty.c: New file. * login/programs/pt_chown.c: New file. * libc.map: Add getpt, grantpt, unlockpt, ptsname, ptsname_r. * stdlib/stdlib.h: Prototype them. * config.make.in: Define $(libexecdir). * Makeconfig: Define $(inst_libexecdir). * sysdeps/generic/pty.c: Removed. * sysdeps/unix/sysv/linux/pty.c: Removed. * sysdeps/generic/getpt.c: Stub out. * sysdeps/generic/grantpt.c: Likewise. * sysdeps/generic/ptsname.c: Likewise. * sysdeps/generic/unlockpt.c: Likewise. * sysdeps/unix/grantpt.c: New file. * sysdeps/unix/bsd/getpt.c: New file. * sysdeps/unix/bsd/unlockpt.c: New file. * sysdeps/unix/sysv/linux/getpt.c: New file. * sysdeps/unix/sysv/linux/ptsname.c: New file. * sysdeps/unix/sysv/linux/unlockpt.c: New file. 1998-01-29 23:56 Ulrich Drepper <drepper@cygnus.com> * localedata/locales/ru_RU: Fix YESEXPR. Patch by lav@yars.free.net. 1998-01-29 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nss/Makefile (tests): Add rule for test-netdb.c. * nss/test-netdb.c: New file. 1998-01-29 02:38 Ulrich Drepper <drepper@cygnus.com> * elf/dl-open.c (_dl_open): Make sure the variable `reloc' is really kept as a variable. Patch by Richard Henderson, reported by Jakub Jelinek <jj@sunsite.ms.mff.cuni.cz>. * elf/rtld.c (dl_main): Call _dl_init_paths before handling preloading. * elf/genrtldtbl.awk: Mark machine dependent directory of generated entries as not existing. 1998-01-26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * stdio-common/vfprintf.c (process_arg): Fix printing of octal zero in alternate form with precision of zero, which must produce "0". Add braces to avoid ambiguous `else'. 1998-01-26 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nss_compat/compat-grp.c: Fix memory leak and trailing null problem with strncpy. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/comapt-spwd.c: Likewise. 1998-01-28 Andreas Jaeger <aj@arthur.rhein-neckar.de> * assert/assert.h (assert_perror): Correct test for errnum. Patch by uch@nop.or.jp. [PR libc/437] 1997-12-20 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * locales/pl_PL: Fix int_curr_symbol. 1998-01-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nis/nis_cache.c: Include <unistd.h> for declaration of close. 1998-01-06 Andreas Jaeger <aj@arthur.rhein-neckar.de> * stdio-common/test-popen.c: Include <errno.h>. * sysdeps/unix/sysv/linux/if_index.c: Include <unistd.h> for close. * inet/getnetgrent_r.c: Include <errno.h>. * db2/db/db_conv.c: Include <string.h> for memcpy. * gmon/bb_exit_func.c: Include <string.h> instead of <strings.h> so that memcpy is declared. * iconv/iconv_open.c: Include <stdlib.h> for alloca. * misc/init-misc.c: Remove unneeded inclusion of <errno.h>. 1998-01-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * pwd/fgetpwent_r.c (__fgetpwent_r): Correctly handle buffer overflow while reading line with fgets. * grp/fgetgrent_r.c (__fgetgrent_r): Likewise. 1998-01-27 00:46 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/bits/types.h (__ipc_pid_t): Change to unsigned short, not short. Reported by Andreas Jaeger. 1998-01-06 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/mips/syscalls.list: Correct typo (ccept->accept). * sysdeps/generic/inttypes.h: Fix spelling. 1998-01-04 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/arm/Dist: Add bits/mman.h. * sysdeps/unix/sysv/linux/alpha/Dist: Add net/route.h. 1998-01-27 00:30 Ulrich Drepper <drepper@cygnus.com> * stdio-common/printf.h (struct print_info): Add new bitfield is_char. * stdio-common/printf-parse.h (parse_one_spec): Fill in is_char field for hh modifier. * stdio-common/vfprint.c: Use is_char field and do not depend in is_short having the value 2. Bug reported by Andreas Jaeger. 1998-01-05 Andreas Jaeger <aj@arthur.rhein-neckar.de> * libio/freopen.c (freopen): Call _IO_old_freopen only if defined PIC && DO_VERSIONING. 1998-01-24 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Rules: Add rules for $(common-objpfx)dummy$o.
477 lines
11 KiB
C
477 lines
11 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 <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. */
|
|
if (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;
|
|
}
|