Fossil SCM

Pass the command flags into the TH1 hooks verbatim, without any masking.

mistachkin 2016-09-13 22:13 trunk

Commit 9595cfcd456c953d2a45956a607f7587d9c63e3a

Parent b218dbb9f3ae268…

2 files changed -4 +4 -4

M src/dispatch.c

-4

		--- src/dispatch.c
		+++ src/dispatch.c
		@@ -46,14 +46,10 @@
46	46	#define CMDFLAG_TEST 0x0004 /* Commands for testing only */
47	47	#define CMDFLAG_WEBPAGE 0x0008 /* Web pages */
48	48	#define CMDFLAG_COMMAND 0x0010 /* A command */
49	49	/**************************************************************************/
50	50
51		-/* Only the bits above that are part of CMDFLAG_TH_MASK are passed into
52		-** the TH1 hook procedures. */
53		-#define CMDFLAG_TH_MASK 0x000f /* Legacy flags only */
54		-
55	51	/* Values for the 2nd parameter to dispatch_name_search() */
56	52	#define CMDFLAG_ANY 0x0018 /* Match anything */
57	53	#define CMDFLAG_PREFIX 0x0020 /* Prefix match is ok */
58	54
59	55	#endif /* INTERFACE */
60	56

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -46,14 +46,10 @@
46	#define CMDFLAG_TEST 0x0004 /* Commands for testing only */
47	#define CMDFLAG_WEBPAGE 0x0008 /* Web pages */
48	#define CMDFLAG_COMMAND 0x0010 /* A command */
49	/**************************************************************************/
50
51	/* Only the bits above that are part of CMDFLAG_TH_MASK are passed into
52	** the TH1 hook procedures. */
53	#define CMDFLAG_TH_MASK 0x000f /* Legacy flags only */
54
55	/* Values for the 2nd parameter to dispatch_name_search() */
56	#define CMDFLAG_ANY 0x0018 /* Match anything */
57	#define CMDFLAG_PREFIX 0x0020 /* Prefix match is ok */
58
59	#endif /* INTERFACE */
60

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -46,14 +46,10 @@
46	#define CMDFLAG_TEST 0x0004 /* Commands for testing only */
47	#define CMDFLAG_WEBPAGE 0x0008 /* Web pages */
48	#define CMDFLAG_COMMAND 0x0010 /* A command */
49	/**************************************************************************/
50




51	/* Values for the 2nd parameter to dispatch_name_search() */
52	#define CMDFLAG_ANY 0x0018 /* Match anything */
53	#define CMDFLAG_PREFIX 0x0020 /* Prefix match is ok */
54
55	#endif /* INTERFACE */
56

M src/main.c

+4 -4

		--- src/main.c
		+++ src/main.c
		@@ -731,11 +731,11 @@
731	731	**
732	732	** TH_CONTINUE: The xFunc() will be skipped, the TH1 notification will be
733	733	** executed.
734	734	*/
735	735	if( !g.isHTTP && !g.fNoThHook ){
736		- rc = Th_CommandHook(pCmd->zName, pCmd->eCmdFlags & CMDFLAG_TH_MASK);
	736	+ rc = Th_CommandHook(pCmd->zName, pCmd->eCmdFlags);
737	737	}else{
738	738	rc = TH_OK;
739	739	}
740	740	if( rc==TH_OK \|\| rc==TH_RETURN \|\| rc==TH_CONTINUE ){
741	741	if( rc==TH_OK \|\| rc==TH_RETURN ){
		@@ -742,11 +742,11 @@
742	742	#endif
743	743	pCmd->xFunc();
744	744	#ifdef FOSSIL_ENABLE_TH1_HOOKS
745	745	}
746	746	if( !g.isHTTP && !g.fNoThHook && (rc==TH_OK \|\| rc==TH_CONTINUE) ){
747		- Th_CommandNotify(pCmd->zName, pCmd->eCmdFlags & CMDFLAG_TH_MASK);
	747	+ Th_CommandNotify(pCmd->zName, pCmd->eCmdFlags);
748	748	}
749	749	}
750	750	#endif
751	751	fossil_exit(0);
752	752	/NOT_REACHED/
		@@ -1546,11 +1546,11 @@
1546	1546	** TH_CONTINUE: The xFunc() will be skipped, the TH1 notification will be
1547	1547	** executed.
1548	1548	*/
1549	1549	int rc;
1550	1550	if( !g.fNoThHook ){
1551		- rc = Th_WebpageHook(pCmd->zName+1, pCmd->eCmdFlags & CMDFLAG_TH_MASK);
	1551	+ rc = Th_WebpageHook(pCmd->zName+1, pCmd->eCmdFlags);
1552	1552	}else{
1553	1553	rc = TH_OK;
1554	1554	}
1555	1555	if( rc==TH_OK \|\| rc==TH_RETURN \|\| rc==TH_CONTINUE ){
1556	1556	if( rc==TH_OK \|\| rc==TH_RETURN ){
		@@ -1557,11 +1557,11 @@
1557	1557	#endif
1558	1558	pCmd->xFunc();
1559	1559	#ifdef FOSSIL_ENABLE_TH1_HOOKS
1560	1560	}
1561	1561	if( !g.fNoThHook && (rc==TH_OK \|\| rc==TH_CONTINUE) ){
1562		- Th_WebpageNotify(pCmd->zName+1, pCmd->eCmdFlags & CMDFLAG_TH_MASK);
	1562	+ Th_WebpageNotify(pCmd->zName+1, pCmd->eCmdFlags);
1563	1563	}
1564	1564	}
1565	1565	#endif
1566	1566	}
1567	1567
1568	1568

	--- src/main.c
	+++ src/main.c
	@@ -731,11 +731,11 @@
