Skip to content

Commit

Permalink
curl tool: reviewed code moved to tool_*.[ch] files
Browse files Browse the repository at this point in the history
my_setopt and my_setopt_str no longer ignores curl_easy_setopt result.

Fixed some OOM handling issues.
  • Loading branch information
yangtse committed Sep 22, 2011
1 parent 3c3aa09 commit fb3845a
Show file tree
Hide file tree
Showing 9 changed files with 387 additions and 144 deletions.
16 changes: 13 additions & 3 deletions packages/Symbian/group/curl.mmp
Expand Up @@ -10,9 +10,19 @@ SOURCEPATH ../../../src
SOURCE \
main.c hugehelp.c urlglob.c writeout.c writeenv.c \
getpass.c homedir.c curlutil.c xattr.c \
tool_bname.c tool_cfgable.c tool_convert.c tool_dirhie.c \
tool_doswin.c tool_easysrc.c tool_mfiles.c tool_msgs.c \
tool_myfunc.c tool_progress.c tool_setopt.c tool_vms.c
tool_bname.c \
tool_cfgable.c \
tool_convert.c \
tool_dirhie.c \
tool_doswin.c \
tool_easysrc.c \
tool_libinfo.c \
tool_mfiles.c \
tool_msgs.c \
tool_myfunc.c \
tool_progress.c \
tool_setopt.c \
tool_vms.c

SOURCEPATH ../../../lib
SOURCE \
Expand Down
32 changes: 26 additions & 6 deletions src/Makefile.inc
Expand Up @@ -16,16 +16,36 @@ CURLX_ONES = $(top_srcdir)/lib/strtoofft.c \

CURL_CFILES = main.c hugehelp.c urlglob.c writeout.c writeenv.c \
getpass.c homedir.c curlutil.c xattr.c \
tool_bname.c tool_cfgable.c tool_convert.c tool_dirhie.c \
tool_doswin.c tool_easysrc.c tool_mfiles.c tool_msgs.c \
tool_myfunc.c tool_progress.c tool_setopt.c tool_vms.c
tool_bname.c \
tool_cfgable.c \
tool_convert.c \
tool_dirhie.c \
tool_doswin.c \
tool_easysrc.c \
tool_libinfo.c \
tool_mfiles.c \
tool_msgs.c \
tool_myfunc.c \
tool_progress.c \
tool_setopt.c \
tool_vms.c

CURL_HFILES = hugehelp.h setup.h config-win32.h config-mac.h \
config-riscos.h urlglob.h version.h xattr.h \
writeout.h writeenv.h getpass.h homedir.h curlutil.h \
tool_bname.h tool_cfgable.h tool_convert.h tool_dirhie.h \
tool_doswin.h tool_easysrc.h tool_mfiles.h tool_msgs.h \
tool_myfunc.h tool_progress.h tool_sdecls.h tool_setopt.h \
tool_bname.h \
tool_cfgable.h \
tool_convert.h \
tool_dirhie.h \
tool_doswin.h \
tool_easysrc.h \
tool_libinfo.h \
tool_mfiles.h \
tool_msgs.h \
tool_myfunc.h \
tool_progress.h \
tool_sdecls.h \
tool_setopt.h \
tool_vms.h

curl_SOURCES = $(CURL_CFILES) $(CURLX_ONES) $(CURL_HFILES)
Expand Down
6 changes: 6 additions & 0 deletions src/Makefile.vc6
Expand Up @@ -147,6 +147,7 @@ RELEASE_OBJS= \
tool_dirhier.obj \
tool_doswinr.obj \
tool_easysrcr.obj \
tool_libinfor.obj \
tool_mfilesr.obj \
tool_msgsr.obj \
tool_myfuncr.obj \
Expand All @@ -173,6 +174,7 @@ DEBUG_OBJS= \
tool_dirhied.obj \
tool_doswind.obj \
tool_easysrcd.obj \
tool_libinfod.obj \
tool_mfilesd.obj \
tool_msgsd.obj \
tool_myfuncd.obj \
Expand Down Expand Up @@ -334,6 +336,8 @@ tool_doswinr.obj: tool_doswin.c
$(CCR) $(CFLAGS) /Fo"$@" tool_doswin.c
tool_easysrcr.obj: tool_easysrc.c
$(CCR) $(CFLAGS) /Fo"$@" tool_easysrc.c
tool_libinfor.obj: tool_libinfo.c
$(CCR) $(CFLAGS) /Fo"$@" tool_libinfo.c
tool_mfilesr.obj: tool_mfiles.c
$(CCR) $(CFLAGS) /Fo"$@" tool_mfiles.c
tool_msgsr.obj: tool_msgs.c
Expand Down Expand Up @@ -384,6 +388,8 @@ tool_doswind.obj: tool_doswin.c
$(CCD) $(CFLAGS) /Fo"$@" tool_doswin.c
tool_easysrcd.obj: tool_easysrc.c
$(CCD) $(CFLAGS) /Fo"$@" tool_easysrc.c
tool_libinfod.obj: tool_libinfo.c
$(CCD) $(CFLAGS) /Fo"$@" tool_libinfo.c
tool_mfilesd.obj: tool_mfiles.c
$(CCD) $(CFLAGS) /Fo"$@" tool_mfiles.c
tool_msgsd.obj: tool_msgs.c
Expand Down

0 comments on commit fb3845a

Please sign in to comment.