aboutsummaryrefslogtreecommitdiff
path: root/shells
diff options
context:
space:
mode:
authorEric L. Hernes <erich@FreeBSD.org>1997-04-10 15:27:42 +0000
committerEric L. Hernes <erich@FreeBSD.org>1997-04-10 15:27:42 +0000
commit9cd3c19d59526fa70a4847fb788cdca4513756c7 (patch)
tree35b0664c3057d5d68d3c7b6ab85c06d0a3a833c2 /shells
parentaba782917b95f9652097dc5e4b11c4a74b150fb4 (diff)
downloadports-9cd3c19d59526fa70a4847fb788cdca4513756c7.tar.gz
ports-9cd3c19d59526fa70a4847fb788cdca4513756c7.zip
fix handling of builtin limit command.
closes ports/3037
Notes
Notes: svn path=/head/; revision=6176
Diffstat (limited to 'shells')
-rw-r--r--shells/es/files/patch-aa90
1 files changed, 54 insertions, 36 deletions
diff --git a/shells/es/files/patch-aa b/shells/es/files/patch-aa
index da1082347fd5..1f649e60e899 100644
--- a/shells/es/files/patch-aa
+++ b/shells/es/files/patch-aa
@@ -37,39 +37,57 @@
es : ${OFILES} initial.o
${CC} -o es ${LDFLAGS} ${OFILES} initial.o ${LIBS}
-*** prim-sys.c~ Mon Jul 31 16:20:31 1995
---- prim-sys.c Mon Jul 31 16:21:25 1995
-***************
-*** 194,200 ****
-
- static void printlimit(const Limit *limit, Boolean hard) {
- struct rlimit rlim;
-! long lim;
- getrlimit(limit->flag, &rlim);
- if (hard)
- lim = rlim.rlim_max;
---- 194,200 ----
-
- static void printlimit(const Limit *limit, Boolean hard) {
- struct rlimit rlim;
-! u_quad_t lim;
- getrlimit(limit->flag, &rlim);
- if (hard)
- lim = rlim.rlim_max;
-***************
-*** 213,219 ****
- }
- }
-
-! static long parselimit(const Limit *limit, char *s) {
- long lim;
- char *t;
- const Suffix *suf = limit->suffix;
---- 213,219 ----
- }
- }
-
-! static u_quad_t parselimit(const Limit *limit, char *s) {
- long lim;
- char *t;
- const Suffix *suf = limit->suffix;
+--- prim-sys.c.orig Tue May 30 06:13:51 1995
++++ prim-sys.c Thu Apr 10 10:15:40 1997
+@@ -194,7 +194,7 @@
+
+ static void printlimit(const Limit *limit, Boolean hard) {
+ struct rlimit rlim;
+- long lim;
++ u_quad_t lim;
+ getrlimit(limit->flag, &rlim);
+ if (hard)
+ lim = rlim.rlim_max;
+@@ -209,11 +209,11 @@
+ lim /= suf->amount;
+ break;
+ }
+- print("%-8s\t%d%s\n", limit->name, lim, (suf == NULL || lim == 0) ? "" : suf->name);
++ print("%-8s\t%ud%s\n", limit->name, (unsigned int)lim, (suf == NULL || lim == 0) ? "" : suf->name);
+ }
+ }
+
+-static long parselimit(const Limit *limit, char *s) {
++static u_quad_t parselimit(const Limit *limit, char *s) {
+ long lim;
+ char *t;
+ const Suffix *suf = limit->suffix;
+--- main.c~ Tue May 30 06:13:50 1995
++++ main.c Thu Apr 10 09:20:49 1997
+@@ -9,7 +9,7 @@
+ Boolean gcinfo = FALSE; /* -I */
+ #endif
+
+-#if !HPUX && !defined(linux)
++#if !HPUX && !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ extern int getopt (int argc, char **argv, const char *optstring);
+ #endif
+ extern int optind;
+--- stdenv.h~ Tue May 30 06:13:53 1995
++++ stdenv.h Thu Apr 10 09:32:22 1997
+@@ -283,6 +283,7 @@
+
+ /* stdlib */
+
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ extern noreturn exit(int);
+ extern noreturn abort(void);
+ extern long strtol(const char *num, char **end, int base);
+@@ -290,6 +291,7 @@
+ void *base, size_t nmemb, size_t size,
+ int (*compar)(const void *, const void *)
+ );
++#endif
+
+ /* setjmp */
+