Fossil SCM

Merge in latest from trunk.

andybradford 2013-11-10 06:04 UTC url-password-fixes merge

Commit 69a19a7d7535b9740f4c0351d91c4045b79cc2d9

Parent 594bbaea700ed2d…

11 files changed +1 +1 +1 -1 +6 -3 +6 -2 +31 -22 +1 -1 +1 -1 +1 -1 +1 -1 +1 -1

~ .fossil-settings/ignore-glob ~ .fossil-settings/keep-glob ~ src/json.c ~ src/makemake.tcl ~ src/printf.c ~ src/sqlite3.c ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc

M .fossil-settings/ignore-glob

		--- .fossil-settings/ignore-glob
		+++ .fossil-settings/ignore-glob
		@@ -1,4 +1,5 @@
1	1	compat/openssl*
2	2	compat/tcl*
3	3	fossil
4	4	fossil.exe
	5	+win/fossil.exe
5	6

	--- .fossil-settings/ignore-glob
	+++ .fossil-settings/ignore-glob
	@@ -1,4 +1,5 @@
1	compat/openssl*
2	compat/tcl*
3	fossil
4	fossil.exe

5

	--- .fossil-settings/ignore-glob
	+++ .fossil-settings/ignore-glob
	@@ -1,4 +1,5 @@
1	compat/openssl*
2	compat/tcl*
3	fossil
4	fossil.exe
5	win/fossil.exe
6

M .fossil-settings/keep-glob

		--- .fossil-settings/keep-glob
		+++ .fossil-settings/keep-glob
		@@ -1,4 +1,5 @@
1	1	compat/openssl*
2	2	compat/tcl*
3	3	fossil
4	4	fossil.exe
	5	+win/fossil.exe
5	6

	--- .fossil-settings/keep-glob
	+++ .fossil-settings/keep-glob
	@@ -1,4 +1,5 @@
1	compat/openssl*
2	compat/tcl*
3	fossil
4	fossil.exe

5

	--- .fossil-settings/keep-glob
	+++ .fossil-settings/keep-glob
	@@ -1,4 +1,5 @@
1	compat/openssl*
2	compat/tcl*
3	fossil
4	fossil.exe
5	win/fossil.exe
6

M src/json.c

+1 -1

		--- src/json.c
		+++ src/json.c
		@@ -987,11 +987,11 @@
987	987	if(!jfile \|\| !*jfile){
988	988	break;
989	989	}
990	990	inFile = (0==strcmp("-",jfile))
991	991	? stdin
992		- : fopen(jfile,"rb");
	992	+ : fossil_fopen(jfile,"rb");
