mirror of
https://github.com/curl/curl.git
synced 2026-06-16 21:15:37 +03:00
77a6bf8489
This loop was using the number of bytes read from the file as condition
to keep reading.
From Linux's fread(3) man page:
> On success, fread() and fwrite() return the number of items read or
> written. This number equals the number of bytes transferred only when
> size is 1. If an error occurs, or the end of the file is reached, the
> return value is a short item count (or zero).
>
> The file position indicator for the stream is advanced by the number
> of bytes successfully read or written.
>
> fread() does not distinguish between end-of-file and error, and
> callers must use feof(3) and ferror(3) to determine which occurred.
This means that nread!=0 doesn't make much sense as an end condition for
the loop: nread==0 doesn't necessarily mean that EOF has been reached or
an error has occured (but that is usually the case) and nread!=0 doesn't
necessarily mean that EOF has not been reached or that no read errors
have occured. feof(3) and ferror(3) should be uses when using fread(3).
Currently curl has to performs an extra fread(3) call to get a return
value equal to 0 to stop looping.
This usually "works" (even though nread==0 shouldn't be interpreted as
EOF) if stdin is a pipe because EOF usually marks the "real" end of the
stream, so the extra fread(3) call will return immediately and the extra
read syscall won't be noticeable:
bash-5.1$ strace -e read curl -s -F file=@- 0x0.st <<< a 2>&1 |
> tail -n 5
read(0, "a\n", 4096) = 2
read(0, "", 4096) = 0
read(0, "", 4096) = 0
http://0x0.st/oRs.txt
+++ exited with 0 +++
bash-5.1$
But this doesn't work if curl is reading from stdin, stdin is a
terminal, and the EOF is being emulated using a shell with ^D. Two
consecutive ^D will be required in this case to actually make curl stop
reading:
bash-5.1$ curl -F file=@- 0x0.st
a
^D^D
http://0x0.st/oRs.txt
bash-5.1$
A possible workaround to this issue is to use a program that handles EOF
correctly to indirectly send data to curl's stdin:
bash-5.1$ cat - | curl -F file=@- 0x0.st
a
^D
http://0x0.st/oRs.txt
bash-5.1$
This patch makes curl handle EOF properly when using fread(3) in
file2memory() so that the workaround is not necessary.
Since curl was previously ignoring read errors caused by this fread(3),
ferror(3) is also used in the condition of the loop: read errors and EOF
will have the same meaning; this is done to somewhat preserve the old
behaviour instead of making the command fail when a read error occurs.
Closes #8701
130 lines
4 KiB
C
130 lines
4 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* 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 https://curl.se/docs/copyright.html.
|
|
*
|
|
* 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
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
#include "tool_setup.h"
|
|
|
|
#include "strcase.h"
|
|
|
|
#define ENABLE_CURLX_PRINTF
|
|
/* use our own printf() functions */
|
|
#include "curlx.h"
|
|
|
|
#include "tool_cfgable.h"
|
|
#include "tool_msgs.h"
|
|
#include "tool_getparam.h"
|
|
#include "tool_helpers.h"
|
|
|
|
#include "memdebug.h" /* keep this as LAST include */
|
|
|
|
/*
|
|
** Helper functions that are used from more than one source file.
|
|
*/
|
|
|
|
const char *param2text(int res)
|
|
{
|
|
ParameterError error = (ParameterError)res;
|
|
switch(error) {
|
|
case PARAM_GOT_EXTRA_PARAMETER:
|
|
return "had unsupported trailing garbage";
|
|
case PARAM_OPTION_UNKNOWN:
|
|
return "is unknown";
|
|
case PARAM_OPTION_AMBIGUOUS:
|
|
return "is ambiguous";
|
|
case PARAM_REQUIRES_PARAMETER:
|
|
return "requires parameter";
|
|
case PARAM_BAD_USE:
|
|
return "is badly used here";
|
|
case PARAM_BAD_NUMERIC:
|
|
return "expected a proper numerical parameter";
|
|
case PARAM_NEGATIVE_NUMERIC:
|
|
return "expected a positive numerical parameter";
|
|
case PARAM_LIBCURL_DOESNT_SUPPORT:
|
|
return "the installed libcurl version doesn't support this";
|
|
case PARAM_LIBCURL_UNSUPPORTED_PROTOCOL:
|
|
return "a specified protocol is unsupported by libcurl";
|
|
case PARAM_NO_MEM:
|
|
return "out of memory";
|
|
case PARAM_NO_PREFIX:
|
|
return "the given option can't be reversed with a --no- prefix";
|
|
case PARAM_NUMBER_TOO_LARGE:
|
|
return "too large number";
|
|
case PARAM_NO_NOT_BOOLEAN:
|
|
return "used '--no-' for option that isn't a boolean";
|
|
case PARAM_CONTDISP_SHOW_HEADER:
|
|
return "showing headers and --remote-header-name cannot be combined";
|
|
case PARAM_CONTDISP_RESUME_FROM:
|
|
return "--continue-at and --remote-header-name cannot be combined";
|
|
case PARAM_READ_ERROR:
|
|
return "error encountered when reading a file";
|
|
default:
|
|
return "unknown error";
|
|
}
|
|
}
|
|
|
|
int SetHTTPrequest(struct OperationConfig *config, HttpReq req, HttpReq *store)
|
|
{
|
|
/* this mirrors the HttpReq enum in tool_sdecls.h */
|
|
const char *reqname[]= {
|
|
"", /* unspec */
|
|
"GET (-G, --get)",
|
|
"HEAD (-I, --head)",
|
|
"multipart formpost (-F, --form)",
|
|
"POST (-d, --data)",
|
|
"PUT (-T, --upload-file)"
|
|
};
|
|
|
|
if((*store == HTTPREQ_UNSPEC) ||
|
|
(*store == req)) {
|
|
*store = req;
|
|
return 0;
|
|
}
|
|
warnf(config->global, "You can only select one HTTP request method! "
|
|
"You asked for both %s and %s.\n",
|
|
reqname[req], reqname[*store]);
|
|
|
|
return 1;
|
|
}
|
|
|
|
void customrequest_helper(struct OperationConfig *config, HttpReq req,
|
|
char *method)
|
|
{
|
|
/* this mirrors the HttpReq enum in tool_sdecls.h */
|
|
const char *dflt[]= {
|
|
"GET",
|
|
"GET",
|
|
"HEAD",
|
|
"POST",
|
|
"POST",
|
|
"PUT"
|
|
};
|
|
|
|
if(!method)
|
|
;
|
|
else if(curl_strequal(method, dflt[req])) {
|
|
notef(config->global, "Unnecessary use of -X or --request, %s is already "
|
|
"inferred.\n", dflt[req]);
|
|
}
|
|
else if(curl_strequal(method, "head")) {
|
|
warnf(config->global,
|
|
"Setting custom HTTP method to HEAD with -X/--request may not work "
|
|
"the way you want. Consider using -I/--head instead.\n");
|
|
}
|
|
}
|