diff -ru bash-2.04/Makefile.in bash-2.04-mpe/Makefile.in --- bash-2.04/Makefile.in Wed Mar 1 11:52:12 2000 +++ bash-2.04-mpe/Makefile.in Fri Mar 30 08:42:34 2001 @@ -449,7 +449,7 @@ version.h: $(SOURCES) config.h Makefile $(SHELL) $(SUPPORT_SRC)mkversion.sh -b -s $(RELSTATUS) -d $(Version) -p $(PatchLevel) -o newversion.h \ - && mv newversion.h version.h + && mv -f newversion.h version.h # old rules GRAM_H = parser-built @@ -669,7 +669,7 @@ @-test -d tests || mkdir tests @cp $(TESTS_SUPPORT) tests @( cd $(srcdir)/tests && \ - PATH=$$PATH:$(BUILD_DIR)/tests THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} ) + export PATH=$$PATH:$(BUILD_DIR)/tests && THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} ) symlinks: $(SHELL) $(SUPPORT_SRC)fixlinks -s $(srcdir) diff -ru bash-2.04/builtins/Makefile.in bash-2.04-mpe/builtins/Makefile.in --- bash-2.04/builtins/Makefile.in Wed Jan 19 13:37:20 2000 +++ bash-2.04-mpe/builtins/Makefile.in Thu Mar 29 16:22:20 2001 @@ -118,12 +118,12 @@ ./$(MKBUILTINS) -externfile builtext.h -structfile builtins.c \ -noproduction $(DIRECTDEFINE) $(DEFSRC) @-if cmp -s old-builtext.h builtext.h 2>/dev/null; then \ - mv old-builtext.h builtext.h; \ + mv -f old-builtext.h builtext.h; \ else \ $(RM) old-builtext.h; \ fi @-if cmp -s old-builtins.c builtins.c 2>/dev/null; then \ - mv old-builtins.c builtins.c; \ + mv -f old-builtins.c builtins.c; \ else \ $(RM) old-builtins.c; \ fi diff -ru bash-2.04/builtins/cd.def bash-2.04-mpe/builtins/cd.def --- bash-2.04/builtins/cd.def Mon Nov 29 09:13:38 1999 +++ bash-2.04-mpe/builtins/cd.def Fri Mar 30 10:01:13 2001 @@ -32,7 +32,7 @@ #include "../bashtypes.h" #include "posixdir.h" #include "posixstat.h" -#ifndef _MINIX +#if !defined(_MINIX) && defined(HAVE_SYS_PARAM_H) #include #endif diff -ru bash-2.04/builtins/fc.def bash-2.04-mpe/builtins/fc.def --- bash-2.04/builtins/fc.def Thu Aug 5 04:42:12 1999 +++ bash-2.04-mpe/builtins/fc.def Fri Mar 30 10:04:04 2001 @@ -49,12 +49,12 @@ #include #if defined (HISTORY) -#ifndef _MINIX +#if !defined(_MINIX) && defined(HAVE_SYS_PARAM_H) # include #endif #include "../bashtypes.h" #include "posixstat.h" -#ifndef _MINIX +#if !defined(_MINIX) && defined(HAVE_SYS_FILE_H) # include #endif diff -ru bash-2.04/builtins/history.def bash-2.04-mpe/builtins/history.def --- bash-2.04/builtins/history.def Thu Aug 5 04:42:51 1999 +++ bash-2.04-mpe/builtins/history.def Fri Mar 30 10:05:27 2001 @@ -47,7 +47,7 @@ #if defined (HISTORY) #include "../bashtypes.h" -#ifndef _MINIX +#if !defined(_MINIX) && defined(HAVE_SYS_FILE_H) # include #endif #include "posixstat.h" diff -ru bash-2.04/builtins/mkbuiltins.c bash-2.04-mpe/builtins/mkbuiltins.c --- bash-2.04/builtins/mkbuiltins.c Thu Aug 5 05:42:54 1999 +++ bash-2.04-mpe/builtins/mkbuiltins.c Fri Mar 30 09:46:24 2001 @@ -30,7 +30,9 @@ #ifndef _MINIX #include "../bashtypes.h" +#ifdef HAVE_SYS_FILE_H #include +#endif #endif #include "posixstat.h" diff -ru bash-2.04/builtins/pushd.def bash-2.04-mpe/builtins/pushd.def --- bash-2.04/builtins/pushd.def Thu Aug 5 04:43:50 1999 +++ bash-2.04-mpe/builtins/pushd.def Fri Mar 30 10:06:25 2001 @@ -95,7 +95,7 @@ #if defined (PUSHD_AND_POPD) #include -#ifndef _MINIX +#if !defined(_MINIX) && defined(HAVE_SYS_PARAM_H) # include #endif diff -ru bash-2.04/builtins/source.def bash-2.04-mpe/builtins/source.def --- bash-2.04/builtins/source.def Thu Aug 5 04:44:52 1999 +++ bash-2.04-mpe/builtins/source.def Fri Mar 30 10:07:36 2001 @@ -41,7 +41,7 @@ #include "../bashtypes.h" #include "posixstat.h" #include "filecntl.h" -#ifndef _MINIX +#if !defined(_MINIX) && defined(HAVE_SYS_FILE_H) # include #endif #include diff -ru bash-2.04/builtins/ulimit.def bash-2.04-mpe/builtins/ulimit.def --- bash-2.04/builtins/ulimit.def Mon Jan 24 07:47:38 2000 +++ bash-2.04-mpe/builtins/ulimit.def Fri Mar 30 10:08:54 2001 @@ -57,7 +57,7 @@ #include #include "../bashtypes.h" -#ifndef _MINIX +#if !defined(_MINIX) && defined(HAVE_SYS_PARAM_H) # include #endif diff -ru bash-2.04/builtins/umask.def bash-2.04-mpe/builtins/umask.def --- bash-2.04/builtins/umask.def Tue Feb 22 09:26:55 2000 +++ bash-2.04-mpe/builtins/umask.def Fri Mar 30 10:09:49 2001 @@ -37,7 +37,7 @@ #include "../bashtypes.h" #include "filecntl.h" -#ifndef _MINIX +#if !defined(_MINIX) && defined(HAVE_SYS_FILE_H) # include #endif Only in bash-2.04-mpe: configure.mpe diff -ru bash-2.04/execute_cmd.c bash-2.04-mpe/execute_cmd.c --- bash-2.04/execute_cmd.c Tue Jan 25 08:29:11 2000 +++ bash-2.04-mpe/execute_cmd.c Fri Mar 30 09:51:40 2001 @@ -26,13 +26,13 @@ #include #include #include "bashtypes.h" -#ifndef _MINIX +#if !defined(_MINIX) && defined(HAVE_SYS_FILE_H) # include #endif #include "filecntl.h" #include "posixstat.h" #include -#ifndef _MINIX +#if !defined(_MINIX) && defined(HAVE_SYS_PARAM_H) # include #endif diff -ru bash-2.04/findcmd.c bash-2.04-mpe/findcmd.c --- bash-2.04/findcmd.c Mon Nov 29 09:33:31 1999 +++ bash-2.04-mpe/findcmd.c Fri Mar 30 09:58:46 2001 @@ -24,7 +24,7 @@ #include #include #include "bashtypes.h" -#ifndef _MINIX +#if !defined(_MINIX) && defined(HAVE_SYS_FILE_H) # include #endif #include "filecntl.h" diff -ru bash-2.04/general.c bash-2.04-mpe/general.c --- bash-2.04/general.c Mon Nov 29 11:20:29 1999 +++ bash-2.04-mpe/general.c Fri Mar 30 09:49:26 2001 @@ -21,7 +21,7 @@ #include "config.h" #include "bashtypes.h" -#ifndef _MINIX +#if !defined(_MINIX) && defined(HAVE_SYS_PARAM_H) # include #endif #include "posixstat.h" diff -ru bash-2.04/input.c bash-2.04-mpe/input.c --- bash-2.04/input.c Tue Feb 22 10:04:00 2000 +++ bash-2.04-mpe/input.c Fri Mar 30 09:56:57 2001 @@ -21,7 +21,7 @@ #include "config.h" #include "bashtypes.h" -#ifndef _MINIX +#if !defined(_MINIX) && defined(HAVE_SYS_FILE_H) # include #endif #include "filecntl.h" diff -ru bash-2.04/jobs.c bash-2.04-mpe/jobs.c --- bash-2.04/jobs.c Fri Feb 25 08:11:11 2000 +++ bash-2.04-mpe/jobs.c Fri Mar 30 09:54:09 2001 @@ -41,10 +41,14 @@ # include #endif /* !_POSIX_VERSION && HAVE_SYS_RESOURCE_H && HAVE_WAIT3 && !RLIMTYPE */ +#ifdef HAVE_SYS_FILE_H #include +#endif #include "filecntl.h" #include +#ifdef HAVE_SYS_PARAM_H #include +#endif #if defined (BUFFERED_INPUT) # include "input.h" @@ -2750,7 +2754,9 @@ { setpgid (0, original_pgrp); /* XXX */ shell_pgrp = original_pgrp; /* XXX */ +#ifndef mpeix job_control = 0; /* XXX */ +#endif } } } diff -ru bash-2.04/lib/glob/glob.c bash-2.04-mpe/lib/glob/glob.c --- bash-2.04/lib/glob/glob.c Mon Feb 14 12:44:54 2000 +++ bash-2.04-mpe/lib/glob/glob.c Fri Mar 30 09:27:09 2001 @@ -211,7 +211,11 @@ { struct stat finfo; +#ifdef HAVE_LSTAT + if (lstat (dir, &finfo) < 0) +#else if (stat (dir, &finfo) < 0) +#endif return (-1); if (S_ISDIR (finfo.st_mode) == 0) diff -ru bash-2.04/lib/malloc/getpagesize.h bash-2.04-mpe/lib/malloc/getpagesize.h --- bash-2.04/lib/malloc/getpagesize.h Thu Aug 5 04:57:46 1999 +++ bash-2.04-mpe/lib/malloc/getpagesize.h Fri Mar 30 10:17:57 2001 @@ -30,7 +30,7 @@ #endif #if !defined (getpagesize) -# ifndef _MINIX +# if !defined (_MINIX) && defined (HAVE_SYS_PARAM_H) # include # endif # if defined (PAGESIZE) Only in bash-2.04/lib/readline/doc: Makefile diff -ru bash-2.04/lib/readline/histfile.c bash-2.04-mpe/lib/readline/histfile.c --- bash-2.04/lib/readline/histfile.c Thu Aug 5 05:04:04 1999 +++ bash-2.04-mpe/lib/readline/histfile.c Fri Mar 30 10:16:32 2001 @@ -32,7 +32,7 @@ #include #include -#ifndef _MINIX +#if !defined (_MINIX) && defined (HAVE_SYS_FILE_H) # include #endif #include "posixstat.h" diff -ru bash-2.04/lib/readline/input.c bash-2.04-mpe/lib/readline/input.c --- bash-2.04/lib/readline/input.c Thu Aug 5 05:05:12 1999 +++ bash-2.04-mpe/lib/readline/input.c Fri Mar 30 10:14:55 2001 @@ -42,7 +42,7 @@ #endif /* HAVE_STDLIB_H */ #if defined (HAVE_SELECT) -# if !defined (HAVE_SYS_SELECT_H) || !defined (M_UNIX) +# if (!defined (HAVE_SYS_SELECT_H) || !defined (M_UNIX)) && defined(HAVE_SYS_TIME_H) # include # endif #endif /* HAVE_SELECT */ diff -ru bash-2.04/lib/readline/parens.c bash-2.04-mpe/lib/readline/parens.c --- bash-2.04/lib/readline/parens.c Thu Aug 5 05:10:08 1999 +++ bash-2.04-mpe/lib/readline/parens.c Fri Mar 30 10:11:40 2001 @@ -34,7 +34,7 @@ # define HAVE_SELECT #endif -#if defined (HAVE_SELECT) +#if defined (HAVE_SELECT) && defined (HAVE_SYS_TIME_H) # include #endif /* HAVE_SELECT */ #if defined (HAVE_SYS_SELECT_H) diff -ru bash-2.04/lib/sh/clktck.c bash-2.04-mpe/lib/sh/clktck.c --- bash-2.04/lib/sh/clktck.c Fri Oct 10 08:35:23 1997 +++ bash-2.04-mpe/lib/sh/clktck.c Fri Mar 30 11:06:26 2001 @@ -21,7 +21,9 @@ #include #include +#ifdef HAVE_SYS_PARAM_H #include +#endif #if defined (HAVE_UNISTD_H) # include diff -ru bash-2.04/lib/sh/inet_aton.c bash-2.04-mpe/lib/sh/inet_aton.c --- bash-2.04/lib/sh/inet_aton.c Mon Feb 14 12:51:19 2000 +++ bash-2.04-mpe/lib/sh/inet_aton.c Fri Mar 30 11:08:25 2001 @@ -65,7 +65,9 @@ #if !defined (HAVE_INET_ATON) && defined (HAVE_NETWORK) && defined (HAVE_NETINET_IN_H) && defined (HAVE_ARPA_INET_H) #include +#ifdef HAVE_SYS_PARAM_H #include +#endif #include #include diff -ru bash-2.04/lib/sh/oslib.c bash-2.04-mpe/lib/sh/oslib.c --- bash-2.04/lib/sh/oslib.c Tue Aug 25 08:37:00 1998 +++ bash-2.04-mpe/lib/sh/oslib.c Fri Mar 30 11:07:32 2001 @@ -21,7 +21,7 @@ #include #include -#ifndef _MINIX +#if !defined (_MINIX) && defined (HAVE_SYS_PARAM_H) # include #endif @@ -220,7 +220,11 @@ pid_t pgrp; int sig; { +#ifdef mpeix + return (kill (pgrp, sig)); +#else return (kill (-pgrp, sig)); +#endif } #endif /* !HAVE_KILLPG */ diff -ru bash-2.04/mailcheck.c bash-2.04-mpe/mailcheck.c --- bash-2.04/mailcheck.c Thu Aug 5 04:21:09 1999 +++ bash-2.04-mpe/mailcheck.c Fri Mar 30 09:55:57 2001 @@ -23,7 +23,7 @@ #include #include "bashtypes.h" #include "posixstat.h" -#ifndef _MINIX +#if !defined(_MINIX) && defined(HAVE_SYS_PARAM_H) # include #endif #if defined (HAVE_UNISTD_H) diff -ru bash-2.04/make_cmd.c bash-2.04-mpe/make_cmd.c --- bash-2.04/make_cmd.c Thu Aug 5 04:21:23 1999 +++ bash-2.04-mpe/make_cmd.c Fri Mar 30 09:50:07 2001 @@ -23,7 +23,7 @@ #include #include "bashtypes.h" -#ifndef _MINIX +#if !defined(_MINIX) && defined(HAVE_SYS_FILE_H) # include #endif #include "filecntl.h" diff -ru bash-2.04/redir.c bash-2.04-mpe/redir.c --- bash-2.04/redir.c Fri Dec 31 08:59:02 1999 +++ bash-2.04-mpe/redir.c Fri Mar 30 09:59:36 2001 @@ -25,7 +25,7 @@ #include #include "bashtypes.h" -#ifndef _MINIX +#if !defined(_MINIX) && defined(HAVE_SYS_FILE_H) # include #endif #include "filecntl.h" diff -ru bash-2.04/shell.c bash-2.04-mpe/shell.c --- bash-2.04/shell.c Fri Nov 19 11:58:15 1999 +++ bash-2.04-mpe/shell.c Fri Mar 30 09:45:08 2001 @@ -27,7 +27,7 @@ #include "config.h" #include "bashtypes.h" -#ifndef _MINIX +#if !defined(_MINIX) && defined(HAVE_SYS_FILE_H) # include #endif #include "posixstat.h" @@ -291,7 +291,7 @@ int code, saverst, old_errexit_flag; volatile int locally_skip_execution; volatile int arg_index, top_level_arg_index; -#ifdef __OPENNT +#if defined(__OPENNT) || defined(NO_MAIN_ENV_ARG) char **env; env = environ; diff -ru bash-2.04/y.tab.c bash-2.04-mpe/y.tab.c --- bash-2.04/y.tab.c Tue Feb 22 10:13:22 2000 +++ bash-2.04-mpe/y.tab.c Fri Mar 30 09:48:04 2001 @@ -92,7 +92,7 @@ #endif /* ALIAS */ #if defined (PROMPT_STRING_DECODE) -# ifndef _MINIX +# if !defined(_MINIX) && defined(HAVE_SYS_PARAM_H) # include # endif # include