0003-time64-Only-getrlimit-setrlimit-if-they-exist.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. From 73f38d909e6a8573b33f7c0e0827a5b14e416533 Mon Sep 17 00:00:00 2001
  2. From: Stefan O'Rear <sorear@fastmail.com>
  3. Date: Thu, 3 Sep 2020 03:31:05 -0400
  4. Subject: [PATCH 03/16] time64: Only getrlimit/setrlimit if they exist
  5. riscv32 and future architectures only provide prlimit64.
  6. ---
  7. src/misc/getrlimit.c | 6 +++++-
  8. src/misc/setrlimit.c | 2 ++
  9. 2 files changed, 7 insertions(+), 1 deletion(-)
  10. diff --git a/src/misc/getrlimit.c b/src/misc/getrlimit.c
  11. index 2ab2f0f4..bf676307 100644
  12. --- a/src/misc/getrlimit.c
  13. +++ b/src/misc/getrlimit.c
  14. @@ -6,12 +6,13 @@
  15. int getrlimit(int resource, struct rlimit *rlim)
  16. {
  17. - unsigned long k_rlim[2];
  18. int ret = syscall(SYS_prlimit64, 0, resource, 0, rlim);
  19. if (!ret) {
  20. FIX(rlim->rlim_cur);
  21. FIX(rlim->rlim_max);
  22. }
  23. +#ifdef SYS_getrlimit
  24. + unsigned long k_rlim[2];
  25. if (!ret || errno != ENOSYS)
  26. return ret;
  27. if (syscall(SYS_getrlimit, resource, k_rlim) < 0)
  28. @@ -21,6 +22,9 @@ int getrlimit(int resource, struct rlimit *rlim)
  29. FIX(rlim->rlim_cur);
  30. FIX(rlim->rlim_max);
  31. return 0;
  32. +#else
  33. + return ret;
  34. +#endif
  35. }
  36. weak_alias(getrlimit, getrlimit64);
  37. diff --git a/src/misc/setrlimit.c b/src/misc/setrlimit.c
  38. index 8340aee0..4cf2c607 100644
  39. --- a/src/misc/setrlimit.c
  40. +++ b/src/misc/setrlimit.c
  41. @@ -16,7 +16,9 @@ static void do_setrlimit(void *p)
  42. {
  43. struct ctx *c = p;
  44. if (c->err>0) return;
  45. +#ifdef SYS_setrlimit
  46. c->err = -__syscall(SYS_setrlimit, c->res, c->lim);
  47. +#endif
  48. }
  49. int setrlimit(int resource, const struct rlimit *rlim)
  50. --
  51. 2.29.2