e5293dc281b… — Fossil SCM

M src/main.c

+8 -1

		--- src/main.c
		+++ src/main.c
		@@ -349,11 +349,11 @@
349	349	/*
350	350	** Zero, unlock, and free the saved database encryption key now.
351	351	*/
352	352	db_unsave_encryption_key();
353	353	#endif
354		-#if defined(_WIN32) \|\| defined(__BIONIC__) && !defined(FOSSIL_HAVE_GETPASS)
	354	+#if defined(_WIN32) \|\| (defined(__BIONIC__) && !defined(FOSSIL_HAVE_GETPASS))
355	355	/*
356	356	** Free the secure getpass() buffer now.
357	357	*/
358	358	freepass();
359	359	#endif
		@@ -388,10 +388,17 @@
388	388	*/
389	389	if( fossil_getenv("TH1_DELETE_INTERP")!=0 ){
390	390	if( g.interp ){
391	391	Th_DeleteInterp(g.interp); g.interp = 0;
392	392	}
	393	+#if defined(TH_MEMDEBUG)
	394	+ if( Th_GetOutstandingMalloc()!=0 ){
	395	+ fossil_print("Th_GetOutstandingMalloc() => %d\n",
	396	+ Th_GetOutstandingMalloc());
	397	+ }
	398	+ assert( Th_GetOutstandingMalloc()==0 );
	399	+#endif
393	400	}
394	401	}
395	402
396	403	/*
397	404	** Convert all arguments from mbcs (or unicode) to UTF-8. Then
398	405

	--- src/main.c
	+++ src/main.c
	@@ -349,11 +349,11 @@
349	/*
350	** Zero, unlock, and free the saved database encryption key now.
351	*/
352	db_unsave_encryption_key();
353	#endif
354	#if defined(_WIN32) \|\| defined(__BIONIC__) && !defined(FOSSIL_HAVE_GETPASS)
355	/*
356	** Free the secure getpass() buffer now.
357	*/
358	freepass();
359	#endif
	@@ -388,10 +388,17 @@
388	*/
389	if( fossil_getenv("TH1_DELETE_INTERP")!=0 ){
390	if( g.interp ){
391	Th_DeleteInterp(g.interp); g.interp = 0;
392	}







393	}
394	}
395
396	/*
397	** Convert all arguments from mbcs (or unicode) to UTF-8. Then
398

	--- src/main.c
	+++ src/main.c
	@@ -349,11 +349,11 @@
349	/*
350	** Zero, unlock, and free the saved database encryption key now.
351	*/
352	db_unsave_encryption_key();
353	#endif
354	#if defined(_WIN32) \|\| (defined(__BIONIC__) && !defined(FOSSIL_HAVE_GETPASS))
355	/*
356	** Free the secure getpass() buffer now.
357	*/
358	freepass();
359	#endif
	@@ -388,10 +388,17 @@
