curl tool: renaming hugehelp files to tool_hugehelp

diff --git a/GIT-INFO b/GIT-INFO
index 231a899..16f4a22 100644 (file)
--- a/GIT-INFO
+++ b/GIT-INFO
@@ -48,9 +48,9 @@ installed:
  o nroff + perl
 
    If you don't have nroff and perl and you for some reason don't want to
-   install them, you can rename the source file src/hugehelp.c.cvs to
-   src/hugehelp.c and avoid having to generate this file. This will give you
-   a stubbed version of the file that doesn't contain actual content.
+   install them, you can rename the source file src/tool_hugehelp.c.cvs to
+   src/tool_hugehelp.c and avoid having to generate this file. This will
+   give you a stubbed version of the file that doesn't contain actual content.
 
 MAC OS X
 

diff --git a/buildconf.bat b/buildconf.bat
index b845d6e..dc55fab 100644 (file)
--- a/buildconf.bat
+++ b/buildconf.bat
@@ -12,9 +12,9 @@ ECHO ERROR: This file shall only be used with a curl git tree checkout.
 goto end_all
 :start_doing
 
-REM create hugehelp.c
-if not exist src\hugehelp.c.cvs goto end_hugehelp_c
-copy /Y src\hugehelp.c.cvs src\hugehelp.c
+REM create tool_hugehelp.c
+if not exist src\tool_hugehelp.c.cvs goto end_hugehelp_c
+copy /Y src\tool_hugehelp.c.cvs src\tool_hugehelp.c
 :end_hugehelp_c
 
 REM create Makefile

diff --git a/docs/INSTALL.cmake b/docs/INSTALL.cmake
index e44f514..125c130 100644 (file)
--- a/docs/INSTALL.cmake
+++ b/docs/INSTALL.cmake
@@ -24,7 +24,7 @@ Current flaws in the curl CMake build
    Missing features in the cmake build:
 
    - Builds libcurl without large file support
-   - It doesn't build src/hugehelp.c which creates the --manual output
+   - It doesn't build src/tool_hugehelp.c which creates the --manual output
    - Can't select which SSL library to build with, only OpenSSL
    - Doesn't build with SCP and SFTP support (libssh2)
    - Doesn't allow different resolver backends (no c-ares build support)

diff --git a/docs/INTERNALS b/docs/INTERNALS
index d06d622..acd05e2 100644 (file)
--- a/docs/INTERNALS
+++ b/docs/INTERNALS
@@ -413,10 +413,10 @@ Client
 
  main() resides in src/main.c together with most of the client code.
 
- src/hugehelp.c is automatically generated by the mkhelp.pl perl script to
- display the complete "manual" and the src/urlglob.c file holds the functions
- used for the URL-"globbing" support. Globbing in the sense that the {} and []
- expansion stuff is there.
+ src/tool_hugehelp.c is automatically generated by the mkhelp.pl perl script
+ to display the complete "manual" and the src/urlglob.c file holds the
+ functions used for the URL-"globbing" support. Globbing in the sense that
+ the {} and [] expansion stuff is there.
 
  The client mostly messes around to setup its 'config' struct properly, then
  it calls the curl_easy_*() functions of the library and when it gets back

diff --git a/docs/TODO b/docs/TODO
index 30c0a64..611b530 100644 (file)
--- a/docs/TODO
+++ b/docs/TODO
@@ -512,7 +512,7 @@ to provide the data to send.
 17.1 roffit
 
  Consider extending 'roffit' to produce decent ASCII output, and use that
- instead of (g)nroff when building src/hugehelp.c
+ instead of (g)nroff when building src/tool_hugehelp.c
 
 18. Test suite
 
@@ -659,4 +659,4 @@ to provide the data to send.
 
  Please see the following thread for more information:
  http://curl.haxx.se/mail/lib-2012-05/0178.html
- 
\ No newline at end of file
+ 

diff --git a/packages/Symbian/group/curl.mmp b/packages/Symbian/group/curl.mmp
index ab9a8fa..28498ce 100644 (file)
--- a/packages/Symbian/group/curl.mmp
+++ b/packages/Symbian/group/curl.mmp
@@ -8,7 +8,6 @@ UID           0x00000000 0xF0206442
 
 SOURCEPATH  ../../../src
 SOURCE \
