procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 17:59:37 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

use g_spawn_async_with_pipes instead of popen. Addresses bug #108659. Also

Browse source 
2005-03-01  Manish Singh  <yosh@gimp.org>

        * plug-ins/common/mail.c: use g_spawn_async_with_pipes instead of
        popen. Addresses bug #108659. Also some general cleanup.

        * plug-ins/common/mblur.c: Fix some typos in comments.
This commit is contained in:
Manish Singh 2005-03-02 02:20:02 +00:00 • committed by Manish Singh
parent c7ca43a647
commit 7b962482da
3 changed files with 185 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-03-01 Manish Singh <yosh@gimp.org>
* plug-ins/common/mail.c: use g_spawn_async_with_pipes instead of
popen. Addresses bug #108659. Also some general cleanup.
* plug-ins/common/mblur.c: Fix some typos in comments.
2005-03-01 Michael Natterer <mitch@gimp.org> 2005-03-01 Michael Natterer <mitch@gimp.org>
* app/core/core-enums.[ch]: added VISIBLE and LINKED to the * app/core/core-enums.[ch]: added VISIBLE and LINKED to the

246
plug-ins/common/mail.c
View file

@ -146,12 +146,6 @@ static const guint8 mail_icon[] =
"\0"}; "\0"};
#define ENCAPSULATION_UUENCODE 0
#define ENCAPSULATION_MIME 1
#define BUFFER_SIZE 256
#ifndef SENDMAIL #ifndef SENDMAIL
#define SENDMAIL "/usr/lib/sendmail" #define SENDMAIL "/usr/lib/sendmail"
#endif #endif
@ -160,9 +154,28 @@ static const guint8 mail_icon[] =
#define UUENCODE "uuencode" #define UUENCODE "uuencode"
#endif #endif
enum
{
ENCAPSULATION_UUENCODE,
ENCAPSULATION_MIME
};
#define BUFFER_SIZE 256
#define PLUG_IN_NAME "plug_in_mail_image" #define PLUG_IN_NAME "plug_in_mail_image"
#define HELP_ID "plug-in-mail-image" #define HELP_ID "plug-in-mail-image"
typedef struct
{
gchar receipt[BUFFER_SIZE];
gchar subject[BUFFER_SIZE];
gchar comment[BUFFER_SIZE];
gchar from[BUFFER_SIZE];
gchar filename[BUFFER_SIZE];
gint encapsulation;
}
m_info;
static void query (void); static void query (void);
static void run (const gchar *name, static void run (const gchar *name,
@ -178,11 +191,11 @@ static GimpPDBStatusType save_image (const gchar *filename,
static gint save_dialog (void); static gint save_dialog (void);
static void mail_entry_callback (GtkWidget *widget, static void mail_entry_callback (GtkWidget *widget,
gpointer data); gchar *data);
static void mesg_body_callback (GtkTextBuffer *buffer, static void mesg_body_callback (GtkTextBuffer *buffer,
gpointer data); gpointer data);
static gint valid_file (const gchar *filename); static gboolean valid_file (const gchar *filename);
static void create_headers (FILE *mailpipe); static void create_headers (FILE *mailpipe);
static gchar *find_extension (const gchar *filename); static gchar *find_extension (const gchar *filename);
static gint to64 (FILE *infile, static gint to64 (FILE *infile,
@ -193,6 +206,12 @@ static void output64chunk (gint c1,
gint pads, gint pads,
FILE *outfile); FILE *outfile);
static gint sane_dup2 (gint fd1,
gint fd2);
static FILE *sendmail_pipe (gchar **cmd,
gint *pid);
GimpPlugInInfo PLUG_IN_INFO = GimpPlugInInfo PLUG_IN_INFO =
{ {
NULL, /* init_proc */ NULL, /* init_proc */
@ -201,25 +220,9 @@ GimpPlugInInfo PLUG_IN_INFO =
run, /* run_proc */ run, /* run_proc */
}; };
typedef struct
{
gchar receipt[BUFFER_SIZE];
gchar subject[BUFFER_SIZE];
gchar comment[BUFFER_SIZE];
gchar from[BUFFER_SIZE];
gchar filename[BUFFER_SIZE];
gint encapsulation;
}
m_info;
static m_info mail_info = static m_info mail_info =
{ {
/* I would assume there is a better way to do this, but this works for now */ "", "", "", "", "",
"\0",
"\0",
"\0",
"\0",
"\0",
ENCAPSULATION_MIME, /* Change this to ENCAPSULATION_UUENCODE ENCAPSULATION_MIME, /* Change this to ENCAPSULATION_UUENCODE
if you prefer that as the default */ if you prefer that as the default */
}; };
@ -306,12 +309,11 @@ run (const gchar *name,
} }
else else
{ {
strncpy (mail_info.filename, g_strlcpy (mail_info.filename, param[3].data.d_string, BUFFER_SIZE);
param[3].data.d_string, BUFFER_SIZE); g_strlcpy (mail_info.receipt, param[4].data.d_string, BUFFER_SIZE);
strncpy (mail_info.receipt, param[4].data.d_string, BUFFER_SIZE); g_strlcpy (mail_info.from, param[5].data.d_string, BUFFER_SIZE);
strncpy (mail_info.receipt, param[5].data.d_string, BUFFER_SIZE); g_strlcpy (mail_info.subject, param[6].data.d_string, BUFFER_SIZE);
strncpy (mail_info.subject, param[6].data.d_string, BUFFER_SIZE); g_strlcpy (mail_info.comment, param[7].data.d_string, BUFFER_SIZE);
strncpy (mail_info.comment, param[7].data.d_string, BUFFER_SIZE);
mail_info.encapsulation = param[8].data.d_int32; mail_info.encapsulation = param[8].data.d_int32;
} }
break; break;
@ -349,33 +351,40 @@ save_image (const gchar *filename,
gint32 drawable_ID, gint32 drawable_ID,
gint32 run_mode) gint32 run_mode)
{ {
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
gchar *ext; gchar *ext;
gchar *tmpname; gchar *tmpname;
gchar mailcmdline[512]; gchar *mailcmd[3];
gint pid; GPid mailpid;
pid_t uupid;
gint wpid; gint wpid;
gint process_status; gint process_status;
FILE *mailpipe; FILE *mailpipe;
FILE *infile; FILE *infile;
if (NULL == (ext = find_extension (filename))) ext = find_extension (filename);
if (ext == NULL)
return GIMP_PDB_CALLING_ERROR; return GIMP_PDB_CALLING_ERROR;
/* get a temp name with the right extension and save into it. */ /* get a temp name with the right extension and save into it. */
tmpname = gimp_temp_name (ext + 1); tmpname = gimp_temp_name (ext + 1);
/* construct the "sendmail user@location" line */ /* construct the "sendmail user@location" line */
strcpy (mailcmdline, SENDMAIL); mailcmd[0] = SENDMAIL;
strcat (mailcmdline, " "); mailcmd[1] = mail_info.receipt;
strcat (mailcmdline, mail_info.receipt); mailcmd[2] = NULL;
/* create a pipe to sendmail */ /* create a pipe to sendmail */
mailpipe = popen (mailcmdline, "w"); mailpipe = sendmail_pipe (mailcmd, &mailpid);
if (mailpipe == NULL)
return GIMP_PDB_EXECUTION_ERROR;
create_headers (mailpipe); create_headers (mailpipe);
/* This is necessary to make the comments and headers work /* This is necessary to make the comments and headers work
* correctly. Not real sure why * correctly. Not real sure why.
*/ */
fflush (mailpipe); fflush (mailpipe);
@ -385,53 +394,47 @@ save_image (const gchar *filename,
tmpname, tmpname,
tmpname) && valid_file (tmpname)) ) tmpname) && valid_file (tmpname)) )
{ {
unlink (tmpname); goto error;
g_free (tmpname);
return GIMP_PDB_EXECUTION_ERROR;
} }
if (mail_info.encapsulation == ENCAPSULATION_UUENCODE) if (mail_info.encapsulation == ENCAPSULATION_UUENCODE)
{ {
/* fork off a uuencode process */ /* fork off a uuencode process */
if ((pid = fork ()) < 0) if ((uupid = fork ()) < 0)
{ {
g_message ("fork() failed: %s", g_strerror (errno)); g_message ("fork() failed: %s", g_strerror (errno));
g_free (tmpname); goto error;
return GIMP_PDB_EXECUTION_ERROR;
} }
else if (pid == 0) else if (uupid == 0)
{ {
if (-1 == dup2 (fileno (mailpipe), fileno (stdout))) if (sane_dup2 (fileno (mailpipe), fileno (stdout)) == -1)
{ {
g_message ("dup2() failed: %s", g_strerror (errno)); g_message ("dup2() failed: %s", g_strerror (errno));
} }
execlp (UUENCODE, UUENCODE, tmpname, filename, NULL); execlp (UUENCODE, UUENCODE, tmpname, filename, NULL);
/* What are we doing here? exec must have failed */ /* What are we doing here? exec must have failed */
g_message ("exec failed: uuencode: %s", g_strerror (errno)); g_message ("exec failed: uuencode: %s", g_strerror (errno));
/* close the pipe now */
pclose (mailpipe);
g_free (tmpname);
_exit (127); _exit (127);
} }
else else
{ {
wpid = waitpid (pid, &process_status, 0); wpid = waitpid (uupid, &process_status, 0);
if ((wpid < 0) if ((wpid < 0)
|| !WIFEXITED (process_status) || !WIFEXITED (process_status)
|| (WEXITSTATUS (process_status) != 0)) || (WEXITSTATUS (process_status) != 0))
{ {
g_message ("mail didnt work or something on file '%s'", g_message ("mail didn't work or something on file '%s'",
gimp_filename_to_utf8 (tmpname)); gimp_filename_to_utf8 (tmpname));
g_free (tmpname); goto error;
return GIMP_PDB_EXECUTION_ERROR;
} }
} }
} }
else else
{ /* This must be MIME stuff. Base64 away... */ {
/* This must be MIME stuff. Base64 away... */
infile = fopen (tmpname, "r"); infile = fopen (tmpname, "r");
to64 (infile, mailpipe); to64 (infile, mailpipe);
@ -440,11 +443,23 @@ save_image (const gchar *filename,
fprintf (mailpipe, "\n--GUMP-MIME-boundary--\n"); fprintf (mailpipe, "\n--GUMP-MIME-boundary--\n");
} }
goto cleanup;
error:
/* stop sendmail from doing anything */
kill (mailpid, SIGINT);
status = GIMP_PDB_EXECUTION_ERROR;
cleanup:
/* close out the sendmail process */
fclose (mailpipe);
waitpid (mailpid, NULL, 0);
/* delete the tmpfile that was generated */ /* delete the tmpfile that was generated */
unlink (tmpname); unlink (tmpname);
g_free (tmpname); g_free (tmpname);
return GIMP_PDB_SUCCESS; return status;
} }
@ -459,7 +474,6 @@ save_dialog (void)
GtkWidget *scrolled_window; GtkWidget *scrolled_window;
GtkWidget *text_view; GtkWidget *text_view;
GtkTextBuffer *text_buffer; GtkTextBuffer *text_buffer;
gchar buffer[BUFFER_SIZE];
gchar *gump_from; gchar *gump_from;
gboolean run; gboolean run;
@ -470,7 +484,7 @@ save_dialog (void)
if (gump_from) if (gump_from)
{ {
strncpy (mail_info.from, gump_from, BUFFER_SIZE); g_strlcpy (mail_info.from, gump_from, BUFFER_SIZE);
g_free (gump_from); g_free (gump_from);
} }
@ -500,62 +514,62 @@ save_dialog (void)
/* to: dialog */ /* to: dialog */
entry = gtk_entry_new (); entry = gtk_entry_new ();
gtk_widget_set_size_request (entry, 200, -1); gtk_widget_set_size_request (entry, 200, -1);
g_snprintf (buffer, sizeof (buffer), "%s", mail_info.receipt); gtk_entry_set_max_length (GTK_ENTRY (entry), BUFFER_SIZE - 1);
gtk_entry_set_text (GTK_ENTRY (entry), buffer); gtk_entry_set_text (GTK_ENTRY (entry), mail_info.receipt);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("_Recipient:"), 0.0, 0.5, _("_Recipient:"), 0.0, 0.5,
entry, 1, FALSE); entry, 1, FALSE);
g_signal_connect (entry, "changed", g_signal_connect (entry, "changed",
G_CALLBACK (mail_entry_callback), G_CALLBACK (mail_entry_callback),
&mail_info.receipt); mail_info.receipt);
/* From entry */ /* From entry */
entry = gtk_entry_new (); entry = gtk_entry_new ();
gtk_widget_set_size_request (entry, 200, -1); gtk_widget_set_size_request (entry, 200, -1);
g_snprintf (buffer, sizeof (buffer), "%s", mail_info.from); gtk_entry_set_max_length (GTK_ENTRY (entry), BUFFER_SIZE - 1);
gtk_entry_set_text (GTK_ENTRY (entry), buffer); gtk_entry_set_text (GTK_ENTRY (entry), mail_info.from);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("_Sender:"), 0.0, 0.5, _("_Sender:"), 0.0, 0.5,
entry, 1, FALSE); entry, 1, FALSE);
g_signal_connect (entry, "changed", g_signal_connect (entry, "changed",
G_CALLBACK (mail_entry_callback), G_CALLBACK (mail_entry_callback),
&mail_info.from); mail_info.from);
/* Subject entry */ /* Subject entry */
entry = gtk_entry_new (); entry = gtk_entry_new ();
gtk_widget_set_size_request (entry, 200, -1); gtk_widget_set_size_request (entry, 200, -1);
g_snprintf (buffer, sizeof (buffer), "%s", mail_info.subject); gtk_entry_set_max_length (GTK_ENTRY (entry), BUFFER_SIZE - 1);
gtk_entry_set_text (GTK_ENTRY (entry), buffer); gtk_entry_set_text (GTK_ENTRY (entry), mail_info.subject);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("S_ubject:"), 0.0, 0.5, _("S_ubject:"), 0.0, 0.5,
entry, 1, FALSE); entry, 1, FALSE);
g_signal_connect (entry, "changed", g_signal_connect (entry, "changed",
G_CALLBACK (mail_entry_callback), G_CALLBACK (mail_entry_callback),
&mail_info.subject); mail_info.subject);
/* Comment entry */ /* Comment entry */
entry = gtk_entry_new (); entry = gtk_entry_new ();
gtk_widget_set_size_request (entry, 200, -1); gtk_widget_set_size_request (entry, 200, -1);
g_snprintf (buffer, sizeof (buffer), "%s", mail_info.comment); gtk_entry_set_max_length (GTK_ENTRY (entry), BUFFER_SIZE - 1);
gtk_entry_set_text (GTK_ENTRY (entry), buffer); gtk_entry_set_text (GTK_ENTRY (entry), mail_info.comment);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, gimp_table_attach_aligned (GTK_TABLE (table), 0, 3,
_("Comm_ent:"), 0.0, 0.5, _("Comm_ent:"), 0.0, 0.5,
entry, 1, FALSE); entry, 1, FALSE);
g_signal_connect (entry, "changed", g_signal_connect (entry, "changed",
G_CALLBACK (mail_entry_callback), G_CALLBACK (mail_entry_callback),
&mail_info.comment); mail_info.comment);
/* Filename entry */ /* Filename entry */
entry = gtk_entry_new (); entry = gtk_entry_new ();
gtk_widget_set_size_request (entry, 200, -1); gtk_widget_set_size_request (entry, 200, -1);
g_snprintf (buffer, sizeof (buffer), "%s", mail_info.filename); gtk_entry_set_max_length (GTK_ENTRY (entry), BUFFER_SIZE - 1);
gtk_entry_set_text (GTK_ENTRY (entry), buffer); gtk_entry_set_text (GTK_ENTRY (entry), mail_info.filename);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 4, gimp_table_attach_aligned (GTK_TABLE (table), 0, 4,
_("_Filename:"), 0.0, 0.5, _("_Filename:"), 0.0, 0.5,
entry, 1, FALSE); entry, 1, FALSE);
g_signal_connect (entry, "changed", g_signal_connect (entry, "changed",
G_CALLBACK (mail_entry_callback), G_CALLBACK (mail_entry_callback),
&mail_info.filename); mail_info.filename);
/* comment */ /* comment */
scrolled_window = gtk_scrolled_window_new (NULL, NULL); scrolled_window = gtk_scrolled_window_new (NULL, NULL);
@ -574,12 +588,12 @@ save_dialog (void)
text_buffer = gtk_text_buffer_new (NULL); text_buffer = gtk_text_buffer_new (NULL);
text_view = gtk_text_view_new_with_buffer (text_buffer); text_view = gtk_text_view_new_with_buffer (text_buffer);
g_object_unref (text_buffer);
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_WORD); gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_WORD);
gtk_container_add (GTK_CONTAINER (scrolled_window), text_view); gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
gtk_widget_show (text_view); gtk_widget_show (text_view);
g_object_unref (text_buffer);
g_signal_connect (text_buffer, "changed", g_signal_connect (text_buffer, "changed",
G_CALLBACK (mesg_body_callback), G_CALLBACK (mesg_body_callback),
NULL); NULL);
@ -614,7 +628,7 @@ save_dialog (void)
return run; return run;
} }
static gint static gboolean
valid_file (const gchar *filename) valid_file (const gchar *filename)
{ {
int stat_res; int stat_res;
@ -623,9 +637,9 @@ valid_file (const gchar *filename)
stat_res = stat (filename, &buf); stat_res = stat (filename, &buf);
if ((0 == stat_res) && (buf.st_size > 0)) if ((0 == stat_res) && (buf.st_size > 0))
return 1; return TRUE;
else else
return 0; return FALSE;
} }
static gchar * static gchar *
@ -648,30 +662,29 @@ find_content_type (const gchar *filename)
}; };
gchar *ext; gchar *ext;
gchar *mimetype = g_new (gchar, 100); gint i;
gint i=0;
ext = find_extension (filename); ext = find_extension (filename);
if (!ext) if (!ext)
{ {
strcpy (mimetype, "application/octet-stream"); return g_strdup ("application/octet-stream");
return mimetype;
} }
i = 0;
ext += 1;
while (type_mappings[i]) while (type_mappings[i])
{ {
if (strcmp (ext+1, type_mappings[i]) == 0) if (strcmp (ext, type_mappings[i]) == 0)
{ {
strcpy (mimetype, type_mappings[i + 1]); return g_strdup (type_mappings[i + 1]);
return mimetype;
} }
i += 2; i += 2;
} }
strcpy (mimetype, "image/x-");
strncat (mimetype, ext + 1, 91);
mimetype[99] = '\0';
return mimetype; return g_strdup_printf ("image/x-%s", ext);
} }
static gchar * static gchar *
@ -695,6 +708,7 @@ find_extension (const gchar *filename)
return NULL; return NULL;
} }
if (0 != strcmp(ext,".gz")) if (0 != strcmp(ext,".gz"))
{ {
return ext; return ext;
@ -712,10 +726,9 @@ find_extension (const gchar *filename)
static void static void
mail_entry_callback (GtkWidget *widget, mail_entry_callback (GtkWidget *widget,
gpointer data) gchar *data)
{ {
strncpy ((gchar *) data, g_strlcpy (data, gtk_entry_get_text (GTK_ENTRY (widget)), BUFFER_SIZE);
gtk_entry_get_text (GTK_ENTRY (widget)), BUFFER_SIZE);
} }
static void static void
@ -725,7 +738,6 @@ mesg_body_callback (GtkTextBuffer *buffer,
GtkTextIter start_iter; GtkTextIter start_iter;
GtkTextIter end_iter; GtkTextIter end_iter;
if (mesg_body) if (mesg_body)
g_free (mesg_body); g_free (mesg_body);
@ -744,24 +756,31 @@ create_headers (FILE *mailpipe)
fprintf (mailpipe, "To: %s \n", mail_info.receipt); fprintf (mailpipe, "To: %s \n", mail_info.receipt);
fprintf (mailpipe, "Subject: %s \n", mail_info.subject); fprintf (mailpipe, "Subject: %s \n", mail_info.subject);
fprintf (mailpipe, "From: %s \n", mail_info.from); fprintf (mailpipe, "From: %s \n", mail_info.from);
fprintf (mailpipe, "X-Mailer: GIMP Useless Mail Program v.85\n"); fprintf (mailpipe, "X-Mailer: GIMP Useless Mail Program %s\n", GIMP_VERSION);
if (mail_info.encapsulation == ENCAPSULATION_MIME ) if (mail_info.encapsulation == ENCAPSULATION_MIME )
{ {
fprintf (mailpipe, "MIME-Version: 1.0\n"); fprintf (mailpipe, "MIME-Version: 1.0\n");
fprintf (mailpipe, "Content-type: multipart/mixed; boundary=GUMP-MIME-boundary\n"); fprintf (mailpipe, "Content-type: multipart/mixed; "
"boundary=GUMP-MIME-boundary\n");
} }
fprintf (mailpipe, "\n\n"); fprintf (mailpipe, "\n\n");
if (mail_info.encapsulation == ENCAPSULATION_MIME ) if (mail_info.encapsulation == ENCAPSULATION_MIME )
{ {
fprintf (mailpipe, "--GUMP-MIME-boundary\n"); fprintf (mailpipe, "--GUMP-MIME-boundary\n");
fprintf (mailpipe, "Content-type: text/plain; charset=US-ASCII\n\n"); fprintf (mailpipe, "Content-type: text/plain; charset=US-ASCII\n\n");
} }
fprintf (mailpipe, mail_info.comment); fprintf (mailpipe, mail_info.comment);
fprintf (mailpipe, "\n\n"); fprintf (mailpipe, "\n\n");
if (mesg_body) if (mesg_body)
fprintf (mailpipe, mesg_body); fprintf (mailpipe, mesg_body);
fprintf (mailpipe, "\n\n"); fprintf (mailpipe, "\n\n");
if (mail_info.encapsulation == ENCAPSULATION_MIME ) if (mail_info.encapsulation == ENCAPSULATION_MIME )
{ {
gchar *content = find_content_type (mail_info.filename); gchar *content = find_content_type (mail_info.filename);
@ -880,3 +899,38 @@ output64chunk (gint c1,
putc (basis_64[c3 & 0x3F], outfile); putc (basis_64[c3 & 0x3F], outfile);
} }
} }
static gint
sane_dup2 (gint fd1,
gint fd2)
{
gint ret;
retry:
ret = dup2 (fd1, fd2);
if (ret < 0 && errno == EINTR)
goto retry;
return ret;
}
static FILE *
sendmail_pipe (gchar **cmd,
gint *pid)
{
gint fd;
GError *err = NULL;
if (! g_spawn_async_with_pipes (NULL, cmd, NULL, G_SPAWN_DO_NOT_REAP_CHILD,
NULL, NULL, pid, &fd, NULL, NULL, &err))
{
g_message (_("Could not start sendmail (%s)"), err->message);
g_error_free (err);
*pid = -1;
return NULL;
}
return fdopen (fd, "w");
}

4
plug-ins/common/mblur.c
View file

@ -38,8 +38,8 @@
* Bilinear interpolation from original mblur for 0.54 * Bilinear interpolation from original mblur for 0.54
* Speed all things up * Speed all things up
* ? better caching scheme * ? better caching scheme
* - while bluring along long trajektory do not averrage all * - while blurring along long trajectory do not average all
* pixels but averrage only few samples * pixels but average only few samples
* Function for weight of samples along trajectory * Function for weight of samples along trajectory
* Preview * Preview
* Support paths in GiMP 1.1 :-) * Support paths in GiMP 1.1 :-)