curl tool: renaming hugehelp files to tool_hugehelp

author: Yang Tse <yangsita@gmail.com> 2012-12-26 23:30:54 +0100
committer: Yang Tse <yangsita@gmail.com> 2012-12-26 23:30:54 +0100
commit: ae2a2c99317a611b5b6a4780df1a907a241de91b (patch)
tree: 58fb14c2f3797a05978df974017b622f7280d5e3
parent: eb5aa12c8baddeba13594e515e8b0a7d94949177 (diff)
26 files changed, 89 insertions, 86 deletions
diff --git a/GIT-INFO b/GIT-INFO
index 231a8996d..16f4a2201 100644
--- 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 b845d6eed..dc55fab89 100644
--- 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 e44f514e5..125c130f3 100644
--- 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 d06d62209..acd05e219 100644
--- 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 30c0a64ab..611b530e4 100644
--- 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 ab9a8fa7a..28498ce7b 100644
--- 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 6835518d3..761433b7a 100644
--- 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 eb6933e69..93f86cbad 100644
--- 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 6f7e8b261..75edf488b 100644
--- 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 d6fd36c12..54162b3b5 100644
--- 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 29d30dfeb..804ac6d14 100644
--- 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 76d6b7b7a..7ce30f0b6 100644
--- 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 766fc733f..b60ccd57c 100644
--- 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 93bbe8b0c..2d0e6222a 100644
--- 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 ac96c4ff0..073b20d6a 100644
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -134,7 +134,6 @@ CFLAGS = $(CFLAGS) /DUSE_WINDOWS_SSPI /I$(WINDOWS_SDK_PATH)\include
 !ENDIF
 
 RELEASE_OBJS= \
-	hugehelpr.obj \
 	nonblockr.obj \
 	rawstrr.obj \
 	strtoofftr.obj \
@@ -157,6 +156,7 @@ RELEASE_OBJS= \
 	tool_helpr.obj \
 	tool_helpersr.obj \
 	tool_homedirr.obj \
+	tool_hugehelpr.obj \
 	tool_libinfor.obj \
 	tool_mainr.obj \
 	tool_metalinkr.obj \
@@ -178,7 +178,6 @@ RELEASE_OBJS= \
 	curlr.res
 
 DEBUG_OBJS= \
-	hugehelpd.obj \
 	nonblockd.obj \
 	rawstrd.obj \
 	strtoofftd.obj \
@@ -201,6 +200,7 @@ DEBUG_OBJS= \
 	tool_helpd.obj \
 	tool_helpersd.obj \
 	tool_homedird.obj \
+	tool_hugehelpd.obj \
 	tool_libinfod.obj \
 	tool_maind.obj \
 	tool_metalinkd.obj \
@@ -341,8 +341,6 @@ debug: $(DEBUG_OBJS)
         $(MANIFESTTOOL)
 
 ## Release
-hugehelpr.obj: hugehelp.c
-	$(CCR) $(CFLAGS) /Zm200 /Fo"$@" hugehelp.c
 nonblockr.obj: ../lib/nonblock.c
 	$(CCR) $(CFLAGS) /Fo"$@" ../lib/nonblock.c
 rawstrr.obj: ../lib/rawstr.c
@@ -387,6 +385,8 @@ tool_helpersr.obj: tool_helpers.c
 	$(CCR) $(CFLAGS) /Fo"$@" tool_helpers.c
 tool_homedirr.obj: tool_homedir.c
 	$(CCR) $(CFLAGS) /Fo"$@" tool_homedir.c
+tool_hugehelpr.obj: tool_hugehelp.c
+	$(CCR) $(CFLAGS) /Zm200 /Fo"$@" tool_hugehelp.c
 tool_libinfor.obj: tool_libinfo.c
 	$(CCR) $(CFLAGS) /Fo"$@" tool_libinfo.c
 tool_mainr.obj: tool_main.c
@@ -427,8 +427,6 @@ curlr.res : curl.rc
 	$(RCR) $(RESFLAGS) /Fo"$@" curl.rc
 
 ## Debug
-hugehelpd.obj: hugehelp.c
-	$(CCD) $(CFLAGS) /Zm200 /Fo"$@" hugehelp.c
 nonblockd.obj: ../lib/nonblock.c
 	$(CCD) $(CFLAGS) /Fo"$@" ../lib/nonblock.c
 rawstrd.obj: ../lib/rawstr.c
