diff options
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/bsd/sun/sunos4/resourcebits.h | 85 | ||||
| -rw-r--r-- | sysdeps/unix/getlogin_r.c | 14 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/errnos.h | 46 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/sysdep.S | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/sysdep.S | 5 |
5 files changed, 124 insertions, 31 deletions
diff --git a/sysdeps/unix/bsd/sun/sunos4/resourcebits.h b/sysdeps/unix/bsd/sun/sunos4/resourcebits.h index 485dec9b81..8f515db330 100644 --- a/sysdeps/unix/bsd/sun/sunos4/resourcebits.h +++ b/sysdeps/unix/bsd/sun/sunos4/resourcebits.h @@ -52,5 +52,88 @@ enum __rlimit_resource #defin RLIMIT_NOFILE RLIMIT_NOFILE #defin RLIMIT_OFILE RLIMIT_OFILE - RLIM_NLIMITS + RLIM_NLIMITS, + + RLIM_INFINITY = 0x7fffffff /* Value to indicate that there is no limit. */ +#define RLIM_INFINITY RLIM_INFINITY + }; + +struct rlimit + { + /* The current (soft) limit. */ + int rlim_cur; + /* The hard limit. */ + int rlim_max; + }; + +/* Whose usage statistics do you want? */ +enum __rusage_who +/* The macro definitions are necessary because some programs want + to test for operating system features with #ifdef RUSAGE_SELF. + In ISO C the reflexive definition is a no-op. */ + { + /* The calling process. */ + RUSAGE_SELF = 0, +#define RUSAGE_SELF RUSAGE_SELF + /* All of its terminated child processes. */ + RUSAGE_CHILDREN = -1 +#define RUSAGE_CHILDREN RUSAGE_CHILDREN + }; + +#include <sys/time.h> /* For `struct timeval'. */ + +/* Structure which says how much of each resource has been used. */ +struct rusage + { + /* Total amount of user time used. */ + struct timeval ru_utime; + /* Total amount of system time used. */ + struct timeval ru_stime; + /* Maximum resident set size (in kilobytes). */ + long int ru_maxrss; + /* Amount of sharing of text segment memory + with other processes (kilobyte-seconds). */ + long int ru_ixrss; + /* Amount of data segment memory used (kilobyte-seconds). */ + long int ru_idrss; + /* Amount of stack memory used (kilobyte-seconds). */ + long int ru_isrss; + /* Number of soft page faults (i.e. those serviced by reclaiming + a page from the list of pages awaiting reallocation. */ + long int ru_minflt; + /* Number of hard page faults (i.e. those that required I/O). */ + long int ru_majflt; + /* Number of times a process was swapped out of physical memory. */ + long int ru_nswap; + /* Number of input operations via the file system. Note: This + and `ru_oublock' do not include operations with the cache. */ + long int ru_inblock; + /* Number of output operations via the file system. */ + long int ru_oublock; + /* Number of IPC messages sent. */ + long int ru_msgsnd; + /* Number of IPC messages received. */ + long int ru_msgrcv; + /* Number of signals delivered. */ + long int ru_nsignals; + /* Number of voluntary context switches, i.e. because the process + gave up the process before it had to (usually to wait for some + resource to be available). */ + long int ru_nvcsw; + /* Number of involuntary context switches, i.e. a higher priority process + became runnable or the current process used up its time slice. */ + long int ru_nivcsw; + }; + +/* Priority limits. */ +#define PRIO_MIN -20 /* Minimum priority a process can have. */ +#define PRIO_MAX 20 /* Maximum priority a process can have. */ + +/* The type of the WHICH argument to `getpriority' and `setpriority', + indicating what flavor of entity the WHO argument specifies. */ +enum __priority_which + { + PRIO_PROCESS = 0, /* WHO is a process ID. */ + PRIO_PGRP = 1, /* WHO is a process group ID. */ + PRIO_USER = 2 /* WHO is a user ID. */ }; diff --git a/sysdeps/unix/getlogin_r.c b/sysdeps/unix/getlogin_r.c index f80b2c7518..aa2c0617e6 100644 --- a/sysdeps/unix/getlogin_r.c +++ b/sysdeps/unix/getlogin_r.c @@ -72,8 +72,18 @@ getlogin_r (name, name_len) } else { - strncpy (name, ut->ut_line, name_len); - result = 0; + size_t needed = strlen (ut->ut_line) + 1; + + if (needed < name_len) + { + __set_errno (ERANGE); + result = ERANGE; + } + else + { + memcpy (name, ut->ut_line, needed); + result = 0; + } } endutent_r (&utmp_data); diff --git a/sysdeps/unix/sysv/linux/errnos.h b/sysdeps/unix/sysv/linux/errnos.h index 40707d1d62..4456e570f0 100644 --- a/sysdeps/unix/sysv/linux/errnos.h +++ b/sysdeps/unix/sysv/linux/errnos.h @@ -19,34 +19,40 @@ Boston, MA 02111-1307, USA. */ #ifdef _ERRNO_H -#undef EDOM -#undef ERANGE -#include <linux/errno.h> +# undef EDOM +# undef ERANGE +# include <linux/errno.h> -#ifndef __ASSEMBLER__ -#if defined __USE_REENTRANT && (!defined _LIBC || defined _LIBC_REENTRANT) -/* Declare alias of `errno' variable so it is accessible even if macro - with name `errno' is defined. */ -extern int __errno; +# ifndef __ASSEMBLER__ +# ifdef _LIBC +/* We now need a declaration of the `errno' variable. */ +extern int errno; -/* When using threads, errno is a per-thread value. */ +/* Function to get address of global `errno' variable. */ extern int *__errno_location __P ((void)) __attribute__ ((__const__)); -#define errno (*__errno_location ()) - -#define __set_errno(val) errno = __errno = (val) - -#else /* !__USE_REENTRENT || (_LIBC && !_LIBC_REENTRANT) */ -#define __set_errno(val) errno = (val) - -#endif /* __USE_REENTRANT && (!_LIBC || _LIBC_REENTRANT) */ -#endif /* !__ASSEMBLER */ +# ifdef _LIBC_REENTRANT +static inline int +__set_errno (int __err) +{ + return *__errno_location () = errno = __err; +} +# else /* !_LIBC_REENTRANT */ +# define __set_errno(val) errno = (val) +# endif /* _LIBC_REENTRANT */ +# endif /* _LIBC */ + +# if defined __USE_REENTRANT && (!defined _LIBC || defined _LIBC_REENTRANT) +/* When using threads, errno is a per-thread value. */ +# define errno (*__errno_location ()) +# endif +# endif /* !__ASSEMBLER__ */ #endif /* _ERRNO_H */ #if !defined (_ERRNO_H) && defined (__need_Emath) /* This is ugly but the kernel header is not clean enough. We must define only the values EDOM and ERANGE in case __need_Emath is defined. The value is the same for all Linux ports. */ -#define EDOM 33 /* Math argument out of domain of function. */ -#define ERANGE 34 /* Math result not representable. */ +# define EDOM 33 /* Math argument out of domain of function. */ +# define ERANGE 34 /* Math result not representable. */ #endif /* !_ERRNO_H && __need_Emath */ diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.S b/sysdeps/unix/sysv/linux/i386/sysdep.S index 742ba2b1a9..c9c78842d8 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.S +++ b/sysdeps/unix/sysv/linux/i386/sysdep.S @@ -32,10 +32,7 @@ Cambridge, MA 02139, USA. */ errno: .zero 4 .globl _errno .type _errno,@object -_errno = errno /* This name is expected by hj libc.so.5 startup code. */ - .globl __errno - .type __errno,@object -__errno = errno /* This name is expected by the MT code. */ +_errno = errno /* This name is expected by hj's libc.so.5 startup code. */ .text /* The following code is only used in the shared library when we diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.S b/sysdeps/unix/sysv/linux/m68k/sysdep.S index 848ece58e8..7016a26a60 100644 --- a/sysdeps/unix/sysv/linux/m68k/sysdep.S +++ b/sysdeps/unix/sysv/linux/m68k/sysdep.S @@ -32,10 +32,7 @@ errno: .space 4 .size errno,4 .globl _errno .type _errno,@object -_errno = errno /* This name is expected by hj libc.so.5 startup code. */ - .globl __errno - .type __errno,@object -__errno = errno /* This name is expected by the MT code. */ +_errno = errno /* This name is expected by hj's libc.so.5 startup code. */ .text /* The following code is only used in the shared library when we |