993	993	if(!inFile){
994	994	g.json.resultCode = FSL_JSON_E_FILE_OPEN_FAILED;
995	995	fossil_fatal("Could not open JSON file [%s].",jfile)
996	996	/* Does not return. */
997	997	;
998	998

	--- src/json.c
	+++ src/json.c
	@@ -987,11 +987,11 @@
987	if(!jfile \|\| !*jfile){
988	break;
989	}
990	inFile = (0==strcmp("-",jfile))
991	? stdin
992	: fopen(jfile,"rb");
993	if(!inFile){
994	g.json.resultCode = FSL_JSON_E_FILE_OPEN_FAILED;
995	fossil_fatal("Could not open JSON file [%s].",jfile)
996	/* Does not return. */
997	;
998

	--- src/json.c
	+++ src/json.c
	@@ -987,11 +987,11 @@
987	if(!jfile \|\| !*jfile){
988	break;
989	}
990	inFile = (0==strcmp("-",jfile))
991	? stdin
992	: fossil_fopen(jfile,"rb");
993	if(!inFile){
994	g.json.resultCode = FSL_JSON_E_FILE_OPEN_FAILED;
995	fossil_fatal("Could not open JSON file [%s].",jfile)
996	/* Does not return. */
997	;
998

M src/makemake.tcl

+6 -3

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -781,10 +781,13 @@
781	781	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
782	782	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
783	783
784	784	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
785	785	set opt {-Dmain=sqlite3_shell}
	786	+append opt " -Dsqlite3_strglob=strglob"
	787	+append opt " -Dgetenv=fossil_getenv"
	788	+append opt " -Dfopen=fossil_fopen"
786	789	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
787	790	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
788	791
789	792	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
790	793	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
		@@ -888,11 +891,11 @@
888	891
889	892	version$E: $B\src\mkversion.c
890	893	$(BCC) -o$@ $**
891	894
892	895	$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
893		- $(TCC) -o$@ -c -Dmain=sqlite3_shell $(SQLITE_OPTIONS) $**
	896	+ $(TCC) -o$@ -c -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SQLITE_OPTIONS) $**
894	897
895	898	$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
896	899	$(TCC) -o$@ -c $(SQLITE_OPTIONS) $**
897	900
898	901	$(OBJDIR)\th$O : $(SRCDIR)\th.c
		@@ -1091,11 +1094,11 @@
1091	1094
1092	1095	mkversion$E: $B\src\mkversion.c
1093	1096	$(BCC) $**
1094	1097
1095	1098	$(OX)\shell$O : $(SRCDIR)\shell.c
1096		- $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
	1099	+ $(TCC) /Fo$@ /Dmain=sqlite3_shell /Dsqlite3_strglob=strglob /Dgetenv=fossil_getenv /Dfopen=fossil_fopen $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
1097	1100
1098	1101	$(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
1099	1102	$(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
1100	1103
1101	1104	$(OX)\th$O : $(SRCDIR)\th.c
		@@ -1277,11 +1280,11 @@
1277	1280
1278	1281	# define the sqlite shell files, which need special flags on compile
1279	1282	SQLITESHELLSRC=shell.c
1280	1283	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
1281	1284	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1282		-SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob
	1285	+SQLITESHELLDEFINES=-Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1
1283	1286
1284	1287	# define the th scripting files, which need special flags on compile
1285	1288	THSRC=th.c th_lang.c
1286	1289	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
1287	1290	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
1288	1291

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -781,10 +781,13 @@
781	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
782	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
783
784	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
785	set opt {-Dmain=sqlite3_shell}



786	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
787	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
788
789	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
790	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
	@@ -888,11 +891,11 @@
888
889	version$E: $B\src\mkversion.c
890	$(BCC) -o$@ $**
891
892	$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
893	$(TCC) -o$@ -c -Dmain=sqlite3_shell $(SQLITE_OPTIONS) $**
894
895	$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
896	$(TCC) -o$@ -c $(SQLITE_OPTIONS) $**
897
898	$(OBJDIR)\th$O : $(SRCDIR)\th.c
	@@ -1091,11 +1094,11 @@
1091
1092	mkversion$E: $B\src\mkversion.c
1093	$(BCC) $**
1094
1095	$(OX)\shell$O : $(SRCDIR)\shell.c
1096	$(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
1097
1098	$(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
1099	$(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
1100
1101	$(OX)\th$O : $(SRCDIR)\th.c
	@@ -1277,11 +1280,11 @@
1277
1278	# define the sqlite shell files, which need special flags on compile
1279	SQLITESHELLSRC=shell.c
1280	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
1281	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1282	SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob
1283
1284	# define the th scripting files, which need special flags on compile
1285	THSRC=th.c th_lang.c
1286	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
1287	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
1288

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -781,10 +781,13 @@
781	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
782	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
783
784	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
785	set opt {-Dmain=sqlite3_shell}
786	append opt " -Dsqlite3_strglob=strglob"
787	append opt " -Dgetenv=fossil_getenv"
788	append opt " -Dfopen=fossil_fopen"
789	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
790	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
791
792	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
793	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
	@@ -888,11 +891,11 @@
891
892	version$E: $B\src\mkversion.c
893	$(BCC) -o$@ $**
894
895	$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
896	$(TCC) -o$@ -c -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SQLITE_OPTIONS) $**
897
898	$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
899	$(TCC) -o$@ -c $(SQLITE_OPTIONS) $**
900
901	$(OBJDIR)\th$O : $(SRCDIR)\th.c
	@@ -1091,11 +1094,11 @@
1094
1095	mkversion$E: $B\src\mkversion.c
1096	$(BCC) $**
1097
1098	$(OX)\shell$O : $(SRCDIR)\shell.c
1099	$(TCC) /Fo$@ /Dmain=sqlite3_shell /Dsqlite3_strglob=strglob /Dgetenv=fossil_getenv /Dfopen=fossil_fopen $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
1100
1101	$(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
1102	$(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
1103
1104	$(OX)\th$O : $(SRCDIR)\th.c
	@@ -1277,11 +1280,11 @@
1280
1281	# define the sqlite shell files, which need special flags on compile
1282	SQLITESHELLSRC=shell.c
1283	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
1284	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1285	SQLITESHELLDEFINES=-Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1
1286
1287	# define the th scripting files, which need special flags on compile
1288	THSRC=th.c th_lang.c
1289	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
1290	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
1291

M src/printf.c

+6 -2

		--- src/printf.c
		+++ src/printf.c
		@@ -922,11 +922,11 @@
922	922	va_list ap;
923	923	static const char *azEnv[] = { "HTTP_HOST", "HTTP_USER_AGENT",
924	924	"PATH_INFO", "QUERY_STRING", "REMOTE_ADDR", "REQUEST_METHOD",
925	925	"REQUEST_URI", "SCRIPT_NAME" };
926	926	if( g.zErrlog==0 ) return;
927		- out = fopen(g.zErrlog, "a");
	927	+ out = fossil_fopen(g.zErrlog, "a");
928	928	if( out==0 ) return;
929	929	now = time(0);
930	930	pNow = gmtime(&now);
931	931	fprintf(out, "------------- %04d-%02d-%02d %02d:%02d:%02d UTC ------------\n",
932	932	pNow->tm_year+1900, pNow->tm_mon+1, pNow->tm_mday+1,
		@@ -934,11 +934,15 @@
934	934	va_start(ap, zFormat);
935	935	vfprintf(out, zFormat, ap);
936	936	fprintf(out, "\n");
937	937	va_end(ap);
938	938	for(i=0; i<sizeof(azEnv)/sizeof(azEnv[0]); i++){
939		- if( (z = getenv(azEnv[i]))!=0 \|\| (z = P(azEnv[i]))!=0 ){
	939	+ char *p;
	940	+ if( (p = fossil_getenv(azEnv[i]))!=0 ){
	941	+ fprintf(out, "%s=%s\n", azEnv[i], p);
	942	+ fossil_filename_free(p);
	943	+ }else if( (z = P(azEnv[i]))!=0 ){
940	944	fprintf(out, "%s=%s\n", azEnv[i], z);
941	945	}
942	946	}
943	947	fclose(out);
944	948	}
945	949

	--- src/printf.c
	+++ src/printf.c
	@@ -922,11 +922,11 @@
922	va_list ap;
923	static const char *azEnv[] = { "HTTP_HOST", "HTTP_USER_AGENT",
924	"PATH_INFO", "QUERY_STRING", "REMOTE_ADDR", "REQUEST_METHOD",
925	"REQUEST_URI", "SCRIPT_NAME" };
926	if( g.zErrlog==0 ) return;
927	out = fopen(g.zErrlog, "a");
928	if( out==0 ) return;
929	now = time(0);
930	pNow = gmtime(&now);
931	fprintf(out, "------------- %04d-%02d-%02d %02d:%02d:%02d UTC ------------\n",
932	pNow->tm_year+1900, pNow->tm_mon+1, pNow->tm_mday+1,
	@@ -934,11 +934,15 @@
934	va_start(ap, zFormat);
935	vfprintf(out, zFormat, ap);
936	fprintf(out, "\n");
937	va_end(ap);
938	for(i=0; i<sizeof(azEnv)/sizeof(azEnv[0]); i++){
939	if( (z = getenv(azEnv[i]))!=0 \|\| (z = P(azEnv[i]))!=0 ){




940	fprintf(out, "%s=%s\n", azEnv[i], z);
941	}
942	}
943	fclose(out);
944	}
945

	--- src/printf.c
	+++ src/printf.c
	@@ -922,11 +922,11 @@
922	va_list ap;
923	static const char *azEnv[] = { "HTTP_HOST", "HTTP_USER_AGENT",
924	"PATH_INFO", "QUERY_STRING", "REMOTE_ADDR", "REQUEST_METHOD",
925	"REQUEST_URI", "SCRIPT_NAME" };
926	if( g.zErrlog==0 ) return;
927	out = fossil_fopen(g.zErrlog, "a");
928	if( out==0 ) return;
929	now = time(0);
930	pNow = gmtime(&now);
931	fprintf(out, "------------- %04d-%02d-%02d %02d:%02d:%02d UTC ------------\n",
932	pNow->tm_year+1900, pNow->tm_mon+1, pNow->tm_mday+1,
	@@ -934,11 +934,15 @@
934	va_start(ap, zFormat);
935	vfprintf(out, zFormat, ap);
936	fprintf(out, "\n");
937	va_end(ap);
938	for(i=0; i<sizeof(azEnv)/sizeof(azEnv[0]); i++){
939	char *p;
940	if( (p = fossil_getenv(azEnv[i]))!=0 ){
941	fprintf(out, "%s=%s\n", azEnv[i], p);
942	fossil_filename_free(p);
943	}else if( (z = P(azEnv[i]))!=0 ){
944	fprintf(out, "%s=%s\n", azEnv[i], z);
945	}
946	}
947	fclose(out);
948	}
949

M src/sqlite3.c

+31 -22

		--- src/sqlite3.c
		+++ src/sqlite3.c
		@@ -30936,18 +30936,14 @@
30936	30936	#ifndef UNUSED_VARIABLE_VALUE
30937	30937	# define UNUSED_VARIABLE_VALUE(x) (void)(x)
30938	30938	#endif
30939	30939
30940	30940	/*
30941		-** Returns the string that should be used as the directory separator.
	30941	+** Returns the character that should be used as the directory separator.
30942	30942	*/
30943		-#ifndef winGetDirDep
30944		-# ifdef __CYGWIN__
30945		-# define winGetDirDep() "/"
30946		-# else
30947		-# define winGetDirDep() "\\"
30948		-# endif
	30943	+#ifndef winGetDirSep
	30944	+# define winGetDirSep() '\\'
30949	30945	#endif
30950	30946
30951	30947	/*
30952	30948	** Do we need to manually define the Win32 file mapping APIs for use with WAL
30953	30949	** mode (e.g. these APIs are available in the Windows CE SDK; however, they
		@@ -34809,16 +34805,25 @@
34809	34805	return zConverted;
34810	34806	}
34811	34807
34812	34808	/*
34813	34809	** This function returns non-zero if the specified UTF-8 string buffer
34814		-** ends with a directory separator character.
	34810	+** ends with a directory separator character or one was successfully
	34811	+** added to it.
34815	34812	*/
34816		-static int winEndsInDirSep(char *zBuf){
	34813	+static int winMakeEndInDirSep(int nBuf, char *zBuf){
34817	34814	if( zBuf ){
34818	34815	int nLen = sqlite3Strlen30(zBuf);
34819		- return nLen>0 && winIsDirSep(zBuf[nLen-1]);
	34816	+ if( nLen>0 ){
	34817	+ if( winIsDirSep(zBuf[nLen-1]) ){
	34818	+ return 1;
	34819	+ }else if( nLen+1<nBuf ){
	34820	+ zBuf[nLen] = winGetDirSep();
	34821	+ zBuf[nLen+1] = '\0';
	34822	+ return 1;
	34823	+ }
	34824	+ }
34820	34825	}
34821	34826	return 0;
34822	34827	}
34823	34828
34824	34829	/*
		@@ -34842,11 +34847,11 @@
34842	34847
34843	34848	/* Allocate a temporary buffer to store the fully qualified file
34844	34849	** name for the temporary file. If this fails, we cannot continue.
34845	34850	*/
34846	34851	nBuf = pVfs->mxPathname;
34847		- zBuf = sqlite3MallocZero( nBuf+2 );
	34852	+ zBuf = sqlite3MallocZero( nBuf+3 );
34848	34853	if( !zBuf ){
34849	34854	OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
34850	34855	return SQLITE_IOERR_NOMEM;
34851	34856	}
34852	34857
		@@ -34854,13 +34859,12 @@
34854	34859	** has been explicitly set by the application; otherwise, use the one
34855	34860	** configured by the operating system.
34856	34861	*/
34857	34862	assert( nBuf>30 );
34858	34863	if( sqlite3_temp_directory ){
34859		- sqlite3_snprintf(nBuf-30, zBuf, "%s%s", sqlite3_temp_directory,
34860		- winEndsInDirSep(sqlite3_temp_directory) ? "" :
34861		- winGetDirDep());
	34864	+ sqlite3_snprintf(nBuf-30, zBuf, "%s", sqlite3_temp_directory);
	34865	+ winMakeEndInDirSep(nBuf-30, zBuf);
34862	34866	}
34863	34867	#if defined(__CYGWIN__)
34864	34868	else{
34865	34869	static const char *azDirs[] = {
34866	34870	0, /* getenv("SQLITE_TMPDIR") */
		@@ -34885,12 +34889,12 @@
34885	34889	for(i=0; i<sizeof(azDirs)/sizeof(azDirs[0]); zDir=azDirs[i++]){
34886	34890	void *zConverted;
34887	34891	if( zDir==0 ) continue;
34888	34892	/* If the path starts with a drive letter followed by the colon
34889	34893	** character, assume it is already a native Win32 path; otherwise,
34890		- ** it must be converted to a native Win32 path prior via the Cygwin
34891		- ** API prior to using it.
	34894	+ ** it must be converted to a native Win32 path via the Cygwin API
	34895	+ ** prior to using it.
34892	34896	*/
34893	34897	if( winIsDriveLetterAndColon(zDir) ){
34894	34898	zConverted = winConvertFromUtf8Filename(zDir);
34895	34899	if( !zConverted ){
34896	34900	sqlite3_free(zBuf);
		@@ -34897,10 +34901,11 @@
34897	34901	OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
34898	34902	return SQLITE_IOERR_NOMEM;
34899	34903	}
34900	34904	if( winIsDir(zConverted) ){
34901	34905	sqlite3_snprintf(nBuf-30, zBuf, "%s", zDir);
	34906	+ winMakeEndInDirSep(nBuf-30, zBuf);
34902	34907	sqlite3_free(zConverted);
34903	34908	break;
34904	34909	}
34905	34910	sqlite3_free(zConverted);
34906	34911	}else{
		@@ -34931,15 +34936,17 @@
34931	34936	sqlite3_free(zBuf);
34932	34937	OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
34933	34938	return SQLITE_IOERR_NOMEM;
34934	34939	}
34935	34940	sqlite3_snprintf(nBuf-30, zBuf, "%s", zUtf8);
	34941	+ winMakeEndInDirSep(nBuf-30, zBuf);
34936	34942	sqlite3_free(zUtf8);
34937	34943	sqlite3_free(zConverted);
34938	34944	break;
34939	34945	}else{
34940	34946	sqlite3_snprintf(nBuf-30, zBuf, "%s", zConverted);
	34947	+ winMakeEndInDirSep(nBuf-30, zBuf);
34941	34948	sqlite3_free(zConverted);
34942	34949	break;
34943	34950	}
34944	34951	}
34945	34952	sqlite3_free(zConverted);
		@@ -34963,10 +34970,11 @@
34963	34970	"winGetTempname1", 0);
34964	34971	}
34965	34972	zMulti = winUnicodeToUtf8(zWidePath);
34966	34973	if( zMulti ){
34967	34974	sqlite3_snprintf(nBuf-30, zBuf, "%s", zMulti);
	34975	+ winMakeEndInDirSep(nBuf-30, zBuf);
34968	34976	sqlite3_free(zMulti);
34969	34977	sqlite3_free(zWidePath);
34970	34978	}else{
34971	34979	sqlite3_free(zWidePath);
34972	34980	sqlite3_free(zBuf);
		@@ -34990,10 +34998,11 @@
34990	34998	"winGetTempname2", 0);
34991	34999	}
34992	35000	zUtf8 = sqlite3_win32_mbcs_to_utf8(zMbcsPath);
34993	35001	if( zUtf8 ){
34994	35002	sqlite3_snprintf(nBuf-30, zBuf, "%s", zUtf8);
	35003	+ winMakeEndInDirSep(nBuf-30, zBuf);
34995	35004	sqlite3_free(zUtf8);
34996	35005	}else{
34997	35006	sqlite3_free(zBuf);
34998	35007	OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
34999	35008	return SQLITE_IOERR_NOMEM;
		@@ -35611,12 +35620,12 @@
35611	35620	pVfs->mxPathname+1)<0 ){
35612	35621	sqlite3_free(zOut);
35613	35622	return winLogError(SQLITE_CANTOPEN_CONVPATH, (DWORD)errno,
35614	35623	"winFullPathname1", zRelative);
35615	35624	}
35616		- sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s%s%s",
35617		- sqlite3_data_directory, winGetDirDep(), zOut);
	35625	+ sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s%c%s",
	35626	+ sqlite3_data_directory, winGetDirSep(), zOut);
35618	35627	sqlite3_free(zOut);
35619	35628	}else{
35620	35629	if( cygwin_conv_path(CCP_POSIX_TO_WIN_A, zRelative, zFull, nFull)<0 ){
35621	35630	return winLogError(SQLITE_CANTOPEN_CONVPATH, (DWORD)errno,
35622	35631	"winFullPathname2", zRelative);
		@@ -35634,12 +35643,12 @@
35634	35643	** NOTE: We are dealing with a relative path name and the data
35635	35644	** directory has been set. Therefore, use it as the basis
35636	35645	** for converting the relative path name to an absolute
35637	35646	** one by prepending the data directory and a backslash.
35638	35647	*/
35639		- sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s%s%s",
35640		- sqlite3_data_directory, winGetDirDep(), zRelative);
	35648	+ sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s%c%s",
	35649	+ sqlite3_data_directory, winGetDirSep(), zRelative);
35641	35650	}else{
35642	35651	sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s", zRelative);
35643	35652	}
35644	35653	return SQLITE_OK;
35645	35654	#endif
		@@ -35667,12 +35676,12 @@
35667	35676	** NOTE: We are dealing with a relative path name and the data
35668	35677	** directory has been set. Therefore, use it as the basis
35669	35678	** for converting the relative path name to an absolute
35670	35679	** one by prepending the data directory and a backslash.
35671	35680	*/
35672		- sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s%s%s",
35673		- sqlite3_data_directory, winGetDirDep(), zRelative);
	35681	+ sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s%c%s",
	35682	+ sqlite3_data_directory, winGetDirSep(), zRelative);
35674	35683	return SQLITE_OK;
35675	35684	}
35676	35685	zConverted = winConvertFromUtf8Filename(zRelative);
35677	35686	if( zConverted==0 ){
35678	35687	return SQLITE_IOERR_NOMEM;
35679	35688

	--- src/sqlite3.c
	+++ src/sqlite3.c
	@@ -30936,18 +30936,14 @@
30936	#ifndef UNUSED_VARIABLE_VALUE
30937	# define UNUSED_VARIABLE_VALUE(x) (void)(x)
30938	#endif
30939
30940	/*
30941	** Returns the string that should be used as the directory separator.
30942	*/
30943	#ifndef winGetDirDep
30944	# ifdef __CYGWIN__
30945	# define winGetDirDep() "/"
30946	# else
30947	# define winGetDirDep() "\\"
30948	# endif
30949	#endif
30950
30951	/*
30952	** Do we need to manually define the Win32 file mapping APIs for use with WAL
30953	** mode (e.g. these APIs are available in the Windows CE SDK; however, they
	@@ -34809,16 +34805,25 @@
34809	return zConverted;
34810	}
34811
34812	/*
34813	** This function returns non-zero if the specified UTF-8 string buffer
34814	** ends with a directory separator character.

34815	*/
34816	static int winEndsInDirSep(char *zBuf){
34817	if( zBuf ){
34818	int nLen = sqlite3Strlen30(zBuf);
34819	return nLen>0 && winIsDirSep(zBuf[nLen-1]);








34820	}
34821	return 0;
34822	}
34823
34824	/*
	@@ -34842,11 +34847,11 @@
34842
34843	/* Allocate a temporary buffer to store the fully qualified file
34844	** name for the temporary file. If this fails, we cannot continue.
34845	*/
34846	nBuf = pVfs->mxPathname;
34847	zBuf = sqlite3MallocZero( nBuf+2 );
34848	if( !zBuf ){
34849	OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
34850	return SQLITE_IOERR_NOMEM;
34851	}
34852
	@@ -34854,13 +34859,12 @@
34854	** has been explicitly set by the application; otherwise, use the one
34855	** configured by the operating system.
34856	*/
34857	assert( nBuf>30 );
34858	if( sqlite3_temp_directory ){
34859	sqlite3_snprintf(nBuf-30, zBuf, "%s%s", sqlite3_temp_directory,
34860	winEndsInDirSep(sqlite3_temp_directory) ? "" :
34861	winGetDirDep());
34862	}
34863	#if defined(__CYGWIN__)
34864	else{
34865	static const char *azDirs[] = {
34866	0, /* getenv("SQLITE_TMPDIR") */
	@@ -34885,12 +34889,12 @@
34885	for(i=0; i<sizeof(azDirs)/sizeof(azDirs[0]); zDir=azDirs[i++]){
34886	void *zConverted;
34887	if( zDir==0 ) continue;
34888	/* If the path starts with a drive letter followed by the colon
34889	** character, assume it is already a native Win32 path; otherwise,
34890	** it must be converted to a native Win32 path prior via the Cygwin
34891	** API prior to using it.
34892	*/
34893	if( winIsDriveLetterAndColon(zDir) ){
34894	zConverted = winConvertFromUtf8Filename(zDir);
34895	if( !zConverted ){
34896	sqlite3_free(zBuf);
	@@ -34897,10 +34901,11 @@
34897	OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
34898	return SQLITE_IOERR_NOMEM;
34899	}
34900	if( winIsDir(zConverted) ){
34901	sqlite3_snprintf(nBuf-30, zBuf, "%s", zDir);

34902	sqlite3_free(zConverted);
34903	break;
34904	}
34905	sqlite3_free(zConverted);
34906	}else{
	@@ -34931,15 +34936,17 @@
34931	sqlite3_free(zBuf);
34932	OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
34933	return SQLITE_IOERR_NOMEM;
34934	}
34935	sqlite3_snprintf(nBuf-30, zBuf, "%s", zUtf8);

34936	sqlite3_free(zUtf8);
34937	sqlite3_free(zConverted);
34938	break;
34939	}else{
34940	sqlite3_snprintf(nBuf-30, zBuf, "%s", zConverted);

34941	sqlite3_free(zConverted);
34942	break;
34943	}
34944	}
34945	sqlite3_free(zConverted);
	@@ -34963,10 +34970,11 @@
34963	"winGetTempname1", 0);
34964	}
34965	zMulti = winUnicodeToUtf8(zWidePath);
34966	if( zMulti ){
34967	sqlite3_snprintf(nBuf-30, zBuf, "%s", zMulti);

34968	sqlite3_free(zMulti);
34969	sqlite3_free(zWidePath);
34970	}else{
34971	sqlite3_free(zWidePath);
34972	sqlite3_free(zBuf);
	@@ -34990,10 +34998,11 @@
34990	"winGetTempname2", 0);
34991	}
34992	zUtf8 = sqlite3_win32_mbcs_to_utf8(zMbcsPath);
34993	if( zUtf8 ){
34994	sqlite3_snprintf(nBuf-30, zBuf, "%s", zUtf8);

34995	sqlite3_free(zUtf8);
34996	}else{
34997	sqlite3_free(zBuf);
34998	OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
34999	return SQLITE_IOERR_NOMEM;
	@@ -35611,12 +35620,12 @@
35611	pVfs->mxPathname+1)<0 ){
35612	sqlite3_free(zOut);
35613	return winLogError(SQLITE_CANTOPEN_CONVPATH, (DWORD)errno,
35614	"winFullPathname1", zRelative);
35615	}
35616	sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s%s%s",
35617	sqlite3_data_directory, winGetDirDep(), zOut);
35618	sqlite3_free(zOut);
35619	}else{
35620	if( cygwin_conv_path(CCP_POSIX_TO_WIN_A, zRelative, zFull, nFull)<0 ){
35621	return winLogError(SQLITE_CANTOPEN_CONVPATH, (DWORD)errno,
35622	"winFullPathname2", zRelative);
	@@ -35634,12 +35643,12 @@
35634	** NOTE: We are dealing with a relative path name and the data
35635	** directory has been set. Therefore, use it as the basis
35636	** for converting the relative path name to an absolute
35637	** one by prepending the data directory and a backslash.
35638	*/
35639	sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s%s%s",
35640	sqlite3_data_directory, winGetDirDep(), zRelative);
35641	}else{
35642	sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s", zRelative);
35643	}
35644	return SQLITE_OK;
35645	#endif
	@@ -35667,12 +35676,12 @@