388	*/
389	if( fossil_getenv("TH1_DELETE_INTERP")!=0 ){
390	if( g.interp ){
391	Th_DeleteInterp(g.interp); g.interp = 0;
392	}
393	#if defined(TH_MEMDEBUG)
394	if( Th_GetOutstandingMalloc()!=0 ){
395	fossil_print("Th_GetOutstandingMalloc() => %d\n",
396	Th_GetOutstandingMalloc());
397	}
398	assert( Th_GetOutstandingMalloc()==0 );
399	#endif
400	}
401	}
402
403	/*
404	** Convert all arguments from mbcs (or unicode) to UTF-8. Then
405

M src/makemake.tcl

+15 -3

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -1478,11 +1478,11 @@
1478	1478	OBJDIR = $(T)
1479	1479	OX = $(OBJDIR)
1480	1480	O = .obj
1481	1481	E = .exe
1482	1482	P = .pdb
1483		-OPTLEVEL= /Os
	1483	+DBGOPTS = /Od
1484	1484
1485	1485	INSTALLDIR = .
1486	1486	!ifdef DESTDIR
1487	1487	INSTALLDIR = $(DESTDIR)\$(INSTALLDIR)
1488	1488	!endif
		@@ -1673,16 +1673,28 @@
1673	1673	CRTFLAGS = /MTd
1674	1674	!else
1675	1675	CRTFLAGS = /MT
1676	1676	!endif
1677	1677	!endif
	1678	+
	1679	+!if $(OPTIMIZATIONS)>3
	1680	+RELOPTS = /Os
	1681	+!elseif $(OPTIMIZATIONS)>2
	1682	+RELOPTS = /Ox
	1683	+!elseif $(OPTIMIZATIONS)>1
	1684	+RELOPTS = /O2
	1685	+!elseif $(OPTIMIZATIONS)>0
	1686	+RELOPTS = /O1
	1687	+!else
	1688	+RELOPTS =
	1689	+!endif
1678	1690
1679	1691	!if $(DEBUG)!=0
1680		-CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
	1692	+CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) $(DBGOPTS) /DFOSSIL_DEBUG /DTH_MEMDEBUG
1681	1693	LDFLAGS = $(LDFLAGS) /DEBUG
1682	1694	!else
1683		-CFLAGS = $(CFLAGS) $(CRTFLAGS) $(OPTLEVEL)
	1695	+CFLAGS = $(CFLAGS) $(CRTFLAGS) $(RELOPTS)
1684	1696	!endif
1685	1697
1686	1698	BCC = $(CC) $(CFLAGS)
1687	1699	TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL)
1688	1700	RCC = $(RC) /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL)
1689	1701

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1478,11 +1478,11 @@
1478	OBJDIR = $(T)
1479	OX = $(OBJDIR)
1480	O = .obj
1481	E = .exe
1482	P = .pdb
1483	OPTLEVEL= /Os
1484
1485	INSTALLDIR = .
1486	!ifdef DESTDIR
1487	INSTALLDIR = $(DESTDIR)\$(INSTALLDIR)
1488	!endif
	@@ -1673,16 +1673,28 @@
1673	CRTFLAGS = /MTd
1674	!else
1675	CRTFLAGS = /MT
1676	!endif
1677	!endif












1678
1679	!if $(DEBUG)!=0
1680	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
1681	LDFLAGS = $(LDFLAGS) /DEBUG
1682	!else
1683	CFLAGS = $(CFLAGS) $(CRTFLAGS) $(OPTLEVEL)
1684	!endif
1685
1686	BCC = $(CC) $(CFLAGS)
1687	TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL)
1688	RCC = $(RC) /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL)
1689

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -1478,11 +1478,11 @@
1478	OBJDIR = $(T)
1479	OX = $(OBJDIR)
1480	O = .obj
1481	E = .exe
1482	P = .pdb
1483	DBGOPTS = /Od
1484
1485	INSTALLDIR = .
1486	!ifdef DESTDIR
1487	INSTALLDIR = $(DESTDIR)\$(INSTALLDIR)
1488	!endif
	@@ -1673,16 +1673,28 @@
1673	CRTFLAGS = /MTd
1674	!else
1675	CRTFLAGS = /MT
1676	!endif
1677	!endif
1678
1679	!if $(OPTIMIZATIONS)>3
1680	RELOPTS = /Os
1681	!elseif $(OPTIMIZATIONS)>2
1682	RELOPTS = /Ox
1683	!elseif $(OPTIMIZATIONS)>1
1684	RELOPTS = /O2
1685	!elseif $(OPTIMIZATIONS)>0
1686	RELOPTS = /O1
1687	!else
1688	RELOPTS =
1689	!endif
1690
1691	!if $(DEBUG)!=0
1692	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) $(DBGOPTS) /DFOSSIL_DEBUG /DTH_MEMDEBUG
1693	LDFLAGS = $(LDFLAGS) /DEBUG
1694	!else
1695	CFLAGS = $(CFLAGS) $(CRTFLAGS) $(RELOPTS)
1696	!endif
1697
1698	BCC = $(CC) $(CFLAGS)
1699	TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL)
1700	RCC = $(RC) /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL)
1701

M src/th.c

+47 -3

		--- src/th.c
		+++ src/th.c
		@@ -222,11 +222,20 @@
222	222	Buffer *pBuffer,
223	223	const char *zAdd,
224	224	int nAdd
225	225	){
226	226	int nNew = (pBuffer->nBuf+nAdd)*2+32;
	227	+#if defined(TH_MEMDEBUG)
	228	+ char zNew = (char )Th_Malloc(interp, nNew);
	229	+ th_memcpy(zNew, pBuffer->zBuf, pBuffer->nBuf);
	230	+ Th_Free(interp, pBuffer->zBuf);
	231	+ pBuffer->zBuf = zNew;
	232	+#else
	233	+ int nOld = pBuffer->nBufAlloc;
227	234	pBuffer->zBuf = Th_Realloc(interp, pBuffer->zBuf, nNew);
	235	+ memset(pBuffer->zBuf+nOld, 0, nNew-nOld);
	236	+#endif
228	237	pBuffer->nBufAlloc = nNew;
229	238	th_memcpy(&pBuffer->zBuf[pBuffer->nBuf], zAdd, nAdd);
230	239	pBuffer->nBuf += nAdd;
231	240	}
232	241	static void thBufferWriteFast(
		@@ -1535,10 +1544,37 @@
1535	1544	}else{
1536	1545	return (char *)Th_Malloc(pInterp, 1);
1537	1546	}
1538	1547	}
1539	1548
	1549	+#if defined(TH_MEMDEBUG)
	1550	+/*
	1551	+** Wrappers around the supplied malloc() and free()
	1552	+*/
	1553	+void Th_DbgMalloc(Th_Interp pInterp, int nByte){
	1554	+ void *p;
	1555	+ Th_Vtab *pVtab = pInterp->pVtab;
	1556	+ if( pVtab ){
	1557	+ p = pVtab->xMalloc(nByte);
	1558	+ if( p ) memset(p, 0, nByte);
	1559	+ }else{
	1560	+ p = Th_SysMalloc(pInterp, nByte);
	1561	+ }
	1562	+ return p;
	1563	+}
	1564	+void Th_DbgFree(Th_Interp pInterp, void z){
	1565	+ if( z ){
	1566	+ Th_Vtab *pVtab = pInterp->pVtab;
	1567	+ if( pVtab ){
	1568	+ pVtab->xFree(z);
	1569	+ }else{
	1570	+ Th_SysFree(pInterp, z);
	1571	+ }
	1572	+ }
	1573	+}
	1574	+#endif
	1575	+
