aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2005-02-05 19:40:23 +0000
committerAndreas Schwab2005-02-05 19:40:23 +0000
commite120ea40ca3399e54cbe6c8597090d140997965b (patch)
tree85362eebfcf2dbe2df4dae1aff5d839baca39e63 /src
parent6d61d855735e2334b64d43368c636293299c48be (diff)
downloademacs-e120ea40ca3399e54cbe6c8597090d140997965b.tar.gz
emacs-e120ea40ca3399e54cbe6c8597090d140997965b.zip
(sys_subshell): Properly terminate execlp argument list.
Diffstat (limited to 'src')
-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 @@
12005-02-05 Andreas Schwab <schwab@suse.de>
2
3 * sysdep.c (sys_subshell): Properly terminate execlp argument
4 list.
5
12005-02-05 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 62005-02-05 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 7
3 * xselect.c (Fx_send_client_event, x_handle_dnd_message): Handle 8 * 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 @@
1/* Interfaces to system-dependent kernel and library entries. 1/* Interfaces to system-dependent kernel and library entries.
2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001,
3 2003, 2004 Free Software Foundation, Inc. 3 2003, 2004, 2005 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
@@ -869,7 +869,7 @@ sys_subshell ()
869 if (pid == -1) 869 if (pid == -1)
870 write (1, "Can't execute subshell", 22); 870 write (1, "Can't execute subshell", 22);
871#else /* not WINDOWSNT */ 871#else /* not WINDOWSNT */
872 execlp (sh, sh, 0); 872 execlp (sh, sh, (char *) 0);
873 write (1, "Can't execute subshell", 22); 873 write (1, "Can't execute subshell", 22);
874 _exit (1); 874 _exit (1);
875#endif /* not WINDOWSNT */ 875#endif /* not WINDOWSNT */