-    hugehelp.c \
     tool_binmode.c \
     tool_bname.c \
     tool_cb_dbg.c \
@@ -28,6 +27,7 @@ SOURCE \
     tool_help.c \
     tool_helpers.c \
     tool_homedir.c \
+    tool_hugehelp.c \
     tool_libinfo.c \
     tool_main.c \
     tool_metalink.c \

diff --git a/src/.gitignore b/src/.gitignore
index 6835518..761433b 100644 (file)
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,7 +1,7 @@
 curl
 curl_config.h
 curl_config.h.in
-hugehelp.c
+tool_hugehelp.c
 stamp-h2
 Makefile.vc8.dist
 Makefile.vc9.dist

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eb6933e..93f86cb 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,11 @@
 set(EXE_NAME curl)
 
-# First try to locate hugehelp.c to see if it has already been created
+# First try to locate tool_hugehelp.c to see if it has already been created
 # TODO Find the file WITHOUT adding a cache entry!!! Or else the user can delete the file after the script was first run, and the script won't notice it has gone.
-find_file(HUGEHELP_C_FILE hugehelp.c PATHS . NO_DEFAULT_PATH)
+find_file(HUGEHELP_C_FILE tool_hugehelp.c PATHS . NO_DEFAULT_PATH)
 if (NOT HUGEHELP_C_FILE)
-  message(STATUS "Warning: hugehelp.c file was not generated before. Generating an 'empty' file...")
-  file(WRITE hugehelp.c "/* built-in manual is disabled, blank function */\n#include \"hugehelp.h\"\nvoid hugehelp(void) {}\n\n")
+  message(STATUS "Warning: tool_hugehelp.c file was not generated before. Generating an 'empty' file...")
+  file(WRITE tool_hugehelp.c "/* built-in manual is disabled, blank function */\n#include \"tool_hugehelp.h\"\nvoid hugehelp(void) {}\n\n")
 endif()
 
 transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")

diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index 6f7e8b2..75edf48 100644 (file)
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -132,7 +132,7 @@ OBJS = $OBJ_DIR\$(OBJS: = $OBJ_DIR\)
 
 RESOURCE = $(OBJ_DIR)$(DS)curl.res
 
-all: hugehelp.c $(OBJ_DIR) curl.exe .SYMBOLIC
+all: tool_hugehelp.c $(OBJ_DIR) curl.exe .SYMBOLIC
        @echo Welcome to cURL
 
 clean: .SYMBOLIC
@@ -141,13 +141,13 @@ clean: .SYMBOLIC
 
 vclean distclean: clean .SYMBOLIC
        -$(RD) $(OBJ_DIR)
-       -$(RM) curl.exe curl.map curl.sym hugehelp.c
+       -$(RM) curl.exe curl.map curl.sym tool_hugehelp.c
 
-hugehelp.c: hugehelp.c.cvs
+tool_hugehelp.c: tool_hugehelp.c.cvs
        $(CP) $[@ $^@
 
-hugehelp.c.cvs: .EXISTSONLY
-       $(CP) hugehelp.c $^@
+tool_hugehelp.c.cvs: .EXISTSONLY
+       $(CP) tool_hugehelp.c $^@
 
 $(OBJ_DIR):
        -$(MD) $^@

diff --git a/src/Makefile.am b/src/Makefile.am
index d6fd36c..54162b3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -67,8 +67,8 @@ curl_LDFLAGS = @LIBMETALINK_LDFLAGS@
 curl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS)
 curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la
 
-BUILT_SOURCES = hugehelp.c
-CLEANFILES = hugehelp.c
+BUILT_SOURCES = tool_hugehelp.c
+CLEANFILES = tool_hugehelp.c
 # Use the C locale to ensure that only ASCII characters appear in the
 # embedded text.
 NROFF=env LC_ALL=C @NROFF@ @MANOPT@ # figured out by the configure script
