* sysdeps/generic/utmp-equal.h: New file, extracted from utmp_file.c.
* sysdeps/generic/utmp_file.c (setutent_file): Invalidate last_entry also on platforms with !HAVE_UT_TYPE. (proc_utmp_eq): Remove function. (internal_getut_r, pututline_file): Call __utmp_equal instead. 2002-09-20 Bruno Haible <bruno@clisp.org> * abi-tags: Add support for FreeBSD with ABI OS value 3. * elf/cache.c (print_entry): Support the GNU/FreeBSD ABI tag.
This commit is contained in:
Roland McGrath
parent
800a312a56
commit
82c261269b
13
ChangeLog
13
ChangeLog
|
|
@ -1,3 +1,16 @@
|
|||
2002-09-17 Bruno Haible <bruno@clisp.org>
|
||||
|
||||
* sysdeps/generic/utmp-equal.h: New file, extracted from utmp_file.c.
|
||||
* sysdeps/generic/utmp_file.c (setutent_file): Invalidate last_entry
|
||||
also on platforms with !HAVE_UT_TYPE.
|
||||
(proc_utmp_eq): Remove function.
|
||||
(internal_getut_r, pututline_file): Call __utmp_equal instead.
|
||||
|
||||
2002-09-20 Bruno Haible <bruno@clisp.org>
|
||||
|
||||
* abi-tags: Add support for FreeBSD with ABI OS value 3.
|
||||
* elf/cache.c (print_entry): Support the GNU/FreeBSD ABI tag.
|
||||
|
||||
2002-09-20 Roland McGrath <roland@redhat.com>
|
||||
|
||||
* sysdeps/generic/gmp-mparam.h: Include <bits/wordsize.h>.
|
||||
|
|
|
|||
2
abi-tags
2
abi-tags
|
|
@ -22,5 +22,7 @@
|
|||
|
||||
.*-sun-solaris2.* 2 2.0.0 # just an arbitrary value
|
||||
|
||||
.*-.*-freebsd.*-gnu.* 3 4.0.0 # earliest compatible kernel version
|
||||
|
||||
# There is no catch-all default here because every supported OS that uses
|
||||
# ELF must have its own unique ABI tag.
|
||||
|
|
|
|||
|
|
@ -101,12 +101,14 @@ print_entry (const char *lib, int flag, unsigned int osversion,
|
|||
[0] = "Linux",
|
||||
[1] = "Hurd",
|
||||
[2] = "Solaris",
|
||||
[3] = N_("Unknown OS")
|
||||
[3] = "FreeBSD",
|
||||
[4] = N_("Unknown OS")
|
||||
};
|
||||
#define MAXTAG (sizeof abi_tag_os / sizeof abi_tag_os[0] - 1)
|
||||
unsigned int os = osversion >> 24;
|
||||
|
||||
printf (_(", OS ABI: %s %d.%d.%d"),
|
||||
_(abi_tag_os[os > 3 ? 3 : os]),
|
||||
_(abi_tag_os[os > MAXTAG ? MAXTAG : os]),
|
||||
(osversion >> 16) & 0xff,
|
||||
(osversion >> 8) & 0xff,
|
||||
osversion & 0xff);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,53 @@
|
|||
/* Helper function for utmp functions to see if two entries are equal.
|
||||
Copyright (C) 1996,97,98,99,2000,01,02 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 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, write to the Free
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#include <string.h>
|
||||
#include <utmp.h>
|
||||
|
||||
#include "utmp-private.h"
|
||||
|
||||
/* Test whether two entries match. */
|
||||
static int
|
||||
__utmp_equal (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
|
||||
);
|
||||
}
|
||||
|
|
@ -28,6 +28,7 @@
|
|||
#include <utmp.h>
|
||||
|
||||
#include "utmp-private.h"
|
||||
#include "utmp-equal.h"
|
||||
|
||||
|
||||
/* Descriptor for the file and position. */
|
||||
|
|
@ -148,9 +149,14 @@ setutent_file (void)
|
|||
__lseek64 (file_fd, 0, SEEK_SET);
|
||||
file_offset = 0;
|
||||
|
||||
#if _HAVE_UT_TYPE - 0
|
||||
/* Make sure the entry won't match. */
|
||||
#if _HAVE_UT_TYPE - 0
|
||||
last_entry.ut_type = -1;
|
||||
#else
|
||||
last_entry.ut_line[0] = '\177';
|
||||
# if _HAVE_UT_ID - 0
|
||||
last_entry.ut_id[0] = '\0';
|
||||
# endif
|
||||
#endif
|
||||
|
||||
return 1;
|
||||
|
|
@ -199,33 +205,6 @@ getutent_r_file (struct utmp *buffer, struct utmp **result)
|
|||
}
|
||||
|
||||
|
||||
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)
|
||||
{
|
||||
|
|
@ -275,7 +254,7 @@ internal_getut_r (const struct utmp *id, struct utmp *buffer)
|
|||
}
|
||||
file_offset += sizeof (struct utmp);
|
||||
|
||||
if (proc_utmp_eq (buffer, id))
|
||||
if (__utmp_equal (buffer, id))
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -390,7 +369,7 @@ pututline_file (const struct utmp *data)
|
|||
|| last_entry.ut_type == NEW_TIME))
|
||||
||
|
||||
#endif
|
||||
proc_utmp_eq (&last_entry, data)))
|
||||
__utmp_equal (&last_entry, data)))
|
||||
found = 1;
|
||||
else
|
||||
found = internal_getut_r (data, &buffer);
|
||||
|
|
|
|||
Loading…
Reference in New Issue