1540	1576	/*
1541	1577	** Install a new th1 command.
1542	1578	**
1543	1579	** If a command of the same name already exists, it is deleted automatically.
1544	1580	*/
		@@ -1821,16 +1857,24 @@
1821	1857	}
1822	1858
1823	1859	/*
1824	1860	** Create a new interpreter.
1825	1861	*/
1826		-Th_Interp * Th_CreateInterp(void){
	1862	+Th_Interp * Th_CreateInterp(Th_Vtab *pVtab){
	1863	+ int nByte = sizeof(Th_Interp) + sizeof(Th_Frame);
1827	1864	Th_Interp *p;
1828	1865
1829	1866	/* Allocate and initialise the interpreter and the global frame */
1830		- p = Th_Malloc(0, sizeof(Th_Interp) + sizeof(Th_Frame));
1831		- memset(p, 0, sizeof(Th_Interp));
	1867	+#if defined(TH_MEMDEBUG)
	1868	+ if( pVtab ){
	1869	+ p = pVtab->xMalloc(nByte);
	1870	+ memset(p, 0, nByte);
	1871	+ p->pVtab = pVtab;
	1872	+ }else
	1873	+#endif
	1874	+ p = Th_SysMalloc(0, nByte);
	1875	+
1832	1876	p->paCmd = Th_HashNew(p);
1833	1877	thPushFrame(p, (Th_Frame *)&p[1]);
1834	1878	thInitialize(p);
1835	1879
1836	1880	return p;
1837	1881

	--- src/th.c
	+++ src/th.c
	@@ -222,11 +222,20 @@
222	Buffer *pBuffer,
223	const char *zAdd,
224	int nAdd
225	){
226	int nNew = (pBuffer->nBuf+nAdd)*2+32;







227	pBuffer->zBuf = Th_Realloc(interp, pBuffer->zBuf, nNew);


228	pBuffer->nBufAlloc = nNew;
229	th_memcpy(&pBuffer->zBuf[pBuffer->nBuf], zAdd, nAdd);
230	pBuffer->nBuf += nAdd;
231	}
232	static void thBufferWriteFast(
	@@ -1535,10 +1544,37 @@
1535	}else{
1536	return (char *)Th_Malloc(pInterp, 1);
1537	}
1538	}
1539



























1540	/*
1541	** Install a new th1 command.
1542	**
1543	** If a command of the same name already exists, it is deleted automatically.
1544	*/
	@@ -1821,16 +1857,24 @@