731	**
732	** TH_CONTINUE: The xFunc() will be skipped, the TH1 notification will be
733	** executed.
734	*/
735	if( !g.isHTTP && !g.fNoThHook ){
736	rc = Th_CommandHook(pCmd->zName, pCmd->eCmdFlags & CMDFLAG_TH_MASK);
737	}else{
738	rc = TH_OK;
739	}
740	if( rc==TH_OK \|\| rc==TH_RETURN \|\| rc==TH_CONTINUE ){
741	if( rc==TH_OK \|\| rc==TH_RETURN ){
	@@ -742,11 +742,11 @@
742	#endif
743	pCmd->xFunc();
744	#ifdef FOSSIL_ENABLE_TH1_HOOKS
745	}
746	if( !g.isHTTP && !g.fNoThHook && (rc==TH_OK \|\| rc==TH_CONTINUE) ){
747	Th_CommandNotify(pCmd->zName, pCmd->eCmdFlags & CMDFLAG_TH_MASK);
748	}
749	}
750	#endif
751	fossil_exit(0);
752	/NOT_REACHED/
	@@ -1546,11 +1546,11 @@
1546	** TH_CONTINUE: The xFunc() will be skipped, the TH1 notification will be
1547	** executed.
1548	*/
1549	int rc;
1550	if( !g.fNoThHook ){
1551	rc = Th_WebpageHook(pCmd->zName+1, pCmd->eCmdFlags & CMDFLAG_TH_MASK);
1552	}else{
1553	rc = TH_OK;
1554	}
1555	if( rc==TH_OK \|\| rc==TH_RETURN \|\| rc==TH_CONTINUE ){
1556	if( rc==TH_OK \|\| rc==TH_RETURN ){
	@@ -1557,11 +1557,11 @@
1557	#endif
1558	pCmd->xFunc();
1559	#ifdef FOSSIL_ENABLE_TH1_HOOKS
1560	}
1561	if( !g.fNoThHook && (rc==TH_OK \|\| rc==TH_CONTINUE) ){
1562	Th_WebpageNotify(pCmd->zName+1, pCmd->eCmdFlags & CMDFLAG_TH_MASK);
1563	}
1564	}
1565	#endif
1566	}
1567
1568

	--- src/main.c
	+++ src/main.c
	@@ -731,11 +731,11 @@
731	**
732	** TH_CONTINUE: The xFunc() will be skipped, the TH1 notification will be
733	** executed.
734	*/
735	if( !g.isHTTP && !g.fNoThHook ){
736	rc = Th_CommandHook(pCmd->zName, pCmd->eCmdFlags);
737	}else{
738	rc = TH_OK;
739	}
740	if( rc==TH_OK \|\| rc==TH_RETURN \|\| rc==TH_CONTINUE ){
741	if( rc==TH_OK \|\| rc==TH_RETURN ){
	@@ -742,11 +742,11 @@
742	#endif
743	pCmd->xFunc();
744	#ifdef FOSSIL_ENABLE_TH1_HOOKS
745	}
746	if( !g.isHTTP && !g.fNoThHook && (rc==TH_OK \|\| rc==TH_CONTINUE) ){
747	Th_CommandNotify(pCmd->zName, pCmd->eCmdFlags);
748	}
749	}
750	#endif
751	fossil_exit(0);
752	/NOT_REACHED/
	@@ -1546,11 +1546,11 @@
1546	** TH_CONTINUE: The xFunc() will be skipped, the TH1 notification will be
1547	** executed.
1548	*/
1549	int rc;
1550	if( !g.fNoThHook ){
1551	rc = Th_WebpageHook(pCmd->zName+1, pCmd->eCmdFlags);
1552	}else{
1553	rc = TH_OK;
1554	}
1555	if( rc==TH_OK \|\| rc==TH_RETURN \|\| rc==TH_CONTINUE ){
1556	if( rc==TH_OK \|\| rc==TH_RETURN ){
	@@ -1557,11 +1557,11 @@
1557	#endif
1558	pCmd->xFunc();
1559	#ifdef FOSSIL_ENABLE_TH1_HOOKS
1560	}
1561	if( !g.fNoThHook && (rc==TH_OK \|\| rc==TH_CONTINUE) ){
1562	Th_WebpageNotify(pCmd->zName+1, pCmd->eCmdFlags);
1563	}
1564	}
1565	#endif
1566	}
1567
1568

Fossil SCM

Keyboard Shortcuts