moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-03-04 03:09:44 -05:00
Code Issues Releases Wiki Activity

tool_operate: fix the suppression logic of some error messages

Browse Source 
- Fix the failed truncation and failed writing body error messages to
  not be shown unless error messages are shown. (ie the user has
  specified -sS, or has not specified -s).

- Also prefix same error messages with "curl: ", for example:
  curl: (23) Failed to truncate, exiting

Prior to this change the failed truncation error messages would be shown
if not -s, but did not account for -sS which should show.

Prior to this change the failed writing body error messages would be
shown always.

Ref: https://curl.se/docs/manpage.html#-S

Bug: https://curl.se/mail/archive-2020-12/0017.html
Reported-by: Hongyi Zhao

Closes https://github.com/curl/curl/pull/6402
This commit is contained in:
Jay Satiro 2021-01-02 03:40:24 -05:00
parent 7de2e96535
commit df1240ccac
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tool_operate.c
View File

@ -396,7 +396,8 @@ static CURLcode post_per_transfer(struct GlobalConfig *global,
if(!result && rc) { if(!result && rc) {
/* something went wrong in the writing process */ /* something went wrong in the writing process */
result = CURLE_WRITE_ERROR; result = CURLE_WRITE_ERROR;
fprintf(global->errors, "(%d) Failed writing body\n", result); if(global->showerror)
fprintf(global->errors, "curl: (%d) Failed writing body\n", result);
} }
} }
@ -559,9 +560,9 @@ static CURLcode post_per_transfer(struct GlobalConfig *global,
if(ftruncate(fileno(outs->stream), outs->init)) { if(ftruncate(fileno(outs->stream), outs->init)) {
/* when truncate fails, we can't just append as then we'll /* when truncate fails, we can't just append as then we'll
create something strange, bail out */ create something strange, bail out */
if(!global->mute) if(global->showerror)
fprintf(global->errors, fprintf(global->errors,
"failed to truncate, exiting\n"); "curl: (23) Failed to truncate file\n");
return CURLE_WRITE_ERROR; return CURLE_WRITE_ERROR;
} }
/* now seek to the end of the file, the position where we /* now seek to the end of the file, the position where we
@ -575,9 +576,9 @@ static CURLcode post_per_transfer(struct GlobalConfig *global,
rc = fseek(outs->stream, (long)outs->init, SEEK_SET); rc = fseek(outs->stream, (long)outs->init, SEEK_SET);
#endif #endif
if(rc) { if(rc) {
if(!global->mute) if(global->showerror)
fprintf(global->errors, fprintf(global->errors,
"failed seeking to end of file, exiting\n"); "curl: (23) Failed seeking to end of file\n");
return CURLE_WRITE_ERROR; return CURLE_WRITE_ERROR;
} }
outs->bytes = 0; /* clear for next round */ outs->bytes = 0; /* clear for next round */
@ -633,7 +634,8 @@ static CURLcode post_per_transfer(struct GlobalConfig *global,
if(!result && rc) { if(!result && rc) {
/* something went wrong in the writing process */ /* something went wrong in the writing process */
result = CURLE_WRITE_ERROR; result = CURLE_WRITE_ERROR;
fprintf(global->errors, "(%d) Failed writing body\n", result); if(global->showerror)
fprintf(global->errors, "curl: (%d) Failed writing body\n", result);
} }
} }