From 49b79b76316248d5233d08006234933913faaa3b Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 5 Oct 2011 00:03:20 +0200 Subject: curl tool: code moved to tool_*.[ch] files --- src/tool_paramhlp.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 src/tool_paramhlp.h (limited to 'src/tool_paramhlp.h') diff --git a/src/tool_paramhlp.h b/src/tool_paramhlp.h new file mode 100644 index 000000000..8b7ec9481 --- /dev/null +++ b/src/tool_paramhlp.h @@ -0,0 +1,53 @@ +#ifndef HEADER_CURL_TOOL_PARAMHLP_H +#define HEADER_CURL_TOOL_PARAMHLP_H +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2011, Daniel Stenberg, , 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 http://curl.haxx.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 "setup.h" + +struct getout *new_getout(struct Configurable *config); + +ParameterError file2string(char **bufp, FILE *file); + +ParameterError file2memory(char **bufp, size_t *size, FILE *file); + +void cleanarg(char *str); + +int str2num(long *val, const char *str); + +long proto2num(struct Configurable *config, long *val, const char *str); + +int str2offset(curl_off_t *val, const char *str); + +void checkpasswd(const char *kind, char **userpwd); + +ParameterError add2list(struct curl_slist **list, const char *ptr); + +int ftpfilemethod(struct Configurable *config, const char *str); + +int ftpcccmethod(struct Configurable *config, const char *str); + +long delegation(struct Configurable *config, char *str); + + + +#endif /* HEADER_CURL_TOOL_PARAMHLP_H */ + -- cgit v1.2.1 From 5bf0d74120a92fb834b0d13098c0b5e93249a84f Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 5 Oct 2011 15:06:26 +0200 Subject: curl tool: OOM handling fixes --- src/tool_paramhlp.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/tool_paramhlp.h') diff --git a/src/tool_paramhlp.h b/src/tool_paramhlp.h index 8b7ec9481..f17999198 100644 --- a/src/tool_paramhlp.h +++ b/src/tool_paramhlp.h @@ -37,7 +37,7 @@ long proto2num(struct Configurable *config, long *val, const char *str); int str2offset(curl_off_t *val, const char *str); -void checkpasswd(const char *kind, char **userpwd); +ParameterError checkpasswd(const char *kind, char **userpwd); ParameterError add2list(struct curl_slist **list, const char *ptr); @@ -47,7 +47,5 @@ int ftpcccmethod(struct Configurable *config, const char *str); long delegation(struct Configurable *config, char *str); - - #endif /* HEADER_CURL_TOOL_PARAMHLP_H */ -- cgit v1.2.1 From 919c97fa65a5c00f7044e849eeb0095408413505 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 6 Apr 2012 23:35:15 +0200 Subject: curl tool: use configuration files from lib directory Configuration files such as curl_config.h and all config-*.h no longer exist nor are generated/copied into 'src' directory, now these only exist in 'lib' directory from where curl tool sources uses them. Additionally old src/setup.h has been refactored into src/tool_setup.h which now pulls lib/setup.h The possibility of a makefile needing an include path adjustment exists. --- src/tool_paramhlp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tool_paramhlp.h') diff --git a/src/tool_paramhlp.h b/src/tool_paramhlp.h index f17999198..c65450915 100644 --- a/src/tool_paramhlp.h +++ b/src/tool_paramhlp.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "setup.h" +#include "tool_setup.h" struct getout *new_getout(struct Configurable *config); -- cgit v1.2.1 From f2b6ebed7bfcfcbe65bcadbce1c5ae7e6134c11e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 10 Jul 2012 23:11:30 +0200 Subject: cmdline: parse numerical options stricter 1 - str2offset() no longer accepts negative numbers since offsets are by nature positive. 2 - introduced str2unum() for the command line parser that accepts numericals which are not supposed to be negative, so that it will properly complain on apparent bad uses and mistakes. Bug: http://curl.haxx.se/mail/archive-2012-07/0013.html --- src/tool_paramhlp.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/tool_paramhlp.h') diff --git a/src/tool_paramhlp.h b/src/tool_paramhlp.h index c65450915..50c693efd 100644 --- a/src/tool_paramhlp.h +++ b/src/tool_paramhlp.h @@ -32,6 +32,7 @@ ParameterError file2memory(char **bufp, size_t *size, FILE *file); void cleanarg(char *str); int str2num(long *val, const char *str); +int str2unum(long *val, const char *str); /* for unsigned input numbers */ long proto2num(struct Configurable *config, long *val, const char *str); -- cgit v1.2.1 From 79954a1b07c6fc8ed4cf9d48c6383521b184c818 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 26 Nov 2012 16:23:02 +0100 Subject: avoid mixing of enumerated type with another type --- src/tool_paramhlp.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/tool_paramhlp.h') diff --git a/src/tool_paramhlp.h b/src/tool_paramhlp.h index 50c693efd..de1604e90 100644 --- a/src/tool_paramhlp.h +++ b/src/tool_paramhlp.h @@ -31,12 +31,12 @@ ParameterError file2memory(char **bufp, size_t *size, FILE *file); void cleanarg(char *str); -int str2num(long *val, const char *str); -int str2unum(long *val, const char *str); /* for unsigned input numbers */ +ParameterError str2num(long *val, const char *str); +ParameterError str2unum(long *val, const char *str); long proto2num(struct Configurable *config, long *val, const char *str); -int str2offset(curl_off_t *val, const char *str); +ParameterError str2offset(curl_off_t *val, const char *str); ParameterError checkpasswd(const char *kind, char **userpwd); -- cgit v1.2.1