Mercurial > gftp.yaz
changeset 647:c197c8fb1e62
2004-12-20 Brian Masney <masneyb@gftp.org>
* lib/rfc959.c lib/ftpcommon.h - removed the quote filename
functionality in the SITE CHMOD and SITE UTIME commands
| author | masneyb |
|---|---|
| date | Tue, 21 Dec 2004 01:30:20 +0000 |
| parents | cd38f25b7c5e |
| children | 86a110c13b8e |
| files | ChangeLog lib/ftpcommon.h lib/rfc959.c |
| diffstat | 3 files changed, 8 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Dec 21 01:25:40 2004 +0000 +++ b/ChangeLog Tue Dec 21 01:30:20 2004 +0000 @@ -1,4 +1,7 @@ 2004-12-20 Brian Masney <masneyb@gftp.org> + * lib/rfc959.c lib/ftpcommon.h - removed the quote filename + functionality in the SITE CHMOD and SITE UTIME commands + * lib/protocols.c (gftp_parse_bookmark) - if the bookmark's password is set to @EMAIL@, expand it to the users' email address @@ -3156,7 +3159,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.380 2004/12/21 01:25:40 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.381 2004/12/21 01:30:20 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/lib/ftpcommon.h Tue Dec 21 01:25:40 2004 +0000 +++ b/lib/ftpcommon.h Tue Dec 21 01:30:20 2004 +0000 @@ -27,8 +27,7 @@ * dataconn_rbuf; int data_connection; unsigned int is_ascii_transfer : 1, - is_fxp_transfer : 1, - quote_filename : 1; + is_fxp_transfer : 1; int (*auth_tls_start) (gftp_request * request); ssize_t (*data_conn_read) (gftp_request * request, void *ptr, size_t size, int fd);
--- a/lib/rfc959.c Tue Dec 21 01:25:40 2004 +0000 +++ b/lib/rfc959.c Tue Dec 21 01:30:20 2004 +0000 @@ -415,14 +415,9 @@ return (GFTP_ERETRYABLE); *endpos = '\0'; - parms->quote_filename = 0; if (strcmp (stpos, "UNIX") == 0) - { - request->server_type = GFTP_DIRTYPE_UNIX; - if (strstr (endpos + 1, "BSD") == NULL) - parms->quote_filename = 1; - } + request->server_type = GFTP_DIRTYPE_UNIX; else if (strcmp (stpos, "VMS") == 0) request->server_type = GFTP_DIRTYPE_VMS; else if (strcmp (stpos, "MVS") == 0 || @@ -1703,10 +1698,7 @@ g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL); parms = request->protocol_data; - if (parms->quote_filename) - tempstr = g_strdup_printf ("SITE CHMOD %o \"%s\"\r\n", mode, file); - else - tempstr = g_strdup_printf ("SITE CHMOD %o %s\r\n", mode, file); + tempstr = g_strdup_printf ("SITE CHMOD %o %s\r\n", mode, file); ret = rfc959_send_command (request, tempstr, 1); g_free (tempstr); @@ -1787,10 +1779,7 @@ if (datestr == NULL) return (GFTP_EFATAL); - if (parms->quote_filename) - tempstr = g_strconcat ("SITE UTIME ", datestr, " \"", file, "\"\r\n", NULL); - else - tempstr = g_strconcat ("SITE UTIME ", datestr, " ", file, "\r\n", NULL); + tempstr = g_strconcat ("SITE UTIME ", datestr, " ", file, "\r\n", NULL); g_free (datestr); @@ -1857,7 +1846,6 @@ sparms = src_request->protocol_data; dparms->data_connection = -1; - dparms->quote_filename = sparms->quote_filename; dparms->is_ascii_transfer = sparms->is_ascii_transfer; dparms->is_fxp_transfer = sparms->is_fxp_transfer; dparms->auth_tls_start = sparms->auth_tls_start;