From 5ebf28c999582c2a08d021a79d5f5121af843249 Mon Sep 17 00:00:00 2001 From: Alejandro Colomar Date: Fri, 2 Dec 2022 22:55:18 +0100 Subject: [PATCH] Assume RLIMIT_FSIZE is defined MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is required by POSIX.1-2001. Cc: Christian Göttsche Signed-off-by: Alejandro Colomar --- libmisc/limits.c | 2 -- libmisc/pwd_init.c | 2 -- libmisc/ulimit.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/libmisc/limits.c b/libmisc/limits.c index 121a1002..c6f4fa48 100644 --- a/libmisc/limits.c +++ b/libmisc/limits.c @@ -254,13 +254,11 @@ static int do_user_limits (const char *buf, const char *name) /* RLIMIT_DATA - max data size (KB) */ retval |= setrlimit_value (RLIMIT_DATA, pp, 1024); break; -#ifdef RLIMIT_FSIZE case 'f': case 'F': /* RLIMIT_FSIZE - Maximum filesize (KB) */ retval |= setrlimit_value (RLIMIT_FSIZE, pp, 1024); break; -#endif #ifdef RLIMIT_NICE case 'i': case 'I': diff --git a/libmisc/pwd_init.c b/libmisc/pwd_init.c index 2f69083c..70453d2d 100644 --- a/libmisc/pwd_init.c +++ b/libmisc/pwd_init.c @@ -36,9 +36,7 @@ void pwd_init (void) setrlimit (RLIMIT_CPU, &rlim); setrlimit (RLIMIT_DATA, &rlim); -#ifdef RLIMIT_FSIZE setrlimit (RLIMIT_FSIZE, &rlim); -#endif #ifdef RLIMIT_NOFILE setrlimit (RLIMIT_NOFILE, &rlim); #endif diff --git a/libmisc/ulimit.c b/libmisc/ulimit.c index 0123e040..eae8b247 100644 --- a/libmisc/ulimit.c +++ b/libmisc/ulimit.c @@ -19,13 +19,11 @@ int set_filesize_limit (int blocks) { int ret = -1; -#if defined(RLIMIT_FSIZE) struct rlimit rlimit_fsize; rlimit_fsize.rlim_cur = 512L * blocks; rlimit_fsize.rlim_max = rlimit_fsize.rlim_cur; ret = setrlimit (RLIMIT_FSIZE, &rlimit_fsize); -#endif return ret; }