2002-09-03 13:52:59 +02:00
|
|
|
/***************************************************************************
|
2004-05-25 23:47:29 +02:00
|
|
|
* _ _ ____ _
|
|
|
|
* Project ___| | | | _ \| |
|
|
|
|
* / __| | | | |_) | |
|
|
|
|
* | (__| |_| | _ <| |___
|
1999-12-29 15:20:26 +01:00
|
|
|
* \___|\___/|_| \_\_____|
|
|
|
|
*
|
2006-04-07 23:50:47 +02:00
|
|
|
* Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
|
1999-12-29 15:20:26 +01:00
|
|
|
*
|
2002-09-03 13:52:59 +02:00
|
|
|
* This software is licensed as described in the file COPYING, which
|
|
|
|
* you should have received as part of this distribution. The terms
|
|
|
|
* are also available at http://curl.haxx.se/docs/copyright.html.
|
2004-05-25 23:47:29 +02:00
|
|
|
*
|
2001-01-03 10:29:33 +01:00
|
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
|
|
* copies of the Software, and permit persons to whom the Software is
|
2002-09-03 13:52:59 +02:00
|
|
|
* furnished to do so, under the terms of the COPYING file.
|
1999-12-29 15:20:26 +01:00
|
|
|
*
|
2001-01-03 10:29:33 +01:00
|
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
|
|
* KIND, either express or implied.
|
1999-12-29 15:20:26 +01:00
|
|
|
*
|
2001-01-03 10:29:33 +01:00
|
|
|
* $Id$
|
2002-09-03 13:52:59 +02:00
|
|
|
***************************************************************************/
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2000-08-24 16:26:33 +02:00
|
|
|
#include "setup.h"
|
|
|
|
|
2002-06-11 13:13:01 +02:00
|
|
|
#ifndef CURL_DISABLE_FILE
|
1999-12-29 15:20:26 +01:00
|
|
|
/* -- WIN32 approved -- */
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <ctype.h>
|
2004-11-02 11:12:22 +01:00
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
1999-12-29 15:20:26 +01:00
|
|
|
#include <sys/types.h>
|
2004-11-02 11:12:22 +01:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_STAT_H
|
1999-12-29 15:20:26 +01:00
|
|
|
#include <sys/stat.h>
|
2004-11-02 11:12:22 +01:00
|
|
|
#endif
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
|
|
|
|
#include <time.h>
|
|
|
|
#include <io.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#else
|
|
|
|
#ifdef HAVE_SYS_SOCKET_H
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#endif
|
2000-08-23 09:23:42 +02:00
|
|
|
#ifdef HAVE_NETINET_IN_H
|
1999-12-29 15:20:26 +01:00
|
|
|
#include <netinet/in.h>
|
2000-08-23 09:23:42 +02:00
|
|
|
#endif
|
1999-12-29 15:20:26 +01:00
|
|
|
#include <sys/time.h>
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
2000-08-23 09:23:42 +02:00
|
|
|
#ifdef HAVE_NETDB_H
|
1999-12-29 15:20:26 +01:00
|
|
|
#include <netdb.h>
|
2000-08-23 09:23:42 +02:00
|
|
|
#endif
|
1999-12-29 15:20:26 +01:00
|
|
|
#ifdef HAVE_ARPA_INET_H
|
|
|
|
#include <arpa/inet.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_NET_IF_H
|
|
|
|
#include <net/if.h>
|
|
|
|
#endif
|
|
|
|
#include <sys/ioctl.h>
|
|
|
|
#include <signal.h>
|
|
|
|
|
|
|
|
#ifdef HAVE_SYS_PARAM_H
|
|
|
|
#include <sys/param.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_FCNTL_H
|
|
|
|
#include <fcntl.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "urldata.h"
|
|
|
|
#include <curl/curl.h>
|
|
|
|
#include "progress.h"
|
|
|
|
#include "sendf.h"
|
|
|
|
#include "escape.h"
|
2004-01-29 14:56:45 +01:00
|
|
|
#include "file.h"
|
2004-03-04 16:23:57 +01:00
|
|
|
#include "speedcheck.h"
|
2004-03-05 10:40:16 +01:00
|
|
|
#include "getinfo.h"
|
2004-05-25 23:47:29 +02:00
|
|
|
#include "transfer.h"
|
|
|
|
#include "url.h"
|
2004-05-11 13:30:23 +02:00
|
|
|
#include "memory.h"
|
2005-02-11 01:03:49 +01:00
|
|
|
#include "parsedate.h" /* for the week day and month names */
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
#define _MPRINTF_REPLACE /* use our functions only */
|
|
|
|
#include <curl/mprintf.h>
|
|
|
|
|
2000-11-27 13:04:51 +01:00
|
|
|
/* The last #include file should be: */
|
|
|
|
#include "memdebug.h"
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2004-04-26 09:11:39 +02:00
|
|
|
/*
|
|
|
|
* Curl_file_connect() gets called from Curl_protocol_connect() to allow us to
|
|
|
|
* do protocol-specific actions at connect-time. We emulate a
|
|
|
|
* connect-then-transfer protocol and "connect" to the file here
|
|
|
|
*/
|
2001-03-05 14:39:01 +01:00
|
|
|
CURLcode Curl_file_connect(struct connectdata *conn)
|
1999-12-29 15:20:26 +01:00
|
|
|
{
|
2006-04-07 23:50:47 +02:00
|
|
|
char *real_path = curl_easy_unescape(conn->data, conn->path, 0, NULL);
|
2004-03-03 10:25:59 +01:00
|
|
|
struct FILEPROTO *file;
|
1999-12-29 15:20:26 +01:00
|
|
|
int fd;
|
2004-11-09 15:57:11 +01:00
|
|
|
#if defined(WIN32) || defined(MSDOS) || defined(__EMX__)
|
2001-03-14 09:28:19 +01:00
|
|
|
int i;
|
2003-08-08 19:12:04 +02:00
|
|
|
char *actual_path;
|
2001-03-14 09:28:19 +01:00
|
|
|
#endif
|
2001-03-05 14:39:01 +01:00
|
|
|
|
2004-05-13 17:17:07 +02:00
|
|
|
if(!real_path)
|
|
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
|
2004-03-03 10:25:59 +01:00
|
|
|
file = (struct FILEPROTO *)calloc(sizeof(struct FILEPROTO), 1);
|
2004-05-13 17:17:07 +02:00
|
|
|
if(!file) {
|
|
|
|
free(real_path);
|
2001-03-05 14:39:01 +01:00
|
|
|
return CURLE_OUT_OF_MEMORY;
|
2004-05-13 17:17:07 +02:00
|
|
|
}
|
2001-03-05 14:39:01 +01:00
|
|
|
|
|
|
|
conn->proto.file = file;
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2004-11-09 15:57:11 +01:00
|
|
|
#if defined(WIN32) || defined(MSDOS) || defined(__EMX__)
|
2003-08-08 19:12:04 +02:00
|
|
|
/* If the first character is a slash, and there's
|
|
|
|
something that looks like a drive at the beginning of
|
|
|
|
the path, skip the slash. If we remove the initial
|
|
|
|
slash in all cases, paths without drive letters end up
|
|
|
|
relative to the current directory which isn't how
|
|
|
|
browsers work.
|
|
|
|
|
|
|
|
Some browsers accept | instead of : as the drive letter
|
|
|
|
separator, so we do too.
|
|
|
|
|
|
|
|
On other platforms, we need the slash to indicate an
|
|
|
|
absolute pathname. On Windows, absolute paths start
|
|
|
|
with a drive letter.
|
|
|
|
*/
|
|
|
|
actual_path = real_path;
|
2003-08-08 19:56:47 +02:00
|
|
|
if ((actual_path[0] == '/') &&
|
|
|
|
actual_path[1] &&
|
2003-08-08 19:12:04 +02:00
|
|
|
(actual_path[2] == ':' || actual_path[2] == '|'))
|
|
|
|
{
|
|
|
|
actual_path[2] = ':';
|
|
|
|
actual_path++;
|
|
|
|
}
|
|
|
|
|
2004-11-09 15:57:11 +01:00
|
|
|
/* change path separators from '/' to '\\' for DOS, Windows and OS/2 */
|
1999-12-29 15:20:26 +01:00
|
|
|
for (i=0; actual_path[i] != '\0'; ++i)
|
|
|
|
if (actual_path[i] == '/')
|
|
|
|
actual_path[i] = '\\';
|
|
|
|
|
2004-10-06 09:50:18 +02:00
|
|
|
fd = open(actual_path, O_RDONLY | O_BINARY); /* no CR/LF translation! */
|
2004-05-25 23:47:29 +02:00
|
|
|
file->path = actual_path;
|
1999-12-29 15:20:26 +01:00
|
|
|
#else
|
2003-08-08 19:12:04 +02:00
|
|
|
fd = open(real_path, O_RDONLY);
|
2004-05-25 23:47:29 +02:00
|
|
|
file->path = real_path;
|
1999-12-29 15:20:26 +01:00
|
|
|
#endif
|
2004-05-25 23:47:29 +02:00
|
|
|
file->freepath = real_path; /* free this when done */
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2005-12-02 00:42:03 +01:00
|
|
|
file->fd = fd;
|
2004-05-25 23:47:29 +02:00
|
|
|
if(!conn->data->set.upload && (fd == -1)) {
|
2001-03-05 14:39:01 +01:00
|
|
|
failf(conn->data, "Couldn't open file %s", conn->path);
|
2004-05-25 23:47:29 +02:00
|
|
|
Curl_file_done(conn, CURLE_FILE_COULDNT_READ_FILE);
|
2000-05-22 16:12:12 +02:00
|
|
|
return CURLE_FILE_COULDNT_READ_FILE;
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
2001-03-05 14:39:01 +01:00
|
|
|
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2004-05-25 23:47:29 +02:00
|
|
|
CURLcode Curl_file_done(struct connectdata *conn,
|
|
|
|
CURLcode status)
|
|
|
|
{
|
|
|
|
struct FILEPROTO *file = conn->proto.file;
|
|
|
|
(void)status; /* not used */
|
2004-06-10 09:17:28 +02:00
|
|
|
Curl_safefree(file->freepath);
|
2004-05-25 23:47:29 +02:00
|
|
|
|
2004-08-17 14:00:39 +02:00
|
|
|
if(file->fd != -1)
|
|
|
|
close(file->fd);
|
|
|
|
|
2004-05-25 23:47:29 +02:00
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2004-11-09 15:57:11 +01:00
|
|
|
#if defined(WIN32) || defined(MSDOS) || defined(__EMX__)
|
2004-07-06 17:16:05 +02:00
|
|
|
#define DIRSEP '\\'
|
|
|
|
#else
|
|
|
|
#define DIRSEP '/'
|
|
|
|
#endif
|
|
|
|
|
2004-05-25 23:47:29 +02:00
|
|
|
static CURLcode file_upload(struct connectdata *conn)
|
|
|
|
{
|
|
|
|
struct FILEPROTO *file = conn->proto.file;
|
2004-07-06 17:16:05 +02:00
|
|
|
char *dir = strchr(file->path, DIRSEP);
|
2004-05-25 23:47:29 +02:00
|
|
|
FILE *fp;
|
|
|
|
CURLcode res=CURLE_OK;
|
|
|
|
struct SessionHandle *data = conn->data;
|
|
|
|
char *buf = data->state.buffer;
|
|
|
|
size_t nread;
|
|
|
|
size_t nwrite;
|
|
|
|
curl_off_t bytecount = 0;
|
|
|
|
struct timeval now = Curl_tvnow();
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Since FILE: doesn't do the full init, we need to provide some extra
|
|
|
|
* assignments here.
|
|
|
|
*/
|
|
|
|
conn->fread = data->set.fread;
|
|
|
|
conn->fread_in = data->set.in;
|
|
|
|
conn->upload_fromhere = buf;
|
|
|
|
|
|
|
|
if(!dir)
|
|
|
|
return CURLE_FILE_COULDNT_READ_FILE; /* fix: better error code */
|
|
|
|
|
|
|
|
if(!dir[1])
|
|
|
|
return CURLE_FILE_COULDNT_READ_FILE; /* fix: better error code */
|
|
|
|
|
|
|
|
fp = fopen(file->path, "wb");
|
|
|
|
if(!fp) {
|
|
|
|
failf(data, "Can't open %s for writing", file->path);
|
|
|
|
return CURLE_WRITE_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(-1 != data->set.infilesize)
|
|
|
|
/* known size of data to "upload" */
|
|
|
|
Curl_pgrsSetUploadSize(data, data->set.infilesize);
|
|
|
|
|
|
|
|
while (res == CURLE_OK) {
|
2004-06-21 16:07:38 +02:00
|
|
|
int readcount;
|
|
|
|
res = Curl_fillreadbuffer(conn, BUFSIZE, &readcount);
|
|
|
|
if(res)
|
2004-08-17 14:00:39 +02:00
|
|
|
break;
|
2004-06-21 16:07:38 +02:00
|
|
|
|
2005-12-30 01:20:46 +01:00
|
|
|
if (readcount <= 0) /* fix questionable compare error. curlvms */
|
2004-05-25 23:47:29 +02:00
|
|
|
break;
|
|
|
|
|
2005-12-30 01:07:25 +01:00
|
|
|
nread = (size_t)readcount;
|
|
|
|
|
2004-05-25 23:47:29 +02:00
|
|
|
/* write the data to the target */
|
|
|
|
nwrite = fwrite(buf, 1, nread, fp);
|
|
|
|
if(nwrite != nread) {
|
|
|
|
res = CURLE_SEND_ERROR;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
bytecount += nread;
|
|
|
|
|
|
|
|
Curl_pgrsSetUploadCounter(data, bytecount);
|
|
|
|
|
|
|
|
if(Curl_pgrsUpdate(conn))
|
|
|
|
res = CURLE_ABORTED_BY_CALLBACK;
|
|
|
|
else
|
|
|
|
res = Curl_speedcheck(data, now);
|
|
|
|
}
|
|
|
|
if(!res && Curl_pgrsUpdate(conn))
|
|
|
|
res = CURLE_ABORTED_BY_CALLBACK;
|
|
|
|
|
|
|
|
fclose(fp);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2004-04-26 09:11:39 +02:00
|
|
|
/*
|
|
|
|
* Curl_file() is the protocol-specific function for the do-phase, separated
|
|
|
|
* from the connect-phase above. Other protocols merely setup the transfer in
|
|
|
|
* the do-phase, to have it done in the main transfer loop but since some
|
|
|
|
* platforms we support don't allow select()ing etc on file handles (as
|
|
|
|
* opposed to sockets) we instead perform the whole do-operation in this
|
|
|
|
* function.
|
|
|
|
*/
|
2005-02-09 14:06:40 +01:00
|
|
|
CURLcode Curl_file(struct connectdata *conn, bool *done)
|
2001-03-05 14:39:01 +01:00
|
|
|
{
|
2004-05-25 23:47:29 +02:00
|
|
|
/* This implementation ignores the host name in conformance with
|
2001-03-05 14:39:01 +01:00
|
|
|
RFC 1738. Only local files (reachable via the standard file system)
|
|
|
|
are supported. This means that files on remotely mounted directories
|
|
|
|
(via NFS, Samba, NT sharing) can be accessed through a file:// URL
|
|
|
|
*/
|
|
|
|
CURLcode res = CURLE_OK;
|
2004-12-13 11:25:26 +01:00
|
|
|
struct_stat statbuf; /* struct_stat instead of struct stat just to allow the
|
|
|
|
Windows version to have a different struct without
|
|
|
|
having to redefine the simple word 'stat' */
|
2004-01-22 13:45:50 +01:00
|
|
|
curl_off_t expected_size=0;
|
2003-10-30 10:08:16 +01:00
|
|
|
bool fstated=FALSE;
|
2001-08-14 10:22:27 +02:00
|
|
|
ssize_t nread;
|
2001-08-31 00:48:34 +02:00
|
|
|
struct SessionHandle *data = conn->data;
|
|
|
|
char *buf = data->state.buffer;
|
2004-01-22 13:45:50 +01:00
|
|
|
curl_off_t bytecount = 0;
|
2001-03-05 14:39:01 +01:00
|
|
|
int fd;
|
2004-03-04 16:12:12 +01:00
|
|
|
struct timeval now = Curl_tvnow();
|
2001-03-05 14:39:01 +01:00
|
|
|
|
2005-02-09 14:06:40 +01:00
|
|
|
*done = TRUE; /* unconditionally */
|
|
|
|
|
2004-03-05 10:40:16 +01:00
|
|
|
Curl_readwrite_init(conn);
|
|
|
|
Curl_initinfo(data);
|
|
|
|
Curl_pgrsStartNow(data);
|
|
|
|
|
2004-05-25 23:47:29 +02:00
|
|
|
if(data->set.upload)
|
|
|
|
return file_upload(conn);
|
|
|
|
|
2001-03-05 14:39:01 +01:00
|
|
|
/* get the fd from the connection phase */
|
|
|
|
fd = conn->proto.file->fd;
|
|
|
|
|
2004-03-05 10:40:16 +01:00
|
|
|
/* VMS: This only works reliable for STREAMLF files */
|
1999-12-29 15:20:26 +01:00
|
|
|
if( -1 != fstat(fd, &statbuf)) {
|
|
|
|
/* we could stat it, then read out the size */
|
2003-10-30 10:08:16 +01:00
|
|
|
expected_size = statbuf.st_size;
|
|
|
|
fstated = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we have selected NOBODY and HEADER, it means that we only want file
|
|
|
|
information. Which for FILE can't be much more than the file size and
|
|
|
|
date. */
|
2004-04-06 17:14:10 +02:00
|
|
|
if(conn->bits.no_body && data->set.include_header && fstated) {
|
2003-10-30 10:08:16 +01:00
|
|
|
CURLcode result;
|
2004-06-24 13:54:11 +02:00
|
|
|
snprintf(buf, sizeof(data->state.buffer),
|
|
|
|
"Content-Length: %" FORMAT_OFF_T "\r\n", expected_size);
|
2003-10-30 10:08:16 +01:00
|
|
|
result = Curl_client_write(data, CLIENTWRITE_BOTH, buf, 0);
|
|
|
|
if(result)
|
|
|
|
return result;
|
|
|
|
|
2004-06-24 13:54:11 +02:00
|
|
|
result = Curl_client_write(data, CLIENTWRITE_BOTH,
|
2004-06-24 17:06:25 +02:00
|
|
|
(char *)"Accept-ranges: bytes\r\n", 0);
|
2003-10-30 10:08:16 +01:00
|
|
|
if(result)
|
|
|
|
return result;
|
|
|
|
|
|
|
|
if(fstated) {
|
|
|
|
struct tm *tm;
|
2004-02-13 08:03:03 +01:00
|
|
|
time_t clock = (time_t)statbuf.st_mtime;
|
2003-10-30 10:13:04 +01:00
|
|
|
#ifdef HAVE_GMTIME_R
|
2003-10-30 10:08:16 +01:00
|
|
|
struct tm buffer;
|
2004-02-13 08:03:03 +01:00
|
|
|
tm = (struct tm *)gmtime_r(&clock, &buffer);
|
2003-10-30 10:08:16 +01:00
|
|
|
#else
|
2004-02-13 08:03:03 +01:00
|
|
|
tm = gmtime(&clock);
|
2003-10-30 10:08:16 +01:00
|
|
|
#endif
|
|
|
|
/* format: "Tue, 15 Nov 1994 12:45:26 GMT" */
|
2005-02-11 01:03:49 +01:00
|
|
|
snprintf(buf, BUFSIZE-1,
|
|
|
|
"Last-Modified: %s, %02d %s %4d %02d:%02d:%02d GMT\r\n",
|
|
|
|
Curl_wkday[tm->tm_wday?tm->tm_wday-1:6],
|
|
|
|
tm->tm_mday,
|
|
|
|
Curl_month[tm->tm_mon],
|
|
|
|
tm->tm_year + 1900,
|
|
|
|
tm->tm_hour,
|
|
|
|
tm->tm_min,
|
|
|
|
tm->tm_sec);
|
2003-10-30 10:08:16 +01:00
|
|
|
result = Curl_client_write(data, CLIENTWRITE_BOTH, buf, 0);
|
|
|
|
}
|
|
|
|
return result;
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
|
|
|
|
2004-01-05 23:29:29 +01:00
|
|
|
if (conn->resume_from <= expected_size)
|
2002-09-23 14:46:23 +02:00
|
|
|
expected_size -= conn->resume_from;
|
2004-12-11 19:55:51 +01:00
|
|
|
else {
|
|
|
|
failf(data, "failed to resume file:// transfer");
|
|
|
|
return CURLE_BAD_DOWNLOAD_RESUME;
|
|
|
|
}
|
2002-09-23 14:46:23 +02:00
|
|
|
|
2003-10-30 10:08:16 +01:00
|
|
|
if (fstated && (expected_size == 0))
|
2002-09-23 14:46:23 +02:00
|
|
|
return CURLE_OK;
|
|
|
|
|
1999-12-29 15:20:26 +01:00
|
|
|
/* The following is a shortcut implementation of file reading
|
|
|
|
this is both more efficient than the former call to download() and
|
|
|
|
it avoids problems with select() and recv() on file descriptors
|
|
|
|
in Winsock */
|
2003-10-30 10:08:16 +01:00
|
|
|
if(fstated)
|
2004-03-10 17:20:33 +01:00
|
|
|
Curl_pgrsSetDownloadSize(data, expected_size);
|
2000-02-14 23:57:42 +01:00
|
|
|
|
2002-09-23 14:46:23 +02:00
|
|
|
if(conn->resume_from)
|
|
|
|
lseek(fd, conn->resume_from, SEEK_SET);
|
|
|
|
|
2004-03-04 16:12:12 +01:00
|
|
|
Curl_pgrsTime(data, TIMER_STARTTRANSFER);
|
|
|
|
|
2000-05-22 16:12:12 +02:00
|
|
|
while (res == CURLE_OK) {
|
1999-12-29 15:20:26 +01:00
|
|
|
nread = read(fd, buf, BUFSIZE-1);
|
|
|
|
|
2001-08-06 14:17:43 +02:00
|
|
|
if ( nread > 0)
|
1999-12-29 15:20:26 +01:00
|
|
|
buf[nread] = 0;
|
|
|
|
|
|
|
|
if (nread <= 0)
|
|
|
|
break;
|
2001-08-14 10:22:27 +02:00
|
|
|
|
1999-12-29 15:20:26 +01:00
|
|
|
bytecount += nread;
|
2000-11-22 13:51:18 +01:00
|
|
|
|
2001-01-05 11:11:41 +01:00
|
|
|
res = Curl_client_write(data, CLIENTWRITE_BODY, buf, nread);
|
2000-11-22 13:51:18 +01:00
|
|
|
if(res)
|
|
|
|
return res;
|
|
|
|
|
2004-03-10 17:20:33 +01:00
|
|
|
Curl_pgrsSetDownloadCounter(data, bytecount);
|
2004-03-04 16:12:12 +01:00
|
|
|
|
2001-04-18 09:25:11 +02:00
|
|
|
if(Curl_pgrsUpdate(conn))
|
2000-05-22 16:12:12 +02:00
|
|
|
res = CURLE_ABORTED_BY_CALLBACK;
|
2004-03-04 16:12:12 +01:00
|
|
|
else
|
2004-05-25 23:47:29 +02:00
|
|
|
res = Curl_speedcheck(data, now);
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
2001-04-18 09:25:11 +02:00
|
|
|
if(Curl_pgrsUpdate(conn))
|
2000-05-22 16:12:12 +02:00
|
|
|
res = CURLE_ABORTED_BY_CALLBACK;
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2000-05-22 16:12:12 +02:00
|
|
|
return res;
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
2004-08-17 14:00:39 +02:00
|
|
|
|
2002-06-11 13:13:01 +02:00
|
|
|
#endif
|