@@ -83,13 +83,14 @@ EXTRA_DIST = mkhelp.pl makefile.dj Makefile.vc6 Makefile.b32 Makefile.m32 \
 MANPAGE=$(top_srcdir)/docs/curl.1
 README=$(top_srcdir)/docs/MANUAL
 MKHELP=$(top_srcdir)/src/mkhelp.pl
-HUGE=hugehelp.c
+HUGE=tool_hugehelp.c
 
 if USE_MANUAL
 # Here are the stuff to create a built-in manual
 
 if HAVE_LIBZ
-# This generates the hugehelp.c file in both uncompressed and compressed formats
+# This generates the tool_hugehelp.c file in both uncompressed and
+# compressed formats
 $(HUGE): $(README) $(MANPAGE)  mkhelp.pl
        echo '#include "tool_setup.h"' > $(HUGE)
        echo '#ifndef HAVE_LIBZ' >> $(HUGE)
@@ -98,7 +99,7 @@ $(HUGE): $(README) $(MANPAGE)  mkhelp.pl
        $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) -c $(README) >> $(HUGE)
        echo '#endif /* HAVE_LIBZ */' >> $(HUGE)
 else # HAVE_LIBZ
-# This generates the hugehelp.c file uncompressed only
+# This generates the tool_hugehelp.c file uncompressed only
 $(HUGE): $(README) $(MANPAGE)  mkhelp.pl
        echo '#include "tool_setup.h"' > $(HUGE)
        $(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE)
@@ -108,14 +109,14 @@ else # USE_MANUAL
 # built-in manual has been disabled, make a blank file
 $(HUGE):
        echo "/* built-in manual is disabled, blank function */" > $(HUGE)
-       echo '#include "hugehelp.h"' >> $(HUGE)
+       echo '#include "tool_hugehelp.h"' >> $(HUGE)
        echo "void hugehelp(void) {}" >>$(HUGE)
 endif
 
-# ignore hugehelp.c since it is generated source code and it plays by slightly
-# different rules!
+# ignore tool_hugehelp.c since it is generated source code and it plays
+# by slightly different rules!
 checksrc:
-       @@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/src -Whugehelp.c $(curl_SOURCES)
+       @@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/src -Wtool_hugehelp.c $(curl_SOURCES)
 
 if CURLDEBUG
 # for debug builds, we scan the sources on all regular make invokes

diff --git a/src/Makefile.b32 b/src/Makefile.b32
index 29d30df..804ac6d 100644 (file)
--- a/src/Makefile.b32
+++ b/src/Makefile.b32
@@ -86,7 +86,7 @@ OBJECTS  = $(CSOURCES:.c=.obj)
 .c.obj:
        $(CC_CMD) $(CC_FLAGS) $(INCDIRS) $(DEFINES) -o$@ $<
 
-all:   $(OBJDIR) hugehelp $(PROGNAME)
+all:   $(OBJDIR) tool_hugehelp $(PROGNAME)
 
 clean:
        cd $(OBJDIR)
@@ -101,13 +101,13 @@ $(OBJDIR):
        @-$(MKDIR) $(OBJDIR)
 
 !ifdef WITH_ZLIB
-hugehelp: ..\docs\MANUAL ..\docs\curl.1 mkhelp.pl
-        groff -Tascii -man -P -c ../docs/curl.1 > hugehelp.tmp
-        perl -w mkhelp.pl -c ../docs/MANUAL < hugehelp.tmp > hugehelp.c
-       @-$(RM) hugehelp.tmp
+tool_hugehelp: ..\docs\MANUAL ..\docs\curl.1 mkhelp.pl
+        groff -Tascii -man -P -c ../docs/curl.1 > tool_hugehelp.tmp
+        perl -w mkhelp.pl -c ../docs/MANUAL < tool_hugehelp.tmp > tool_hugehelp.c
+       @-$(RM) tool_hugehelp.tmp
 !else
-hugehelp:
-       $(COPY) hugehelp.c.cvs hugehelp.c
+tool_hugehelp:
+       $(COPY) tool_hugehelp.c.cvs tool_hugehelp.c
 !endif
 
 $(PROGNAME): $(OBJECTS) $(LIBCURL_LIB) $(LINKLIB)

