From b8fe19fa809ac786b7d3dbb464cb1b3f887dc69d Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 22 May 1996 02:11:55 +0000 Subject: Wed May 22 01:48:54 1996 Ulrich Drepper * stdlib/strtol.c [!QUAD] (ULONG_MAX, LONG_MAX): Define these macros if they are not available. (WEAKNAME): New macro to declare argument as weak. Define function with __ prefix and add normal name as weak alias. * sysdeps/posix/euidaccess.c (S_IROTH, S_IWOTH, S_IXOTH): Defines these macros if not already available based on R_OK, W_OK, and X_OK. Tue May 21 18:48:46 1996 Roland McGrath * misc/sys/syslog.h (__need___va_list): Define this instead of __need_va_list before including . * Makerules (o-iterator): Use $(object-suffixes-left) instead of $(object-suffixes) to produce repetitions; this is used for other lists than just that one. [versioned]: Use $(o-iterator) properly. * sysdeps/unix/sysv/linux/Implies: Include `gnu'. * sysdeps/mach/hurd/Implies: Likewise. Sat May 18 02:57:46 1996 Ulrich Drepper * login/Makefile: New file. This directory contains functions for user administration. * Makefile (subdirs): Add login. * misc/Makefile (headers): Remove utmp.h. Now in login/utmp.h. (extra-libs, libutil-routines): Ditto. * misc/login.c, misc/login_tty.c, misc/logout.c, misc/logwtmp.c, misc/utmp.h: Moved to misc/. * login/login.c, login/login_tty.c, login/logout.c, login/logwtmp.c, login/utmp.h: Moved to here from misc/. * login/utmp.h: Split file. Definitions of data structures and constants are now in the system dependent utmpbits.h file. * login/setutent_r.c, login/setutent.c, login/endutent_r.c, login/endutent.c, login/getutent_r.c, login/getutent.c, login/getutid_r.c, login/getutid.c, login/getutline_r.c, login/getutline.c, login/pututline_r.c, login/pututline.c: New files. Routines to handle utmp-style files. * sysdeps/gnu/utmpbits.h: New file. Contains GNU/Linux specific definitions of utmp data structures and constants. * sysdeps/unix/sysv/utmpbits.h: Renamed from sysdeps/unix/sysv/utmp.h. * sysdeps/generic/utmpbits.h: New file. Generic (BSDish) version of definitions of utmp data structures and constants. Fri May 17 00:01:31 1996 Ulrich Drepper * locale/C-monetary.c: Default value for mon_decimal_point should be '.'. * stdio-common/printf.h: Remove Linux libc compatibility stuff. Add `extra' flag. Currently used in __printf_fp. * stdio-common/printf_fp.c (__guess_grouping): Renamed from `guess_grouping' and extend visibility to extern. This function is now used in `strfmon'. (__printf_fp): Recognize new bit flag in info struct. This triggers to use the grouping information and decimal point from the LC_MONETARY category instead of the LC_NUMERIC category. * stdio-common/vfprintf.c (process_arg): Correct major bug. In `complicated' loop we must not use the varargs because the args are already available in the ARGS_VALUE array. * stdlib/Makefile (headers): Add monetary.h. (routines): Add strfmon. * stdlib/monetary.h: New file. Header for strfmon function. * stdlib/strfmon.c: New file. Implement strfmon function to print monetary amounts according to current locale's rules. * sysdeps/unix/sysv/linux/i386/sys/vm86.h: The kernel header is now (>= Linux-1.3.100) called . --- sysdeps/generic/utmpbits.h | 52 +++++++++++++++++++++ sysdeps/gnu/utmpbits.h | 83 +++++++++++++++++++++++++++++++++ sysdeps/mach/hurd/Implies | 3 ++ sysdeps/posix/euidaccess.c | 10 ++++ sysdeps/unix/sysv/linux/Implies | 4 ++ sysdeps/unix/sysv/linux/i386/sys/vm86.h | 2 +- sysdeps/unix/sysv/utmp.h | 23 --------- sysdeps/unix/sysv/utmpbits.h | 42 +++++++++++++++++ 8 files changed, 195 insertions(+), 24 deletions(-) create mode 100644 sysdeps/generic/utmpbits.h create mode 100644 sysdeps/gnu/utmpbits.h delete mode 100644 sysdeps/unix/sysv/utmp.h create mode 100644 sysdeps/unix/sysv/utmpbits.h (limited to 'sysdeps') diff --git a/sysdeps/generic/utmpbits.h b/sysdeps/generic/utmpbits.h new file mode 100644 index 0000000000..3189ff0fdf --- /dev/null +++ b/sysdeps/generic/utmpbits.h @@ -0,0 +1,52 @@ +/* The `struct utmp' type, describing entries in the utmp file. Generic/BSDish +Copyright (C) 1993, 1996 Free Software Foundation, Inc. + +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. */ + +#ifndef _UTMPBITS_H + +#define _UTMPBITS_H 1 +#include + +#include + +#define _PATH_UTMP "/var/run/utmp" +#define _PATH_WTMP "/var/log/wtmp" +#define _PATH_LASTLOG "/var/log/lastlog" + +#define UT_NAMESIZE 8 +#define UT_LINESIZE 8 +#define UT_HOSTSIZE 16 + +__BEGIN_DECLS + +struct lastlog { + time_t ll_time; + char ll_line[UT_LINESIZE]; + char ll_host[UT_HOSTSIZE]; +}; + +struct utmp { + char ut_line[UT_LINESIZE]; + char ut_name[UT_NAMESIZE]; + char ut_host[UT_HOSTSIZE]; + long ut_time; +}; + +__END_DECLS + +#endif /* utmpbits.h */ + diff --git a/sysdeps/gnu/utmpbits.h b/sysdeps/gnu/utmpbits.h new file mode 100644 index 0000000000..8b939cee86 --- /dev/null +++ b/sysdeps/gnu/utmpbits.h @@ -0,0 +1,83 @@ +/* The `struct utmp' type, describing entries in the utmp file. GNU version. +Copyright (C) 1993, 1996 Free Software Foundation, Inc. + +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. */ + +#ifndef _UTMPBITS_H + +#define _UTMPBITS_H 1 +#include + +#include +#include + +#define _PATH_UTMP "/var/run/utmp" +#define _PATH_WTMP "/var/log/wtmp" +#define _PATH_LASTLOG "/var/log/lastlog" + +#define UTMP_FILE _PATH_UTMP +#define WTMP_FILE _PATH_WTMP +#define UTMP_FILENAME UTMP_FILE +#define WTMP_FILENAME WTMP_FILE + +#define UT_UNKNOWN 0 /* for ut_type field */ + +#define RUN_LVL 1 +#define BOOT_TIME 2 +#define NEW_TIME 3 +#define OLD_TIME 4 + +#define INIT_PROCESS 5 +#define LOGIN_PROCESS 6 +#define USER_PROCESS 7 +#define DEAD_PROCESS 8 + +#define ut_name ut_user + +#define UT_LINESIZE 32 +#define UT_NAMESIZE 32 +#define UT_HOSTSIZE 256 + +__BEGIN_DECLS + +struct lastlog +{ + time_t ll_time; + char ll_line[UT_LINESIZE]; + char ll_host[UT_HOSTSIZE]; +}; + +struct utmp +{ + short int ut_type; /* Type of login. */ + pid_t ut_pid; /* Pid of login process. */ + char ut_line[UT_LINESIZE]; /* NUL-terminated devicename of tty. */ + char ut_id[4]; /* Inittab id. */ + char ut_user[UT_NAMESIZE]; /* Username (not NUL terminated). */ + char ut_host[UT_HOSTSIZE]; /* Hostname for remote login. */ + int ut_exit; /* Process termination/exit status. */ + struct timeval ut_tv; /* Time entry was made. */ + long ut_session; /* Session ID, used for windowing. */ + int32_t ut_addr; /* Internet address of remote host. */ + char pad[32]; /* Reserved for future use. */ +}; + +#define ut_time ut_tv.tv_sec /* Backwards compatibility. */ + +__END_DECLS + +#endif /* !_UTMP_H_ */ + diff --git a/sysdeps/mach/hurd/Implies b/sysdeps/mach/hurd/Implies index b6e4d864d5..b6063463ce 100644 --- a/sysdeps/mach/hurd/Implies +++ b/sysdeps/mach/hurd/Implies @@ -1,2 +1,5 @@ +# The gnu subdirectory exists for things common to both Linux-based and +# Hurd-based GNU systems. +gnu # The Hurd provides a rough superset of the functionality of 4.4 BSD. unix/bsd/bsd4.4 diff --git a/sysdeps/posix/euidaccess.c b/sysdeps/posix/euidaccess.c index feaa9a2ed3..e50bdfbb8c 100644 --- a/sysdeps/posix/euidaccess.c +++ b/sysdeps/posix/euidaccess.c @@ -78,6 +78,16 @@ extern int errno; #define R_OK 4 #endif +#if !defined (S_IROTH) && defined (R_OK) +# define S_IROTH R_OK +#endif +#if !defined (S_IWOTH) && defined (W_OK) +# define S_IWOTH W_OK +#endif +#if !defined (S_IXOTH) && defined (X_OK) +# define S_IXOTH X_OK +#endif + #ifdef _LIBC diff --git a/sysdeps/unix/sysv/linux/Implies b/sysdeps/unix/sysv/linux/Implies index 41c26f20f9..4deb1c6245 100644 --- a/sysdeps/unix/sysv/linux/Implies +++ b/sysdeps/unix/sysv/linux/Implies @@ -1,3 +1,7 @@ +# The gnu subdirectory exists for things common to both Linux-based and +# Hurd-based GNU systems. +gnu + # Linux shares most of the syscalls which are also common to BSD and SVR4. unix/common diff --git a/sysdeps/unix/sysv/linux/i386/sys/vm86.h b/sysdeps/unix/sysv/linux/i386/sys/vm86.h index 32e0055ce8..fd3c2b34f8 100644 --- a/sysdeps/unix/sysv/linux/i386/sys/vm86.h +++ b/sysdeps/unix/sysv/linux/i386/sys/vm86.h @@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA. */ #include /* Get constants and data types from kernel header file. */ -#include +#include __BEGIN_DECLS diff --git a/sysdeps/unix/sysv/utmp.h b/sysdeps/unix/sysv/utmp.h deleted file mode 100644 index 4c3d33e987..0000000000 --- a/sysdeps/unix/sysv/utmp.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef _UTMP_H - -#define _UTMP_H 1 - -#include - -struct utmp - { -#define ut_name ut_user - char ut_user[8]; - char ut_id[4]; - char ut_line[12]; - short ut_pid; - short ut_type; - struct exit_status - { - short e_termination; - short e_exit; - } ut_exit; - time_t ut_time; - }; - -#endif /* utmp.h. */ diff --git a/sysdeps/unix/sysv/utmpbits.h b/sysdeps/unix/sysv/utmpbits.h new file mode 100644 index 0000000000..e8d9334af1 --- /dev/null +++ b/sysdeps/unix/sysv/utmpbits.h @@ -0,0 +1,42 @@ +/* The `struct utmp' type, describing entries in the utmp file. System V. +Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. + +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., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#ifndef _UTMPBITS_H + +#define _UTMPBITS_H 1 + +#include + +struct utmp + { +#define ut_name ut_user + char ut_user[8]; + char ut_id[4]; + char ut_line[12]; + short ut_pid; + short ut_type; + struct exit_status + { + short e_termination; + short e_exit; + } ut_exit; + time_t ut_time; + }; + +#endif /* utmpbits.h */ -- cgit v1.2.3