Upgrade to 6.10

5 files changed, 1167 insertions, 2716 deletions

diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 50113e0..1e15c0e 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -16,7 +16,7 @@ CFLAGS+= -I${TCSHDIR} -I${.CURDIR} -I. ${DFLAGS}
 SRCS=	sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \
 	sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \
 	sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \
-	sh.set.c sh.time.c sh.h sh.char.h sh.dir.h sh.proc.h
+	sh.set.c sh.time.c sh.char.h sh.dir.h sh.proc.h sh.h
 SRCS+=	sh.decls.h glob.c glob.h mi.termios.c mi.wait.h mi.varargs.h
 SRCS+=	tw.decls.h tw.h tw.help.c tw.init.c tw.parse.c tw.spell.c \
 	tw.comp.c tw.color.c
@@ -26,8 +26,7 @@ SRCS+=	tc.alloc.c tc.bind.c tc.const.c tc.decls.h tc.disc.c \
 	tc.func.c tc.os.c tc.os.h tc.printf.c tc.prompt.c \
 	tc.sched.c tc.sig.c tc.sig.h tc.str.c sh.types.h tc.vers.c tc.wait.h \
 	tc.who.c tc.h
-SRCS+=	tc.defs.c
-GENHDRS= ed.defns.h sh.err.h tc.const.h
+GENHDRS= ed.defns.h sh.err.h tc.const.h tc.defs.c
 SRCS+=	${GENHDRS}
 
 MAN1=	csh.1
@@ -41,11 +40,20 @@ LDADD=	-ltermcap -lcrypt
 
 LINKS=	${BINDIR}/csh ${BINDIR}/tcsh
 
-CLEANFILES= ${GENHDRS} csh.1
+CLEANFILES= ${GENHDRS} gethost csh.1
 
 csh.1: tcsh.man
 	ln -sf ${.ALLSRC} ${.TARGET}
 
