[evolution-patches] 40515, arguments to signature scripts

[Not Zed <notzed ximian com>]

? mail/ems.diff
? mail/evolution-mail-2.0.schemas
? mail/m.diff
? mail/ma.diff
? mail/default/zh_CN/Makefile
? mail/default/zh_CN/Makefile.in
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3577
diff -u -p -r1.3577 ChangeLog
--- mail/ChangeLog	21 Feb 2005 06:37:13 -0000	1.3577
+++ mail/ChangeLog	22 Feb 2005 04:08:37 -0000
@@ -1,3 +1,10 @@
+2005-02-22  Not Zed  <NotZed Ximian com>
+
+	** See bug #40515
+
+	* mail-config.c (mail_config_signature_run_script): run the script
+	using /bin/sh -c, so arguments may be passed to the script.
+
 2005-02-14  Not Zed  <NotZed Ximian com>
 
 	** See bug #61363 & e-util/ChangeLog
Index: mail/mail-config.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-config.c,v
retrieving revision 1.313
diff -u -p -r1.313 mail-config.c
--- mail/mail-config.c	18 Jan 2005 13:19:23 -0000	1.313
+++ mail/mail-config.c	22 Feb 2005 04:08:38 -0000
@@ -978,7 +978,7 @@ mail_config_signature_run_script (const 
 	int result, status;
 	int in_fds[2];
 	pid_t pid;
-	
+
 	if (pipe (in_fds) == -1) {
 		g_warning ("Failed to create pipe to '%s': %s", script, g_strerror (errno));
 		return NULL;
@@ -1001,7 +1001,7 @@ mail_config_signature_run_script (const 
 				fcntl (i, F_SETFD, FD_CLOEXEC);
 		}
 		
-		execlp (script, script, NULL);
+		execlp("/bin/sh", "/bin/sh", "-c", script, NULL);
 		g_warning ("Could not execute %s: %s\n", script, g_strerror (errno));
 		_exit (255);
 	} else if (pid < 0) {