diff --git a/src/Makefile.inc b/src/Makefile.inc
index 76d6b7b..7ce30f0 100644 (file)
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -14,7 +14,7 @@ CURLX_ONES = $(top_srcdir)/lib/strtoofft.c \
        $(top_srcdir)/lib/rawstr.c \
        $(top_srcdir)/lib/nonblock.c
 
-CURL_CFILES = hugehelp.c \
+CURL_CFILES = \
        tool_binmode.c \
        tool_bname.c \
        tool_cb_dbg.c \
@@ -34,6 +34,7 @@ CURL_CFILES = hugehelp.c \
        tool_help.c \
        tool_helpers.c \
        tool_homedir.c \
+       tool_hugehelp.c \
        tool_libinfo.c \
        tool_main.c \
        tool_metalink.c \
@@ -53,7 +54,7 @@ CURL_CFILES = hugehelp.c \
        tool_writeout.c \
        tool_xattr.c
 
-CURL_HFILES = hugehelp.h \
+CURL_HFILES = \
        tool_binmode.h \
        tool_bname.h \
        tool_cb_dbg.h \
@@ -73,6 +74,7 @@ CURL_HFILES = hugehelp.h \
        tool_help.h \
        tool_helpers.h \
        tool_homedir.h \
+       tool_hugehelp.h \
        tool_libinfo.h \
        tool_main.h \
        tool_metalink.h \

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 766fc73..b60ccd5 100644 (file)
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -296,11 +296,11 @@ curl.exe: $(RESOURCE) $(curl_OBJECTS) $(curl_DEPENDENCIES)
        $(CC) $(LDFLAGS) -o $@ $< $(curl_OBJECTS) $(curl_LDADD)
 
 # We don't have nroff normally under win32
-# hugehelp.c: $(PROOT)/docs/MANUAL $(PROOT)/docs/curl.1 mkhelp.pl
-#      @$(call DEL, hugehelp.c)
-#      $(NROFF) -man $(PROOT)/docs/curl.1 | $(PERL) mkhelp.pl $(PROOT)/docs/MANUAL > hugehelp.c
+# tool_hugehelp.c: $(PROOT)/docs/MANUAL $(PROOT)/docs/curl.1 mkhelp.pl
+#      @$(call DEL, tool_hugehelp.c)
+#      $(NROFF) -man $(PROOT)/docs/curl.1 | $(PERL) mkhelp.pl $(PROOT)/docs/MANUAL > tool_hugehelp.c
 
-hugehelp.c:
+tool_hugehelp.c:
        @echo Creating $@
        @$(call COPY, $@.cvs, $@)
 
@@ -311,8 +311,8 @@ hugehelp.c:
        $(RC) $(RCFLAGS) $< -o $@
 
 clean:
-ifeq "$(wildcard hugehelp.c.cvs)" "hugehelp.c.cvs"
-       @$(call DEL, hugehelp.c)
+ifeq "$(wildcard tool_hugehelp.c.cvs)" "tool_hugehelp.c.cvs"
+       @$(call DEL, tool_hugehelp.c)
 endif
        @$(call DEL, $(curl_OBJECTS) $(curlx_OBJECTS) $(RESOURCE))
 

diff --git a/src/Makefile.netware b/src/Makefile.netware
index 93bbe8b..2d0e622 100644 (file)
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -379,8 +379,8 @@ install: $(INSTDIR) all
        @$(CP) $(TARGET).nlm $(INSTDIR)
 
 clean:
-ifeq "$(wildcard hugehelp.c.cvs)" "hugehelp.c.cvs"
-       -$(RM) hugehelp.c
+ifeq "$(wildcard tool_hugehelp.c.cvs)" "tool_hugehelp.c.cvs"
+       -$(RM) tool_hugehelp.c
 endif
        -$(RM) -r $(OBJDIR)
 
@@ -488,9 +488,9 @@ endif
        @echo $(DL)output $(TARGET).nlm$(DL) >> $@
 endif
 
-hugehelp.c:
+tool_hugehelp.c:
        @echo Creating $@
