2005-06-15 [paul] 1.9.11cvs71

[claws.git] / src / send_message.c

diff --git a/src/send_message.c b/src/send_message.c
index 5681567376c501778b93dd69577a186eddb34016..9f51e179350981fdec2fce7931e310314389b283 100644 (file)
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -28,7 +28,6 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkwindow.h>
-#include <gtk/gtkclist.h>
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
@@ -46,6 +45,7 @@
 #include "inputdialog.h"
 #include "alertpanel.h"
 #include "manage_window.h"
+#include "socket.h"
 #include "utils.h"
 #include "gtkutils.h"
 #include "inc.h"
@@ -117,39 +117,54 @@ enum
 
 gint send_message_local(const gchar *command, FILE *fp)
 {
-       FILE *pipefp;
+       gchar **argv;
+       GPid pid;
+       gint child_stdin;
        gchar buf[BUFFSIZE];
-       int r;
-       sigset_t osig, mask;
+       gboolean err = FALSE;
 
        g_return_val_if_fail(command != NULL, -1);
        g_return_val_if_fail(fp != NULL, -1);
 
-       pipefp = popen(command, "w");
-       if (!pipefp) {
-               g_warning("Can't execute external command: %s\n", command);
+       log_message(_("Sending message using command: %s\n"), command);
+
+       argv = strsplit_with_quote(command, " ", 0);
+
+       if (g_spawn_async_with_pipes(NULL, argv, NULL, 0, NULL, NULL, &pid,
+                                    &child_stdin, NULL, NULL, NULL) == FALSE) {
+               g_snprintf(buf, sizeof(buf),
+                          _("Can't execute command: %s"), command);
+               log_warning("%s\n", buf);
+               alertpanel_error("%s", buf);
+               g_strfreev(argv);
                return -1;
        }
+       g_strfreev(argv);
 
        while (fgets(buf, sizeof(buf), fp) != NULL) {
                strretchomp(buf);
-               fputs(buf, pipefp);
-               fputc('\n', pipefp);
+               if (buf[0] == '.' && buf[1] == '\0') {
+                       if (fd_write_all(child_stdin, ".", 1) < 0) {
+                               err = TRUE;
+                               break;
+                       }
+               }
+               if (fd_write_all(child_stdin, buf, strlen(buf)) < 0 ||
+                   fd_write_all(child_stdin, "\n", 1) < 0) {
+                       err = TRUE;
+                       break;
+               }
        }
 
-       /* we need to block SIGCHLD, otherwise pspell's handler will wait()
-        * the pipecommand away and pclose will return -1 because of its
-        * failed wait4().
-        */
-       sigemptyset(&mask);
-       sigaddset(&mask, SIGCHLD);
-       sigprocmask(SIG_BLOCK, &mask, &osig);
-       
-       r = pclose(pipefp);
+       fd_close(child_stdin);
+       g_spawn_close_pid(pid);
 
-       sigprocmask(SIG_SETMASK, &osig, NULL);
-       if (r != 0) {
-               g_warning("external command `%s' failed with code `%i'\n", command, r);
+       if (err) {
+               g_snprintf(buf, sizeof(buf),
+                          _("Error occurred while executing command: %s"),
+                          command);
+               log_warning("%s\n", buf);
+               alertpanel_error("%s", buf);
                return -1;
        }
 
@@ -160,7 +175,7 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
 {
        Session *session;
        SMTPSession *smtp_session;
-       gushort port;
+       gushort port = 0;
        SendProgressDialog *dialog;
        gchar buf[BUFFSIZE];
        gint ret = 0;
@@ -333,7 +348,8 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
         * easier.
         */
        if (!keep_session || ret != 0) {
-               smtp_quit(session);
+               if (session_is_connected(session))
+                       smtp_quit(smtp_session);
                while (session_is_connected(session))
                        gtk_main_iteration();
                session_destroy(session);