@@ -473,6 +471,8 @@ tool_helpersd.obj: tool_helpers.c
 	$(CCD) $(CFLAGS) /Fo"$@" tool_helpers.c
 tool_homedird.obj: tool_homedir.c
 	$(CCD) $(CFLAGS) /Fo"$@" tool_homedir.c
+tool_hugehelpd.obj: tool_hugehelp.c
+	$(CCD) $(CFLAGS) /Zm200 /Fo"$@" tool_hugehelp.c
 tool_libinfod.obj: tool_libinfo.c
 	$(CCD) $(CFLAGS) /Fo"$@" tool_libinfo.c
 tool_maind.obj: tool_main.c
diff --git a/src/hugehelp.c.cvs b/src/hugehelp.c.cvs
index 7cecf64db..1c1697d73 100644
--- 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 698c916a6..28d44dfde 100644
--- 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 17da13325..7dffa9d17 100644
--- a/src/macos/MACINSTALL.TXT
+++ b/src/macos/MACINSTALL.TXT
@@ -1 +1 @@
-MACOS (not MACOS X)
-===================
-This is the first attempt at porting cURL to MacOS.
-http, ftp, dict and telnet seems to work fine, other protocols and advanced 
-features have not been all tested.
-This port is heavily based on the GUSI library from Matthias Neeracher.
-GUSI (Grand Unified Socket Interface) is a POSIX/Pthreads/Sockets library 
-bringing some of the comforts of UNIX 98 to traditional MacOS.
-The latest GUSI release can be downloaded from sourceforge 
-at <http://sourceforge.net/projects/gusi/>
-I have also write a few functions to help port UNIX applications to MacOS.
-These functions are part of the GUSI Extra library that can be downloaded at
-<http://perso.wanadoo.fr/ela/resources.html#gusiextra>
-OpenSSL support is still experimental but I hope to deliver a version 
-including SSL soon.
-cURL for MacOS requires using the CodeWarrior compiler from Metrowerks.
-First download GUSI, GUSI Extra and cURL. Access paths have been setup so that
-GUSI, GUSI Extra and cURL directories should have the same parent directory.
-Follow the instructions in GUSI Extra "readme.txt" mainly the ones related to
-SIOUX and GUSI patches. If you do not apply these patches curl will not behave 
-correctly.
-In the 'curl/src/macos' directory, decode "curl.mcp.xml.sit.hqx" (This is a 
-stuffit binhexed file)
-From the CodeWarrior IDE, import 'curl/src/macos/curl.xml', adjust the access 
-paths if required. Then you should be able to build:
- the libcurl libraries for PPC and 68K.
- the curl application (also available for PPC and 68K) which is the command
-  line version of cURL.
-If the file "hugehelp.c" is missing rename "curl/src/hugehelp.c.cvs" to 
-"hugehelp.c" and make sure its file type is 'TEXT'
-\ No newline at end of file
+MACOS (not MACOS X)
+===================
+This is the first attempt at porting cURL to MacOS.
+http, ftp, dict and telnet seems to work fine, other protocols and advanced 
+features have not been all tested.
+This port is heavily based on the GUSI library from Matthias Neeracher.
+GUSI (Grand Unified Socket Interface) is a POSIX/Pthreads/Sockets library 
+bringing some of the comforts of UNIX 98 to traditional MacOS.
+The latest GUSI release can be downloaded from sourceforge 
+at <http://sourceforge.net/projects/gusi/>
+I have also write a few functions to help port UNIX applications to MacOS.
+These functions are part of the GUSI Extra library that can be downloaded at
+<http://perso.wanadoo.fr/ela/resources.html#gusiextra>
+OpenSSL support is still experimental but I hope to deliver a version 
+including SSL soon.
+cURL for MacOS requires using the CodeWarrior compiler from Metrowerks.
+First download GUSI, GUSI Extra and cURL. Access paths have been setup so that
+GUSI, GUSI Extra and cURL directories should have the same parent directory.
+Follow the instructions in GUSI Extra "readme.txt" mainly the ones related to
+SIOUX and GUSI patches. If you do not apply these patches curl will not behave 
+correctly.
+In the 'curl/src/macos' directory, decode "curl.mcp.xml.sit.hqx" (This is a 
+stuffit binhexed file)
+From the CodeWarrior IDE, import 'curl/src/macos/curl.xml', adjust the access 
+paths if required. Then you should be able to build:
+- the libcurl libraries for PPC and 68K.
+- the curl application (also available for PPC and 68K) which is the command
+  line version of cURL.
+If the file "tool_hugehelp.c" is missing rename "curl/src/tool_hugehelp.c.cvs"
+to "tool_hugehelp.c" and make sure its file type is 'TEXT'
diff --git a/src/makefile.amiga b/src/makefile.amiga
index dc984811a..4be7e25a3 100644
--- 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 094ef665a..37db70a14 100644
--- 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 ff4604155..444b669ba 100644
--- 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 f3d72eeed..297b986f5 100644
--- 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 d794eb773..5fb7fe1d1 100644
--- a/src/vc6curlsrc.dsp
+++ b/src/vc6curlsrc.dsp
@@ -139,10 +139,6 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\hugehelp.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\lib\nonblock.c
 # End Source File
 # Begin Source File