35667	** NOTE: We are dealing with a relative path name and the data
35668	** directory has been set. Therefore, use it as the basis
35669	** for converting the relative path name to an absolute
35670	** one by prepending the data directory and a backslash.
35671	*/
35672	sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s%s%s",
35673	sqlite3_data_directory, winGetDirDep(), zRelative);
35674	return SQLITE_OK;
35675	}
35676	zConverted = winConvertFromUtf8Filename(zRelative);
35677	if( zConverted==0 ){
35678	return SQLITE_IOERR_NOMEM;
35679

	--- src/sqlite3.c
	+++ src/sqlite3.c
	@@ -30936,18 +30936,14 @@
30936	#ifndef UNUSED_VARIABLE_VALUE
30937	# define UNUSED_VARIABLE_VALUE(x) (void)(x)
30938	#endif
30939
30940	/*
30941	** Returns the character that should be used as the directory separator.
30942	*/
30943	#ifndef winGetDirSep
30944	# define winGetDirSep() '\\'




30945	#endif
30946
30947	/*
30948	** Do we need to manually define the Win32 file mapping APIs for use with WAL
30949	** mode (e.g. these APIs are available in the Windows CE SDK; however, they
	@@ -34809,16 +34805,25 @@
34805	return zConverted;
34806	}
34807
34808	/*
34809	** This function returns non-zero if the specified UTF-8 string buffer
34810	** ends with a directory separator character or one was successfully
34811	** added to it.
34812	*/
34813	static int winMakeEndInDirSep(int nBuf, char *zBuf){
34814	if( zBuf ){
34815	int nLen = sqlite3Strlen30(zBuf);
34816	if( nLen>0 ){
34817	if( winIsDirSep(zBuf[nLen-1]) ){
34818	return 1;
34819	}else if( nLen+1<nBuf ){
34820	zBuf[nLen] = winGetDirSep();
34821	zBuf[nLen+1] = '\0';
34822	return 1;
34823	}
34824	}
34825	}
34826	return 0;
34827	}
34828
34829	/*
	@@ -34842,11 +34847,11 @@
34847
34848	/* Allocate a temporary buffer to store the fully qualified file
34849	** name for the temporary file. If this fails, we cannot continue.
34850	*/
34851	nBuf = pVfs->mxPathname;
34852	zBuf = sqlite3MallocZero( nBuf+3 );
34853	if( !zBuf ){
34854	OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
34855	return SQLITE_IOERR_NOMEM;
34856	}
34857
	@@ -34854,13 +34859,12 @@
34859	** has been explicitly set by the application; otherwise, use the one
34860	** configured by the operating system.
34861	*/
34862	assert( nBuf>30 );
34863	if( sqlite3_temp_directory ){
34864	sqlite3_snprintf(nBuf-30, zBuf, "%s", sqlite3_temp_directory);
34865	winMakeEndInDirSep(nBuf-30, zBuf);

34866	}
34867	#if defined(__CYGWIN__)
34868	else{
34869	static const char *azDirs[] = {
34870	0, /* getenv("SQLITE_TMPDIR") */
	@@ -34885,12 +34889,12 @@
34889	for(i=0; i<sizeof(azDirs)/sizeof(azDirs[0]); zDir=azDirs[i++]){
34890	void *zConverted;
34891	if( zDir==0 ) continue;
34892	/* If the path starts with a drive letter followed by the colon
34893	** character, assume it is already a native Win32 path; otherwise,
34894	** it must be converted to a native Win32 path via the Cygwin API
34895	** prior to using it.
34896	*/
34897	if( winIsDriveLetterAndColon(zDir) ){
34898	zConverted = winConvertFromUtf8Filename(zDir);
34899	if( !zConverted ){
34900	sqlite3_free(zBuf);
	@@ -34897,10 +34901,11 @@
34901	OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
34902	return SQLITE_IOERR_NOMEM;
34903	}
34904	if( winIsDir(zConverted) ){
34905	sqlite3_snprintf(nBuf-30, zBuf, "%s", zDir);
34906	winMakeEndInDirSep(nBuf-30, zBuf);
34907	sqlite3_free(zConverted);
34908	break;
34909	}
34910	sqlite3_free(zConverted);
34911	}else{
	@@ -34931,15 +34936,17 @@
34936	sqlite3_free(zBuf);
34937	OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
34938	return SQLITE_IOERR_NOMEM;
34939	}
34940	sqlite3_snprintf(nBuf-30, zBuf, "%s", zUtf8);
34941	winMakeEndInDirSep(nBuf-30, zBuf);
34942	sqlite3_free(zUtf8);
34943	sqlite3_free(zConverted);
34944	break;
34945	}else{
34946	sqlite3_snprintf(nBuf-30, zBuf, "%s", zConverted);
34947	winMakeEndInDirSep(nBuf-30, zBuf);
34948	sqlite3_free(zConverted);
34949	break;
34950	}
34951	}
34952	sqlite3_free(zConverted);
	@@ -34963,10 +34970,11 @@
34970	"winGetTempname1", 0);
34971	}
34972	zMulti = winUnicodeToUtf8(zWidePath);
34973	if( zMulti ){
34974	sqlite3_snprintf(nBuf-30, zBuf, "%s", zMulti);
34975	winMakeEndInDirSep(nBuf-30, zBuf);
34976	sqlite3_free(zMulti);
34977	sqlite3_free(zWidePath);
34978	}else{
34979	sqlite3_free(zWidePath);
34980	sqlite3_free(zBuf);
	@@ -34990,10 +34998,11 @@
34998	"winGetTempname2", 0);
34999	}
35000	zUtf8 = sqlite3_win32_mbcs_to_utf8(zMbcsPath);
35001	if( zUtf8 ){
35002	sqlite3_snprintf(nBuf-30, zBuf, "%s", zUtf8);
35003	winMakeEndInDirSep(nBuf-30, zBuf);
35004	sqlite3_free(zUtf8);
35005	}else{
35006	sqlite3_free(zBuf);
35007	OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
35008	return SQLITE_IOERR_NOMEM;
	@@ -35611,12 +35620,12 @@
35620	pVfs->mxPathname+1)<0 ){
35621	sqlite3_free(zOut);
35622	return winLogError(SQLITE_CANTOPEN_CONVPATH, (DWORD)errno,
35623	"winFullPathname1", zRelative);
35624	}
35625	sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s%c%s",
35626	sqlite3_data_directory, winGetDirSep(), zOut);
35627	sqlite3_free(zOut);
35628	}else{
35629	if( cygwin_conv_path(CCP_POSIX_TO_WIN_A, zRelative, zFull, nFull)<0 ){
35630	return winLogError(SQLITE_CANTOPEN_CONVPATH, (DWORD)errno,
35631	"winFullPathname2", zRelative);
	@@ -35634,12 +35643,12 @@
35643	** NOTE: We are dealing with a relative path name and the data
35644	** directory has been set. Therefore, use it as the basis
35645	** for converting the relative path name to an absolute
35646	** one by prepending the data directory and a backslash.
35647	*/
35648	sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s%c%s",
35649	sqlite3_data_directory, winGetDirSep(), zRelative);
35650	}else{
35651	sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s", zRelative);
35652	}
35653	return SQLITE_OK;
35654	#endif
	@@ -35667,12 +35676,12 @@
