comparison lib/sshv2.c @ 845:8263cc35c027

2006-11-2 Brian Masney <[e-mail]> * lib/gftp.h lib/local.c lib/misc.c lib/protocols.c lib/rfc959.c lib/sshv2.c - added gftp_filename_to_utf8() and gftp_filename_from_utf8(). (gftp_string_from_utf8) - added argument that will force the local encoding to be used.

844:1ece208d1357

{
  const char *addstr;
  char *utf8, *ret;
  size_t pathlen;

  utf8 = gftp_string_from_utf8 (request, str, &pathlen);
  if (utf8 != NULL)
    addstr = utf8;
  else
    {
      addstr = str;

  if (*str == '/')
    path = g_strdup (str);
  else
    path = gftp_build_path (request, request->directory, str, NULL);

  utf8 = gftp_string_from_utf8 (request, path, len);
  if (utf8 != NULL)
    {
      g_free (path);
      return (utf8);
    }

    return (ret);

  if ((dir = sshv2_buffer_get_string (request, &message, 1)) == NULL)
    return (GFTP_EFATAL);

  utf8 = gftp_string_to_utf8 (request, dir, &len);
  if (utf8 != NULL)
    {
      request->directory = utf8;
      g_free (dir);
    }

845:8263cc35c027

{
  const char *addstr;
  char *utf8, *ret;
  size_t pathlen;

  utf8 = gftp_filename_from_utf8 (request, str, &pathlen);
  if (utf8 != NULL)
    addstr = utf8;
  else
    {
      addstr = str;

  if (*str == '/')
    path = g_strdup (str);
  else
    path = gftp_build_path (request, request->directory, str, NULL);

  utf8 = gftp_filename_from_utf8 (request, path, len);
  if (utf8 != NULL)
    {
      g_free (path);
      return (utf8);
    }

    return (ret);

  if ((dir = sshv2_buffer_get_string (request, &message, 1)) == NULL)
    return (GFTP_EFATAL);

  utf8 = gftp_filename_to_utf8 (request, dir, &len);
  if (utf8 != NULL)
    {
      request->directory = utf8;
      g_free (dir);
    }