+gethost: gethost.c sh.err.h tc.const.h sh.h
+	@rm -f ${.TARGET}
+	${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${TCSHDIR}/gethost.c
+
+tc.defs.c: gethost ${.CURDIR}/host.defs
+	@rm -f ${.TARGET}
+	@echo "/* Do not edit this file, make creates it */" > ${.TARGET}
+	./gethost ${.CURDIR}/host.defs >> ${.TARGET}
+
 ed.defns.h: ed.defns.c
 	@rm -f ${.TARGET}
 	@echo '/* Do not edit this file, make creates it. */' > ${.TARGET}
@@ -59,7 +67,7 @@ sh.err.h: sh.err.c
 	@echo '/* Do not edit this file, make creates it. */' > ${.TARGET}
 	@echo '#ifndef _h_sh_err' >> ${.TARGET}
 	@echo '#define _h_sh_err' >> ${.TARGET}
-	egrep 'ERR_' ${.ALLSRC} | egrep '^#define' >> ${.TARGET}
+	grep 'ERR_' ${.ALLSRC} | grep '^#define' >> ${.TARGET}
 	@echo '#endif /* _h_sh_err */' >> ${.TARGET}
 
 tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h
@@ -67,7 +75,7 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h
 	@echo '/* Do not edit this file, make creates it. */' > ${.TARGET}
 	@echo '#ifndef _h_tc_const' >> ${.TARGET}
 	@echo '#define _h_tc_const' >> ${.TARGET}
-	${CC} -E ${CFLAGS} ${.ALLSRC} -D_h_tc_const | egrep 'Char STR' | \
+	${CC} -E ${CFLAGS} ${.ALLSRC} -D_h_tc_const | grep 'Char STR' | \
 	    sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
 	    sort >> ${.TARGET}
 	@echo '#endif /* _h_tc_const */' >> ${.TARGET}
diff --git a/bin/csh/host.defs b/bin/csh/host.defs
new file mode 100644
index 0000000..db56a8e
--- /dev/null
+++ b/bin/csh/host.defs
@@ -0,0 +1,1136 @@
+newcode	:
+/* $Header: /src/pub/tcsh/host.defs,v 1.28 2000/11/11 23:03:35 christos Exp $ */
+/* $FreeBSD$ */
+/*
+ * host.defs: Hosttype/Machtype etc.
+ */
+/*-
+ * Copyright (c) 1980, 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include "sh.h"
+
+RCSID("$Id: host.defs,v 1.28 2000/11/11 23:03:35 christos Exp $")
+
+endcode	:
+
+macro	: M_mipsel : (defined(mips) || defined(__mips)) && (defined(MIPSEL) || defined(__MIPSEL))
+macro	: M_mipseb : (defined(mips) || defined(__mips)) && (defined(MIPSEB) || defined(__MIPSEB))
+macro	: M_i386 : (defined(i386) || defined(__i386__))
+macro	: M_i486 : (defined(i486) || defined(__i486__))
+macro	: M_i586 : (defined(i586) || defined(__i586__))
+macro	: M_intel : (defined(M_i386) || defined(M_i486) || defined(M_i586))
+
+newdef	: defined(ns32000)
+newcode	:
+static char *
+isamultimax(flag)
+    int flag;
+{
+    if (access("/Umax.image", F_OK) == 0)
+	return "multimax";
+    else 
+	return flag ? "mach" : "ns32000";
+}
+endcode	:
+enddef	:
+
+
+newdef	: defined(cray)
+newcode	:
+/*  
+ * On crays, find the current machine type via the target() syscall
+ * We need ctype.h to convert the name returned to lower case
+ */
+# include <sys/target.h> 
+# include <ctype.h>
+# include <string.h>
+
+/* From: hpa@hook.eecs.nwu.edu (H. Peter Anvin) */
+static char *
+getcray()
+{
+# ifdef MC_GET_SYSTEM /* If we have target() */
+    struct target data;
+
+    if (target(MC_GET_SYSTEM, &data) != -1) {
+	static char hosttype_buf[sizeof(data.mc_pmt)+1];
+	char *p = (char *) &(data.mc_pmt);
+	char *q = hosttype_buf;
+	int n;
+
+	/* 
+	 * Copy to buffer and convert to lower case 
+	 * String may not be null-terminated, so keep a counter
+	 */
+	for (n = 0; *p && n < sizeof(data.mc_pmt); n++)
+	  *q++ = tolower(p[n]);
+
+	*q = '\0';
+
+	/* replace dashes with underscores if present */
+	while ((q = strchr(hosttype_buf, '-')) != NULL)
+	    *q = '_';
+	return hosttype_buf; 	/* Return in static buffer */
+    }
+    else
+# endif /* MC_GET_SYSTEM */
+	return "cray";		/* target() failed */
+}
+endcode	:
+enddef	:
+
+
+newdef	: defined(convex)
+newcode	:
+/*  
+ * On convex, find the current machine type via the getsysinfo() syscall
+ */
+#include <sys/sysinfo.h> 
+
+/* From: fox@convex.com (David DeSimone) */
+static char *
+getconvex()
+{
+    struct system_information  sysinfo;
+    static char  result[8];
+
+    if (getsysinfo(SYSINFO_SIZE, &sysinfo) == -1)
+	return "convex";
+
+    switch(sysinfo.cpu_type) {
+#ifdef SI_CPUTYPE_C1
+    case SI_CPUTYPE_C1:
+	return "c1";
+#endif
+
+#ifdef SI_CPUTYPE_C2
+    case SI_CPUTYPE_C2:
+	return "c2";
+#endif
+
+#ifdef SI_CPUTYPE_C2MP
+    case SI_CPUTYPE_C2MP:
+	(void) strcpy(result, "c2X0");
+	result[2] = sysinfo.cpu_count + '0';
+	return result;
+#endif
+
+#ifdef SI_CPUTYPE_C34
+    case SI_CPUTYPE_C34:
+	(void) strcpy(result, "c34X0");
+	result[3] = sysinfo.cpu_count + '0';
+	return result;
+#endif
+
+#ifdef SI_CPUTYPE_C38
+    case SI_CPUTYPE_C38:
+	(void) strcpy(result, "c38X0");
+	result[3] = sysinfo.cpu_count + '0';
+	return result;
+#endif
+
+#ifdef SI_CPUTYPE_C46
+    case SI_CPUTYPE_C46:
+	(void) strcpy(result, "c46X0");
+	result[3] = sysinfo.cpu_count + '0';
+	return result;
+#endif
+
+    default:
+	return "convex";
+    }
+}
+endcode	:
+enddef	:
+
+
+newcode	:
+void
+getmachine()
+{
+     char *hosttype;
+     char *ostype;
+     char *vendor;
+     char *machtype;
+
+endcode	:
+
+
+newdef	: defined(HOSTTYPE)
+hosttype:						: HOSTTYPE
+enddef	:
+
+
+newdef	: defined(__PARAGON__)
+comment	: Intel Paragon running OSF/1
+vendor	:						: "intel"
+hosttype:						: "paragon"
+ostype	:						: "osf1"
+machtype: defined(M_i386) 				: "i386"
+enddef	:
+
+
+newdef	: defined(AMIX)
+comment	: Amiga running Amix 2.02
+vendor	:						: "commodore"
+hosttype:						: "amiga"
+ostype	:						: "Amix"
+machtype:						: "m68k"
+enddef	:
+
+
+newdef	: defined(accel)
+comment	: celerity Accel
+vendor	: 						: "celerity"
+hosttype: 						: "celerityACCEL"
+ostype	:						: "unix"
+machtype:						: "accel"
+enddef	:
+
+
+newdef	: defined(_VMS_POSIX)
+comment	: digital vax or alpha running vms posix
+vendor	:						: "dec"
+hosttype:						: "VMS-POSIX"
+ostype	:						: "vms"
+machtype: defined(__alpha)				: "alpha"
+machtype: defined(__vax) || defined(vax)		: "vax"
+machtype: defined(__vax__) 				: "vax"
+enddef	:
+
+
+newdef	: defined(__hp_osf)
+comment	: Hewlett Packard running OSF/1
+vendor	:						: "hp"
+hosttype: defined(__pa_risc)				: "hp9000s700-osf1"
+hosttype: 						: "hp-osf1"
+ostype	: 						: "osf1"
+machtype: defined(__pa_risc)				: "pa_risc"
+enddef	:
+
+
+newdef	: defined(hp9000)
+comment	: Hewlett Packard running MORE/bsd 
+vendor	: 						: "hp"
+hosttype: defined(hp300)				: "hp300"
+hosttype: defined(hp800)				: "hp800"
+hosttype: 						: "hp9000"
+ostype	: defined(BSD4_4)				: "bsd44"
+ostype	:						: "mtXinu"
+machtype: defined(hp300)				: "m68k"
+machtype: defined(hp800)				: "pa_risc"
+enddef	:
+
+
+newdef	: defined(hpux) || defined(__hpux)
+comment	: Hewlett Packard running HP/UX
+vendor	:						: "hp"
+hosttype: defined(__hp9000s700)				: "hp9000s700"
+hosttype: defined(__hp9000s800) || defined(hp9000s800)  : "hp9000s800"
+hosttype: defined(hp9000s500)				: "hp9000s500"
+hosttype: defined(__hp9000s300) || defined(hp9000s300)  : "hp9000s300"
+hosttype: 						: "hp"
+ostype	:						: "hpux"
+machtype: defined(__hp9000s700)				: "pa_risc"
+machtype: defined(__hp9000s800) || defined(hp9000s800)  : "pa_risc"
+machtype: defined(hp9000s500)				: "m68k"
+machtype: defined(__hp9000s300) || defined(hp9000s300)  : "m68k"
+enddef	:
+
+
+newdef	: defined(apollo)
+comment	: Hewlett Packard apollo running Domain/OS
+vendor	:						: "hp"
+hosttype: 						: "apollo"
+ostype	:						: "DomainOS"
+machtype: 						: "m68k"
+enddef	:
+
+
+newdef	: defined(sun) || defined(__sun__)
+comment	: Sun Microsystems series 2 workstation (68010 based)
+comment	: Sun Microsystems series 3 workstation (68020 based)
+comment	: Sun Microsystems 386i workstation (386 based)
+comment	: Sun Microsystems series 4 workstation (SPARC based)
+vendor	:						: "sun"
+hosttype: defined(M_i386) && !defined(__SVR4)		: "sun386i"
+hosttype: defined(M_i386) && defined(__SVR4)		: "i86pc"
+hosttype: defined(mc68010) || defined(__mc68010__)	: "sun2"
+hosttype: defined(mc68020) || defined(__mc68020__)	: "sun3"
+hosttype: defined(sparc) || defined(__sparc__)		: "sun4"
+hosttype: 						: "sun"
+ostype	: defined(SUNOS3)				: "sunos3"
+ostype	: defined(SUNOS4)				: "sunos4"
+ostype	: defined(SOLARIS2)				: "solaris"
+machtype: defined(mc68010) || defined(__mc68010__)	: "m68k"
+machtype: defined(mc68020) || defined(__mc68020__)	: "m68k"
+machtype: defined(sparc) || defined(__sparc__)		: "sparc"
+machtype: defined(M_i386)				: "i386"
+enddef	:
+
+
+newdef	: defined(pyr)
+comment	: Pyramid Technology
+vendor	:						: "pyramid"
+hosttype:						: "pyramid"
+machtype:						: "pyramid"
+enddef	:
+
+
+newdef	: defined(hcx) || defined(_CX_UX)
+comment	: Harris Tahoe running CX/UX
+vendor	:						: "harris"
+hosttype:						: "hcx"
+ostype	:						: "hcx"
+machtype:						: "tahoe"
+enddef	:
+
+
+newdef	: defined(tahoe)
+comment	: Harris Tahoe
+vendor	:						: "harris"
+hosttype:						: "tahoe"
+machtype:						: "tahoe"
+enddef	:
+
+
+newdef	: defined(ibm032)
+comment	: RT running IBM AOS4.3 or MACH
+vendor	:						: "ibm"
+hosttype:						: "rt"
+ostype	: defined(MACH)					: "mach"
+ostype	: 						: "aos"
+machtype:						: "ibm032"
+enddef	:
+
+
+newdef	: defined(aiws)
+comment	: RT running IBM aix2.x
+vendor	:						: "ibm"
+hosttype:						: "rtpc"
+ostype	:						: "aix"
+machtype:						: "ibm032"
+enddef	:
+
+
+newdef	: defined(_AIX370)
+comment	: IBM/370 running aix
+vendor	:						: "ibm"
+hosttype:						: "aix370"
+ostype	:						: "aix"
+machtype:						: "ibm370"
+enddef	:
+
+
+newdef	: defined(_IBMESA)
+comment	: IBM/ESA running aix
+vendor	:						: "ibm"
+hosttype:						: "aixESA"
+ostype	:						: "aix"
+machtype:						: "esa"
+enddef	:
+
+
+newdef	: defined(_IBMR2)
+comment	: IBM/RS6000 running aix
+vendor	:						: "ibm"
+hosttype:						: "rs6000"
+ostype	:						: "aix"
+machtype:						: "rs6000"
+enddef	:
+
+
+newdef	: defined(_AIXPS2)
+comment	: IBM/PS2 running aix
+vendor	:						: "ibm"
+hosttype:						: "ps2"
+ostype	:						: "aix"
+machtype:						: "i386"
+enddef	:
+
+
+newdef	: defined(OREO)
+comment	: Macintosh running AU/X
+vendor	:						: "apple"
+hosttype:						: "mac2"
+ostype	:						: "aux"
+machtype: defined(mc68020)				: "m68k"
+enddef	:
+
+
+newdef	: defined(u3b20d)
+comment	: AT&T 3B/20 series running SVR2/3 
+vendor	:						: "att"
+hosttype:						: "att3b20"
+machtype:						: "u3b20"
+enddef	:
+
+
+newdef	: defined(u3b15)
+comment	: AT&T 3B/15 series running SVR2/3 
+vendor	:						: "att"
+hosttype:						: "att3b15"
+machtype:						: "u3b15"
+enddef	:
+
+
+newdef	: defined(u3b5)
+comment	: AT&T 3B/5 series running SVR2/3 
+vendor	:						: "att"
+hosttype:						: "att3b5"
+machtype:						: "u3b5"
+enddef	:
+
+
+newdef	: defined(u3b2)
+comment	: AT&T 3B/2 series running SVR2/3 
+vendor	:						: "att"
+hosttype:						: "att3b2"
+machtype:						: "u3b2"
+enddef	:
+
+
+newdef	: defined(UNIXPC)
+comment	: AT&T UnixPC att3b1/att7300
+vendor	:						: "att"
+hosttype:						: "unixpc"
+machtype: defined(u3b1)					: "u3b1"
+machtype: defined(att7300)				: "att7300"
+enddef	:
+
+
+newdef	: defined(_MINIX)
+comment	: Andy Tanenbaum's minix
+vendor	: defined(M_i386)				: "intel"
+hosttype: defined(M_i386)				: "minix386"
+hosttype:						: "minix"
+ostype	:						: "minix"
+machtype: defined(M_i386)				: "i386"
+enddef	:
+
+
+newdef	: defined(linux)
+comment	: Linus Torvalds's linux
+vendor	: defined(M_intel)				: "intel"
+hosttype: defined(M_i586) 				: "i586-linux"
+hosttype: defined(M_i486) 				: "i486-linux"
+hosttype: defined(M_i386)				: "i386-linux"
+ostype	: !defined(PPC) 				: "linux"
+ostype	: defined(PPC)					: "mklinux"
+machtype: defined(M_i586) 				: "i586"
+machtype: defined(M_i486) 				: "i486"
+machtype: defined(M_i386)				: "i386"
+vendor	: defined(__alpha)				: "dec"
+vendor	: defined(PPC)					: "apple"
+hosttype: defined(__alpha)				: "alpha"
+hosttype: defined(PPC)					: "powerpc"
+machtype: defined(__alpha)				: "alpha"
+machtype: defined(PPC)					: "powerpc"
+enddef	:
+
+
+newdef	: defined(__EMX__)
+comment	: OS/2 EMX [unix emulation under OS/2]
+vendor	: defined(M_intel)				: "intel"
+hosttype: defined(M_i386)				: "i386-emx"
+ostype	:						: "os2"
+machtype: defined(M_i386)				: "i386"
+enddef	:
+
+
+newdef	: defined(__NetBSD__) 
+comment	: NetBSD
+vendor	: defined(arm32)				: "acorn"
+vendor	: defined(alpha)				: "digital"
+vendor	: defined(amiga)				: "commodore"
+vendor	: defined(atari)				: "atari"
+vendor	: defined(hp300)				: "hp"
+vendor	: defined(M_intel)				: "intel"
+vendor	: defined(m68k)					: "motorola"
+vendor	: defined(mac68k)				: "apple"
+vendor	: defined(pc532)				: "national-semi"
+vendor	: defined(pmax)	|| defined(mips)		: "dec"
+vendor	: defined(M_mipsel)				: "dec"
+vendor	: defined(sparc)				: "sun"
+vendor	: defined(sun3)					: "sun"
+vendor	: defined(vax)					: "digital"
+hosttype: 						: "NetBSD"
+ostype	: 						: "NetBSD"
+machtype: defined(arm32)				: "arm32"
+machtype: defined(sparc)				: "sparc"
+machtype: defined(mc68020)				: "m68k"
+machtype: defined(M_i386)				: "i386"
+machtype: defined(M_mipsel)				: "mipsel"
+machtype: defined(M_mipseb)				: "mipseb"
+machtype: defined(mips)					: "mips"
+machtype: defined(pc532)				: "pc532"
+machtype: defined(vax)					: "vax"
+machtype: defined(alpha)				: "alpha"
+enddef	:
+
+
+newdef	: defined(__FreeBSD__) 
+comment	: FreeBSD
+vendor	: defined(__alpha)				: "digital"
+vendor	: defined(M_intel)				: "intel"
+hosttype:						: "FreeBSD"
+ostype	:						: "FreeBSD"
+machtype: defined(__alpha)				: "alpha"
+machtype: defined(M_i386)				: "i386"
+enddef	:
+
+
+newdef	: defined(__386BSD__)
+comment	: Bill Jolitz's 386BSD
+vendor	: defined(M_intel)				: "intel"
+hosttype:						: "386BSD"
+ostype	:						: "386BSD"
+machtype:						: "i386"
+enddef	:
+
+
+newdef	: defined(bsdi)
+comment	: BSDI's unix
+vendor	: defined(M_intel)				: "intel"
+vendor	: defined(sparc)				: "sun"
+vendor	: defined(__powerpc__)				: "motorola"
+hosttype: defined(M_intel)				: "bsd386"
+hosttype: defined(sparc)				: "bsd-sparc"
+hosttype: defined(__powerpc__)				: "bsd-powerpc"
+ostype	:						: "bsdi"
+machtype: defined(M_i386)				: "i386"
+machtype: defined(sparc)				: "sparc"
+machtype: defined(__powerpc__)				: "powerpc"
+enddef	:
+
+
+newdef	: defined(COHERENT)
+comment	: COHERENT's unix
+vendor	: defined(_I386)				: "intel"
+hosttype:						: "coh386"
+hosttype:						: "coherent"
+ostype	:						: "coherent"
+machtype: defined(_I386)				: "i386"
+enddef	:
+
+newdef	: defined(SCO)
+comment	: SCO UNIX System V/386 Release 3.2
+vendor	:						: "sco"
+hosttype:						: "sco386"
+ostype	:						: "sco_unix"
+machtype:						: "i386"
+enddef	:
+
+newdef	: defined(M_XENIX) && !defined(M_UNIX)
+comment	: SCO XENIX
+vendor	:						: "sco"
+hosttype:						: "sco_xenix"
+ostype	:						: "sco_xenix"
+machtype: defined(M_I386)				: "i386"
+machtype: defined(M_I286)				: "i286"
+enddef	:
+
+
+newdef	: defined(ISC) || defined(ISC202)
+comment	: Interactive Unix
+vendor	:						: "isc"
+hosttype:						: "isc386"
+ostype	: defined(POSIX)				: "POSIX"
+ostype	: 						: "SVR3"
+machtype: defined(M_i386)				: "i386"
+enddef	:
+
+
+newdef	: defined(INTEL)
+comment	: Intel Unix
+vendor	:						: "intel"
+hosttype:						: "intel386"
+ostype	:						: "intel_unix"
+machtype: defined(M_i386)				: "i386"
+enddef	:
+
+
+newdef	: defined(MACH)
+comment	: cmu's mach
+vendor	:						: "cmu"
+hosttype: defined(M_i386)				: "i386-mach"
+ostype	:						: "mach"
+machtype: defined(M_i386)				: "i386"
+enddef	:
+
+
+newdef	: defined(alliant)
+comment	: Alliants FSX
+vendor	:						: "alliant"
+hosttype: defined(mc68000)				: "alliant-fx80"
+hosttype: defined(i860)					: "alliant-fx2800"
+hosttype:						: "alliant"
+ostype	:						: "fsx"
+machtype: defined(mc68000)				: "mc68000"
+machtype: defined(i860)					: "i860"
+enddef	:
+
+
+newdef	: defined(_FTX)
+comment	: Stratus Computer, Inc FTX2 (i860 based)
+comment	: Stratus Computer, Inc FTX3 (HPPA based)
+vendor	:						: "stratus"
+hosttype: defined(i860) && defined(_FTX)		: "atlantic"
+hosttype: defined(__hppa) && defined(_FTX)		: "continuum"
+ostype	: defined(i860) && defined(_FTX)		: "ftx2"
+ostype	: defined(__hppa) && defined(_FTX)		: "ftx3"
+machtype: defined(i860)					: "i860"
+machtype: defined(__hppa)				: "hppa"
+enddef	:
+
+
+newdef	: defined(sequent) || defined(_SEQUENT_)
+comment	: Sequent Balance (32000 based)
+comment	: Sequent Symmetry running DYNIX/ptx (386/486 based)
+comment	: Sequent Symmetry running DYNIX 3 (386/486 based)
+vendor	:						: "sequent"
+hosttype: defined(M_i386) && defined(sequent)		: "symmetry"
+hosttype: defined(M_i386)				: "ptx"
+hosttype: 						: "balance"
+ostype	: defined(M_i386) && !defined(sequent)		: "ptx"
+ostype	: 						: "dynix3"
+machtype: defined(M_i386)				: "i386"
+machtype: defined(ns32000)				: "ns32000"
+enddef	:
+
+
+newdef	: defined(ns32000)
+comment	: Encore Computer Corp. Multimax (32000 based)
+vendor	:						: "encore"
+hosttype: defined(CMUCS)				: "multimax"
+hosttype: 						: isamultimax(0)
+ostype	: defined(CMUCS)				: "mach"
+ostype	:						: isamultimax(1)
+machtype:						: "ns32000"
+enddef	:
+
+
+newdef	: defined(iconuxv)
+comment	: Icon 88k running Unix
+vendor	:						: "icon"
+hosttype:						: "icon"
+ostype	:						: "iconuxv"
+machtype: defined(m88k) || defined(__m88k__)		: "m88k"
+enddef	:
+
+
+newdef	: defined(_CRAY) && defined(_CRAYCOM)
+comment	: Cray Computer Corp. running CSOS
+vendor	:						: "ccc"
+hosttype: defined(_CRAY2)				: "cray"
+hosttype: defined(_CRAY3)				: "cray"
+hosttype: defined(_CRAY4)				: "cray"
+ostype	:						: "CSOS"
+machtype: defined(_CRAY2)				: "cray2"
+machtype: defined(_CRAY3)				: "cray3"
+machtype: defined(_CRAY4)				: "cray4"
+enddef	:
+
+
+newdef	: defined(cray) && !defined(_CRAYMPP)
+comment	: Cray Research Inc. PVP running UNICOS
+vendor	:						: "cri"
+hosttype:						: getcray()
+ostype	:						: "unicos"
+machtype:						: getcray()
+enddef	:
+
+
+newdef  : defined(cray) && defined(_CRAYT3D)
+comment : Cray Research Inc. running UNICOS MAX
+vendor  :                                               : "cri"
+hosttype:                                               : getcray()
+ostype  :                                               : "unicosmax"
+machtype:                                               : getcray()
+enddef  :
+
+
+newdef	: defined(cray) && defined(_CRAYT3E)
+comment	: Cray Research Inc. running UNICOS/mk
+vendor	:						: "cri"
+hosttype:						: getcray()
+ostype	:						: "unicosmk"
+machtype:						: getcray()
+enddef	:
+
+
+newdef	: defined(convex)
+comment	: Convex
+vendor	: 						: "convex"
+hosttype:						: "convex"
+ostype	:						: "convexos"
+machtype:						: getconvex()
+enddef	:
+
+
+newdef	: defined(butterfly)
+comment	: BBN Butterfly 1000
+vendor	:						: "bbn"
+hosttype:						: "butterfly"
+machtype: defined(mc68020) || defined(__mc68020__)	: "m68k"
+enddef	:
+
+
+newdef	: defined(NeXT)
+comment	: NeXTStep
+vendor	:						: "next"
+hosttype: defined(mc68020) || defined(__mc68020__)	: "next"
+hosttype: defined(M_i386)  || defined(__i386__)		: "intel-pc"
+hosttype: defined(hppa)    || defined(__hppa__)		: "hp"
+hosttype: defined(sparc)   || defined(__sparc__)	: "sun"
+ostype	:						: "nextstep"
+machtype: defined(mc68020) || defined(__mc68020__)	: "m68k"
+machtype: defined(M_i386)  || defined(__i386__)		: "i386"
+machtype: defined(hppa)    || defined(__hppa__)		: "hppa"
+machtype: defined(sparc)   || defined(__sparc__)	: "sparc"
+enddef	:
+
+
+newdef	: defined(__APPLE__)
+comment	: Rhapsody
+vendor	:						: "apple"
+hosttype: defined(__i386__)				: "intel-pc"
+hosttype: defined(__ppc__)				: "macintosh"
+ostype	:						: "rhapsody"
+machtype: defined(__i386__)				: "i386"
+machtype: defined(__ppc__)				: "powerpc"
+enddef	:
+
+
+newdef	: defined(sony_news)
+comment	: Sony NEWS 800 or 1700 workstation
+vendor	:						: "sony"
+hosttype: defined(mips)					: "news_mips"
+hosttype: defined(mc68020) || defined(__mc68020__)	: "news_m68k"
+ostype	:						: "News"
+machtype: defined(mc68020) || defined(__mc68020__)	: "m68k"
+machtype: defined(M_mipsel)				: "mipsel"
+machtype: defined(M_mipseb)				: "mipseb"
+enddef	:
+
+
+newdef	: defined(sgi)
+comment	: Silicon Graphics
+vendor	:						: "sgi"
+hosttype: defined(M_mipsel)				: "iris4d"
+hosttype: defined(M_mipseb)				: "iris4d"
+hosttype: defined(mc68000) 				: "iris3d"
+ostype	:						: "irix"
+machtype: defined(M_mipsel)				: "mipsel"
+machtype: defined(M_mipseb)				: "mipseb"
+machtype: defined(mc68000) 				: "mc68000"
+enddef	:
+
+
+newdef	: defined(ultrix) || defined(__ultrix)
+comment	: Digital's Ultrix 
+vendor	:						: "dec"
+hosttype: defined(M_mipsel)				: "decstation"
+hosttype: defined(M_mipseb)				: "decmips"
+hosttype: defined(vax) || defined(__vax)		: "vax"
+hosttype: defined(__vax__) 				: "vax"
+ostype	:						: "ultrix"
+machtype: defined(M_mipsel)				: "mipsel"
+machtype: defined(M_mipseb)				: "mipseb"
+machtype: defined(vax) || defined (__vax)		: "vax"
+hosttype: defined(__vax__) 				: "vax"
+enddef	:
+
+
+newdef	: defined(MIPS)
+comment	: Mips OS
+vendor	:						: "mips"
+hosttype: defined(M_mipsel) 				: "mips"
+hosttype: defined(M_mipseb)				: "mips"
+ostype	:						: "mips"
+machtype: defined(M_mipsel)				: "mipsel"
+machtype: defined(M_mipseb)				: "mipseb"
+enddef	:
+
+
+newdef	: defined(DECOSF1)
+comment	: Digital's alpha running osf1
+vendor	:						: "dec"
+ostype	:						: "osf1"
+hosttype: defined(__alpha)				: "alpha"
+machtype: defined(__alpha)				: "alpha"
+enddef	:
+
+
+newdef	: defined(Lynx)
+comment	: Lynx OS 2.1
+vendor	:						: "Lynx"
+hosttype: defined(M_mipsel)				: "lynxos-mips"
+hosttype: defined(M_mipseb)				: "lynxos-mips"
+hosttype: defined(M_i386)				: "lynxos-i386"
+hosttype: defined(i860) || defined(__i860__)		: "lynxos-i860"
+hosttype: defined(m68k)					: "lynxos-m68k"
+hosttype: defined(m88k)					: "lynxos-m88k"
+hosttype: defined(sparc)				: "lynxos-sparc"
+hosttype: 						: "lynxos-unknown"
+ostype	:						: "LynxOS"
+machtype: defined(M_mipsel)				: "mipsel"
+machtype: defined(M_mipseb)				: "mipseb"
+machtype: defined(M_i386)				: "i386"
+machtype: defined(i860) || defined(__i860__)		: "i860"
+machtype: defined(m68k)					: "m68k"
+machtype: defined(m88k)					: "m88k"
+machtype: defined(sparc)				: "sparc"
+enddef	:
+
+
+newdef	: defined(masscomp)
+comment	: Masscomp
+vendor	:						: "masscomp"
+hosttype:						: "masscomp"
+ostype	:						: "masscomp"
+enddef	:
+
+newdef	: defined(__MACHTEN__)
+comment	: Machintosh
+vendor	:						: "Tenon"
+hosttype:						: "Macintosh"
+ostype	: 						: "MachTen"
+machtype:						: "Macintosh"
+enddef	:
+
+
+
+newdef	: defined(GOULD_NP1)
+comment	: Gould
+vendor	:						: "gould"
+hosttype:						: "gould_np1"
+machtype:						: "gould"
+enddef	:
+
+
+newdef	: defined(MULTIFLOW)
+comment	: Multiflow running 4.3BSD
+vendor	:						: "multiflow"
+hosttype:						: "multiflow"
+machtype:						: "multiflow"
+ostype	:						: "bsd43"
+enddef	:
+
+
+newdef	: defined(SXA)
+comment	: PFU/Fujitsu A-xx computer
+vendor	:						: "sxa"
+hosttype:						: "pfa50"
+ostype	: defined(_BSDX_)				: "e60-bsdx"
+ostype	: 						: "e60"
+machtype:						: "pfa50"
+enddef	:
+
+
+newdef	: defined(titan)
+comment	: (St)Ardent Titan
+vendor	:						: "ardent"
+hosttype:						: "titan"
+enddef	:
+
+
+newdef	: defined(stellar)
+comment	: Stellar
+vendor	:						: "stellar"
+hosttype:						: "stellar"
+ostype	:						: "stellix"
+enddef	:
+
+
+newdef	: defined(atari)
+comment	: Atari TT running SVR4. This machine was never
+comment	: commercially available.
+vendor	:						: "atari"
+hosttype:						: "atari"
+ostype	:						: "asv"
+enddef	:
+
+
+newdef	: defined(OPUS)
+comment	: ???
+vendor	:						: "opus"
+hosttype:						: "opus"
+enddef	:
+
+
+newdef	: defined(eta10)
+comment	: ETA running SVR3
+vendor	:						: "eta"
+hosttype:						: "eta10"
+enddef	:
+
+
+newdef	: defined(hk68)
+comment	: Heurikon HK68 running Uniplus+ 5.0
+vendor	:						: "heurikon"
+hosttype:						: "hk68"
+ostype	:						: "uniplus"
+enddef	:
+
+
+newdef	: defined(NDIX)
+comment	: Norsk Data ND 500/5000 running Ndix
+vendor	:						: "norsk"
+hosttype:						: "nd500"
+ostype	:						: "ndix"
+enddef	:
+
+
+newdef	: defined(AMIGA)
+comment	: Amiga running AmigaOS+GG
+vendor	:						: "commodore"
+hosttype:						: "amiga"
+ostype	:						: "AmigaOS"
+machtype:						: "m68k"
+enddef	:
+
+
+newdef	: defined(uts)
+comment	: Amdahl running uts 2.1
+vendor	: 						: "amdahl"
+hosttype:						: "amdahl"
+ostype	:						: "uts"
+machtype:						: "amdahl"
+enddef	:
+
+
+newdef	: defined(UTek)
+comment	: Tektronix 4300 running UTek (BSD 4.2 / 68020 based)
+vendor	:						: "tektronix"
+hosttype: 						: "tek4300"
+enddef	:
+
+
+newdef	: defined(UTekV)
+comment	: Tektronix XD88/10 running UTekV 3.2e (SVR3/88100 based)
+vendor	:						: "tektronix"
+hosttype: 						: "tekXD88"
+enddef	:
+
+
+newdef	: defined(__DGUX__)
+comment	: Data-General AViiON running DGUX
+hosttype:						: "aviion"
+ostype	:						: "dgux"
+vendor	:						: "dg"
+machtype: defined(__m88k__)				: "m88k"
+machtype: defined(__i386__)				: "pentium"
+enddef	:
+
+
+newdef	: defined(sysV68)
+comment	: Motorola MPC running System V/68 R32V2 (SVR3/68020 based)
+vendor	:						: "motorola"
+hosttype: 						: "sysV68"
+machtype:						: "m68k"
+enddef	:
+
+
+newdef	: defined(supermax)
+comment	: DDE Supermax running System V/68 R3 (SVR3/68020 based)
+vendor	:						: "supermax"
+hosttype: 						: "supermax"
+machtype:						: "m68k"
+enddef	:
+
+
+newdef	: defined(sysV88)
+comment	: Motorola MPC running System V/88 R32V2 (SVR3/88100 based)
+vendor	:						: "motorola"
+hosttype: 						: "sysV88"
+machtype:						: "m88k"
+enddef	:
+
+
+newdef	: defined(__clipper__)
+comment	: Clipper Chipset (Intergraph)
+vendor	:						: "intergraph"
+hosttype:						: "clipper"
+machtype:						: "clipper"
+enddef	:
+
+
+newdef	: defined(SNI) || defined(sinix)
+comment	: Siemens Nixdorf Informationssysteme SINIX
+vendor	:						: "sni"
+hosttype: defined(M_intel)				: "wx200i"
+hosttype: defined(MIPSEB)				: "rm400"
+ostype	: defined(sinix)				: "sinix"
+machtype: defined(M_i586)				: "i586"
+machtype: defined(M_i486)				: "i486"
+machtype: defined(M_i386)				: "i386"
+machtype: defined(M_mipsel)				: "mipsel"
+machtype: defined(M_mipseb)				: "mipseb"
+machtype:						: "mips"
+enddef	:
+
+newdef	: defined(_OSD_POSIX)
+comment	: Siemens Nixdorf Informationssysteme BS2000 POSIX (mainframe, EBCDIC)
+vendor	:						: "sni"
+hosttype: defined(M_intel)				: "bs2000"
+ostype	: 						: "posix"
+machtype:						: "bs2000"
+enddef	:
+
+newdef	: defined(__MVS__)
+comment	: ibm uss s/390 (mainframe, EBCDIC)
+vendor	:						: "ibm"
+hosttype:					 	: "s390"
+ostype	: 						: "os390"
+machtype:						: "s390"
+enddef	:
+
+newdef	: defined(_SX)
+comment : NEC Corporation (SX-4)
+vendor	: 						: "nec"
+ostype	:						: "superux"
+hosttype:						: "sx4"
+machtype:						: "sx4"
+enddef	:
+
+newdef  : !defined(SOLARIS2) && (SYSVREL == 4)
+comment : Unix System V Release 4.0
+vendor  : defined(DELL)					: "dell"
+hosttype: defined(M_i386)				: "i386"
+ostype  :						: "svr4"
+machtype: defined(M_i386)				: "i386"
+enddef	:
+
+newdef	: defined(__uxp__) || defined(__uxps__)
+comment	: FUJITSU DS/90 7000
+vendor	:						: "fujitsu"
+hosttype:						: "ds90"
+ostype	:						: "sysv4"
+machtype:						: "sparc"
+enddef	:
+
+newdef  : defined(_UWIN)
+comment : AT&T Research Unix for Windows
+vendor  :               				: "att"
+hosttype:                       			: "win32.i386"
+machtype:                       			: "i386"
+enddef	:
+
+
+newdef	: defined(mc68000) || defined(__mc68000__) || defined(mc68k32) || defined(m68k) || defined(mc68010) || defined(mc68020)
+hosttype:						: "m68k"
+vendor	: defined(m68k)					: "motorola"
+machtype:						: "m68k"
+enddef	:
+
+
+newdef	: defined(m88k) || defined(__m88k__)
+hosttype:						: "m88k"
+machtype:						: "m88k"
+enddef	:
+
+
+newdef	: defined(M_intel)
+hosttype: defined(M_i586)				: "i586"
+hosttype: defined(M_i486)				: "i486"
+hosttype: defined(M_i386)				: "i386"
+vendor	: 						: "intel"
+machtype: defined(M_i586)				: "i586"
+machtype: defined(M_i486)				: "i486"
+machtype: defined(M_i386)				: "i386"
+enddef	:
+
+
+newdef	: defined(sparc) || defined(__sparc__)
+hosttype:						: "sparc"
+machtype:						: "sparc"
+enddef	:
+
+
+newdef	: defined(i860) || defined(__i860__)
+hosttype:						: "i860"
+machtype:						: "i860"
+enddef	:
+
+
+newdef	: defined(osf1)
+ostype	:						: "osf1"
+enddef	:
+
+
+newdef	: SYSVREL == 0
+ostype	: defined(BSD4_4)				: "bsd44"
+ostype	: defined(BSD)					: "bsd"
+ostype	: defined(POSIX)				: "posix"
+enddef	:
+
+
+newdef	: SYSVREL == 1
+ostype	: 						: "svr1"
+enddef	:
+
+
+newdef	: SYSVREL == 2
+ostype	: 						: "svr2"
+enddef	:
+
+
+newdef	: SYSVREL == 3
+ostype	: 						: "svr3"
+enddef	:
+
+
+newdef	: SYSVREL == 4
+ostype	: 						: "svr4"
+enddef	:
+
+
+newcode	:
+#ifndef _hosttype_
+    hosttype = "unknown";
+#endif
+#ifndef _ostype_
+    ostype = "unknown";
+#endif
+#ifndef _vendor_
+    vendor = "unknown";
+#endif
+#ifndef _machtype_
+    machtype = "unknown";
+#endif
+    tsetenv(STRHOSTTYPE, str2short(hosttype));
+    tsetenv(STRVENDOR,   str2short(vendor));
+    tsetenv(STROSTYPE,   str2short(ostype));
+    tsetenv(STRMACHTYPE, str2short(machtype));
+} /* end setmachine */
+endcode	:
diff --git a/bin/csh/nls/Makefile b/bin/csh/nls/Makefile
index 9f1e4c53..110d359 100644
--- a/bin/csh/nls/Makefile
+++ b/bin/csh/nls/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SUBDIR= finnish french ja german italian spanish
+SUBDIR= finnish french ja german italian spanish ukrainian
 
 # We are not ready for greek yet
 #SUBDIR+= greek
diff --git a/bin/csh/nls/ukrainian/Makefile b/bin/csh/nls/ukrainian/Makefile
new file mode 100644
index 0000000..0e019b5
--- /dev/null
+++ b/bin/csh/nls/ukrainian/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+NL=     ukrainian
+DL=     uk_UA.KOI8-U
+
+.PATH: ${BASESRC}/${NL}
+
+tcsh.msg: set[0-9]*
+	cat ${BASESRC}/${NL}/set[0-9] \
+	    ${BASESRC}/${NL}/set[0-9][0-9] > ${.TARGET}
+
+install:
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+		tcsh.cat ${DESTDIR}${NLSDIR}/${DL}/tcsh.cat
+
+.include <bsd.prog.mk>
diff --git a/bin/csh/tc.defs.c b/bin/csh/tc.defs.c
deleted file mode 100644
index 484e72b..0000000
--- a/bin/csh/tc.defs.c
+++ /dev/null
@@ -1,2709 +0,0 @@
-/* $FreeBSD$ */
-
-/* Do not edit this file, make creates it */
-/* $Header: /src/pub/tcsh/host.defs,v 1.25 1999/04/20 07:48:41 christos Exp $ */
-/*
- * host.defs: Hosttype/Machtype etc.
- */
-/*-
- * Copyright (c) 1980, 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include "sh.h"
-
-RCSID("$Id: host.defs,v 1.25 1999/04/20 07:48:41 christos Exp $")
-
-
-
-#if (defined(mips) || defined(__mips)) && (defined(MIPSEL) || defined(__MIPSEL))
-# define M_mipsel
-#endif
-
-
-#if (defined(mips) || defined(__mips)) && (defined(MIPSEB) || defined(__MIPSEB))
-# define M_mipseb
-#endif
-
-
-#if (defined(i386) || defined(__i386__))
-# define M_i386
-#endif
-
-
-#if (defined(i486) || defined(__i486__))
-# define M_i486
-#endif
-
-
-#if (defined(i586) || defined(__i586__))
-# define M_i586
-#endif
-
-
-#if (defined(M_i386) || defined(M_i486) || defined(M_i586))
-# define M_intel
-#endif
-
-
-
-
-#if defined(ns32000)
-static char *
-isamultimax(flag)
-    int flag;
-{
-    if (access("/Umax.image", F_OK) == 0)
-	return "multimax";
-    else 
-	return flag ? "mach" : "ns32000";
-}
-#endif
-
-
-
-
-#if defined(cray)
-/*  
- * On crays, find the current machine type via the target() syscall
- * We need ctype.h to convert the name returned to lower case
- */
-# include <sys/target.h> 
-# include <ctype.h>
-# include <string.h>
-
-/* From: hpa@hook.eecs.nwu.edu (H. Peter Anvin) */
-static char *
-getcray()
-{
-# ifdef MC_GET_SYSTEM /* If we have target() */
-    struct target data;
-
-    if (target(MC_GET_SYSTEM, &data) != -1) {
-	static char hosttype_buf[sizeof(data.mc_pmt)+1];
-	char *p = (char *) &(data.mc_pmt);
-	char *q = hosttype_buf;
-	int n;
-
-	/* 
-	 * Copy to buffer and convert to lower case 
-	 * String may not be null-terminated, so keep a counter
-	 */
-	for (n = 0; *p && n < sizeof(data.mc_pmt); n++)
-	  *q++ = tolower(p[n]);
-
-	*q = '\0';
-
-	/* replace dashes with underscores if present */
-	while ((q = strchr(hosttype_buf, '-')) != NULL)
-	    *q = '_';
-	return hosttype_buf; 	/* Return in static buffer */
-    }
-    else
-# endif /* MC_GET_SYSTEM */
-	return "cray";		/* target() failed */
-}
-#endif
-
-
-
-
-#if defined(convex)
-/*  
- * On convex, find the current machine type via the getsysinfo() syscall
- */
-#include <sys/sysinfo.h> 
-
-/* From: fox@convex.com (David DeSimone) */
-static char *
-getconvex()
-{
-    struct system_information  sysinfo;
-    static char  result[8];
-
-    if (getsysinfo(SYSINFO_SIZE, &sysinfo) == -1)
-	return "convex";
-
-    switch(sysinfo.cpu_type) {
-#ifdef SI_CPUTYPE_C1
-    case SI_CPUTYPE_C1:
-	return "c1";
-#endif
-
-#ifdef SI_CPUTYPE_C2
-    case SI_CPUTYPE_C2:
-	return "c2";
-#endif
-
-#ifdef SI_CPUTYPE_C2MP
-    case SI_CPUTYPE_C2MP:
-	(void) strcpy(result, "c2X0");
-	result[2] = sysinfo.cpu_count + '0';
-	return result;
-#endif
-
-#ifdef SI_CPUTYPE_C34
-    case SI_CPUTYPE_C34:
-	(void) strcpy(result, "c34X0");
-	result[3] = sysinfo.cpu_count + '0';
-	return result;
-#endif
-
-#ifdef SI_CPUTYPE_C38
-    case SI_CPUTYPE_C38:
-	(void) strcpy(result, "c38X0");
-	result[3] = sysinfo.cpu_count + '0';
-	return result;
-#endif
-
-#ifdef SI_CPUTYPE_C46
-    case SI_CPUTYPE_C46:
-	(void) strcpy(result, "c46X0");
-	result[3] = sysinfo.cpu_count + '0';
-	return result;
-#endif
-
-    default:
-	return "convex";
-    }
-}
-#endif
-
-
-void
-getmachine()
-{
-     char *hosttype;
-     char *ostype;
-     char *vendor;
-     char *machtype;
-
-
-
-
-
-#if defined(__PARAGON__)
-    /* Intel Paragon running OSF/1 */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "intel";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "paragon";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "osf1";
-# endif
-# if (defined(M_i386)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-#endif
-
-
-
-
-#if defined(AMIX)
-    /* Amiga running Amix 2.02 */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "commodore";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "amiga";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "Amix";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "m68k";
-# endif
-#endif
-
-
-
-
-#if defined(accel)
-    /* celerity Accel */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "celerity";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "celerityACCEL";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "unix";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "accel";
-# endif
-#endif
-
-
-
-
-#if defined(_VMS_POSIX)
-    /* digital vax or alpha running vms posix */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "dec";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "VMS-POSIX";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "vms";
-# endif
-# if (defined(__alpha)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "alpha";
-# endif
-# if (defined(__vax) || defined(vax)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "vax";
-# endif
-# if (defined(__vax__)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "vax";
-# endif
-#endif
-
-
-
-
-#if defined(__hp_osf)
-    /* Hewlett Packard running OSF/1 */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "hp";
-# endif
-# if (defined(__pa_risc)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "hp9000s700-osf1";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "hp-osf1";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "osf1";
-# endif
-# if (defined(__pa_risc)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "pa_risc";
-# endif
-#endif
-
-
-
-
-#if defined(hp9000)
-    /* Hewlett Packard running MORE/bsd */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "hp";
-# endif
-# if (defined(hp300)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "hp300";
-# endif
-# if (defined(hp800)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "hp800";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "hp9000";
-# endif
-# if (defined(BSD4_4)) && !defined(_ostype_)
-# define _ostype_
-    ostype = "bsd44";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "mtXinu";
-# endif
-# if (defined(hp300)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "m68k";
-# endif
-# if (defined(hp800)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "pa_risc";
-# endif
-#endif
-
-
-
-
-#if defined(hpux) || defined(__hpux)
-    /* Hewlett Packard running HP/UX */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "hp";
-# endif
-# if (defined(__hp9000s700)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "hp9000s700";
-# endif
-# if (defined(__hp9000s800) || defined(hp9000s800)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "hp9000s800";
-# endif
-# if (defined(hp9000s500)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "hp9000s500";
-# endif
-# if (defined(__hp9000s300) || defined(hp9000s300)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "hp9000s300";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "hp";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "hpux";
-# endif
-# if (defined(__hp9000s700)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "pa_risc";
-# endif
-# if (defined(__hp9000s800) || defined(hp9000s800)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "pa_risc";
-# endif
-# if (defined(hp9000s500)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "m68k";
-# endif
-# if (defined(__hp9000s300) || defined(hp9000s300)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "m68k";
-# endif
-#endif
-
-
-
-
-#if defined(apollo)
-    /* Hewlett Packard apollo running Domain/OS */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "hp";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "apollo";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "DomainOS";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "m68k";
-# endif
-#endif
-
-
-
-
-#if defined(sun) || defined(__sun__)
-    /* Sun Microsystems series 2 workstation (68010 based) */
-    /* Sun Microsystems series 3 workstation (68020 based) */
-    /* Sun Microsystems 386i workstation (386 based) */
-    /* Sun Microsystems series 4 workstation (SPARC based) */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "sun";
-# endif
-# if (defined(M_i386) && !defined(__SVR4)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "sun386i";
-# endif
-# if (defined(M_i386) && defined(__SVR4)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "i86pc";
-# endif
-# if (defined(mc68010) || defined(__mc68010__)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "sun2";
-# endif
-# if (defined(mc68020) || defined(__mc68020__)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "sun3";
-# endif
-# if (defined(sparc) || defined(__sparc__)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "sun4";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "sun";
-# endif
-# if (defined(SUNOS3)) && !defined(_ostype_)
-# define _ostype_
-    ostype = "sunos3";
-# endif
-# if (defined(SUNOS4)) && !defined(_ostype_)
-# define _ostype_
-    ostype = "sunos4";
-# endif
-# if (defined(SOLARIS2)) && !defined(_ostype_)
-# define _ostype_
-    ostype = "solaris";
-# endif
-# if (defined(mc68010) || defined(__mc68010__)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "m68k";
-# endif
-# if (defined(mc68020) || defined(__mc68020__)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "m68k";
-# endif
-# if (defined(sparc) || defined(__sparc__)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "sparc";
-# endif
-# if (defined(M_i386)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-#endif
-
-
-
-
-#if defined(pyr)
-    /* Pyramid Technology */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "pyramid";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "pyramid";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "pyramid";
-# endif
-#endif
-
-
-
-
-#if defined(hcx) || defined(_CX_UX)
-    /* Harris Tahoe running CX/UX */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "harris";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "hcx";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "hcx";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "tahoe";
-# endif
-#endif
-
-
-
-
-#if defined(tahoe)
-    /* Harris Tahoe */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "harris";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "tahoe";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "tahoe";
-# endif
-#endif
-
-
-
-
-#if defined(ibm032)
-    /* RT running IBM AOS4.3 or MACH */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "ibm";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "rt";
-# endif
-# if (defined(MACH)) && !defined(_ostype_)
-# define _ostype_
-    ostype = "mach";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "aos";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "ibm032";
-# endif
-#endif
-
-
-
-
-#if defined(aiws)
-    /* RT running IBM aix2.x */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "ibm";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "rtpc";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "aix";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "ibm032";
-# endif
-#endif
-
-
-
-
-#if defined(_AIX370)
-    /* IBM/370 running aix */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "ibm";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "aix370";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "aix";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "ibm370";
-# endif
-#endif
-
-
-
-
-#if defined(_IBMESA)
-    /* IBM/ESA running aix */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "ibm";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "aixESA";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "aix";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "esa";
-# endif
-#endif
-
-
-
-
-#if defined(_IBMR2)
-    /* IBM/RS6000 running aix */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "ibm";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "rs6000";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "aix";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "rs6000";
-# endif
-#endif
-
-
-
-
-#if defined(_AIXPS2)
-    /* IBM/PS2 running aix */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "ibm";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "ps2";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "aix";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-#endif
-
-
-
-
-#if defined(OREO)
-    /* Macintosh running AU/X */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "apple";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "mac2";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "aux";
-# endif
-# if (defined(mc68020)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "m68k";
-# endif
-#endif
-
-
-
-
-#if defined(u3b20d)
-    /* AT&T 3B/20 series running SVR2/3 */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "att";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "att3b20";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "u3b20";
-# endif
-#endif
-
-
-
-
-#if defined(u3b15)
-    /* AT&T 3B/15 series running SVR2/3 */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "att";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "att3b15";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "u3b15";
-# endif
-#endif
-
-
-
-
-#if defined(u3b5)
-    /* AT&T 3B/5 series running SVR2/3 */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "att";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "att3b5";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "u3b5";
-# endif
-#endif
-
-
-
-
-#if defined(u3b2)
-    /* AT&T 3B/2 series running SVR2/3 */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "att";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "att3b2";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "u3b2";
-# endif
-#endif
-
-
-
-
-#if defined(UNIXPC)
-    /* AT&T UnixPC att3b1/att7300 */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "att";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "unixpc";
-# endif
-# if (defined(u3b1)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "u3b1";
-# endif
-# if (defined(att7300)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "att7300";
-# endif
-#endif
-
-
-
-
-#if defined(_MINIX)
-    /* Andy Tanenbaum's minix */
-# if (defined(M_i386)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "intel";
-# endif
-# if (defined(M_i386)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "minix386";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "minix";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "minix";
-# endif
-# if (defined(M_i386)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-#endif
-
-
-
-
-#if defined(linux)
-    /* Linus Torvalds's linux */
-# if (defined(M_intel)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "intel";
-# endif
-# if (defined(M_i586)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "i586-linux";
-# endif
-# if (defined(M_i486)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "i486-linux";
-# endif
-# if (defined(M_i386)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "i386-linux";
-# endif
-# if (!defined(PPC)) && !defined(_ostype_)
-# define _ostype_
-    ostype = "linux";
-# endif
-# if (defined(PPC)) && !defined(_ostype_)
-# define _ostype_
-    ostype = "mklinux";
-# endif
-# if (defined(M_i586)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i586";
-# endif
-# if (defined(M_i486)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i486";
-# endif
-# if (defined(M_i386)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-# if (defined(__alpha)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "dec";
-# endif
-# if (defined(PPC)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "apple";
-# endif
-# if (defined(__alpha)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "alpha";
-# endif
-# if (defined(PPC)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "powerpc";
-# endif
-# if (defined(__alpha)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "alpha";
-# endif
-# if (defined(PPC)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "powerpc";
-# endif
-#endif
-
-
-
-
-#if defined(__EMX__)
-    /* OS/2 EMX [unix emulation under OS/2] */
-# if (defined(M_intel)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "intel";
-# endif
-# if (defined(M_i386)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "i386-emx";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "os2";
-# endif
-# if (defined(M_i386)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-#endif
-
-
-
-
-#if defined(__NetBSD__)
-    /* NetBSD */
-# if (defined(arm32)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "acorn";
-# endif
-# if (defined(alpha)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "digital";
-# endif
-# if (defined(amiga)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "commodore";
-# endif
-# if (defined(atari)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "atari";
-# endif
-# if (defined(hp300)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "hp";
-# endif
-# if (defined(M_intel)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "intel";
-# endif
-# if (defined(m68k)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "motorola";
-# endif
-# if (defined(mac68k)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "apple";
-# endif
-# if (defined(pc532)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "national-semi";
-# endif
-# if (defined(pmax)	|| defined(mips)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "dec";
-# endif
-# if (defined(M_mipsel)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "dec";
-# endif
-# if (defined(sparc)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "sun";
-# endif
-# if (defined(sun3)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "sun";
-# endif
-# if (defined(vax)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "digital";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "NetBSD";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "NetBSD";
-# endif
-# if (defined(arm32)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "arm32";
-# endif
-# if (defined(sparc)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "sparc";
-# endif
-# if (defined(mc68020)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "m68k";
-# endif
-# if (defined(M_i386)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-# if (defined(M_mipsel)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "mipsel";
-# endif
-# if (defined(M_mipseb)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "mipseb";
-# endif
-# if (defined(mips)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "mips";
-# endif
-# if (defined(pc532)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "pc532";
-# endif
-# if (defined(vax)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "vax";
-# endif
-# if (defined(alpha)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "alpha";
-# endif
-#endif
-
-
-
-
-#if defined(__FreeBSD__)
-    /* FreeBSD */
-# if (defined(__alpha)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "digital";
-# endif
-# if (defined(M_intel)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "intel";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "FreeBSD";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "FreeBSD";
-# endif
-# if (defined(__alpha)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "alpha";
-# endif
-# if (defined(M_i386)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-#endif
-
-
-
-
-#if defined(__386BSD__)
-    /* Bill Jolitz's 386BSD */
-# if (defined(M_intel)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "intel";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "386BSD";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "386BSD";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-#endif
-
-
-
-
-#if defined(bsdi)
-    /* BSDI's unix */
-# if (defined(M_intel)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "intel";
-# endif
-# if (defined(sparc)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "sun";
-# endif
-# if (defined(__powerpc__)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "motorola";
-# endif
-# if (defined(M_intel)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "bsd386";
-# endif
-# if (defined(sparc)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "bsd-sparc";
-# endif
-# if (defined(__powerpc__)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "bsd-powerpc";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "bsdi";
-# endif
-# if (defined(M_i386)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-# if (defined(sparc)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "sparc";
-# endif
-# if (defined(__powerpc__)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "powerpc";
-# endif
-#endif
-
-
-
-
-#if defined(COHERENT)
-    /* COHERENT's unix */
-# if (defined(_I386)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "intel";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "coh386";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "coherent";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "coherent";
-# endif
-# if (defined(_I386)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-#endif
-
-
-
-#if defined(SCO)
-    /* SCO UNIX System V/386 Release 3.2 */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "sco";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "sco386";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "sco_unix";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-#endif
-
-
-
-#if defined(M_XENIX) && !defined(M_UNIX)
-    /* SCO XENIX */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "sco";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "sco_xenix";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "sco_xenix";
-# endif
-# if (defined(M_I386)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-# if (defined(M_I286)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i286";
-# endif
-#endif
-
-
-
-
-#if defined(ISC) || defined(ISC202)
-    /* Interactive Unix */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "isc";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "isc386";
-# endif
-# if (defined(POSIX)) && !defined(_ostype_)
-# define _ostype_
-    ostype = "POSIX";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "SVR3";
-# endif
-# if (defined(M_i386)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-#endif
-
-
-
-
-#if defined(INTEL)
-    /* Intel Unix */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "intel";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "intel386";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "intel_unix";
-# endif
-# if (defined(M_i386)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-#endif
-
-
-
-
-#if defined(MACH)
-    /* cmu's mach */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "cmu";
-# endif
-# if (defined(M_i386)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "i386-mach";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "mach";
-# endif
-# if (defined(M_i386)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-#endif
-
-
-
-
-#if defined(alliant)
-    /* Alliants FSX */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "alliant";
-# endif
-# if (defined(mc68000)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "alliant-fx80";
-# endif
-# if (defined(i860)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "alliant-fx2800";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "alliant";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "fsx";
-# endif
-# if (defined(mc68000)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "mc68000";
-# endif
-# if (defined(i860)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i860";
-# endif
-#endif
-
-
-
-
-#if defined(_FTX)
-    /* Stratus Computer, Inc FTX2 (i860 based) */
-    /* Stratus Computer, Inc FTX3 (HPPA based) */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "stratus";
-# endif
-# if (defined(i860) && defined(_FTX)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "atlantic";
-# endif
-# if (defined(__hppa) && defined(_FTX)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "continuum";
-# endif
-# if (defined(i860) && defined(_FTX)) && !defined(_ostype_)
-# define _ostype_
-    ostype = "ftx2";
-# endif
-# if (defined(__hppa) && defined(_FTX)) && !defined(_ostype_)
-# define _ostype_
-    ostype = "ftx3";
-# endif
-# if (defined(i860)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i860";
-# endif
-# if (defined(__hppa)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "hppa";
-# endif
-#endif
-
-
-
-
-#if defined(sequent) || defined(_SEQUENT_)
-    /* Sequent Balance (32000 based) */
-    /* Sequent Symmetry running DYNIX/ptx (386/486 based) */
-    /* Sequent Symmetry running DYNIX 3 (386/486 based) */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "sequent";
-# endif
-# if (defined(M_i386) && defined(sequent)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "symmetry";
-# endif
-# if (defined(M_i386)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "ptx";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "balance";
-# endif
-# if (defined(M_i386) && !defined(sequent)) && !defined(_ostype_)
-# define _ostype_
-    ostype = "ptx";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "dynix3";
-# endif
-# if (defined(M_i386)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-# if (defined(ns32000)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "ns32000";
-# endif
-#endif
-
-
-
-
-#if defined(ns32000)
-    /* Encore Computer Corp. Multimax (32000 based) */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "encore";
-# endif
-# if (defined(CMUCS)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "multimax";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = isamultimax(0);
-# endif
-# if (defined(CMUCS)) && !defined(_ostype_)
-# define _ostype_
-    ostype = "mach";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = isamultimax(1);
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "ns32000";
-# endif
-#endif
-
-
-
-
-#if defined(iconuxv)
-    /* Icon 88k running Unix */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "icon";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "icon";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "iconuxv";
-# endif
-# if (defined(m88k) || defined(__m88k__)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "m88k";
-# endif
-#endif
-
-
-
-
-#if defined(_CRAY) && defined(_CRAYCOM)
-    /* Cray Computer Corp. running CSOS */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "ccc";
-# endif
-# if (defined(_CRAY2)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "cray";
-# endif
-# if (defined(_CRAY3)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "cray";
-# endif
-# if (defined(_CRAY4)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "cray";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "CSOS";
-# endif
-# if (defined(_CRAY2)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "cray2";
-# endif
-# if (defined(_CRAY3)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "cray3";
-# endif
-# if (defined(_CRAY4)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "cray4";
-# endif
-#endif
-
-
-
-
-#if defined(cray) && !defined(_CRAYMPP)
-    /* Cray Research Inc. PVP running UNICOS */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "cri";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = getcray();
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "unicos";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = getcray();
-# endif
-#endif
-
-
-
-
-#if defined(cray) && defined(_CRAYT3D)
-    /* Cray Research Inc. running UNICOS MAX */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "cri";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = getcray();
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "unicosmax";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = getcray();
-# endif
-#endif
-
-
-
-
-#if defined(cray) && defined(_CRAYT3E)
-    /* Cray Research Inc. running UNICOS/mk */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "cri";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = getcray();
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "unicosmk";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = getcray();
-# endif
-#endif
-
-
-
-
-#if defined(convex)
-    /* Convex */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "convex";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "convex";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "convexos";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = getconvex();
-# endif
-#endif
-
-
-
-
-#if defined(butterfly)
-    /* BBN Butterfly 1000 */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "bbn";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "butterfly";
-# endif
-# if (defined(mc68020) || defined(__mc68020__)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "m68k";
-# endif
-#endif
-
-
-
-
-#if defined(NeXT)
-    /* NeXTStep */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "next";
-# endif
-# if (defined(mc68020) || defined(__mc68020__)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "next";
-# endif
-# if (defined(M_i386)  || defined(__i386__)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "intel-pc";
-# endif
-# if (defined(hppa)    || defined(__hppa__)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "hp";
-# endif
-# if (defined(sparc)   || defined(__sparc__)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "sun";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "nextstep";
-# endif
-# if (defined(mc68020) || defined(__mc68020__)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "m68k";
-# endif
-# if (defined(M_i386)  || defined(__i386__)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-# if (defined(hppa)    || defined(__hppa__)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "hppa";
-# endif
-# if (defined(sparc)   || defined(__sparc__)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "sparc";
-# endif
-#endif
-
-
-
-
-#if defined(__APPLE__)
-    /* Rhapsody */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "apple";
-# endif
-# if (defined(__i386__)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "intel-pc";
-# endif
-# if (defined(__ppc__)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "macintosh";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "rhapsody";
-# endif
-# if (defined(__i386__)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-# if (defined(__ppc__)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "powerpc";
-# endif
-#endif
-
-
-
-
-#if defined(sony_news)
-    /* Sony NEWS 800 or 1700 workstation */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "sony";
-# endif
-# if (defined(mips)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "news_mips";
-# endif
-# if (defined(mc68020) || defined(__mc68020__)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "news_m68k";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "News";
-# endif
-# if (defined(mc68020) || defined(__mc68020__)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "m68k";
-# endif
-# if (defined(M_mipsel)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "mipsel";
-# endif
-# if (defined(M_mipseb)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "mipseb";
-# endif
-#endif
-
-
-
-
-#if defined(sgi)
-    /* Silicon Graphics */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "sgi";
-# endif
-# if (defined(M_mipsel)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "iris4d";
-# endif
-# if (defined(M_mipseb)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "iris4d";
-# endif
-# if (defined(mc68000)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "iris3d";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "irix";
-# endif
-# if (defined(M_mipsel)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "mipsel";
-# endif
-# if (defined(M_mipseb)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "mipseb";
-# endif
-# if (defined(mc68000)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "mc68000";
-# endif
-#endif
-
-
-
-
-#if defined(ultrix) || defined(__ultrix)
-    /* Digital's Ultrix */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "dec";
-# endif
-# if (defined(M_mipsel)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "decstation";
-# endif
-# if (defined(M_mipseb)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "decmips";
-# endif
-# if (defined(vax) || defined(__vax)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "vax";
-# endif
-# if (defined(__vax__)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "vax";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "ultrix";
-# endif
-# if (defined(M_mipsel)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "mipsel";
-# endif
-# if (defined(M_mipseb)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "mipseb";
-# endif
-# if (defined(vax) || defined (__vax)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "vax";
-# endif
-# if (defined(__vax__)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "vax";
-# endif
-#endif
-
-
-
-
-#if defined(MIPS)
-    /* Mips OS */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "mips";
-# endif
-# if (defined(M_mipsel)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "mips";
-# endif
-# if (defined(M_mipseb)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "mips";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "mips";
-# endif
-# if (defined(M_mipsel)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "mipsel";
-# endif
-# if (defined(M_mipseb)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "mipseb";
-# endif
-#endif
-
-
-
-
-#if defined(DECOSF1)
-    /* Digital's alpha running osf1 */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "dec";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "osf1";
-# endif
-# if (defined(__alpha)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "alpha";
-# endif
-# if (defined(__alpha)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "alpha";
-# endif
-#endif
-
-
-
-
-#if defined(Lynx)
-    /* Lynx OS 2.1 */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "Lynx";
-# endif
-# if (defined(M_mipsel)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "lynxos-mips";
-# endif
-# if (defined(M_mipseb)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "lynxos-mips";
-# endif
-# if (defined(M_i386)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "lynxos-i386";
-# endif
-# if (defined(i860) || defined(__i860__)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "lynxos-i860";
-# endif
-# if (defined(m68k)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "lynxos-m68k";
-# endif
-# if (defined(m88k)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "lynxos-m88k";
-# endif
-# if (defined(sparc)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "lynxos-sparc";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "lynxos-unknown";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "LynxOS";
-# endif
-# if (defined(M_mipsel)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "mipsel";
-# endif
-# if (defined(M_mipseb)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "mipseb";
-# endif
-# if (defined(M_i386)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-# if (defined(i860) || defined(__i860__)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i860";
-# endif
-# if (defined(m68k)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "m68k";
-# endif
-# if (defined(m88k)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "m88k";
-# endif
-# if (defined(sparc)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "sparc";
-# endif
-#endif
-
-
-
-
-#if defined(masscomp)
-    /* Masscomp */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "masscomp";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "masscomp";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "masscomp";
-# endif
-#endif
-
-
-
-#if defined(__MACHTEN__)
-    /* Machintosh */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "Tenon";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "Macintosh";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "MachTen";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "Macintosh";
-# endif
-#endif
-
-
-
-
-
-#if defined(GOULD_NP1)
-    /* Gould */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "gould";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "gould_np1";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "gould";
-# endif
-#endif
-
-
-
-
-#if defined(MULTIFLOW)
-    /* Multiflow running 4.3BSD */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "multiflow";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "multiflow";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "multiflow";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "bsd43";
-# endif
-#endif
-
-
-
-
-#if defined(SXA)
-    /* PFU/Fujitsu A-xx computer */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "sxa";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "pfa50";
-# endif
-# if (defined(_BSDX_)) && !defined(_ostype_)
-# define _ostype_
-    ostype = "e60-bsdx";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "e60";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "pfa50";
-# endif
-#endif
-
-
-
-
-#if defined(titan)
-    /* (St)Ardent Titan */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "ardent";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "titan";
-# endif
-#endif
-
-
-
-
-#if defined(stellar)
-    /* Stellar */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "stellar";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "stellar";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "stellix";
-# endif
-#endif
-
-
-
-
-#if defined(atari)
-    /* Atari TT running SVR4. This machine was never */
-    /* commercially available. */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "atari";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "atari";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "asv";
-# endif
-#endif
-
-
-
-
-#if defined(OPUS)
-    /* ??? */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "opus";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "opus";
-# endif
-#endif
-
-
-
-
-#if defined(eta10)
-    /* ETA running SVR3 */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "eta";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "eta10";
-# endif
-#endif
-
-
-
-
-#if defined(hk68)
-    /* Heurikon HK68 running Uniplus+ 5.0 */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "heurikon";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "hk68";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "uniplus";
-# endif
-#endif
-
-
-
-
-#if defined(NDIX)
-    /* Norsk Data ND 500/5000 running Ndix */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "norsk";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "nd500";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "ndix";
-# endif
-#endif
-
-
-
-
-#if defined(AMIGA)
-    /* Amiga running AmigaOS+GG */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "commodore";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "amiga";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "AmigaOS";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "m68k";
-# endif
-#endif
-
-
-
-
-#if defined(uts)
-    /* Amdahl running uts 2.1 */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "amdahl";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "amdahl";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "uts";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "amdahl";
-# endif
-#endif
-
-
-
-
-#if defined(UTek)
-    /* Tektronix 4300 running UTek (BSD 4.2 / 68020 based) */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "tektronix";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "tek4300";
-# endif
-#endif
-
-
-
-
-#if defined(UTekV)
-    /* Tektronix XD88/10 running UTekV 3.2e (SVR3/88100 based) */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "tektronix";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "tekXD88";
-# endif
-#endif
-
-
-
-
-#if defined(__DGUX__)
-    /* Data-General AViiON running DGUX */
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "aviion";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "dgux";
-# endif
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "dg";
-# endif
-# if (defined(__m88k__)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "m88k";
-# endif
-# if (defined(__i386__)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "pentium";
-# endif
-#endif
-
-
-
-
-#if defined(sysV68)
-    /* Motorola MPC running System V/68 R32V2 (SVR3/68020 based) */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "motorola";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "sysV68";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "m68k";
-# endif
-#endif
-
-
-
-
-#if defined(supermax)
-    /* DDE Supermax running System V/68 R3 (SVR3/68020 based) */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "supermax";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "supermax";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "m68k";
-# endif
-#endif
-
-
-
-
-#if defined(sysV88)
-    /* Motorola MPC running System V/88 R32V2 (SVR3/88100 based) */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "motorola";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "sysV88";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "m88k";
-# endif
-#endif
-
-
-
-
-#if defined(__clipper__)
-    /* Clipper Chipset (Intergraph) */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "intergraph";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "clipper";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "clipper";
-# endif
-#endif
-
-
-
-
-#if defined(SNI) || defined(sinix)
-    /* Siemens Nixdorf Informationssysteme SINIX */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "sni";
-# endif
-# if (defined(M_intel)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "wx200i";
-# endif
-# if (defined(MIPSEB)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "rm400";
-# endif
-# if (defined(sinix)) && !defined(_ostype_)
-# define _ostype_
-    ostype = "sinix";
-# endif
-# if (defined(M_i586)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i586";
-# endif
-# if (defined(M_i486)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i486";
-# endif
-# if (defined(M_i386)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-# if (defined(M_mipsel)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "mipsel";
-# endif
-# if (defined(M_mipseb)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "mipseb";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "mips";
-# endif
-#endif
-
-
-
-#if defined(_OSD_POSIX)
-    /* Siemens Nixdorf Informationssysteme BS2000 POSIX (mainframe, EBCDIC) */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "sni";
-# endif
-# if (defined(M_intel)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "bs2000";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "posix";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "bs2000";
-# endif
-#endif
-
-
-
-#if defined(_SX)
-    /* NEC Corporation (SX-4) */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "nec";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "superux";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "sx4";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "sx4";
-# endif
-#endif
-
-
-
-#if !defined(SOLARIS2) && (SYSVREL == 4)
-    /* Unix System V Release 4.0 */
-# if (defined(DELL)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "dell";
-# endif
-# if (defined(M_i386)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "i386";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "svr4";
-# endif
-# if (defined(M_i386)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-#endif
-
-
-
-#if defined(__uxp__) || defined(__uxps__)
-    /* FUJITSU DS/90 7000 */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "fujitsu";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "ds90";
-# endif
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "sysv4";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "sparc";
-# endif
-#endif
-
-
-
-#if defined(_UWIN)
-    /* AT&T Research Unix for Windows */
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "att";
-# endif
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "win32.i386";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-#endif
-
-
-
-
-#if defined(mc68000) || defined(__mc68000__) || defined(mc68k32) || defined(m68k) || defined(mc68010) || defined(mc68020)
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "m68k";
-# endif
-# if (defined(m68k)) && !defined(_vendor_)
-# define _vendor_
-    vendor = "motorola";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "m68k";
-# endif
-#endif
-
-
-
-
-#if defined(m88k) || defined(__m88k__)
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "m88k";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "m88k";
-# endif
-#endif
-
-
-
-
-#if defined(M_intel)
-# if (defined(M_i586)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "i586";
-# endif
-# if (defined(M_i486)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "i486";
-# endif
-# if (defined(M_i386)) && !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "i386";
-# endif
-# if !defined(_vendor_)
-# define _vendor_
-    vendor = "intel";
-# endif
-# if (defined(M_i586)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i586";
-# endif
-# if (defined(M_i486)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i486";
-# endif
-# if (defined(M_i386)) && !defined(_machtype_)
-# define _machtype_
-    machtype = "i386";
-# endif
-#endif
-
-
-
-
-#if defined(sparc) || defined(__sparc__)
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "sparc";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "sparc";
-# endif
-#endif
-
-
-
-
-#if defined(i860) || defined(__i860__)
-# if !defined(_hosttype_)
-# define _hosttype_
-    hosttype = "i860";
-# endif
-# if !defined(_machtype_)
-# define _machtype_
-    machtype = "i860";
-# endif
-#endif
-
-
-
-
-#if defined(osf1)
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "osf1";
-# endif
-#endif
-
-
-
-
-#if SYSVREL == 0
-# if (defined(BSD4_4)) && !defined(_ostype_)
-# define _ostype_
-    ostype = "bsd44";
-# endif
-# if (defined(BSD)) && !defined(_ostype_)
-# define _ostype_
-    ostype = "bsd";
-# endif
-# if (defined(POSIX)) && !defined(_ostype_)
-# define _ostype_
-    ostype = "posix";
-# endif
-# if (defined(unix) || defined(__unix__)) && !defined(_ostype_)
-# define _ostype_
-    ostype = "unix";
-# endif
-#endif
-
-
-
-
-#if SYSVREL == 1
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "svr1";
-# endif
-#endif
-
-
-
-
-#if SYSVREL == 2
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "svr2";
-# endif
-#endif
-
-
-
-
-#if SYSVREL == 3
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "svr3";
-# endif
-#endif
-
-
-
-
-#if SYSVREL == 4
-# if !defined(_ostype_)
-# define _ostype_
-    ostype = "svr4";
-# endif
-#endif
-
-
-#ifndef _hosttype_
-    hosttype = "unknown";
-#endif
-#ifndef _ostype_
-    ostype = "unknown";
-#endif
-#ifndef _vendor_
-    vendor = "unknown";
-#endif
-#ifndef _machtype_
-    machtype = "unknown";
-#endif
-    tsetenv(STRHOSTTYPE, str2short(hosttype));
-    tsetenv(STRVENDOR,   str2short(vendor));
-    tsetenv(STROSTYPE,   str2short(ostype));
-    tsetenv(STRMACHTYPE, str2short(machtype));
-} /* end setmachine */