35676	** NOTE: We are dealing with a relative path name and the data
35677	** directory has been set. Therefore, use it as the basis
35678	** for converting the relative path name to an absolute
35679	** one by prepending the data directory and a backslash.
35680	*/
35681	sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s%c%s",
35682	sqlite3_data_directory, winGetDirSep(), zRelative);
35683	return SQLITE_OK;
35684	}
35685	zConverted = winConvertFromUtf8Filename(zRelative);
35686	if( zConverted==0 ){
35687	return SQLITE_IOERR_NOMEM;
35688

M win/Makefile.PellesCGMake

+1 -1

		--- win/Makefile.PellesCGMake
		+++ win/Makefile.PellesCGMake
		@@ -89,11 +89,11 @@
89	89
90	90	# define the sqlite shell files, which need special flags on compile
91	91	SQLITESHELLSRC=shell.c
92	92	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93	93	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94		-SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob
	94	+SQLITESHELLDEFINES=-Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1
95	95
96	96	# define the th scripting files, which need special flags on compile
97	97	THSRC=th.c th_lang.c
98	98	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
99	99	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
100	100

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -89,11 +89,11 @@
89
90	# define the sqlite shell files, which need special flags on compile
91	SQLITESHELLSRC=shell.c
92	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94	SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob
95
96	# define the th scripting files, which need special flags on compile
97	THSRC=th.c th_lang.c
98	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
99	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
100

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -89,11 +89,11 @@
89
90	# define the sqlite shell files, which need special flags on compile
91	SQLITESHELLSRC=shell.c
92	ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93	SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94	SQLITESHELLDEFINES=-Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1
95
96	# define the th scripting files, which need special flags on compile
97	THSRC=th.c th_lang.c
98	ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
99	THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
100

M win/Makefile.dmc

+1 -1

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -66,11 +66,11 @@
66	66
67	67	version$E: $B\src\mkversion.c
68	68	$(BCC) -o$@ $**
69	69
70	70	$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
71		- $(TCC) -o$@ -c -Dmain=sqlite3_shell $(SQLITE_OPTIONS) $**
	71	+ $(TCC) -o$@ -c -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SQLITE_OPTIONS) $**
