comparison lib/rfc959.c @ 988:63555c9744c2

remote charset should be specified by each bookmark entry.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Fri, 14 Aug 2009 07:54:55 +0900
parents 9a6571938f89
children 9c583f570950
comparison
equal deleted inserted replaced
987:2f6924c67846 988:63555c9744c2
42 42
43 {"email", N_("Email address:"), 43 {"email", N_("Email address:"),
44 gftp_option_type_text, "", NULL, GFTP_CVARS_FLAGS_SHOW_BOOKMARK, 44 gftp_option_type_text, "", NULL, GFTP_CVARS_FLAGS_SHOW_BOOKMARK,
45 N_("This is the password that will be used whenever you log into a remote FTP server as anonymous"), 45 N_("This is the password that will be used whenever you log into a remote FTP server as anonymous"),
46 GFTP_PORT_ALL, NULL}, 46 GFTP_PORT_ALL, NULL},
47
48 /* charset */
49 #if 0
50 {"remote_charset", N_("Remote Character Set:"),
51 gftp_option_type_text, "", NULL, GFTP_CVARS_FLAGS_SHOW_BOOKMARK_ONLY,
52 N_("This is the site specific charset"),
53 GFTP_PORT_ALL, NULL},
54 #endif
55
47 {"ftp_proxy_host", N_("Proxy hostname:"), 56 {"ftp_proxy_host", N_("Proxy hostname:"),
48 gftp_option_type_text, "", NULL, 0, 57 gftp_option_type_text, "", NULL, 0,
49 N_("Firewall hostname"), GFTP_PORT_ALL, NULL}, 58 N_("Firewall hostname"), GFTP_PORT_ALL, NULL},
50 {"ftp_proxy_port", N_("Proxy port:"), 59 {"ftp_proxy_port", N_("Proxy port:"),
51 gftp_option_type_int, GINT_TO_POINTER(21), NULL, 0, 60 gftp_option_type_int, GINT_TO_POINTER(21), NULL, 0,
210 size_t len; 219 size_t len;
211 int resp; 220 int resp;
212 221
213 if (argument != NULL) 222 if (argument != NULL)
214 { 223 {
215 utf8 = gftp_filename_from_utf8 (request, argument, &len); 224 utf8 = gftp_remote_filename_from_utf8 (request, argument, &len);
216 if (utf8 != NULL) 225 if (utf8 != NULL)
217 { 226 {
218 tempstr = g_strconcat (command, " ", utf8, "\r\n", NULL); 227 tempstr = g_strconcat (command, " ", utf8, "\r\n", NULL);
219 g_free (utf8); 228 g_free (utf8);
220 } 229 }
1716 1725
1717 g_return_val_if_fail (request != NULL, GFTP_EFATAL); 1726 g_return_val_if_fail (request != NULL, GFTP_EFATAL);
1718 g_return_val_if_fail (file != NULL, GFTP_EFATAL); 1727 g_return_val_if_fail (file != NULL, GFTP_EFATAL);
1719 g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL); 1728 g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
1720 1729
1721 utf8 = gftp_filename_from_utf8 (request, file, &destlen); 1730 utf8 = gftp_remote_filename_from_utf8 (request, file, &destlen);
1722 if (utf8 != NULL) 1731 if (utf8 != NULL)
1723 { 1732 {
1724 tempstr = g_strdup_printf ("SITE CHMOD %o %s\r\n", mode, utf8); 1733 tempstr = g_strdup_printf ("SITE CHMOD %o %s\r\n", mode, utf8);
1725 g_free (utf8); 1734 g_free (utf8);
1726 } 1735 }