comparison lib/sshv2.c @ 843:32dbed7e0dc4

2006-11-2 Brian Masney <[e-mail]> * lib/local.c lib/misc.c lib/sshv2.c - more improvements to make sure that the filename is encoded in the proper character set.

842:0d6fba16c7db

static int
sshv2_getcwd (gftp_request * request)
{
  sshv2_message message;
  char *tempstr, *dir;
  size_t msglen;
  int ret;

  g_return_val_if_fail (request != NULL, GFTP_EFATAL);
  g_return_val_if_fail (request->protonum == GFTP_SSHV2_NUM, GFTP_EFATAL);

  if (request->directory == NULL || *request->directory == '\0')
    dir = ".";
  else
    dir = request->directory;

  tempstr = sshv2_initialize_buffer_with_i18n_string (request, dir, &msglen);
  ret = sshv2_send_command (request, SSH_FXP_REALPATH, tempstr, msglen);
  g_free (tempstr);
  if (ret < 0)
    return (ret);

  if (request->directory)

  message.pos += 4;
  if ((ret = sshv2_buffer_get_int32 (request, &message, 1, 1, NULL)) < 0)
    return (ret);

  if ((request->directory = sshv2_buffer_get_string (request, &message, 1)) == NULL)
    return (GFTP_EFATAL);

  sshv2_message_free (&message);
  return (0);
}

843:32dbed7e0dc4

static int
sshv2_getcwd (gftp_request * request)
{
  char *tempstr, *dir, *utf8;
  sshv2_message message;
  size_t len;
  int ret;

  g_return_val_if_fail (request != NULL, GFTP_EFATAL);
  g_return_val_if_fail (request->protonum == GFTP_SSHV2_NUM, GFTP_EFATAL);

  if (request->directory == NULL || *request->directory == '\0')
    dir = ".";
  else
    dir = request->directory;

  tempstr = sshv2_initialize_buffer_with_i18n_string (request, dir, &len);
  ret = sshv2_send_command (request, SSH_FXP_REALPATH, tempstr, len);
  g_free (tempstr);
  if (ret < 0)
    return (ret);

  if (request->directory)

  message.pos += 4;
  if ((ret = sshv2_buffer_get_int32 (request, &message, 1, 1, NULL)) < 0)
    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);
    }
  else
    request->directory = dir;

  sshv2_message_free (&message);
  return (0);
}