72	72
73	73	$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
74	74	$(TCC) -o$@ -c $(SQLITE_OPTIONS) $**
75	75
76	76	$(OBJDIR)\th$O : $(SRCDIR)\th.c
77	77

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -66,11 +66,11 @@
66
67	version$E: $B\src\mkversion.c
68	$(BCC) -o$@ $**
69
70	$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
71	$(TCC) -o$@ -c -Dmain=sqlite3_shell $(SQLITE_OPTIONS) $**
72
73	$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
74	$(TCC) -o$@ -c $(SQLITE_OPTIONS) $**
75
76	$(OBJDIR)\th$O : $(SRCDIR)\th.c
77

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -66,11 +66,11 @@
66
67	version$E: $B\src\mkversion.c
68	$(BCC) -o$@ $**
69
70	$(OBJDIR)\shell$O : $(SRCDIR)\shell.c
71	$(TCC) -o$@ -c -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SQLITE_OPTIONS) $**
72
73	$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
74	$(TCC) -o$@ -c $(SQLITE_OPTIONS) $**
75
76	$(OBJDIR)\th$O : $(SRCDIR)\th.c
77

M win/Makefile.mingw

+1 -1

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -1693,11 +1693,11 @@
1693	1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694	1694
1695	1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696	1696
1697	1697	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698		- $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
	1698	+ $(XTCC) -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699	1699
