From 91b016c4148c51573ca3a3eb6bc2ae5d623909ce Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 22 Dec 2007 11:27:02 +0000 Subject: configh.dos.template [__DJGPP__]: Replace HAVE_SYS_SIGLIST with HAVE_DECL_SYS_SIGLIST. job.c (child_execute_job): Remove __MSDOS__ because MSDOS/DJGPP build does not use child_execute_job. variable.c (define_automatic_variables) [__MSDOS__]: Always export the SHELL environment variable to the child. --- ChangeLog | 11 +++++++++++ configh.dos.template | 2 +- job.c | 2 +- variable.c | 3 +++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1803beb..0a5f455 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-12-22 Juan Manuel Guerrero (tiny change) + + * configh.dos.template [__DJGPP__]: Replace HAVE_SYS_SIGLIST with + HAVE_DECL_SYS_SIGLIST. + + * job.c (child_execute_job): Remove __MSDOS__ because MSDOS/DJGPP + build does not use child_execute_job. + + * variable.c (define_automatic_variables) [__MSDOS__]: Always + export the SHELL environment variable to the child. + 2007-12-22 Eli Zaretskii * config.h.W32: Include sys/types.h. diff --git a/configh.dos.template b/configh.dos.template index 12d0f58..b2add06 100644 --- a/configh.dos.template +++ b/configh.dos.template @@ -25,7 +25,7 @@ this program. If not, see . */ # define SYS_SIGLIST_DECLARED 1 /* Define to 1 if the C library defines the variable `_sys_siglist'. */ -# define HAVE_SYS_SIGLIST 1 +# define HAVE_DECL_SYS_SIGLIST 1 #else diff --git a/job.c b/job.c index 6fc3054..82f7c0b 100644 --- a/job.c +++ b/job.c @@ -1901,7 +1901,7 @@ start_waiting_jobs (void) #ifndef WINDOWS32 /* EMX: Start a child process. This function returns the new pid. */ -# if defined __MSDOS__ || defined __EMX__ +# if defined __EMX__ int child_execute_job (int stdin_fd, int stdout_fd, char **argv, char **envp) { diff --git a/variable.c b/variable.c index e3071c2..25491c4 100644 --- a/variable.c +++ b/variable.c @@ -794,6 +794,9 @@ define_automatic_variables (void) /* This won't override any definition, but it will provide one if there isn't one there. */ v = define_variable ("SHELL", 5, default_shell, o_default, 0); +#ifdef __MSDOS__ + v->export = v_export; /* Export always SHELL. */ +#endif /* On MSDOS we do use SHELL from environment, since it isn't a standard environment variable on MSDOS, so whoever sets it, does that on purpose. -- cgit v1.2.3