romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-04 08:24:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

- Eric Wong introduced support for the new option -T. (dot) that makes curl

Browse source 
read stdin in a non-blocking fashion. This also brings back -T- (minus) to
  the previous blocking behavior since it could break stuff for people at
  times.
This commit is contained in:
Daniel Stenberg 2009-08-24 10:57:17 +00:00
parent 6ede4ce79d
commit 95c2b205a4
4 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main.c
View file

@ -3953,6 +3953,10 @@ static void dumpeasycode(struct Configurable *config)
curl_slist_free_all(easycode);
}
static bool stdin_upload(const char *uploadfile)
{
return curlx_strequal(uploadfile, "-") || curlx_strequal(uploadfile, ".");
}
static int
operate(struct Configurable *config, int argc, argv_item_t argv[])
@ -4417,7 +4421,7 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
}
}
infdopen=FALSE;
if(uploadfile && !curlx_strequal(uploadfile, "-")) {
if(uploadfile && !stdin_upload(uploadfile)) {
/*
* We have specified a file to upload and it isn't "-".
*/
@ -4511,11 +4515,14 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
uploadfilesize=fileinfo.st_size;
}
else if(uploadfile && curlx_strequal(uploadfile, "-")) {
else if(uploadfile && stdin_upload(uploadfile)) {
SET_BINMODE(stdin);
infd = STDIN_FILENO;
if (curlx_nonblock((curl_socket_t)infd, TRUE) < 0)
warnf(config, "fcntl failed on fd=%d: %s\n", infd, strerror(errno));
if (curlx_strequal(uploadfile, ".")) {
if (curlx_nonblock((curl_socket_t)infd, TRUE) < 0)
warnf(config,
"fcntl failed on fd=%d: %s\n", infd, strerror(errno));
}
}
if(uploadfile && config->resume_from_current)