Fossil SCM

Merge the changes from the windowscompilers branch into the trunk.

drh 2010-08-31 01:53 trunk merge

Commit 3564af0f7abdd7c32d77f3cf900fab05574177ae

Parent f1d309ccd7e829f…

32 files changed +2 -2 +3 -3 +3 -3 +6 -5 +3 -3 +3 -3 +7 -2 +10 -7 +10 -7 +1 -1 +1 -1 +10 -7 +11 -8 +4 -4 +1 -1 +4 -2 +5 -5 +6 -3 +233 -1 +8 -6 +8 -6 +1 -1 +11 -9 +1 -2 +1 -1 +4 +3 -2 +428 +378 +67 +43 +4

~ src/add.c ~ src/blob.c ~ src/blob.c ~ src/cgi.c ~ src/checkin.c ~ src/checkin.c ~ src/config.h ~ src/db.c ~ src/db.c ~ src/diffcmd.c ~ src/diffcmd.c ~ src/file.c ~ src/http_socket.c ~ src/http_ssl.c ~ src/info.c ~ src/login.c ~ src/main.c ~ src/makeheaders.c ~ src/makemake.tcl ~ src/popen.c ~ src/popen.c ~ src/rss.c ~ src/sha1.c ~ src/style.c ~ src/user.c ~ src/vfile.c ~ src/winhttp.c ~ win/Makefile.dmc ~ win/Makefile.msc ~ win/include/dirent.h ~ win/include/unistd.h ~ win/version.c

M src/add.c

+2 -2

		--- src/add.c
		+++ src/add.c
		@@ -53,11 +53,11 @@
53	53	fossil_warning("cannot add %s", zPath);
54	54	}else{
55	55	if( !file_is_simple_pathname(zPath) ){
56	56	fossil_fatal("filename contains illegal characters: %s", zPath);
57	57	}
58		-#ifdef __MINGW32__
	58	+#if defined(_WIN32)
59	59	if( db_exists("SELECT 1 FROM vfile"
60	60	" WHERE pathname=%Q COLLATE nocase", zPath) ){
61	61	db_multi_exec("UPDATE vfile SET deleted=0"
62	62	" WHERE pathname=%Q COLLATE nocase", zPath);
63	63	}
		@@ -152,11 +152,11 @@
152	152	db_begin_transaction();
153	153	if( !file_tree_name(g.zRepositoryName, &repo, 0) ){
154	154	blob_zero(&repo);
155	155	}
156	156	db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY)");
157		-#ifdef __MINGW32__
	157	+#if defined(_WIN32)
158	158	db_multi_exec(
159	159	"CREATE INDEX IF NOT EXISTS vfile_pathname "
160	160	" ON vfile(pathname COLLATE nocase)"
161	161	);
162	162	#endif
163	163

	--- src/add.c
	+++ src/add.c
	@@ -53,11 +53,11 @@
53	fossil_warning("cannot add %s", zPath);
54	}else{
55	if( !file_is_simple_pathname(zPath) ){
56	fossil_fatal("filename contains illegal characters: %s", zPath);
57	}
58	#ifdef __MINGW32__
59	if( db_exists("SELECT 1 FROM vfile"
60	" WHERE pathname=%Q COLLATE nocase", zPath) ){
61	db_multi_exec("UPDATE vfile SET deleted=0"
62	" WHERE pathname=%Q COLLATE nocase", zPath);
63	}
	@@ -152,11 +152,11 @@
152	db_begin_transaction();
153	if( !file_tree_name(g.zRepositoryName, &repo, 0) ){
154	blob_zero(&repo);
155	}
156	db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY)");
157	#ifdef __MINGW32__
158	db_multi_exec(
159	"CREATE INDEX IF NOT EXISTS vfile_pathname "
160	" ON vfile(pathname COLLATE nocase)"
161	);
162	#endif
163

	--- src/add.c
	+++ src/add.c
	@@ -53,11 +53,11 @@
53	fossil_warning("cannot add %s", zPath);
54	}else{
55	if( !file_is_simple_pathname(zPath) ){
56	fossil_fatal("filename contains illegal characters: %s", zPath);
57	}
58	#if defined(_WIN32)
59	if( db_exists("SELECT 1 FROM vfile"
60	" WHERE pathname=%Q COLLATE nocase", zPath) ){
61	db_multi_exec("UPDATE vfile SET deleted=0"
62	" WHERE pathname=%Q COLLATE nocase", zPath);
63	}
	@@ -152,11 +152,11 @@
152	db_begin_transaction();
153	if( !file_tree_name(g.zRepositoryName, &repo, 0) ){
154	blob_zero(&repo);
155	}
156	db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY)");
157	#if defined(_WIN32)
158	db_multi_exec(
159	"CREATE INDEX IF NOT EXISTS vfile_pathname "
160	" ON vfile(pathname COLLATE nocase)"
161	);
162	#endif
163

M src/blob.c

+3 -3

		--- src/blob.c
		+++ src/blob.c
		@@ -660,11 +660,11 @@
660	660	}
661	661	nName = file_simplify_name(zName, nName);
662	662	for(i=1; i<nName; i++){
663	663	if( zName[i]=='/' ){
664	664	zName[i] = 0;
665		-#ifdef __MINGW32__
	665	+#if defined(_WIN32)
666	666	/*
667	667	** On Windows, local path looks like: C:/develop/project/file.txt
668	668	** The if stops us from trying to create a directory of a drive letter
669	669	** C: in this example.
670	670	*/
		@@ -672,11 +672,11 @@
672	672	#endif
673	673	if( file_mkdir(zName, 1) ){
674	674	fossil_fatal_recursive("unable to create directory %s", zName);
675	675	return 0;
676	676	}
677		-#ifdef __MINGW32__
	677	+#if defined(_WIN32)
678	678	}
679	679	#endif
680	680	zName[i] = '/';
681	681	}
682	682	}
		@@ -856,11 +856,11 @@
856	856	blob_reset(&b3);
857	857	}
858	858	printf("ok\n");
859	859	}
860	860
861		-#ifdef __MINGW32__
	861	+#if defined(_WIN32)
862	862	/*
863	863	** Convert every \n character in the given blob into \r\n.
864	864	*/
865	865	void blob_add_cr(Blob *p){
866	866	char *z = p->aData;
867	867

	--- src/blob.c
	+++ src/blob.c
	@@ -660,11 +660,11 @@
660	}
661	nName = file_simplify_name(zName, nName);
662	for(i=1; i<nName; i++){
663	if( zName[i]=='/' ){
664	zName[i] = 0;
665	#ifdef __MINGW32__
666	/*
667	** On Windows, local path looks like: C:/develop/project/file.txt
668	** The if stops us from trying to create a directory of a drive letter
669	** C: in this example.
670	*/
	@@ -672,11 +672,11 @@
672	#endif
673	if( file_mkdir(zName, 1) ){
674	fossil_fatal_recursive("unable to create directory %s", zName);
675	return 0;
676	}
677	#ifdef __MINGW32__
678	}
679	#endif
680	zName[i] = '/';
681	}
682	}
	@@ -856,11 +856,11 @@
856	blob_reset(&b3);
857	}
858	printf("ok\n");
859	}
860
861	#ifdef __MINGW32__
862	/*
863	** Convert every \n character in the given blob into \r\n.
864	*/
865	void blob_add_cr(Blob *p){
866	char *z = p->aData;
867

	--- src/blob.c
	+++ src/blob.c
	@@ -660,11 +660,11 @@
660	}
661	nName = file_simplify_name(zName, nName);
662	for(i=1; i<nName; i++){
663	if( zName[i]=='/' ){
664	zName[i] = 0;
665	#if defined(_WIN32)
666	/*
667	** On Windows, local path looks like: C:/develop/project/file.txt
668	** The if stops us from trying to create a directory of a drive letter
669	** C: in this example.
670	*/
	@@ -672,11 +672,11 @@
672	#endif
673	if( file_mkdir(zName, 1) ){
674	fossil_fatal_recursive("unable to create directory %s", zName);
675	return 0;
676	}
677	#if defined(_WIN32)
678	}
679	#endif
680	zName[i] = '/';
681	}
682	}
	@@ -856,11 +856,11 @@
856	blob_reset(&b3);
857	}
858	printf("ok\n");
859	}
860
861	#if defined(_WIN32)
862	/*
863	** Convert every \n character in the given blob into \r\n.
864	*/
865	void blob_add_cr(Blob *p){
866	char *z = p->aData;
867

M src/blob.c

+3 -3

		--- src/blob.c
		+++ src/blob.c
		@@ -660,11 +660,11 @@
660	660	}
661	661	nName = file_simplify_name(zName, nName);
662	662	for(i=1; i<nName; i++){
663	663	if( zName[i]=='/' ){
664	664	zName[i] = 0;
665		-#ifdef __MINGW32__
	665	+#if defined(_WIN32)
666	666	/*
667	667	** On Windows, local path looks like: C:/develop/project/file.txt
668	668	** The if stops us from trying to create a directory of a drive letter
669	669	** C: in this example.
670	670	*/
		@@ -672,11 +672,11 @@
672	672	#endif
673	673	if( file_mkdir(zName, 1) ){
674	674	fossil_fatal_recursive("unable to create directory %s", zName);
675	675	return 0;
676	676	}
677		-#ifdef __MINGW32__
	677	+#if defined(_WIN32)
678	678	}
679	679	#endif
680	680	zName[i] = '/';
681	681	}
682	682	}
		@@ -856,11 +856,11 @@
856	856	blob_reset(&b3);
857	857	}
858	858	printf("ok\n");
859	859	}
860	860
861		-#ifdef __MINGW32__
	861	+#if defined(_WIN32)
862	862	/*
863	863	** Convert every \n character in the given blob into \r\n.
864	864	*/
865	865	void blob_add_cr(Blob *p){
866	866	char *z = p->aData;
867	867

	--- src/blob.c
	+++ src/blob.c
	@@ -660,11 +660,11 @@
660	}
661	nName = file_simplify_name(zName, nName);
662	for(i=1; i<nName; i++){
663	if( zName[i]=='/' ){
664	zName[i] = 0;
665	#ifdef __MINGW32__
666	/*
667	** On Windows, local path looks like: C:/develop/project/file.txt
668	** The if stops us from trying to create a directory of a drive letter
669	** C: in this example.
670	*/
	@@ -672,11 +672,11 @@
672	#endif
673	if( file_mkdir(zName, 1) ){
674	fossil_fatal_recursive("unable to create directory %s", zName);
675	return 0;
676	}
677	#ifdef __MINGW32__
678	}
679	#endif
680	zName[i] = '/';
681	}
682	}
	@@ -856,11 +856,11 @@
856	blob_reset(&b3);
857	}
858	printf("ok\n");
859	}
860
861	#ifdef __MINGW32__
862	/*
863	** Convert every \n character in the given blob into \r\n.
864	*/
865	void blob_add_cr(Blob *p){
866	char *z = p->aData;
867

	--- src/blob.c
	+++ src/blob.c
	@@ -660,11 +660,11 @@
660	}
661	nName = file_simplify_name(zName, nName);
662	for(i=1; i<nName; i++){
663	if( zName[i]=='/' ){
664	zName[i] = 0;
665	#if defined(_WIN32)
666	/*
667	** On Windows, local path looks like: C:/develop/project/file.txt
668	** The if stops us from trying to create a directory of a drive letter
669	** C: in this example.
670	*/
	@@ -672,11 +672,11 @@
672	#endif
673	if( file_mkdir(zName, 1) ){
674	fossil_fatal_recursive("unable to create directory %s", zName);
675	return 0;
676	}
677	#if defined(_WIN32)
678	}
679	#endif
680	zName[i] = '/';
681	}
682	}
	@@ -856,11 +856,11 @@
856	blob_reset(&b3);
857	}
858	printf("ok\n");
859	}
860
861	#if defined(_WIN32)
862	/*
863	** Convert every \n character in the given blob into \r\n.
864	*/
865	void blob_add_cr(Blob *p){
866	char *z = p->aData;
867

M src/cgi.c

+6 -5

		--- src/cgi.c
		+++ src/cgi.c
		@@ -20,15 +20,16 @@
20	20	** dispensing QUERY_STRING parameters and cookies, the "mprintf()"
21	21	** formatting function and its cousins, and routines to encode and
22	22	** decode strings in HTML or HTTP.
23	23	*/
24	24	#include "config.h"
25		-#ifdef __MINGW32__
	25	+#ifdef _WIN32
26	26	# include <windows.h> /* for Sleep once server works again */
27		-# include <winsock2.h> /* socket operations */
28		-# define sleep Sleep /* windows does not have sleep, but Sleep */
29		-# include <ws2tcpip.h>
	27	+# if defined(__MINGW32__)
	28	+# define sleep Sleep /* windows does not have sleep, but Sleep */
	29	+# include <ws2tcpip.h>
	30	+# endif
30	31	#else
31	32	# include <sys/socket.h>
32	33	# include <netinet/in.h>
33	34	# include <arpa/inet.h>
34	35	# include <sys/times.h>
		@@ -1039,11 +1040,11 @@
1039	1040	**
1040	1041	** Return 0 to each child as it runs. If unable to establish a
1041	1042	** listening socket, return non-zero.
1042	1043	*/
1043	1044	int cgi_http_server(int mnPort, int mxPort, char *zBrowser, int flags){
1044		-#ifdef __MINGW32__
	1045	+#if defined(_WIN32)
1045	1046	/* Use win32_http_server() instead */
1046	1047	fossil_exit(1);
1047	1048	#else
1048	1049	int listener = -1; /* The server socket */
1049	1050	int connection; /* A socket for each individual connection */
1050	1051

	--- src/cgi.c
	+++ src/cgi.c
	@@ -20,15 +20,16 @@
20	** dispensing QUERY_STRING parameters and cookies, the "mprintf()"
21	** formatting function and its cousins, and routines to encode and
22	** decode strings in HTML or HTTP.
23	*/
24	#include "config.h"
25	#ifdef __MINGW32__
26	# include <windows.h> /* for Sleep once server works again */
27	# include <winsock2.h> /* socket operations */
28	# define sleep Sleep /* windows does not have sleep, but Sleep */
29	# include <ws2tcpip.h>

30	#else
31	# include <sys/socket.h>
32	# include <netinet/in.h>
33	# include <arpa/inet.h>
34	# include <sys/times.h>
	@@ -1039,11 +1040,11 @@
1039	**
1040	** Return 0 to each child as it runs. If unable to establish a
1041	** listening socket, return non-zero.
1042	*/
1043	int cgi_http_server(int mnPort, int mxPort, char *zBrowser, int flags){
1044	#ifdef __MINGW32__
1045	/* Use win32_http_server() instead */
1046	fossil_exit(1);
1047	#else
1048	int listener = -1; /* The server socket */
1049	int connection; /* A socket for each individual connection */
1050

	--- src/cgi.c
	+++ src/cgi.c
	@@ -20,15 +20,16 @@
20	** dispensing QUERY_STRING parameters and cookies, the "mprintf()"
21	** formatting function and its cousins, and routines to encode and
22	** decode strings in HTML or HTTP.
23	*/
24	#include "config.h"
25	#ifdef _WIN32
26	# include <windows.h> /* for Sleep once server works again */
27	# if defined(__MINGW32__)
28	# define sleep Sleep /* windows does not have sleep, but Sleep */
29	# include <ws2tcpip.h>
30	# endif
31	#else
32	# include <sys/socket.h>
33	# include <netinet/in.h>
34	# include <arpa/inet.h>
35	# include <sys/times.h>
	@@ -1039,11 +1040,11 @@
1040	**
1041	** Return 0 to each child as it runs. If unable to establish a
1042	** listening socket, return non-zero.
1043	*/
1044	int cgi_http_server(int mnPort, int mxPort, char *zBrowser, int flags){
1045	#if defined(_WIN32)
1046	/* Use win32_http_server() instead */
1047	fossil_exit(1);
1048	#else
1049	int listener = -1; /* The server socket */
1050	int connection; /* A socket for each individual connection */
1051

M src/checkin.c

+3 -3

		--- src/checkin.c
		+++ src/checkin.c
		@@ -401,19 +401,19 @@
401	401	}
402	402	if( zEditor==0 ){
403	403	zEditor = getenv("EDITOR");
404	404	}
405	405	if( zEditor==0 ){
406		-#ifdef __MINGW32__
	406	+#if defined(_WIN32)
407	407	zEditor = "notepad";
408	408	#else
409	409	zEditor = "ed";
410	410	#endif
411	411	}
412	412	zFile = db_text(0, "SELECT '%qci-comment-' \|\| hex(randomblob(6)) \|\| '.txt'",
413	413	g.zLocalRoot);
414		-#ifdef __MINGW32__
	414	+#if defined(_WIN32)
415	415	blob_add_cr(&text);
416	416	#endif
417	417	blob_write_to_file(&text, zFile);
418	418	zCmd = mprintf("%s \"%s\"", zEditor, zFile);
419	419	printf("%s\n", zCmd);
		@@ -775,11 +775,11 @@
775	775	const char *zOrig = db_column_text(&q, 2);
776	776	int frid = db_column_int(&q, 3);
777	777	int isexe = db_column_int(&q, 4);
778	778	const char *zPerm;
779	779	blob_append(&filename, zName, -1);
780		-#ifndef __MINGW32__
	780	+#if !defined(_WIN32)
781	781	/* For unix, extract the "executable" permission bit directly from
782	782	** the filesystem. On windows, the "executable" bit is retained
783	783	** unchanged from the original. */
784	784	isexe = file_isexe(blob_str(&filename));
785	785	#endif
786	786

	--- src/checkin.c
	+++ src/checkin.c
	@@ -401,19 +401,19 @@
401	}
402	if( zEditor==0 ){
403	zEditor = getenv("EDITOR");
404	}
405	if( zEditor==0 ){
406	#ifdef __MINGW32__
407	zEditor = "notepad";
408	#else
409	zEditor = "ed";
410	#endif
411	}
412	zFile = db_text(0, "SELECT '%qci-comment-' \|\| hex(randomblob(6)) \|\| '.txt'",
413	g.zLocalRoot);
414	#ifdef __MINGW32__
415	blob_add_cr(&text);
416	#endif
417	blob_write_to_file(&text, zFile);
418	zCmd = mprintf("%s \"%s\"", zEditor, zFile);
419	printf("%s\n", zCmd);
	@@ -775,11 +775,11 @@
775	const char *zOrig = db_column_text(&q, 2);
776	int frid = db_column_int(&q, 3);
777	int isexe = db_column_int(&q, 4);
778	const char *zPerm;
779	blob_append(&filename, zName, -1);
780	#ifndef __MINGW32__
781	/* For unix, extract the "executable" permission bit directly from
782	** the filesystem. On windows, the "executable" bit is retained
783	** unchanged from the original. */
784	isexe = file_isexe(blob_str(&filename));
785	#endif
786

	--- src/checkin.c
	+++ src/checkin.c
	@@ -401,19 +401,19 @@
401	}
402	if( zEditor==0 ){
403	zEditor = getenv("EDITOR");
404	}
405	if( zEditor==0 ){
406	#if defined(_WIN32)
407	zEditor = "notepad";
408	#else
409	zEditor = "ed";
410	#endif
411	}
412	zFile = db_text(0, "SELECT '%qci-comment-' \|\| hex(randomblob(6)) \|\| '.txt'",
413	g.zLocalRoot);
414	#if defined(_WIN32)
415	blob_add_cr(&text);
416	#endif
417	blob_write_to_file(&text, zFile);
418	zCmd = mprintf("%s \"%s\"", zEditor, zFile);
419	printf("%s\n", zCmd);
	@@ -775,11 +775,11 @@
775	const char *zOrig = db_column_text(&q, 2);
776	int frid = db_column_int(&q, 3);
777	int isexe = db_column_int(&q, 4);
778	const char *zPerm;
779	blob_append(&filename, zName, -1);
780	#if !defined(_WIN32)
781	/* For unix, extract the "executable" permission bit directly from
782	** the filesystem. On windows, the "executable" bit is retained
783	** unchanged from the original. */
784	isexe = file_isexe(blob_str(&filename));
785	#endif
786

M src/checkin.c

+3 -3

		--- src/checkin.c
		+++ src/checkin.c
		@@ -401,19 +401,19 @@
401	401	}
402	402	if( zEditor==0 ){
403	403	zEditor = getenv("EDITOR");
404	404	}
405	405	if( zEditor==0 ){
406		-#ifdef __MINGW32__
	406	+#if defined(_WIN32)
407	407	zEditor = "notepad";
408	408	#else
409	409	zEditor = "ed";
410	410	#endif
411	411	}
412	412	zFile = db_text(0, "SELECT '%qci-comment-' \|\| hex(randomblob(6)) \|\| '.txt'",
413	413	g.zLocalRoot);
414		-#ifdef __MINGW32__
	414	+#if defined(_WIN32)
415	415	blob_add_cr(&text);
416	416	#endif
417	417	blob_write_to_file(&text, zFile);
418	418	zCmd = mprintf("%s \"%s\"", zEditor, zFile);
419	419	printf("%s\n", zCmd);
		@@ -775,11 +775,11 @@
775	775	const char *zOrig = db_column_text(&q, 2);
776	776	int frid = db_column_int(&q, 3);
777	777	int isexe = db_column_int(&q, 4);
778	778	const char *zPerm;
779	779	blob_append(&filename, zName, -1);
780		-#ifndef __MINGW32__
	780	+#if !defined(_WIN32)
781	781	/* For unix, extract the "executable" permission bit directly from
782	782	** the filesystem. On windows, the "executable" bit is retained
783	783	** unchanged from the original. */
784	784	isexe = file_isexe(blob_str(&filename));
785	785	#endif
786	786

	--- src/checkin.c
	+++ src/checkin.c
	@@ -401,19 +401,19 @@
401	}
402	if( zEditor==0 ){
403	zEditor = getenv("EDITOR");
404	}
405	if( zEditor==0 ){
406	#ifdef __MINGW32__
407	zEditor = "notepad";
408	#else
409	zEditor = "ed";
410	#endif
411	}
412	zFile = db_text(0, "SELECT '%qci-comment-' \|\| hex(randomblob(6)) \|\| '.txt'",
413	g.zLocalRoot);
414	#ifdef __MINGW32__
415	blob_add_cr(&text);
416	#endif
417	blob_write_to_file(&text, zFile);
418	zCmd = mprintf("%s \"%s\"", zEditor, zFile);
419	printf("%s\n", zCmd);
	@@ -775,11 +775,11 @@
775	const char *zOrig = db_column_text(&q, 2);
776	int frid = db_column_int(&q, 3);
777	int isexe = db_column_int(&q, 4);
778	const char *zPerm;
779	blob_append(&filename, zName, -1);
780	#ifndef __MINGW32__
781	/* For unix, extract the "executable" permission bit directly from
782	** the filesystem. On windows, the "executable" bit is retained
783	** unchanged from the original. */
784	isexe = file_isexe(blob_str(&filename));
785	#endif
786

	--- src/checkin.c
	+++ src/checkin.c
	@@ -401,19 +401,19 @@
401	}
402	if( zEditor==0 ){
403	zEditor = getenv("EDITOR");
404	}
405	if( zEditor==0 ){
406	#if defined(_WIN32)
407	zEditor = "notepad";
408	#else
409	zEditor = "ed";
410	#endif
411	}
412	zFile = db_text(0, "SELECT '%qci-comment-' \|\| hex(randomblob(6)) \|\| '.txt'",
413	g.zLocalRoot);
414	#if defined(_WIN32)
415	blob_add_cr(&text);
416	#endif
417	blob_write_to_file(&text, zFile);
418	zCmd = mprintf("%s \"%s\"", zEditor, zFile);
419	printf("%s\n", zCmd);
	@@ -775,11 +775,11 @@
