comparison lib/sshv2.c @ 990:a4641b8c68bb

imported patch sftp_charset
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 04 Feb 2010 18:02:06 +0900
parents 63555c9744c2
children
comparison
equal deleted inserted replaced
989:c99b134c6185 990:a4641b8c68bb
181 { 181 {
182 const char *addstr; 182 const char *addstr;
183 char *utf8, *ret; 183 char *utf8, *ret;
184 size_t pathlen; 184 size_t pathlen;
185 185
186 utf8 = gftp_filename_from_utf8 (request, str, &pathlen); 186 utf8 = gftp_remote_filename_from_utf8 (request, str, &pathlen);
187 if (utf8 != NULL) 187 if (utf8 != NULL)
188 addstr = utf8; 188 addstr = utf8;
189 else 189 else
190 { 190 {
191 addstr = str; 191 addstr = str;
211 if (*str == '/') 211 if (*str == '/')
212 path = g_strdup (str); 212 path = g_strdup (str);
213 else 213 else
214 path = gftp_build_path (request, request->directory, str, NULL); 214 path = gftp_build_path (request, request->directory, str, NULL);
215 215
216 utf8 = gftp_filename_from_utf8 (request, path, len); 216 utf8 = gftp_remote_filename_from_utf8 (request, path, len);
217 if (utf8 != NULL) 217 if (utf8 != NULL)
218 { 218 {
219 g_free (path); 219 g_free (path);
220 return (utf8); 220 return (utf8);
221 } 221 }