@@ -231,6 +227,10 @@ SOURCE=.\tool_homedir.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\tool_hugehelp.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\tool_libinfo.c
 # End Source File
 # Begin Source File
@@ -311,10 +311,6 @@ SOURCE=".\config-win32.h"
 # End Source File
 # Begin Source File
 
-SOURCE=.\hugehelp.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\lib\nonblock.h
 # End Source File
 # Begin Source File
@@ -403,6 +399,10 @@ SOURCE=.\tool_homedir.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\tool_hugehelp.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\tool_libinfo.h
 # End Source File
 # Begin Source File
diff --git a/tests/testcurl.pl b/tests/testcurl.pl
index 5de997d4c..5cb25f927 100755
--- 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 bc93c4b50..b7c00cfd5 100644
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -43,8 +43,8 @@ LIBCURL_OBJS=$(CSOURCES:.c=.obj)
 top_srcdir=..
 !INCLUDE "../src/Makefile.inc"
 
-# hugehelp has a special rule
-CURL_OBJS=$(CURL_CFILES:hugehelp.c=)
+# tool_hugehelp has a special rule
+CURL_OBJS=$(CURL_CFILES:tool_hugehelp.c=)
 
 CURL_OBJS=$(CURL_OBJS:.c=.obj)
 
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 7e2904bbe..5e8b39253 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -454,7 +454,7 @@ CURL_LIBCURL_LIBNAME=$(LIB_NAME_IMP)
 !ENDIF
 !ENDIF
 
-CURL_FROM_LIBCURL=$(CURL_DIROBJ)\hugehelp.obj \
+CURL_FROM_LIBCURL=$(CURL_DIROBJ)\tool_hugehelp.obj \
  $(CURL_DIROBJ)\nonblock.obj \
  $(CURL_DIROBJ)\rawstr.obj \
  $(CURL_DIROBJ)\strtoofft.obj
@@ -466,8 +466,8 @@ $(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS)
 {$(CURL_SRC_DIR)\}.c{$(CURL_DIROBJ)\}.obj:
 	$(CC) $(CURL_CFLAGS) /Fo"$@"  $<
 
-$(CURL_DIROBJ)\hugehelp.obj: $(CURL_SRC_DIR)\hugehelp.c
-	$(CURL_CC) $(CURL_CFLAGS) /Zm200 /Fo"$@" $(CURL_SRC_DIR)\hugehelp.c
+$(CURL_DIROBJ)\tool_hugehelp.obj: $(CURL_SRC_DIR)\tool_hugehelp.c
+	$(CURL_CC) $(CURL_CFLAGS) /Zm200 /Fo"$@" $(CURL_SRC_DIR)\tool_hugehelp.c
 $(CURL_DIROBJ)\nonblock.obj: ../lib/nonblock.c
 	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/nonblock.c
 $(CURL_DIROBJ)\rawstr.obj: ../lib/rawstr.c
author	Yang Tse <yangsita@gmail.com>	2012-12-26 23:30:54 +0100
committer	Yang Tse <yangsita@gmail.com>	2012-12-26 23:30:54 +0100
commit	ae2a2c99317a611b5b6a4780df1a907a241de91b (patch)
tree	58fb14c2f3797a05978df974017b622f7280d5e3
parent	eb5aa12c8baddeba13594e515e8b0a7d94949177 (diff)