alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu-msg-part: ensure that mime part file names are proper utf8

Browse Source
This commit is contained in:
djcb
2012-01-12 00:22:20 +02:00
parent 5fb5347bc8
commit 58db0c76a6
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mu-msg-part.c
View File

@ -27,6 +27,7 @@
#include <unistd.h> #include <unistd.h>
#include "mu-util.h" #include "mu-util.h"
#include "mu-str.h"
#include "mu-msg-priv.h" #include "mu-msg-priv.h"
#include "mu-msg-part.h" #include "mu-msg-part.h"
@ -160,9 +161,14 @@ part_foreach_cb (GMimeObject *parent, GMimeObject *mobj, PartData *pdata)
if (GMIME_IS_PART(mobj)) { if (GMIME_IS_PART(mobj)) {
GMimePart *part; GMimePart *part;
const gchar *fname;
part = (GMimePart*)mobj; part = (GMimePart*)mobj;
pi.disposition = (char*)g_mime_object_get_disposition (mobj); pi.disposition = (char*)g_mime_object_get_disposition (mobj);
pi.file_name = (char*)g_mime_part_get_filename (part);
fname = g_mime_part_get_filename (part);
pi.file_name = fname ? mu_str_utf8ify (fname) : NULL;
pi.size = get_part_size (part); pi.size = get_part_size (part);
pi.is_leaf = TRUE; pi.is_leaf = TRUE;
@ -176,6 +182,7 @@ part_foreach_cb (GMimeObject *parent, GMimeObject *mobj, PartData *pdata)
} }
pdata->_func(pdata->_msg, &pi, pdata->_user_data); pdata->_func(pdata->_msg, &pi, pdata->_user_data);
g_free (pi.file_name);
} }
@ -269,7 +276,7 @@ write_to_stream (GMimeObject *part, int fd, GError **err)
} }
gboolean static gboolean
save_part (GMimeObject *part, const char *fullpath, save_part (GMimeObject *part, const char *fullpath,
gboolean overwrite, gboolean use_existing, GError **err) gboolean overwrite, gboolean use_existing, GError **err)
{ {

8
src/mu-msg-part.h
View File

@ -136,9 +136,11 @@ gchar* mu_msg_part_filepath (MuMsg *msg, const char* targetdir,
/** /**
* get a full path name for saving the message part in the cache * get a full path name for a file for saving the message part INDEX;
* directory for this message; if needed, create the directory (but * this path is unique (1:1) for this particular message and part for
* not the file) * this user. Thus, it can be used as a cache.
*
* Will create the directory if needed.
* *
* @param msg a msg * @param msg a msg
* @param partidx the part for which to determine a filename * @param partidx the part for which to determine a filename