1700	1700	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1701	1701	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702	1702
1703	1703	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704	1704

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1693,11 +1693,11 @@
1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696
1697	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699
1700	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1701	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702
1703	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1693,11 +1693,11 @@
1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696
1697	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698	$(XTCC) -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699
1700	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1701	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702
1703	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704

M win/Makefile.mingw.mistachkin

+1 -1

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -1693,11 +1693,11 @@
1693	1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694	1694
1695	1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696	1696
1697	1697	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698		- $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
	1698	+ $(XTCC) -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699	1699
1700	1700	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1701	1701	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702	1702
1703	1703	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704	1704

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1693,11 +1693,11 @@
1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696
1697	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699
1700	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1701	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702
1703	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1693,11 +1693,11 @@
1693	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696
1697	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698	$(XTCC) -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699
1700	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1701	$(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702
1703	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704

M win/Makefile.msc

+1 -1

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -440,11 +440,11 @@
440	440
441	441	mkversion$E: $B\src\mkversion.c
442	442	$(BCC) $**
443	443
444	444	$(OX)\shell$O : $(SRCDIR)\shell.c
445		- $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
	445	+ $(TCC) /Fo$@ /Dmain=sqlite3_shell /Dsqlite3_strglob=strglob /Dgetenv=fossil_getenv /Dfopen=fossil_fopen $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
446	446
447	447	$(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
448	448	$(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
449	449
450	450	$(OX)\th$O : $(SRCDIR)\th.c
451	451

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -440,11 +440,11 @@
440
441	mkversion$E: $B\src\mkversion.c
442	$(BCC) $**
443
444	$(OX)\shell$O : $(SRCDIR)\shell.c
445	$(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
446
447	$(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
448	$(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
449
450	$(OX)\th$O : $(SRCDIR)\th.c
451

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -440,11 +440,11 @@
440
441	mkversion$E: $B\src\mkversion.c
442	$(BCC) $**
443
444	$(OX)\shell$O : $(SRCDIR)\shell.c
445	$(TCC) /Fo$@ /Dmain=sqlite3_shell /Dsqlite3_strglob=strglob /Dgetenv=fossil_getenv /Dfopen=fossil_fopen $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
446
447	$(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
448	$(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
449
450	$(OX)\th$O : $(SRCDIR)\th.c
451

Fossil SCM

Keyboard Shortcuts