From ec5380fb33896334dd8086a3f506a6891b1f5ed9 Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Sat, 18 Mar 2000 00:12:41 +0000 Subject: [PATCH] See ChangeLog entry 2000-03-17 19:10 GMT-5 David G. Holm --- harbour/ChangeLog | 35 ++++++++++++++++++++++------------- harbour/doc/gmake.txt | 4 ++++ harbour/source/vm/main.c | 13 +++++++++++++ 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 63477d9709..004bd5bd7b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,12 @@ +2000-03-17 19:10 GMT-5 David G. Holm + * doc/gmake.txt + + Documented the need to have "CYGWIN" set to "noglob" to + avoid having Harbour and Harbour created programs expand + wildcard command line arguments (it's a run-time check). + * source/vm/main.c + + Added code to disable command line wildcard expansion by + DJGPP and MINGW32. + 20000317-18:00 GMT+1 Victor Szakats * source/vm/maindll.c ! __BORLAND__ -> __BORLANDC__ @@ -127,7 +136,7 @@ * source/rtl/gtapi.c * removed extraneous ';' -2000-03-16 02:30 GMT-5 David G. Holm +2000-03-16 02:30 GMT-5 David G. Holm * include/hbapigt.h * include/hbsetup.h * source/rtl/console.c @@ -172,7 +181,7 @@ * source/rtl/gtapi.c * added explicit casts to remove warnings. -2000-03-15 19:00 GMT-5 David G. Holm +2000-03-15 19:00 GMT-5 David G. Holm * source/rtl/tone.c ! Rearranged include file #elif list to test for __CYGWIN__ before testing for the various Windows manifest constants @@ -397,7 +406,7 @@ * contrib/rdd_ads/ads1.c * Little bug fixed in adsAppend() -2000-03-12 21:50 GMT-5 David G. Holm +2000-03-12 21:50 GMT-5 David G. Holm * source/compiler/harbour.y ! Added missing ( char * ) override for C++ on line 1549. @@ -867,7 +876,7 @@ Name of some Harbour internal functions changed to better reflect that they are Harbour extensions. -2000-03-06 20:05 GMT-5 David G. Holm +2000-03-06 20:05 GMT-5 David G. Holm * tests/regress/Makefile ! Several of the supported platforms begin program execution with the first object module listed when the executable is created, @@ -1077,7 +1086,7 @@ + tests/regress/rt_vars.ch + Added. -2000-03-02 15:10 GMT-5 David G. Holm +2000-03-02 15:10 GMT-5 David G. Holm * compiler/Makefile * macro/Makefile ! Several include files were still using the old names @@ -1367,7 +1376,7 @@ * Corrected handling of bof()/eof() * Fixed some warnings -2000-02-23 14:00 GMT-5 David G. Holm +2000-02-23 14:00 GMT-5 David G. Holm * source/rtl/inkey.c ! KEYBOARD ";" now returns INKEY() == 13, just like Clipper. @@ -1415,7 +1424,7 @@ *utils/hbdoc/hbdoc.prg *Changed to generate the new HTML template output -2000-02-21 15:45 GMT-5 David G. Holm +2000-02-21 15:45 GMT-5 David G. Holm * config/rules.cf * config/w32/bcc32.cf * config/w32/global.cf @@ -1500,7 +1509,7 @@ *doc/harbext.txt *Added usage of @() -2000-02-18 17:30 GMT-5 David G. Holm +2000-02-18 17:30 GMT-5 David G. Holm + doc/cvs_ssh.txt + New file with information on how to get CVS to work with SSH. @@ -1936,7 +1945,7 @@ * makefile.b32 - Removed -v option (debug info) from 4.0 mode. -2000-02-11 19:15 GMT-5 David G. Holm +2000-02-11 19:15 GMT-5 David G. Holm * source/rtl/inkey.c ! First pass at international character support for Windows console mode. @@ -2032,7 +2041,7 @@ * makefile.vc * temporarily - not defining _Windows for tone.c and oemansi.c -2000-02-10 13:50 GMT-5 David G. Holm +2000-02-10 13:50 GMT-5 David G. Holm * source/rtl/tone.c ! Borland C does not support Beep() under Windows. @@ -2474,7 +2483,7 @@ * s_xMousePos -> s_iMouseCol * s_yMousePos -> s_iMouseRow -2000-02-03 16:10 GMT-5 David G. Holm +2000-02-03 16:10 GMT-5 David G. Holm * bin/bld_tpl.bat * bin/bld_tpl.cmd @@ -2536,7 +2545,7 @@ * fixed to properly compile EXTERNAL directive if placed outside of a function body -2000-02-01 20:40 GMT-5 David G. Holm +2000-02-01 20:40 GMT-5 David G. Holm * bin/bld_tpl.bat * bin/bld_tpl.cmd @@ -2564,7 +2573,7 @@ source/runner/stdalone/external.prg ! EXTERNAL CLIPPER530 put between #ifdef HB_COMPAT_53 guards. -20000131-13:30 GMT-5 David G. Holm +20000131-13:30 GMT-5 David G. Holm * ChangeLog.005 + Renamed from ChangeLog and started a new ChangeLog diff --git a/harbour/doc/gmake.txt b/harbour/doc/gmake.txt index 3f91621493..94f61b7683 100644 --- a/harbour/doc/gmake.txt +++ b/harbour/doc/gmake.txt @@ -135,9 +135,13 @@ Then, you must set a couple of environment variables that indicate your architecture and compiler. For gcc on Win95/WinNT with the Cygwin library: + Notes: The CYGWIN environment variable must include "noglob" in order + to avoid having Harbour or programs created with Harbour expand + wildcard command line arguments (this is checked at run-time!) HB_ARCHITECTURE w32 HB_COMPILER gcc C_USR -DHARBOUR_USE_WIN_GTAPI + CYGWIN noglob For gcc on Win95/WinNT with the Mingw32 library: HB_ARCHITECTURE w32 diff --git a/harbour/source/vm/main.c b/harbour/source/vm/main.c index ec36a6783a..ed7a85a4c3 100644 --- a/harbour/source/vm/main.c +++ b/harbour/source/vm/main.c @@ -35,6 +35,10 @@ #include "hbsetup.h" +#ifdef __MINGW32__ +int _CRT_glob = 0; +#endif + #if defined(HARBOUR_MAIN_STD) #include "mainstd.c" #elif defined(HARBOUR_MAIN_WIN) @@ -42,3 +46,12 @@ #else #include "mainstd.c" /* Use the standard ANSI C entry point if not speficied */ #endif + +#ifdef __DJGPP__ +char **__crt0_glob_function( char *_arg ) +{ + /* This function disables command line wildcard expansion. */ + HB_SYMBOL_UNUSED( _arg ); + return 0; +} +#endif