1821	}
1822
1823	/*
1824	** Create a new interpreter.
1825	*/
1826	Th_Interp * Th_CreateInterp(void){

1827	Th_Interp *p;
1828
1829	/* Allocate and initialise the interpreter and the global frame */
1830	p = Th_Malloc(0, sizeof(Th_Interp) + sizeof(Th_Frame));
1831	memset(p, 0, sizeof(Th_Interp));







1832	p->paCmd = Th_HashNew(p);
1833	thPushFrame(p, (Th_Frame *)&p[1]);
1834	thInitialize(p);
1835
1836	return p;
1837

	--- src/th.c
	+++ src/th.c
	@@ -222,11 +222,20 @@
222	Buffer *pBuffer,
223	const char *zAdd,
224	int nAdd
225	){
226	int nNew = (pBuffer->nBuf+nAdd)*2+32;
227	#if defined(TH_MEMDEBUG)
228	char zNew = (char )Th_Malloc(interp, nNew);
229	th_memcpy(zNew, pBuffer->zBuf, pBuffer->nBuf);
230	Th_Free(interp, pBuffer->zBuf);
231	pBuffer->zBuf = zNew;
232	#else
233	int nOld = pBuffer->nBufAlloc;
234	pBuffer->zBuf = Th_Realloc(interp, pBuffer->zBuf, nNew);
235	memset(pBuffer->zBuf+nOld, 0, nNew-nOld);
236	#endif
237	pBuffer->nBufAlloc = nNew;
238	th_memcpy(&pBuffer->zBuf[pBuffer->nBuf], zAdd, nAdd);
239	pBuffer->nBuf += nAdd;
240	}
241	static void thBufferWriteFast(
	@@ -1535,10 +1544,37 @@
1544	}else{
1545	return (char *)Th_Malloc(pInterp, 1);
1546	}
1547	}
1548
1549	#if defined(TH_MEMDEBUG)
1550	/*
1551	** Wrappers around the supplied malloc() and free()
1552	*/
1553	void Th_DbgMalloc(Th_Interp pInterp, int nByte){
1554	void *p;
1555	Th_Vtab *pVtab = pInterp->pVtab;
1556	if( pVtab ){
1557	p = pVtab->xMalloc(nByte);
1558	if( p ) memset(p, 0, nByte);
1559	}else{
1560	p = Th_SysMalloc(pInterp, nByte);
1561	}
1562	return p;
1563	}
1564	void Th_DbgFree(Th_Interp pInterp, void z){
1565	if( z ){
1566	Th_Vtab *pVtab = pInterp->pVtab;
1567	if( pVtab ){
1568	pVtab->xFree(z);
1569	}else{
1570	Th_SysFree(pInterp, z);
1571	}
1572	}
1573	}
1574	#endif
1575
1576	/*
1577	** Install a new th1 command.
1578	**
1579	** If a command of the same name already exists, it is deleted automatically.
1580	*/
	@@ -1821,16 +1857,24 @@
