mirror of
https://sourceware.org/git/glibc.git
synced 2024-10-04 04:57:46 +00:00
714a562f0b
<1997-06-12 21:22 Ulrich Drepper <drepper@cygnus.com> * Makefile (libc-map): Define before including Makerules. * Makerules (lib%.so): Depend on $(lib%-map). (build-shlib): Adapt rule for above change. (libc.so): Depend on $(libc-map). * db/Makefile (libcdb-map): New definition. * elf/Makefile (libdl-map): New definition. * elf/dl-lookup.c: Don't use relative include path. (undefined_msg): New variable. Use single string in all functions. (do_lookup): Correctly recognize default version. Return -2 if no version information is available. Stop processing hash entries when string was found. Don't bark about missing versioned symbol in file with original reference if it is a weak symbol. (_dl_lookup_symbol): Use undefined_msg. (_dl_lookup_versioned_symbol): Likewise. Give extra information if no verdef info is available. * elf/dl-version.c (file_needed): Remove first argument. We must seek in the whole search list. (match_symbol): Correct check for available verdef info. (_dl_check_map_versions): Correct call of find_needed. * locale/Makefile (libBrokenLocale-map): New definition. * login/Makefile (libutil-map): New definition. * math/Makefile (libm-map): New definition. * md5-crypt/Makefile (libcrypt-map): New definition. * nis/Makefile (libnsl-map, libnss_compat-map, libnss_nis-map, libnss_nisplus-map): New definition. * nss/Makefile (libnss_files-map, libnss_db-map): New definitions. * resolv/Makefile (libresolv-map, libnss_dns-map): New definitions. * libc.map: New file. * db/libdb.map: New file. * elf/libdl.map: New file. * locale/libBrokenLocale.map: New file. * login/libutil.map: New file. * math/libm.map: New file. * md5-crypt/libcrypt.map: New file. * nis/libnss_compat.map: New file. * nis/libnsl.map: New file. * nis/libnss_nis.map: New file. * nis/libnss_nisplus.map: New file. * nss/libnss_files.map: New file. * nss/libnss_db.map: New file. * resolv/libnss_dns.map: New file. * resolv/libresolv.map: New file. * sysdeps/i386/dl-machine.h (elf_machine_rel): Don't do anything for R_386_NONE entries. * Makefile (manual/dir-add.info): New rule. * Makerules: Add vpath definition for .x files. * Makerules (distinfo): Make sure target directory exists. * argp/argp-help.c (argp_args_usage): Don't modify `fdoc' value since it is used to distinguish filtered strings from unmodifed strings. * elf/dl-lookup.c (do_lookup): Optimize STT_* recognition. * elf/dl-reloc.c: Fix typo. * inet/arpa/tftp.h (struct tftphdr): Change type of tu_block to `unsigned short'. * manual/Makefile (dir-add.texi): Also emit wrapper text for info/install-info. (distribute): Add dir-add.texi and dir-add.info. (mostlyclean): Add dir-add.info. (realclean): Add dir-add.texi. (install): Add entries in `dir' file using install-info. * manual/libc.texinfo: Add @dircategory and @direntry text. Reported by Miles Bader <miles@gnu.ai.mit.edu>. * manual/pattern.texi: Correct description of GLOB_MAGCHAR and GLOB_NOMAGIC. Changes by Roland McGrath <roland@gnu.ai.mit.edu>. * nis/nis_addmember.c: Little optimizations. * nis/nis_call.c: Likewise. * nis/nis_creategroup.c: Likewise. * nis/nis_defaults.c: Likewise. * nis/nis_destroygroup.c: Likewise. * nis/nis_ismember.c: Likewise. * nis/nis_local_names.c: Likewise. * nis/nis_print_group_entry.c: Likewise. * nis/nis_verifygroup.c: Likewise. * posix/unistd.h: Fix comment for getcwd. * stdlib/Makefile (headers): Remove inttypes.h. It's a system dependent header. * sysdeps/wordsize-32/Dist: New file. * sysdeps/wordsize-32/Makefile: New file. * sysdeps/wordsize-64/Dist: New file. * sysdeps/wordsize-64/Makefile: New file. * sunrpc/Makefile: Adopt comment for real situation. * sysdeps/i386/add_n.S: Add ASM_TYPE_DIRECTIVE and AS_SIZE_DIRECTIVE. * sysdeps/i386/addmul_1.s: Likewise. * sysdeps/i386/lshist.s: Likewise. * sysdeps/i386/rshift.s: Likewise. * sysdeps/i386/sub_n.s: Likewise. * sysdeps/i386/submul_1.s: Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.h (SYSCALL_ERROR_HANDLER): Add .type and .size. 1997-06-12 13:32 Philip Blundell <Philip.Blundell@pobox.com> * libc/sysdeps/unix/arm/brk.S: New file. * libc/sysdeps/unix/arm/sysdep.S: Likewise. * libc/sysdeps/unix/sysv/linux/arm/sysdep.S: Likewise. 1997-06-11 11:51 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nss_nisplus/nisplus-spwd.c (_nss_nisplus_parse_spent): Check if we have shadow information. 1997-06-08 19:33 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nis_getservlist.c (nis_getservlist): Use calloc instead of malloc, alloc memory for nis_server struct. * nis/nis_getservlist.c (nis_freeservlist): Give the memory for the nis_server struct free, too. * nis/nis_removemember (nis_removemember): Fix for loop. 1997-06-12 12:45 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/fpu/__math.h (__M_SQRT2): Define here since we cannot rely on M_SQRT2 being defined. (log1p): Use __M_SQRT2 not M_SQRT2. * math/math.h (_Mldbl): Define even if M_* constants are not defined. Reported by corsepiu@faw.uni-ulm.de. 1997-06-12 03:08 Philip Blundell <Philip.Blundell@pobox.com> * nss/getXXbyYY_r.c (do_weak_alias): Remove extra parentheses. 1997-06-11 13:22 Ulrich Drepper <drepper@cygnus.com> * misc/regexp.h (compile): Allow use of macro INIT for variable declaration. Add documentation for INIT. Reported by Robert Bihlmeyer <robbe@orcus.priv.at>. 1997-06-11 10:47 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/net/if_arp.h: Add two new hardware types. 1997-06-10 11:31 H.J. Lu <hjl@gnu.ai.mit.edu> * sysdeps/powerpc/strlen.s: Use -0x101 instead of 0xfffffeff for a signed 16-bit value. 1997-06-07 07:54 H.J. Lu <hjl@gnu.ai.mit.edu> * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c (_dl_sysdep_read_whole_file): Deleted. * sysdeps/powerpc/fenvbits.h (__FE_ALL_INVALID): Changed to FE_ALL_INVALID. * sysdeps/powerpc/fraiseexcpt.c (__FE_INVALID_SOFTWARE): Changed to FE_INVALID_SOFTWARE. (__FPSCR_STICKY_BITS): Changed to FPSCR_STICKY_BITS. * sysdeps/libm-ieee754/s_fmin.c: Fix a typo. 1997-06-07 18:48 H.J. Lu <hjl@gnu.ai.mit.edu> * shlib-versions (.*-.*-linux.*): Set libc to 6. 1997-06-08 15:35 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nis_add.c (nis_add): Use nis_leaf_of_r instead of nis_name_of_r. * nis/nis_addmember.c (nis_addmember): Fix a lot of pointer errors. * nis/nis_clone.c: Likewise. * nis/nis_removemember.c (nis_removemember): Likewise. * nis/nis_table.c: Likewise. * nis/nss_nis/nis-hosts.c: Use addr, not p for inet_pton call. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nis/nis-netgrp.c (_nss_nis_setnetgrent): Check for group == NULL. 1997-06-08 21:21 Mark Kettenis <kettenis@phys.uva.nl> * login/login.c, login/utmp_daemon.c, login/utmp_file.c, login/getutent_r.c, login/utmpname.c: Cleanup `#if _LIBC' and `#ifndef _LIBC' fragments. * login/programs/utmpd.c: Define DEFAULT_USER. (drop_priviliges): Use it. (main): Set locale and text domain. * login/programs/utmpd-private.h: Declare proc_utmp_eq. * login/programs/database.c (proc_utmp_eq): Removed. * login/programs/request.c (proc_utmp_eq): Made global. Only use ut_id field if valid. * login/utmp_file.c (proc_utmp_eq): Restore patch made by Miles Bader that was lost when adding the daemon backend; Only use ut_id field if valid. 1997-06-05 23:10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/Dist: Remove netatalk/atalk.h and netinet/icmp.h, add netatalk/at.h. * sysdeps/unix/sysv/linux/powerpc/Dist: Remove termios.h. * sysdeps/unix/sysv/linux/sparc/Dist: Remove start.c. 1997-06-04 19:22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * stdlib/testsort.c (compare): Fix parameter types. 1997-06-04 19:05 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * md5-crypt/Makefile (distribute): Fix name of file. 1997-06-04 19:02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * login/Makefile (utmpd-routines): Remove utmpd again, which is already added implicitly through $(others). 1997-06-05 13:43 Fila Kolodny <fila@filapc.ibi.com> * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add netipx/ipx.h. 1997-06-05 13:25 Andreas Jaeger <aj@arthur.rhein-neckar.de> * md5-crypt/md5-crypt.c: Add prototype for __md5_crypt. 1997-06-05 17:08 Ulrich Drepper <drepper@cygnus.com> * string/argz-addsep.c: Correct weak alias. Reported by Ben Pfaff <pfaffben@pilot.msu.edu>. * locale/setlocale.c (setlocale): Free variable with locale path before returning. (setname): Don't test for _nl_current[category] being NULL before freeing. Reported by Ben Pfaff <pfaffben@pilot.msu.edu>. 1997-06-04 12:41 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/intro.texi (XPG): Correct some typos. * manual/libc.texinfo (Program Arguments): Menu updated. * nis/nis_local_names.c (nis_local_host): Fix pointer errors.
489 lines
11 KiB
C
489 lines
11 KiB
C
/* Copyright (C) 1997 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997.
|
|
|
|
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 <string.h>
|
|
#include <stdlib.h>
|
|
#include <sys/stat.h>
|
|
#include <time.h>
|
|
#include <unistd.h>
|
|
#include <utmp.h>
|
|
|
|
|
|
#include "utmpd-private.h"
|
|
#include "xtmp.h"
|
|
|
|
|
|
/* Prototypes for the local functions. */
|
|
static int initialize_database (utmp_database *database);
|
|
static int store_state_entry (utmp_database *database, int old_position,
|
|
const struct utmp *old_entry);
|
|
static int store_process_entry (utmp_database *database, int old_position,
|
|
const struct utmp *old_entry);
|
|
static int replace_entry (utmp_database *database, int old_position,
|
|
int new_position, const struct utmp *entry);
|
|
static int store_entry (utmp_database *database, int position,
|
|
const struct utmp *entry);
|
|
static int get_mtime (const char *file, time_t *timer);
|
|
|
|
|
|
/* Open the database specified by FILE and merge it with the
|
|
contents of the old format file specified by OLD_FILE. Returns a
|
|
pointer to a newly allocated structure describing the database, or
|
|
NULL on error. */
|
|
utmp_database *
|
|
open_database (const char *file, const char *old_file)
|
|
{
|
|
utmp_database *database;
|
|
|
|
/* Allocate memory. */
|
|
database = (utmp_database *) malloc (sizeof (utmp_database));
|
|
if (database == NULL)
|
|
return NULL;
|
|
|
|
memset (database, 0, sizeof (utmp_database));
|
|
|
|
/* Open database. */
|
|
database->fd = open (file, O_RDWR);
|
|
if (database->fd < 0)
|
|
goto fail;
|
|
|
|
database->old_fd = open (old_file, O_RDWR);
|
|
if (database->old_fd < 0)
|
|
goto fail;
|
|
|
|
if ((file && !(database->file = strdup (file)))
|
|
|| (old_file && !(database->old_file = strdup (old_file))))
|
|
goto fail;
|
|
|
|
if (initialize_database (database) < 0
|
|
|| synchronize_database (database) < 0)
|
|
goto fail;
|
|
|
|
return database;
|
|
|
|
fail:
|
|
close_database (database);
|
|
return NULL;
|
|
}
|
|
|
|
/* Synchronize DATABASE. */
|
|
int
|
|
synchronize_database (utmp_database *database)
|
|
{
|
|
assert (database);
|
|
|
|
/* Check if there is a file in the old format, that we have to
|
|
synchronize with. */
|
|
if (database->old_file)
|
|
{
|
|
time_t curtime;
|
|
time_t mtime;
|
|
|
|
curtime = time (NULL);
|
|
|
|
if (get_mtime (database->old_file, &mtime) < 0)
|
|
return -1;
|
|
|
|
if (mtime >= database->mtime)
|
|
{
|
|
int position = 0;
|
|
struct utmp entry;
|
|
struct utmp old_entry;
|
|
|
|
while (1)
|
|
{
|
|
if (read_old_entry (database, position, &old_entry) < 0)
|
|
break;
|
|
|
|
if (read_entry (database, position, &entry) < 0
|
|
|| !compare_entry (&old_entry, &entry))
|
|
{
|
|
if (write_entry (database, position, &old_entry) < 0)
|
|
return -1;
|
|
}
|
|
|
|
position++;
|
|
}
|
|
|
|
database->mtime = curtime;
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Close DATABASE. */
|
|
void
|
|
close_database (utmp_database *database)
|
|
{
|
|
assert (database);
|
|
|
|
if (database->fd >= 0)
|
|
close (database->fd);
|
|
|
|
if (database->old_fd >= 0)
|
|
close (database->old_fd);
|
|
|
|
/* Free allocated memory. */
|
|
if (database->file)
|
|
free (database->file);
|
|
if (database->old_file)
|
|
free (database->old_file);
|
|
free (database);
|
|
}
|
|
|
|
|
|
/* Read the entry at POSITION in DATABASE and store the result in
|
|
ENTRY. Returns 0 if successful, -1 if not. */
|
|
int
|
|
read_entry (utmp_database *database, int position, struct utmp *entry)
|
|
{
|
|
ssize_t nbytes;
|
|
off_t offset;
|
|
|
|
offset = position * sizeof (struct utmp);
|
|
if (lseek (database->fd, offset, SEEK_SET) < 0)
|
|
return -1;
|
|
|
|
nbytes = read (database->fd, entry, sizeof (struct utmp));
|
|
if (nbytes != sizeof (struct utmp))
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Write ENTRY at POSITION in DATABASE. Returns 0 if successful, -1
|
|
on error. */
|
|
int
|
|
write_entry (utmp_database *database, int position,
|
|
const struct utmp *entry)
|
|
{
|
|
int result = -1;
|
|
struct flock fl;
|
|
ssize_t nbytes;
|
|
off_t offset;
|
|
|
|
/* Try to lock the file. */
|
|
memset (&fl, 0, sizeof (struct flock));
|
|
fl.l_type = F_WRLCK;
|
|
fl.l_whence = SEEK_SET;
|
|
fcntl (database->fd, F_SETLKW, &fl);
|
|
|
|
offset = position * sizeof (struct utmp);
|
|
if (lseek (database->fd, offset, SEEK_SET) < 0)
|
|
goto fail;
|
|
|
|
nbytes = write (database->fd, entry, sizeof (struct utmp));
|
|
if (nbytes != sizeof (struct utmp))
|
|
{
|
|
ftruncate (database->fd, offset);
|
|
goto fail;
|
|
}
|
|
|
|
result = 0;
|
|
|
|
fail:
|
|
/* And unlock the file. */
|
|
fl.l_type = F_UNLCK;
|
|
fcntl (database->fd, F_SETLKW, &fl);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
/* Append ENTRY to DATABASE. Returns the position of the appended
|
|
entry if successful, or -1 on error. */
|
|
int
|
|
append_entry (utmp_database *database, const struct utmp *entry)
|
|
{
|
|
int result = -1;
|
|
struct flock fl;
|
|
ssize_t nbytes;
|
|
off_t offset;
|
|
|
|
/* Try to lock the file. */
|
|
memset (&fl, 0, sizeof (struct flock));
|
|
fl.l_type = F_WRLCK;
|
|
fl.l_whence = SEEK_SET;
|
|
fcntl (database->fd, F_SETLKW, &fl);
|
|
|
|
offset = lseek (database->fd, 0, SEEK_END);
|
|
if (offset % sizeof (struct utmp) != 0)
|
|
{
|
|
offset -= offset % sizeof (struct utmp);
|
|
ftruncate (database->fd, offset);
|
|
|
|
if (lseek (database->fd, 0, SEEK_END) < 0)
|
|
goto fail;
|
|
}
|
|
|
|
nbytes = write (database->fd, entry, sizeof (struct utmp));
|
|
if (nbytes != sizeof (struct utmp))
|
|
{
|
|
ftruncate (database->fd, offset);
|
|
goto fail;
|
|
}
|
|
|
|
result = offset / sizeof (struct utmp);
|
|
|
|
fail:
|
|
/* And unlock the file. */
|
|
fl.l_type = F_UNLCK;
|
|
fcntl (database->fd, F_SETLKW, &fl);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
int
|
|
read_old_entry (utmp_database *database, int position,
|
|
struct utmp *entry)
|
|
{
|
|
struct xtmp old_entry;
|
|
ssize_t nbytes;
|
|
off_t offset;
|
|
|
|
offset = position * sizeof (struct xtmp);
|
|
if (lseek (database->old_fd, offset, SEEK_SET) < 0)
|
|
return -1;
|
|
|
|
nbytes = read (database->old_fd, &old_entry, sizeof (struct xtmp));
|
|
if (nbytes != sizeof (struct xtmp))
|
|
return -1;
|
|
|
|
xtmp_to_utmp (&old_entry, entry);
|
|
return 0;
|
|
}
|
|
|
|
|
|
int
|
|
write_old_entry (utmp_database *database, int position,
|
|
const struct utmp *entry)
|
|
{
|
|
struct xtmp old_entry;
|
|
ssize_t nbytes;
|
|
off_t offset;
|
|
|
|
utmp_to_xtmp (entry, &old_entry);
|
|
|
|
offset = position * sizeof (struct xtmp);
|
|
if (lseek (database->old_fd, offset, SEEK_SET) < 0)
|
|
return -1;
|
|
|
|
nbytes = write (database->old_fd, &old_entry, sizeof (struct xtmp));
|
|
if (nbytes != sizeof (struct xtmp))
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Initialize DATABASE. */
|
|
static int
|
|
initialize_database (utmp_database *database)
|
|
{
|
|
struct utmp entry;
|
|
int position = 0;
|
|
|
|
assert (database);
|
|
|
|
/* Check if there is a file in the old format to read. */
|
|
if (database->old_file)
|
|
{
|
|
while (1)
|
|
{
|
|
if (read_old_entry (database, position, &entry) < 0)
|
|
break;
|
|
|
|
#if _HAVE_UT_TYPE - 0
|
|
/* If the login type is one of RUN_LVL, BOOT_TIME, OLD_TIME or
|
|
NEW_TIME, search for an entry of the same type in the
|
|
database, and replace it if the entry in the file is newer. */
|
|
if (entry.ut_type == RUN_LVL || entry.ut_type == BOOT_TIME
|
|
|| entry.ut_type == OLD_TIME || entry.ut_type == NEW_TIME)
|
|
{
|
|
if (store_state_entry (database, position, &entry) < 0)
|
|
return -1;
|
|
}
|
|
else
|
|
#endif
|
|
{
|
|
if (store_process_entry (database, position, &entry) < 0)
|
|
return -1;
|
|
}
|
|
|
|
/* Update position. */
|
|
position++;
|
|
}
|
|
|
|
while (1)
|
|
{
|
|
if (read_entry (database, position, &entry) < 0)
|
|
break;
|
|
|
|
if (write_old_entry (database, position, &entry) < 0)
|
|
return -1;
|
|
|
|
/* Update position. */
|
|
position++;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int
|
|
store_state_entry (utmp_database *database, int old_position,
|
|
const struct utmp *old_entry)
|
|
{
|
|
struct utmp new_entry;
|
|
int new_position = 0;
|
|
int found = 0;
|
|
|
|
assert (old_entry->ut_type == RUN_LVL
|
|
|| old_entry->ut_type == BOOT_TIME
|
|
|| old_entry->ut_type == OLD_TIME
|
|
|| old_entry->ut_type == NEW_TIME);
|
|
|
|
while (!found)
|
|
{
|
|
/* Read the next entry. */
|
|
if (read_entry (database, new_position, &new_entry) < 0)
|
|
break;
|
|
|
|
if (old_entry->ut_type == new_entry.ut_type)
|
|
{
|
|
found = 1;
|
|
continue;
|
|
}
|
|
|
|
/* Update position. */
|
|
new_position++;
|
|
}
|
|
|
|
if (found)
|
|
{
|
|
const struct utmp *entry;
|
|
|
|
if (old_entry->ut_time > new_entry.ut_time)
|
|
entry = old_entry;
|
|
else
|
|
entry = &new_entry;
|
|
|
|
return replace_entry (database, old_position, new_position, entry);
|
|
}
|
|
|
|
return store_entry (database, old_position, old_entry);
|
|
}
|
|
|
|
|
|
static int
|
|
store_process_entry (utmp_database *database, int old_position,
|
|
const struct utmp *old_entry)
|
|
{
|
|
struct utmp new_entry;
|
|
int new_position = 0;
|
|
int found = 0;
|
|
|
|
while (!found)
|
|
{
|
|
/* Read the next entry. */
|
|
if (read_entry (database, new_position, &new_entry) < 0)
|
|
break;
|
|
|
|
if (proc_utmp_eq (old_entry, &new_entry))
|
|
{
|
|
found = 1;
|
|
continue;
|
|
}
|
|
|
|
/* Update position. */
|
|
new_position++;
|
|
}
|
|
|
|
if (found)
|
|
{
|
|
const struct utmp *entry;
|
|
|
|
if (old_entry->ut_time > new_entry.ut_time)
|
|
entry = old_entry;
|
|
else
|
|
entry = &new_entry;
|
|
|
|
return replace_entry (database, old_position, new_position, entry);
|
|
}
|
|
|
|
return store_entry (database, old_position, old_entry);
|
|
}
|
|
|
|
|
|
static int
|
|
replace_entry (utmp_database *database, int old_position, int new_position,
|
|
const struct utmp *entry)
|
|
{
|
|
struct utmp tmp;
|
|
|
|
if (read_entry (database, old_position, &tmp) < 0
|
|
|| write_entry (database, old_position, entry) < 0
|
|
|| write_entry (database, new_position, &tmp) < 0)
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int
|
|
store_entry (utmp_database *database, int position,
|
|
const struct utmp *entry)
|
|
{
|
|
struct utmp tmp;
|
|
|
|
if (read_entry (database, position, &tmp) < 0)
|
|
return write_entry (database, position, entry);
|
|
|
|
if (write_entry (database, position, entry) < 0
|
|
|| append_entry (database, &tmp) < 0)
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Get modification time of FILE and put it in TIMER. returns 0 if
|
|
successful, -1 if not. */
|
|
static int
|
|
get_mtime (const char *file, time_t *timer)
|
|
{
|
|
struct stat st;
|
|
|
|
if (stat (file, &st) < 0)
|
|
return -1;
|
|
|
|
*timer = st.st_mtime;
|
|
|
|
return 0;
|
|
}
|