summaryrefslogtreecommitdiff
path: root/shells/tcsh/patches/patch-ag
diff options
context:
space:
mode:
Diffstat (limited to 'shells/tcsh/patches/patch-ag')
-rw-r--r--shells/tcsh/patches/patch-ag49
1 files changed, 27 insertions, 22 deletions
diff --git a/shells/tcsh/patches/patch-ag b/shells/tcsh/patches/patch-ag
index 21326022187..8ef8ec2aaec 100644
--- a/shells/tcsh/patches/patch-ag
+++ b/shells/tcsh/patches/patch-ag
@@ -1,24 +1,29 @@
-$NetBSD: patch-ag,v 1.7 2000/11/19 21:40:43 christos Exp $
+$NetBSD: patch-ag,v 1.8 2002/04/11 15:26:21 abs Exp $
---- Makefile.in.orig Tue Nov 24 13:17:08 1998
-+++ Makefile.in Mon Aug 16 18:48:47 1999
-@@ -463,17 +463,10 @@
- install-strip: install
+--- sh.func.c.orig Tue Mar 13 12:53:50 2001
++++ sh.func.c
+@@ -2143,6 +2143,9 @@
+ else
+ rlim.rlim_cur = limit;
- install: tcsh
-- -mkdir -p ${DESTBIN}
-- -mv -f ${DESTBIN}/tcsh ${DESTBIN}/tcsh.old
-- cp tcsh ${DESTBIN}/tcsh
-- -strip ${DESTBIN}/tcsh
-- chmod 555 ${DESTBIN}/tcsh
-+ ${BSD_INSTALL_PROGRAM} tcsh ${DESTBIN}/tcsh
-
- install.man: tcsh.man
-- -mkdir -p ${DESTMAN}
-- -rm -f ${DESTMAN}/tcsh.${MANSECT}
-- cp $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT}
-- chmod 444 ${DESTMAN}/tcsh.${MANSECT}
-+ ${BSD_INSTALL_MAN} tcsh.man ${DESTMAN}/tcsh.${MANSECT}
-
- # Amiga Unix
- #install.man: tcsh.man
++ if (rlim.rlim_cur > rlim.rlim_max)
++ rlim.rlim_max = rlim.rlim_cur;
++
+ if (setrlimit(lp->limconst, &rlim) < 0) {
+ # else /* BSDLIMIT */
+ if (limit != RLIM_INFINITY && lp->limconst == RLIMIT_FSIZE)
+@@ -2153,10 +2156,10 @@
+ # endif /* aiws */
+ if (ulimit(toset(lp->limconst), limit) < 0) {
+ # endif /* BSDLIMIT */
+- xprintf(CGETS(15, 1, "%s: %s: Can't %s%s limit\n"), bname, lp->limname,
+- limit == RLIM_INFINITY ? CGETS(15, 2, "remove") :
+- CGETS(15, 3, "set"),
+- hard ? CGETS(14, 4, " hard") : "");
++ xprintf(CGETS(15, 1, "%s: %s: Can't %s%s limit (%s)\n"), bname,
++ lp->limname, limit == RLIM_INFINITY ? CGETS(15, 2, "remove") :
++ CGETS(15, 3, "set"), hard ? CGETS(14, 4, " hard") : "",
++ strerror(errno));
+ return (-1);
+ }
+ return (0);