775	const char *zOrig = db_column_text(&q, 2);
776	int frid = db_column_int(&q, 3);
777	int isexe = db_column_int(&q, 4);
778	const char *zPerm;
779	blob_append(&filename, zName, -1);
780	#if !defined(_WIN32)
781	/* For unix, extract the "executable" permission bit directly from
782	** the filesystem. On windows, the "executable" bit is retained
783	** unchanged from the original. */
784	isexe = file_isexe(blob_str(&filename));
785	#endif
786

M src/config.h

+7 -2

		--- src/config.h
		+++ src/config.h
		@@ -26,12 +26,17 @@
26	26	#include <stdlib.h>
27	27	#include <ctype.h>
28	28	#include <string.h>
29	29	#include <stdarg.h>
30	30	#include <assert.h>
31		-#ifdef __MINGW32__
32		-# include <windows.h>
	31	+#if defined( __MINGW32__) \|\| defined(__DMC__) \|\| defined(_MSC_VER)
	32	+# if defined(__DMC__) \|\| defined(_MSC_VER)
	33	+ typedef int socklen_t;
	34	+# endif
	35	+# ifndef _WIN32
	36	+# define _WIN32
	37	+# endif
33	38	#else
34	39	# include <sys/types.h>
35	40	# include <signal.h>
36	41	# include <pwd.h>
37	42	#endif
38	43

	--- src/config.h
	+++ src/config.h
	@@ -26,12 +26,17 @@
26	#include <stdlib.h>
27	#include <ctype.h>
28	#include <string.h>
29	#include <stdarg.h>
30	#include <assert.h>
31	#ifdef __MINGW32__
32	# include <windows.h>





33	#else
34	# include <sys/types.h>
35	# include <signal.h>
36	# include <pwd.h>
37	#endif
38

	--- src/config.h
	+++ src/config.h
	@@ -26,12 +26,17 @@
26	#include <stdlib.h>
27	#include <ctype.h>
28	#include <string.h>
29	#include <stdarg.h>
30	#include <assert.h>
31	#if defined( __MINGW32__) \|\| defined(__DMC__) \|\| defined(_MSC_VER)
32	# if defined(__DMC__) \|\| defined(_MSC_VER)
33	typedef int socklen_t;
34	# endif
35	# ifndef _WIN32
36	# define _WIN32
37	# endif
38	#else
39	# include <sys/types.h>
40	# include <signal.h>
41	# include <pwd.h>
42	#endif
43

M src/db.c

+10 -7

		--- src/db.c
		+++ src/db.c
		@@ -27,10 +27,13 @@
27	27	** (3) A local checkout database named "_FOSSIL_" or ".fos"
28	28	** and located at the root of the local copy of the source tree.
29	29	**
30	30	*/
31	31	#include "config.h"
	32	+#if ! defined(_WIN32)
	33	+# include <pwd.h>
	34	+#endif
32	35	#include <sqlite3.h>
33	36	#include <sys/types.h>
34	37	#include <sys/stat.h>
35	38	#include <unistd.h>
36	39	#include "db.h"
		@@ -534,11 +537,11 @@
534	537	}
535	538	db_finalize(&s);
536	539	return z;
537	540	}
538	541
539		-#ifdef __MINGW32__
	542	+#if defined(_WIN32)
