summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/sysdep.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fccfbf7ddd4..31e0d0a269f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-05 Andreas Schwab <schwab@suse.de>
+
+ * sysdep.c (sys_subshell): Properly terminate execlp argument
+ list.
+
2005-02-05 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* xselect.c (Fx_send_client_event, x_handle_dnd_message): Handle
diff --git a/src/sysdep.c b/src/sysdep.c
index 1884c0ccffa..f1345e591ab 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1,6 +1,6 @@
/* Interfaces to system-dependent kernel and library entries.
Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001,
- 2003, 2004 Free Software Foundation, Inc.
+ 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -869,7 +869,7 @@ sys_subshell ()
if (pid == -1)
write (1, "Can't execute subshell", 22);
#else /* not WINDOWSNT */
- execlp (sh, sh, 0);
+ execlp (sh, sh, (char *) 0);
write (1, "Can't execute subshell", 22);
_exit (1);
#endif /* not WINDOWSNT */