mirror of
https://sourceware.org/git/glibc.git
synced 2025-12-24 17:51:17 +03:00
Update.
2000-01-24 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/arm/bits/resource.h: New file. * sysdeps/unix/sysv/linux/arm/Makefile: Remove oldsetrlimit64.c. * sysdeps/unix/sysv/linux/i386/Makefile: Likewise. * sysdeps/unix/sysv/linux/i386/Dist: Likewise. * sysdeps/unix/sysv/linux/arm/Versions: Remove setrlimit64@GLIBC_2.1.3. * sysdeps/unix/sysv/linux/i386/Versions: Likewise. * sysdeps/unix/sysv/linux/arm/oldsetrlimit64.c: Remove. * sysdeps/unix/sysv/linux/i386/oldsetrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/arm/setrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/i386/setrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/i386/oldgetrlimit64.c: Call __new_getrlimit, so that setrlimit64@GLIBC_2.1 can report limits above 2G. * sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list (getrlimit, setrlimit): Remove syscall stubs, add normal syscalls. * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list (setrlimit): Remove syscall stub.
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
clone.S
|
||||
oldgetrlimit64.c
|
||||
oldsetrlimit64.c
|
||||
setresuid.c
|
||||
setresgid.c
|
||||
setfsuid.c
|
||||
|
||||
@@ -13,5 +13,5 @@ CFLAGS-initfini.s += -DWEAK_GMON_START
|
||||
endif
|
||||
|
||||
ifeq ($(subdir),resource)
|
||||
sysdep_routines += oldgetrlimit64 oldsetrlimit64
|
||||
sysdep_routines += oldgetrlimit64
|
||||
endif
|
||||
|
||||
@@ -9,6 +9,6 @@ libc {
|
||||
}
|
||||
GLIBC_2.1.3 {
|
||||
# New rlimit interface
|
||||
getrlimit; setrlimit; getrlimit64; setrlimit64;
|
||||
getrlimit; setrlimit; getrlimit64;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1991, 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1991, 1995-1999, 2000 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
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <sys/resource.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
extern int __old_getrlimit (enum __rlimit_resource, struct rlimit *);
|
||||
extern int __new_getrlimit (enum __rlimit_resource, struct rlimit *);
|
||||
|
||||
/* Put the soft and hard limits for RESOURCE in *RLIMITS.
|
||||
Returns 0 if successful, -1 if not (and sets errno). */
|
||||
@@ -33,14 +33,14 @@ __old_getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits)
|
||||
{
|
||||
struct rlimit rlimits32;
|
||||
|
||||
if (__old_getrlimit (resource, &rlimits32) < 0)
|
||||
if (__new_getrlimit (resource, &rlimits32) < 0)
|
||||
return -1;
|
||||
|
||||
if (rlimits32.rlim_cur == RLIM_INFINITY >> 1)
|
||||
if (rlimits32.rlim_cur == RLIM_INFINITY)
|
||||
rlimits->rlim_cur = RLIM64_INFINITY >> 1;
|
||||
else
|
||||
rlimits->rlim_cur = rlimits32.rlim_cur;
|
||||
if (rlimits32.rlim_max == RLIM_INFINITY >> 1)
|
||||
if (rlimits32.rlim_max == RLIM_INFINITY)
|
||||
rlimits->rlim_max = RLIM64_INFINITY >> 1;
|
||||
else
|
||||
rlimits->rlim_max = rlimits32.rlim_max;
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
/* Copyright (C) 1991, 95, 96, 97, 98, 1999 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., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
/* This is a compatibility file. If we don't build the libc with
|
||||
versioning don't compile this file. */
|
||||
#if defined PIC && DO_VERSIONING
|
||||
|
||||
#include <errno.h>
|
||||
#include <sys/resource.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
extern int __old_setrlimit (enum __rlimit_resource, const struct rlimit *);
|
||||
|
||||
/* Set the soft and hard limits for RESOURCE to *RLIMITS.
|
||||
Only the super-user can increase hard limits.
|
||||
Return 0 if successful, -1 if not (and sets errno). */
|
||||
int
|
||||
__old_setrlimit64 (enum __rlimit_resource resource,
|
||||
const struct rlimit64 *rlimits)
|
||||
{
|
||||
struct rlimit rlimits32;
|
||||
|
||||
if (rlimits->rlim_cur >= RLIM_INFINITY >> 1)
|
||||
rlimits32.rlim_cur = RLIM_INFINITY >> 1;
|
||||
else
|
||||
rlimits32.rlim_cur = rlimits->rlim_cur;
|
||||
if (rlimits->rlim_max >= RLIM_INFINITY >> 1)
|
||||
rlimits32.rlim_max = RLIM_INFINITY >> 1;
|
||||
else
|
||||
rlimits32.rlim_max = rlimits->rlim_max;
|
||||
|
||||
return __old_setrlimit (resource, &rlimits32);
|
||||
}
|
||||
|
||||
symbol_version (__old_setrlimit64, setrlimit64, GLIBC_2.1);
|
||||
|
||||
#endif /* PIC && DO_VERSIONING */
|
||||
@@ -1,28 +0,0 @@
|
||||
/* Copyright (C) 1999 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., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
#define setrlimit64 __new_setrlimit64
|
||||
|
||||
#include <sysdeps/generic/setrlimit64.c>
|
||||
|
||||
#undef setrlimit64
|
||||
#if defined PIC && defined DO_VERSIONING
|
||||
default_symbol_version (__new_setrlimit64, setrlimit64, GLIBC_2.1.3);
|
||||
#else
|
||||
weak_alias (__new_setrlimit64, setrlimit64);
|
||||
#endif
|
||||
Reference in New Issue
Block a user