540	543	extern char sqlite3_win32_mbcs_to_utf8(const char);
541	544	#endif
542	545
543	546	/*
544	547	** Initialize a new database file with the given schema. If anything
		@@ -552,11 +555,11 @@
552	555	sqlite3 *db;
553	556	int rc;
554	557	const char *zSql;
555	558	va_list ap;
556	559
557		-#ifdef __MINGW32__
	560	+#if defined(_WIN32)
558	561	zFileName = sqlite3_win32_mbcs_to_utf8(zFileName);
559	562	#endif
560	563	rc = sqlite3_open(zFileName, &db);
561	564	if( rc!=SQLITE_OK ){
562	565	db_err(sqlite3_errmsg(db));
		@@ -587,11 +590,11 @@
587	590	int rc;
588	591	const char *zVfs;
589	592	sqlite3 *db;
590	593
591	594	zVfs = getenv("FOSSIL_VFS");
592		-#ifdef __MINGW32__
	595	+#if defined(_WIN32)
593	596	zDbName = sqlite3_win32_mbcs_to_utf8(zDbName);
594	597	#endif
595	598	rc = sqlite3_open_v2(
596	599	zDbName, &db,
597	600	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,
		@@ -615,11 +618,11 @@
615	618	if( !g.db ){
616	619	g.db = openDatabase(zDbName);
617	620	g.zRepoDb = "main";
618	621	db_connection_init();
619	622	}else{
620		-#ifdef __MINGW32__
	623	+#if defined(_WIN32)
621	624	zDbName = sqlite3_win32_mbcs_to_utf8(zDbName);
622	625	#endif
623	626	db_multi_exec("ATTACH DATABASE %Q AS %s", zDbName, zLabel);
624	627	g.zRepoDb = mprintf("%s", zLabel);
625	628	}
		@@ -639,11 +642,11 @@
639	642	*/
640	643	void db_open_config(int useAttach){
641	644	char *zDbName;
642	645	const char *zHome;
643	646	if( g.configOpen ) return;
644		-#ifdef __MINGW32__
	647	+#if defined(_WIN32)
645	648	zHome = getenv("LOCALAPPDATA");
646	649	if( zHome==0 ){
647	650	zHome = getenv("APPDATA");
648	651	if( zHome==0 ){
649	652	zHome = getenv("HOMEPATH");
		@@ -667,11 +670,11 @@
667	670	if( access(zHome, W_OK) ){
668	671	fossil_fatal("home directory %s must be writeable", zHome);
669	672	}
670	673	#endif
671	674	g.zHome = mprintf("%/", zHome);
672		-#ifdef __MINGW32__
	675	+#if defined(_WIN32)
673	676	/* . filenames give some window systems problems and many apps problems */
674	677	zDbName = mprintf("%//_fossil", zHome);
675	678	#else
676	679	zDbName = mprintf("%s/.fossil", zHome);
677	680	#endif
		@@ -944,11 +947,11 @@
944	947	zUser = db_get("default-user", 0);
945	948	if( zUser==0 ){
946	949	zUser = zDefaultUser;
947	950	}
948	951	if( zUser==0 ){
949		-#ifdef __MINGW32__
	952	+#if defined(_WIN32)
950	953	zUser = getenv("USERNAME");
951	954	#else
952	955	zUser = getenv("USER");
953	956	#endif
954	957	}
955	958

	--- src/db.c
	+++ src/db.c
	@@ -27,10 +27,13 @@
27	** (3) A local checkout database named "_FOSSIL_" or ".fos"
28	** and located at the root of the local copy of the source tree.
29	**
30	*/
31	#include "config.h"



32	#include <sqlite3.h>
33	#include <sys/types.h>
34	#include <sys/stat.h>
35	#include <unistd.h>
36	#include "db.h"
	@@ -534,11 +537,11 @@
534	}
535	db_finalize(&s);
536	return z;
537	}
538
539	#ifdef __MINGW32__
540	extern char sqlite3_win32_mbcs_to_utf8(const char);
541	#endif
542
543	/*
544	** Initialize a new database file with the given schema. If anything
	@@ -552,11 +555,11 @@
552	sqlite3 *db;
553	int rc;
554	const char *zSql;
555	va_list ap;
556
557	#ifdef __MINGW32__
558	zFileName = sqlite3_win32_mbcs_to_utf8(zFileName);
559	#endif
560	rc = sqlite3_open(zFileName, &db);
561	if( rc!=SQLITE_OK ){
562	db_err(sqlite3_errmsg(db));
	@@ -587,11 +590,11 @@
587	int rc;
588	const char *zVfs;
589	sqlite3 *db;
590
591	zVfs = getenv("FOSSIL_VFS");
592	#ifdef __MINGW32__
593	zDbName = sqlite3_win32_mbcs_to_utf8(zDbName);
594	#endif
595	rc = sqlite3_open_v2(
596	zDbName, &db,
597	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,
	@@ -615,11 +618,11 @@
615	if( !g.db ){
616	g.db = openDatabase(zDbName);
617	g.zRepoDb = "main";
618	db_connection_init();
619	}else{
620	#ifdef __MINGW32__
621	zDbName = sqlite3_win32_mbcs_to_utf8(zDbName);
622	#endif
623	db_multi_exec("ATTACH DATABASE %Q AS %s", zDbName, zLabel);
624	g.zRepoDb = mprintf("%s", zLabel);
625	}
	@@ -639,11 +642,11 @@
639	*/
640	void db_open_config(int useAttach){
641	char *zDbName;
642	const char *zHome;
643	if( g.configOpen ) return;
644	#ifdef __MINGW32__
645	zHome = getenv("LOCALAPPDATA");
646	if( zHome==0 ){
647	zHome = getenv("APPDATA");
648	if( zHome==0 ){
649	zHome = getenv("HOMEPATH");
	@@ -667,11 +670,11 @@
667	if( access(zHome, W_OK) ){
668	fossil_fatal("home directory %s must be writeable", zHome);
669	}
670	#endif
671	g.zHome = mprintf("%/", zHome);
672	#ifdef __MINGW32__
673	/* . filenames give some window systems problems and many apps problems */
674	zDbName = mprintf("%//_fossil", zHome);
675	#else
676	zDbName = mprintf("%s/.fossil", zHome);
677	#endif
	@@ -944,11 +947,11 @@
944	zUser = db_get("default-user", 0);
945	if( zUser==0 ){
946	zUser = zDefaultUser;
947	}
948	if( zUser==0 ){
949	#ifdef __MINGW32__
950	zUser = getenv("USERNAME");
951	#else
952	zUser = getenv("USER");
953	#endif
954	}
955

	--- src/db.c
	+++ src/db.c
	@@ -27,10 +27,13 @@
27	** (3) A local checkout database named "_FOSSIL_" or ".fos"
28	** and located at the root of the local copy of the source tree.
29	**
30	*/
31	#include "config.h"
32	#if ! defined(_WIN32)
33	# include <pwd.h>
34	#endif
35	#include <sqlite3.h>
36	#include <sys/types.h>
37	#include <sys/stat.h>
38	#include <unistd.h>
39	#include "db.h"
	@@ -534,11 +537,11 @@
537	}
538	db_finalize(&s);
539	return z;
540	}
541
542	#if defined(_WIN32)
543	extern char sqlite3_win32_mbcs_to_utf8(const char);
544	#endif
545
546	/*
547	** Initialize a new database file with the given schema. If anything
	@@ -552,11 +555,11 @@
555	sqlite3 *db;
556	int rc;
557	const char *zSql;
558	va_list ap;
559
560	#if defined(_WIN32)
561	zFileName = sqlite3_win32_mbcs_to_utf8(zFileName);
562	#endif
563	rc = sqlite3_open(zFileName, &db);
564	if( rc!=SQLITE_OK ){
565	db_err(sqlite3_errmsg(db));
	@@ -587,11 +590,11 @@
590	int rc;
591	const char *zVfs;
592	sqlite3 *db;
593
594	zVfs = getenv("FOSSIL_VFS");
595	#if defined(_WIN32)
596	zDbName = sqlite3_win32_mbcs_to_utf8(zDbName);
597	#endif
598	rc = sqlite3_open_v2(
599	zDbName, &db,
600	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,
	@@ -615,11 +618,11 @@
618	if( !g.db ){
619	g.db = openDatabase(zDbName);
620	g.zRepoDb = "main";
621	db_connection_init();
622	}else{
623	#if defined(_WIN32)
624	zDbName = sqlite3_win32_mbcs_to_utf8(zDbName);
625	#endif
626	db_multi_exec("ATTACH DATABASE %Q AS %s", zDbName, zLabel);
627	g.zRepoDb = mprintf("%s", zLabel);
628	}
	@@ -639,11 +642,11 @@
642	*/
643	void db_open_config(int useAttach){
644	char *zDbName;
645	const char *zHome;
646	if( g.configOpen ) return;
647	#if defined(_WIN32)
648	zHome = getenv("LOCALAPPDATA");
649	if( zHome==0 ){
650	zHome = getenv("APPDATA");
651	if( zHome==0 ){
652	zHome = getenv("HOMEPATH");
	@@ -667,11 +670,11 @@
670	if( access(zHome, W_OK) ){
671	fossil_fatal("home directory %s must be writeable", zHome);
672	}
673	#endif
674	g.zHome = mprintf("%/", zHome);
675	#if defined(_WIN32)
676	/* . filenames give some window systems problems and many apps problems */
677	zDbName = mprintf("%//_fossil", zHome);
678	#else
679	zDbName = mprintf("%s/.fossil", zHome);
680	#endif
	@@ -944,11 +947,11 @@
947	zUser = db_get("default-user", 0);
948	if( zUser==0 ){
949	zUser = zDefaultUser;
950	}
951	if( zUser==0 ){
952	#if defined(_WIN32)
953	zUser = getenv("USERNAME");
954	#else
955	zUser = getenv("USER");
956	#endif
957	}
958

M src/db.c

+10 -7

		--- src/db.c
		+++ src/db.c
		@@ -27,10 +27,13 @@
27	27	** (3) A local checkout database named "_FOSSIL_" or ".fos"
28	28	** and located at the root of the local copy of the source tree.
29	29	**
30	30	*/
31	31	#include "config.h"
	32	+#if ! defined(_WIN32)
	33	+# include <pwd.h>
	34	+#endif
32	35	#include <sqlite3.h>
33	36	#include <sys/types.h>
34	37	#include <sys/stat.h>
35	38	#include <unistd.h>
36	39	#include "db.h"
		@@ -534,11 +537,11 @@
534	537	}
535	538	db_finalize(&s);
536	539	return z;
537	540	}
538	541
539		-#ifdef __MINGW32__
	542	+#if defined(_WIN32)
540	543	extern char sqlite3_win32_mbcs_to_utf8(const char);
541	544	#endif
542	545
543	546	/*
544	547	** Initialize a new database file with the given schema. If anything
		@@ -552,11 +555,11 @@
552	555	sqlite3 *db;
553	556	int rc;
554	557	const char *zSql;
555	558	va_list ap;
556	559
557		-#ifdef __MINGW32__
	560	+#if defined(_WIN32)
558	561	zFileName = sqlite3_win32_mbcs_to_utf8(zFileName);
559	562	#endif
560	563	rc = sqlite3_open(zFileName, &db);
561	564	if( rc!=SQLITE_OK ){
562	565	db_err(sqlite3_errmsg(db));
		@@ -587,11 +590,11 @@
587	590	int rc;
588	591	const char *zVfs;
589	592	sqlite3 *db;
590	593
591	594	zVfs = getenv("FOSSIL_VFS");
592		-#ifdef __MINGW32__
	595	+#if defined(_WIN32)
593	596	zDbName = sqlite3_win32_mbcs_to_utf8(zDbName);
594	597	#endif
595	598	rc = sqlite3_open_v2(
596	599	zDbName, &db,
597	600	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,
		@@ -615,11 +618,11 @@
615	618	if( !g.db ){
616	619	g.db = openDatabase(zDbName);
617	620	g.zRepoDb = "main";
618	621	db_connection_init();
619	622	}else{
620		-#ifdef __MINGW32__
	623	+#if defined(_WIN32)
621	624	zDbName = sqlite3_win32_mbcs_to_utf8(zDbName);
622	625	#endif
623	626	db_multi_exec("ATTACH DATABASE %Q AS %s", zDbName, zLabel);
624	627	g.zRepoDb = mprintf("%s", zLabel);
625	628	}
		@@ -639,11 +642,11 @@
639	642	*/
640	643	void db_open_config(int useAttach){
641	644	char *zDbName;
642	645	const char *zHome;
643	646	if( g.configOpen ) return;
644		-#ifdef __MINGW32__
	647	+#if defined(_WIN32)
645	648	zHome = getenv("LOCALAPPDATA");
646	649	if( zHome==0 ){
647	650	zHome = getenv("APPDATA");
648	651	if( zHome==0 ){
649	652	zHome = getenv("HOMEPATH");
		@@ -667,11 +670,11 @@
667	670	if( access(zHome, W_OK) ){
668	671	fossil_fatal("home directory %s must be writeable", zHome);
669	672	}
670	673	#endif
671	674	g.zHome = mprintf("%/", zHome);
672		-#ifdef __MINGW32__
	675	+#if defined(_WIN32)
673	676	/* . filenames give some window systems problems and many apps problems */
674	677	zDbName = mprintf("%//_fossil", zHome);
675	678	#else
676	679	zDbName = mprintf("%s/.fossil", zHome);
677	680	#endif
		@@ -944,11 +947,11 @@
944	947	zUser = db_get("default-user", 0);
945	948	if( zUser==0 ){
946	949	zUser = zDefaultUser;
947	950	}
948	951	if( zUser==0 ){
949		-#ifdef __MINGW32__
	952	+#if defined(_WIN32)
950	953	zUser = getenv("USERNAME");
951	954	#else
952	955	zUser = getenv("USER");
953	956	#endif
954	957	}
955	958

	--- src/db.c
	+++ src/db.c
	@@ -27,10 +27,13 @@
27	** (3) A local checkout database named "_FOSSIL_" or ".fos"
28	** and located at the root of the local copy of the source tree.
29	**
30	*/
31	#include "config.h"



32	#include <sqlite3.h>
33	#include <sys/types.h>
34	#include <sys/stat.h>
35	#include <unistd.h>
36	#include "db.h"
	@@ -534,11 +537,11 @@
534	}
535	db_finalize(&s);
536	return z;
537	}
538
539	#ifdef __MINGW32__
540	extern char sqlite3_win32_mbcs_to_utf8(const char);
541	#endif
542
543	/*
544	** Initialize a new database file with the given schema. If anything
	@@ -552,11 +555,11 @@
552	sqlite3 *db;
553	int rc;
554	const char *zSql;
555	va_list ap;
556
557	#ifdef __MINGW32__
558	zFileName = sqlite3_win32_mbcs_to_utf8(zFileName);
559	#endif
560	rc = sqlite3_open(zFileName, &db);
561	if( rc!=SQLITE_OK ){
562	db_err(sqlite3_errmsg(db));
	@@ -587,11 +590,11 @@
587	int rc;
588	const char *zVfs;
589	sqlite3 *db;
590
591	zVfs = getenv("FOSSIL_VFS");
592	#ifdef __MINGW32__
593	zDbName = sqlite3_win32_mbcs_to_utf8(zDbName);
594	#endif
595	rc = sqlite3_open_v2(
596	zDbName, &db,
597	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,
	@@ -615,11 +618,11 @@
615	if( !g.db ){
616	g.db = openDatabase(zDbName);
617	g.zRepoDb = "main";
618	db_connection_init();
619	}else{
620	#ifdef __MINGW32__
621	zDbName = sqlite3_win32_mbcs_to_utf8(zDbName);
622	#endif
623	db_multi_exec("ATTACH DATABASE %Q AS %s", zDbName, zLabel);
624	g.zRepoDb = mprintf("%s", zLabel);
625	}
	@@ -639,11 +642,11 @@
639	*/
640	void db_open_config(int useAttach){
641	char *zDbName;
642	const char *zHome;
643	if( g.configOpen ) return;
644	#ifdef __MINGW32__
645	zHome = getenv("LOCALAPPDATA");
646	if( zHome==0 ){
647	zHome = getenv("APPDATA");
648	if( zHome==0 ){
649	zHome = getenv("HOMEPATH");
	@@ -667,11 +670,11 @@
667	if( access(zHome, W_OK) ){
668	fossil_fatal("home directory %s must be writeable", zHome);
669	}
670	#endif
671	g.zHome = mprintf("%/", zHome);
672	#ifdef __MINGW32__
673	/* . filenames give some window systems problems and many apps problems */
674	zDbName = mprintf("%//_fossil", zHome);
675	#else
676	zDbName = mprintf("%s/.fossil", zHome);
677	#endif
	@@ -944,11 +947,11 @@
944	zUser = db_get("default-user", 0);
945	if( zUser==0 ){
946	zUser = zDefaultUser;
947	}
948	if( zUser==0 ){
949	#ifdef __MINGW32__
950	zUser = getenv("USERNAME");
951	#else
952	zUser = getenv("USER");
953	#endif
954	}
955

	--- src/db.c
	+++ src/db.c
	@@ -27,10 +27,13 @@
27	** (3) A local checkout database named "_FOSSIL_" or ".fos"
28	** and located at the root of the local copy of the source tree.
29	**
30	*/
31	#include "config.h"
32	#if ! defined(_WIN32)
33	# include <pwd.h>
34	#endif
35	#include <sqlite3.h>
36	#include <sys/types.h>
37	#include <sys/stat.h>
38	#include <unistd.h>
39	#include "db.h"
	@@ -534,11 +537,11 @@
537	}
538	db_finalize(&s);
539	return z;
540	}
541
542	#if defined(_WIN32)
543	extern char sqlite3_win32_mbcs_to_utf8(const char);
544	#endif
545
546	/*
547	** Initialize a new database file with the given schema. If anything
	@@ -552,11 +555,11 @@
555	sqlite3 *db;
556	int rc;
557	const char *zSql;
558	va_list ap;
559
560	#if defined(_WIN32)
561	zFileName = sqlite3_win32_mbcs_to_utf8(zFileName);
562	#endif
563	rc = sqlite3_open(zFileName, &db);
564	if( rc!=SQLITE_OK ){
565	db_err(sqlite3_errmsg(db));
	@@ -587,11 +590,11 @@
590	int rc;
591	const char *zVfs;
592	sqlite3 *db;
593
594	zVfs = getenv("FOSSIL_VFS");
595	#if defined(_WIN32)
596	zDbName = sqlite3_win32_mbcs_to_utf8(zDbName);
597	#endif
598	rc = sqlite3_open_v2(
599	zDbName, &db,
600	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,
	@@ -615,11 +618,11 @@
618	if( !g.db ){
619	g.db = openDatabase(zDbName);
620	g.zRepoDb = "main";
621	db_connection_init();
622	}else{
623	#if defined(_WIN32)
624	zDbName = sqlite3_win32_mbcs_to_utf8(zDbName);
625	#endif
626	db_multi_exec("ATTACH DATABASE %Q AS %s", zDbName, zLabel);
627	g.zRepoDb = mprintf("%s", zLabel);
628	}
	@@ -639,11 +642,11 @@
642	*/
643	void db_open_config(int useAttach){
644	char *zDbName;
645	const char *zHome;
646	if( g.configOpen ) return;
647	#if defined(_WIN32)
648	zHome = getenv("LOCALAPPDATA");
649	if( zHome==0 ){
650	zHome = getenv("APPDATA");
651	if( zHome==0 ){
652	zHome = getenv("HOMEPATH");
	@@ -667,11 +670,11 @@
670	if( access(zHome, W_OK) ){
671	fossil_fatal("home directory %s must be writeable", zHome);
672	}
673	#endif
674	g.zHome = mprintf("%/", zHome);
675	#if defined(_WIN32)
676	/* . filenames give some window systems problems and many apps problems */
677	zDbName = mprintf("%//_fossil", zHome);
678	#else
679	zDbName = mprintf("%s/.fossil", zHome);
680	#endif
	@@ -944,11 +947,11 @@
947	zUser = db_get("default-user", 0);
948	if( zUser==0 ){
949	zUser = zDefaultUser;
950	}
951	if( zUser==0 ){
952	#if defined(_WIN32)
953	zUser = getenv("USERNAME");
954	#else
955	zUser = getenv("USER");
956	#endif
957	}
958

M src/diffcmd.c

+1 -1

		--- src/diffcmd.c
		+++ src/diffcmd.c
		@@ -24,11 +24,11 @@
24	24	/*
25	25	** This function implements a cross-platform "system()" interface.
26	26	*/
27	27	int portable_system(const char *zOrigCmd){
28	28	int rc;
29		-#ifdef __MINGW32__
	29	+#if defined(_WIN32)
30	30	/* On windows, we have to put double-quotes around the entire command.
31	31	** Who knows why - this is just the way windows works.
32	32	*/
33	33	char *zNewCmd = mprintf("\"%s\"", zOrigCmd);
34	34	rc = system(zNewCmd);
35	35

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -24,11 +24,11 @@
24	/*
25	** This function implements a cross-platform "system()" interface.
26	*/
27	int portable_system(const char *zOrigCmd){
28	int rc;
29	#ifdef __MINGW32__
30	/* On windows, we have to put double-quotes around the entire command.
31	** Who knows why - this is just the way windows works.
32	*/
33	char *zNewCmd = mprintf("\"%s\"", zOrigCmd);
34	rc = system(zNewCmd);
35

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -24,11 +24,11 @@
24	/*
25	** This function implements a cross-platform "system()" interface.
26	*/
27	int portable_system(const char *zOrigCmd){
28	int rc;
29	#if defined(_WIN32)
30	/* On windows, we have to put double-quotes around the entire command.
31	** Who knows why - this is just the way windows works.
32	*/
33	char *zNewCmd = mprintf("\"%s\"", zOrigCmd);
34	rc = system(zNewCmd);
35

M src/diffcmd.c

+1 -1

		--- src/diffcmd.c
		+++ src/diffcmd.c
		@@ -24,11 +24,11 @@
24	24	/*
25	25	** This function implements a cross-platform "system()" interface.
26	26	*/
27	27	int portable_system(const char *zOrigCmd){
28	28	int rc;
29		-#ifdef __MINGW32__
	29	+#if defined(_WIN32)
30	30	/* On windows, we have to put double-quotes around the entire command.
31	31	** Who knows why - this is just the way windows works.
32	32	*/
33	33	char *zNewCmd = mprintf("\"%s\"", zOrigCmd);
34	34	rc = system(zNewCmd);
35	35

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -24,11 +24,11 @@
24	/*
25	** This function implements a cross-platform "system()" interface.
26	*/
27	int portable_system(const char *zOrigCmd){
28	int rc;
29	#ifdef __MINGW32__
30	/* On windows, we have to put double-quotes around the entire command.
31	** Who knows why - this is just the way windows works.
32	*/
33	char *zNewCmd = mprintf("\"%s\"", zOrigCmd);
34	rc = system(zNewCmd);
35

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -24,11 +24,11 @@
24	/*
25	** This function implements a cross-platform "system()" interface.
26	*/
27	int portable_system(const char *zOrigCmd){
28	int rc;
29	#if defined(_WIN32)
30	/* On windows, we have to put double-quotes around the entire command.
31	** Who knows why - this is just the way windows works.
32	*/
33	char *zNewCmd = mprintf("\"%s\"", zOrigCmd);
34	rc = system(zNewCmd);
35

M src/file.c

+10 -7

		--- src/file.c
		+++ src/file.c
		@@ -83,11 +83,14 @@
83	83	** Return TRUE if the named file is an executable. Return false
84	84	** for directories, devices, fifos, symlinks, etc.
85	85	*/
86	86	int file_isexe(const char *zFilename){
87	87	if( getStat(zFilename) \|\| !S_ISREG(fileStat.st_mode) ) return 0;
88		-#ifdef __MINGW32__
	88	+#if defined(_WIN32)
	89	+# if defined(__DMC__) \|\| defined(_MSC_VER)
	90	+# define S_IXUSR _S_IEXEC
	91	+# endif
89	92	return ((S_IXUSR)&fileStat.st_mode)!=0;
90	93	#else
91	94	return ((S_IXUSR\|S_IXGRP\|S_IXOTH)&fileStat.st_mode)!=0;
92	95	#endif
93	96	}
		@@ -145,11 +148,11 @@
145	148
146	149	/*
147	150	** Set or clear the execute bit on a file.
148	151	*/
149	152	void file_setexe(const char *zFilename, int onoff){
150		-#ifndef __MINGW32__
	153	+#if !defined(_WIN32)
151	154	struct stat buf;
152	155	if( stat(zFilename, &buf)!=0 ) return;
153	156	if( onoff ){
154	157	if( (buf.st_mode & 0111)!=0111 ){
155	158	chmod(zFilename, buf.st_mode \| 0111);
		@@ -157,11 +160,11 @@
157	160	}else{
158	161	if( (buf.st_mode & 0111)!=0 ){
159	162	chmod(zFilename, buf.st_mode & ~0111);
160	163	}
161	164	}
162		-#endif /* __MINGW32__ */
	165	+#endif /* _WIN32 */
163	166	}
164	167
165	168	/*
166	169	** Create the directory named in the argument, if it does not already
167	170	** exist. If forceFlag is 1, delete any prior non-directory object
		@@ -174,11 +177,11 @@
174	177	if( rc==2 ){
175	178	if( !forceFlag ) return 1;
176	179	unlink(zName);
177	180	}
178	181	if( rc!=1 ){
179		-#ifdef __MINGW32__
	182	+#if defined(_WIN32)
180	183	return mkdir(zName);
181	184	#else
182	185	return mkdir(zName, 0755);
183	186	#endif
184	187	}
		@@ -231,11 +234,11 @@
231	234	** Changes are made in-place. Return the new name length.
232	235	*/
233	236	int file_simplify_name(char *z, int n){
234	237	int i, j;
235	238	if( n<0 ) n = strlen(z);
236		-#ifdef __MINGW32__
	239	+#if defined(_WIN32)
237	240	for(i=0; i<n; i++){
238	241	if( z[i]=='\\' ) z[i] = '/';
239	242	}
240	243	#endif
241	244	while( n>1 && z[n-1]=='/' ){ n--; }
		@@ -266,11 +269,11 @@
266	269	** Remove all /./ path elements.
267	270	** Convert /A/../ to just /
268	271	*/
269	272	void file_canonical_name(const char zOrigName, Blob pOut){
270	273	if( zOrigName[0]=='/'
271		-#ifdef __MINGW32__
	274	+#if defined(_WIN32)
272	275	\|\| zOrigName[0]=='\\'
273	276	\|\| (strlen(zOrigName)>3 && zOrigName[1]==':'
274	277	&& (zOrigName[2]=='\\' \|\| zOrigName[2]=='/'))
275	278	#endif
276	279	){
		@@ -311,11 +314,11 @@
311	314	** contain no "/./" or "/../" terms.
312	315	*/
313	316	int file_is_canonical(const char *z){
314	317	int i;
315	318	if( z[0]!='/'
316		-#ifdef __MINGW32__
	319	+#if defined(_WIN32)
317	320	&& (z[0]==0 \|\| z[1]!=':' \|\| z[2]!='/')
318	321	#endif
319	322	) return 0;
320	323
321	324	for(i=0; z[i]; i++){
322	325

	--- src/file.c
	+++ src/file.c
	@@ -83,11 +83,14 @@
83	** Return TRUE if the named file is an executable. Return false
84	** for directories, devices, fifos, symlinks, etc.
85	*/
86	int file_isexe(const char *zFilename){
87	if( getStat(zFilename) \|\| !S_ISREG(fileStat.st_mode) ) return 0;
88	#ifdef __MINGW32__



89	return ((S_IXUSR)&fileStat.st_mode)!=0;
90	#else
91	return ((S_IXUSR\|S_IXGRP\|S_IXOTH)&fileStat.st_mode)!=0;
92	#endif
93	}
	@@ -145,11 +148,11 @@
145
146	/*
147	** Set or clear the execute bit on a file.
148	*/
149	void file_setexe(const char *zFilename, int onoff){
150	#ifndef __MINGW32__
151	struct stat buf;
152	if( stat(zFilename, &buf)!=0 ) return;
153	if( onoff ){
154	if( (buf.st_mode & 0111)!=0111 ){
155	chmod(zFilename, buf.st_mode \| 0111);
	@@ -157,11 +160,11 @@
157	}else{
158	if( (buf.st_mode & 0111)!=0 ){
159	chmod(zFilename, buf.st_mode & ~0111);
160	}
161	}
162	#endif /* __MINGW32__ */
163	}
164
165	/*
166	** Create the directory named in the argument, if it does not already
167	** exist. If forceFlag is 1, delete any prior non-directory object
	@@ -174,11 +177,11 @@
174	if( rc==2 ){
175	if( !forceFlag ) return 1;
176	unlink(zName);
177	}
178	if( rc!=1 ){
179	#ifdef __MINGW32__
180	return mkdir(zName);
181	#else
182	return mkdir(zName, 0755);
183	#endif
184	}
	@@ -231,11 +234,11 @@
231	** Changes are made in-place. Return the new name length.
232	*/
233	int file_simplify_name(char *z, int n){
234	int i, j;
235	if( n<0 ) n = strlen(z);
236	#ifdef __MINGW32__
237	for(i=0; i<n; i++){
238	if( z[i]=='\\' ) z[i] = '/';
239	}
240	#endif
241	while( n>1 && z[n-1]=='/' ){ n--; }
	@@ -266,11 +269,11 @@
266	** Remove all /./ path elements.
267	** Convert /A/../ to just /
268	*/
269	void file_canonical_name(const char zOrigName, Blob pOut){
270	if( zOrigName[0]=='/'
271	#ifdef __MINGW32__
272	\|\| zOrigName[0]=='\\'
273	\|\| (strlen(zOrigName)>3 && zOrigName[1]==':'
274	&& (zOrigName[2]=='\\' \|\| zOrigName[2]=='/'))
275	#endif
276	){
	@@ -311,11 +314,11 @@
311	** contain no "/./" or "/../" terms.
312	*/
313	int file_is_canonical(const char *z){
314	int i;
315	if( z[0]!='/'
316	#ifdef __MINGW32__
317	&& (z[0]==0 \|\| z[1]!=':' \|\| z[2]!='/')
318	#endif
319	) return 0;
320
321	for(i=0; z[i]; i++){
322

	--- src/file.c
	+++ src/file.c
	@@ -83,11 +83,14 @@
83	** Return TRUE if the named file is an executable. Return false
84	** for directories, devices, fifos, symlinks, etc.
85	*/
86	int file_isexe(const char *zFilename){
87	if( getStat(zFilename) \|\| !S_ISREG(fileStat.st_mode) ) return 0;
88	#if defined(_WIN32)
89	# if defined(__DMC__) \|\| defined(_MSC_VER)
90	# define S_IXUSR _S_IEXEC
91	# endif
92	return ((S_IXUSR)&fileStat.st_mode)!=0;
93	#else
94	return ((S_IXUSR\|S_IXGRP\|S_IXOTH)&fileStat.st_mode)!=0;
95	#endif
96	}
	@@ -145,11 +148,11 @@
148
149	/*
150	** Set or clear the execute bit on a file.
151	*/
152	void file_setexe(const char *zFilename, int onoff){
153	#if !defined(_WIN32)
154	struct stat buf;
155	if( stat(zFilename, &buf)!=0 ) return;
156	if( onoff ){
157	if( (buf.st_mode & 0111)!=0111 ){
158	chmod(zFilename, buf.st_mode \| 0111);
	@@ -157,11 +160,11 @@
160	}else{
161	if( (buf.st_mode & 0111)!=0 ){
162	chmod(zFilename, buf.st_mode & ~0111);
163	}
164	}
165	#endif /* _WIN32 */
166	}
167
168	/*
169	** Create the directory named in the argument, if it does not already
170	** exist. If forceFlag is 1, delete any prior non-directory object
	@@ -174,11 +177,11 @@
177	if( rc==2 ){
178	if( !forceFlag ) return 1;
179	unlink(zName);
180	}
181	if( rc!=1 ){
182	#if defined(_WIN32)
183	return mkdir(zName);
184	#else
185	return mkdir(zName, 0755);
186	#endif
187	}
	@@ -231,11 +234,11 @@
234	** Changes are made in-place. Return the new name length.
235	*/
236	int file_simplify_name(char *z, int n){
237	int i, j;
238	if( n<0 ) n = strlen(z);
239	#if defined(_WIN32)
240	for(i=0; i<n; i++){
241	if( z[i]=='\\' ) z[i] = '/';
242	}
243	#endif
244	while( n>1 && z[n-1]=='/' ){ n--; }
	@@ -266,11 +269,11 @@
269	** Remove all /./ path elements.
270	** Convert /A/../ to just /
271	*/
272	void file_canonical_name(const char zOrigName, Blob pOut){
273	if( zOrigName[0]=='/'
274	#if defined(_WIN32)
275	\|\| zOrigName[0]=='\\'
276	\|\| (strlen(zOrigName)>3 && zOrigName[1]==':'
277	&& (zOrigName[2]=='\\' \|\| zOrigName[2]=='/'))
278	#endif
279	){
	@@ -311,11 +314,11 @@
314	** contain no "/./" or "/../" terms.
315	*/
316	int file_is_canonical(const char *z){
317	int i;
318	if( z[0]!='/'
319	#if defined(_WIN32)
320	&& (z[0]==0 \|\| z[1]!=':' \|\| z[2]!='/')
321	#endif
322	) return 0;
323
324	for(i=0; z[i]; i++){
325

M src/http_socket.c

+11 -8

		--- src/http_socket.c
		+++ src/http_socket.c
		@@ -26,13 +26,16 @@
26	26	** are handled different on Unix and windows.
27	27	*/
28	28
29	29	#include "config.h"
30	30	#include "http_socket.h"
31		-#ifdef __MINGW32__
32		-# include <windows.h>
33		-# include <winsock2.h>
	31	+#if defined(_WIN32)
	32	+# include <windows.h> /* for Sleep once server works again */
	33	+# define sleep Sleep /* windows does not have sleep, but Sleep */
	34	+# if defined(__MINGW32__)
	35	+# include <ws2tcpip.h>
	36	+# endif
34	37	#else
35	38	# include <arpa/inet.h>
36	39	# include <sys/socket.h>
37	40	# include <netdb.h>
38	41	# include <netinet/in.h>
		@@ -45,11 +48,11 @@
45	48	** There can only be a single socket connection open at a time.
46	49	** State information about that socket is stored in the following
47	50	** local variables:
48	51	*/
49	52	static int socketIsInit = 0; /* True after global initialization */
50		-#ifdef __MINGW32__
	53	+#if defined(_WIN32)
51	54	static WSADATA socketInfo; /* Windows socket initialize data */
52	55	#endif
53	56	static int iSocket = -1; /* The socket on which we talk to the server */
54	57	static char socketErrMsg = 0; / Text of most recent socket error */
55	58
		@@ -84,11 +87,11 @@
84	87	** Call this routine once before any other use of the socket interface.
85	88	** This routine does initial configuration of the socket module.
86	89	*/
87	90	void socket_global_init(void){
88	91	if( socketIsInit==0 ){
89		-#ifdef __MINGW32__
	92	+#if defined(_WIN32)
90	93	if( WSAStartup(MAKEWORD(2,0), &socketInfo)!=0 ){
91	94	fossil_panic("can't initialize winsock");
92	95	}
93	96	#endif
94	97	socketIsInit = 1;
		@@ -99,11 +102,11 @@
99	102	** Call this routine to shutdown the socket module prior to program
100	103	** exit.
101	104	*/
102	105	void socket_global_shutdown(void){
103	106	if( socketIsInit ){
104		-#ifdef __MINGW32__
	107	+#if defined(_WIN32)
105	108	WSACleanup();
106	109	#endif
107	110	socket_clear_errmsg();
108	111	socketIsInit = 0;
109	112	}
		@@ -113,11 +116,11 @@
113	116	** Close the currently open socket. If no socket is open, this routine
114	117	** is a no-op.
115	118	*/
116	119	void socket_close(void){
117	120	if( iSocket>=0 ){
118		-#ifdef __MINGW32__
	121	+#if defined(_WIN32)
119	122	closesocket(iSocket);
120	123	#else
121	124	close(iSocket);
122	125	#endif
123	126	iSocket = -1;
		@@ -171,11 +174,11 @@
171	174	if( connect(iSocket,(struct sockaddr*)&addr,sizeof(addr))<0 ){
172	175	socket_set_errmsg("cannot connect to host %s:%d", g.urlName, g.urlPort);
173	176	socket_close();
174	177	return 1;
175	178	}
176		-#ifndef __MINGW32__
	179	+#if !defined(_WIN32)
177	180	signal(SIGPIPE, SIG_IGN);
178	181	#endif
179	182	return 0;
180	183	}
181	184
182	185

	--- src/http_socket.c
	+++ src/http_socket.c
	@@ -26,13 +26,16 @@
26	** are handled different on Unix and windows.
27	*/
28
29	#include "config.h"
30	#include "http_socket.h"
31	#ifdef __MINGW32__
32	# include <windows.h>
33	# include <winsock2.h>



34	#else
35	# include <arpa/inet.h>
36	# include <sys/socket.h>
37	# include <netdb.h>
38	# include <netinet/in.h>
	@@ -45,11 +48,11 @@
45	** There can only be a single socket connection open at a time.
46	** State information about that socket is stored in the following
47	** local variables:
48	*/
49	static int socketIsInit = 0; /* True after global initialization */
50	#ifdef __MINGW32__
51	static WSADATA socketInfo; /* Windows socket initialize data */
52	#endif
53	static int iSocket = -1; /* The socket on which we talk to the server */
54	static char socketErrMsg = 0; / Text of most recent socket error */
55
	@@ -84,11 +87,11 @@
84	** Call this routine once before any other use of the socket interface.
85	** This routine does initial configuration of the socket module.
86	*/
87	void socket_global_init(void){
88	if( socketIsInit==0 ){
89	#ifdef __MINGW32__
90	if( WSAStartup(MAKEWORD(2,0), &socketInfo)!=0 ){
91	fossil_panic("can't initialize winsock");
92	}
93	#endif
94	socketIsInit = 1;
	@@ -99,11 +102,11 @@
99	** Call this routine to shutdown the socket module prior to program
100	** exit.
101	*/
102	void socket_global_shutdown(void){
103	if( socketIsInit ){
104	#ifdef __MINGW32__
105	WSACleanup();
106	#endif
107	socket_clear_errmsg();
108	socketIsInit = 0;
109	}
	@@ -113,11 +116,11 @@
113	** Close the currently open socket. If no socket is open, this routine
114	** is a no-op.
115	*/
116	void socket_close(void){
117	if( iSocket>=0 ){
118	#ifdef __MINGW32__
119	closesocket(iSocket);
120	#else
121	close(iSocket);
122	#endif
123	iSocket = -1;
	@@ -171,11 +174,11 @@
171	if( connect(iSocket,(struct sockaddr*)&addr,sizeof(addr))<0 ){
172	socket_set_errmsg("cannot connect to host %s:%d", g.urlName, g.urlPort);
173	socket_close();
174	return 1;
175	}
176	#ifndef __MINGW32__
177	signal(SIGPIPE, SIG_IGN);
178	#endif
179	return 0;
180	}
181
182

	--- src/http_socket.c
	+++ src/http_socket.c
	@@ -26,13 +26,16 @@
26	** are handled different on Unix and windows.
27	*/
28
29	#include "config.h"
30	#include "http_socket.h"
31	#if defined(_WIN32)
32	# include <windows.h> /* for Sleep once server works again */
33	# define sleep Sleep /* windows does not have sleep, but Sleep */
34	# if defined(__MINGW32__)
35	# include <ws2tcpip.h>
36	# endif
37	#else
38	# include <arpa/inet.h>
39	# include <sys/socket.h>
40	# include <netdb.h>
41	# include <netinet/in.h>
	@@ -45,11 +48,11 @@
48	** There can only be a single socket connection open at a time.
49	** State information about that socket is stored in the following
50	** local variables:
51	*/
52	static int socketIsInit = 0; /* True after global initialization */
53	#if defined(_WIN32)
54	static WSADATA socketInfo; /* Windows socket initialize data */
55	#endif
56	static int iSocket = -1; /* The socket on which we talk to the server */
57	static char socketErrMsg = 0; / Text of most recent socket error */
58
	@@ -84,11 +87,11 @@
87	** Call this routine once before any other use of the socket interface.
88	** This routine does initial configuration of the socket module.
89	*/
90	void socket_global_init(void){
91	if( socketIsInit==0 ){
92	#if defined(_WIN32)
93	if( WSAStartup(MAKEWORD(2,0), &socketInfo)!=0 ){
94	fossil_panic("can't initialize winsock");
95	}
96	#endif
97	socketIsInit = 1;
	@@ -99,11 +102,11 @@
102	** Call this routine to shutdown the socket module prior to program
103	** exit.
104	*/
105	void socket_global_shutdown(void){
106	if( socketIsInit ){
107	#if defined(_WIN32)
108	WSACleanup();
109	#endif
110	socket_clear_errmsg();
111	socketIsInit = 0;
112	}
	@@ -113,11 +116,11 @@
116	** Close the currently open socket. If no socket is open, this routine
117	** is a no-op.
118	*/
119	void socket_close(void){
120	if( iSocket>=0 ){
121	#if defined(_WIN32)
122	closesocket(iSocket);
123	#else
124	close(iSocket);
125	#endif
126	iSocket = -1;
	@@ -171,11 +174,11 @@
174	if( connect(iSocket,(struct sockaddr*)&addr,sizeof(addr))<0 ){
175	socket_set_errmsg("cannot connect to host %s:%d", g.urlName, g.urlPort);
176	socket_close();
177	return 1;
178	}
179	#if !defined(_WIN32)
180	signal(SIGPIPE, SIG_IGN);
181	#endif
182	return 0;
183	}
184
185

M src/http_ssl.c

+4 -4

		--- src/http_ssl.c
		+++ src/http_ssl.c
		@@ -128,11 +128,11 @@
128	128	** Return the number of errors.
129	129	*/
130	130	int ssl_open(void){
131	131	X509 *cert;
132	132	int hasSavedCertificate = 0;
133		-
	133	+char *connStr ;
134	134	ssl_global_init();
135	135
136	136	/* Get certificate for current server from global config and
137	137	* (if we have it in config) add it to certificate store.
138	138	*/
		@@ -150,11 +150,11 @@
150	150	ssl_set_errmsg("SSL: cannot open SSL (%s)",
151	151	ERR_reason_error_string(ERR_get_error()));
152	152	return 1;
153	153	}
154	154
155		- char *connStr = mprintf("%s:%d", g.urlName, g.urlPort);
	155	+ connStr = mprintf("%s:%d", g.urlName, g.urlPort);
156	156	BIO_set_conn_hostname(iBio, connStr);
157	157	free(connStr);
158	158
159	159	if( BIO_do_connect(iBio)<=0 ){
160	160	ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)",
		@@ -178,29 +178,29 @@
178	178	return 1;
179	179	}
180	180
181	181	if( SSL_get_verify_result(ssl) != X509_V_OK ){
182	182	char desc, prompt;
	183	+ char *warning = "";
	184	+ Blob ans;
183	185	BIO *mem;
184	186
185	187	mem = BIO_new(BIO_s_mem());
186	188	X509_NAME_print_ex(mem, X509_get_subject_name(cert), 2, XN_FLAG_MULTILINE);
187	189	BIO_puts(mem, "\n\nIssued By:\n\n");
188	190	X509_NAME_print_ex(mem, X509_get_issuer_name(cert), 2, XN_FLAG_MULTILINE);
189	191	BIO_write(mem, "", 1); // null-terminate mem buffer
190	192	BIO_get_mem_data(mem, &desc);
191	193
192		- char *warning = "";
193	194	if( hasSavedCertificate ){
194	195	warning = "WARNING: Certificate doesn't match the "
195	196	"saved certificate for this host!";
196	197	}
197	198	prompt = mprintf("\nUnknown SSL certificate:\n\n%s\n\n%s\n"
198	199	"Accept certificate [a=always/y/N]? ", desc, warning);
199	200	BIO_free(mem);
200	201
201		- Blob ans;
202	202	prompt_user(prompt, &ans);
203	203	free(prompt);
204	204	if( blob_str(&ans)[0]!='y' && blob_str(&ans)[0]!='a' ) {
205	205	X509_free(cert);
206	206	ssl_set_errmsg("SSL certificate declined");
207	207

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -128,11 +128,11 @@
128	** Return the number of errors.
129	*/
130	int ssl_open(void){
131	X509 *cert;
132	int hasSavedCertificate = 0;
133
134	ssl_global_init();
135
136	/* Get certificate for current server from global config and
137	* (if we have it in config) add it to certificate store.
138	*/
	@@ -150,11 +150,11 @@
150	ssl_set_errmsg("SSL: cannot open SSL (%s)",
151	ERR_reason_error_string(ERR_get_error()));
152	return 1;
153	}
154
155	char *connStr = mprintf("%s:%d", g.urlName, g.urlPort);
156	BIO_set_conn_hostname(iBio, connStr);
157	free(connStr);
158
159	if( BIO_do_connect(iBio)<=0 ){
160	ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)",
	@@ -178,29 +178,29 @@
178	return 1;
179	}
180
181	if( SSL_get_verify_result(ssl) != X509_V_OK ){
182	char desc, prompt;


183	BIO *mem;
184
185	mem = BIO_new(BIO_s_mem());
186	X509_NAME_print_ex(mem, X509_get_subject_name(cert), 2, XN_FLAG_MULTILINE);
187	BIO_puts(mem, "\n\nIssued By:\n\n");
188	X509_NAME_print_ex(mem, X509_get_issuer_name(cert), 2, XN_FLAG_MULTILINE);
189	BIO_write(mem, "", 1); // null-terminate mem buffer
190	BIO_get_mem_data(mem, &desc);
191
192	char *warning = "";
193	if( hasSavedCertificate ){
194	warning = "WARNING: Certificate doesn't match the "
195	"saved certificate for this host!";
196	}
197	prompt = mprintf("\nUnknown SSL certificate:\n\n%s\n\n%s\n"
198	"Accept certificate [a=always/y/N]? ", desc, warning);
199	BIO_free(mem);
200
201	Blob ans;
202	prompt_user(prompt, &ans);
203	free(prompt);
204	if( blob_str(&ans)[0]!='y' && blob_str(&ans)[0]!='a' ) {
205	X509_free(cert);
206	ssl_set_errmsg("SSL certificate declined");
207

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -128,11 +128,11 @@
128	** Return the number of errors.
129	*/
130	int ssl_open(void){
131	X509 *cert;
132	int hasSavedCertificate = 0;
133	char *connStr ;
134	ssl_global_init();
135
136	/* Get certificate for current server from global config and
137	* (if we have it in config) add it to certificate store.
138	*/
	@@ -150,11 +150,11 @@
150	ssl_set_errmsg("SSL: cannot open SSL (%s)",
151	ERR_reason_error_string(ERR_get_error()));
152	return 1;
153	}
154
155	connStr = mprintf("%s:%d", g.urlName, g.urlPort);
156	BIO_set_conn_hostname(iBio, connStr);
157	free(connStr);
158
159	if( BIO_do_connect(iBio)<=0 ){
160	ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)",
	@@ -178,29 +178,29 @@
178	return 1;
179	}
180
181	if( SSL_get_verify_result(ssl) != X509_V_OK ){
182	char desc, prompt;
183	char *warning = "";
184	Blob ans;
185	BIO *mem;
186
187	mem = BIO_new(BIO_s_mem());
188	X509_NAME_print_ex(mem, X509_get_subject_name(cert), 2, XN_FLAG_MULTILINE);
189	BIO_puts(mem, "\n\nIssued By:\n\n");
190	X509_NAME_print_ex(mem, X509_get_issuer_name(cert), 2, XN_FLAG_MULTILINE);
191	BIO_write(mem, "", 1); // null-terminate mem buffer
192	BIO_get_mem_data(mem, &desc);
193

194	if( hasSavedCertificate ){
195	warning = "WARNING: Certificate doesn't match the "
196	"saved certificate for this host!";
197	}
198	prompt = mprintf("\nUnknown SSL certificate:\n\n%s\n\n%s\n"
199	"Accept certificate [a=always/y/N]? ", desc, warning);
200	BIO_free(mem);
201

202	prompt_user(prompt, &ans);
203	free(prompt);
204	if( blob_str(&ans)[0]!='y' && blob_str(&ans)[0]!='a' ) {
205	X509_free(cert);
206	ssl_set_errmsg("SSL certificate declined");
207

M src/info.c

+1 -1

		--- src/info.c
		+++ src/info.c
		@@ -142,11 +142,11 @@
142	142	/* 012345678901234 */
143	143	db_record_repository_filename(0);
144	144	printf("project-name: %s\n", db_get("project-name", "<unnamed>"));
145	145	printf("repository: %s\n", db_lget("repository", ""));
146	146	printf("local-root: %s\n", g.zLocalRoot);
147		-#ifdef __MINGW32__
	147	+#if defined(_WIN32)
148	148	if( g.zHome ){
149	149	printf("user-home: %s\n", g.zHome);
150	150	}
151	151	#endif
152	152	printf("project-code: %s\n", db_get("project-code", ""));
153	153

	--- src/info.c
	+++ src/info.c
	@@ -142,11 +142,11 @@
142	/* 012345678901234 */
143	db_record_repository_filename(0);
144	printf("project-name: %s\n", db_get("project-name", "<unnamed>"));
145	printf("repository: %s\n", db_lget("repository", ""));
146	printf("local-root: %s\n", g.zLocalRoot);
147	#ifdef __MINGW32__
148	if( g.zHome ){
149	printf("user-home: %s\n", g.zHome);
150	}
151	#endif
152	printf("project-code: %s\n", db_get("project-code", ""));
153

	--- src/info.c
	+++ src/info.c
	@@ -142,11 +142,11 @@
142	/* 012345678901234 */
143	db_record_repository_filename(0);
144	printf("project-name: %s\n", db_get("project-name", "<unnamed>"));
145	printf("repository: %s\n", db_lget("repository", ""));
146	printf("local-root: %s\n", g.zLocalRoot);
147	#if defined(_WIN32)
148	if( g.zHome ){
149	printf("user-home: %s\n", g.zHome);
150	}
151	#endif
152	printf("project-code: %s\n", db_get("project-code", ""));
153

M src/login.c

+4 -2

		--- src/login.c
		+++ src/login.c
		@@ -37,13 +37,15 @@
37	37	** logs and downloading diffs of very version of the archive that
38	38	** has ever existed, and things like that.
39	39	*/
40	40	#include "config.h"
41	41	#include "login.h"
42		-#ifdef __MINGW32__
	42	+#if defined(_WIN32)
43	43	# include <windows.h> /* for Sleep */
44		-# define sleep Sleep /* windows does not have sleep, but Sleep */
	44	+# if defined(_MINGW32__) \|\| defined(_MSC_VER)
	45	+# define sleep Sleep /* windows does not have sleep, but Sleep */
	46	+# endif
45	47	#endif
46	48	#include <time.h>
47	49
48	50	/*
49	51	** Return the name of the login cookie
50	52

	--- src/login.c
	+++ src/login.c
	@@ -37,13 +37,15 @@
37	** logs and downloading diffs of very version of the archive that
38	** has ever existed, and things like that.
39	*/
40	#include "config.h"
41	#include "login.h"
42	#ifdef __MINGW32__
43	# include <windows.h> /* for Sleep */
44	# define sleep Sleep /* windows does not have sleep, but Sleep */


45	#endif
46	#include <time.h>
47
48	/*
49	** Return the name of the login cookie
50

	--- src/login.c
	+++ src/login.c
	@@ -37,13 +37,15 @@
37	** logs and downloading diffs of very version of the archive that
38	** has ever existed, and things like that.
39	*/
40	#include "config.h"
41	#include "login.h"
42	#if defined(_WIN32)
43	# include <windows.h> /* for Sleep */
44	# if defined(_MINGW32__) \|\| defined(_MSC_VER)
45	# define sleep Sleep /* windows does not have sleep, but Sleep */
46	# endif
47	#endif
48	#include <time.h>
49
50	/*
51	** Return the name of the login cookie
52

M src/main.c

+5 -5

		--- src/main.c
		+++ src/main.c
		@@ -632,11 +632,11 @@
632	632	**
633	633	** Assume the user-id and group-id of the repository, or if zRepo
634	634	** is a directory, of that directory.
635	635	*/
636	636	static char enter_chroot_jail(char zRepo){
637		-#if !defined(__MINGW32__)
	637	+#if !defined(_WIN32)
638	638	if( getuid()==0 ){
639	639	int i;
640	640	struct stat sStat;
641	641	Blob dir;
642	642	char *zDir;
		@@ -810,11 +810,11 @@
810	810	}else{
811	811	zFile = g.argv[1];
812	812	}
813	813	g.httpOut = stdout;
814	814	g.httpIn = stdin;
815		-#ifdef __MINGW32__
	815	+#if defined(_WIN32)
816	816	/* Set binary mode on windows to avoid undesired translations
817	817	** between \n and \r\n. */
818	818	setmode(_fileno(g.httpOut), _O_BINARY);
819	819	setmode(_fileno(g.httpIn), _O_BINARY);
820	820	#endif
		@@ -953,11 +953,11 @@
953	953	g.fullHttpReply = 1;
954	954	cgi_handle_http_request(0);
955	955	process_one_web_page(0);
956	956	}
957	957
958		-#ifndef __MINGW32__
	958	+#if !defined(_WIN32)
959	959	#if !defined(__DARWIN__) && !defined(__APPLE__)
960	960	/*
961	961	** Search for an executable on the PATH environment variable.
962	962	** Return true (1) if found and false (0) if not found.
963	963	*/
		@@ -1009,11 +1009,11 @@
1009	1009	char zBrowserCmd = 0; / Command to launch the web browser */
1010	1010	int isUiCmd; /* True if command is "ui", not "server' */
1011	1011	const char zNotFound; / The --notfound option or NULL */
1012	1012	int flags = 0; /* Server flags */
1013	1013
1014		-#ifdef __MINGW32__
	1014	+#if defined(_WIN32)
1015	1015	const char zStopperFile; / Name of file used to terminate server */
1016	1016	zStopperFile = find_option("stopper", 0, 1);
1017	1017	#endif
1018	1018
1019	1019	g.thTrace = find_option("th-trace", 0, 0)!=0;
		@@ -1030,11 +1030,11 @@
1030	1030	iPort = mxPort = atoi(zPort);
1031	1031	}else{
1032	1032	iPort = db_get_int("http-port", 8080);
1033	1033	mxPort = iPort+100;
1034	1034	}
1035		-#ifndef __MINGW32__
	1035	+#if !defined(_WIN32)
1036	1036	/* Unix implementation */
1037	1037	if( isUiCmd ){
1038	1038	#if !defined(__DARWIN__) && !defined(__APPLE__)
1039	1039	zBrowser = db_get("web-browser", 0);
1040	1040	if( zBrowser==0 ){
1041	1041

	--- src/main.c
	+++ src/main.c
	@@ -632,11 +632,11 @@
632	**
633	** Assume the user-id and group-id of the repository, or if zRepo
634	** is a directory, of that directory.
635	*/
636	static char enter_chroot_jail(char zRepo){
637	#if !defined(__MINGW32__)
638	if( getuid()==0 ){
639	int i;
640	struct stat sStat;
641	Blob dir;
642	char *zDir;
	@@ -810,11 +810,11 @@
810	}else{
811	zFile = g.argv[1];
812	}
813	g.httpOut = stdout;
814	g.httpIn = stdin;
815	#ifdef __MINGW32__
816	/* Set binary mode on windows to avoid undesired translations
817	** between \n and \r\n. */
818	setmode(_fileno(g.httpOut), _O_BINARY);
819	setmode(_fileno(g.httpIn), _O_BINARY);
820	#endif
	@@ -953,11 +953,11 @@
953	g.fullHttpReply = 1;
954	cgi_handle_http_request(0);
955	process_one_web_page(0);
956	}
957
958	#ifndef __MINGW32__
959	#if !defined(__DARWIN__) && !defined(__APPLE__)
960	/*
961	** Search for an executable on the PATH environment variable.
962	** Return true (1) if found and false (0) if not found.
963	*/
	@@ -1009,11 +1009,11 @@
1009	char zBrowserCmd = 0; / Command to launch the web browser */
1010	int isUiCmd; /* True if command is "ui", not "server' */
1011	const char zNotFound; / The --notfound option or NULL */
1012	int flags = 0; /* Server flags */
1013
1014	#ifdef __MINGW32__
1015	const char zStopperFile; / Name of file used to terminate server */
1016	zStopperFile = find_option("stopper", 0, 1);
1017	#endif
1018
1019	g.thTrace = find_option("th-trace", 0, 0)!=0;
	@@ -1030,11 +1030,11 @@
1030	iPort = mxPort = atoi(zPort);
1031	}else{
1032	iPort = db_get_int("http-port", 8080);
1033	mxPort = iPort+100;
1034	}
1035	#ifndef __MINGW32__
1036	/* Unix implementation */
1037	if( isUiCmd ){
1038	#if !defined(__DARWIN__) && !defined(__APPLE__)
1039	zBrowser = db_get("web-browser", 0);
1040	if( zBrowser==0 ){
1041

	--- src/main.c
	+++ src/main.c
	@@ -632,11 +632,11 @@
632	**
633	** Assume the user-id and group-id of the repository, or if zRepo
634	** is a directory, of that directory.
635	*/
636	static char enter_chroot_jail(char zRepo){
637	#if !defined(_WIN32)
638	if( getuid()==0 ){
639	int i;
640	struct stat sStat;
641	Blob dir;
642	char *zDir;
	@@ -810,11 +810,11 @@
810	}else{
811	zFile = g.argv[1];
812	}
813	g.httpOut = stdout;
814	g.httpIn = stdin;
815	#if defined(_WIN32)
816	/* Set binary mode on windows to avoid undesired translations
817	** between \n and \r\n. */
818	setmode(_fileno(g.httpOut), _O_BINARY);
819	setmode(_fileno(g.httpIn), _O_BINARY);
820	#endif
	@@ -953,11 +953,11 @@
953	g.fullHttpReply = 1;
954	cgi_handle_http_request(0);
955	process_one_web_page(0);
956	}
957
958	#if !defined(_WIN32)
959	#if !defined(__DARWIN__) && !defined(__APPLE__)
960	/*
961	** Search for an executable on the PATH environment variable.
962	** Return true (1) if found and false (0) if not found.
963	*/
	@@ -1009,11 +1009,11 @@
1009	char zBrowserCmd = 0; / Command to launch the web browser */
1010	int isUiCmd; /* True if command is "ui", not "server' */
1011	const char zNotFound; / The --notfound option or NULL */
1012	int flags = 0; /* Server flags */
1013
1014	#if defined(_WIN32)
1015	const char zStopperFile; / Name of file used to terminate server */
1016	zStopperFile = find_option("stopper", 0, 1);
1017	#endif
1018
1019	g.thTrace = find_option("th-trace", 0, 0)!=0;
	@@ -1030,11 +1030,11 @@
1030	iPort = mxPort = atoi(zPort);
1031	}else{
1032	iPort = db_get_int("http-port", 8080);
1033	mxPort = iPort+100;
1034	}
1035	#if !defined(_WIN32)
1036	/* Unix implementation */
1037	if( isUiCmd ){
1038	#if !defined(__DARWIN__) && !defined(__APPLE__)
1039	zBrowser = db_get("web-browser", 0);
1040	if( zBrowser==0 ){
1041

M src/makeheaders.c

+6 -3

		--- src/makeheaders.c
		+++ src/makeheaders.c
		@@ -13,14 +13,17 @@
13	13	#include <stdlib.h>
14	14	#include <ctype.h>
15	15	#include <memory.h>
16	16	#include <sys/stat.h>
17	17	#include <assert.h>
18		-#ifndef WIN32
19		-# include <unistd.h>
20		-#else
	18	+#if defined( __MINGW32__) \|\| defined(__DMC__) \|\| defined(_MSC_VER)
	19	+# ifndef WIN32
	20	+# define WIN32
	21	+# endif
21	22	# include <string.h>
	23	+#else
	24	+# include <unistd.h>
22	25	#endif
23	26
24	27	/*
25	28	** Macros for debugging.
26	29	*/
27	30

	--- src/makeheaders.c
	+++ src/makeheaders.c
	@@ -13,14 +13,17 @@
13	#include <stdlib.h>
14	#include <ctype.h>
15	#include <memory.h>
16	#include <sys/stat.h>
17	#include <assert.h>
18	#ifndef WIN32
19	# include <unistd.h>
20	#else

21	# include <string.h>


22	#endif
23
24	/*
25	** Macros for debugging.
26	*/
27

	--- src/makeheaders.c
	+++ src/makeheaders.c
	@@ -13,14 +13,17 @@
13	#include <stdlib.h>
14	#include <ctype.h>
15	#include <memory.h>
16	#include <sys/stat.h>
17	#include <assert.h>
18	#if defined( __MINGW32__) \|\| defined(__DMC__) \|\| defined(_MSC_VER)
19	# ifndef WIN32
20	# define WIN32
21	# endif
22	# include <string.h>
23	#else
24	# include <unistd.h>
25	#endif
26
27	/*
28	** Macros for debugging.
29	*/
30

M src/makemake.tcl

+233 -1

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -81,11 +81,11 @@
81	81	}
82	82
83	83	# Name of the final application
84	84	#
85	85	set name fossil
86		-
	86	+if { 0 == $argc } {
87	87	puts {# DO NOT EDIT
88	88	#
89	89	# This file is automatically generated. Instead of editing this
90	90	# file, edit "makemake.tcl" then run "tclsh makemake.tcl >main.mk"
91	91	# to regenerate this file.
		@@ -205,5 +205,237 @@
205	205	puts "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
206	206	puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
207	207
208	208	puts "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
209	209	puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
	210	+exit
	211	+}
	212	+if { "dmc" == [lindex $argv 0] } {
	213	+
	214	+puts {# DO NOT EDIT
	215	+#
	216	+# This file is automatically generated. Instead of editing this
	217	+# file, edit "makemake.tcl" then run
	218	+# "tclsh src/makemake.tcl dmc > win/Makefile.dmc"
	219	+# to regenerate this file.
	220	+B = ..
	221	+SRCDIR = $B\src
	222	+OBJDIR = .
	223	+O = .obj
	224	+E = .exe
	225	+
	226	+
	227	+# Maybe DMDIR, SSL or INCL needs adjustment
	228	+DMDIR = c:\DM
	229	+INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(DMDIR)\extra\include
	230	+
	231	+#SSL = -DFOSSIL_ENABLE_SSL=1
	232	+SSL =
	233	+
	234	+DMCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp
	235	+I18N = -DFOSSIL_I18N=0
	236	+
	237	+CFLAGS = -o
	238	+BCC = $(DMDIR)\bin\dmc $(CFLAGS)
	239	+TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
	240	+LIBS = $(DMDIR)\extra\lib\ zlib wsock32
	241	+}
	242	+puts -nonewline "SRC = "
	243	+foreach s [lsort $src] {
	244	+ puts -nonewline "${s}_.c "
	245	+}
	246	+puts "\n"
	247	+puts -nonewline "OBJ = "
	248	+foreach s [lsort $src] {
	249	+ puts -nonewline "\$(OBJDIR)\\$s\$O "
	250	+}
	251	+puts "\$(OBJDIR)\\sqlite3\$O \$(OBJDIR)\\th\$O \$(OBJDIR)\\th_lang\$O "
	252	+puts {
	253	+
	254	+APPNAME = $(OBJDIR)\fossil$(E)
	255	+
	256	+all: $(APPNAME)
	257	+
	258	+$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
	259	+ cd $(OBJDIR)
	260	+ $(DMDIR)\bin\link @link
	261	+
	262	+$(OBJDIR)\link:}
	263	+puts -nonewline "\t+echo "
	264	+foreach s [lsort $src] {
	265	+ puts -nonewline "$s "
	266	+}
	267	+puts "sqlite3 th th_lang > \$@"
	268	+puts "\t+echo fossil >> \$@"
	269	+puts "\t+echo fossil >> \$@"
	270	+puts "\t+echo \$(LIBS) >> \$@\n\n"
	271	+
	272	+puts {
	273	+translate$E: $(SRCDIR)\translate.c
	274	+ $(BCC) -o$@ $**
	275	+
	276	+makeheaders$E: $(SRCDIR)\makeheaders.c
	277	+ $(BCC) -o$@ $**
	278	+
	279	+mkindex$E: $(SRCDIR)\mkindex.c
	280	+ $(BCC) -o$@ $**
	281	+
	282	+version$E: $B\win\version.c
	283	+ $(BCC) -o$@ $**
	284	+
	285	+$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
	286	+ $(TCC) -o$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $**
	287	+
	288	+$(OBJDIR)\th$O : $(SRCDIR)\th.c
	289	+ $(TCC) -o$@ -c $**
	290	+
	291	+$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
	292	+ $(TCC) -o$@ -c $**
	293	+
	294	+VERSION.h : version$E $B\manifest.uuid $B\manifest
	295	+ +$** > $@
	296	+
	297	+page_index.h: mkindex$E $(SRC)
	298	+ +$** > $@
	299	+
	300	+clean:
	301	+ -del $(OBJDIR)\*.obj
	302	+ -del .obj _.c .h .map
	303	+
	304	+realclean:
	305	+ -del $(APPNAME) translate$E mkindex$E makeheaders$E version$E
	306	+
	307	+}
	308	+foreach s [lsort $src] {
	309	+ puts "\$(OBJDIR)\\$s\$O : ${s}_.c"
	310	+ puts "\t\$(TCC) -o\$@ -c \$**\n"
	311	+ puts "${s}_.c : \$(SRCDIR)\\$s.c"
	312	+ puts "\t+translate\$E \$** > \$@\n"
	313	+}
	314	+
	315	+puts -nonewline "headers: makeheaders\$E page_index.h VERSION.h\n\t +makeheaders\$E "
	316	+foreach s [lsort $src] {
	317	+ puts -nonewline "${s}_.c:$s.h "
	318	+}
	319	+puts "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h"
	320	+puts "\t@copy /Y nul: headers"
	321	+exit
	322	+}
	323	+
	324	+if { "msc" == [lindex $argv 0] } {
	325	+
	326	+puts {# DO NOT EDIT
	327	+#
	328	+# This file is automatically generated. Instead of editing this
	329	+# file, edit "makemake.tcl" then run
	330	+# "tclsh src/makemake.tcl msc > win/Makefile.msc"
	331	+# to regenerate this file.
	332	+B = ..
	333	+SRCDIR = $B\src
	334	+OBJDIR = .
	335	+O = .obj
	336	+E = .exe
	337	+
	338	+
	339	+# Maybe MSCDIR, SSL or INCL needs adjustment
	340	+MSCDIR = c:\msc
	341	+INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include
	342	+
	343	+#SSL = -DFOSSIL_ENABLE_SSL=1
	344	+SSL =
	345	+
	346	+MSCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp
	347	+I18N = -DFOSSIL_I18N=0
	348	+
	349	+CFLAGS = -nologo -MD -O2 -Oy- -Zi
	350	+CFLAGS = -nologo -MT -O2
	351	+BCC = $(CC) $(CFLAGS)
	352	+TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
	353	+LIBS = zlib.lib ws2_32.lib
	354	+##SSL uncoment below
	355	+#LIBS = zlib.lib ws2_32.lib ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
	356	+LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib
	357	+}
	358	+puts -nonewline "SRC = "
	359	+foreach s [lsort $src] {
	360	+ puts -nonewline "${s}_.c "
	361	+}
	362	+puts "\n"
	363	+puts -nonewline "OBJ = "
	364	+foreach s [lsort $src] {
	365	+ puts -nonewline "\$(OBJDIR)\\$s\$O "
	366	+}
	367	+puts "\$(OBJDIR)\\sqlite3\$O \$(OBJDIR)\\th\$O \$(OBJDIR)\\th_lang\$O "
	368	+puts {
	369	+
	370	+APPNAME = $(OBJDIR)\fossil$(E)
	371	+
	372	+all: $(OBJDIR) $(APPNAME)
	373	+
	374	+$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
	375	+ cd $(OBJDIR)
	376	+ link -LINK -OUT:$@ $(LIBDIR) @link
	377	+
	378	+$(OBJDIR)\link:}
	379	+puts -nonewline "\techo "
	380	+foreach s [lsort $src] {
	381	+ puts -nonewline "$s "
	382	+}
	383	+puts "sqlite3 th th_lang > \$@"
	384	+puts "\techo \$(LIBS) >> \$@\n\n"
	385	+
	386	+puts {
	387	+
	388	+
	389	+$(OBJDIR):
	390	+ @-mkdir $@
	391	+
	392	+translate$E: $(SRCDIR)\translate.c
	393	+ $(BCC) $**
	394	+
	395	+makeheaders$E: $(SRCDIR)\makeheaders.c
	396	+ $(BCC) $**
	397	+
	398	+mkindex$E: $(SRCDIR)\mkindex.c
	399	+ $(BCC) $**
	400	+
	401	+version$E: $B\win\version.c
	402	+ $(BCC) $**
	403	+
	404	+$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
	405	+ $(TCC) /Fo$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $**
	406	+
	407	+$(OBJDIR)\th$O : $(SRCDIR)\th.c
	408	+ $(TCC) /Fo$@ -c $**
	409	+
	410	+$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
	411	+ $(TCC) /Fo$@ -c $**
	412	+
	413	+VERSION.h : version$E $B\manifest.uuid $B\manifest
	414	+ $** > $@
	415	+
	416	+page_index.h: mkindex$E $(SRC)
	417	+ $** > $@
	418	+
	419	+clean:
	420	+ -del $(OBJDIR)\*.obj
	421	+ -del .obj _.c .h .map
	422	+
	423	+realclean:
	424	+ -del $(APPNAME) translate$E mkindex$E makeheaders$E version$E
	425	+
	426	+}
	427	+foreach s [lsort $src] {
	428	+ puts "\$(OBJDIR)\\$s\$O : ${s}_.c"
	429	+ puts "\t\$(TCC) /Fo\$@ -c \$**\n"
	430	+ puts "${s}_.c : \$(SRCDIR)\\$s.c"
	431	+ puts "\ttranslate\$E \$** > \$@\n"
	432	+}
	433	+
	434	+puts -nonewline "headers: makeheaders\$E page_index.h VERSION.h\n\tmakeheaders\$E "
	435	+foreach s [lsort $src] {
	436	+ puts -nonewline "${s}_.c:$s.h "
	437	+}
	438	+puts "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h"
	439	+puts "\t@copy /Y nul: headers"
	440	+
	441	+}
210	442

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -81,11 +81,11 @@
81	}
82
83	# Name of the final application
84	#
85	set name fossil
86
87	puts {# DO NOT EDIT
88	#
89	# This file is automatically generated. Instead of editing this
90	# file, edit "makemake.tcl" then run "tclsh makemake.tcl >main.mk"
91	# to regenerate this file.
	@@ -205,5 +205,237 @@
205	puts "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
206	puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
207
208	puts "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
209	puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"








































































































































































































































210

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -81,11 +81,11 @@
81	}
82
83	# Name of the final application
84	#
85	set name fossil
86	if { 0 == $argc } {
87	puts {# DO NOT EDIT
88	#
89	# This file is automatically generated. Instead of editing this
90	# file, edit "makemake.tcl" then run "tclsh makemake.tcl >main.mk"
91	# to regenerate this file.
	@@ -205,5 +205,237 @@
205	puts "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
206	puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
207
208	puts "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
209	puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
210	exit
211	}
212	if { "dmc" == [lindex $argv 0] } {
213
214	puts {# DO NOT EDIT
215	#
216	# This file is automatically generated. Instead of editing this
217	# file, edit "makemake.tcl" then run
218	# "tclsh src/makemake.tcl dmc > win/Makefile.dmc"
219	# to regenerate this file.
220	B = ..
221	SRCDIR = $B\src
222	OBJDIR = .
223	O = .obj
224	E = .exe
225
226
227	# Maybe DMDIR, SSL or INCL needs adjustment
228	DMDIR = c:\DM
229	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(DMDIR)\extra\include
230
231	#SSL = -DFOSSIL_ENABLE_SSL=1
232	SSL =
233
234	DMCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp
235	I18N = -DFOSSIL_I18N=0
236
237	CFLAGS = -o
238	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
239	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
240	LIBS = $(DMDIR)\extra\lib\ zlib wsock32
241	}
242	puts -nonewline "SRC = "
243	foreach s [lsort $src] {
244	puts -nonewline "${s}_.c "
245	}
246	puts "\n"
247	puts -nonewline "OBJ = "
248	foreach s [lsort $src] {
249	puts -nonewline "\$(OBJDIR)\\$s\$O "
250	}
251	puts "\$(OBJDIR)\\sqlite3\$O \$(OBJDIR)\\th\$O \$(OBJDIR)\\th_lang\$O "
252	puts {
253
254	APPNAME = $(OBJDIR)\fossil$(E)
255
256	all: $(APPNAME)
257
258	$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
259	cd $(OBJDIR)
260	$(DMDIR)\bin\link @link
261
262	$(OBJDIR)\link:}
263	puts -nonewline "\t+echo "
264	foreach s [lsort $src] {
265	puts -nonewline "$s "
266	}
267	puts "sqlite3 th th_lang > \$@"
268	puts "\t+echo fossil >> \$@"
269	puts "\t+echo fossil >> \$@"
270	puts "\t+echo \$(LIBS) >> \$@\n\n"
271
272	puts {
273	translate$E: $(SRCDIR)\translate.c
274	$(BCC) -o$@ $**
275
276	makeheaders$E: $(SRCDIR)\makeheaders.c
277	$(BCC) -o$@ $**
278
279	mkindex$E: $(SRCDIR)\mkindex.c
280	$(BCC) -o$@ $**
281
282	version$E: $B\win\version.c
283	$(BCC) -o$@ $**
284
285	$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
286	$(TCC) -o$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $**
287
288	$(OBJDIR)\th$O : $(SRCDIR)\th.c
289	$(TCC) -o$@ -c $**
290
291	$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
292	$(TCC) -o$@ -c $**
293
294	VERSION.h : version$E $B\manifest.uuid $B\manifest
295	+$** > $@
296
297	page_index.h: mkindex$E $(SRC)
298	+$** > $@
299
300	clean:
301	-del $(OBJDIR)\*.obj
302	-del .obj _.c .h .map
303
304	realclean:
305	-del $(APPNAME) translate$E mkindex$E makeheaders$E version$E
306
307	}
308	foreach s [lsort $src] {
309	puts "\$(OBJDIR)\\$s\$O : ${s}_.c"
310	puts "\t\$(TCC) -o\$@ -c \$**\n"
311	puts "${s}_.c : \$(SRCDIR)\\$s.c"
312	puts "\t+translate\$E \$** > \$@\n"
313	}
314
315	puts -nonewline "headers: makeheaders\$E page_index.h VERSION.h\n\t +makeheaders\$E "
316	foreach s [lsort $src] {
317	puts -nonewline "${s}_.c:$s.h "
318	}
319	puts "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h"
320	puts "\t@copy /Y nul: headers"
321	exit
322	}
323
324	if { "msc" == [lindex $argv 0] } {
325
326	puts {# DO NOT EDIT
327	#
328	# This file is automatically generated. Instead of editing this
329	# file, edit "makemake.tcl" then run
330	# "tclsh src/makemake.tcl msc > win/Makefile.msc"
331	# to regenerate this file.
332	B = ..
333	SRCDIR = $B\src
334	OBJDIR = .
335	O = .obj
336	E = .exe
337
338
339	# Maybe MSCDIR, SSL or INCL needs adjustment
340	MSCDIR = c:\msc
341	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include
342
343	#SSL = -DFOSSIL_ENABLE_SSL=1
344	SSL =
345
346	MSCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp
347	I18N = -DFOSSIL_I18N=0
348
349	CFLAGS = -nologo -MD -O2 -Oy- -Zi
350	CFLAGS = -nologo -MT -O2
351	BCC = $(CC) $(CFLAGS)
352	TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
353	LIBS = zlib.lib ws2_32.lib
354	##SSL uncoment below
355	#LIBS = zlib.lib ws2_32.lib ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
356	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib
357	}
358	puts -nonewline "SRC = "
359	foreach s [lsort $src] {
360	puts -nonewline "${s}_.c "
361	}
362	puts "\n"
363	puts -nonewline "OBJ = "
364	foreach s [lsort $src] {
365	puts -nonewline "\$(OBJDIR)\\$s\$O "
366	}
367	puts "\$(OBJDIR)\\sqlite3\$O \$(OBJDIR)\\th\$O \$(OBJDIR)\\th_lang\$O "
368	puts {
369
370	APPNAME = $(OBJDIR)\fossil$(E)
371
372	all: $(OBJDIR) $(APPNAME)
373
374	$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
375	cd $(OBJDIR)
376	link -LINK -OUT:$@ $(LIBDIR) @link
377
378	$(OBJDIR)\link:}
379	puts -nonewline "\techo "
380	foreach s [lsort $src] {
381	puts -nonewline "$s "
382	}
383	puts "sqlite3 th th_lang > \$@"
384	puts "\techo \$(LIBS) >> \$@\n\n"
385
386	puts {
387
388
389	$(OBJDIR):
390	@-mkdir $@
391
392	translate$E: $(SRCDIR)\translate.c
393	$(BCC) $**
394
395	makeheaders$E: $(SRCDIR)\makeheaders.c
396	$(BCC) $**
397
398	mkindex$E: $(SRCDIR)\mkindex.c
399	$(BCC) $**
400
401	version$E: $B\win\version.c
402	$(BCC) $**
403
404	$(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
405	$(TCC) /Fo$@ -c -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 $**
406
407	$(OBJDIR)\th$O : $(SRCDIR)\th.c
408	$(TCC) /Fo$@ -c $**
409
410	$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
411	$(TCC) /Fo$@ -c $**
412
413	VERSION.h : version$E $B\manifest.uuid $B\manifest
414	$** > $@
415
416	page_index.h: mkindex$E $(SRC)
417	$** > $@
418
419	clean:
420	-del $(OBJDIR)\*.obj
421	-del .obj _.c .h .map
422
423	realclean:
424	-del $(APPNAME) translate$E mkindex$E makeheaders$E version$E
425
426	}
427	foreach s [lsort $src] {
428	puts "\$(OBJDIR)\\$s\$O : ${s}_.c"
429	puts "\t\$(TCC) /Fo\$@ -c \$**\n"
430	puts "${s}_.c : \$(SRCDIR)\\$s.c"
431	puts "\ttranslate\$E \$** > \$@\n"
432	}
433
434	puts -nonewline "headers: makeheaders\$E page_index.h VERSION.h\n\tmakeheaders\$E "
435	foreach s [lsort $src] {
436	puts -nonewline "${s}_.c:$s.h "
437	}
438	puts "\$(SRCDIR)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h"
439	puts "\t@copy /Y nul: headers"
440
441	}
442

M src/popen.c

+8 -6

		--- src/popen.c
		+++ src/popen.c
		@@ -18,11 +18,13 @@
18	18	** This file contains an implementation of a bi-directional popen().
19	19	*/
20	20	#include "config.h"
21	21	#include "popen.h"
22	22
23		-#ifdef __MINGW32__
	23	+#ifdef _WIN32
	24	+#include <windows.h>
	25	+#include <fcntl.h>
24	26	/*
25	27	** Print a fatal error and quit.
26	28	*/
27	29	static void win32_fatal_error(const char *zMsg){
28	30	fossil_fatal("%s");
		@@ -29,11 +31,11 @@
29	31	}
30	32	#endif
31	33
32	34
33	35
34		-#ifdef __MINGW32__
	36	+#ifdef _WIN32
35	37	/*
36	38	** On windows, create a child process and specify the stdin, stdout,
37	39	** and stderr channels for that process to use.
38	40	**
39	41	** Return the number of errors.
		@@ -91,11 +93,11 @@
91	93	** The process ID of the child is written into *pChildPid.
92	94	**
93	95	** Return the number of errors.
94	96	*/
95	97	int popen2(const char zCmd, int pfdIn, FILE *ppOut, int pChildPid){
96		-#ifdef __MINGW32__
	98	+#ifdef _WIN32
97	99	HANDLE hStdinRd, hStdinWr, hStdoutRd, hStdoutWr, hStderr;
98	100	SECURITY_ATTRIBUTES saAttr;
99	101	DWORD childPid;
100	102	int fd;
101	103
		@@ -114,12 +116,12 @@
114	116	SetHandleInformation( hStdinWr, HANDLE_FLAG_INHERIT, FALSE);
115	117
116	118	win32_create_child_process((char*)zCmd,
117	119	hStdinRd, hStdoutWr, hStderr,&childPid);
118	120	*pChildPid = childPid;
119		- *pfdIn = _open_osfhandle(hStdoutRd, 0);
120		- fd = _open_osfhandle(hStdinWr, 0);
	121	+ *pfdIn = _open_osfhandle((long)hStdoutRd, 0);
	122	+ fd = _open_osfhandle((long)hStdinWr, 0);
121	123	*ppOut = _fdopen(fd, "w");
122	124	CloseHandle(hStdinRd);
123	125	CloseHandle(hStdoutWr);
124	126	return 0;
125	127	#else
		@@ -171,15 +173,15 @@
171	173	/*
172	174	** Close the connection to a child process previously created using
173	175	** popen2(). Kill off the child process, then close the pipes.
174	176	*/
175	177	void pclose2(int fdIn, FILE *pOut, int childPid){
176		-#ifdef __MINGW32__
	178	+#ifdef _WIN32
177	179	/* Not implemented, yet */
178	180	close(fdIn);
179	181	fclose(pOut);
180	182	#else
181	183	close(fdIn);
182	184	fclose(pOut);
183	185	kill(childPid, SIGINT);
184	186	#endif
185	187	}
186	188

	--- src/popen.c
	+++ src/popen.c
	@@ -18,11 +18,13 @@
18	** This file contains an implementation of a bi-directional popen().
19	*/
20	#include "config.h"
21	#include "popen.h"
22
23	#ifdef __MINGW32__


24	/*
25	** Print a fatal error and quit.
26	*/
27	static void win32_fatal_error(const char *zMsg){
28	fossil_fatal("%s");
	@@ -29,11 +31,11 @@
29	}
30	#endif
31
32
33
34	#ifdef __MINGW32__
35	/*
36	** On windows, create a child process and specify the stdin, stdout,
37	** and stderr channels for that process to use.
38	**
39	** Return the number of errors.
	@@ -91,11 +93,11 @@
91	** The process ID of the child is written into *pChildPid.
92	**
93	** Return the number of errors.
94	*/
95	int popen2(const char zCmd, int pfdIn, FILE *ppOut, int pChildPid){
96	#ifdef __MINGW32__
97	HANDLE hStdinRd, hStdinWr, hStdoutRd, hStdoutWr, hStderr;
98	SECURITY_ATTRIBUTES saAttr;
99	DWORD childPid;
100	int fd;
101
	@@ -114,12 +116,12 @@
114	SetHandleInformation( hStdinWr, HANDLE_FLAG_INHERIT, FALSE);
115
116	win32_create_child_process((char*)zCmd,
117	hStdinRd, hStdoutWr, hStderr,&childPid);
118	*pChildPid = childPid;
119	*pfdIn = _open_osfhandle(hStdoutRd, 0);
120	fd = _open_osfhandle(hStdinWr, 0);
121	*ppOut = _fdopen(fd, "w");
122	CloseHandle(hStdinRd);
123	CloseHandle(hStdoutWr);
124	return 0;
125	#else
	@@ -171,15 +173,15 @@
171	/*
172	** Close the connection to a child process previously created using
173	** popen2(). Kill off the child process, then close the pipes.
174	*/
175	void pclose2(int fdIn, FILE *pOut, int childPid){
176	#ifdef __MINGW32__
177	/* Not implemented, yet */
178	close(fdIn);
179	fclose(pOut);
180	#else
181	close(fdIn);
182	fclose(pOut);
183	kill(childPid, SIGINT);
184	#endif
185	}
186

	--- src/popen.c
	+++ src/popen.c
	@@ -18,11 +18,13 @@
18	** This file contains an implementation of a bi-directional popen().
19	*/
20	#include "config.h"
21	#include "popen.h"
22
23	#ifdef _WIN32
24	#include <windows.h>
25	#include <fcntl.h>
26	/*
27	** Print a fatal error and quit.
28	*/
29	static void win32_fatal_error(const char *zMsg){
30	fossil_fatal("%s");
	@@ -29,11 +31,11 @@
31	}
32	#endif
33
34
35
36	#ifdef _WIN32
37	/*
38	** On windows, create a child process and specify the stdin, stdout,
39	** and stderr channels for that process to use.
40	**
41	** Return the number of errors.
	@@ -91,11 +93,11 @@
93	** The process ID of the child is written into *pChildPid.
94	**
95	** Return the number of errors.
96	*/
97	int popen2(const char zCmd, int pfdIn, FILE *ppOut, int pChildPid){
98	#ifdef _WIN32
99	HANDLE hStdinRd, hStdinWr, hStdoutRd, hStdoutWr, hStderr;
100	SECURITY_ATTRIBUTES saAttr;
101	DWORD childPid;
102	int fd;
103
	@@ -114,12 +116,12 @@
116	SetHandleInformation( hStdinWr, HANDLE_FLAG_INHERIT, FALSE);
117
118	win32_create_child_process((char*)zCmd,
119	hStdinRd, hStdoutWr, hStderr,&childPid);
120	*pChildPid = childPid;
121	*pfdIn = _open_osfhandle((long)hStdoutRd, 0);
122	fd = _open_osfhandle((long)hStdinWr, 0);
123	*ppOut = _fdopen(fd, "w");
124	CloseHandle(hStdinRd);
125	CloseHandle(hStdoutWr);
126	return 0;
127	#else
	@@ -171,15 +173,15 @@
173	/*
174	** Close the connection to a child process previously created using
175	** popen2(). Kill off the child process, then close the pipes.
176	*/
177	void pclose2(int fdIn, FILE *pOut, int childPid){
178	#ifdef _WIN32
179	/* Not implemented, yet */
180	close(fdIn);
181	fclose(pOut);
182	#else
183	close(fdIn);
184	fclose(pOut);
185	kill(childPid, SIGINT);
186	#endif
187	}
188

M src/popen.c

+8 -6

		--- src/popen.c
		+++ src/popen.c
		@@ -18,11 +18,13 @@
18	18	** This file contains an implementation of a bi-directional popen().
19	19	*/
20	20	#include "config.h"
21	21	#include "popen.h"
22	22
23		-#ifdef __MINGW32__
	23	+#ifdef _WIN32
	24	+#include <windows.h>
	25	+#include <fcntl.h>
24	26	/*
25	27	** Print a fatal error and quit.
26	28	*/
27	29	static void win32_fatal_error(const char *zMsg){
28	30	fossil_fatal("%s");
		@@ -29,11 +31,11 @@
29	31	}
30	32	#endif
31	33
32	34
33	35
34		-#ifdef __MINGW32__
	36	+#ifdef _WIN32
35	37	/*
36	38	** On windows, create a child process and specify the stdin, stdout,
37	39	** and stderr channels for that process to use.
38	40	**
39	41	** Return the number of errors.
		@@ -91,11 +93,11 @@
91	93	** The process ID of the child is written into *pChildPid.
92	94	**
93	95	** Return the number of errors.
94	96	*/
95	97	int popen2(const char zCmd, int pfdIn, FILE *ppOut, int pChildPid){
96		-#ifdef __MINGW32__
	98	+#ifdef _WIN32
97	99	HANDLE hStdinRd, hStdinWr, hStdoutRd, hStdoutWr, hStderr;
98	100	SECURITY_ATTRIBUTES saAttr;
99	101	DWORD childPid;
100	102	int fd;
101	103
		@@ -114,12 +116,12 @@
114	116	SetHandleInformation( hStdinWr, HANDLE_FLAG_INHERIT, FALSE);
115	117
116	118	win32_create_child_process((char*)zCmd,
117	119	hStdinRd, hStdoutWr, hStderr,&childPid);
118	120	*pChildPid = childPid;
119		- *pfdIn = _open_osfhandle(hStdoutRd, 0);
120		- fd = _open_osfhandle(hStdinWr, 0);
	121	+ *pfdIn = _open_osfhandle((long)hStdoutRd, 0);
	122	+ fd = _open_osfhandle((long)hStdinWr, 0);
121	123	*ppOut = _fdopen(fd, "w");
122	124	CloseHandle(hStdinRd);
123	125	CloseHandle(hStdoutWr);
124	126	return 0;
125	127	#else
		@@ -171,15 +173,15 @@
171	173	/*
172	174	** Close the connection to a child process previously created using
173	175	** popen2(). Kill off the child process, then close the pipes.
174	176	*/
175	177	void pclose2(int fdIn, FILE *pOut, int childPid){
176		-#ifdef __MINGW32__
	178	+#ifdef _WIN32
177	179	/* Not implemented, yet */
178	180	close(fdIn);
179	181	fclose(pOut);
180	182	#else
181	183	close(fdIn);
182	184	fclose(pOut);
183	185	kill(childPid, SIGINT);
184	186	#endif
185	187	}
186	188

	--- src/popen.c
	+++ src/popen.c
	@@ -18,11 +18,13 @@
18	** This file contains an implementation of a bi-directional popen().
19	*/
20	#include "config.h"
21	#include "popen.h"
22
23	#ifdef __MINGW32__


24	/*
25	** Print a fatal error and quit.
26	*/
27	static void win32_fatal_error(const char *zMsg){
28	fossil_fatal("%s");
	@@ -29,11 +31,11 @@
29	}
30	#endif
31
32
33
34	#ifdef __MINGW32__
35	/*
36	** On windows, create a child process and specify the stdin, stdout,
37	** and stderr channels for that process to use.
38	**
39	** Return the number of errors.
	@@ -91,11 +93,11 @@
91	** The process ID of the child is written into *pChildPid.
92	**
93	** Return the number of errors.
94	*/
95	int popen2(const char zCmd, int pfdIn, FILE *ppOut, int pChildPid){
96	#ifdef __MINGW32__
97	HANDLE hStdinRd, hStdinWr, hStdoutRd, hStdoutWr, hStderr;
98	SECURITY_ATTRIBUTES saAttr;
99	DWORD childPid;
100	int fd;
101
	@@ -114,12 +116,12 @@
114	SetHandleInformation( hStdinWr, HANDLE_FLAG_INHERIT, FALSE);
115
116	win32_create_child_process((char*)zCmd,
117	hStdinRd, hStdoutWr, hStderr,&childPid);
118	*pChildPid = childPid;
119	*pfdIn = _open_osfhandle(hStdoutRd, 0);
120	fd = _open_osfhandle(hStdinWr, 0);
121	*ppOut = _fdopen(fd, "w");
122	CloseHandle(hStdinRd);
123	CloseHandle(hStdoutWr);
124	return 0;
125	#else
	@@ -171,15 +173,15 @@
171	/*
172	** Close the connection to a child process previously created using
173	** popen2(). Kill off the child process, then close the pipes.
174	*/
175	void pclose2(int fdIn, FILE *pOut, int childPid){
176	#ifdef __MINGW32__
177	/* Not implemented, yet */
178	close(fdIn);
179	fclose(pOut);
180	#else
181	close(fdIn);
182	fclose(pOut);
183	kill(childPid, SIGINT);
184	#endif
185	}
186

	--- src/popen.c
	+++ src/popen.c
	@@ -18,11 +18,13 @@
18	** This file contains an implementation of a bi-directional popen().
19	*/
20	#include "config.h"
21	#include "popen.h"
22
23	#ifdef _WIN32
24	#include <windows.h>
25	#include <fcntl.h>
26	/*
27	** Print a fatal error and quit.
28	*/
29	static void win32_fatal_error(const char *zMsg){
30	fossil_fatal("%s");
	@@ -29,11 +31,11 @@
31	}
32	#endif
33
34
35
36	#ifdef _WIN32
37	/*
38	** On windows, create a child process and specify the stdin, stdout,
39	** and stderr channels for that process to use.
40	**
41	** Return the number of errors.
	@@ -91,11 +93,11 @@
93	** The process ID of the child is written into *pChildPid.
94	**
95	** Return the number of errors.
96	*/
97	int popen2(const char zCmd, int pfdIn, FILE *ppOut, int pChildPid){
98	#ifdef _WIN32
99	HANDLE hStdinRd, hStdinWr, hStdoutRd, hStdoutWr, hStderr;
100	SECURITY_ATTRIBUTES saAttr;
101	DWORD childPid;
102	int fd;
103
	@@ -114,12 +116,12 @@
116	SetHandleInformation( hStdinWr, HANDLE_FLAG_INHERIT, FALSE);
117
118	win32_create_child_process((char*)zCmd,
119	hStdinRd, hStdoutWr, hStderr,&childPid);
120	*pChildPid = childPid;
121	*pfdIn = _open_osfhandle((long)hStdoutRd, 0);
122	fd = _open_osfhandle((long)hStdinWr, 0);
123	*ppOut = _fdopen(fd, "w");
124	CloseHandle(hStdinRd);
125	CloseHandle(hStdoutWr);
126	return 0;
127	#else
	@@ -171,15 +173,15 @@
173	/*
174	** Close the connection to a child process previously created using
175	** popen2(). Kill off the child process, then close the pipes.
176	*/
177	void pclose2(int fdIn, FILE *pOut, int childPid){
178	#ifdef _WIN32
179	/* Not implemented, yet */
180	close(fdIn);
181	fclose(pOut);
182	#else
183	close(fdIn);
184	fclose(pOut);
185	kill(childPid, SIGINT);
186	#endif
187	}
188

M src/rss.c

+1 -1

		--- src/rss.c
		+++ src/rss.c
		@@ -16,13 +16,13 @@
16	16	*******************************************************************************
17	17	**
18	18	** This file contains code used to create a RSS feed for the CGI interface.
19	19	*/
20	20	#include "config.h"
	21	+#include <time.h>
21	22	#include "rss.h"
22	23	#include <assert.h>
23		-#include <time.h>
24	24
25	25	/*
26	26	** WEBPAGE: timeline.rss
27	27	*/
28	28	void page_timeline_rss(void){
29	29

	--- src/rss.c
	+++ src/rss.c
	@@ -16,13 +16,13 @@
16	*******************************************************************************
17	**
18	** This file contains code used to create a RSS feed for the CGI interface.
19	*/
20	#include "config.h"

21	#include "rss.h"
22	#include <assert.h>
23	#include <time.h>
24
25	/*
26	** WEBPAGE: timeline.rss
27	*/
28	void page_timeline_rss(void){
29

	--- src/rss.c
	+++ src/rss.c
	@@ -16,13 +16,13 @@
16	*******************************************************************************
17	**
18	** This file contains code used to create a RSS feed for the CGI interface.
19	*/
20	#include "config.h"
21	#include <time.h>
22	#include "rss.h"
23	#include <assert.h>

24
25	/*
26	** WEBPAGE: timeline.rss
27	*/
28	void page_timeline_rss(void){
29

M src/sha1.c

+11 -9

		--- src/sha1.c
		+++ src/sha1.c
		@@ -1,22 +1,24 @@
1	1	/*
2	2	** This implementation of SHA1 is adapted from the example implementation
3	3	** contained in RFC-3174.
4	4	*/
5		-#include <stdint.h>
6		-#include <sys/types.h>
7		-#include "config.h"
8		-#include "sha1.h"
9		-
10	5	/*
11	6	* If you do not have the ISO standard stdint.h header file, then you
12	7	* must typdef the following:
13	8	* name meaning
14		- * uint32_t unsigned 32 bit integer
15		- * uint8_t unsigned 8 bit integer (i.e., unsigned char)
16		- *
17		- */
	9	+ * */
	10	+#if defined(__DMC__) \|\| defined(_MSC_VER)
	11	+ typedef unsigned long uint32_t; //unsigned 32 bit integer
	12	+ typedef unsigned char uint8_t; //unsigned 8 bit integer (i.e., unsigned char)
	13	+#else
	14	+# include <stdint.h>
	15	+#endif
	16	+#include <sys/types.h>
	17	+#include "config.h"
	18	+#include "sha1.h"
	19	+
18	20	#define SHA1HashSize 20
19	21	#define shaSuccess 0
20	22	#define shaInputTooLong 1
21	23	#define shaStateError 2
22	24
23	25

	--- src/sha1.c
	+++ src/sha1.c
	@@ -1,22 +1,24 @@
1	/*
2	** This implementation of SHA1 is adapted from the example implementation
3	** contained in RFC-3174.
4	*/
5	#include <stdint.h>
6	#include <sys/types.h>
7	#include "config.h"
8	#include "sha1.h"
9
10	/*
11	* If you do not have the ISO standard stdint.h header file, then you
12	* must typdef the following:
13	* name meaning
14	* uint32_t unsigned 32 bit integer
15	* uint8_t unsigned 8 bit integer (i.e., unsigned char)
16	*
17	*/







18	#define SHA1HashSize 20
19	#define shaSuccess 0
20	#define shaInputTooLong 1
21	#define shaStateError 2
22
23

	--- src/sha1.c
	+++ src/sha1.c
	@@ -1,22 +1,24 @@
1	/*
2	** This implementation of SHA1 is adapted from the example implementation
3	** contained in RFC-3174.
4	*/





5	/*
6	* If you do not have the ISO standard stdint.h header file, then you
7	* must typdef the following:
8	* name meaning
9	* */
10	#if defined(__DMC__) \|\| defined(_MSC_VER)
11	typedef unsigned long uint32_t; //unsigned 32 bit integer
12	typedef unsigned char uint8_t; //unsigned 8 bit integer (i.e., unsigned char)
13	#else
14	# include <stdint.h>
15	#endif
16	#include <sys/types.h>
17	#include "config.h"
18	#include "sha1.h"
19
20	#define SHA1HashSize 20
21	#define shaSuccess 0
22	#define shaInputTooLong 1
23	#define shaStateError 2
24
25

M src/style.c

+1 -2

		--- src/style.c
		+++ src/style.c
		@@ -397,14 +397,13 @@
397	397	/*
398	398	** WEBPAGE: test_env
399	399	*/
400	400	void page_test_env(void){
401	401	style_header("Environment Test");
402		-#if !defined(__MINGW32__)
	402	+#if !defined(_WIN32)
403	403	@ uid=%d(getuid()), gid=%d(getgid())<br>
404	404	#endif
405	405	@ g.zBaseURL = %h(g.zBaseURL)<br>
406	406	@ g.zTop = %h(g.zTop)<br>
407		- @ g.zRepositoryName = %h(g.zRepositoryName)<br>
408	407	cgi_print_all();
409	408	style_footer();
410	409	}
411	410

	--- src/style.c
	+++ src/style.c
	@@ -397,14 +397,13 @@
397	/*
398	** WEBPAGE: test_env
399	*/
400	void page_test_env(void){
401	style_header("Environment Test");
402	#if !defined(__MINGW32__)
403	@ uid=%d(getuid()), gid=%d(getgid())<br>
404	#endif
405	@ g.zBaseURL = %h(g.zBaseURL)<br>
406	@ g.zTop = %h(g.zTop)<br>
407	@ g.zRepositoryName = %h(g.zRepositoryName)<br>
408	cgi_print_all();
409	style_footer();
410	}
411

	--- src/style.c
	+++ src/style.c
	@@ -397,14 +397,13 @@
397	/*
398	** WEBPAGE: test_env
399	*/
400	void page_test_env(void){
401	style_header("Environment Test");
402	#if !defined(_WIN32)
403	@ uid=%d(getuid()), gid=%d(getgid())<br>
404	#endif
405	@ g.zBaseURL = %h(g.zBaseURL)<br>
406	@ g.zTop = %h(g.zTop)<br>

407	cgi_print_all();
408	style_footer();
409	}
410

M src/user.c

+1 -1

		--- src/user.c
		+++ src/user.c
		@@ -39,11 +39,11 @@
39	39	if( z[i]<' ' ) z[i] = ' ';
40	40	}
41	41	blob_append(pBlob, z, -1);
42	42	}
43	43
44		-#ifdef __MINGW32__
	44	+#if defined(_WIN32)
45	45	/*
46	46	** getpass for Windows
47	47	*/
48	48	static char getpass(const char prompt){
49	49	static char pwd[64];
50	50

	--- src/user.c
	+++ src/user.c
	@@ -39,11 +39,11 @@
39	if( z[i]<' ' ) z[i] = ' ';
40	}
41	blob_append(pBlob, z, -1);
42	}
43
44	#ifdef __MINGW32__
45	/*
46	** getpass for Windows
47	*/
48	static char getpass(const char prompt){
49	static char pwd[64];
50

	--- src/user.c
	+++ src/user.c
	@@ -39,11 +39,11 @@
39	if( z[i]<' ' ) z[i] = ' ';
40	}
41	blob_append(pBlob, z, -1);
42	}
43
44	#if defined(_WIN32)
45	/*
46	** getpass for Windows
47	*/
48	static char getpass(const char prompt){
49	static char pwd[64];
50

M src/vfile.c

		--- src/vfile.c
		+++ src/vfile.c
		@@ -19,11 +19,15 @@
19	19	*/
20	20	#include "config.h"
21	21	#include "vfile.h"
22	22	#include <assert.h>
23	23	#include <sys/types.h>
	24	+#if defined(__DMC__)
	25	+#include "dirent.h"
	26	+#else
24	27	#include <dirent.h>
	28	+#endif
25	29
26	30	/*
27	31	** Given a UUID, return the corresponding record ID. If the UUID
28	32	** does not exist, then return 0.
29	33	**
30	34

	--- src/vfile.c
	+++ src/vfile.c
	@@ -19,11 +19,15 @@
19	*/
20	#include "config.h"
21	#include "vfile.h"
22	#include <assert.h>
23	#include <sys/types.h>



24	#include <dirent.h>

25
26	/*
27	** Given a UUID, return the corresponding record ID. If the UUID
28	** does not exist, then return 0.
29	**
30

	--- src/vfile.c
	+++ src/vfile.c
	@@ -19,11 +19,15 @@
19	*/
20	#include "config.h"
21	#include "vfile.h"
22	#include <assert.h>
23	#include <sys/types.h>
24	#if defined(__DMC__)
25	#include "dirent.h"
26	#else
27	#include <dirent.h>
28	#endif
29
30	/*
31	** Given a UUID, return the corresponding record ID. If the UUID
32	** does not exist, then return 0.
33	**
34

M src/winhttp.c

+3 -2

		--- src/winhttp.c
		+++ src/winhttp.c
		@@ -16,11 +16,12 @@
16	16	*******************************************************************************
17	17	**
18	18	** This file implements a very simple (and low-performance) HTTP server
19	19	** for windows.
20	20	*/
21		-#ifdef __MINGW32__ /* This code is for win32 only */
	21	+#if defined( __MINGW32__) \|\| defined(__DMC__) \|\| defined(_MSC_VER)
	22	+/* This code is for win32 only */
22	23	#include "config.h"
23	24	#include "winhttp.h"
24	25	#include <windows.h>
25	26
26	27	/*
		@@ -220,6 +221,6 @@
220	221	}
221	222	closesocket(s);
222	223	WSACleanup();
223	224	}
224	225
225		-#endif /* __MINGW32__ -- This code is for win32 only */
	226	+#endif /* _WIN32 -- This code is for win32 only */
226	227
227	228	ADDED win/Makefile.dmc
228	229	ADDED win/Makefile.msc
229	230	ADDED win/include/dirent.h
230	231	ADDED win/include/unistd.h
231	232	ADDED win/version.c

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -16,11 +16,12 @@
16	*******************************************************************************
17	**
18	** This file implements a very simple (and low-performance) HTTP server
19	** for windows.
20	*/
21	#ifdef __MINGW32__ /* This code is for win32 only */

22	#include "config.h"
23	#include "winhttp.h"
24	#include <windows.h>
25
26	/*
	@@ -220,6 +221,6 @@
220	}
221	closesocket(s);
222	WSACleanup();
223	}
224
225	#endif /* __MINGW32__ -- This code is for win32 only */
226
227	DDED win/Makefile.dmc
228	DDED win/Makefile.msc
229	DDED win/include/dirent.h
230	DDED win/include/unistd.h
231	DDED win/version.c

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -16,11 +16,12 @@
16	*******************************************************************************
17	**
18	** This file implements a very simple (and low-performance) HTTP server
19	** for windows.
20	*/
21	#if defined( __MINGW32__) \|\| defined(__DMC__) \|\| defined(_MSC_VER)
22	/* This code is for win32 only */
23	#include "config.h"
24	#include "winhttp.h"
25	#include <windows.h>
26
27	/*
	@@ -220,6 +221,6 @@
221	}
222	closesocket(s);
223	WSACleanup();
224	}
225
226	#endif /* _WIN32 -- This code is for win32 only */
227
228	DDED win/Makefile.dmc
229	DDED win/Makefile.msc
230	DDED win/include/dirent.h
231	DDED win/include/unistd.h
232	DDED win/version.c

M win/Makefile.dmc

+428

		--- a/win/Makefile.dmc
		+++ b/win/Makefile.dmc
		@@ -0,0 +1,428 @@
	1	+# DO NOT EDITrver_.c:server#
	2	+### $(SQLITE_OPTIONS) $**
	3	+
	4	+**
	5	+
	6	+ENABLE_STAT3rverrverrverrver$O
	7	+# "tclsh src/makemakeserverserver_.c
	8	+
	9	+serverservrver_.c:server**
	10	+
	11	+**
	12	+
	13	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	14	+
	15	+serverservrver_.c:servertag_.tag$O S) $**
	16	+
	17	+**
	18	+
	19	+ENABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
	20	+### $(SQLITE_OPTIONS) $**
	21	+
	22	+**
	23	+
	24	+ENABLE_STAT3rverrverrverrver$O : serv#
	25	+### $(SQLITE_OPTIONS) $**
	26	+
	27	+**
	28	+
	29	+ENABLE_STAT3rverrver
	30	+
	31	+SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
	32	+
	33	+4_.tag$O S) $**
	34	+
	35	+**
	36	+
	37	+EN4ertaserver_.c serverserver_.c
	38	+
	39	+serverservrver_.c:server#
	40	+### $(SQLITE_OPTIONS) $**
	41	+
	42	+**
	43	+
	44	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	45	+
	46	+serverservrver_.c:server#
	47	+### $(SQLITE_OPTIONS) $**
	48	+
	49	+**
	50	+
	51	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	52	+
	53	+serverservrver_.c:serververify$O : server_.c serve#
	54	+### $(SQLITE_OPTIONS) $**
	55	+
	56	+**
	57	+
	58	+ENABLE_STAT3rverrverrverrvever_.c:server#
	59	+### $(SQLITE_OPTIONS) $**
	60	+
	61	+**
	62	+
	63	+ENABLE_STAT3rverrverrverrver$O
	64	+# "tclsh src/makemakeserverser_.c:server#
	65	+### $(SQLITE_OPTIONS) $**
	66	+
	67	+**
	68	+
	69	+ENABLE_STAT3rverrverrverrver$O
	70	+# "tclsh src/makemaserver**
	71	+
	72	+**
	73	+
	74	+ENABLE_STAT3rverrverrverrver$O : serve = -DFOerver#
	75	+### $(SQLITE_OPTIONS) $**
	76	+
	77	+**
	78	+
	79	+ENABLE_STAT3rverrverrverrver$O : serv#
	80	+### $(SQLITE_OPTIONS) $**
	81	+
	82	+**
	83	+
	84	+ENABLE_STAT3rverrver
	85	+
	86	+SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
	87	+
	88	+4_.tag$O S) $**
	89	+
	90	+**
	91	+
	92	+EN4ertaserver_.c serverserver_.c
	93	+
	94	+serverservrver_.c:server#
	95	+### $(SQLITE_OPTIONS) $**
	96	+
	97	+**
	98	+
	99	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	100	+
	101	+serverservrver_.c:server#
	102	+### $(SQLITE_OPTIONS) $**
	103	+
	104	+**
	105	+
	106	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	107	+
	108	+serverservrver_.c:serververify$O : server_.c serve#
	109	+### STAT3rverrverrverrvever_.c:server#
	110	+### $(SQLITE_OPTIONS) $**
	111	+
	112	+**
	113	+
	114	+ENABLE_STAT3rverrverrverrver$O
	115	+# "tclsh src/makemakeserverserver_.c
	116	+
	117	+serverservrver_.c:server**
	118	+
	119	+**
	120	+
	121	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	122	+
	123	+serverservrver_.c:servertag_.tag$O S) $**
	124	+
	125	+**
	126	+
	127	+ENABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
	128	+### $(SQLITE_OPTIONS) $**
	129	+
	130	+**
	131	+
	132	+ENABLE_STAT3rverrverrverrver$O : serv#
	133	+### $(SQLITE_OPTIONS) $**
	134	+
	135	+**
	136	+
	137	+ENABLE_STAT3rverrver
	138	+
	139	+SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
	140	+
	141	+4_.tag$O S) $**
	142	+
	143	+**
	144	+
	145	+EN4ertaserver_.c serverserver_.c
	146	+
	147	+serverservrver_.c:server#
	148	+### $(SQLITE_OPTIONS) $**
	149	+
	150	+**
	151	+
	152	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	153	+
	154	+serverservrver_.c:server#
	155	+### $(SQLITE_OPTIONS) $**
	156	+
	157	+**
	158	+
	159	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	160	+
	161	+serverservrver_.c:serververify$O : server_.c serve#
	162	+### $(SQLITE_OPTIONS) $**
	163	+
	164	+**
	165	+
	166	+ENABLE_STAT3rverrverrverrver$O : server# DO NOT EDITrver_.c:server#
	167	+### $(SQLITE_OPTIONS) $**
	168	+
	169	+**
	170	+
	171	+ENABLE_STAT3rverrverrverrver$O
	172	+# "tclsh src/makemakeserverserver_.c
	173	+
	174	+serverservrver_.c:server**
	175	+
	176	+**
	177	+
	178	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	179	+
	180	+serverservrver_.c:servertag_.tag$O S) $**
	181	+
	182	+**
	183	+
	184	+ENABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
	185	+### $(SQLITE_OPTIONS) $**
	186	+
	187	+**
	188	+
	189	+ENABLE_STAT3rverrverrverrver$O : serv#
	190	+### $(SQLITE_OPTIONS) $**
	191	+
	192	+**
	193	+
	194	+ENABLE_STAT3rverrver
	195	+
	196	+SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
	197	+
	198	+4_.tag$O S) $**
	199	+
	200	+**
	201	+
	202	+EN4ertaserver_.c serverserver_.c
	203	+
	204	+serverservrver_.c:server#
	205	+### $(SQLITE_OPTIONS) $**
	206	+
	207	+**
	208	+
	209	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	210	+
	211	+serverservrver_.c:server#
	212	+### $(SQLITE_OPTIONS) $**
	213	+
	214	+**
	215	+
	216	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	217	+
	218	+serverservrver_.c:serververify$O : server_.c serve#
	219	+### $(SQLITE_OPTIONS) $**
	220	+
	221	+**
	222	+
	223	+ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
	224	+
	225	+serverservrver_.c:servertag_qlite3_.c:servertag_.tag$O S) $**
	226	+
	227	+**th
	228	+### $(th
	229	+### $(SQLITE_OPfserver#
	230	+##:server#
	231	+### $(SQLITE_I18N serv#
	232	+### $(SQLITE_OPTIONS) $**
	233	+
	234	+*
	235	+
	236	+**
	237	+
	238	+ENABLE_STAT3rverrverrverrver$O : server_.c rver_.c
	239	+
	240	+serverservrver_$(SQLITE_OPTIONS) $
	241	+
	242	+**
	243	+
	244	+raph_.c http_.r_.c:servertag_.tag$O ver_.c:server#
	245	+### $(SQLITE_OP.c serverserver_.c
	246	+
	247	+serverservrvererervrver_.c:server#
	248	+### $(SQLITE_OPTIONS) $**
	249	+
	250	+**
	251	+
	252	+ENABLE_Sc serverserver_.c
	253	+
	254	+serverservrver_.c:server#
	255	+### $(AT3rverrverrverrver$O : server_.c serverserver_.c
	256	+
	257	+serverservrver_.c:servertag_.tag$O S) $**
	258	+
	259	+**
	260	+
	261	+ENABLE_STAT3rverrverrverrver*
	262	+
	263	+ENABLerrverrver$O : smakeserverserver_$**
	264	+
	265	+addad) $**
	266	+
	267	+**
	268	+verrverrver$makeserverserver_$**servrver_.c:server#
	269	+### errverrver$O : servemakeserverserver_$**
	270	+
	271	+attacS) $**
	272	+
	273	+**
	274	+
	275	+ENABLET3rverrverrverrverNOT EDbag$O : bag_.cmakeserverserver_$**
	276	+
	277	+bagbagblob$O : blob_.cmakeserverserver_$r
	278	+
	279	+**
	280	+
	281	+ENAT3rverITrver_.c:server#
	282	+##makeserverserver_$**
	283	+
	284	+brancS) $**
	285	+
	286	+**
	287	+
	288	+ENABLNABLE_STAT3rverrverrvervrbrowse$O : browse_.cmakeserverserver_$AT3rverrverrverrver$OI
	289	+
	290	+ENABLE_STAT3rve### $(SQLITE_OPTIONS)makeserverserver_$_4O : _THREADSAFE=0 -DSQ
	291	+
	292	+ENABLE_STAT3rvegi$O : cgi_.cmakeserverserver_$**
	293	+
	294	+cgiver#
	295	+### $(SQLI srver_.c serverserver_**
	296	+
	297	+ENABLE_STAT3rveheckin$O : checkin_.cmakeserverserver_$serverservrver_.c:se_OPT
	298	+
	299	+ENABLE_STAT3rveheckout$O : checkout_.cmakeserverserver_$**
	300	+
	301	+checkoulsh src/makemakeserverserve**
	302	+
	303	+ENABLE_STAT3rveSTAT3rveserverservrver_.cmakeserverserver_$3rverrverrverrver$OI18N se
	304	+
	305	+ENABLE_STAT3rvelone$O : clone_.cmakeserverserver_$**
	306	+
	307	+clonever#
	308	+### $(SQLI sST server_.c serv# DO N**
	309	+
	310	+ENABLE_STAT3rver_.tag$O S) $**
	311	+
	312	+**
	313	+
	314	+EN4emakeserverserver_$**DO NOT EDITrver_.c:server#
	315	+#**
	316	+
	317	+ENABLE_STAT3rmakeserverserver_$**
	318	+
	319	+configurever#
	320	+### $(SQLI serfigur src/makemakeservers**
	321	+
	322	+ENABLE_STAT3rverrO : server_.c serthmakeserverserver_$**
	323	+
	324	+conten_OPTIONS) $**
	325	+
	326	+**
	327	+
	328	+ENABLE_db$O : db_.cmakeserverserver_$**
	329	+
	330	+dbrv#
	331	+### $(SQLITE_bdelta$O : delta_.cmakeserverserver_$ src/makemakeservers# DO NOT EDITrver_ DO NOT EDITrver_.c:serv# DO NOT EDITrver$r**
	332	+
	333	+**
	334	+
	335	+ENAT3rverrverrverONS) $**
	336	+src/makemakeserversermakeserverserver_$E_STAT3rverrverrvervrver_.c:servdiff$O : diff_.cmakeserverserver_$O : serv#
	337	+### $(SQdiffcmd$O : diffcmd_.cmakeserverserver_$**
	338	+
	339	+diffcmdrv#
	340	+### $(SQLITE_OPT.cONS) $**
	341	+
	342	+**
	343	+
	344	+ENABLEdoc$O : doc_.cmakeserverserver_$**
	345	+
	346	+docrv#
	347	+### $(SQLITE_oENABLE_STAT3rverrvermakeserverserver_$**
	348	+
	349	+encodee_OPTIONS) $**
	350	+
	351	+**
	352	+
	353	+ENABLfile$O : file_.cmakeserverserver_$**
	354	+
	355	+filelsh src/makemakeserversfinfo$O : finfo_.cmakeserverserver_$**
	356	+
	357	+f DO NOT EDITrver_.c:### $(SQLITE_OPTIONS) $graph$O : graph_.cmakeserverserver_$*ver$O : serv#
	358	+### $(http$O : http_.cmakeserverserver_$**
	359	+
	360	+# "tclsh src/makemakese# DO NOT EDITrver_ver_.c serv# DO NOT EDITrver_.makeserverserver_$**
	361	+
	362	+http_sockeerver_.c serv# DOvrver_.c:server_.c:server**
	363	+
	364	+**
	365	+
	366	+ENABmakeserverserver_$serthSTAT3rverrverrver# ermakeserverserver_$c serv# DSTAT3rverrverrverrver$O : server_.c serverserver_.c
	367	+
	368	+serinfo$O : info_.cmakeserverserver_$** DO NOT EDITrver_.#
	369	+### $(SQLITE_OPTlogin$O : login_.cmakeserverserver_$NABLE_STAT3rverrverrmain$O : main_.cmakeserverserver_$ABLE_STAT3rverrvererrverrver# er$ENABLE_STmakeserverserver_$**rserver_.c
	370	+
	371	+serverservrvermd5$O : md5_.cmakeserverserver_$**
	372	+
	373	+md5merge$O : merge_.cmakeserverserver_$**
	374	+
	375	+mergemerge3$O : merge3_.cmakeserverserver_$vrver_.c:server
	376	+
	377	+**
	378	+
	379	+ENABLE_STAT# DO NOT EDITrver$ver_.c:server
	380	+
	381	+# DO NOT EDITrver$**
	382	+
	383	+pivopivomakeserverserver_$**
	384	+
	385	+popeerver_.c serthSTAqueue$O : pqueue_.cmakeserverserver_$makeserverserver_$
	386	+
	387	+printerv#
	388	+### $(SQLITErebuild$O : rebuild_.cmakeserverserver_$**
	389	+
	390	+rebuildreport$O : report_.cmakeserverserver_$rss$O : rss_.cmakeserverserver_$
	391	+
	392	+rssschema$O : schema_.cmakeserverserver_$makeserverserver_$
	393	+
	394	+searcS) $**
	395	+
	396	+**
	397	+
	398	+ENABLsetup$O : setup_.cmakeserverserver_$sha1$O : sha1_.cmakeserverserver_$
	399	+
	400	+sha1shun$O : shun_.cmakeserverserver_$**
	401	+
	402	+shuerver_.c serthSTAskins$O : skins_.cmakeserverserver_$**
	403	+
	404	+skinsstat$O : stat_.cmakeserverserver_$**
	405	+
	406	+ststyle$O : style_.cmakeserverserver_$**
	407	+
	408	+stylesync$O : sync_.cmakeserverserver_$**
	409	+
	410	+synctag$O : tag_.cmakeserverserver_$makeserverserver_$
	411	+
	412	+th_LE_STAT3rverrverrvermakeserverserver_$tkt$O : tkt_.cmakeserverserver_$
	413	+
	414	+tktktsetup$O : tktsetup_.cmakeserverserver_$**
	415	+
	416	+tktndo$O : undo_.cmakeserverserver_$**
	417	+
	418	+und DO NOT EDITrver_ $(SQLITE_OPTIONS) $**
	419	+pdate$O : update_.cmakeserverserver_$makeserverserver_$ser$O : user_.cmakeserverserver_$**
	420	+
	421	+userverify$O : verify_.cmakeserverserver_$makeserverserver_$
	422	+
	423	+vfilevlsh src/makemakeserversmakeserverserver_$format$O : wikiformat_.cmakeserverserver_$
	424	+
	425	+wikiT EDITrver_.c:server#
	426	+wikiformnhttp$O : winhttp_.cmakeserverserver_$xfer$O : xfer_.cmakeserverserver_$zip$O : zip_.cmakeserverserver_$**
	427	+
	428	+zizip

	--- a/win/Makefile.dmc
	+++ b/win/Makefile.dmc
	@@ -0,0 +1,428 @@

	--- a/win/Makefile.dmc
	+++ b/win/Makefile.dmc
	@@ -0,0 +1,428 @@
1	# DO NOT EDITrver_.c:server#
2	### $(SQLITE_OPTIONS) $**
3
4	**
5
6	ENABLE_STAT3rverrverrverrver$O
7	# "tclsh src/makemakeserverserver_.c
8
9	serverservrver_.c:server**
10
11	**
12
13	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
14
15	serverservrver_.c:servertag_.tag$O S) $**
16
17	**
18
19	ENABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
20	### $(SQLITE_OPTIONS) $**
21
22	**
23
24	ENABLE_STAT3rverrverrverrver$O : serv#
25	### $(SQLITE_OPTIONS) $**
26
27	**
28
29	ENABLE_STAT3rverrver
30
31	SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
32
33	4_.tag$O S) $**
34
35	**
36
37	EN4ertaserver_.c serverserver_.c
38
39	serverservrver_.c:server#
40	### $(SQLITE_OPTIONS) $**
41
42	**
43
44	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
45
46	serverservrver_.c:server#
47	### $(SQLITE_OPTIONS) $**
48
49	**
50
51	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
52
53	serverservrver_.c:serververify$O : server_.c serve#
54	### $(SQLITE_OPTIONS) $**
55
56	**
57
58	ENABLE_STAT3rverrverrverrvever_.c:server#
59	### $(SQLITE_OPTIONS) $**
60
61	**
62
63	ENABLE_STAT3rverrverrverrver$O
64	# "tclsh src/makemakeserverser_.c:server#
65	### $(SQLITE_OPTIONS) $**
66
67	**
68
69	ENABLE_STAT3rverrverrverrver$O
70	# "tclsh src/makemaserver**
71
72	**
73
74	ENABLE_STAT3rverrverrverrver$O : serve = -DFOerver#
75	### $(SQLITE_OPTIONS) $**
76
77	**
78
79	ENABLE_STAT3rverrverrverrver$O : serv#
80	### $(SQLITE_OPTIONS) $**
81
82	**
83
84	ENABLE_STAT3rverrver
85
86	SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
87
88	4_.tag$O S) $**
89
90	**
91
92	EN4ertaserver_.c serverserver_.c
93
94	serverservrver_.c:server#
95	### $(SQLITE_OPTIONS) $**
96
97	**
98
99	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
100
101	serverservrver_.c:server#
102	### $(SQLITE_OPTIONS) $**
103
104	**
105
106	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
107
108	serverservrver_.c:serververify$O : server_.c serve#
109	### STAT3rverrverrverrvever_.c:server#
110	### $(SQLITE_OPTIONS) $**
111
112	**
113
114	ENABLE_STAT3rverrverrverrver$O
115	# "tclsh src/makemakeserverserver_.c
116
117	serverservrver_.c:server**
118
119	**
120
121	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
122
123	serverservrver_.c:servertag_.tag$O S) $**
124
125	**
126
127	ENABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
128	### $(SQLITE_OPTIONS) $**
129
130	**
131
132	ENABLE_STAT3rverrverrverrver$O : serv#
133	### $(SQLITE_OPTIONS) $**
134
135	**
136
137	ENABLE_STAT3rverrver
138
139	SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
140
141	4_.tag$O S) $**
142
143	**
144
145	EN4ertaserver_.c serverserver_.c
146
147	serverservrver_.c:server#
148	### $(SQLITE_OPTIONS) $**
149
150	**
151
152	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
153
154	serverservrver_.c:server#
155	### $(SQLITE_OPTIONS) $**
156
157	**
158
159	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
160
161	serverservrver_.c:serververify$O : server_.c serve#
162	### $(SQLITE_OPTIONS) $**
163
164	**
165
166	ENABLE_STAT3rverrverrverrver$O : server# DO NOT EDITrver_.c:server#
167	### $(SQLITE_OPTIONS) $**
168
169	**
170
171	ENABLE_STAT3rverrverrverrver$O
172	# "tclsh src/makemakeserverserver_.c
173
174	serverservrver_.c:server**
175
176	**
177
178	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
179
180	serverservrver_.c:servertag_.tag$O S) $**
181
182	**
183
184	ENABLE_STAT3rverrverrverrver$OI18N = -DFOerver#
185	### $(SQLITE_OPTIONS) $**
186
187	**
188
189	ENABLE_STAT3rverrverrverrver$O : serv#
190	### $(SQLITE_OPTIONS) $**
191
192	**
193
194	ENABLE_STAT3rverrver
195
196	SQLITEer_.c serverserver_: serv4er_.c serverserver_4O : _THREADSAFE=0 -DSQLITEc
197
198	4_.tag$O S) $**
199
200	**
201
202	EN4ertaserver_.c serverserver_.c
203
204	serverservrver_.c:server#
205	### $(SQLITE_OPTIONS) $**
206
207	**
208
209	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
210
211	serverservrver_.c:server#
212	### $(SQLITE_OPTIONS) $**
213
214	**
215
216	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
217
218	serverservrver_.c:serververify$O : server_.c serve#
219	### $(SQLITE_OPTIONS) $**
220
221	**
222
223	ENABLE_STAT3rverrverrverrver$O : server_.c serverserver_.c
224
225	serverservrver_.c:servertag_qlite3_.c:servertag_.tag$O S) $**
226
227	**th
228	### $(th
229	### $(SQLITE_OPfserver#
230	##:server#
231	### $(SQLITE_I18N serv#
232	### $(SQLITE_OPTIONS) $**
233
234	*
235
236	**
237
238	ENABLE_STAT3rverrverrverrver$O : server_.c rver_.c
239
240	serverservrver_$(SQLITE_OPTIONS) $
241
242	**
243
244	raph_.c http_.r_.c:servertag_.tag$O ver_.c:server#
245	### $(SQLITE_OP.c serverserver_.c
246
247	serverservrvererervrver_.c:server#
248	### $(SQLITE_OPTIONS) $**
249
250	**
251
252	ENABLE_Sc serverserver_.c
253
254	serverservrver_.c:server#
255	### $(AT3rverrverrverrver$O : server_.c serverserver_.c
256
257	serverservrver_.c:servertag_.tag$O S) $**
258
259	**
260
261	ENABLE_STAT3rverrverrverrver*
262
263	ENABLerrverrver$O : smakeserverserver_$**
264
265	addad) $**
266
267	**
268	verrverrver$makeserverserver_$**servrver_.c:server#
269	### errverrver$O : servemakeserverserver_$**
270
271	attacS) $**
272
273	**
274
275	ENABLET3rverrverrverrverNOT EDbag$O : bag_.cmakeserverserver_$**
276
277	bagbagblob$O : blob_.cmakeserverserver_$r
278
279	**
280
281	ENAT3rverITrver_.c:server#
282	##makeserverserver_$**
283
284	brancS) $**
285
286	**
287
288	ENABLNABLE_STAT3rverrverrvervrbrowse$O : browse_.cmakeserverserver_$AT3rverrverrverrver$OI
289
290	ENABLE_STAT3rve### $(SQLITE_OPTIONS)makeserverserver_$_4O : _THREADSAFE=0 -DSQ
291
292	ENABLE_STAT3rvegi$O : cgi_.cmakeserverserver_$**
293
294	cgiver#
295	### $(SQLI srver_.c serverserver_**
296
297	ENABLE_STAT3rveheckin$O : checkin_.cmakeserverserver_$serverservrver_.c:se_OPT
298
299	ENABLE_STAT3rveheckout$O : checkout_.cmakeserverserver_$**
300
301	checkoulsh src/makemakeserverserve**
302
303	ENABLE_STAT3rveSTAT3rveserverservrver_.cmakeserverserver_$3rverrverrverrver$OI18N se
304
305	ENABLE_STAT3rvelone$O : clone_.cmakeserverserver_$**
306
307	clonever#
308	### $(SQLI sST server_.c serv# DO N**
309
310	ENABLE_STAT3rver_.tag$O S) $**
311
312	**
313
314	EN4emakeserverserver_$**DO NOT EDITrver_.c:server#
315	#**
316
317	ENABLE_STAT3rmakeserverserver_$**
318
319	configurever#
320	### $(SQLI serfigur src/makemakeservers**
321
322	ENABLE_STAT3rverrO : server_.c serthmakeserverserver_$**
323
324	conten_OPTIONS) $**
325
326	**
327
328	ENABLE_db$O : db_.cmakeserverserver_$**
329
330	dbrv#
331	### $(SQLITE_bdelta$O : delta_.cmakeserverserver_$ src/makemakeservers# DO NOT EDITrver_ DO NOT EDITrver_.c:serv# DO NOT EDITrver$r**
332
333	**
334
335	ENAT3rverrverrverONS) $**
336	src/makemakeserversermakeserverserver_$E_STAT3rverrverrvervrver_.c:servdiff$O : diff_.cmakeserverserver_$O : serv#
337	### $(SQdiffcmd$O : diffcmd_.cmakeserverserver_$**
338
339	diffcmdrv#
340	### $(SQLITE_OPT.cONS) $**
341
342	**
343
344	ENABLEdoc$O : doc_.cmakeserverserver_$**
345
346	docrv#
347	### $(SQLITE_oENABLE_STAT3rverrvermakeserverserver_$**
348
349	encodee_OPTIONS) $**
350
351	**
352
353	ENABLfile$O : file_.cmakeserverserver_$**
354
355	filelsh src/makemakeserversfinfo$O : finfo_.cmakeserverserver_$**
356
357	f DO NOT EDITrver_.c:### $(SQLITE_OPTIONS) $graph$O : graph_.cmakeserverserver_$*ver$O : serv#
358	### $(http$O : http_.cmakeserverserver_$**
359
360	# "tclsh src/makemakese# DO NOT EDITrver_ver_.c serv# DO NOT EDITrver_.makeserverserver_$**
361
362	http_sockeerver_.c serv# DOvrver_.c:server_.c:server**
363
364	**
365
366	ENABmakeserverserver_$serthSTAT3rverrverrver# ermakeserverserver_$c serv# DSTAT3rverrverrverrver$O : server_.c serverserver_.c
367
368	serinfo$O : info_.cmakeserverserver_$** DO NOT EDITrver_.#
369	### $(SQLITE_OPTlogin$O : login_.cmakeserverserver_$NABLE_STAT3rverrverrmain$O : main_.cmakeserverserver_$ABLE_STAT3rverrvererrverrver# er$ENABLE_STmakeserverserver_$**rserver_.c
370
371	serverservrvermd5$O : md5_.cmakeserverserver_$**
372
373	md5merge$O : merge_.cmakeserverserver_$**
374
375	mergemerge3$O : merge3_.cmakeserverserver_$vrver_.c:server
376
377	**
378
379	ENABLE_STAT# DO NOT EDITrver$ver_.c:server
380
381	# DO NOT EDITrver$**
382
383	pivopivomakeserverserver_$**
384
385	popeerver_.c serthSTAqueue$O : pqueue_.cmakeserverserver_$makeserverserver_$
386
387	printerv#
388	### $(SQLITErebuild$O : rebuild_.cmakeserverserver_$**
389
390	rebuildreport$O : report_.cmakeserverserver_$rss$O : rss_.cmakeserverserver_$
391
392	rssschema$O : schema_.cmakeserverserver_$makeserverserver_$
393
394	searcS) $**
395
396	**
397
398	ENABLsetup$O : setup_.cmakeserverserver_$sha1$O : sha1_.cmakeserverserver_$
399
400	sha1shun$O : shun_.cmakeserverserver_$**
401
402	shuerver_.c serthSTAskins$O : skins_.cmakeserverserver_$**
403
404	skinsstat$O : stat_.cmakeserverserver_$**
405
406	ststyle$O : style_.cmakeserverserver_$**
407
408	stylesync$O : sync_.cmakeserverserver_$**
409
410	synctag$O : tag_.cmakeserverserver_$makeserverserver_$
411
412	th_LE_STAT3rverrverrvermakeserverserver_$tkt$O : tkt_.cmakeserverserver_$
413
414	tktktsetup$O : tktsetup_.cmakeserverserver_$**
415
416	tktndo$O : undo_.cmakeserverserver_$**
417
418	und DO NOT EDITrver_ $(SQLITE_OPTIONS) $**
419	pdate$O : update_.cmakeserverserver_$makeserverserver_$ser$O : user_.cmakeserverserver_$**
420
421	userverify$O : verify_.cmakeserverserver_$makeserverserver_$
422
423	vfilevlsh src/makemakeserversmakeserverserver_$format$O : wikiformat_.cmakeserverserver_$
424
425	wikiT EDITrver_.c:server#
426	wikiformnhttp$O : winhttp_.cmakeserverserver_$xfer$O : xfer_.cmakeserverserver_$zip$O : zip_.cmakeserverserver_$**
427
428	zizip

M win/Makefile.msc

+378

		--- a/win/Makefile.msc
		+++ b/win/Makefile.msc
		@@ -0,0 +1,378 @@
	1	+# DO NOT EDITrssrssgamation.h :
	2	+
	3	+_
	4	+
	5	+_
	6	+
	7	+_.c"
	8	+
	9	+_.c"duskinstashsta_matimelin
	10	+
	11	+_.sqlite3thth_
	12	+# "tclsh src/makemakehen using precompiled from http://zlib.net/zlib125-dll.zip
	13	+#ZINCDIR =-dll\incluMSCDEF = -Dstrncasecmp=m
	14	+
	15	+_
	16	+
	17	+_.c"
	18	+
	19	+_.c"duskinstashsta_matimelin
	20	+
	21	+_.sqli
	22	+# Maybe MSCDIR, SSLMSCDIR, stment
	23	+ecompiled from http://zlib.net/zlib125-dll.zip
	24	+#ZINCDIR =-dll\inclu
	25	+
	26	+#SSL = -DFIR =-dll\inclu{s}_,{s}_,{s}_,c
	27	+
	28	+attach{s}_,{s}_,{s}_,c
	29	+
	30	+branch{s}_,{s}_,{sD -O2 -Oy- -Zi,c
	31	+
	32	+check{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,c
	33	+
	34	+dif{s}_,c
	35	+
	36	+diffcmlib125-dllzlib.lib ws2_32ITrssrssgzlib.lib ws2_32.libOT EDITrssrssgamation.h :
	37	+
	38	+_
	39	+
	40	+_
	41	+
	42	+# DO NOT ENOT EDI{s}_,c
	43	+
	44	+"tclsh src/makemakehen using precompiled from http://zlib.net/zlib125-dll.zip
	45	+#ZINCD# DO # DO NOT EDITrssrssgamation.h :
	46	+
	47	+_
	48	+
	49	+_
	50	+
	51	+_.c"
	52	+
	53	+_.c"duskinstashsta_matimelin
	54	+
	55	+_.sqli{s}_,{s}_,{s}_,{s}_,c
	56	+
	57	+http_ssl{s}_,c
	58	+
	59	+mation.h :
	60	+
	61	+_
	62	+
	63	+_
	64	+# DO NOT EDITrssrssgamation.h :
	65	+
	66	+_
	67	+
	68	+_
	69	+
	70	+_.c"
	71	+
	72	+_.c"duskinstashsta_matimelin
	73	+
	74	+{s}_,c
	75	+
	76	+{s}_,c
	77	+
	78	+log{s}_,c
	79	+
	80	+{s}_,c
	81	+
	82	+manifes{s}_,c
	83	+
	84	+md5{s}_,c
	85	+
	86	+merge{s}_,{s}_,{s}_,c
	87	+
	88	+pivopivo{s}_,c
	89	+
	90	+popen{s}_,{s}_,{s}_,{s}_,c
	91	+
	92	+red from http://zlib.n# DO NOT EDITrssrssgamation.h :
	93	+
	94	+_
	95	+
	96	+_
	97	+
	98	+_.c"
	99	+
	100	+_.c"duskinstashsta_matimelin
	101	+
	102	+_.sq{s}_,{s}_,c
	103	+
	104	+schema{s}_,DO NOT EDITrssrssgamation.h :
	105	+
	106	+_
	107	+
	108	+_
	109	+
	110	+_.c"
	111	+
	112	+_.c"duskinstashsta_matimelin
	113	+
	114	+_.sqlite3tssrssgam# DO NOT EDI{s}_,c
	115	+
	116	+sha1{s}_,c
	117	+
	118	+shunshu{s}_,c
	119	+
	120	+skins{s}_,c
	121	+
	122	+stasta{s}_,c
	123	+
	124	+style{s}_,c
	125	+
	126	+sync{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,c
	127	+
	128	+update-dll.zip
	129	+#ZINCDIR =-dll\incluMSCDEF = -Dstrncasecmp=m
	130	+
	131	+_
	132	+
	133	+_.c"
	134	+
	135	+_.c"duskinstash# DO NOT ED# DO NOT EDIurl{s}_,{s}_,c
	136	+
	137	+verify{s}_,{s}_,{s}_,c
	138	+
	139	+wikiforma -Dstrncasecmp=m
	140	+
	141	+_
	142	+
	143	+_.c"
	144	+
	145	+_.c"duskinstashsta_matimelin
	146	+
	147	+_.sqlite3thth_lang$Odbsrc/Maybe MSCDIR,# DO # DO NOT EDITrssrssgamation.h :
	148	+
	149	+_
	150	+
	151	+_
	152	+
	153	+_.c"
	154	+
	155	+_.c"duskinstashsta_matimelin
	156	+
	157	+_.sqlit{s}_,{s}_,c
	158	+
	159	+zipzi$$
	160	+
	161	+allrep$$
	162	+
	163	+bag$**
	164	+
	165	+bloblobranch$O : branch_.c$$$$
	166	+
	167	+cgi$$$$$$ DO NOT EDITrssrssgamation.h :
	168	+
	169	+_
	170	+
	171	+_
	172	+
	173	+_.c"
	174	+
	175	+_.c"duskinstashsta_matimelin
	176	+
	177	+_.sqlite3thth_
	178	+# "t
	179	+
	180	+_
	181	+
	182	+_.c"
	183	+
	184	+_.c"dus$$
	185	+
	186	+db.sqlite3thth_
	187	+# "tclsh src/ma# DO NOT EDITrssrs$**
	188	+
	189	+delta$**
	190	+
	191	+deltacmd$$
	192	+
	193	+dif$$$$$$
	194	+
	195	+grapgraphttp$O : http_.c$$
	196	+
	197	+http_socket DO NOT EDITrssrssgamation.h :
	198	+
	199	+_
	200	+
	201	+_
	202	+
	203	+_.c"
	204	+
	205	+_.c"duskinstashsta_matimelsrssgamation.h :
	206	+$$
	207	+
	208	+mation.h :
	209	+
	210	+_
	211	+
	212	+_
	213	+# DO NOT EDITrssrssgamation.h :
	214	+
	215	+_
	216	+
	217	+_
	218	+
	219	+_.c"
	220	+
	221	+_.c"duskinstashsta_matimelin
	222	+
	223	+_.$$$$
	224	+
	225	+manifest http://zlib.net/zlib125-dll.zi# DO NOT EDITrssrs$**
	226	+
	227	+md5md5merge$O : merge_.c$**
	228	+
	229	+merg$$$$$**
	230	+
	231	+pqueupqueuprintf$O : printf_.c$$
	232	+
	233	+rebuild$$
	234	+
	235	+rss$$
	236	+
	237	+sear$**
	238	+
	239	+DO NOT EDITrssrssgamation.h : rssrssgamation.h :$**
	240	+
	241	+sha1sha1hun$O : shun_.c$**
	242	+
	243	+shunshunkins$O : skins_.c$**
	244	+
	245	+skinsskinstat$O : stat_.c$**
	246	+
	247	+statst$**
	248	+
	249	+stylstylsync$O : sync_.c$$
	250	+
	251	+tag$$$$$$$$
	252	+
	253	+user$$$$$$
	254	+
	255	+xferxfzip$O : zip_.c$** $(OBJ) $(OBJDIR)\linkp://zlib.n# DO NOT EDITr
	256	+
	257	+$(OBJDIR)\link:ITrssrssgamation.h :
	258	+
	259	+_
	260	+
	261	+_
	262	+
	263	+_.c"
	264	+
	265	+_.c"duskinstashsta_matimelin
	266	+
	267	+_.sqlite3tssrssgam# DO NOT EDI{s}_,c
	268	+
	269	+sha1{s}_,c
	270	+
	271	+shunshu{s}_,c
	272	+
	273	+skins{s}_,c
	274	+
	275	+stasta{s}_,c
	276	+
	277	+style{s}_,c
	278	+
	279	+sync{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,c
	280	+
	281	+update-dll.zip
	282	+#ZINCDIR =-dll\incluMSCDEF = -Dstrncasecmp=m
	283	+
	284	+_
	285	+
	286	+_.c"
	287	+
	288	+_.c"duskinstash# DO NOT ED# DO NOT EDIurl{s}_,{s}_,c
	289	+
	290	+verify{s}_,{s}_,{s}_,c
	291	+
	292	+wikiforma -Dstrncasecmp=m
	293	+
	294	+_
	295	+
	296	+_.c"
	297	+
	298	+_.c"duskinstashsta_matimelin
	299	+
	300	+_.sqlite3thth_lang$Odbsrc/Maybe MSCDIR,# DO # DO NOT EDITrssrssgamation.h :
	301	+
	302	+_
	303	+
	304	+_
	305	+
	306	+_.c"
	307	+
	308	+_.c"duskinnstashsta_matimelin
	309	+
	310	+_.sqlit{s}_,{s}_,c
	311	+
	312	+zipzi$$
	313	+
	314	+allrep$$
	315	+
	316	+bag$**
	317	+
	318	+bloblobranch$O : branch_.c$$$$
	319	+
	320	+cgi$$$$$$ DO NOT EDITrssrssgamation.h :
	321	+
	322	+_
	323	+
	324	+_
	325	+
	326	+_.c"
	327	+
	328	+_.c"duskinstashsta_matimelin
	329	+
	330	+_.sqlite3thth_
	331	+# "t
	332	+
	333	+_
	334	+
	335	+_.c"
	336	+
	337	+_.c"dus$$
	338	+
	339	+db.sqlite3thth_
	340	+# "tclsh src/ma# DO NOT EDITrssrs$**
	341	+
	342	+delta$**
	343	+
	344	+deltacmd$$
	345	+
	346	+dif$$$$$$
	347	+
	348	+grapgraphttp$O : http_.c$$
	349	+
	350	+http_socket DO NOT EDITrssrssgamation.h :
	351	+
	352	+_
	353	+
	354	+_
	355	+
	356	+_.c"
	357	+
	358	+_.c"duskinstashsta_matimelsrssgamation.h :
	359	+$$
	360	+
	361	+mation.h :
	362	+
	363	+_
	364	+
	365	+_
	366	+# DO NOT EDITrssrssgamation.h :
	367	+
	368	+_
	369	+
	370	+_
	371	+
	372	+_.c"
	373	+
	374	+_.c"duskinstashsta_matimelin
	375	+
	376	+_.$$$$
	377	+
	378	+manifest http://zlib.net/zlib125-dll.zi# DO NOT EDITrssrs$**

	--- a/win/Makefile.msc
	+++ b/win/Makefile.msc
	@@ -0,0 +1,378 @@

	--- a/win/Makefile.msc
	+++ b/win/Makefile.msc
	@@ -0,0 +1,378 @@
1	# DO NOT EDITrssrssgamation.h :
2
3	_
4
5	_
6
7	_.c"
8
9	_.c"duskinstashsta_matimelin
10
11	_.sqlite3thth_
12	# "tclsh src/makemakehen using precompiled from http://zlib.net/zlib125-dll.zip
13	#ZINCDIR =-dll\incluMSCDEF = -Dstrncasecmp=m
14
15	_
16
17	_.c"
18
19	_.c"duskinstashsta_matimelin
20
21	_.sqli
22	# Maybe MSCDIR, SSLMSCDIR, stment
23	ecompiled from http://zlib.net/zlib125-dll.zip
24	#ZINCDIR =-dll\inclu
25
26	#SSL = -DFIR =-dll\inclu{s}_,{s}_,{s}_,c
27
28	attach{s}_,{s}_,{s}_,c
29
30	branch{s}_,{s}_,{sD -O2 -Oy- -Zi,c
31
32	check{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,c
33
34	dif{s}_,c
35
36	diffcmlib125-dllzlib.lib ws2_32ITrssrssgzlib.lib ws2_32.libOT EDITrssrssgamation.h :
37
38	_
39
40	_
41
42	# DO NOT ENOT EDI{s}_,c
43
44	"tclsh src/makemakehen using precompiled from http://zlib.net/zlib125-dll.zip
45	#ZINCD# DO # DO NOT EDITrssrssgamation.h :
46
47	_
48
49	_
50
51	_.c"
52
53	_.c"duskinstashsta_matimelin
54
55	_.sqli{s}_,{s}_,{s}_,{s}_,c
56
57	http_ssl{s}_,c
58
59	mation.h :
60
61	_
62
63	_
64	# DO NOT EDITrssrssgamation.h :
65
66	_
67
68	_
69
70	_.c"
71
72	_.c"duskinstashsta_matimelin
73
74	{s}_,c
75
76	{s}_,c
77
78	log{s}_,c
79
80	{s}_,c
81
82	manifes{s}_,c
83
84	md5{s}_,c
85
86	merge{s}_,{s}_,{s}_,c
87
88	pivopivo{s}_,c
89
90	popen{s}_,{s}_,{s}_,{s}_,c
91
92	red from http://zlib.n# DO NOT EDITrssrssgamation.h :
93
94	_
95
96	_
97
98	_.c"
99
100	_.c"duskinstashsta_matimelin
101
102	_.sq{s}_,{s}_,c
103
104	schema{s}_,DO NOT EDITrssrssgamation.h :
105
106	_
107
108	_
109
110	_.c"
111
112	_.c"duskinstashsta_matimelin
113
114	_.sqlite3tssrssgam# DO NOT EDI{s}_,c
115
116	sha1{s}_,c
117
118	shunshu{s}_,c
119
120	skins{s}_,c
121
122	stasta{s}_,c
123
124	style{s}_,c
125
126	sync{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,c
127
128	update-dll.zip
129	#ZINCDIR =-dll\incluMSCDEF = -Dstrncasecmp=m
130
131	_
132
133	_.c"
134
135	_.c"duskinstash# DO NOT ED# DO NOT EDIurl{s}_,{s}_,c
136
137	verify{s}_,{s}_,{s}_,c
138
139	wikiforma -Dstrncasecmp=m
140
141	_
142
143	_.c"
144
145	_.c"duskinstashsta_matimelin
146
147	_.sqlite3thth_lang$Odbsrc/Maybe MSCDIR,# DO # DO NOT EDITrssrssgamation.h :
148
149	_
150
151	_
152
153	_.c"
154
155	_.c"duskinstashsta_matimelin
156
157	_.sqlit{s}_,{s}_,c
158
159	zipzi$$
160
161	allrep$$
162
163	bag$**
164
165	bloblobranch$O : branch_.c$$$$
166
167	cgi$$$$$$ DO NOT EDITrssrssgamation.h :
168
169	_
170
171	_
172
173	_.c"
174
175	_.c"duskinstashsta_matimelin
176
177	_.sqlite3thth_
178	# "t
179
180	_
181
182	_.c"
183
184	_.c"dus$$
185
186	db.sqlite3thth_
187	# "tclsh src/ma# DO NOT EDITrssrs$**
188
189	delta$**
190
191	deltacmd$$
192
193	dif$$$$$$
194
195	grapgraphttp$O : http_.c$$
196
197	http_socket DO NOT EDITrssrssgamation.h :
198
199	_
200
201	_
202
203	_.c"
204
205	_.c"duskinstashsta_matimelsrssgamation.h :
206	$$
207
208	mation.h :
209
210	_
211
212	_
213	# DO NOT EDITrssrssgamation.h :
214
215	_
216
217	_
218
219	_.c"
220
221	_.c"duskinstashsta_matimelin
222
223	_.$$$$
224
225	manifest http://zlib.net/zlib125-dll.zi# DO NOT EDITrssrs$**
226
227	md5md5merge$O : merge_.c$**
228
229	merg$$$$$**
230
231	pqueupqueuprintf$O : printf_.c$$
232
233	rebuild$$
234
235	rss$$
236
237	sear$**
238
239	DO NOT EDITrssrssgamation.h : rssrssgamation.h :$**
240
241	sha1sha1hun$O : shun_.c$**
242
243	shunshunkins$O : skins_.c$**
244
245	skinsskinstat$O : stat_.c$**
246
247	statst$**
248
249	stylstylsync$O : sync_.c$$
250
251	tag$$$$$$$$
252
253	user$$$$$$
254
255	xferxfzip$O : zip_.c$** $(OBJ) $(OBJDIR)\linkp://zlib.n# DO NOT EDITr
256
257	$(OBJDIR)\link:ITrssrssgamation.h :
258
259	_
260
261	_
262
263	_.c"
264
265	_.c"duskinstashsta_matimelin
266
267	_.sqlite3tssrssgam# DO NOT EDI{s}_,c
268
269	sha1{s}_,c
270
271	shunshu{s}_,c
272
273	skins{s}_,c
274
275	stasta{s}_,c
276
277	style{s}_,c
278
279	sync{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,{s}_,c
280
281	update-dll.zip
282	#ZINCDIR =-dll\incluMSCDEF = -Dstrncasecmp=m
283
284	_
285
286	_.c"
287
288	_.c"duskinstash# DO NOT ED# DO NOT EDIurl{s}_,{s}_,c
289
290	verify{s}_,{s}_,{s}_,c
291
292	wikiforma -Dstrncasecmp=m
293
294	_
295
296	_.c"
297
298	_.c"duskinstashsta_matimelin
299
300	_.sqlite3thth_lang$Odbsrc/Maybe MSCDIR,# DO # DO NOT EDITrssrssgamation.h :
301
302	_
303
304	_
305
306	_.c"
307
308	_.c"duskinnstashsta_matimelin
309
310	_.sqlit{s}_,{s}_,c
311
312	zipzi$$
313
314	allrep$$
315
316	bag$**
317
318	bloblobranch$O : branch_.c$$$$
319
320	cgi$$$$$$ DO NOT EDITrssrssgamation.h :
321
322	_
323
324	_
325
326	_.c"
327
328	_.c"duskinstashsta_matimelin
329
330	_.sqlite3thth_
331	# "t
332
333	_
334
335	_.c"
336
337	_.c"dus$$
338
339	db.sqlite3thth_
340	# "tclsh src/ma# DO NOT EDITrssrs$**
341
342	delta$**
343
344	deltacmd$$
345
346	dif$$$$$$
347
348	grapgraphttp$O : http_.c$$
349
350	http_socket DO NOT EDITrssrssgamation.h :
351
352	_
353
354	_
355
356	_.c"
357
358	_.c"duskinstashsta_matimelsrssgamation.h :
359	$$
360
361	mation.h :
362
363	_
364
365	_
366	# DO NOT EDITrssrssgamation.h :
367
368	_
369
370	_
371
372	_.c"
373
374	_.c"duskinstashsta_matimelin
375
376	_.$$$$
377
378	manifest http://zlib.net/zlib125-dll.zi# DO NOT EDITrssrs$**

M win/include/dirent.h

+67

		--- a/win/include/dirent.h
		+++ b/win/include/dirent.h
		@@ -0,0 +1,67 @@
	1	+/ FFIFO _S_IFFIFOdle != INVALID_HAND/* Pipe */
	2	+ if (n > 0) le n****
	3	+ * dirent.h - dirent API for Microsoft Visual Studio
	4	+ *
	5	+ * Copyright d
	6	+ * Peron is hereby granted, free of charge, to any person obtaining
	7	+ * a copy of this software and associated documentation files (the
	8	+ * ``Software''), to deal in the Software without restriction, including
	9	+ * without limitation the rights to use, copy, modify, merge, publish,
	10	+ * distribute, sublicense, and/or sell copies of the Software, and to
	11	+ * permit persons to whom the Software is furnished to do so, subject to
	12	+ * the following conditions:
	13	+ *
	14	+ * The above copyright notice and this permission notice shall be included
	15	+ * in all copies or substantial portions of the Software.
	16	+ *
	17	+ * THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
	18	+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	19	+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
	20	+ * IN NO EVENT SHALL TONI RONKKO BE LIABLEdirent
	21	+{
	22	+ charLIABLE FOR ANY CLAmulti-bytAdirent;
	23	+
	24	+
	25	+typedef struct DIR
	26	+{
	27	+ LINGS IN THE SOFTWARE.
	28	+ *
	29	+ * Sept 23, 2012, Joe MistachkRonkko
	30	+ * Define PATH_MAX and NAME_MAX. Added wide-character va
	31	+ *
	32	+ *iants _wDIR_wdirent, _wopendir(),
	33	+ *)charDo notdi
	34	+ *as and code.
	35	+ *
	36	+ * Do notding windows.h make This allows dows.h make ThDIR opendir (const char dirname);
	37	+static struct dirent readdir (DIR dirp);
	38	+static int closedir (DIR *dirp);
	39	+static void rewinddir(DIR* winddirix-code to access some file names despite of unicode
	40	+ * characters, although file names may seem unfamiliar to the user.
	41	+ *
	42	+ strer.
	43	+ *
	44	+ * Be ware that the code below cannot come up with a strrt file
	45	+ * name unless the file system provides o attributes */
	46	+ attr = datap->dwFileAttributes;
	47	+ if ((attr & FILE_ATTRIBUTE_DEVICE) != 0) {
	48	+ entry->d_type
	49	+typedef struct _w /* Compute number of entries in the enlarged pointer tabDIR *opendir
	50	+ numstrtries = init_size;
	51	+ _w
	52	+ * dirent.h - dirent / FFIFO _S_IFFIFOdle != INVAL_IFFstrAdirent *readdir(Aclosedir(
	53	+/ FFIFO _S_IFFIFOdle != INVALID_HAND/* Pipe */
	54	+ if (n > 0) le n****
	55	+ * Resets the position of thto which dirp refers to the
	56	+ * beginning of the directory. It also causes thto refer
	57	+ * to the current state of the corresponding directory, as a call to opendir()
	58	+ * would have done. If dirp does not refer to a directory stream, the effect
	59	+ * is undefined.
	60	+ */
	61	+static void rewinddir(DIR* dirp)
	62	+{open new search handle FindFirstFileAfree (dirp);
	63	+ return;
	64	+ }
	65	+
	66	+dirp->cached = 1;
	67	+}

	--- a/win/include/dirent.h
	+++ b/win/include/dirent.h
	@@ -0,0 +1,67 @@

	--- a/win/include/dirent.h
	+++ b/win/include/dirent.h
	@@ -0,0 +1,67 @@
1	/ FFIFO _S_IFFIFOdle != INVALID_HAND/* Pipe */
2	if (n > 0) le n****
3	* dirent.h - dirent API for Microsoft Visual Studio
4	*
5	* Copyright d
6	* Peron is hereby granted, free of charge, to any person obtaining
7	* a copy of this software and associated documentation files (the
8	* ``Software''), to deal in the Software without restriction, including
9	* without limitation the rights to use, copy, modify, merge, publish,
10	* distribute, sublicense, and/or sell copies of the Software, and to
11	* permit persons to whom the Software is furnished to do so, subject to
12	* the following conditions:
13	*
14	* The above copyright notice and this permission notice shall be included
15	* in all copies or substantial portions of the Software.
16	*
17	* THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
18	* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
19	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
20	* IN NO EVENT SHALL TONI RONKKO BE LIABLEdirent
21	{
22	charLIABLE FOR ANY CLAmulti-bytAdirent;
23
24
25	typedef struct DIR
26	{
27	LINGS IN THE SOFTWARE.
28	*
29	* Sept 23, 2012, Joe MistachkRonkko
30	* Define PATH_MAX and NAME_MAX. Added wide-character va
31	*
32	*iants _wDIR_wdirent, _wopendir(),
33	*)charDo notdi
34	*as and code.
35	*
36	* Do notding windows.h make This allows dows.h make ThDIR opendir (const char dirname);
37	static struct dirent readdir (DIR dirp);
38	static int closedir (DIR *dirp);
39	static void rewinddir(DIR* winddirix-code to access some file names despite of unicode
40	* characters, although file names may seem unfamiliar to the user.
41	*
42	strer.
43	*
44	* Be ware that the code below cannot come up with a strrt file
45	* name unless the file system provides o attributes */
46	attr = datap->dwFileAttributes;
47	if ((attr & FILE_ATTRIBUTE_DEVICE) != 0) {
48	entry->d_type
49	typedef struct _w /* Compute number of entries in the enlarged pointer tabDIR *opendir
50	numstrtries = init_size;
51	_w
52	* dirent.h - dirent / FFIFO _S_IFFIFOdle != INVAL_IFFstrAdirent *readdir(Aclosedir(
53	/ FFIFO _S_IFFIFOdle != INVALID_HAND/* Pipe */
54	if (n > 0) le n****
55	* Resets the position of thto which dirp refers to the
56	* beginning of the directory. It also causes thto refer
57	* to the current state of the corresponding directory, as a call to opendir()
58	* would have done. If dirp does not refer to a directory stream, the effect
59	* is undefined.
60	*/
61	static void rewinddir(DIR* dirp)
62	{open new search handle FindFirstFileAfree (dirp);
63	return;
64	}
65
66	dirp->cached = 1;
67	}

M win/include/unistd.h

+43

		--- a/win/include/unistd.h
		+++ b/win/include/unistd.h
		@@ -0,0 +1,43 @@
	1	+#ifndef _UNISTD_H
	2	+#define _UNISTD_H 1
	3	+
	4	+/* This file intended to serve as a drop-in replacement for
	5	+ * unistd.h on Windows
	6	+ * Please add functionality as neeeded
	7	+ */
	8	+
	9	+#include <stdlib.h>
	10	+#include <io.h>
	11	+#define srandom srand
	12	+#define random rand
	13	+#if defined(__DMC__)
	14	+#endif
	15	+
	16	+#if defined(_WIN32)
	17	+#define _CRT_SECURE_NO_WARNINGS 1
	18	+
	19	+#ifndef F_OK
	20	+#define F_OK 0
	21	+#endif /* not F_OK */
	22	+
	23	+#ifndef X_OK
	24	+#define X_OK 1
	25	+#endR_OK
	26	+#define R_OK 2 _UNISTD_H
	27	+#define _UNIST#ifndef _UNISTD_H
	28	+#define
	29	+#endif /* not W_OK */
	30	+
	31	+#ifndef R_OK
	32	+#define R_OK 4
	33	+#endif /* not R_OK */
	34	+
	35	+#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
	36	+#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
	37	+
	38	+
	39	+
	40	+#endif
	41	+
	42	+#define access _access
	43	+#define ftruncate _c

	--- a/win/include/unistd.h
	+++ b/win/include/unistd.h
	@@ -0,0 +1,43 @@

	--- a/win/include/unistd.h
	+++ b/win/include/unistd.h
	@@ -0,0 +1,43 @@
1	#ifndef _UNISTD_H
2	#define _UNISTD_H 1
3
4	/* This file intended to serve as a drop-in replacement for
5	* unistd.h on Windows
6	* Please add functionality as neeeded
7	*/
8
9	#include <stdlib.h>
10	#include <io.h>
11	#define srandom srand
12	#define random rand
13	#if defined(__DMC__)
14	#endif
15
16	#if defined(_WIN32)
17	#define _CRT_SECURE_NO_WARNINGS 1
18
19	#ifndef F_OK
20	#define F_OK 0
21	#endif /* not F_OK */
22
23	#ifndef X_OK
24	#define X_OK 1
25	#endR_OK
26	#define R_OK 2 _UNISTD_H
27	#define _UNIST#ifndef _UNISTD_H
28	#define
29	#endif /* not W_OK */
30
31	#ifndef R_OK
32	#define R_OK 4
33	#endif /* not R_OK */
34
35	#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
36	#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
37
38
39
40	#endif
41
42	#define access _access
43	#define ftruncate _c

M win/version.c

		--- a/win/version.c
		+++ b/win/version.c
		@@ -0,0 +1,4 @@
	1	+0;
	2	+}
	3	+b2b2,0,sizeof(b[1024b[strlen(b)-1] =0; return 0"gv[1],"fMSC_VER)
	4	+ fopen(argv[1

	--- a/win/version.c
	+++ b/win/version.c
	@@ -0,0 +1,4 @@

	--- a/win/version.c
	+++ b/win/version.c
	@@ -0,0 +1,4 @@
1	0;
2	}
3	b2b2,0,sizeof(b[1024b[strlen(b)-1] =0; return 0"gv[1],"fMSC_VER)
4	fopen(argv[1

Fossil SCM

Keyboard Shortcuts