diff options
author | mp <mp@FreeBSD.org> | 2012-02-22 03:36:15 +0000 |
---|---|---|
committer | mp <mp@FreeBSD.org> | 2012-02-22 03:36:15 +0000 |
commit | 3ee51a00f36c11a6172d08d787943dfc63f66110 (patch) | |
tree | 522fd2d4d27770566e466a79d636194e5743d94a /bin | |
parent | d177303078ee8f6069218009d6c3c2b6d9d9ca97 (diff) | |
parent | 54c5644df8eb87e7a5b1c4c411e349ac329ee04b (diff) | |
download | FreeBSD-src-3ee51a00f36c11a6172d08d787943dfc63f66110.zip FreeBSD-src-3ee51a00f36c11a6172d08d787943dfc63f66110.tar.gz |
Update to tcsh 6.18.01.
Diffstat (limited to 'bin')
-rw-r--r-- | bin/csh/Makefile | 6 | ||||
-rw-r--r-- | bin/csh/config.h | 81 | ||||
-rw-r--r-- | bin/csh/config_p.h | 3 | ||||
-rw-r--r-- | bin/csh/host.defs | 1140 |
4 files changed, 61 insertions, 1169 deletions
diff --git a/bin/csh/Makefile b/bin/csh/Makefile index b63d705..1fa24a1 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -18,7 +18,7 @@ DFLAGS= -D_PATH_TCSHELL='"/rescue/${PROG}"' DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"' .endif CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS} -WARNS?= 0 +WARNS?= 1 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 \ @@ -116,10 +116,10 @@ gethost: gethost.c sh.err.h tc.const.h sh.h ${CC} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \ ${TCSHDIR}/gethost.c -tc.defs.c: gethost ${.CURDIR}/host.defs +tc.defs.c: gethost ${TCSHDIR}/host.defs @rm -f ${.TARGET} @echo "/* Do not edit this file, make creates it */" > ${.TARGET} - ./gethost ${.CURDIR}/host.defs >> ${.TARGET} + ./gethost ${TCSHDIR}/host.defs >> ${.TARGET} ed.defns.h: ed.defns.c @rm -f ${.TARGET} diff --git a/bin/csh/config.h b/bin/csh/config.h index 60b229d..99f7d0b 100644 --- a/bin/csh/config.h +++ b/bin/csh/config.h @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* config.h. Generated by configure. */ +/* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ /* Define to the type of elements in the array set by `getgroups'. Usually @@ -12,9 +12,6 @@ /* Define to 1 if you have the <auth.h> header file. */ /* #undef HAVE_AUTH_H */ -/* Define to 1 if you have the `catgets' function. */ -#define HAVE_CATGETS 1 - /* Define to 1 if you have the <crypt.h> header file. */ /* #undef HAVE_CRYPT_H */ @@ -41,6 +38,9 @@ /* Define to 1 if you have the `dup2' function. */ #define HAVE_DUP2 1 +/* Define to 1 if you have the <features.h> header file. */ +/* #undef HAVE_FEATURES_H */ + /* Define to 1 if you have the `getauthid' function. */ /* #undef HAVE_GETAUTHID */ @@ -54,9 +54,12 @@ #define HAVE_GETPWENT 1 /* Define to 1 if you have the `getutent' function. */ -#define HAVE_GETUTENT 1 +/* #undef HAVE_GETUTENT */ -/* Define if you have the iconv() function. */ +/* Define to 1 if you have the `getutxent' function. */ +#define HAVE_GETUTXENT 1 + +/* Define if you have the iconv() function and it works. */ /* #undef HAVE_ICONV */ /* Define to 1 if you have the <inttypes.h> header file. */ @@ -65,6 +68,9 @@ /* Define to 1 if the system has the type `long long'. */ #define HAVE_LONG_LONG 1 +/* Define to 1 if you have the `mallinfo' function. */ +/* #undef HAVE_MALLINFO */ + /* Define to 1 if mbrtowc and mbstate_t are properly declared. */ #define HAVE_MBRTOWC 1 @@ -77,6 +83,9 @@ /* Define to 1 if you have the `memset' function. */ #define HAVE_MEMSET 1 +/* Define to 1 if you have the `mkstemp' function. */ +#define HAVE_MKSTEMP 1 + /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ /* #undef HAVE_NDIR_H */ @@ -86,6 +95,9 @@ /* Define to 1 if you have the `nl_langinfo' function. */ #define HAVE_NL_LANGINFO 1 +/* Define to 1 if you have the <paths.h> header file. */ +#define HAVE_PATHS_H 1 + /* Define to 1 if you have the `sbrk' function. */ #define HAVE_SBRK 1 @@ -120,22 +132,34 @@ /* Define to 1 if you have the `strstr' function. */ #define HAVE_STRSTR 1 -/* Define to 1 if `d_ino' is member of `struct dirent'. */ +/* Define to 1 if `d_ino' is a member of `struct dirent'. */ #define HAVE_STRUCT_DIRENT_D_INO 1 -/* Define to 1 if `ss_family' is member of `struct sockaddr_storage'. */ +/* Define to 1 if `ss_family' is a member of `struct sockaddr_storage'. */ #define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1 -/* Define to 1 if `ut_host' is member of `struct utmp'. */ +/* Define to 1 if `ut_host' is a member of `struct utmpx'. */ +#define HAVE_STRUCT_UTMPX_UT_HOST 1 + +/* Define to 1 if `ut_tv' is a member of `struct utmpx'. */ +#define HAVE_STRUCT_UTMPX_UT_TV 1 + +/* Define to 1 if `ut_user' is a member of `struct utmpx'. */ +#define HAVE_STRUCT_UTMPX_UT_USER 1 + +/* Define to 1 if `ut_xtime' is a member of `struct utmpx'. */ +/* #undef HAVE_STRUCT_UTMPX_UT_XTIME */ + +/* Define to 1 if `ut_host' is a member of `struct utmp'. */ #define HAVE_STRUCT_UTMP_UT_HOST 1 -/* Define to 1 if `ut_tv' is member of `struct utmp'. */ +/* Define to 1 if `ut_tv' is a member of `struct utmp'. */ #define HAVE_STRUCT_UTMP_UT_TV 1 -/* Define to 1 if `ut_user' is member of `struct utmp'. */ +/* Define to 1 if `ut_user' is a member of `struct utmp'. */ #define HAVE_STRUCT_UTMP_UT_USER 1 -/* Define to 1 if `ut_xtime' is member of `struct utmp'. */ +/* Define to 1 if `ut_xtime' is a member of `struct utmp'. */ /* #undef HAVE_STRUCT_UTMP_UT_XTIME */ /* Define to 1 if you have the `sysconf' function. */ @@ -179,25 +203,31 @@ /* Support NLS. */ #define NLS 1 +/* Support NLS catalogs. */ +#define NLS_CATALOGS 1 + /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" +#define PACKAGE_BUGREPORT "http://bugs.gw.com/" /* Define to the full name of this package. */ -#define PACKAGE_NAME "" +#define PACKAGE_NAME "tcsh" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" +#define PACKAGE_STRING "tcsh 6.18.01" /* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" +#define PACKAGE_TARNAME "tcsh" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "" +#define PACKAGE_VERSION "6.18.01" /* Define to 1 if the `setpgrp' function takes no argument. */ /* #undef SETPGRP_VOID */ -/* The size of a `wchar_t', as computed by sizeof. */ +/* The size of `wchar_t', as computed by sizeof. */ #define SIZEOF_WCHAR_T 4 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ @@ -206,6 +236,11 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 +/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>, + <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT32_T */ + /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ @@ -215,7 +250,7 @@ /* Define to `int' if <sys/types.h> does not define. */ /* #undef mode_t */ -/* Define to `unsigned' if <sys/types.h> does not define. */ +/* Define to `unsigned int' if <sys/types.h> does not define. */ /* #undef size_t */ /* Define to `int' if neither <sys/types.h> nor <sys/socket.h> define. */ @@ -227,6 +262,10 @@ /* Define to `int' if <sys/types.h> doesn't define. */ /* #undef uid_t */ +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint32_t */ + /* Define to empty if the keyword `volatile' does not work. Warning: valid code using `volatile' can become incorrect without. Disable with care. */ /* #undef volatile */ @@ -234,9 +273,5 @@ #include "config_p.h" #include "config_f.h" -#ifndef NO_NLS_CATALOGS -#define NLS_CATALOGS -#endif - /* Work around a vendor issue where config_f.h is #undef'ing this setting */ #define SYSMALLOC diff --git a/bin/csh/config_p.h b/bin/csh/config_p.h index 72e3042..a1bbea6 100644 --- a/bin/csh/config_p.h +++ b/bin/csh/config_p.h @@ -106,9 +106,6 @@ #elif defined(__APPLE__) # define SYSMALLOC - -#else -# define NLS_CATALOGS #endif #endif /* _h_config */ diff --git a/bin/csh/host.defs b/bin/csh/host.defs deleted file mode 100644 index 5eb251a..0000000 --- a/bin/csh/host.defs +++ /dev/null @@ -1,1140 +0,0 @@ -newcode : -/* $Header: /src/pub/tcsh/host.defs,v 1.31 2001/06/10 02:19:11 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. - * 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.31 2001/06/10 02:19:11 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) : "dec" -vendor : defined(mips) : "mips" -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(concurrent) -comment : Concurrent PowerHawk -vendor : : "concurrent" -hosttype: : "powerhawk" -ostype : : "powermax_os" -machtype: : "powerhawk" -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 : |