summaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-10-05 13:40:47 +0000
committerUlrich Drepper <drepper@redhat.com>1998-10-05 13:40:47 +0000
commit8325d82cf3910aec38b9182face1fc3d524f676b (patch)
tree0e35c870f6d2e2a08acdd9b0047488e99cf24cd8 /sysdeps/unix/sysv
parent8c93cd99f54c6971594aa76f6e4304d0c1fe4ae0 (diff)
Update.
1998-10-02 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/sys/swap.h (SWAP_FLAG_PREFER, SWAP_FLAG_PRIO_MASK,SWAP_FLAG_PRIO_SHIFT): Added. Remove inclusion of <linux/swap.h>. 1998-10-05 Ulrich Drepper <drepper@cygnus.com> * io/sys/stat.h: Use __P in definitions of inline stat functions so that they match the declaration. 1998-10-02 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/sys/quota.h (Q_RSQUASH): Added. 1998-10-02 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/sys/acct.h: Bring in sync with current linux 2.1 version. 1998-10-02 Philip Blundell <pb@nexus.co.uk> * sysdeps/arm/dl-machine.h: Fix typo in last change. * sysdeps/arm/bits/huge_val.h: New file. 1998-10-02 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/sys/reboot.h (RB_POWER_OFF): Added. * sysdeps/unix/sysv/linux/sys/ptrace.h (PTRACE_SYSCALL): Add define. 1998-10-05 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/getcwd.c (__getcwd): Use temporary variable to store result of realloc instead of using BUF. 1998-10-04 Andreas Jaeger <aj@arthur.rhein-neckar.de> * misc/sgtty.h (_SGTTY_H): Correct spelling. Reported by Rouben Rostamian <rostamian@umbc.edu> [PR libc/817]. 1998-10-04 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/memory.texi (Obstacks): Document obstack_alloc_failed_handler usage. * malloc/obstack.h: Enhance comment about obstack_alloc_failed_handler usage. * malloc/obstack.c: Likewise. 1998-10-05 Ulrich Drepper <drepper@cygnus.com> * misc/sys/cdefs.h (__extension__): Define as empty if no gcc or gcc before 2.8 is used. 1998-10-01 Philip Blundell <pb@nexus.co.uk> * sysdeps/arm/machine-gmon.h: Correct args to mcount(). Patch from Scott Bambrough. * sysdeps/unix/sysv/linux/arm/register-dump.h: New file. * libio/libioP.h (FILEBUF_LITERAL) [! _IO_MTSAFE_IO]: Don't include the lock member. 1998-09-03 Philip Blundell <pb@nexus.co.uk> * sysdeps/arm/fpu/__longjmp.S: Cope with fussy assembler. 1998-09-29 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * string/bits/string2.h (__string2_1bptr_p): Don't use a statement expression. (__mempcpy, strcpy, __stpcpy, strcmp, strcspn, strspn, strpbrk, __strsep): Greatly reduce size of expansion by combining common expressions. (__mempcpy_small, __strcpy_small, __stpcpy_small): Convert to inline function. (__mempcpy_args, __strcpy_args, __stpcpy_args): New macros, used by the above definitions. 1998-09-27 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/unix/sysv/linux/powerpc/bits/ipc.h: New file, use correct struct ipc_perm definition. 1998-09-29 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/ypclnt.c (yp_all): Close UDP socket und give CLIENT handle free. * sysdeps/unix/sysv/linux/alpha/ioperm.c: List Ruffian in platforms[]. * sysdeps/unix/sysv/linux/net/if_shaper.h: New file.
Diffstat (limited to 'sysdeps/unix/sysv')
-rw-r--r--sysdeps/unix/sysv/linux/sys/acct.h49
-rw-r--r--sysdeps/unix/sysv/linux/sys/ptrace.h3
-rw-r--r--sysdeps/unix/sysv/linux/sys/quota.h1
-rw-r--r--sysdeps/unix/sysv/linux/sys/reboot.h7
-rw-r--r--sysdeps/unix/sysv/linux/sys/swap.h10
5 files changed, 45 insertions, 25 deletions
diff --git a/sysdeps/unix/sysv/linux/sys/acct.h b/sysdeps/unix/sysv/linux/sys/acct.h
index 0b16d249af..bc203a2d11 100644
--- a/sysdeps/unix/sysv/linux/sys/acct.h
+++ b/sysdeps/unix/sysv/linux/sys/acct.h
@@ -23,36 +23,47 @@
#define __need_time_t
#include <time.h>
-
+#include <sys/types.h>
__BEGIN_DECLS
#define ACCT_COMM 16
+/*
+ comp_t is a 16-bit "floating" point number with a 3-bit base 8
+ exponent and a 13-bit fraction. See linux/kernel/acct.c for the
+ specific encoding system used.
+*/
+
+typedef u_int16_t comp_t;
+
struct acct
{
- char ac_comm[ACCT_COMM]; /* Accounting command name. */
- time_t ac_utime; /* Accounting user time. */
- time_t ac_stime; /* Accounting system time. */
- time_t ac_etime; /* Accounting elapsed time. */
- time_t ac_btime; /* Beginning time. */
- unsigned short int ac_uid; /* Accounting user ID. */
- unsigned short int ac_gid; /* Accounting group ID. */
- unsigned short int ac_tty; /* Controlling tty. */
- /* Please note that the value of the `ac_tty' field, a device number,
- is encoded differently in the kernel and for the libc dev_t type. */
- char ac_flag; /* Accounting flag. */
- long int ac_minflt; /* Accounting minor pagefaults. */
- long int ac_majflt; /* Accounting major pagefaults. */
- long int ac_exitcode; /* Accounting process exitcode. */
+ char ac_flag; /* Accounting flags. */
+ u_int16_t ac_uid; /* Accounting user ID. */
+ u_int16_t ac_gid; /* Accounting group ID. */
+ u_int16_t ac_tty; /* Controlling tty. */
+ u_int32_t ac_btime; /* Beginning time. */
+ comp_t ac_utime; /* Accounting user time. */
+ comp_t ac_stime; /* Accounting system time. */
+ comp_t ac_etime; /* Accounting elapsed time. */
+ comp_t ac_mem; /* Accounting average memory usage. */
+ comp_t ac_io; /* Accounting chars transferred. */
+ comp_t ac_rw; /* Accounting blocks read or written. */
+ comp_t ac_minflt; /* Accounting minor pagefaults. */
+ comp_t ac_majflt; /* Accounting major pagefaults. */
+ comp_t ac_swaps; /* Accounting number of swaps. */
+ u_int32_t ac_exitcode; /* Accounting process exitcode. */
+ char ac_comm[ACCT_COMM+1]; /* Accounting command name. */
+ char ac_pad[10]; /* Accounting padding bytes. */
};
enum
{
- AFORK = 0001, /* Has executed fork, but no exec. */
- ASU = 0002, /* Used super-user privileges. */
- ACORE = 0004, /* Dumped core. */
- AXSIG = 0010 /* Killed by a signal. */
+ AFORK = 0x01, /* Has executed fork, but no exec. */
+ ASU = 0x02, /* Used super-user privileges. */
+ ACORE = 0x08, /* Dumped core. */
+ AXSIG = 0x10 /* Killed by a signal. */
};
#define AHZ 100
diff --git a/sysdeps/unix/sysv/linux/sys/ptrace.h b/sysdeps/unix/sysv/linux/sys/ptrace.h
index 33beb50b72..6c5d580d7b 100644
--- a/sysdeps/unix/sysv/linux/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/sys/ptrace.h
@@ -18,8 +18,8 @@
Boston, MA 02111-1307, USA. */
#ifndef _SYS_PTRACE_H
-
#define _SYS_PTRACE_H 1
+
#include <features.h>
__BEGIN_DECLS
@@ -100,6 +100,7 @@ enum __ptrace_request
/* Continue and stop at the next (return from) syscall. */
PTRACE_SYSCALL = 24,
+#define PTRACE_SYSCALL PTRACE_SYSCALL
};
/* Perform process tracing functions. REQUEST is one of the values
diff --git a/sysdeps/unix/sysv/linux/sys/quota.h b/sysdeps/unix/sysv/linux/sys/quota.h
index bcbbfa5ddb..3ea52b0393 100644
--- a/sysdeps/unix/sysv/linux/sys/quota.h
+++ b/sysdeps/unix/sysv/linux/sys/quota.h
@@ -106,6 +106,7 @@
#define Q_SYNC 0x0600 /* sync disk copy of a filesystems quotas */
#define Q_SETQLIM 0x0700 /* set limits */
#define Q_GETSTATS 0x0800 /* get collected stats */
+#define Q_RSQUASH 0x1000 /* set root_squash option */
/*
* The following structure defines the format of the disk quota file
diff --git a/sysdeps/unix/sysv/linux/sys/reboot.h b/sysdeps/unix/sysv/linux/sys/reboot.h
index 4d249aaaaa..dd7a71b4c6 100644
--- a/sysdeps/unix/sysv/linux/sys/reboot.h
+++ b/sysdeps/unix/sysv/linux/sys/reboot.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998 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
@@ -20,8 +20,8 @@
bits in the argument to the `reboot' system call. */
#ifndef _SYS_REBOOT_H
-
#define _SYS_REBOOT_H 1
+
#include <features.h>
/* Perform a hard reset now. */
@@ -36,6 +36,9 @@
/* Disable reboot using Ctrl-Alt-Delete keystroke. */
#define RB_DISABLE_CAD 0
+/* Stop system and switch power off if possible. */
+#define RB_POWER_OFF 0x4321fedc
+
__BEGIN_DECLS
/* Reboot or halt the system. */
diff --git a/sysdeps/unix/sysv/linux/sys/swap.h b/sysdeps/unix/sysv/linux/sys/swap.h
index 13921eadc6..e84c365206 100644
--- a/sysdeps/unix/sysv/linux/sys/swap.h
+++ b/sysdeps/unix/sysv/linux/sys/swap.h
@@ -1,5 +1,5 @@
/* Calls to enable and disable swapping on specified locations. Linux version.
- Copyright (C) 1996 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1998 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
@@ -22,8 +22,12 @@
#define _SYS_SWAP_H 1
#include <features.h>
-/* Get constants from kernel headers. */
-#include <linux/swap.h>
+/* The swap priority is encoded as:
+ (prio << SWAP_FLAG_PRIO_SHIFT) & SWAP_FLAG_PRIO_MASK
+*/
+#define SWAP_FLAG_PREFER 0x8000 /* Set if swap priority is specified. */
+#define SWAP_FLAG_PRIO_MASK 0x7fff
+#define SWAP_FLAG_PRIO_SHIFT 0
__BEGIN_DECLS