1857	}
1858
1859	/*
1860	** Create a new interpreter.
1861	*/
1862	Th_Interp * Th_CreateInterp(Th_Vtab *pVtab){
1863	int nByte = sizeof(Th_Interp) + sizeof(Th_Frame);
1864	Th_Interp *p;
1865
1866	/* Allocate and initialise the interpreter and the global frame */
1867	#if defined(TH_MEMDEBUG)
1868	if( pVtab ){
1869	p = pVtab->xMalloc(nByte);
1870	memset(p, 0, nByte);
1871	p->pVtab = pVtab;
1872	}else
1873	#endif
1874	p = Th_SysMalloc(0, nByte);
1875
1876	p->paCmd = Th_HashNew(p);
1877	thPushFrame(p, (Th_Frame *)&p[1]);
1878	thInitialize(p);
1879
1880	return p;
1881

M src/th.h

+21 -6

		--- src/th.h
		+++ src/th.h
		@@ -21,11 +21,11 @@
21	21	typedef struct Th_Interp Th_Interp;
22	22
23	23	/*
24	24	** Create and delete interpreters.
25	25	*/
26		-Th_Interp * Th_CreateInterp(void);
	26	+Th_Interp * Th_CreateInterp(Th_Vtab *);
27	27	void Th_DeleteInterp(Th_Interp *);
28	28
29	29	/*
30	30	** Evaluate an TH program in the stack frame identified by parameter
31	31	** iFrame, according to the following rules:
		@@ -121,16 +121,31 @@
121	121
122	122	/*
123	123	** Access the memory management functions associated with the specified
124	124	** interpreter.
125	125	*/
	126	+#if defined(TH_MEMDEBUG)
	127	+void Th_DbgMalloc(Th_Interp , int);
	128	+void Th_DbgFree(Th_Interp , void );
	129	+#endif
	130	+
126	131	void *fossil_malloc_zero(size_t);
127		-void fossil_realloc(void,size_t);
128		-void fossil_free(void*);
129		-#define Th_Malloc(I,N) fossil_malloc_zero(N)
130		-#define Th_Realloc(I,P,N) fossil_realloc(P,N)
131		-#define Th_Free(I,P) fossil_free(P)
	132	+void fossil_realloc(void , size_t);
	133	+void fossil_free(void *);
	134	+
	135	+#define Th_SysMalloc(I,N) fossil_malloc_zero((N))
	136	+#define Th_SysRealloc(I,P,N) fossil_realloc((P),(N))
	137	+#define Th_SysFree(I,P) fossil_free((P))
	138	+
	139	+#if defined(TH_MEMDEBUG)
	140	+# define Th_Malloc(I,N) Th_DbgMalloc((I),(N))
	141	+# define Th_Free(I,P) Th_DbgFree((I),(P))
	142	+#else
	143	+# define Th_Malloc(I,N) Th_SysMalloc((I),(N))
	144	+# define Th_Realloc(I,P,N) Th_SysRealloc((I),(P),(N))
	145	+# define Th_Free(I,P) Th_SysFree((I),(P))
	146	+#endif
132	147
133	148	/*
134	149	** Functions for handling TH lists.
135	150	*/
136	151	int Th_ListAppend(Th_Interp , char , int , const char *, int);
137	152

	--- src/th.h
	+++ src/th.h
	@@ -21,11 +21,11 @@
21	typedef struct Th_Interp Th_Interp;
22
23	/*
24	** Create and delete interpreters.
25	*/
26	Th_Interp * Th_CreateInterp(void);
27	void Th_DeleteInterp(Th_Interp *);
28
29	/*
30	** Evaluate an TH program in the stack frame identified by parameter
31	** iFrame, according to the following rules:
	@@ -121,16 +121,31 @@
121
122	/*
123	** Access the memory management functions associated with the specified
124	** interpreter.
125	*/





126	void *fossil_malloc_zero(size_t);
127	void fossil_realloc(void,size_t);
128	void fossil_free(void*);
129	#define Th_Malloc(I,N) fossil_malloc_zero(N)
130	#define Th_Realloc(I,P,N) fossil_realloc(P,N)
131	#define Th_Free(I,P) fossil_free(P)










132
133	/*
134	** Functions for handling TH lists.
135	*/
136	int Th_ListAppend(Th_Interp , char , int , const char *, int);
137

	--- src/th.h
	+++ src/th.h
	@@ -21,11 +21,11 @@
21	typedef struct Th_Interp Th_Interp;
22
23	/*
24	** Create and delete interpreters.
25	*/
26	Th_Interp * Th_CreateInterp(Th_Vtab *);
27	void Th_DeleteInterp(Th_Interp *);
28
29	/*
30	** Evaluate an TH program in the stack frame identified by parameter
31	** iFrame, according to the following rules:
	@@ -121,16 +121,31 @@
121
122	/*
123	** Access the memory management functions associated with the specified
124	** interpreter.
125	*/
126	#if defined(TH_MEMDEBUG)
127	void Th_DbgMalloc(Th_Interp , int);
128	void Th_DbgFree(Th_Interp , void );
129	#endif
130
131	void *fossil_malloc_zero(size_t);
132	void fossil_realloc(void , size_t);
133	void fossil_free(void *);
134
135	#define Th_SysMalloc(I,N) fossil_malloc_zero((N))
136	#define Th_SysRealloc(I,P,N) fossil_realloc((P),(N))
137	#define Th_SysFree(I,P) fossil_free((P))
138
139	#if defined(TH_MEMDEBUG)
140	# define Th_Malloc(I,N) Th_DbgMalloc((I),(N))
141	# define Th_Free(I,P) Th_DbgFree((I),(P))
142	#else
143	# define Th_Malloc(I,N) Th_SysMalloc((I),(N))
144	# define Th_Realloc(I,P,N) Th_SysRealloc((I),(P),(N))
145	# define Th_Free(I,P) Th_SysFree((I),(P))
146	#endif
147
148	/*
149	** Functions for handling TH lists.
150	*/
151	int Th_ListAppend(Th_Interp , char , int , const char *, int);
152

M src/th_main.c

+50 -4

		--- src/th_main.c
		+++ src/th_main.c
		@@ -68,10 +68,46 @@
68	68	** configuration ("user") database are currently open.
69	69	*/
70	70	#define Th_IsRepositoryOpen() (g.repositoryOpen)
71	71	#define Th_IsConfigOpen() (g.zConfigDbName!=0)
72	72
	73	+/*
	74	+** When memory debugging is enabled, use our custom memory allocator.
	75	+*/
	76	+#if defined(TH_MEMDEBUG)
	77	+/*
	78	+** Global variable counting the number of outstanding calls to malloc()
	79	+** made by the th1 implementation. This is used to catch memory leaks
	80	+** in the interpreter. Obviously, it also means th1 is not threadsafe.
	81	+*/
	82	+static int nOutstandingMalloc = 0;
	83	+
	84	+/*
	85	+** Implementations of malloc() and free() to pass to the interpreter.
	86	+*/
	87	+static void *xMalloc(unsigned int n){
	88	+ void *p = fossil_malloc(n);
	89	+ if( p ){
	90	+ nOutstandingMalloc++;
	91	+ }
	92	+ return p;
	93	+}
	94	+static void xFree(void *p){
	95	+ if( p ){
	96	+ nOutstandingMalloc--;
	97	+ }
	98	+ free(p);
	99	+}
	100	+static Th_Vtab vtab = { xMalloc, xFree };
	101	+
	102	+/*
	103	+** Returns the number of outstanding TH1 memory allocations.
	104	+*/
	105	+int Th_GetOutstandingMalloc(){
	106	+ return nOutstandingMalloc;
	107	+}
	108	+#endif
73	109
74	110	/*
75	111	** Generate a TH1 trace message if debugging is enabled.
76	112	*/
77	113	void Th_Trace(const char *zFormat, ...){
		@@ -350,11 +386,11 @@
350	386	if(0==pOut && pThOut!=0){
351	387	pOut = pThOut;
352	388	}
353	389	if(TH_INIT_NO_ENCODE & g.th1Flags){
354	390	encode = 0;
355		- }
	391	+ }
356	392	if( enableOutput && n ){
357	393	if( n<0 ) n = strlen(z);
358	394	if( encode ){
359	395	z = htmlize(z, n);
360	396	n = strlen(z);
		@@ -627,10 +663,11 @@
627	663	blob_zero(&title); blob_zero(&body);
628	664	markdown_to_html(&src, &title, &body);
629	665	Th_ListAppend(interp, &zValue, &nValue, blob_str(&title), blob_size(&title));
630	666	Th_ListAppend(interp, &zValue, &nValue, blob_str(&body), blob_size(&body));
631	667	Th_SetResult(interp, zValue, nValue);
	668	+ Th_Free(interp, zValue);
632	669	return TH_OK;
633	670	}
634	671
635	672	/*
636	673	** TH1 command: decorate STRING
		@@ -810,15 +847,15 @@
810	847	}else if( azCap[i][0]=='*' ){
811	848	rc = 1;
812	849	}else{
813	850	rc = login_has_capability(azCap[i], anCap[i], 0);
814	851	}
815		- break;
	852	+ break;
816	853	}
817	854	Th_Free(interp, azCap);
818	855	Th_SetResultInt(interp, rc);
819		- return TH_OK;
	856	+ return TH_OK;
820	857	}
821	858
822	859
823	860	/*
824	861	** TH1 command: searchable STRING...
		@@ -2356,11 +2393,20 @@
2356	2393	}
2357	2394	if( forceReset \|\| forceTcl \|\| g.interp==0 ){
2358	2395	int created = 0;
2359	2396	int i;
2360	2397	if( g.interp==0 ){
2361		- g.interp = Th_CreateInterp();
	2398	+ Th_Vtab *pVtab = 0;
	2399	+#if defined(TH_MEMDEBUG)
	2400	+ if( fossil_getenv("TH1_DELETE_INTERP")!=0 ){
	2401	+ pVtab = &vtab;
	2402	+ if( g.thTrace ){
	2403	+ Th_Trace("th1-init MEMDEBUG ENABLED<br />\n");
	2404	+ }
	2405	+ }
	2406	+#endif
	2407	+ g.interp = Th_CreateInterp(pVtab);
2362	2408	created = 1;
2363	2409	}
2364	2410	if( forceReset \|\| created ){
2365	2411	th_register_language(g.interp); /* Basic scripting commands. */
2366	2412	}
2367	2413

	--- src/th_main.c
	+++ src/th_main.c
	@@ -68,10 +68,46 @@
68	** configuration ("user") database are currently open.
69	*/
70	#define Th_IsRepositoryOpen() (g.repositoryOpen)
71	#define Th_IsConfigOpen() (g.zConfigDbName!=0)
72




































73
74	/*
75	** Generate a TH1 trace message if debugging is enabled.
76	*/
77	void Th_Trace(const char *zFormat, ...){
	@@ -350,11 +386,11 @@
350	if(0==pOut && pThOut!=0){
351	pOut = pThOut;
352	}
353	if(TH_INIT_NO_ENCODE & g.th1Flags){
354	encode = 0;
355	}
356	if( enableOutput && n ){
357	if( n<0 ) n = strlen(z);
358	if( encode ){
359	z = htmlize(z, n);
360	n = strlen(z);
	@@ -627,10 +663,11 @@
627	blob_zero(&title); blob_zero(&body);
628	markdown_to_html(&src, &title, &body);
629	Th_ListAppend(interp, &zValue, &nValue, blob_str(&title), blob_size(&title));
630	Th_ListAppend(interp, &zValue, &nValue, blob_str(&body), blob_size(&body));
631	Th_SetResult(interp, zValue, nValue);

632	return TH_OK;
633	}
634
635	/*
636	** TH1 command: decorate STRING
	@@ -810,15 +847,15 @@
810	}else if( azCap[i][0]=='*' ){
811	rc = 1;
812	}else{
813	rc = login_has_capability(azCap[i], anCap[i], 0);
814	}
815	break;
816	}
817	Th_Free(interp, azCap);
818	Th_SetResultInt(interp, rc);
819	return TH_OK;
820	}
821
822
823	/*
824	** TH1 command: searchable STRING...
	@@ -2356,11 +2393,20 @@
2356	}
2357	if( forceReset \|\| forceTcl \|\| g.interp==0 ){
2358	int created = 0;
2359	int i;
2360	if( g.interp==0 ){
2361	g.interp = Th_CreateInterp();









2362	created = 1;
2363	}
2364	if( forceReset \|\| created ){
2365	th_register_language(g.interp); /* Basic scripting commands. */
2366	}
2367

	--- src/th_main.c
	+++ src/th_main.c
	@@ -68,10 +68,46 @@
68	** configuration ("user") database are currently open.
69	*/
70	#define Th_IsRepositoryOpen() (g.repositoryOpen)
71	#define Th_IsConfigOpen() (g.zConfigDbName!=0)
72
73	/*
74	** When memory debugging is enabled, use our custom memory allocator.
75	*/
76	#if defined(TH_MEMDEBUG)
77	/*
78	** Global variable counting the number of outstanding calls to malloc()
79	** made by the th1 implementation. This is used to catch memory leaks
80	** in the interpreter. Obviously, it also means th1 is not threadsafe.
81	*/
82	static int nOutstandingMalloc = 0;
83
84	/*
85	** Implementations of malloc() and free() to pass to the interpreter.
86	*/
87	static void *xMalloc(unsigned int n){
88	void *p = fossil_malloc(n);
89	if( p ){
90	nOutstandingMalloc++;
91	}
92	return p;
93	}
94	static void xFree(void *p){
95	if( p ){
96	nOutstandingMalloc--;
97	}
98	free(p);
99	}
100	static Th_Vtab vtab = { xMalloc, xFree };
101
102	/*
103	** Returns the number of outstanding TH1 memory allocations.
104	*/
105	int Th_GetOutstandingMalloc(){
106	return nOutstandingMalloc;
107	}
108	#endif
109
110	/*
111	** Generate a TH1 trace message if debugging is enabled.
112	*/
113	void Th_Trace(const char *zFormat, ...){
	@@ -350,11 +386,11 @@
386	if(0==pOut && pThOut!=0){
387	pOut = pThOut;
388	}
389	if(TH_INIT_NO_ENCODE & g.th1Flags){
390	encode = 0;
391	}
392	if( enableOutput && n ){
393	if( n<0 ) n = strlen(z);
394	if( encode ){
395	z = htmlize(z, n);
396	n = strlen(z);
	@@ -627,10 +663,11 @@
663	blob_zero(&title); blob_zero(&body);
664	markdown_to_html(&src, &title, &body);
665	Th_ListAppend(interp, &zValue, &nValue, blob_str(&title), blob_size(&title));
666	Th_ListAppend(interp, &zValue, &nValue, blob_str(&body), blob_size(&body));
667	Th_SetResult(interp, zValue, nValue);
668	Th_Free(interp, zValue);
669	return TH_OK;
670	}
671
672	/*
673	** TH1 command: decorate STRING
	@@ -810,15 +847,15 @@
847	}else if( azCap[i][0]=='*' ){
848	rc = 1;
849	}else{
850	rc = login_has_capability(azCap[i], anCap[i], 0);
851	}
852	break;
853	}
854	Th_Free(interp, azCap);
855	Th_SetResultInt(interp, rc);
856	return TH_OK;
857	}
858
859
860	/*
861	** TH1 command: searchable STRING...
	@@ -2356,11 +2393,20 @@
2393	}
2394	if( forceReset \|\| forceTcl \|\| g.interp==0 ){
2395	int created = 0;
2396	int i;
2397	if( g.interp==0 ){
2398	Th_Vtab *pVtab = 0;
2399	#if defined(TH_MEMDEBUG)
2400	if( fossil_getenv("TH1_DELETE_INTERP")!=0 ){
2401	pVtab = &vtab;
2402	if( g.thTrace ){
2403	Th_Trace("th1-init MEMDEBUG ENABLED<br />\n");
2404	}
2405	}
2406	#endif
2407	g.interp = Th_CreateInterp(pVtab);
2408	created = 1;
2409	}
2410	if( forceReset \|\| created ){
2411	th_register_language(g.interp); /* Basic scripting commands. */
2412	}
2413

M src/user.c

+1 -1

		--- src/user.c
		+++ src/user.c
		@@ -38,11 +38,11 @@
38	38	if( z[i]>0 && z[i]<' ' ) z[i] = ' ';
39	39	}
40	40	blob_append(pBlob, z, -1);
41	41	}
42	42
43		-#if defined(_WIN32) \|\| defined(__BIONIC__) && !defined(FOSSIL_HAVE_GETPASS)
	43	+#if defined(_WIN32) \|\| (defined(__BIONIC__) && !defined(FOSSIL_HAVE_GETPASS))
44	44	#ifdef _WIN32
45	45	#include <conio.h>
46	46	#endif
47	47
48	48	/*
49	49

	--- src/user.c
	+++ src/user.c
	@@ -38,11 +38,11 @@
38	if( z[i]>0 && z[i]<' ' ) z[i] = ' ';
39	}
40	blob_append(pBlob, z, -1);
41	}
42
43	#if defined(_WIN32) \|\| defined(__BIONIC__) && !defined(FOSSIL_HAVE_GETPASS)
44	#ifdef _WIN32
45	#include <conio.h>
46	#endif
47
48	/*
49

	--- src/user.c
	+++ src/user.c
	@@ -38,11 +38,11 @@
38	if( z[i]>0 && z[i]<' ' ) z[i] = ' ';
39	}
40	blob_append(pBlob, z, -1);
41	}
42
43	#if defined(_WIN32) \|\| (defined(__BIONIC__) && !defined(FOSSIL_HAVE_GETPASS))
44	#ifdef _WIN32
45	#include <conio.h>
46	#endif
47
48	/*
49

M win/Makefile.msc

+15 -3

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -14,11 +14,11 @@
14	14	OBJDIR = $(T)
15	15	OX = $(OBJDIR)
16	16	O = .obj
17	17	E = .exe
18	18	P = .pdb
19		-OPTLEVEL= /Os
	19	+DBGOPTS = /Od
20	20
21	21	INSTALLDIR = .
22	22	!ifdef DESTDIR
23	23	INSTALLDIR = $(DESTDIR)\$(INSTALLDIR)
24	24	!endif
		@@ -209,16 +209,28 @@
209	209	CRTFLAGS = /MTd
210	210	!else
211	211	CRTFLAGS = /MT
212	212	!endif
213	213	!endif
	214	+
	215	+!if $(OPTIMIZATIONS)>3
	216	+RELOPTS = /Os
	217	+!elseif $(OPTIMIZATIONS)>2
	218	+RELOPTS = /Ox
	219	+!elseif $(OPTIMIZATIONS)>1
	220	+RELOPTS = /O2
	221	+!elseif $(OPTIMIZATIONS)>0
	222	+RELOPTS = /O1
	223	+!else
	224	+RELOPTS =
	225	+!endif
214	226
215	227	!if $(DEBUG)!=0
216		-CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
	228	+CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) $(DBGOPTS) /DFOSSIL_DEBUG /DTH_MEMDEBUG
217	229	LDFLAGS = $(LDFLAGS) /DEBUG
218	230	!else
219		-CFLAGS = $(CFLAGS) $(CRTFLAGS) $(OPTLEVEL)
	231	+CFLAGS = $(CFLAGS) $(CRTFLAGS) $(RELOPTS)
220	232	!endif
221	233
222	234	BCC = $(CC) $(CFLAGS)
223	235	TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL)
224	236	RCC = $(RC) /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL)
225	237

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -14,11 +14,11 @@
14	OBJDIR = $(T)
15	OX = $(OBJDIR)
16	O = .obj
17	E = .exe
18	P = .pdb
19	OPTLEVEL= /Os
20
21	INSTALLDIR = .
22	!ifdef DESTDIR
23	INSTALLDIR = $(DESTDIR)\$(INSTALLDIR)
24	!endif
	@@ -209,16 +209,28 @@
209	CRTFLAGS = /MTd
210	!else
211	CRTFLAGS = /MT
212	!endif
213	!endif












214
215	!if $(DEBUG)!=0
216	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) /Od /DFOSSIL_DEBUG
217	LDFLAGS = $(LDFLAGS) /DEBUG
218	!else
219	CFLAGS = $(CFLAGS) $(CRTFLAGS) $(OPTLEVEL)
220	!endif
221
222	BCC = $(CC) $(CFLAGS)
223	TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL)
224	RCC = $(RC) /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL)
225

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -14,11 +14,11 @@
14	OBJDIR = $(T)
15	OX = $(OBJDIR)
16	O = .obj
17	E = .exe
18	P = .pdb
19	DBGOPTS = /Od
20
21	INSTALLDIR = .
22	!ifdef DESTDIR
23	INSTALLDIR = $(DESTDIR)\$(INSTALLDIR)
24	!endif
	@@ -209,16 +209,28 @@
209	CRTFLAGS = /MTd
210	!else
211	CRTFLAGS = /MT
212	!endif
213	!endif
214
215	!if $(OPTIMIZATIONS)>3
216	RELOPTS = /Os
217	!elseif $(OPTIMIZATIONS)>2
218	RELOPTS = /Ox
219	!elseif $(OPTIMIZATIONS)>1
220	RELOPTS = /O2
221	!elseif $(OPTIMIZATIONS)>0
222	RELOPTS = /O1
223	!else
224	RELOPTS =
225	!endif
226
227	!if $(DEBUG)!=0
228	CFLAGS = $(CFLAGS) /Zi $(CRTFLAGS) $(DBGOPTS) /DFOSSIL_DEBUG /DTH_MEMDEBUG
229	LDFLAGS = $(LDFLAGS) /DEBUG
230	!else
231	CFLAGS = $(CFLAGS) $(CRTFLAGS) $(RELOPTS)
232	!endif
233
234	BCC = $(CC) $(CFLAGS)
235	TCC = $(CC) /c $(CFLAGS) $(MSCDEF) $(INCL)
236	RCC = $(RC) /D_WIN32 /D_MSC_VER $(MSCDEF) $(INCL)
237

Fossil SCM

Keyboard Shortcuts