update to 6.08
This commit is contained in:
form
parent
f7d750cb86
commit
448676e9b0
@ -3,11 +3,11 @@
|
||||
# Date created: 17 November 1997
|
||||
# Whom: gene
|
||||
#
|
||||
# $OpenBSD: Makefile,v 1.9 1998/04/20 04:41:29 marc Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 1998/12/17 03:54:01 form Exp $
|
||||
#
|
||||
|
||||
DISTNAME= tcsh-6.07
|
||||
PKGNAME= tcsh-6.07.02
|
||||
DISTNAME= tcsh-6.08
|
||||
PKGNAME= tcsh-6.08.00
|
||||
CATEGORIES= shells
|
||||
MASTER_SITES= ftp://ftp.astron.com/pub/tcsh/
|
||||
|
||||
@ -16,32 +16,27 @@ MAINTAINER= gene@OpenBSD.ORG
|
||||
GNU_CONFIGURE= yes
|
||||
WRKSRC= ${WRKDIR}/${PKGNAME}
|
||||
ALL_TARGET= all catalogs
|
||||
INSTALL_TARGET= install install.man
|
||||
#INSTALL_TARGET= install install.man
|
||||
MAN1= tcsh.1
|
||||
|
||||
post-install:
|
||||
/usr/sbin/chown $(BINOWN):$(BINGRP) ${PREFIX}/bin/tcsh
|
||||
/usr/sbin/chown $(BINOWN):$(BINGRP) ${PREFIX}/man/man1/$(MAN1)
|
||||
cd ${WRKSRC} && ${INSTALL_DATA} \
|
||||
tcsh.C.cat ${PREFIX}/share/nls/C/tcsh.cat
|
||||
cd ${WRKSRC} && ${INSTALL_DATA} \
|
||||
tcsh.french.cat ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat
|
||||
$(LN) -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat \
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/tcsh ${PREFIX}/bin/tcsh
|
||||
${INSTALL_MAN} ${WRKSRC}/tcsh.man ${PREFIX}/man/man1/tcsh.1
|
||||
${INSTALL_DATA} ${WRKSRC}/tcsh.C.cat ${PREFIX}/share/nls/C/tcsh.cat
|
||||
${INSTALL_DATA} ${WRKSRC}/tcsh.french.cat ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat
|
||||
${LN} -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat \
|
||||
${PREFIX}/share/nls/fr_BE.ISO_8859-1/tcsh.cat
|
||||
$(LN) -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat \
|
||||
${LN} -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat \
|
||||
${PREFIX}/share/nls/fr_CA.ISO_8859-1/tcsh.cat
|
||||
$(LN) -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat \
|
||||
${LN} -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat \
|
||||
${PREFIX}/share/nls/fr_CH.ISO_8859-1/tcsh.cat
|
||||
cd ${WRKSRC} && ${INSTALL_DATA} \
|
||||
tcsh.german.cat ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat
|
||||
$(LN) -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat \
|
||||
${INSTALL_DATA} ${WRKSRC}/tcsh.german.cat ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat
|
||||
${LN} -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat \
|
||||
${PREFIX}/share/nls/de_AT.ISO_8859-1/tcsh.cat
|
||||
$(LN) -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat \
|
||||
${LN} -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat \
|
||||
${PREFIX}/share/nls/de_CH.ISO_8859-1/tcsh.cat
|
||||
$(INSTALL) -d -o ${BINOWN} -g ${BINGRP} -m 755 \
|
||||
${PREFIX}/share/nls/el_GR.ISO_8859-7
|
||||
cd ${WRKSRC} && ${INSTALL_DATA} \
|
||||
tcsh.greek.cat ${PREFIX}/share/nls/el_GR.ISO_8859-7/tcsh.cat
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/nls/el_GR.ISO_8859-7
|
||||
${INSTALL_DATA} ${WRKSRC}/tcsh.greek.cat ${PREFIX}/share/nls/el_GR.ISO_8859-7/tcsh.cat
|
||||
@${ECHO} ""
|
||||
@${ECHO} "*** Finished installing $(DISTNAME)"
|
||||
@${ECHO} "*** To complete the install, you should notify the system"
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (tcsh-6.07.tar.gz) = 18a9d8091c6da38ebdd63ab509324eb5
|
||||
MD5 (tcsh-6.08.tar.gz) = e16e0f08b324e67f654ecab554042967
|
||||
|
||||
@ -1,56 +1,56 @@
|
||||
*** configure.in.orig Sun Oct 27 08:58:56 1996
|
||||
--- configure.in Sat Apr 19 21:37:17 1997
|
||||
*** config.guess.orig Thu Dec 17 04:34:33 1998
|
||||
--- config.guess Thu Dec 17 04:37:18 1998
|
||||
***************
|
||||
*** 76,81 ****
|
||||
--- 76,91 ----
|
||||
tcsh_config_file=sysV88
|
||||
;;
|
||||
|
||||
+ ## FreeBSD
|
||||
+ *-*-freebsd*)
|
||||
+ tcsh_config_file=bsd4.4
|
||||
+ ;;
|
||||
+
|
||||
+ ## OpenBSD
|
||||
+ *-*-openbsd*)
|
||||
+ tcsh_config_file=bsd4.4
|
||||
+ ;;
|
||||
+
|
||||
## NetBSD systems
|
||||
*-*-netbsd*)
|
||||
tcsh_config_file=bsd4.4
|
||||
*** configure.orig Sun Oct 27 08:58:55 1996
|
||||
--- configure Sat Apr 19 21:39:29 1997
|
||||
*** 65,70 ****
|
||||
--- 65,73 ----
|
||||
amiga:NetBSD:*:*)
|
||||
echo m68k-cbm-netbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
+ amiga:OpenBSD:*:*)
|
||||
+ echo m68k-cbm-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
|
||||
echo arm-acorn-riscix${UNAME_RELEASE}
|
||||
exit 0;;
|
||||
***************
|
||||
*** 582,587 ****
|
||||
--- 582,597 ----
|
||||
tcsh_config_file=sysV88
|
||||
;;
|
||||
|
||||
+ ## FreeBSD
|
||||
+ *-*-freebsd*)
|
||||
+ tcsh_config_file=bsd4.4
|
||||
+ ;;
|
||||
+
|
||||
+ ## OpenBSD
|
||||
+ *-*-openbsd*)
|
||||
+ tcsh_config_file=bsd4.4
|
||||
+ ;;
|
||||
+
|
||||
## NetBSD systems
|
||||
*-*-netbsd*)
|
||||
tcsh_config_file=bsd4.4
|
||||
*** config.guess.dist Sat Oct 19 10:54:43 1996
|
||||
--- config.guess Sat Apr 19 22:52:46 1997
|
||||
***************
|
||||
*** 308,313 ****
|
||||
--- 308,316 ----
|
||||
*:FreeBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
||||
*** 108,113 ****
|
||||
--- 111,125 ----
|
||||
mac68k:NetBSD:*:*)
|
||||
echo m68k-apple-netbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
+ *:OpenBSD:*:*)
|
||||
+ echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
||||
+ atari*:OpenBSD:*:*)
|
||||
+ echo m68k-atari-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
+ sun3*:OpenBSD:*:*)
|
||||
+ echo m68k-sun-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
+ mac68k:OpenBSD:*:*)
|
||||
+ echo m68k-apple-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
RISC*:ULTRIX:*:*)
|
||||
echo mips-dec-ultrix${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
***************
|
||||
*** 307,312 ****
|
||||
--- 319,327 ----
|
||||
hp3[0-9][05]:NetBSD:*:*)
|
||||
echo m68k-hp-netbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
+ hp3[0-9][05]:OpenBSD:*:*)
|
||||
+ echo m68k-hp-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
i[34]86:BSD/386:*:* | *:BSD/OS:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
***************
|
||||
*** 315,320 ****
|
||||
--- 330,338 ----
|
||||
exit 0 ;;
|
||||
*:NetBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
|
||||
+ exit 0 ;;
|
||||
+ *:OpenBSD:*:*)
|
||||
+ echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
|
||||
exit 0 ;;
|
||||
*:GNU:*:*)
|
||||
echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
*** nls/greek/set20.bak Fri Apr 26 23:24:30 1996
|
||||
--- nls/greek/set20 Mon Dec 16 02:56:43 1996
|
||||
***************
|
||||
*** 13,19 ****
|
||||
10 %-15s-> δεν έχει οριστεί\n
|
||||
11 BUG!!! το %s δεν είναι συσχετισμένο με τίποτα.\n
|
||||
12 Χρήση: bindkey [επιλογές] [--] [ΠΛΗΚΤΡΟ [ΕΝΤΟΛΗ]]\n
|
||||
! 13 -a εμφάνιση ή συσχέτιση ΠΛΗΚΤΡΟυ στον εναλλακτικό χάρτη πλήκτρων\ν
|
||||
14 -b ερμηνεία ΠΛΗΚΤΡΟυ ως C-, M-, F- or X- όνομα πλήκτρου\n
|
||||
15 -s ερμηνεία ΕΝΤΟΛΗς ως κυριολεκτικού string γιά εμφάνιση\n
|
||||
16 -c ερμηνεία ΕΝΤΟΛΗς ως εσωτερικής ή εξωτερικής εντολής\n
|
||||
--- 13,19 ----
|
||||
10 %-15s-> δεν έχει οριστεί\n
|
||||
11 BUG!!! το %s δεν είναι συσχετισμένο με τίποτα.\n
|
||||
12 Χρήση: bindkey [επιλογές] [--] [ΠΛΗΚΤΡΟ [ΕΝΤΟΛΗ]]\n
|
||||
! 13 -a εμφάνιση ή συσχέτιση ΠΛΗΚΤΡΟυ στον εναλλακτικό χάρτη πλήκτρων\n
|
||||
14 -b ερμηνεία ΠΛΗΚΤΡΟυ ως C-, M-, F- or X- όνομα πλήκτρου\n
|
||||
15 -s ερμηνεία ΕΝΤΟΛΗς ως κυριολεκτικού string γιά εμφάνιση\n
|
||||
16 -c ερμηνεία ΕΝΤΟΛΗς ως εσωτερικής ή εξωτερικής εντολής\n
|
||||
@ -1,19 +1,19 @@
|
||||
*** sh.h.bak Sat Oct 19 21:54:12 1996
|
||||
--- sh.h Mon Dec 16 03:02:35 1996
|
||||
*** sh.h.orig Fri Sep 18 23:09:13 1998
|
||||
--- sh.h Thu Dec 17 04:30:06 1998
|
||||
***************
|
||||
*** 1085,1091 ****
|
||||
/*
|
||||
* To print system call errors...
|
||||
*** 268,274 ****
|
||||
* redefines malloc(), so we define the following
|
||||
* to avoid it.
|
||||
*/
|
||||
! #ifdef __NetBSD__
|
||||
# include <errno.h>
|
||||
#else
|
||||
# ifndef linux
|
||||
--- 1085,1091 ----
|
||||
/*
|
||||
* To print system call errors...
|
||||
! # if defined(linux) || defined(sgi)
|
||||
# define NO_FIX_MALLOC
|
||||
# include <stdlib.h>
|
||||
# else /* linux */
|
||||
--- 268,274 ----
|
||||
* redefines malloc(), so we define the following
|
||||
* to avoid it.
|
||||
*/
|
||||
! #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
# include <errno.h>
|
||||
#else
|
||||
# ifndef linux
|
||||
! # if defined(linux) || defined(sgi) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
# define NO_FIX_MALLOC
|
||||
# include <stdlib.h>
|
||||
# else /* linux */
|
||||
|
||||
@ -1,83 +0,0 @@
|
||||
*** glob.c.orig Sat Nov 13 03:40:56 1993
|
||||
--- glob.c Mon Dec 16 03:09:07 1996
|
||||
***************
|
||||
*** 139,144 ****
|
||||
--- 139,165 ----
|
||||
#define M_SET META('[')
|
||||
#define ismeta(c) (((c)&M_META) != 0)
|
||||
|
||||
+ int collate_range_cmp (c1, c2)
|
||||
+ int c1, c2;
|
||||
+ {
|
||||
+ #if defined(NLS) && defined(LC_COLLATE)
|
||||
+ static char s1[2], s2[2];
|
||||
+ int ret;
|
||||
+ #endif
|
||||
+
|
||||
+ c1 &= 0xFF;
|
||||
+ c2 &= 0xFF;
|
||||
+ #if defined(NLS) && defined(LC_COLLATE)
|
||||
+ if (c1 == c2)
|
||||
+ return (0);
|
||||
+ s1[0] = c1;
|
||||
+ s2[0] = c2;
|
||||
+ if ((ret = strcoll(s1, s2)) != 0)
|
||||
+ return (ret);
|
||||
+ #endif
|
||||
+ return (c1 - c2);
|
||||
+ }
|
||||
+
|
||||
/*
|
||||
* Need to dodge two kernel bugs:
|
||||
* opendir("") != opendir(".")
|
||||
***************
|
||||
*** 646,652 ****
|
||||
++pat;
|
||||
while (((c = *pat++) & M_MASK) != M_END) {
|
||||
if ((*pat & M_MASK) == M_RNG) {
|
||||
! if (c <= k && k <= pat[1])
|
||||
ok = 1;
|
||||
pat += 2;
|
||||
}
|
||||
--- 667,675 ----
|
||||
++pat;
|
||||
while (((c = *pat++) & M_MASK) != M_END) {
|
||||
if ((*pat & M_MASK) == M_RNG) {
|
||||
! if ( collate_range_cmp(CHAR(c), CHAR(k)) <= 0
|
||||
! && collate_range_cmp(CHAR(k), CHAR(pat[1])) <= 0
|
||||
! )
|
||||
ok = 1;
|
||||
pat += 2;
|
||||
}
|
||||
*** sh.glob.c.orig Sun May 14 00:49:17 1995
|
||||
--- sh.glob.c Thu Oct 31 18:04:28 1996
|
||||
***************
|
||||
*** 85,90 ****
|
||||
--- 85,91 ----
|
||||
static void pword __P((int));
|
||||
static void psave __P((int));
|
||||
static void backeval __P((Char *, bool));
|
||||
+ extern int collate_range_cmp __P((int, int));
|
||||
|
||||
static Char *
|
||||
globtilde(nv, s)
|
||||
***************
|
||||
*** 1038,1045 ****
|
||||
if (match)
|
||||
continue;
|
||||
if (rangec == '-' && *(pattern-2) != '[' && *pattern != ']') {
|
||||
! match = (stringc <= (*pattern & TRIM) &&
|
||||
! (*(pattern-2) & TRIM) <= stringc);
|
||||
pattern++;
|
||||
}
|
||||
else
|
||||
--- 1039,1047 ----
|
||||
if (match)
|
||||
continue;
|
||||
if (rangec == '-' && *(pattern-2) != '[' && *pattern != ']') {
|
||||
! match = ( collate_range_cmp(stringc, *pattern & TRIM) <= 0
|
||||
! && collate_range_cmp(*(pattern-2) & TRIM, stringc) <= 0
|
||||
! );
|
||||
pattern++;
|
||||
}
|
||||
else
|
||||
@ -1,67 +0,0 @@
|
||||
*** tc.os.h.old Sun May 14 00:49:26 1995
|
||||
--- tc.os.h Sat Jun 17 06:02:53 1995
|
||||
***************
|
||||
*** 417,423 ****
|
||||
# define NEEDgethostname
|
||||
#endif /* _SEQUENT_ */
|
||||
|
||||
! #if defined(BSD) && defined(POSIXJOBS) && !defined(__hp_osf)
|
||||
# define setpgid(pid, pgrp) setpgrp(pid, pgrp)
|
||||
#endif /* BSD && POSIXJOBS && !__hp_osf */
|
||||
|
||||
--- 417,423 ----
|
||||
# define NEEDgethostname
|
||||
#endif /* _SEQUENT_ */
|
||||
|
||||
! #if defined(BSD) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && defined(POSIXJOBS) && !defined(__hp_osf)
|
||||
# define setpgid(pid, pgrp) setpgrp(pid, pgrp)
|
||||
#endif /* BSD && POSIXJOBS && !__hp_osf */
|
||||
|
||||
***************
|
||||
*** 468,474 ****
|
||||
#ifndef POSIX
|
||||
# define mygetpgrp() getpgrp(0)
|
||||
#else /* POSIX */
|
||||
! # if defined(BSD) || defined(SUNOS4) || defined(IRIS4D) || defined(DGUX)
|
||||
# define mygetpgrp() getpgrp(0)
|
||||
# else /* !(BSD || SUNOS4 || IRIS4D || DGUX) */
|
||||
# define mygetpgrp() getpgrp()
|
||||
--- 468,474 ----
|
||||
#ifndef POSIX
|
||||
# define mygetpgrp() getpgrp(0)
|
||||
#else /* POSIX */
|
||||
! # if (defined(BSD) && !defined(__FreeBSD__)) || defined(SUNOS4) || defined(IRIS4D) || defined(DGUX)
|
||||
# define mygetpgrp() getpgrp(0)
|
||||
# else /* !(BSD || SUNOS4 || IRIS4D || DGUX) */
|
||||
# define mygetpgrp() getpgrp()
|
||||
***************
|
||||
*** 657,670 ****
|
||||
# endif /* REMOTEHOST */
|
||||
#endif /* SUNOS4 && __GNUC__ == 2 */
|
||||
|
||||
! #if (defined(BSD) && !defined(__386BSD__)) || defined(SUNOS4)
|
||||
# if defined(__alpha) && defined(__osf__) && DECOSF1 < 200
|
||||
extern void bcopy __P((const void *, void *, size_t));
|
||||
# define memmove(a, b, c) (bcopy((char *) (b), (char *) (a), (int) (c)), a)
|
||||
# endif /* __alpha && __osf__ && DECOSF1 < 200 */
|
||||
#endif /* (BSD && !__386BSD__) || SUNOS4 */
|
||||
|
||||
! #if !defined(hpux) && !defined(COHERENT) && ((SYSVREL < 4) || defined(_SEQUENT_)) && !defined(__386BSD__) && !defined(memmove)
|
||||
# define NEEDmemmove
|
||||
#endif /* !hpux && !COHERENT && (SYSVREL < 4 || _SEQUENT_) && !__386BSD__ && !memmove */
|
||||
|
||||
--- 657,670 ----
|
||||
# endif /* REMOTEHOST */
|
||||
#endif /* SUNOS4 && __GNUC__ == 2 */
|
||||
|
||||
! #if (defined(BSD) && !defined(__386BSD__) && !defined(__FreeBSD__)) || defined(SUNOS4)
|
||||
# if defined(__alpha) && defined(__osf__) && DECOSF1 < 200
|
||||
extern void bcopy __P((const void *, void *, size_t));
|
||||
# define memmove(a, b, c) (bcopy((char *) (b), (char *) (a), (int) (c)), a)
|
||||
# endif /* __alpha && __osf__ && DECOSF1 < 200 */
|
||||
#endif /* (BSD && !__386BSD__) || SUNOS4 */
|
||||
|
||||
! #if !defined(hpux) && !defined(COHERENT) && ((SYSVREL < 4) || defined(_SEQUENT_)) && !defined(__386BSD__) && !defined(__FreeBSD__) && !defined(memmove)
|
||||
# define NEEDmemmove
|
||||
#endif /* !hpux && !COHERENT && (SYSVREL < 4 || _SEQUENT_) && !__386BSD__ && !memmove */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
*** config_f.h.orig Fri Apr 26 13:17:30 1996
|
||||
--- config_f.h Tue Dec 16 23:53:24 1997
|
||||
*** config_f.h.orig Sat Sep 19 21:48:08 1998
|
||||
--- config_f.h Thu Dec 17 05:18:51 1998
|
||||
***************
|
||||
*** 65,71 ****
|
||||
* if you don't have <nl_types.h>, you don't want
|
||||
@ -13,7 +13,7 @@
|
||||
* if you don't have <nl_types.h>, you don't want
|
||||
* to define this.
|
||||
*/
|
||||
! #if defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
! #ifdef __OpenBSD__
|
||||
! # define NLS_CATALOGS
|
||||
! #else
|
||||
! # undef NLS_CATALOGS
|
||||
@ -22,19 +22,46 @@
|
||||
/*
|
||||
* LOGINFIRST Source ~/.login before ~/.cshrc
|
||||
***************
|
||||
*** 129,135 ****
|
||||
*** 92,103 ****
|
||||
/*
|
||||
* DOTLAST put "." last in the default path, for security reasons
|
||||
*/
|
||||
! #define DOTLAST
|
||||
|
||||
/*
|
||||
* NODOT Don't put "." in the default path, for security reasons
|
||||
*/
|
||||
! #undef NODOT
|
||||
|
||||
/*
|
||||
* AUTOLOGOUT tries to determine if it should set autologout depending
|
||||
--- 96,107 ----
|
||||
/*
|
||||
* DOTLAST put "." last in the default path, for security reasons
|
||||
*/
|
||||
! #undef DOTLAST
|
||||
|
||||
/*
|
||||
* NODOT Don't put "." in the default path, for security reasons
|
||||
*/
|
||||
! #define NODOT
|
||||
|
||||
/*
|
||||
* AUTOLOGOUT tries to determine if it should set autologout depending
|
||||
***************
|
||||
*** 142,148 ****
|
||||
* This can be much slower and no memory statistics will be
|
||||
* provided.
|
||||
*/
|
||||
! #if defined(PURIFY) || defined(MALLOC_TRACE)
|
||||
! #if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX)
|
||||
# define SYSMALLOC
|
||||
#else
|
||||
# undef SYSMALLOC
|
||||
--- 133,139 ----
|
||||
--- 146,152 ----
|
||||
* This can be much slower and no memory statistics will be
|
||||
* provided.
|
||||
*/
|
||||
! #if defined(PURIFY) || defined(MALLOC_TRACE) || defined(__OpenBSD__)
|
||||
! #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX)
|
||||
# define SYSMALLOC
|
||||
#else
|
||||
# undef SYSMALLOC
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
*** sh.func.c.bak Sat Oct 5 21:39:10 1996
|
||||
--- sh.func.c Mon Dec 16 04:25:04 1996
|
||||
***************
|
||||
*** 1312,1319 ****
|
||||
# ifdef LC_COLLATE
|
||||
(void) setlocale(LC_COLLATE, "");
|
||||
# endif
|
||||
! # if defined(NLS_CATALOGS) && defined(LC_MESSAGES)
|
||||
(void) setlocale(LC_MESSAGES, "");
|
||||
(void) catclose(catd);
|
||||
nlsinit();
|
||||
# endif /* NLS_CATALOGS && LC_MESSAGES */
|
||||
--- 1312,1321 ----
|
||||
# ifdef LC_COLLATE
|
||||
(void) setlocale(LC_COLLATE, "");
|
||||
# endif
|
||||
! # ifdef NLS_CATALOGS
|
||||
! # ifdef LC_MESSAGES
|
||||
(void) setlocale(LC_MESSAGES, "");
|
||||
+ # endif
|
||||
(void) catclose(catd);
|
||||
nlsinit();
|
||||
# endif /* NLS_CATALOGS && LC_MESSAGES */
|
||||
***************
|
||||
*** 1475,1482 ****
|
||||
# ifdef LC_COLLATE
|
||||
(void) setlocale(LC_COLLATE, "");
|
||||
# endif
|
||||
! # if defined(NLS_CATALOGS) && defined(LC_MESSAGES)
|
||||
(void) setlocale(LC_MESSAGES, "");
|
||||
(void) catclose(catd);
|
||||
nlsinit();
|
||||
# endif /* NLS_CATALOGS && LC_MESSAGES */
|
||||
--- 1477,1486 ----
|
||||
# ifdef LC_COLLATE
|
||||
(void) setlocale(LC_COLLATE, "");
|
||||
# endif
|
||||
! # ifdef NLS_CATALOGS
|
||||
! # ifdef LC_MESSAGES
|
||||
(void) setlocale(LC_MESSAGES, "");
|
||||
+ # endif
|
||||
(void) catclose(catd);
|
||||
nlsinit();
|
||||
# endif /* NLS_CATALOGS && LC_MESSAGES */
|
||||
@ -1,5 +1,5 @@
|
||||
*** sh.exp.c.orig Wed Nov 26 22:18:20 1997
|
||||
--- sh.exp.c Wed Nov 26 22:19:16 1997
|
||||
*** sh.exp.c.orig Thu Dec 17 09:41:49 1998
|
||||
--- sh.exp.c Thu Dec 17 09:42:41 1998
|
||||
***************
|
||||
*** 155,161 ****
|
||||
* and they define _SC_NGROUPS_MAX without having sysconf
|
||||
@ -13,49 +13,7 @@
|
||||
* and they define _SC_NGROUPS_MAX without having sysconf
|
||||
*/
|
||||
# undef _SC_NGROUPS_MAX
|
||||
! # if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined (__OpenBSD__)
|
||||
! # if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__bsdi__)
|
||||
# define GID_T gid_t
|
||||
# else
|
||||
# define GID_T int
|
||||
*** sh.sem.c.orig Wed Nov 26 21:30:09 1997
|
||||
--- sh.sem.c Wed Nov 26 21:32:48 1997
|
||||
***************
|
||||
*** 51,57 ****
|
||||
#endif /* CLOSE_ON_EXEC */
|
||||
|
||||
#if defined(__sparc__) || defined(sparc)
|
||||
! # if !defined(MACH) && SYSVREL == 0 && !defined(Lynx) && !defined(__NetBSD__)
|
||||
# include <vfork.h>
|
||||
# endif /* !MACH && SYSVREL == 0 && !Lynx && !__NetBSD__ */
|
||||
#endif /* __sparc__ || sparc */
|
||||
--- 51,57 ----
|
||||
#endif /* CLOSE_ON_EXEC */
|
||||
|
||||
#if defined(__sparc__) || defined(sparc)
|
||||
! # if !defined(MACH) && SYSVREL == 0 && !defined(Lynx) && !defined(__NetBSD__) && !defined(__OpenBSD__)
|
||||
# include <vfork.h>
|
||||
# endif /* !MACH && SYSVREL == 0 && !Lynx && !__NetBSD__ */
|
||||
#endif /* __sparc__ || sparc */
|
||||
*** tc.os.h.orig Wed Nov 26 22:22:23 1997
|
||||
--- tc.os.h Wed Nov 26 22:23:34 1997
|
||||
***************
|
||||
*** 77,85 ****
|
||||
# define NOFILE 256
|
||||
#endif /* NOFILE */
|
||||
|
||||
! #if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || SYSVREL >= 4
|
||||
# undef NEEDstrerror
|
||||
! #endif /* linux || __NetBSD__ || __FreeBSD__ || SYSVREL >= 4 */
|
||||
|
||||
#if !defined(pyr) && !defined(sinix)
|
||||
/* Pyramid's cpp complains about the next line */
|
||||
--- 77,85 ----
|
||||
# define NOFILE 256
|
||||
#endif /* NOFILE */
|
||||
|
||||
! #if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || SYSVREL >= 4 || defined(__OpenBSD__)
|
||||
# undef NEEDstrerror
|
||||
! #endif /* linux || __NetBSD__ || __FreeBSD__ || SYSVREL >= 4 || __OpenBSD__ */
|
||||
|
||||
#if !defined(pyr) && !defined(sinix)
|
||||
/* Pyramid's cpp complains about the next line */
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
--- sh.print.c 1996/04/26 19:20:06 3.8
|
||||
+++ sh.print.c 1997/09/20 22:47:21
|
||||
@@ -196,6 +196,7 @@
|
||||
{
|
||||
register int unit;
|
||||
static int interrupted = 0;
|
||||
+ size_t sz;
|
||||
|
||||
/* int lmode; */
|
||||
|
||||
@@ -223,7 +224,10 @@
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
- (void) write(unit, linbuf, (size_t) (linp - linbuf));
|
||||
+ sz = (size_t) (linp - linbuf);
|
||||
+ if (write(unit, linbuf, sz) != sz && !haderr)
|
||||
+ stderror(ERR_SYSTEM, progname, strerror(errno));
|
||||
+
|
||||
linp = linbuf;
|
||||
interrupted = 0;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user