-       @$(CP) hugehelp.c.cvs $@
+       @$(CP) tool_hugehelp.c.cvs $@
 
 $(LIBCARES_PATH)/libcares.$(LIBEXT):
        $(MAKE) -C $(LIBCARES_PATH) -f Makefile.netware lib

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index ac96c4f..073b20d 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -134,7 +134,6 @@ CFLAGS = $(CFLAGS) /DUSE_WINDOWS_SSPI /I$(WINDOWS_SDK_PATH)\include
 !ENDIF\r
 \r
 RELEASE_OBJS= \\r
-       hugehelpr.obj \\r
        nonblockr.obj \\r
        rawstrr.obj \\r
        strtoofftr.obj \\r
@@ -157,6 +156,7 @@ RELEASE_OBJS= \
        tool_helpr.obj \\r
        tool_helpersr.obj \\r
        tool_homedirr.obj \\r
+       tool_hugehelpr.obj \\r
        tool_libinfor.obj \\r
        tool_mainr.obj \\r
        tool_metalinkr.obj \\r
@@ -178,7 +178,6 @@ RELEASE_OBJS= \
        curlr.res\r
 \r
 DEBUG_OBJS= \\r
-       hugehelpd.obj \\r
        nonblockd.obj \\r
        rawstrd.obj \\r
        strtoofftd.obj \\r
@@ -201,6 +200,7 @@ DEBUG_OBJS= \
        tool_helpd.obj \\r
        tool_helpersd.obj \\r
        tool_homedird.obj \\r
+       tool_hugehelpd.obj \\r
        tool_libinfod.obj \\r
        tool_maind.obj \\r
        tool_metalinkd.obj \\r
@@ -341,8 +341,6 @@ debug: $(DEBUG_OBJS)
         $(MANIFESTTOOL)\r
 \r
 ## Release\r
-hugehelpr.obj: hugehelp.c\r
-       $(CCR) $(CFLAGS) /Zm200 /Fo"$@" hugehelp.c\r
 nonblockr.obj: ../lib/nonblock.c\r
        $(CCR) $(CFLAGS) /Fo"$@" ../lib/nonblock.c\r
 rawstrr.obj: ../lib/rawstr.c\r
@@ -387,6 +385,8 @@ tool_helpersr.obj: tool_helpers.c
        $(CCR) $(CFLAGS) /Fo"$@" tool_helpers.c\r
 tool_homedirr.obj: tool_homedir.c\r
        $(CCR) $(CFLAGS) /Fo"$@" tool_homedir.c\r
+tool_hugehelpr.obj: tool_hugehelp.c\r
+       $(CCR) $(CFLAGS) /Zm200 /Fo"$@" tool_hugehelp.c\r
 tool_libinfor.obj: tool_libinfo.c\r
        $(CCR) $(CFLAGS) /Fo"$@" tool_libinfo.c\r
 tool_mainr.obj: tool_main.c\r
@@ -427,8 +427,6 @@ curlr.res : curl.rc
        $(RCR) $(RESFLAGS) /Fo"$@" curl.rc\r
 \r
 ## Debug\r
-hugehelpd.obj: hugehelp.c\r
-       $(CCD) $(CFLAGS) /Zm200 /Fo"$@" hugehelp.c\r
 nonblockd.obj: ../lib/nonblock.c\r
        $(CCD) $(CFLAGS) /Fo"$@" ../lib/nonblock.c\r
 rawstrd.obj: ../lib/rawstr.c\r
@@ -473,6 +471,8 @@ tool_helpersd.obj: tool_helpers.c
        $(CCD) $(CFLAGS) /Fo"$@" tool_helpers.c\r
 tool_homedird.obj: tool_homedir.c\r
        $(CCD) $(CFLAGS) /Fo"$@" tool_homedir.c\r
+tool_hugehelpd.obj: tool_hugehelp.c\r
+       $(CCD) $(CFLAGS) /Zm200 /Fo"$@" tool_hugehelp.c\r
 tool_libinfod.obj: tool_libinfo.c\r
        $(CCD) $(CFLAGS) /Fo"$@" tool_libinfo.c\r
 tool_maind.obj: tool_main.c\r

