From b061fed981c97bef78679f193173ab55a4dce91e Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Fri, 25 May 2012 17:33:28 +0900 Subject: Made -D option work with -O and -J. To achieve this, first new structure HeaderData is defined to hold necessary data to perform header-related work. Then tool_header_cb now receives HeaderData pointer as userdata. All header-related work (currently, dumping header and Content-Disposition inspection) are done in this callback function. HeaderData.outs->config is used to determine whether each work is done. Unit tests were also updated because after this change, curl code always sets CURLOPT_HEADERFUNCTION and CURLOPT_HEADERDATA. Tested with -O -J -D, -O -J -i and -O -J -D -i and all worked fine. --- src/tool_cb_hdr.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/tool_cb_hdr.h') diff --git a/src/tool_cb_hdr.h b/src/tool_cb_hdr.h index 5909336e6..0300c0068 100644 --- a/src/tool_cb_hdr.h +++ b/src/tool_cb_hdr.h @@ -23,6 +23,16 @@ ***************************************************************************/ #include "tool_setup.h" +/* Structure to pass as userdata in tool_header_cb */ +typedef struct { + /* getout object pointer currently processing */ + struct getout *urlnode; + /* output stream */ + struct OutStruct *outs; + /* header output stream */ + struct OutStruct *heads; +} HeaderData; + /* ** callback for CURLOPT_HEADERFUNCTION */ -- cgit v1.2.3