diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2009-08-24 10:57:17 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2009-08-24 10:57:17 +0000 |
| commit | 95c2b205a4e33eab9ea331428565109bde99c8a5 (patch) | |
| tree | b52ed9087f9a1ecf5a4dcdd6ddebf8afc7ba6eb1 /src/main.c | |
| parent | 6ede4ce79d740e9ea9430bba7654aa8d92c6926a (diff) | |
- Eric Wong introduced support for the new option -T. (dot) that makes curl
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.
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c index 2dc1a6686..d1152f9d8 100644 --- a/src/main.c +++ b/src/main.c @@ -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) |