diff --git a/src/hugehelp.c.cvs b/src/hugehelp.c.cvs
index 7cecf64..1c1697d 100644 (file)
--- a/src/hugehelp.c.cvs
+++ b/src/hugehelp.c.cvs
@@ -1,5 +1,5 @@
 #include "tool_setup.h"
-#include "hugehelp.h"
+#include "tool_hugehelp.h"
 void hugehelp(void)
 {
   puts ( "This is a silly replacement for the actual file.");

diff --git a/src/hugehelp.h b/src/hugehelp.h
index 698c916..28d44df 100644 (file)
--- a/src/hugehelp.h
+++ b/src/hugehelp.h
@@ -1,5 +1,5 @@
-#ifndef HEADER_CURL_HUGEHELP_H
-#define HEADER_CURL_HUGEHELP_H
+#ifndef HEADER_CURL_TOOL_HUGEHELP_H
+#define HEADER_CURL_TOOL_HUGEHELP_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -25,4 +25,4 @@
 
 void hugehelp(void);
 
-#endif /* HEADER_CURL_HUGEHELP_H */
+#endif /* HEADER_CURL_TOOL_HUGEHELP_H */

diff --git a/src/macos/MACINSTALL.TXT b/src/macos/MACINSTALL.TXT
index 17da133..7dffa9d 100644 (file)
--- a/src/macos/MACINSTALL.TXT
+++ b/src/macos/MACINSTALL.TXT
@@ -1 +1 @@
-MACOS (not MACOS X)\r===================\rThis is the first attempt at porting cURL to MacOS.\rhttp, ftp, dict and telnet seems to work fine, other protocols and advanced \rfeatures have not been all tested.\r\rThis port is heavily based on the GUSI library from Matthias Neeracher.\rGUSI (Grand Unified Socket Interface) is a POSIX/Pthreads/Sockets library \rbringing some of the comforts of UNIX 98 to traditional MacOS.\rThe latest GUSI release can be downloaded from sourceforge \rat <http://sourceforge.net/projects/gusi/>\r\rI have also write a few functions to help port UNIX applications to MacOS.\rThese functions are part of the GUSI Extra library that can be downloaded at\r<http://perso.wanadoo.fr/ela/resources.html#gusiextra>\r\rOpenSSL support is still experimental but I hope to deliver a version \rincluding SSL soon.\r\rcURL for MacOS requires using the CodeWarrior compiler from Metrowerks.\r\rFirst download GUSI, GUSI Extra and cURL. Access paths have been setup so that\rGUSI, GUSI Extra and cURL directories should have the same parent directory.\r\rFollow the instructions in GUSI Extra "readme.txt" mainly the ones related to\rSIOUX and GUSI patches. If you do not apply these patches curl will not behave \rcorrectly.\r\rIn the 'curl/src/macos' directory, decode "curl.mcp.xml.sit.hqx" (This is a \rstuffit binhexed file)\rFrom the CodeWarrior IDE, import 'curl/src/macos/curl.xml', adjust the access \rpaths if required. Then you should be able to build:\r- the libcurl libraries for PPC and 68K.\r- the curl application (also available for PPC and 68K) which is the command\r  line version of cURL.\r\rIf the file "hugehelp.c" is missing rename "curl/src/hugehelp.c.cvs" to \r"hugehelp.c" and make sure its file type is 'TEXT'\r
\ No newline at end of file
+MACOS (not MACOS X)\r===================\rThis is the first attempt at porting cURL to MacOS.\rhttp, ftp, dict and telnet seems to work fine, other protocols and advanced \rfeatures have not been all tested.\r\rThis port is heavily based on the GUSI library from Matthias Neeracher.\rGUSI (Grand Unified Socket Interface) is a POSIX/Pthreads/Sockets library \rbringing some of the comforts of UNIX 98 to traditional MacOS.\rThe latest GUSI release can be downloaded from sourceforge \rat <http://sourceforge.net/projects/gusi/>\r\rI have also write a few functions to help port UNIX applications to MacOS.\rThese functions are part of the GUSI Extra library that can be downloaded at\r<http://perso.wanadoo.fr/ela/resources.html#gusiextra>\r\rOpenSSL support is still experimental but I hope to deliver a version \rincluding SSL soon.\r\rcURL for MacOS requires using the CodeWarrior compiler from Metrowerks.\r\rFirst download GUSI, GUSI Extra and cURL. Access paths have been setup so that\rGUSI, GUSI Extra and cURL directories should have the same parent directory.\r\rFollow the instructions in GUSI Extra "readme.txt" mainly the ones related to\rSIOUX and GUSI patches. If you do not apply these patches curl will not behave \rcorrectly.\r\rIn the 'curl/src/macos' directory, decode "curl.mcp.xml.sit.hqx" (This is a \rstuffit binhexed file)\rFrom the CodeWarrior IDE, import 'curl/src/macos/curl.xml', adjust the access \rpaths if required. Then you should be able to build:\r- the libcurl libraries for PPC and 68K.\r- the curl application (also available for PPC and 68K) which is the command\r  line version of cURL.\r\rIf the file "tool_hugehelp.c" is missing rename "curl/src/tool_hugehelp.c.cvs"\rto "tool_hugehelp.c" and make sure its file type is 'TEXT'\r

diff --git a/src/makefile.amiga b/src/makefile.amiga
index dc98481..4be7e25 100644 (file)
--- a/src/makefile.amiga
+++ b/src/makefile.amiga
@@ -20,12 +20,12 @@ include Makefile.inc
 
 OBJS = $(CURL_CFILES:.c=.o) $(CURLX_ONES:.c=.o)
 
-all:   hugehelp.c $(OBJS)
+all:   tool_hugehelp.c $(OBJS)
        $(CC) $(CFLAGS) -o cURL $(OBJS) $(LIBS) -Wl,-Map,cURL.map,--cref
 
-hugehelp.c: $(README) $(MANPAGE)  mkhelp.pl
-       rm -f hugehelp.c
-       /bin/nroff -man $(MANPAGE) | /bin/perl $(MKHELP) -c $(README) > hugehelp.c
+tool_hugehelp.c: $(README) $(MANPAGE)  mkhelp.pl
+       rm -f tool_hugehelp.c
+       /bin/nroff -man $(MANPAGE) | /bin/perl $(MKHELP) -c $(README) > tool_hugehelp.c
 
 install:
        $(INSTALL) -c cURL /c/cURL

diff --git a/src/makefile.dj b/src/makefile.dj
index 094ef66..37db70a 100644 (file)
--- a/src/makefile.dj
+++ b/src/makefile.dj
@@ -3,7 +3,7 @@
 #  Gisle Vanem <gvanem@broadpark.no>
 #
 
-DEPEND_PREREQ = # hugehelp.c
+DEPEND_PREREQ = # tool_hugehelp.c
 
 top_srcdir = ..
 TOPDIR = ..
@@ -46,14 +46,14 @@ $(PROGRAM): $(OBJECTS) ../lib/libcurl.a
 #
 # groff 1.18+ requires "-P -c"
 #
-hugehelp.c: ../docs/MANUAL ../docs/curl.1 mkhelp.pl
+tool_hugehelp.c: ../docs/MANUAL ../docs/curl.1 mkhelp.pl
        groff -Tascii -man ../docs/curl.1 | \
        perl -w mkhelp.pl ../docs/MANUAL > $@
 
 # clean generated files
 #
 genclean:
-       - $(DELETE) hugehelp.c
+       - $(DELETE) tool_hugehelp.c
 
 # clean object files and subdir
 #

diff --git a/src/mkhelp.pl b/src/mkhelp.pl
index ff46041..444b669 100644 (file)
--- a/src/mkhelp.pl
+++ b/src/mkhelp.pl
@@ -134,7 +134,7 @@ print <<HEAD
  * Generation time: $now
  */
 #ifdef USE_MANUAL
-#include "hugehelp.h"
+#include "tool_hugehelp.h"
 HEAD
     ;
 if($c) {

diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index f3d72ee..297b986 100644 (file)
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -28,7 +28,7 @@
 #include "curlx.h"
 
 #ifdef USE_MANUAL
-#  include "hugehelp.h"
+#  include "tool_hugehelp.h"
 #endif
 
 #include "tool_binmode.h"

diff --git a/src/vc6curlsrc.dsp b/src/vc6curlsrc.dsp
index d794eb7..5fb7fe1 100644 (file)
--- a/src/vc6curlsrc.dsp
+++ b/src/vc6curlsrc.dsp
@@ -139,10 +139,6 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\hugehelp.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\lib\nonblock.c\r
 # End Source File\r
 # Begin Source File\r
@@ -231,6 +227,10 @@ SOURCE=.\tool_homedir.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\tool_hugehelp.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\tool_libinfo.c\r
 # End Source File\r
 # Begin Source File\r
@@ -311,10 +311,6 @@ SOURCE=".\config-win32.h"
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\hugehelp.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\lib\nonblock.h\r
 # End Source File\r
 # Begin Source File\r
@@ -403,6 +399,10 @@ SOURCE=.\tool_homedir.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\tool_hugehelp.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\tool_libinfo.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/tests/testcurl.pl b/tests/testcurl.pl
index 5de997d..5cb25f9 100755 (executable)
--- a/tests/testcurl.pl
+++ b/tests/testcurl.pl
@@ -364,7 +364,7 @@ if (-d $CURLDIR) {
     logit "$CURLDIR is verified to be a fine git source dir";
     # remove the generated sources to force them to be re-generated each
     # time we run this test
-    unlink "$CURLDIR/src/hugehelp.c";
+    unlink "$CURLDIR/src/tool_hugehelp.c";
     # find out if curl source dir has an in-tree c-ares repo
     $have_embedded_ares = 1 if (-f "$CURLDIR/ares/GIT-INFO");
   } elsif (!$git && -f "$CURLDIR/tests/testcurl.pl") {

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index bc93c4b..b7c00cf 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -43,8 +43,8 @@ LIBCURL_OBJS=$(CSOURCES:.c=.obj)
 top_srcdir=..\r
 !INCLUDE "../src/Makefile.inc"\r
 \r
-# hugehelp has a special rule\r
-CURL_OBJS=$(CURL_CFILES:hugehelp.c=)\r
+# tool_hugehelp has a special rule\r
+CURL_OBJS=$(CURL_CFILES:tool_hugehelp.c=)\r
 \r
 CURL_OBJS=$(CURL_OBJS:.c=.obj)\r
 \r

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 7e2904b..5e8b392 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -454,7 +454,7 @@ CURL_LIBCURL_LIBNAME=$(LIB_NAME_IMP)
 !ENDIF\r
 !ENDIF\r
 \r
-CURL_FROM_LIBCURL=$(CURL_DIROBJ)\hugehelp.obj \\r
+CURL_FROM_LIBCURL=$(CURL_DIROBJ)\tool_hugehelp.obj \\r
  $(CURL_DIROBJ)\nonblock.obj \\r
  $(CURL_DIROBJ)\rawstr.obj \\r
  $(CURL_DIROBJ)\strtoofft.obj\r
@@ -466,8 +466,8 @@ $(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS)
 {$(CURL_SRC_DIR)\}.c{$(CURL_DIROBJ)\}.obj:\r
        $(CC) $(CURL_CFLAGS) /Fo"$@"  $<\r
 \r
-$(CURL_DIROBJ)\hugehelp.obj: $(CURL_SRC_DIR)\hugehelp.c\r
-       $(CURL_CC) $(CURL_CFLAGS) /Zm200 /Fo"$@" $(CURL_SRC_DIR)\hugehelp.c\r
+$(CURL_DIROBJ)\tool_hugehelp.obj: $(CURL_SRC_DIR)\tool_hugehelp.c\r
+       $(CURL_CC) $(CURL_CFLAGS) /Zm200 /Fo"$@" $(CURL_SRC_DIR)\tool_hugehelp.c\r
 $(CURL_DIROBJ)\nonblock.obj: ../lib/nonblock.c\r
        $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/nonblock.c\r
 $(CURL_DIROBJ)\rawstr.obj: ../lib/rawstr.c\r