Mercurial > gftp.yaz
changeset 599:0999b11f84e3
2004-10-29 Brian Masney <masneyb@gftp.org>
* lib/protocols.c (gftp_put_file) - don't do any kind of character
set conversion on the filename. After looking into this some more,
this wasn't the proper place to do this.
| author | masneyb |
|---|---|
| date | Fri, 29 Oct 2004 20:16:40 +0000 |
| parents | fa0838b22b14 |
| children | 0a1d03fa2261 |
| files | ChangeLog lib/protocols.c |
| diffstat | 2 files changed, 6 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Oct 29 20:05:32 2004 +0000 +++ b/ChangeLog Fri Oct 29 20:16:40 2004 +0000 @@ -1,4 +1,8 @@ 2004-10-29 Brian Masney <masneyb@gftp.org> + * lib/protocols.c (gftp_put_file) - don't do any kind of character + set conversion on the filename. After looking into this some more, + this wasn't the proper place to do this. + * lib/gftp.h lib/misc.c lib/protocols.c lib/rfc2068.c lib/rfc959.c lib/sshv2.c src/gtk/dnd.c src/gtk/view_dialog.c src/uicommon/gftpui.c src/uicommon/gftpuicallbacks.c - removed free_fdata(). Added @@ -2967,7 +2971,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.348 2004/10/29 20:05:31 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.349 2004/10/29 20:16:40 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/lib/protocols.c Fri Oct 29 20:05:32 2004 +0000 +++ b/lib/protocols.c Fri Oct 29 20:16:40 2004 +0000 @@ -191,25 +191,13 @@ gftp_put_file (gftp_request * request, const char *filename, int fd, off_t startsize, off_t totalsize) { - char *enc_filename; - int ret; - g_return_val_if_fail (request != NULL, GFTP_EFATAL); request->cached = 0; if (request->put_file == NULL) return (GFTP_EFATAL); - enc_filename = gftp_string_from_utf8 (request, filename); - if (enc_filename != NULL) - { - ret = request->put_file (request, enc_filename, fd, startsize, totalsize); - g_free (enc_filename); - } - else - ret = request->put_file (request, filename, fd, startsize, totalsize); - - return (ret); + return (request->put_file (request, filename, fd, startsize, totalsize)); }