comparison src/uicommon/gftpui.c @ 811:789ff8cb3170

2006-9-14 Brian Masney <[e-mail]> * src/uicommon/gftpui.c - added _do_transfer_file(). This will take care of the actual file transfer. It will also make sure that the entire buffer has been transmitted properly. * lib/protocols.c lib/rfc959.c (*_put_next_file_chunk) - removed unneeded code that checks for a block size of 0 * lib/rfc959.c (rfc959_syst) - disable show_hidden_files and resolve_remote_symlinks if the remote system type is OS/400.

810:6cdba64ec675

    }
}


int
gftpui_common_transfer_files (gftp_transfer * tdata)
{
  intptr_t preserve_permissions, preserve_time, trans_blksize;
  struct timeval updatetime;
  ssize_t num_read, ret;
  gftp_file * curfle; 
  int tofd, fromfd;
  char *buf;

  gftp_lookup_request_option (tdata->fromreq, "trans_blksize", &trans_blksize);
  buf = g_malloc (trans_blksize);

  tdata->curfle = tdata->files;
  gettimeofday (&tdata->starttime, NULL);
  memcpy (&tdata->lasttime, &tdata->starttime, sizeof (tdata->lasttime));

  gftp_lookup_request_option (tdata->fromreq, "preserve_time",
                              &preserve_time);

  while (tdata->curfle != NULL)
    {
      num_read = -1;

      if (g_thread_supported ())
        g_static_mutex_lock (&tdata->structmutex);

      curfle = tdata->curfle->data;

          tdata->resumed_bytes += tdata->curresumed;

          if (g_thread_supported ())
            g_static_mutex_unlock (&tdata->structmutex);

          memset (&updatetime, 0, sizeof (updatetime));
          gftpui_start_current_file_in_transfer (tdata);

          while (!tdata->cancel &&
                 (num_read = gftp_get_next_file_chunk (tdata->fromreq,
                                                       buf, trans_blksize)) > 0)
            {
              gftp_calc_kbs (tdata, num_read);
              if (tdata->lasttime.tv_sec - updatetime.tv_sec >= 1 ||
                  tdata->curtrans >= tdata->tot_file_trans)
                {
                  gftpui_update_current_file_in_transfer (tdata);
                  memcpy (&updatetime, &tdata->lasttime, sizeof (updatetime));
                }

              if ((ret = gftp_put_next_file_chunk (tdata->toreq, buf,
                                                   num_read)) < 0)
                {
                  num_read = (int) ret;
                  break;
                }
            }

          if (num_read == GFTP_ENOTRANS)
            num_read = 0;

          gftpui_finish_current_file_in_transfer (tdata);
        }

      if (tdata->cancel)
        {
          if (gftp_abort_transfer (tdata->fromreq) != 0)
            gftp_disconnect (tdata->fromreq);

          if (gftp_abort_transfer (tdata->toreq) != 0)
            gftp_disconnect (tdata->toreq);
        }
      else if (num_read < 0)
        {
          tdata->fromreq->logging_function (gftp_logging_error,
                                        tdata->fromreq,
                                        _("Could not download %s from %s\n"),
                                        curfle->file,
                                        tdata->fromreq->hostname);

          if (gftp_get_transfer_status (tdata, num_read) == GFTP_ERETRYABLE)
            continue;

          break;
        }
      else

      tdata->fromreq->cancel = 0;
      tdata->toreq->cancel = 0;
    }

  tdata->done = 1;
  g_free (buf);

  return (1);
}

811:789ff8cb3170

    }
}


int
_do_transfer_file (gftp_transfer * tdata)
{
  struct timeval updatetime;
  intptr_t trans_blksize;
  ssize_t num_read, ret;
  char *buf, *bufpos;

  gftp_lookup_request_option (tdata->fromreq, "trans_blksize", &trans_blksize);
  buf = g_malloc (trans_blksize);

  memset (&updatetime, 0, sizeof (updatetime));
  gftpui_start_current_file_in_transfer (tdata);

  while (!tdata->cancel &&
         (num_read = gftp_get_next_file_chunk (tdata->fromreq, buf,
                                               trans_blksize)) > 0)
    {
      gftp_calc_kbs (tdata, num_read);
      if (tdata->lasttime.tv_sec - updatetime.tv_sec >= 1 ||
          tdata->curtrans >= tdata->tot_file_trans)
        {
          gftpui_update_current_file_in_transfer (tdata);
          memcpy (&updatetime, &tdata->lasttime, sizeof (updatetime));
        }

      bufpos = buf;
      while (num_read > 0)
        {
          if ((ret = gftp_put_next_file_chunk (tdata->toreq, bufpos,
                                               num_read)) <= 0)
            {
              num_read = ret;
              break;
            }

          num_read -= ret;
          bufpos += ret;
        }
    }

  if (num_read == GFTP_ENOTRANS)
    num_read = 0;

  g_free (buf);
  gftpui_finish_current_file_in_transfer (tdata);

  return ((int) num_read);
}


int
gftpui_common_transfer_files (gftp_transfer * tdata)
{
  intptr_t preserve_permissions, preserve_time;
  gftp_file * curfle; 
  int tofd, fromfd;
  int ret;

  tdata->curfle = tdata->files;
  gettimeofday (&tdata->starttime, NULL);
  memcpy (&tdata->lasttime, &tdata->starttime, sizeof (tdata->lasttime));

  gftp_lookup_request_option (tdata->fromreq, "preserve_time",
                              &preserve_time);

  while (tdata->curfle != NULL)
    {
      ret = -1;

      if (g_thread_supported ())
        g_static_mutex_lock (&tdata->structmutex);

      curfle = tdata->curfle->data;

          tdata->resumed_bytes += tdata->curresumed;

          if (g_thread_supported ())
            g_static_mutex_unlock (&tdata->structmutex);

          ret = _do_transfer_file (tdata);
        }

      if (tdata->cancel)
        {
          if (gftp_abort_transfer (tdata->fromreq) != 0)
            gftp_disconnect (tdata->fromreq);

          if (gftp_abort_transfer (tdata->toreq) != 0)
            gftp_disconnect (tdata->toreq);
        }
      else if (ret < 0)
        {
          tdata->fromreq->logging_function (gftp_logging_error,
                                        tdata->fromreq,
                                        _("Could not download %s from %s\n"),
                                        curfle->file,
                                        tdata->fromreq->hostname);

          if (gftp_get_transfer_status (tdata, ret) == GFTP_ERETRYABLE)
            continue;

          break;
        }
      else

      tdata->fromreq->cancel = 0;
      tdata->toreq->cancel = 0;
    }

  tdata->done = 1;

  return (1);
}