e2bdc10572c… — Fossil SCM

M src/add.c

+2 -2

		--- src/add.c
		+++ src/add.c
		@@ -353,11 +353,11 @@
353	353	** for files to be excluded. Example: '.o,.obj,*.exe' If the --ignore
354	354	** option does not appear on the command line then the "ignore-glob" setting
355	355	** is used. If the --clean option does not appear on the command line then
356	356	** the "clean-glob" setting is used.
357	357	**
358		-** When attempting to explicitly add files on the commandline, and if those
	358	+** When attempting to explicitly add files on the command line, and if those
359	359	** match "ignore-glob", a confirmation is asked first. This can be prevented
360	360	** using the -f\|--force option.
361	361	**
362	362	** The --case-sensitive option determines whether or not filenames should
363	363	** be treated case sensitive or not. If the option is not given, the default
		@@ -476,11 +476,11 @@
476	476	}
477	477	glob_free(pIgnore);
478	478	glob_free(pClean);
479	479
480	480	/** Check for Windows-reserved names and warn or exit, as
481		- ** appopriate. Note that the 'add' internal machinery already
	481	+ ** appropriate. Note that the 'add' internal machinery already
482	482	** _silently_ skips over any names for which
483	483	** file_is_reserved_name() returns true or which is in the
484	484	** fossil_reserved_name() list. We do not need to warn for those,
485	485	** as they're outright verboten. */
486	486	if(db_exists("SELECT 1 FROM sfile WHERE win_reserved(pathname)")){
487	487

	--- src/add.c
	+++ src/add.c
	@@ -353,11 +353,11 @@
353	** for files to be excluded. Example: '.o,.obj,*.exe' If the --ignore
354	** option does not appear on the command line then the "ignore-glob" setting
355	** is used. If the --clean option does not appear on the command line then
356	** the "clean-glob" setting is used.
357	**
358	** When attempting to explicitly add files on the commandline, and if those
359	** match "ignore-glob", a confirmation is asked first. This can be prevented
360	** using the -f\|--force option.
361	**
362	** The --case-sensitive option determines whether or not filenames should
363	** be treated case sensitive or not. If the option is not given, the default
	@@ -476,11 +476,11 @@
476	}
477	glob_free(pIgnore);
478	glob_free(pClean);
479
480	/** Check for Windows-reserved names and warn or exit, as
481	** appopriate. Note that the 'add' internal machinery already
482	** _silently_ skips over any names for which
483	** file_is_reserved_name() returns true or which is in the
484	** fossil_reserved_name() list. We do not need to warn for those,
485	** as they're outright verboten. */
486	if(db_exists("SELECT 1 FROM sfile WHERE win_reserved(pathname)")){
487

	--- src/add.c
	+++ src/add.c
	@@ -353,11 +353,11 @@
353	** for files to be excluded. Example: '.o,.obj,*.exe' If the --ignore
354	** option does not appear on the command line then the "ignore-glob" setting
355	** is used. If the --clean option does not appear on the command line then
356	** the "clean-glob" setting is used.
357	**
358	** When attempting to explicitly add files on the command line, and if those
359	** match "ignore-glob", a confirmation is asked first. This can be prevented
360	** using the -f\|--force option.
361	**
362	** The --case-sensitive option determines whether or not filenames should
363	** be treated case sensitive or not. If the option is not given, the default
	@@ -476,11 +476,11 @@
476	}
477	glob_free(pIgnore);
478	glob_free(pClean);
479
480	/** Check for Windows-reserved names and warn or exit, as
481	** appropriate. Note that the 'add' internal machinery already
482	** _silently_ skips over any names for which
483	** file_is_reserved_name() returns true or which is in the
484	** fossil_reserved_name() list. We do not need to warn for those,
485	** as they're outright verboten. */
486	if(db_exists("SELECT 1 FROM sfile WHERE win_reserved(pathname)")){
487

M src/ajax.c

+1 -1

		--- src/ajax.c
		+++ src/ajax.c
		@@ -395,11 +395,11 @@
395	395	const AjaxRoute routes[] = {
396	396	/* Keep these sorted by zName (for bsearch()) */
397	397	{"preview-text", ajax_route_preview_text, 0, 1
398	398	/* Note that this does not require write permissions in the repo.
399	399	** It should arguably require write permissions but doing means
400		- ** that /chat does not work without checkin permissions:
	400	+ ** that /chat does not work without check-in permissions:
401	401	**
402	402	** https://fossil-scm.org/forum/forumpost/ed4a762b3a557898
403	403	**
404	404	** This particular route is used by /fileedit and /chat, whereas
405	405	** /wikiedit uses a simpler wiki-specific route.
406	406

	--- src/ajax.c
	+++ src/ajax.c
	@@ -395,11 +395,11 @@
395	const AjaxRoute routes[] = {
396	/* Keep these sorted by zName (for bsearch()) */
397	{"preview-text", ajax_route_preview_text, 0, 1
398	/* Note that this does not require write permissions in the repo.
399	** It should arguably require write permissions but doing means
400	** that /chat does not work without checkin permissions:
401	**
402	** https://fossil-scm.org/forum/forumpost/ed4a762b3a557898
403	**
404	** This particular route is used by /fileedit and /chat, whereas
405	** /wikiedit uses a simpler wiki-specific route.
406

	--- src/ajax.c
	+++ src/ajax.c
	@@ -395,11 +395,11 @@
395	const AjaxRoute routes[] = {
396	/* Keep these sorted by zName (for bsearch()) */
397	{"preview-text", ajax_route_preview_text, 0, 1
398	/* Note that this does not require write permissions in the repo.
399	** It should arguably require write permissions but doing means
400	** that /chat does not work without check-in permissions:
401	**
402	** https://fossil-scm.org/forum/forumpost/ed4a762b3a557898
403	**
404	** This particular route is used by /fileedit and /chat, whereas
405	** /wikiedit uses a simpler wiki-specific route.
406

M src/alerts.c

+5 -5

		--- src/alerts.c
		+++ src/alerts.c
		@@ -664,11 +664,11 @@
664	664	return p;
665	665	}
666	666
667	667	/*
668	668	** Scan the header of the email message in pMsg looking for the
669		-** (first) occurrance of zField. Fill pValue with the content of
	669	+** (first) occurrence of zField. Fill pValue with the content of
670	670	** that field.
671	671	**
672	672	** This routine initializes pValue. Any prior content of pValue is
673	673	** discarded (leaked).
674	674	**
		@@ -710,11 +710,11 @@
710	710	/*
711	711	** Determine whether or not the input string is a valid email address.
712	712	** Only look at character up to but not including the first \000 or
713	713	** the first cTerm character, whichever comes first.
714	714	**
715		-** Return the length of the email addresss string in bytes if the email
	715	+** Return the length of the email address string in bytes if the email
716	716	** address is valid. If the email address is misformed, return 0.
717	717	*/
718	718	int email_address_is_valid(const char *z, char cTerm){
719	719	int i;
720	720	int nAt = 0;
		@@ -2955,12 +2955,12 @@
2955	2955	Blob pBody, / Write email body here */
2956	2956	const char zCode, / The subscriber code */
2957	2957	int lastContact, /* Last contact (days since 1970) */
2958	2958	const char zEAddr, / Subscriber email address. Send to this. */
2959	2959	const char zSub, / Subscription codes */
2960		- const char zRepoName, / Name of the sending Fossil repostory */
2961		- const char zUrl / URL for the sending Fossil repostory */
	2960	+ const char zRepoName, / Name of the sending Fossil repository */
	2961	+ const char zUrl / URL for the sending Fossil repository */
2962	2962	){
2963	2963	blob_appendf(pHdr,"To: <%s>\r\n", zEAddr);
2964	2964	blob_appendf(pHdr,"Subject: %s Subscription to %s expires soon\r\n",
2965	2965	zRepoName, zUrl);
2966	2966	blob_appendf(pBody,
		@@ -3466,11 +3466,11 @@
3466	3466	@ </form>
3467	3467	style_finish_page();
3468	3468	}
3469	3469
3470	3470	/*
3471		-** Send an annoucement message described by query parameter.
	3471	+** Send an announcement message described by query parameter.
3472	3472	** Permission to do this has already been verified.
3473	3473	*/
3474	3474	static char *alert_send_announcement(void){
3475	3475	AlertSender *pSender;
3476	3476	char *zErr;
3477	3477

	--- src/alerts.c
	+++ src/alerts.c
	@@ -664,11 +664,11 @@
664	return p;
665	}
666
667	/*
668	** Scan the header of the email message in pMsg looking for the
669	** (first) occurrance of zField. Fill pValue with the content of
670	** that field.
671	**
672	** This routine initializes pValue. Any prior content of pValue is
673	** discarded (leaked).
674	**
	@@ -710,11 +710,11 @@
710	/*
711	** Determine whether or not the input string is a valid email address.
712	** Only look at character up to but not including the first \000 or
713	** the first cTerm character, whichever comes first.
714	**
715	** Return the length of the email addresss string in bytes if the email
716	** address is valid. If the email address is misformed, return 0.
717	*/
718	int email_address_is_valid(const char *z, char cTerm){
719	int i;
720	int nAt = 0;
	@@ -2955,12 +2955,12 @@
2955	Blob pBody, / Write email body here */
2956	const char zCode, / The subscriber code */
2957	int lastContact, /* Last contact (days since 1970) */
2958	const char zEAddr, / Subscriber email address. Send to this. */
2959	const char zSub, / Subscription codes */
2960	const char zRepoName, / Name of the sending Fossil repostory */
2961	const char zUrl / URL for the sending Fossil repostory */
2962	){
2963	blob_appendf(pHdr,"To: <%s>\r\n", zEAddr);
2964	blob_appendf(pHdr,"Subject: %s Subscription to %s expires soon\r\n",
2965	zRepoName, zUrl);
2966	blob_appendf(pBody,
	@@ -3466,11 +3466,11 @@
3466	@ </form>
3467	style_finish_page();
3468	}
3469
3470	/*
3471	** Send an annoucement message described by query parameter.
3472	** Permission to do this has already been verified.
3473	*/
3474	static char *alert_send_announcement(void){
3475	AlertSender *pSender;
3476	char *zErr;
3477

	--- src/alerts.c
	+++ src/alerts.c
	@@ -664,11 +664,11 @@
664	return p;
665	}
666
667	/*
668	** Scan the header of the email message in pMsg looking for the
669	** (first) occurrence of zField. Fill pValue with the content of
670	** that field.
671	**
672	** This routine initializes pValue. Any prior content of pValue is
673	** discarded (leaked).
674	**
	@@ -710,11 +710,11 @@
710	/*
711	** Determine whether or not the input string is a valid email address.
712	** Only look at character up to but not including the first \000 or
713	** the first cTerm character, whichever comes first.
714	**
715	** Return the length of the email address string in bytes if the email
716	** address is valid. If the email address is misformed, return 0.
717	*/
718	int email_address_is_valid(const char *z, char cTerm){
719	int i;
720	int nAt = 0;
	@@ -2955,12 +2955,12 @@
2955	Blob pBody, / Write email body here */
2956	const char zCode, / The subscriber code */
2957	int lastContact, /* Last contact (days since 1970) */
2958	const char zEAddr, / Subscriber email address. Send to this. */
2959	const char zSub, / Subscription codes */
2960	const char zRepoName, / Name of the sending Fossil repository */
2961	const char zUrl / URL for the sending Fossil repository */
2962	){
2963	blob_appendf(pHdr,"To: <%s>\r\n", zEAddr);
2964	blob_appendf(pHdr,"Subject: %s Subscription to %s expires soon\r\n",
2965	zRepoName, zUrl);
2966	blob_appendf(pBody,
	@@ -3466,11 +3466,11 @@
3466	@ </form>
3467	style_finish_page();
3468	}
3469
3470	/*
3471	** Send an announcement message described by query parameter.
3472	** Permission to do this has already been verified.
3473	*/
3474	static char *alert_send_announcement(void){
3475	AlertSender *pSender;
3476	char *zErr;
3477

M src/backlink.c

+1 -1

		--- src/backlink.c
		+++ src/backlink.c
		@@ -338,11 +338,11 @@
338	338	blob_reset(&in);
339	339	}
340	340
341	341	/*
342	342	** Transform mimetype string into an integer code.
343		-** NOTE: In the sake of compatability empty string is parsed as MT_UNKNOWN;
	343	+** NOTE: In the sake of compatibility empty string is parsed as MT_UNKNOWN;
344	344	** it is yet unclear whether it can safely be changed to MT_NONE.
345	345	*/
346	346	int parse_mimetype(const char* zMimetype){
347	347	if( zMimetype==0 ) return MT_NONE;
348	348	if( strstr(zMimetype,"wiki")!=0 ) return MT_WIKI;
349	349

	--- src/backlink.c
	+++ src/backlink.c
	@@ -338,11 +338,11 @@
338	blob_reset(&in);
339	}
340
341	/*
342	** Transform mimetype string into an integer code.
343	** NOTE: In the sake of compatability empty string is parsed as MT_UNKNOWN;
344	** it is yet unclear whether it can safely be changed to MT_NONE.
345	*/
346	int parse_mimetype(const char* zMimetype){
347	if( zMimetype==0 ) return MT_NONE;
348	if( strstr(zMimetype,"wiki")!=0 ) return MT_WIKI;
349

	--- src/backlink.c
	+++ src/backlink.c
	@@ -338,11 +338,11 @@
338	blob_reset(&in);
339	}
340
341	/*
342	** Transform mimetype string into an integer code.
343	** NOTE: In the sake of compatibility empty string is parsed as MT_UNKNOWN;
344	** it is yet unclear whether it can safely be changed to MT_NONE.
345	*/
346	int parse_mimetype(const char* zMimetype){
347	if( zMimetype==0 ) return MT_NONE;
348	if( strstr(zMimetype,"wiki")!=0 ) return MT_WIKI;
349

M src/blob.c

+5 -5

		--- src/blob.c
		+++ src/blob.c
		@@ -782,11 +782,11 @@
782	782	** end-of-file.
783	783	**
784	784	** The cursor of pFrom is left pointing at the first byte past the
785	785	** \n that terminated the line.
786	786	**
787		-** pTo will be an ephermeral blob. If pFrom changes, it might alter
	787	+** pTo will be an ephemeral blob. If pFrom changes, it might alter
788	788	** pTo as well.
789	789	*/
790	790	int blob_line(Blob pFrom, Blob pTo){
791	791	char *aData = pFrom->aData;
792	792	int n = pFrom->nUsed;
		@@ -825,11 +825,11 @@
825	825	** whitespace is ignored.
826	826	**
827	827	** The cursor of pFrom is left pointing at the first character past
828	828	** the end of the token.
829	829	**
830		-** pTo will be an ephermeral blob. If pFrom changes, it might alter
	830	+** pTo will be an ephemeral blob. If pFrom changes, it might alter
831	831	** pTo as well.
832	832	*/
833	833	int blob_token(Blob pFrom, Blob pTo){
834	834	char *aData = pFrom->aData;
835	835	int n = pFrom->nUsed;
		@@ -853,11 +853,11 @@
853	853	** (ignoring double '') or by the end of the string
854	854	**
855	855	** The cursor of pFrom is left pointing at the first character past
856	856	** the end of the token.
857	857	**
858		-** pTo will be an ephermeral blob. If pFrom changes, it might alter
	858	+** pTo will be an ephemeral blob. If pFrom changes, it might alter
859	859	** pTo as well.
860	860	*/
861	861	int blob_sqltoken(Blob pFrom, Blob pTo){
862	862	char *aData = pFrom->aData;
863	863	int n = pFrom->nUsed;
		@@ -881,11 +881,11 @@
881	881	return pTo->nUsed;
882	882	}
883	883
884	884	/*
885	885	** Extract everything from the current cursor to the end of the blob
886		-** into a new blob. The new blob is an ephemerial reference to the
	886	+** into a new blob. The new blob is an ephemeral reference to the
887	887	** original blob. The cursor of the original blob is unchanged.
888	888	*/
889	889	int blob_tail(Blob pFrom, Blob pTo){
890	890	int iCursor = pFrom->iCursor;
891	891	blob_extract(pFrom, pFrom->nUsed-pFrom->iCursor, pTo);
		@@ -976,11 +976,11 @@
976	976	** Options:
977	977	** -y\|--side-by-side Show diff of INPUTFILE and output side-by-side
978	978	** -W\|--width N Width of lines in side-by-side diff
979	979	*/
980	980	void test_strip_comment_lines_cmd(void){
981		- Blob f, h; /* unitialized */
	981	+ Blob f, h; /* uninitialized */
982	982	Blob out;
983	983	DiffConfig dCfg;
984	984	int sbs = 0;
985	985	const char *z;
986	986	int w = 0;
987	987

	--- src/blob.c
	+++ src/blob.c
	@@ -782,11 +782,11 @@
782	** end-of-file.
783	**
784	** The cursor of pFrom is left pointing at the first byte past the
785	** \n that terminated the line.
786	**
787	** pTo will be an ephermeral blob. If pFrom changes, it might alter
788	** pTo as well.
789	*/
790	int blob_line(Blob pFrom, Blob pTo){
791	char *aData = pFrom->aData;
792	int n = pFrom->nUsed;
	@@ -825,11 +825,11 @@
825	** whitespace is ignored.
826	**
827	** The cursor of pFrom is left pointing at the first character past
828	** the end of the token.
829	**
830	** pTo will be an ephermeral blob. If pFrom changes, it might alter
831	** pTo as well.
832	*/
833	int blob_token(Blob pFrom, Blob pTo){
834	char *aData = pFrom->aData;
835	int n = pFrom->nUsed;
	@@ -853,11 +853,11 @@
853	** (ignoring double '') or by the end of the string
854	**
855	** The cursor of pFrom is left pointing at the first character past
856	** the end of the token.
857	**
858	** pTo will be an ephermeral blob. If pFrom changes, it might alter
859	** pTo as well.
860	*/
861	int blob_sqltoken(Blob pFrom, Blob pTo){
862	char *aData = pFrom->aData;
863	int n = pFrom->nUsed;
	@@ -881,11 +881,11 @@
881	return pTo->nUsed;
882	}
883
884	/*
885	** Extract everything from the current cursor to the end of the blob
886	** into a new blob. The new blob is an ephemerial reference to the
887	** original blob. The cursor of the original blob is unchanged.
888	*/
889	int blob_tail(Blob pFrom, Blob pTo){
890	int iCursor = pFrom->iCursor;
891	blob_extract(pFrom, pFrom->nUsed-pFrom->iCursor, pTo);
	@@ -976,11 +976,11 @@
976	** Options:
977	** -y\|--side-by-side Show diff of INPUTFILE and output side-by-side
978	** -W\|--width N Width of lines in side-by-side diff
979	*/
980	void test_strip_comment_lines_cmd(void){
981	Blob f, h; /* unitialized */
982	Blob out;
983	DiffConfig dCfg;
984	int sbs = 0;
985	const char *z;
986	int w = 0;
987

	--- src/blob.c
	+++ src/blob.c
	@@ -782,11 +782,11 @@
782	** end-of-file.
783	**
784	** The cursor of pFrom is left pointing at the first byte past the
785	** \n that terminated the line.
786	**
787	** pTo will be an ephemeral blob. If pFrom changes, it might alter
788	** pTo as well.
789	*/
790	int blob_line(Blob pFrom, Blob pTo){
791	char *aData = pFrom->aData;
792	int n = pFrom->nUsed;
	@@ -825,11 +825,11 @@
825	** whitespace is ignored.
826	**
827	** The cursor of pFrom is left pointing at the first character past
828	** the end of the token.
829	**
830	** pTo will be an ephemeral blob. If pFrom changes, it might alter
831	** pTo as well.
832	*/
833	int blob_token(Blob pFrom, Blob pTo){
834	char *aData = pFrom->aData;
835	int n = pFrom->nUsed;
	@@ -853,11 +853,11 @@
853	** (ignoring double '') or by the end of the string
854	**
855	** The cursor of pFrom is left pointing at the first character past
856	** the end of the token.
857	**
858	** pTo will be an ephemeral blob. If pFrom changes, it might alter
859	** pTo as well.
860	*/
861	int blob_sqltoken(Blob pFrom, Blob pTo){
862	char *aData = pFrom->aData;
863	int n = pFrom->nUsed;
	@@ -881,11 +881,11 @@
881	return pTo->nUsed;
882	}
883
884	/*
885	** Extract everything from the current cursor to the end of the blob
886	** into a new blob. The new blob is an ephemeral reference to the
887	** original blob. The cursor of the original blob is unchanged.
888	*/
889	int blob_tail(Blob pFrom, Blob pTo){
890	int iCursor = pFrom->iCursor;
891	blob_extract(pFrom, pFrom->nUsed-pFrom->iCursor, pTo);
	@@ -976,11 +976,11 @@
976	** Options:
977	** -y\|--side-by-side Show diff of INPUTFILE and output side-by-side
978	** -W\|--width N Width of lines in side-by-side diff
979	*/
980	void test_strip_comment_lines_cmd(void){
981	Blob f, h; /* uninitialized */
982	Blob out;
983	DiffConfig dCfg;
984	int sbs = 0;
985	const char *z;
986	int w = 0;
987

M src/branch.c

+7 -7

		--- src/branch.c
		+++ src/branch.c
		@@ -232,11 +232,11 @@
232	232	**
233	233	** name Name of the branch
234	234	** mtime Time of last check-in on this branch
235	235	** isclosed True if the branch is closed
236	236	** mergeto Another branch this branch was merged into
237		-** nckin Number of checkins on this branch
	237	+** nckin Number of check-ins on this branch
238	238	** ckin Hash of the last check-in on this branch
239	239	** isprivate True if the branch is private
240	240	** bgclr Background color for this branch
241	241	*/
242	242	static const char createBrlistQuery[] =
		@@ -558,11 +558,11 @@
558	558	}
559	559
560	560	/*
561	561	** Implementation of (branch close\|reopen) subcommands. nStartAtArg is
562	562	** the g.argv index to start reading branch/check-in names. The given
563		-** checkins are closed if fClose is true, else their "closed" tag (if
	563	+** check-ins are closed if fClose is true, else their "closed" tag (if
564	564	** any) is cancelled. Fails fatally on error.
565	565	*/
566	566	static void branch_cmd_close(int nStartAtArg, int fClose){
567	567	int argPos = nStartAtArg; /* g.argv pos with first branch name */
568	568	char * zUuid = 0; /* Resolved branch UUID. */
		@@ -1116,17 +1116,17 @@
1116	1116	style_finish_page();
1117	1117	}
1118	1118
1119	1119	/*
1120	1120	** Generate a multichoice submenu for the few recent active branches. zName is
1121		-** the query parameter used to select the current checkin. zCI is optional and
1122		-** represent the currently selected checkin, so if it is a checkin hash
	1121	+** the query parameter used to select the current check-in. zCI is optional and
	1122	+** represent the currently selected check-in, so if it is a check-in hash
1123	1123	** instead of a branch, it can be part of the multichoice menu.
1124	1124	*/
1125	1125	void generate_branch_submenu_multichoice(
1126	1126	const char* zName, /* Query parameter name */
1127		- const char* zCI /* Current checkin */
	1127	+ const char* zCI /* Current check-in */
1128	1128	){
1129	1129	Stmt q;
1130	1130	const int brFlags = BRL_ORDERBY_MTIME \| BRL_OPEN_ONLY;
1131	1131	static const char zBranchMenuList[322]; /* 2 per entries */
1132	1132	const int nLimit = count(zBranchMenuList)/2;
		@@ -1134,18 +1134,18 @@
1134	1134
1135	1135	if( zName == 0 ) zName = "ci";
1136	1136
1137	1137	branch_prepare_list_query(&q, brFlags, 0, nLimit, 0);
1138	1138	zBranchMenuList[i++] = "";
1139		- zBranchMenuList[i++] = "All Checkins";
	1139	+ zBranchMenuList[i++] = "All Check-ins";
1140	1140
1141	1141	if( zCI ){
1142	1142	zCI = fossil_strdup(zCI);
1143	1143	zBranchMenuList[i++] = zCI;
1144	1144	zBranchMenuList[i++] = zCI;
1145	1145	}
1146		- /* If current checkin is not "tip", add it to the list */
	1146	+ /* If current check-in is not "tip", add it to the list */
1147	1147	if( zCI==0 \|\| strcmp(zCI, "tip") ){
1148	1148	zBranchMenuList[i++] = "tip";
1149	1149	zBranchMenuList[i++] = "tip";
1150	1150	}
1151	1151	while( i/2 < nLimit && db_step(&q)==SQLITE_ROW ){
1152	1152

	--- src/branch.c
	+++ src/branch.c
	@@ -232,11 +232,11 @@
232	**
233	** name Name of the branch
234	** mtime Time of last check-in on this branch
235	** isclosed True if the branch is closed
236	** mergeto Another branch this branch was merged into
237	** nckin Number of checkins on this branch
238	** ckin Hash of the last check-in on this branch
239	** isprivate True if the branch is private
240	** bgclr Background color for this branch
241	*/
242	static const char createBrlistQuery[] =
	@@ -558,11 +558,11 @@
558	}
559
560	/*
561	** Implementation of (branch close\|reopen) subcommands. nStartAtArg is
562	** the g.argv index to start reading branch/check-in names. The given
563	** checkins are closed if fClose is true, else their "closed" tag (if
564	** any) is cancelled. Fails fatally on error.
565	*/
566	static void branch_cmd_close(int nStartAtArg, int fClose){
567	int argPos = nStartAtArg; /* g.argv pos with first branch name */
568	char * zUuid = 0; /* Resolved branch UUID. */
	@@ -1116,17 +1116,17 @@
1116	style_finish_page();
1117	}
1118
1119	/*
1120	** Generate a multichoice submenu for the few recent active branches. zName is
1121	** the query parameter used to select the current checkin. zCI is optional and
1122	** represent the currently selected checkin, so if it is a checkin hash
1123	** instead of a branch, it can be part of the multichoice menu.
1124	*/
1125	void generate_branch_submenu_multichoice(
1126	const char* zName, /* Query parameter name */
1127	const char* zCI /* Current checkin */
1128	){
1129	Stmt q;
1130	const int brFlags = BRL_ORDERBY_MTIME \| BRL_OPEN_ONLY;
1131	static const char zBranchMenuList[322]; /* 2 per entries */
1132	const int nLimit = count(zBranchMenuList)/2;
	@@ -1134,18 +1134,18 @@
1134
1135	if( zName == 0 ) zName = "ci";
1136
1137	branch_prepare_list_query(&q, brFlags, 0, nLimit, 0);
1138	zBranchMenuList[i++] = "";
1139	zBranchMenuList[i++] = "All Checkins";
1140
1141	if( zCI ){
1142	zCI = fossil_strdup(zCI);
1143	zBranchMenuList[i++] = zCI;
1144	zBranchMenuList[i++] = zCI;
1145	}
1146	/* If current checkin is not "tip", add it to the list */
1147	if( zCI==0 \|\| strcmp(zCI, "tip") ){
1148	zBranchMenuList[i++] = "tip";
1149	zBranchMenuList[i++] = "tip";
1150	}
1151	while( i/2 < nLimit && db_step(&q)==SQLITE_ROW ){
1152

	--- src/branch.c
	+++ src/branch.c
	@@ -232,11 +232,11 @@
232	**
233	** name Name of the branch
234	** mtime Time of last check-in on this branch
235	** isclosed True if the branch is closed
236	** mergeto Another branch this branch was merged into
237	** nckin Number of check-ins on this branch
238	** ckin Hash of the last check-in on this branch
239	** isprivate True if the branch is private
240	** bgclr Background color for this branch
241	*/
242	static const char createBrlistQuery[] =
	@@ -558,11 +558,11 @@
558	}
559
560	/*
561	** Implementation of (branch close\|reopen) subcommands. nStartAtArg is
562	** the g.argv index to start reading branch/check-in names. The given
563	** check-ins are closed if fClose is true, else their "closed" tag (if
564	** any) is cancelled. Fails fatally on error.
565	*/
566	static void branch_cmd_close(int nStartAtArg, int fClose){
567	int argPos = nStartAtArg; /* g.argv pos with first branch name */
568	char * zUuid = 0; /* Resolved branch UUID. */
	@@ -1116,17 +1116,17 @@
1116	style_finish_page();
1117	}
1118
1119	/*
1120	** Generate a multichoice submenu for the few recent active branches. zName is
1121	** the query parameter used to select the current check-in. zCI is optional and
1122	** represent the currently selected check-in, so if it is a check-in hash
1123	** instead of a branch, it can be part of the multichoice menu.
1124	*/
1125	void generate_branch_submenu_multichoice(
1126	const char* zName, /* Query parameter name */
1127	const char* zCI /* Current check-in */
1128	){
1129	Stmt q;
1130	const int brFlags = BRL_ORDERBY_MTIME \| BRL_OPEN_ONLY;
1131	static const char zBranchMenuList[322]; /* 2 per entries */
1132	const int nLimit = count(zBranchMenuList)/2;
	@@ -1134,18 +1134,18 @@
1134
1135	if( zName == 0 ) zName = "ci";
1136
1137	branch_prepare_list_query(&q, brFlags, 0, nLimit, 0);
1138	zBranchMenuList[i++] = "";
1139	zBranchMenuList[i++] = "All Check-ins";
1140
1141	if( zCI ){
1142	zCI = fossil_strdup(zCI);
1143	zBranchMenuList[i++] = zCI;
1144	zBranchMenuList[i++] = zCI;
1145	}
1146	/* If current check-in is not "tip", add it to the list */
1147	if( zCI==0 \|\| strcmp(zCI, "tip") ){
1148	zBranchMenuList[i++] = "tip";
1149	zBranchMenuList[i++] = "tip";
1150	}
1151	while( i/2 < nLimit && db_step(&q)==SQLITE_ROW ){
1152

M src/builtin.c

+1 -1

		--- src/builtin.c
		+++ src/builtin.c
		@@ -735,11 +735,11 @@
735	735	} fjs[] = {
736	736	/* This list ordering isn't strictly important. */
737	737	{"confirmer", 0, 0},
738	738	{"copybutton", 0, "dom\0"},
739	739	{"diff", 0, "dom\0fetch\0storage\0"
740		- /* maintenance note: "diff" needs "storage" for storing the the
	740	+ /* maintenance note: "diff" needs "storage" for storing the
741	741	** sbs-sync-scroll toggle. */},
742	742	{"dom", 0, 0},
743	743	{"fetch", 0, 0},
744	744	{"numbered-lines", 0, "popupwidget\0copybutton\0"},
745	745	{"pikchr", 0, "dom\0"},
746	746

	--- src/builtin.c
	+++ src/builtin.c
	@@ -735,11 +735,11 @@
735	} fjs[] = {
736	/* This list ordering isn't strictly important. */
737	{"confirmer", 0, 0},
738	{"copybutton", 0, "dom\0"},
739	{"diff", 0, "dom\0fetch\0storage\0"
740	/* maintenance note: "diff" needs "storage" for storing the the
741	** sbs-sync-scroll toggle. */},
742	{"dom", 0, 0},
743	{"fetch", 0, 0},
744	{"numbered-lines", 0, "popupwidget\0copybutton\0"},
745	{"pikchr", 0, "dom\0"},
746

	--- src/builtin.c
	+++ src/builtin.c
	@@ -735,11 +735,11 @@
735	} fjs[] = {
736	/* This list ordering isn't strictly important. */
737	{"confirmer", 0, 0},
738	{"copybutton", 0, "dom\0"},
739	{"diff", 0, "dom\0fetch\0storage\0"
740	/* maintenance note: "diff" needs "storage" for storing the
741	** sbs-sync-scroll toggle. */},
742	{"dom", 0, 0},
743	{"fetch", 0, 0},
744	{"numbered-lines", 0, "popupwidget\0copybutton\0"},
745	{"pikchr", 0, "dom\0"},
746

M src/cache.c

+2 -2

		--- src/cache.c
		+++ src/cache.c
		@@ -70,11 +70,11 @@
70	70	"CREATE TABLE IF NOT EXISTS blob(id INTEGER PRIMARY KEY, data BLOB);"
71	71	"CREATE TABLE IF NOT EXISTS cache("
72	72	"key TEXT PRIMARY KEY," /* Key used to access the cache */
73	73	"id INT REFERENCES blob," /* The cache content */
74	74	"sz INT," /* Size of content in bytes */
75		- "tm INT," /* Last access time (unix timestampe) */
	75	+ "tm INT," /* Last access time (unix timestamp) */
76	76	"nref INT" /* Number of uses */
77	77	");"
78	78	"CREATE TRIGGER IF NOT EXISTS cacheDel AFTER DELETE ON cache BEGIN"
79	79	" DELETE FROM blob WHERE id=OLD.id;"
80	80	"END;",
		@@ -437,11 +437,11 @@
437	437	@ <li><p>%z(href("%R/cacheget?key=%T",zName))%h(zName)</a><br>
438	438	@ size: %,lld(sqlite3_column_int64(pStmt,1)),
439	439	@ hit-count: %d(sqlite3_column_int(pStmt,2)),
440	440	@ last-access: %s(sqlite3_column_text(pStmt,3))Z \
441	441	if( zHash ){
442		- @ → %z(href("%R/timeline?c=%S",zHash))checkin info</a>\
	442	+ @ → %z(href("%R/timeline?c=%S",zHash))check-in info</a>\
443	443	fossil_free(zHash);
444	444	}
445	445	@ </p></li>
446	446	nEntry++;
447	447	}
448	448

	--- src/cache.c
	+++ src/cache.c
	@@ -70,11 +70,11 @@
70	"CREATE TABLE IF NOT EXISTS blob(id INTEGER PRIMARY KEY, data BLOB);"
71	"CREATE TABLE IF NOT EXISTS cache("
72	"key TEXT PRIMARY KEY," /* Key used to access the cache */
73	"id INT REFERENCES blob," /* The cache content */
74	"sz INT," /* Size of content in bytes */
75	"tm INT," /* Last access time (unix timestampe) */
76	"nref INT" /* Number of uses */
77	");"
78	"CREATE TRIGGER IF NOT EXISTS cacheDel AFTER DELETE ON cache BEGIN"
79	" DELETE FROM blob WHERE id=OLD.id;"
80	"END;",
	@@ -437,11 +437,11 @@
437	@ <li><p>%z(href("%R/cacheget?key=%T",zName))%h(zName)</a><br>
438	@ size: %,lld(sqlite3_column_int64(pStmt,1)),
439	@ hit-count: %d(sqlite3_column_int(pStmt,2)),
440	@ last-access: %s(sqlite3_column_text(pStmt,3))Z \
441	if( zHash ){
442	@ → %z(href("%R/timeline?c=%S",zHash))checkin info</a>\
443	fossil_free(zHash);
444	}
445	@ </p></li>
446	nEntry++;
447	}
448

	--- src/cache.c
	+++ src/cache.c
	@@ -70,11 +70,11 @@
70	"CREATE TABLE IF NOT EXISTS blob(id INTEGER PRIMARY KEY, data BLOB);"
71	"CREATE TABLE IF NOT EXISTS cache("
72	"key TEXT PRIMARY KEY," /* Key used to access the cache */
73	"id INT REFERENCES blob," /* The cache content */
74	"sz INT," /* Size of content in bytes */
75	"tm INT," /* Last access time (unix timestamp) */
76	"nref INT" /* Number of uses */
77	");"
78	"CREATE TRIGGER IF NOT EXISTS cacheDel AFTER DELETE ON cache BEGIN"
79	" DELETE FROM blob WHERE id=OLD.id;"
80	"END;",
	@@ -437,11 +437,11 @@
437	@ <li><p>%z(href("%R/cacheget?key=%T",zName))%h(zName)</a><br>
438	@ size: %,lld(sqlite3_column_int64(pStmt,1)),
439	@ hit-count: %d(sqlite3_column_int(pStmt,2)),
440	@ last-access: %s(sqlite3_column_text(pStmt,3))Z \
441	if( zHash ){
442	@ → %z(href("%R/timeline?c=%S",zHash))check-in info</a>\
443	fossil_free(zHash);
444	}
445	@ </p></li>
446	nEntry++;
447	}
448

M src/captcha.c

+3 -3

		--- src/captcha.c
		+++ src/captcha.c
		@@ -509,11 +509,11 @@
509	509	sqlite3_randomness(sizeof(x), &x);
510	510	x &= 0x7fffffff;
511	511	return x;
512	512	}
513	513
514		-/* The SQL that will rotate the the captcha-secret. */
	514	+/* The SQL that will rotate the captcha-secret. */
515	515	static const char captchaSecretRotationSql[] =
516	516	@ SAVEPOINT rotate;
517	517	@ DELETE FROM config
518	518	@ WHERE name GLOB 'captcha-secret-*'
519	519	@ AND mtime<unixepoch('now','-6 hours');
		@@ -529,11 +529,11 @@
529	529	;
530	530
531	531
532	532	/*
533	533	** Create a new random captcha-secret. Rotate the old one into
534		-** the captcha-secret-N backups. Purge captch-secret-N backups
	534	+** the captcha-secret-N backups. Purge captcha-secret-N backups
535	535	** older than 6 hours.
536	536	**
537	537	** Do this on the current database and in all other databases of
538	538	** the same login group.
539	539	*/
		@@ -559,11 +559,11 @@
559	559	fossil_free(zSql);
560	560	}
561	561
562	562	/*
563	563	** Return the value of the N-th more recent captcha-secret. The
564		-** most recent captch-secret is 0. Others are prior captcha-secrets
	564	+** most recent captcha-secret is 0. Others are prior captcha-secrets
565	565	** that have expired, but are retained for a limited period of time
566	566	** so that pending anonymous login cookies and/or captcha dialogs
567	567	** don't malfunction when the captcha-secret changes.
568	568	**
569	569	** Clients should start by using the 0-th captcha-secret. Only if
570	570

	--- src/captcha.c
	+++ src/captcha.c
	@@ -509,11 +509,11 @@
509	sqlite3_randomness(sizeof(x), &x);
510	x &= 0x7fffffff;
511	return x;
512	}
513
514	/* The SQL that will rotate the the captcha-secret. */
515	static const char captchaSecretRotationSql[] =
516	@ SAVEPOINT rotate;
517	@ DELETE FROM config
518	@ WHERE name GLOB 'captcha-secret-*'
519	@ AND mtime<unixepoch('now','-6 hours');
	@@ -529,11 +529,11 @@
529	;
530
531
532	/*
533	** Create a new random captcha-secret. Rotate the old one into
534	** the captcha-secret-N backups. Purge captch-secret-N backups
535	** older than 6 hours.
536	**
537	** Do this on the current database and in all other databases of
538	** the same login group.
539	*/
	@@ -559,11 +559,11 @@
559	fossil_free(zSql);
560	}
561
562	/*
563	** Return the value of the N-th more recent captcha-secret. The
564	** most recent captch-secret is 0. Others are prior captcha-secrets
565	** that have expired, but are retained for a limited period of time
566	** so that pending anonymous login cookies and/or captcha dialogs
567	** don't malfunction when the captcha-secret changes.
568	**
569	** Clients should start by using the 0-th captcha-secret. Only if
570

	--- src/captcha.c
	+++ src/captcha.c
	@@ -509,11 +509,11 @@
509	sqlite3_randomness(sizeof(x), &x);
510	x &= 0x7fffffff;
511	return x;
512	}
513
514	/* The SQL that will rotate the captcha-secret. */
515	static const char captchaSecretRotationSql[] =
516	@ SAVEPOINT rotate;
517	@ DELETE FROM config
518	@ WHERE name GLOB 'captcha-secret-*'
519	@ AND mtime<unixepoch('now','-6 hours');
	@@ -529,11 +529,11 @@
529	;
530
531
532	/*
533	** Create a new random captcha-secret. Rotate the old one into
534	** the captcha-secret-N backups. Purge captcha-secret-N backups
535	** older than 6 hours.
536	**
537	** Do this on the current database and in all other databases of
538	** the same login group.
539	*/
	@@ -559,11 +559,11 @@
559	fossil_free(zSql);
560	}
561
562	/*
563	** Return the value of the N-th more recent captcha-secret. The
564	** most recent captcha-secret is 0. Others are prior captcha-secrets
565	** that have expired, but are retained for a limited period of time
566	** so that pending anonymous login cookies and/or captcha dialogs
567	** don't malfunction when the captcha-secret changes.
568	**
569	** Clients should start by using the 0-th captcha-secret. Only if
570

M src/cgi.c

+2 -2

		--- src/cgi.c
		+++ src/cgi.c
		@@ -146,11 +146,11 @@
146	146	**
147	147	** Do not confuse the content header with the HTTP header. The content header
148	148	** is generated by downstream code. The HTTP header is generated by the
149	149	** cgi_reply() routine below.
150	150	**
151		-** The content header and contenty body are approximately the <head>
	151	+** The content header and content body are approximately the <head>
152	152	** element and the <body> elements for HTML replies. However this is only
153	153	** approximate. The content header also includes parts of <body> that
154	154	** show the banner and menu bar at the top of each page. Also note that
155	155	** not all replies are HTML, but there can still be separate header and
156	156	** body sections of the content.
		@@ -2830,11 +2830,11 @@
2830	2830	if( fossil_system(zBrowser)<0 ){
2831	2831	fossil_warning("cannot start browser: %s\n", zBrowser);
2832	2832	}
2833	2833	}
2834	2834
2835		- /* What for incomming requests. For each request, fork() a child process
	2835	+ /* What for incoming requests. For each request, fork() a child process
2836	2836	** to deal with that request. The child process returns. The parent
2837	2837	** keeps on listening and never returns.
2838	2838	*/
2839	2839	while( 1 ){
2840	2840	#if FOSSIL_MAX_CONNECTIONS>0
2841	2841

	--- src/cgi.c
	+++ src/cgi.c
	@@ -146,11 +146,11 @@
146	**
147	** Do not confuse the content header with the HTTP header. The content header
148	** is generated by downstream code. The HTTP header is generated by the
149	** cgi_reply() routine below.
150	**
151	** The content header and contenty body are approximately the <head>
152	** element and the <body> elements for HTML replies. However this is only
153	** approximate. The content header also includes parts of <body> that
154	** show the banner and menu bar at the top of each page. Also note that
155	** not all replies are HTML, but there can still be separate header and
156	** body sections of the content.
	@@ -2830,11 +2830,11 @@
2830	if( fossil_system(zBrowser)<0 ){
2831	fossil_warning("cannot start browser: %s\n", zBrowser);
2832	}
2833	}
2834
2835	/* What for incomming requests. For each request, fork() a child process
2836	** to deal with that request. The child process returns. The parent
2837	** keeps on listening and never returns.
2838	*/
2839	while( 1 ){
2840	#if FOSSIL_MAX_CONNECTIONS>0
2841

	--- src/cgi.c
	+++ src/cgi.c
	@@ -146,11 +146,11 @@
146	**
147	** Do not confuse the content header with the HTTP header. The content header
148	** is generated by downstream code. The HTTP header is generated by the
149	** cgi_reply() routine below.
150	**
151	** The content header and content body are approximately the <head>
152	** element and the <body> elements for HTML replies. However this is only
153	** approximate. The content header also includes parts of <body> that
154	** show the banner and menu bar at the top of each page. Also note that
155	** not all replies are HTML, but there can still be separate header and
156	** body sections of the content.
	@@ -2830,11 +2830,11 @@
2830	if( fossil_system(zBrowser)<0 ){
2831	fossil_warning("cannot start browser: %s\n", zBrowser);
2832	}
2833	}
2834
2835	/* What for incoming requests. For each request, fork() a child process
2836	** to deal with that request. The child process returns. The parent
2837	** keeps on listening and never returns.
2838	*/
2839	while( 1 ){
2840	#if FOSSIL_MAX_CONNECTIONS>0
2841

M src/checkin.c

+2 -2

		--- src/checkin.c
		+++ src/checkin.c
		@@ -484,11 +484,11 @@
484	484	{"no-merge", C_MERGE }, {"no-classify", C_CLASSIFY },
485	485	};
486	486
487	487	Blob report = BLOB_INITIALIZER;
488	488	enum {CHANGES, STATUS} command = *g.argv[1]=='s' ? STATUS : CHANGES;
489		- /* --sha1sum is an undocumented alias for --hash for backwards compatiblity */
	489	+ /* --sha1sum is an undocumented alias for --hash for backwards compatibility */
490	490	int useHash = find_option("hash",0,0)!=0 \|\| find_option("sha1sum",0,0)!=0;
491	491	int showHdr = command==CHANGES && find_option("header", 0, 0);
492	492	int verboseFlag = command==CHANGES && find_option("verbose", "v", 0);
493	493	const char *zIgnoreFlag = find_option("ignore", 0, 1);
494	494	unsigned scanFlags = 0;
		@@ -2562,11 +2562,11 @@
2562	2562	char zNewBranch = 0; / The branch name after update */
2563	2563	int ckComFlgs; /* Flags passed to verify_comment() */
2564	2564
2565	2565	memset(&sCiInfo, 0, sizeof(sCiInfo));
2566	2566	url_proxy_options();
2567		- /* --sha1sum is an undocumented alias for --hash for backwards compatiblity */
	2567	+ /* --sha1sum is an undocumented alias for --hash for backwards compatibility */
2568	2568	useHash = find_option("hash",0,0)!=0 \|\| find_option("sha1sum",0,0)!=0;
2569	2569	noSign = find_option("nosign",0,0)!=0;
2570	2570	if( find_option("nosync",0,0) ) g.fNoSync = 1;
2571	2571	privateFlag = find_option("private",0,0)!=0;
2572	2572	forceDelta = find_option("delta",0,0)!=0;
2573	2573

	--- src/checkin.c
	+++ src/checkin.c
	@@ -484,11 +484,11 @@
484	{"no-merge", C_MERGE }, {"no-classify", C_CLASSIFY },
485	};
486
487	Blob report = BLOB_INITIALIZER;
488	enum {CHANGES, STATUS} command = *g.argv[1]=='s' ? STATUS : CHANGES;
489	/* --sha1sum is an undocumented alias for --hash for backwards compatiblity */
490	int useHash = find_option("hash",0,0)!=0 \|\| find_option("sha1sum",0,0)!=0;
491	int showHdr = command==CHANGES && find_option("header", 0, 0);
492	int verboseFlag = command==CHANGES && find_option("verbose", "v", 0);
493	const char *zIgnoreFlag = find_option("ignore", 0, 1);
494	unsigned scanFlags = 0;
	@@ -2562,11 +2562,11 @@
2562	char zNewBranch = 0; / The branch name after update */
2563	int ckComFlgs; /* Flags passed to verify_comment() */
2564
2565	memset(&sCiInfo, 0, sizeof(sCiInfo));
2566	url_proxy_options();
2567	/* --sha1sum is an undocumented alias for --hash for backwards compatiblity */
2568	useHash = find_option("hash",0,0)!=0 \|\| find_option("sha1sum",0,0)!=0;
2569	noSign = find_option("nosign",0,0)!=0;
2570	if( find_option("nosync",0,0) ) g.fNoSync = 1;
2571	privateFlag = find_option("private",0,0)!=0;
2572	forceDelta = find_option("delta",0,0)!=0;
2573

	--- src/checkin.c
	+++ src/checkin.c
	@@ -484,11 +484,11 @@
484	{"no-merge", C_MERGE }, {"no-classify", C_CLASSIFY },
485	};
486
487	Blob report = BLOB_INITIALIZER;
488	enum {CHANGES, STATUS} command = *g.argv[1]=='s' ? STATUS : CHANGES;
489	/* --sha1sum is an undocumented alias for --hash for backwards compatibility */
490	int useHash = find_option("hash",0,0)!=0 \|\| find_option("sha1sum",0,0)!=0;
491	int showHdr = command==CHANGES && find_option("header", 0, 0);
492	int verboseFlag = command==CHANGES && find_option("verbose", "v", 0);
493	const char *zIgnoreFlag = find_option("ignore", 0, 1);
494	unsigned scanFlags = 0;
	@@ -2562,11 +2562,11 @@
2562	char zNewBranch = 0; / The branch name after update */
2563	int ckComFlgs; /* Flags passed to verify_comment() */
2564
2565	memset(&sCiInfo, 0, sizeof(sCiInfo));
2566	url_proxy_options();
2567	/* --sha1sum is an undocumented alias for --hash for backwards compatibility */
2568	useHash = find_option("hash",0,0)!=0 \|\| find_option("sha1sum",0,0)!=0;
2569	noSign = find_option("nosign",0,0)!=0;
2570	if( find_option("nosync",0,0) ) g.fNoSync = 1;
2571	privateFlag = find_option("private",0,0)!=0;
2572	forceDelta = find_option("delta",0,0)!=0;
2573

M src/color.c

+1 -1

		--- src/color.c
		+++ src/color.c
		@@ -215,11 +215,11 @@
215	215
216	216	/*
217	217	** SETTING: raw-bgcolor boolean default=off
218	218	**
219	219	** Fossil usually tries to adjust user-specified background colors
220		-** for checkins so that the text is readable and so that the color
	220	+** for check-ins so that the text is readable and so that the color
221	221	** is not too garish. This setting disables that filter. When
222	222	** this setting is on, the user-selected background colors are shown
223	223	** exactly as requested.
224	224	*/
225	225
226	226

	--- src/color.c
	+++ src/color.c
	@@ -215,11 +215,11 @@
215
216	/*
217	** SETTING: raw-bgcolor boolean default=off
218	**
219	** Fossil usually tries to adjust user-specified background colors
220	** for checkins so that the text is readable and so that the color
221	** is not too garish. This setting disables that filter. When
222	** this setting is on, the user-selected background colors are shown
223	** exactly as requested.
224	*/
225
226

	--- src/color.c
	+++ src/color.c
	@@ -215,11 +215,11 @@
215
216	/*
217	** SETTING: raw-bgcolor boolean default=off
218	**
219	** Fossil usually tries to adjust user-specified background colors
220	** for check-ins so that the text is readable and so that the color
221	** is not too garish. This setting disables that filter. When
222	** this setting is on, the user-selected background colors are shown
223	** exactly as requested.
224	*/
225
226

M src/comformat.c

+1 -1

		--- src/comformat.c
		+++ src/comformat.c
		@@ -750,11 +750,11 @@
750	750	** handling the value of a C-card from a manifest.
751	751	** --file FILE Omit the TEXT argument and read the comment text
752	752	** from FILE.
753	753	** --indent Number of spaces to indent (default (-1) is to
754	754	** auto-detect). Zero means no indent.
755		-** --orig FILE Take the value for the ORIGTEXT argumetn from FILE.
	755	+** --orig FILE Take the value for the ORIGTEXT argument from FILE.
756	756	** --origbreak Attempt to break when the original comment text
757	757	** is detected.
758	758	** --trimcrlf Enable trimming of leading/trailing CR/LF.
759	759	** --trimspace Enable trimming of leading/trailing spaces.
760	760	** --whitespace Keep all internal whitespace.
761	761

	--- src/comformat.c
	+++ src/comformat.c
	@@ -750,11 +750,11 @@
750	** handling the value of a C-card from a manifest.
751	** --file FILE Omit the TEXT argument and read the comment text
752	** from FILE.
753	** --indent Number of spaces to indent (default (-1) is to
754	** auto-detect). Zero means no indent.
755	** --orig FILE Take the value for the ORIGTEXT argumetn from FILE.
756	** --origbreak Attempt to break when the original comment text
757	** is detected.
758	** --trimcrlf Enable trimming of leading/trailing CR/LF.
759	** --trimspace Enable trimming of leading/trailing spaces.
760	** --whitespace Keep all internal whitespace.
761

	--- src/comformat.c
	+++ src/comformat.c
	@@ -750,11 +750,11 @@
750	** handling the value of a C-card from a manifest.
751	** --file FILE Omit the TEXT argument and read the comment text
752	** from FILE.
753	** --indent Number of spaces to indent (default (-1) is to
754	** auto-detect). Zero means no indent.
755	** --orig FILE Take the value for the ORIGTEXT argument from FILE.
756	** --origbreak Attempt to break when the original comment text
757	** is detected.
758	** --trimcrlf Enable trimming of leading/trailing CR/LF.
759	** --trimspace Enable trimming of leading/trailing spaces.
760	** --whitespace Keep all internal whitespace.
761

M src/config.h

+1 -1

		--- src/config.h
		+++ src/config.h
		@@ -39,11 +39,11 @@
39	39
40	40	#ifdef HAVE_AUTOCONFIG_H
41	41	#include "autoconfig.h"
42	42	#endif
43	43
44		-/* Enable the hardened SHA1 implemenation by default */
	44	+/* Enable the hardened SHA1 implementation by default */
45	45	#ifndef FOSSIL_HARDENED_SHA1
46	46	# define FOSSIL_HARDENED_SHA1 1
47	47	#endif
48	48
49	49	#ifndef _RC_COMPILE_
50	50

	--- src/config.h
	+++ src/config.h
	@@ -39,11 +39,11 @@
39
40	#ifdef HAVE_AUTOCONFIG_H
41	#include "autoconfig.h"
42	#endif
43
44	/* Enable the hardened SHA1 implemenation by default */
45	#ifndef FOSSIL_HARDENED_SHA1
46	# define FOSSIL_HARDENED_SHA1 1
47	#endif
48
49	#ifndef _RC_COMPILE_
50

	--- src/config.h
	+++ src/config.h
	@@ -39,11 +39,11 @@
39
40	#ifdef HAVE_AUTOCONFIG_H
41	#include "autoconfig.h"
42	#endif
43
44	/* Enable the hardened SHA1 implementation by default */
45	#ifndef FOSSIL_HARDENED_SHA1
46	# define FOSSIL_HARDENED_SHA1 1
47	#endif
48
49	#ifndef _RC_COMPILE_
50

M src/configure.c

+1 -1

		--- src/configure.c
		+++ src/configure.c
		@@ -376,11 +376,11 @@
376	376	** NAME-specific notes:
377	377	**
378	378	** - /reportftm's $MTIME is in Julian, not the Unix epoch.
379	379	*/
380	380	void configure_receive(const char zName, Blob pContent, int groupMask){
381		- int checkMask; /* Masks for which we must first check existance of tables */
	381	+ int checkMask; /* Masks for which we must first check existence of tables */
382	382
383	383	checkMask = CONFIGSET_SCRIBER;
384	384	if( zName[0]=='/' ){
385	385	/* The new format */
386	386	char *azToken[24];
387	387

	--- src/configure.c
	+++ src/configure.c
	@@ -376,11 +376,11 @@
376	** NAME-specific notes:
377	**
378	** - /reportftm's $MTIME is in Julian, not the Unix epoch.
379	*/
380	void configure_receive(const char zName, Blob pContent, int groupMask){
381	int checkMask; /* Masks for which we must first check existance of tables */
382
383	checkMask = CONFIGSET_SCRIBER;
384	if( zName[0]=='/' ){
385	/* The new format */
386	char *azToken[24];
387

	--- src/configure.c
	+++ src/configure.c
	@@ -376,11 +376,11 @@
376	** NAME-specific notes:
377	**
378	** - /reportftm's $MTIME is in Julian, not the Unix epoch.
379	*/
380	void configure_receive(const char zName, Blob pContent, int groupMask){
381	int checkMask; /* Masks for which we must first check existence of tables */
382
383	checkMask = CONFIGSET_SCRIBER;
384	if( zName[0]=='/' ){
385	/* The new format */
386	char *azToken[24];
387

M src/content.c

+2 -2

		--- src/content.c
		+++ src/content.c
		@@ -496,11 +496,11 @@
496	496	** zUuid is the UUID of the artifact, if it is specified. When srcId is
497	497	** specified then zUuid must always be specified. If srcId is zero,
498	498	** and zUuid is zero then the correct zUuid is computed from pBlob.
499	499	**
500	500	** If the record already exists but is a phantom, the pBlob content
501		-** is inserted and the phatom becomes a real record.
	501	+** is inserted and the phantom becomes a real record.
502	502	**
503	503	** The original content of pBlob is not disturbed. The caller continues
504	504	** to be responsible for pBlob. This routine does not take over
505	505	** responsibility for freeing pBlob.
506	506	*/
		@@ -793,11 +793,11 @@
793	793	}
794	794
795	795	/*
796	796	** Try to change the storage of rid so that it is a delta from one
797	797	** of the artifacts given in aSrc[0]..aSrc[nSrc-1]. The aSrc[*] that
798		-** gives the smallest delta is choosen.
	798	+** gives the smallest delta is chosen.
799	799	**
800	800	** If rid is already a delta from some other place then no
801	801	** conversion occurs and this is a no-op unless force==1. If force==1,
802	802	** then nSrc must also be 1.
803	803	**
804	804

	--- src/content.c
	+++ src/content.c
	@@ -496,11 +496,11 @@
496	** zUuid is the UUID of the artifact, if it is specified. When srcId is
497	** specified then zUuid must always be specified. If srcId is zero,
498	** and zUuid is zero then the correct zUuid is computed from pBlob.
499	**
500	** If the record already exists but is a phantom, the pBlob content
501	** is inserted and the phatom becomes a real record.
502	**
503	** The original content of pBlob is not disturbed. The caller continues
504	** to be responsible for pBlob. This routine does not take over
505	** responsibility for freeing pBlob.
506	*/
	@@ -793,11 +793,11 @@
793	}
794
795	/*
796	** Try to change the storage of rid so that it is a delta from one
797	** of the artifacts given in aSrc[0]..aSrc[nSrc-1]. The aSrc[*] that
798	** gives the smallest delta is choosen.
799	**
800	** If rid is already a delta from some other place then no
801	** conversion occurs and this is a no-op unless force==1. If force==1,
802	** then nSrc must also be 1.
803	**
804

	--- src/content.c
	+++ src/content.c
	@@ -496,11 +496,11 @@
496	** zUuid is the UUID of the artifact, if it is specified. When srcId is
497	** specified then zUuid must always be specified. If srcId is zero,
498	** and zUuid is zero then the correct zUuid is computed from pBlob.
499	**
500	** If the record already exists but is a phantom, the pBlob content
501	** is inserted and the phantom becomes a real record.
502	**
503	** The original content of pBlob is not disturbed. The caller continues
504	** to be responsible for pBlob. This routine does not take over
505	** responsibility for freeing pBlob.
506	*/
	@@ -793,11 +793,11 @@
793	}
794
795	/*
796	** Try to change the storage of rid so that it is a delta from one
797	** of the artifacts given in aSrc[0]..aSrc[nSrc-1]. The aSrc[*] that
798	** gives the smallest delta is chosen.
799	**
800	** If rid is already a delta from some other place then no
801	** conversion occurs and this is a no-op unless force==1. If force==1,
802	** then nSrc must also be 1.
803	**
804

M src/db.c

+6 -6

		--- src/db.c
		+++ src/db.c
		@@ -1718,11 +1718,11 @@
1718	1718	savedKeySize = n;
1719	1719	}
1720	1720
1721	1721	/*
1722	1722	** This function arranges for the database encryption key to be securely
1723		-** saved in non-pagable memory (on platforms where this is possible).
	1723	+** saved in non-pageable memory (on platforms where this is possible).
1724	1724	*/
1725	1725	static void db_save_encryption_key(
1726	1726	Blob *pKey
1727	1727	){
1728	1728	void *p = NULL;
		@@ -2531,11 +2531,11 @@
2531	2531	if( file_access(zDbName, F_OK) ) return 0;
2532	2532	lsize = file_size(zDbName, ExtFILE);
2533	2533	if( lsize%1024!=0 \|\| lsize<4096 ) return 0;
2534	2534	db_open_or_attach(zDbName, "localdb");
2535	2535
2536		- /* Check to see if the check-out database has the lastest schema changes.
	2536	+ /* Check to see if the check-out database has the latest schema changes.
2537	2537	** The most recent schema change (2019-01-19) is the addition of the
2538	2538	** vmerge.mhash and vfile.mhash fields. If the schema has the vmerge.mhash
2539	2539	** column, assume everything else is up-to-date.
2540	2540	*/
2541	2541	if( db_table_has_column("localdb","vmerge","mhash") ){
		@@ -2784,11 +2784,11 @@
2784	2784
2785	2785	/* Additional checks that occur when opening the check-out database */
2786	2786	if( g.localOpen ){
2787	2787
2788	2788	/* If the repository database that was just opened has been
2789		- ** eplaced by a clone of the same project, with different RID
	2789	+ ** replaced by a clone of the same project, with different RID
2790	2790	** values, then renumber the RID values stored in various tables
2791	2791	** of the check-out database, so that the repository and check-out
2792	2792	** databases align.
2793	2793	*/
2794	2794	if( !db_fingerprint_ok() ){
		@@ -3655,12 +3655,12 @@
3655	3655	** non-versioned value exist and are not equal, then a warning message
3656	3656	** might be generated.
3657	3657	**
3658	3658	** zCkin is normally NULL. In that case, the versioned setting is
3659	3659	** take from the local check-out, if a local checkout exists, or from
3660		-** checkin named by the g.zOpenRevision global variable. If zCkin is
3661		-** not NULL, then zCkin is the name of the specific checkin from which
	3660	+** check-in named by the g.zOpenRevision global variable. If zCkin is
	3661	+** not NULL, then zCkin is the name of the specific check-in from which
3662	3662	** versioned setting value is taken. When zCkin is not NULL, the cache
3663	3663	** is bypassed.
3664	3664	*/
3665	3665	char *db_get_versioned(
3666	3666	const char *zName,
		@@ -4855,11 +4855,11 @@
4855	4855	*/
4856	4856	/*
4857	4857	** SETTING: empty-dirs width=40 versionable block-text
4858	4858	** The value is a list of pathnames parsed according to the same rules as
4859	4859	** the *-glob settings. On update and checkout commands, if no directory
4860		-** exists with that name, an empty directory will be be created, even if
	4860	+** exists with that name, an empty directory will be created, even if
4861	4861	** it must create one or more parent directories.
4862	4862	*/
4863	4863	/*
4864	4864	** SETTING: encoding-glob width=40 versionable block-text
4865	4865	** The VALUE of this setting is a list of GLOB patterns matching files that
4866	4866

	--- src/db.c
	+++ src/db.c
	@@ -1718,11 +1718,11 @@
1718	savedKeySize = n;
1719	}
1720
1721	/*
1722	** This function arranges for the database encryption key to be securely
1723	** saved in non-pagable memory (on platforms where this is possible).
1724	*/
1725	static void db_save_encryption_key(
1726	Blob *pKey
1727	){
1728	void *p = NULL;
	@@ -2531,11 +2531,11 @@
2531	if( file_access(zDbName, F_OK) ) return 0;
2532	lsize = file_size(zDbName, ExtFILE);
2533	if( lsize%1024!=0 \|\| lsize<4096 ) return 0;
2534	db_open_or_attach(zDbName, "localdb");
2535
2536	/* Check to see if the check-out database has the lastest schema changes.
2537	** The most recent schema change (2019-01-19) is the addition of the
2538	** vmerge.mhash and vfile.mhash fields. If the schema has the vmerge.mhash
2539	** column, assume everything else is up-to-date.
2540	*/
2541	if( db_table_has_column("localdb","vmerge","mhash") ){
	@@ -2784,11 +2784,11 @@
2784
2785	/* Additional checks that occur when opening the check-out database */
2786	if( g.localOpen ){
2787
2788	/* If the repository database that was just opened has been
2789	** eplaced by a clone of the same project, with different RID
2790	** values, then renumber the RID values stored in various tables
2791	** of the check-out database, so that the repository and check-out
2792	** databases align.
2793	*/
2794	if( !db_fingerprint_ok() ){
	@@ -3655,12 +3655,12 @@
3655	** non-versioned value exist and are not equal, then a warning message
3656	** might be generated.
3657	**
3658	** zCkin is normally NULL. In that case, the versioned setting is
3659	** take from the local check-out, if a local checkout exists, or from
3660	** checkin named by the g.zOpenRevision global variable. If zCkin is
3661	** not NULL, then zCkin is the name of the specific checkin from which
3662	** versioned setting value is taken. When zCkin is not NULL, the cache
3663	** is bypassed.
3664	*/
3665	char *db_get_versioned(
3666	const char *zName,
	@@ -4855,11 +4855,11 @@
4855	*/
4856	/*
4857	** SETTING: empty-dirs width=40 versionable block-text
4858	** The value is a list of pathnames parsed according to the same rules as
4859	** the *-glob settings. On update and checkout commands, if no directory
4860	** exists with that name, an empty directory will be be created, even if
4861	** it must create one or more parent directories.
4862	*/
4863	/*
4864	** SETTING: encoding-glob width=40 versionable block-text
4865	** The VALUE of this setting is a list of GLOB patterns matching files that
4866

	--- src/db.c
	+++ src/db.c
	@@ -1718,11 +1718,11 @@
1718	savedKeySize = n;
1719	}
1720
1721	/*
1722	** This function arranges for the database encryption key to be securely
1723	** saved in non-pageable memory (on platforms where this is possible).
1724	*/
1725	static void db_save_encryption_key(
1726	Blob *pKey
1727	){
1728	void *p = NULL;
	@@ -2531,11 +2531,11 @@
2531	if( file_access(zDbName, F_OK) ) return 0;
2532	lsize = file_size(zDbName, ExtFILE);
2533	if( lsize%1024!=0 \|\| lsize<4096 ) return 0;
2534	db_open_or_attach(zDbName, "localdb");
2535
2536	/* Check to see if the check-out database has the latest schema changes.
2537	** The most recent schema change (2019-01-19) is the addition of the
2538	** vmerge.mhash and vfile.mhash fields. If the schema has the vmerge.mhash
2539	** column, assume everything else is up-to-date.
2540	*/
2541	if( db_table_has_column("localdb","vmerge","mhash") ){
	@@ -2784,11 +2784,11 @@
2784
2785	/* Additional checks that occur when opening the check-out database */
2786	if( g.localOpen ){
2787
2788	/* If the repository database that was just opened has been
2789	** replaced by a clone of the same project, with different RID
2790	** values, then renumber the RID values stored in various tables
2791	** of the check-out database, so that the repository and check-out
2792	** databases align.
2793	*/
2794	if( !db_fingerprint_ok() ){
	@@ -3655,12 +3655,12 @@
3655	** non-versioned value exist and are not equal, then a warning message
3656	** might be generated.
3657	**
3658	** zCkin is normally NULL. In that case, the versioned setting is
3659	** take from the local check-out, if a local checkout exists, or from
3660	** check-in named by the g.zOpenRevision global variable. If zCkin is
3661	** not NULL, then zCkin is the name of the specific check-in from which
3662	** versioned setting value is taken. When zCkin is not NULL, the cache
3663	** is bypassed.
3664	*/
3665	char *db_get_versioned(
3666	const char *zName,
	@@ -4855,11 +4855,11 @@
4855	*/
4856	/*
4857	** SETTING: empty-dirs width=40 versionable block-text
4858	** The value is a list of pathnames parsed according to the same rules as
4859	** the *-glob settings. On update and checkout commands, if no directory
4860	** exists with that name, an empty directory will be created, even if
4861	** it must create one or more parent directories.
4862	*/
4863	/*
4864	** SETTING: encoding-glob width=40 versionable block-text
4865	** The VALUE of this setting is a list of GLOB patterns matching files that
4866

M src/delta.c

+1 -1

		--- src/delta.c
		+++ src/delta.c
		@@ -316,11 +316,11 @@
316	316	**
317	317	** The last term is of the form
318	318	**
319	319	** NNN;
320	320	**
321		-** In this case, NNN is a 32-bit bigendian checksum of the output file
	321	+** In this case, NNN is a 32-bit big endian checksum of the output file
322	322	** that can be used to verify that the delta applied correctly. All
323	323	** numbers are in base-64.
324	324	**
325	325	** Pure text files generate a pure text delta. Binary files generate a
326	326	** delta that may contain some binary data.
327	327

	--- src/delta.c
	+++ src/delta.c
	@@ -316,11 +316,11 @@
316	**
317	** The last term is of the form
318	**
319	** NNN;
320	**
321	** In this case, NNN is a 32-bit bigendian checksum of the output file
322	** that can be used to verify that the delta applied correctly. All
323	** numbers are in base-64.
324	**
325	** Pure text files generate a pure text delta. Binary files generate a
326	** delta that may contain some binary data.
327

	--- src/delta.c
	+++ src/delta.c
	@@ -316,11 +316,11 @@
316	**
317	** The last term is of the form
318	**
319	** NNN;
320	**
321	** In this case, NNN is a 32-bit big endian checksum of the output file
322	** that can be used to verify that the delta applied correctly. All
323	** numbers are in base-64.
324	**
325	** Pure text files generate a pure text delta. Binary files generate a
326	** delta that may contain some binary data.
327

M src/descendants.c

+1 -1

		--- src/descendants.c
		+++ src/descendants.c
		@@ -159,11 +159,11 @@
159	159	}
160	160	}
161	161
162	162	/*
163	163	** If RID refers to a check-in, return the mtime of that check-in - the
164		-** julian day number of when the check-in occurred.
	164	+** Julian day number of when the check-in occurred.
165	165	*/
166	166	double mtime_of_rid(int rid, double mtime){
167	167	static Stmt q;
168	168	db_static_prepare(&q,"SELECT mtime FROM event WHERE objid=:rid");
169	169	db_bind_int(&q, ":rid", rid);
170	170

	--- src/descendants.c
	+++ src/descendants.c
	@@ -159,11 +159,11 @@
159	}
160	}
161
162	/*
163	** If RID refers to a check-in, return the mtime of that check-in - the
164	** julian day number of when the check-in occurred.
165	*/
166	double mtime_of_rid(int rid, double mtime){
167	static Stmt q;
168	db_static_prepare(&q,"SELECT mtime FROM event WHERE objid=:rid");
169	db_bind_int(&q, ":rid", rid);
170

	--- src/descendants.c
	+++ src/descendants.c
	@@ -159,11 +159,11 @@
159	}
160	}
161
162	/*
163	** If RID refers to a check-in, return the mtime of that check-in - the
164	** Julian day number of when the check-in occurred.
165	*/
166	double mtime_of_rid(int rid, double mtime){
167	static Stmt q;
168	db_static_prepare(&q,"SELECT mtime FROM event WHERE objid=:rid");
169	db_bind_int(&q, ":rid", rid);
170

M src/diff.c

+1 -1

		--- src/diff.c
		+++ src/diff.c
		@@ -1045,11 +1045,11 @@
1045	1045
1046	1046	/*********************** DiffBuilderDebug ******************************/
1047	1047	/* This version of DiffBuilder is used for debugging the diff and diff
1048	1048	** diff formatter logic. It is accessed using the (undocumented) --debug
1049	1049	** option to the diff command. The output is human-readable text that
1050		-** describes the various method calls that are invoked agains the DiffBuilder
	1050	+** describes the various method calls that are invoked against the DiffBuilder
1051	1051	** object.
1052	1052	*/
1053	1053	static void dfdebugSkip(DiffBuilder *p, unsigned int n, int isFinal){
1054	1054	blob_appendf(p->pOut, "SKIP %d (%d..%d left and %d..%d right)%s\n",
1055	1055	n, p->lnLeft+1, p->lnLeft+n, p->lnRight+1, p->lnRight+n,
1056	1056

	--- src/diff.c
	+++ src/diff.c
	@@ -1045,11 +1045,11 @@
1045
1046	/*********************** DiffBuilderDebug ******************************/
1047	/* This version of DiffBuilder is used for debugging the diff and diff
1048	** diff formatter logic. It is accessed using the (undocumented) --debug
1049	** option to the diff command. The output is human-readable text that
1050	** describes the various method calls that are invoked agains the DiffBuilder
1051	** object.
1052	*/
1053	static void dfdebugSkip(DiffBuilder *p, unsigned int n, int isFinal){
1054	blob_appendf(p->pOut, "SKIP %d (%d..%d left and %d..%d right)%s\n",
1055	n, p->lnLeft+1, p->lnLeft+n, p->lnRight+1, p->lnRight+n,
1056

	--- src/diff.c
	+++ src/diff.c
	@@ -1045,11 +1045,11 @@
1045
1046	/*********************** DiffBuilderDebug ******************************/
1047	/* This version of DiffBuilder is used for debugging the diff and diff
1048	** diff formatter logic. It is accessed using the (undocumented) --debug
1049	** option to the diff command. The output is human-readable text that
1050	** describes the various method calls that are invoked against the DiffBuilder
1051	** object.
1052	*/
1053	static void dfdebugSkip(DiffBuilder *p, unsigned int n, int isFinal){
1054	blob_appendf(p->pOut, "SKIP %d (%d..%d left and %d..%d right)%s\n",
1055	n, p->lnLeft+1, p->lnLeft+n, p->lnRight+1, p->lnRight+n,
1056

M src/diffcmd.c

+1 -1

		--- src/diffcmd.c
		+++ src/diffcmd.c
		@@ -813,11 +813,11 @@
813	813	Blob pOut / Blob to output diff instead of stdout */
814	814	){
815	815	int vid;
816	816	Blob sql;
817	817	Stmt q;
818		- int asNewFile; /* Treat non-existant files as empty files */
	818	+ int asNewFile; /* Treat non-existent files as empty files */
819	819	int isNumStat; /* True for --numstat */
820	820
821	821	asNewFile = (pCfg->diffFlags & (DIFF_VERBOSE\|DIFF_NUMSTAT\|DIFF_HTML))!=0;
822	822	isNumStat = (pCfg->diffFlags & (DIFF_NUMSTAT\|DIFF_TCL\|DIFF_HTML))!=0;
823	823	vid = db_lget_int("checkout", 0);
824	824

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -813,11 +813,11 @@
813	Blob pOut / Blob to output diff instead of stdout */
814	){
815	int vid;
816	Blob sql;
817	Stmt q;
818	int asNewFile; /* Treat non-existant files as empty files */
819	int isNumStat; /* True for --numstat */
820
821	asNewFile = (pCfg->diffFlags & (DIFF_VERBOSE\|DIFF_NUMSTAT\|DIFF_HTML))!=0;
822	isNumStat = (pCfg->diffFlags & (DIFF_NUMSTAT\|DIFF_TCL\|DIFF_HTML))!=0;
823	vid = db_lget_int("checkout", 0);
824

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -813,11 +813,11 @@
813	Blob pOut / Blob to output diff instead of stdout */
814	){
815	int vid;
816	Blob sql;
817	Stmt q;
818	int asNewFile; /* Treat non-existent files as empty files */
819	int isNumStat; /* True for --numstat */
820
821	asNewFile = (pCfg->diffFlags & (DIFF_VERBOSE\|DIFF_NUMSTAT\|DIFF_HTML))!=0;
822	isNumStat = (pCfg->diffFlags & (DIFF_NUMSTAT\|DIFF_TCL\|DIFF_HTML))!=0;
823	vid = db_lget_int("checkout", 0);
824

M src/dispatch.c

+1 -1

		--- src/dispatch.c
		+++ src/dispatch.c
		@@ -1155,11 +1155,11 @@
1155	1155	Blob pOut, / Write simplified help text here */
1156	1156	const char zTopic, / TOPIC */
1157	1157	const char zSubtopic, / SUBTOPIC */
1158	1158	int bAbbrevSubcmd /* True if z[] contains abbreviated subcommands */
1159	1159	){
1160		- Blob in, line; //, subsection;
	1160	+ Blob in, line;/, subsection;/
1161	1161	int n = 0;
1162	1162	char *zQTop = re_quote(zTopic);
1163	1163	char *zQSub = re_quote(zSubtopic);
1164	1164	char *zPattern;
1165	1165	ReCompiled *pRe = 0;
1166	1166

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -1155,11 +1155,11 @@
1155	Blob pOut, / Write simplified help text here */
1156	const char zTopic, / TOPIC */
1157	const char zSubtopic, / SUBTOPIC */
1158	int bAbbrevSubcmd /* True if z[] contains abbreviated subcommands */
1159	){
1160	Blob in, line; //, subsection;
1161	int n = 0;
1162	char *zQTop = re_quote(zTopic);
1163	char *zQSub = re_quote(zSubtopic);
1164	char *zPattern;
1165	ReCompiled *pRe = 0;
1166

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -1155,11 +1155,11 @@
1155	Blob pOut, / Write simplified help text here */
1156	const char zTopic, / TOPIC */
1157	const char zSubtopic, / SUBTOPIC */
1158	int bAbbrevSubcmd /* True if z[] contains abbreviated subcommands */
1159	){
1160	Blob in, line;/, subsection;/
1161	int n = 0;
1162	char *zQTop = re_quote(zTopic);
1163	char *zQSub = re_quote(zSubtopic);
1164	char *zPattern;
1165	ReCompiled *pRe = 0;
1166

M src/event.c

+1 -1

		--- src/event.c
		+++ src/event.c
		@@ -425,11 +425,11 @@
425	425	if( rid ){
426	426	zClr = db_text("", "SELECT bgcolor FROM event WHERE objid=%d", rid);
427	427	if( zClr && zClr[0] ){
428	428	const char * zRequestMethod = P("REQUEST_METHOD");
429	429	if(zRequestMethod && 'G'==zRequestMethod[0]){
430		- /* Apply saved color by defaut for GET requests
	430	+ /* Apply saved color by default for GET requests
431	431	** (e.g., an Edit menu link).
432	432	*/
433	433	zClrFlag = " checked";
434	434	}
435	435	}
436	436

	--- src/event.c
	+++ src/event.c
	@@ -425,11 +425,11 @@
425	if( rid ){
426	zClr = db_text("", "SELECT bgcolor FROM event WHERE objid=%d", rid);
427	if( zClr && zClr[0] ){
428	const char * zRequestMethod = P("REQUEST_METHOD");
429	if(zRequestMethod && 'G'==zRequestMethod[0]){
430	/* Apply saved color by defaut for GET requests
431	** (e.g., an Edit menu link).
432	*/
433	zClrFlag = " checked";
434	}
435	}
436

	--- src/event.c
	+++ src/event.c
	@@ -425,11 +425,11 @@
425	if( rid ){
426	zClr = db_text("", "SELECT bgcolor FROM event WHERE objid=%d", rid);
427	if( zClr && zClr[0] ){
428	const char * zRequestMethod = P("REQUEST_METHOD");
429	if(zRequestMethod && 'G'==zRequestMethod[0]){
430	/* Apply saved color by default for GET requests
431	** (e.g., an Edit menu link).
432	*/
433	zClrFlag = " checked";
434	}
435	}
436

M src/export.c

+2 -2

		--- src/export.c
		+++ src/export.c
		@@ -28,11 +28,11 @@
28	28	const char zTrunkName; / Name of trunk branch */
29	29	} gexport;
30	30
31	31	#if INTERFACE
32	32	/*
33		-** Each line in a git-fast-export "marK" file is an instance of
	33	+** Each line in a git-fast-export "mark" file is an instance of
34	34	** this object.
35	35	*/
36	36	struct mark_t {
37	37	char name; / Name of the mark. Also starts with ":" */
38	38	int rid; /* Corresponding object in the BLOB table */
		@@ -759,11 +759,11 @@
759	759	**
760	760	** This table contains all check-ins of the repository in topological
761	761	** order. "Topological order" means that every parent check-in comes
762	762	** before all of its children. Topological order is almost the same
763	763	** thing as "ORDER BY event.mtime". Differences only arise when there
764		-** are timewarps. In as much as Git hates timewarps, we have to compute
	764	+** are timewarps. Inasmuch as Git hates timewarps, we have to compute
765	765	** a correct topological order when doing an export.
766	766	**
767	767	** Since mtime is a usually already nearly in topological order, the
768	768	** algorithm is to start with mtime, then make adjustments as necessary
769	769	** for timewarps. This is not a great algorithm for the general case,
770	770

	--- src/export.c
	+++ src/export.c
	@@ -28,11 +28,11 @@
28	const char zTrunkName; / Name of trunk branch */
29	} gexport;
30
31	#if INTERFACE
32	/*
33	** Each line in a git-fast-export "marK" file is an instance of
34	** this object.
35	*/
36	struct mark_t {
37	char name; / Name of the mark. Also starts with ":" */
38	int rid; /* Corresponding object in the BLOB table */
	@@ -759,11 +759,11 @@
759	**
760	** This table contains all check-ins of the repository in topological
761	** order. "Topological order" means that every parent check-in comes
762	** before all of its children. Topological order is almost the same
763	** thing as "ORDER BY event.mtime". Differences only arise when there
764	** are timewarps. In as much as Git hates timewarps, we have to compute
765	** a correct topological order when doing an export.
766	**
767	** Since mtime is a usually already nearly in topological order, the
768	** algorithm is to start with mtime, then make adjustments as necessary
769	** for timewarps. This is not a great algorithm for the general case,
770

	--- src/export.c
	+++ src/export.c
	@@ -28,11 +28,11 @@
28	const char zTrunkName; / Name of trunk branch */
29	} gexport;
30
31	#if INTERFACE
32	/*
33	** Each line in a git-fast-export "mark" file is an instance of
34	** this object.
35	*/
36	struct mark_t {
37	char name; / Name of the mark. Also starts with ":" */
38	int rid; /* Corresponding object in the BLOB table */
	@@ -759,11 +759,11 @@
759	**
760	** This table contains all check-ins of the repository in topological
761	** order. "Topological order" means that every parent check-in comes
762	** before all of its children. Topological order is almost the same
763	** thing as "ORDER BY event.mtime". Differences only arise when there
764	** are timewarps. Inasmuch as Git hates timewarps, we have to compute
765	** a correct topological order when doing an export.
766	**
767	** Since mtime is a usually already nearly in topological order, the
768	** algorithm is to start with mtime, then make adjustments as necessary
769	** for timewarps. This is not a great algorithm for the general case,
770

M src/fileedit.c

+2 -2

		--- src/fileedit.c
		+++ src/fileedit.c
		@@ -48,11 +48,11 @@
48	48	Blob comment; /* Check-in comment text */
49	49	char zCommentMimetype; / Mimetype of comment. May be NULL */
50	50	char zUser; / User name */
51	51	char zDate; / Optionally force this date string (anything
52	52	supported by date_in_standard_format()).
53		- Maybe be NULL. */
	53	+ May be NULL. */
54	54	Blob pMfOut; / If not NULL, checkin_mini() will write a
55	55	copy of the generated manifest here. This
56	56	memory is NOT owned by CheckinMiniInfo. */
57	57	int filePerm; /* Permissions (via file_perm()) of the input
58	58	file. We need to store this before calling
		@@ -123,11 +123,11 @@
123	123	*/
124	124	CIMINI_PREFER_DELTA = 1<<8,
125	125	/*
126	126	** A "stronger hint" to checkin_mini() to prefer creation of a delta
127	127	** manifest if it at all can. It will decide not to only if creation
128		-** of a delta is not a realistic option or if it's forbitted by the
	128	+** of a delta is not a realistic option or if it's forbidden by the
129	129	** forbid-delta-manifests repo config option. For this to work, it
130	130	** must be set together with the CIMINI_PREFER_DELTA flag, but the two
131	131	** cannot be combined in this enum.
132	132	**
133	133	** This option is ONLY INTENDED FOR TESTING, used in bypassing
134	134

	--- src/fileedit.c
	+++ src/fileedit.c
	@@ -48,11 +48,11 @@
48	Blob comment; /* Check-in comment text */
49	char zCommentMimetype; / Mimetype of comment. May be NULL */
50	char zUser; / User name */
51	char zDate; / Optionally force this date string (anything
52	supported by date_in_standard_format()).
53	Maybe be NULL. */
54	Blob pMfOut; / If not NULL, checkin_mini() will write a
55	copy of the generated manifest here. This
56	memory is NOT owned by CheckinMiniInfo. */
57	int filePerm; /* Permissions (via file_perm()) of the input
58	file. We need to store this before calling
	@@ -123,11 +123,11 @@
123	*/
124	CIMINI_PREFER_DELTA = 1<<8,
125	/*
126	** A "stronger hint" to checkin_mini() to prefer creation of a delta
127	** manifest if it at all can. It will decide not to only if creation
128	** of a delta is not a realistic option or if it's forbitted by the
129	** forbid-delta-manifests repo config option. For this to work, it
130	** must be set together with the CIMINI_PREFER_DELTA flag, but the two
131	** cannot be combined in this enum.
132	**
133	** This option is ONLY INTENDED FOR TESTING, used in bypassing
134

	--- src/fileedit.c
	+++ src/fileedit.c
	@@ -48,11 +48,11 @@
48	Blob comment; /* Check-in comment text */
49	char zCommentMimetype; / Mimetype of comment. May be NULL */
50	char zUser; / User name */
51	char zDate; / Optionally force this date string (anything
52	supported by date_in_standard_format()).
53	May be NULL. */
54	Blob pMfOut; / If not NULL, checkin_mini() will write a
55	copy of the generated manifest here. This
56	memory is NOT owned by CheckinMiniInfo. */
57	int filePerm; /* Permissions (via file_perm()) of the input
58	file. We need to store this before calling
	@@ -123,11 +123,11 @@
123	*/
124	CIMINI_PREFER_DELTA = 1<<8,
125	/*
126	** A "stronger hint" to checkin_mini() to prefer creation of a delta
127	** manifest if it at all can. It will decide not to only if creation
128	** of a delta is not a realistic option or if it's forbidden by the
129	** forbid-delta-manifests repo config option. For this to work, it
130	** must be set together with the CIMINI_PREFER_DELTA flag, but the two
131	** cannot be combined in this enum.
132	**
133	** This option is ONLY INTENDED FOR TESTING, used in bypassing
134

M src/forum.c

+1 -1

		--- src/forum.c
		+++ src/forum.c
		@@ -133,11 +133,11 @@
133	133	** (recursively), else they are not. When checking in-response-to
134	134	** posts, the first one which is closed ends the search.
135	135	**
136	136	** Note that this function checks _exactly_ the given rid, whereas
137	137	** forum post closure/re-opening is always applied to the head of an
138		-** edit chain so that we get consistent implied locking beheavior for
	138	+** edit chain so that we get consistent implied locking behavior for
139	139	** later versions and responses to arbitrary versions in the
140	140	** chain. Even so, the "closed" tag is applied as a propagating tag
141	141	** so will apply to all edits in a given chain.
142	142	**
143	143	** The return value is one of:
144	144

	--- src/forum.c
	+++ src/forum.c
	@@ -133,11 +133,11 @@
133	** (recursively), else they are not. When checking in-response-to
134	** posts, the first one which is closed ends the search.
135	**
136	** Note that this function checks _exactly_ the given rid, whereas
137	** forum post closure/re-opening is always applied to the head of an
138	** edit chain so that we get consistent implied locking beheavior for
139	** later versions and responses to arbitrary versions in the
140	** chain. Even so, the "closed" tag is applied as a propagating tag
141	** so will apply to all edits in a given chain.
142	**
143	** The return value is one of:
144

	--- src/forum.c
	+++ src/forum.c
	@@ -133,11 +133,11 @@
133	** (recursively), else they are not. When checking in-response-to
134	** posts, the first one which is closed ends the search.
135	**
136	** Note that this function checks _exactly_ the given rid, whereas
137	** forum post closure/re-opening is always applied to the head of an
138	** edit chain so that we get consistent implied locking behavior for
139	** later versions and responses to arbitrary versions in the
140	** chain. Even so, the "closed" tag is applied as a propagating tag
141	** so will apply to all edits in a given chain.
142	**
143	** The return value is one of:
144

M src/fossil.diff.js

+1 -1

		--- src/fossil.diff.js
		+++ src/fossil.diff.js
		@@ -106,11 +106,11 @@
106	106	chunkLoadLines: (
107	107	F.config.diffContextLines * 3
108	108	/per /chat discussion/
109	109	) \|\| 20,
110	110	chunkFetch: {
111		- /* Default callack handlers for Diff.fetchArtifactChunk(),
	111	+ /* Default callback handlers for Diff.fetchArtifactChunk(),
112	112	unless overridden by options passeed to that function. */
113	113	beforesend: function(){},
114	114	aftersend: function(){},
115	115	onerror: function(e){
116	116	console.error("XHR error: ",e);
117	117

	--- src/fossil.diff.js
	+++ src/fossil.diff.js
	@@ -106,11 +106,11 @@
106	chunkLoadLines: (
107	F.config.diffContextLines * 3
108	/per /chat discussion/
109	) \|\| 20,
110	chunkFetch: {
111	/* Default callack handlers for Diff.fetchArtifactChunk(),
112	unless overridden by options passeed to that function. */
113	beforesend: function(){},
114	aftersend: function(){},
115	onerror: function(e){
116	console.error("XHR error: ",e);
117

	--- src/fossil.diff.js
	+++ src/fossil.diff.js
	@@ -106,11 +106,11 @@
106	chunkLoadLines: (
107	F.config.diffContextLines * 3
108	/per /chat discussion/
109	) \|\| 20,
110	chunkFetch: {
111	/* Default callback handlers for Diff.fetchArtifactChunk(),
112	unless overridden by options passeed to that function. */
113	beforesend: function(){},
114	aftersend: function(){},
115	onerror: function(e){
116	console.error("XHR error: ",e);
117

M src/fossil.page.chat.js

+2 -2

		--- src/fossil.page.chat.js
		+++ src/fossil.page.chat.js
		@@ -1050,11 +1050,11 @@
1050	1050	if(eUser==this \|\| !eUser) return false;
1051	1051	const uname = eUser.dataset.uname;
1052	1052	let eLast;
1053	1053	cs.setCurrentView(cs.e.viewMessages);
1054	1054	if(eUser.classList.contains('selected')){
1055		- /* If curently selected, toggle filter off */
	1055	+ /* If currently selected, toggle filter off */
1056	1056	eUser.classList.remove('selected');
1057	1057	cs.setUserFilter(false);
1058	1058	delete f.$eSelected;
1059	1059	}else{
1060	1060	if(f.$eSelected) f.$eSelected.classList.remove('selected');
		@@ -2856,11 +2856,11 @@
2856	2856	beforesend: chatPollBeforeSend,
2857	2857	aftersend: function(){
2858	2858	poll.running = false;
2859	2859	},
2860	2860	ontimeout: function(err){
2861		- f.pendingOnError = undefined /strip preceeding non-timeout error, if any/;
	2861	+ f.pendingOnError = undefined /strip preceding non-timeout error, if any/;
2862	2862	afterPollFetch(err);
2863	2863	},
2864	2864	onerror:function(err){
2865	2865	Chat._isBatchLoading = false;
2866	2866	if(Chat.beVerbose){
2867	2867

	--- src/fossil.page.chat.js
	+++ src/fossil.page.chat.js
	@@ -1050,11 +1050,11 @@
1050	if(eUser==this \|\| !eUser) return false;
1051	const uname = eUser.dataset.uname;
1052	let eLast;
1053	cs.setCurrentView(cs.e.viewMessages);
1054	if(eUser.classList.contains('selected')){
1055	/* If curently selected, toggle filter off */
1056	eUser.classList.remove('selected');
1057	cs.setUserFilter(false);
1058	delete f.$eSelected;
1059	}else{
1060	if(f.$eSelected) f.$eSelected.classList.remove('selected');
	@@ -2856,11 +2856,11 @@
2856	beforesend: chatPollBeforeSend,
2857	aftersend: function(){
2858	poll.running = false;
2859	},
2860	ontimeout: function(err){
2861	f.pendingOnError = undefined /strip preceeding non-timeout error, if any/;
2862	afterPollFetch(err);
2863	},
2864	onerror:function(err){
2865	Chat._isBatchLoading = false;
2866	if(Chat.beVerbose){
2867

	--- src/fossil.page.chat.js
	+++ src/fossil.page.chat.js
	@@ -1050,11 +1050,11 @@
1050	if(eUser==this \|\| !eUser) return false;
1051	const uname = eUser.dataset.uname;
1052	let eLast;
1053	cs.setCurrentView(cs.e.viewMessages);
1054	if(eUser.classList.contains('selected')){
1055	/* If currently selected, toggle filter off */
1056	eUser.classList.remove('selected');
1057	cs.setUserFilter(false);
1058	delete f.$eSelected;
1059	}else{
1060	if(f.$eSelected) f.$eSelected.classList.remove('selected');
	@@ -2856,11 +2856,11 @@
2856	beforesend: chatPollBeforeSend,
2857	aftersend: function(){
2858	poll.running = false;
2859	},
2860	ontimeout: function(err){
2861	f.pendingOnError = undefined /strip preceding non-timeout error, if any/;
2862	afterPollFetch(err);
2863	},
2864	onerror:function(err){
2865	Chat._isBatchLoading = false;
2866	if(Chat.beVerbose){
2867

M src/fossil.wikiedit-wysiwyg.js

+1 -1

		--- src/fossil.wikiedit-wysiwyg.js
		+++ src/fossil.wikiedit-wysiwyg.js
		@@ -449,11 +449,11 @@
449	449	oDoc.focus();
450	450	}
451	451
452	452	////////////////////////////////////////////////////////////////////////
453	453	// A hook which can be activated via a site skin to plug this editor
454		- // in to the wikiedit page.
	454	+ // into the wikiedit page.
455	455	F.page.wysiwyg = {
456	456	// only for debugging: oDoc: oDoc,
457	457	/*
458	458	Replaces wikiedit's default editor widget with this wysiwyg
459	459	editor.
460	460

	--- src/fossil.wikiedit-wysiwyg.js
	+++ src/fossil.wikiedit-wysiwyg.js
	@@ -449,11 +449,11 @@
449	oDoc.focus();
450	}
451
452	////////////////////////////////////////////////////////////////////////
453	// A hook which can be activated via a site skin to plug this editor
454	// in to the wikiedit page.
455	F.page.wysiwyg = {
456	// only for debugging: oDoc: oDoc,
457	/*
458	Replaces wikiedit's default editor widget with this wysiwyg
459	editor.
460

	--- src/fossil.wikiedit-wysiwyg.js
	+++ src/fossil.wikiedit-wysiwyg.js
	@@ -449,11 +449,11 @@
449	oDoc.focus();
450	}
451
452	////////////////////////////////////////////////////////////////////////
453	// A hook which can be activated via a site skin to plug this editor
454	// into the wikiedit page.
455	F.page.wysiwyg = {
456	// only for debugging: oDoc: oDoc,
457	/*
458	Replaces wikiedit's default editor widget with this wysiwyg
459	editor.
460

M src/fshell.c

+1 -1

		--- src/fshell.c
		+++ src/fshell.c
		@@ -21,11 +21,11 @@
21	21	** after the fashion of a standard Bourne shell and forks a child process
22	22	** to run the corresponding Fossil command. This only works on Unix.
23	23	**
24	24	** The "fossil shell" command is intended for use with SEE-enabled fossil.
25	25	** It allows multiple commands to be issued without having to reenter the
26		-** crypto phasephrase for each command.
	26	+** crypto passphrase for each command.
27	27	*/
28	28	#include "config.h"
29	29	#include "fshell.h"
30	30	#include <ctype.h>
31	31
32	32

	--- src/fshell.c
	+++ src/fshell.c
	@@ -21,11 +21,11 @@
21	** after the fashion of a standard Bourne shell and forks a child process
22	** to run the corresponding Fossil command. This only works on Unix.
23	**
24	** The "fossil shell" command is intended for use with SEE-enabled fossil.
25	** It allows multiple commands to be issued without having to reenter the
26	** crypto phasephrase for each command.
27	*/
28	#include "config.h"
29	#include "fshell.h"
30	#include <ctype.h>
31
32

	--- src/fshell.c
	+++ src/fshell.c
	@@ -21,11 +21,11 @@
21	** after the fashion of a standard Bourne shell and forks a child process
22	** to run the corresponding Fossil command. This only works on Unix.
23	**
24	** The "fossil shell" command is intended for use with SEE-enabled fossil.
25	** It allows multiple commands to be issued without having to reenter the
26	** crypto passphrase for each command.
27	*/
28	#include "config.h"
29	#include "fshell.h"
30	#include <ctype.h>
31
32

M src/glob.c

+2 -2

		--- src/glob.c
		+++ src/glob.c
		@@ -29,11 +29,11 @@
29	29	** zVal: "x"
30	30	** zGlobList: ".o,.obj"
31	31	**
32	32	** Result: "(x GLOB '.o' OR x GLOB '.obj')"
33	33	**
34		-** Commas and whitespace are considered to be element delimters. Each
	34	+** Commas and whitespace are considered to be element delimiters. Each
35	35	** element of the GLOB list may optionally be enclosed in either '...' or
36	36	** "...". This allows commas and/or whitespace to be used in the elements
37	37	** themselves.
38	38	**
39	39	** The returned string is owned by the caller, who must fossil_free()
		@@ -57,11 +57,11 @@
57	57	cTerm = zGlobList[0];
58	58	zGlobList++;
59	59	}else{
60	60	cTerm = ',';
61	61	}
62		- /* Find the next delimter (or the end of the string). */
	62	+ /* Find the next delimiter (or the end of the string). */
63	63	for(i=0; zGlobList[i] && zGlobList[i]!=cTerm; i++){
64	64	if( cTerm!=',' ) continue; /* If quoted, keep going. */
65	65	if( fossil_isspace(zGlobList[i]) ) break; /* If space, stop. */
66	66	}
67	67	blob_appendf(&expr, "%s%s GLOB '%#q'", zSep, zVal, i, zGlobList);
68	68

	--- src/glob.c
	+++ src/glob.c
	@@ -29,11 +29,11 @@
29	** zVal: "x"
30	** zGlobList: ".o,.obj"
31	**
32	** Result: "(x GLOB '.o' OR x GLOB '.obj')"
33	**
34	** Commas and whitespace are considered to be element delimters. Each
35	** element of the GLOB list may optionally be enclosed in either '...' or
36	** "...". This allows commas and/or whitespace to be used in the elements
37	** themselves.
38	**
39	** The returned string is owned by the caller, who must fossil_free()
	@@ -57,11 +57,11 @@
57	cTerm = zGlobList[0];
58	zGlobList++;
59	}else{
60	cTerm = ',';
61	}
62	/* Find the next delimter (or the end of the string). */
63	for(i=0; zGlobList[i] && zGlobList[i]!=cTerm; i++){
64	if( cTerm!=',' ) continue; /* If quoted, keep going. */
65	if( fossil_isspace(zGlobList[i]) ) break; /* If space, stop. */
66	}
67	blob_appendf(&expr, "%s%s GLOB '%#q'", zSep, zVal, i, zGlobList);
68

	--- src/glob.c
	+++ src/glob.c
	@@ -29,11 +29,11 @@
29	** zVal: "x"
30	** zGlobList: ".o,.obj"
31	**
32	** Result: "(x GLOB '.o' OR x GLOB '.obj')"
33	**
34	** Commas and whitespace are considered to be element delimiters. Each
35	** element of the GLOB list may optionally be enclosed in either '...' or
36	** "...". This allows commas and/or whitespace to be used in the elements
37	** themselves.
38	**
39	** The returned string is owned by the caller, who must fossil_free()
	@@ -57,11 +57,11 @@
57	cTerm = zGlobList[0];
58	zGlobList++;
59	}else{
60	cTerm = ',';
61	}
62	/* Find the next delimiter (or the end of the string). */
63	for(i=0; zGlobList[i] && zGlobList[i]!=cTerm; i++){
64	if( cTerm!=',' ) continue; /* If quoted, keep going. */
65	if( fossil_isspace(zGlobList[i]) ) break; /* If space, stop. */
66	}
67	blob_appendf(&expr, "%s%s GLOB '%#q'", zSep, zVal, i, zGlobList);
68

M src/hname.c

+1 -1

		--- src/hname.c
		+++ src/hname.c
		@@ -199,11 +199,11 @@
199	199
200	200	/*
201	201	** Return the default hash policy for repositories that do not currently
202	202	** have an assigned hash policy.
203	203	**
204		-** Make the default HPOLICY_AUTO if there are SHA1 artficates but no SHA3
	204	+** Make the default HPOLICY_AUTO if there are SHA1 artifacts but no SHA3
205	205	** artifacts in the repository. Make the default HPOLICY_SHA3 if there
206	206	** are one or more SHA3 artifacts or if the repository is initially empty.
207	207	*/
208	208	int hname_default_policy(void){
209	209	if( db_exists("SELECT 1 FROM blob WHERE length(uuid)>40")
210	210

	--- src/hname.c
	+++ src/hname.c
	@@ -199,11 +199,11 @@
199
200	/*
201	** Return the default hash policy for repositories that do not currently
202	** have an assigned hash policy.
203	**
204	** Make the default HPOLICY_AUTO if there are SHA1 artficates but no SHA3
205	** artifacts in the repository. Make the default HPOLICY_SHA3 if there
206	** are one or more SHA3 artifacts or if the repository is initially empty.
207	*/
208	int hname_default_policy(void){
209	if( db_exists("SELECT 1 FROM blob WHERE length(uuid)>40")
210

	--- src/hname.c
	+++ src/hname.c
	@@ -199,11 +199,11 @@
199
200	/*
201	** Return the default hash policy for repositories that do not currently
202	** have an assigned hash policy.
203	**
204	** Make the default HPOLICY_AUTO if there are SHA1 artifacts but no SHA3
205	** artifacts in the repository. Make the default HPOLICY_SHA3 if there
206	** are one or more SHA3 artifacts or if the repository is initially empty.
207	*/
208	int hname_default_policy(void){
209	if( db_exists("SELECT 1 FROM blob WHERE length(uuid)>40")
210

M src/hook.c

+1 -1

		--- src/hook.c
		+++ src/hook.c
		@@ -29,11 +29,11 @@
29	29	** }
30	30	**
31	31	** hook-last-rcvid The last rcvid for which post-receive hooks were
32	32	** run.
33	33	**
34		-** hook-embargo Do not run hooks again before this julianday.
	34	+** hook-embargo Do not run hooks again before this Julian day.
35	35	**
36	36	** For "after-receive" hooks, a list of the received artifacts is sent
37	37	** into the command via standard input. Each line of input begins with
38	38	** the hash of the artifact and continues with a description of the
39	39	** interpretation of the artifact.
40	40

	--- src/hook.c
	+++ src/hook.c
	@@ -29,11 +29,11 @@
29	** }
30	**
31	** hook-last-rcvid The last rcvid for which post-receive hooks were
32	** run.
33	**
34	** hook-embargo Do not run hooks again before this julianday.
35	**
36	** For "after-receive" hooks, a list of the received artifacts is sent
37	** into the command via standard input. Each line of input begins with
38	** the hash of the artifact and continues with a description of the
39	** interpretation of the artifact.
40

	--- src/hook.c
	+++ src/hook.c
	@@ -29,11 +29,11 @@
29	** }
30	**
31	** hook-last-rcvid The last rcvid for which post-receive hooks were
32	** run.
33	**
34	** hook-embargo Do not run hooks again before this Julian day.
35	**
36	** For "after-receive" hooks, a list of the received artifacts is sent
37	** into the command via standard input. Each line of input begins with
38	** the hash of the artifact and continues with a description of the
39	** interpretation of the artifact.
40

M src/http.c

+1 -1

		--- src/http.c
		+++ src/http.c
		@@ -353,11 +353,11 @@
353	353	db_finalize(&s);
354	354	db_swap_connections();
355	355	}
356	356	}
357	357
358		-/* Add an approprate PATH= argument to the SSH command under construction
	358	+/* Add an appropriate PATH= argument to the SSH command under construction
359	359	** in pCmd.
360	360	**
361	361	** About This Feature
362	362	** ==================
363	363	**
364	364

	--- src/http.c
	+++ src/http.c
	@@ -353,11 +353,11 @@
353	db_finalize(&s);
354	db_swap_connections();
355	}
356	}
357
358	/* Add an approprate PATH= argument to the SSH command under construction
359	** in pCmd.
360	**
361	** About This Feature
362	** ==================
363	**
364

	--- src/http.c
	+++ src/http.c
	@@ -353,11 +353,11 @@
353	db_finalize(&s);
354	db_swap_connections();
355	}
356	}
357
358	/* Add an appropriate PATH= argument to the SSH command under construction
359	** in pCmd.
360	**
361	** About This Feature
362	** ==================
363	**
364

M src/http_ssl.c

+1 -1

		--- src/http_ssl.c
		+++ src/http_ssl.c
		@@ -270,11 +270,11 @@
270	270
271	271	/* Find the trust store */
272	272	zFile = 0;
273	273	for(i=0; zFile==0 && i<5; i++){
274	274	switch( i ){
275		- case 0: /* First priority is environmentn variables */
	275	+ case 0: /* First priority is environment variables */
276	276	zFile = fossil_getenv(X509_get_default_cert_file_env());
277	277	break;
278	278	case 1:
279	279	zFile = fossil_getenv(X509_get_default_cert_dir_env());
280	280	break;
281	281

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -270,11 +270,11 @@
270
271	/* Find the trust store */
272	zFile = 0;
273	for(i=0; zFile==0 && i<5; i++){
274	switch( i ){
275	case 0: /* First priority is environmentn variables */
276	zFile = fossil_getenv(X509_get_default_cert_file_env());
277	break;
278	case 1:
279	zFile = fossil_getenv(X509_get_default_cert_dir_env());
280	break;
281

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -270,11 +270,11 @@
270
271	/* Find the trust store */
272	zFile = 0;
273	for(i=0; zFile==0 && i<5; i++){
274	switch( i ){
275	case 0: /* First priority is environment variables */
276	zFile = fossil_getenv(X509_get_default_cert_file_env());
277	break;
278	case 1:
279	zFile = fossil_getenv(X509_get_default_cert_dir_env());
280	break;
281

M src/json.c

+4 -4

		--- src/json.c
		+++ src/json.c
		@@ -240,11 +240,11 @@
240	240	** - g.json.gc.a is NULL
241	241	** - key is NULL or empty.
242	242	**
243	243	** Returns 0 on success.
244	244	**
245		-** Ownership of v is transfered to (or shared with) g.json.gc, and v
	245	+** Ownership of v is transferred to (or shared with) g.json.gc, and v
246	246	** will be valid until that object is cleaned up or some internal code
247	247	** incorrectly removes it from the gc (which we never do). If this
248	248	** function fails, it is fatal to the app (as it indicates an
249	249	** allocation error (more likely than not) or a serious internal error
250	250	** such as numeric overflow).
		@@ -271,11 +271,11 @@
271	271
272	272
273	273	/*
274	274	** Returns the value of json_rc_cstr(code) as a new JSON
275	275	** string, which is owned by the caller and must eventually
276		-** be cson_value_free()d or transfered to a JSON container.
	276	+** be cson_value_free()d or transferred to a JSON container.
277	277	*/
278	278	cson_value * json_rc_string( int code ){
279	279	return cson_value_new_string( json_rc_cstr(code), 11 );
280	280	}
281	281
		@@ -864,11 +864,11 @@
864	864	/*
865	865	** Splits zStr (which must not be NULL) into tokens separated by the
866	866	** given separator character. If doDeHttp is true then each element
867	867	** will be passed through dehttpize(), otherwise they are used
868	868	** as-is. Note that tokenization happens before dehttpize(),
869		-** which is significant if the ENcoded tokens might contain the
	869	+** which is significant if the encoded tokens might contain the
870	870	** separator character.
871	871	**
872	872	** Each new element is appended to the given target array object,
873	873	** which must not be NULL and ownership of it is not changed by this
874	874	** call.
		@@ -1437,11 +1437,11 @@
1437	1437	** If payload is not NULL and resultCode is 0 then it is set as the
1438	1438	** "payload" property of the returned object. If resultCode is 0 then
1439	1439	** it defaults to g.json.resultCode. If resultCode is (or defaults to)
1440	1440	** non-zero and payload is not NULL then this function calls
1441	1441	** cson_value_free(payload) and does not insert the payload into the
1442		-** response. In either case, ownership of payload is transfered to (or
	1442	+** response. In either case, ownership of payload is transferred to (or
1443	1443	** shared with, if the caller holds a reference) this function.
1444	1444	**
1445	1445	** pMsg is an optional message string property (resultText) of the
1446	1446	** response. If resultCode is non-0 and pMsg is NULL then
1447	1447	** json_err_cstr() is used to get the error string. The caller may
1448	1448

	--- src/json.c
	+++ src/json.c
	@@ -240,11 +240,11 @@
240	** - g.json.gc.a is NULL
241	** - key is NULL or empty.
242	**
243	** Returns 0 on success.
244	**
245	** Ownership of v is transfered to (or shared with) g.json.gc, and v
246	** will be valid until that object is cleaned up or some internal code
247	** incorrectly removes it from the gc (which we never do). If this
248	** function fails, it is fatal to the app (as it indicates an
249	** allocation error (more likely than not) or a serious internal error
250	** such as numeric overflow).
	@@ -271,11 +271,11 @@
271
272
273	/*
274	** Returns the value of json_rc_cstr(code) as a new JSON
275	** string, which is owned by the caller and must eventually
276	** be cson_value_free()d or transfered to a JSON container.
277	*/
278	cson_value * json_rc_string( int code ){
279	return cson_value_new_string( json_rc_cstr(code), 11 );
280	}
281
	@@ -864,11 +864,11 @@
864	/*
865	** Splits zStr (which must not be NULL) into tokens separated by the
866	** given separator character. If doDeHttp is true then each element
867	** will be passed through dehttpize(), otherwise they are used
868	** as-is. Note that tokenization happens before dehttpize(),
869	** which is significant if the ENcoded tokens might contain the
870	** separator character.
871	**
872	** Each new element is appended to the given target array object,
873	** which must not be NULL and ownership of it is not changed by this
874	** call.
	@@ -1437,11 +1437,11 @@
1437	** If payload is not NULL and resultCode is 0 then it is set as the
1438	** "payload" property of the returned object. If resultCode is 0 then
1439	** it defaults to g.json.resultCode. If resultCode is (or defaults to)
1440	** non-zero and payload is not NULL then this function calls
1441	** cson_value_free(payload) and does not insert the payload into the
1442	** response. In either case, ownership of payload is transfered to (or
1443	** shared with, if the caller holds a reference) this function.
1444	**
1445	** pMsg is an optional message string property (resultText) of the
1446	** response. If resultCode is non-0 and pMsg is NULL then
1447	** json_err_cstr() is used to get the error string. The caller may
1448

	--- src/json.c
	+++ src/json.c
	@@ -240,11 +240,11 @@
240	** - g.json.gc.a is NULL
241	** - key is NULL or empty.
242	**
243	** Returns 0 on success.
244	**
245	** Ownership of v is transferred to (or shared with) g.json.gc, and v
246	** will be valid until that object is cleaned up or some internal code
247	** incorrectly removes it from the gc (which we never do). If this
248	** function fails, it is fatal to the app (as it indicates an
249	** allocation error (more likely than not) or a serious internal error
250	** such as numeric overflow).
	@@ -271,11 +271,11 @@
271
272
273	/*
274	** Returns the value of json_rc_cstr(code) as a new JSON
275	** string, which is owned by the caller and must eventually
276	** be cson_value_free()d or transferred to a JSON container.
277	*/
278	cson_value * json_rc_string( int code ){
279	return cson_value_new_string( json_rc_cstr(code), 11 );
280	}
281
	@@ -864,11 +864,11 @@
864	/*
865	** Splits zStr (which must not be NULL) into tokens separated by the
866	** given separator character. If doDeHttp is true then each element
867	** will be passed through dehttpize(), otherwise they are used
868	** as-is. Note that tokenization happens before dehttpize(),
869	** which is significant if the encoded tokens might contain the
870	** separator character.
871	**
872	** Each new element is appended to the given target array object,
873	** which must not be NULL and ownership of it is not changed by this
874	** call.
	@@ -1437,11 +1437,11 @@
1437	** If payload is not NULL and resultCode is 0 then it is set as the
1438	** "payload" property of the returned object. If resultCode is 0 then
1439	** it defaults to g.json.resultCode. If resultCode is (or defaults to)
1440	** non-zero and payload is not NULL then this function calls
1441	** cson_value_free(payload) and does not insert the payload into the
1442	** response. In either case, ownership of payload is transferred to (or
1443	** shared with, if the caller holds a reference) this function.
1444	**
1445	** pMsg is an optional message string property (resultText) of the
1446	** response. If resultCode is non-0 and pMsg is NULL then
1447	** json_err_cstr() is used to get the error string. The caller may
1448

M src/json_report.c

+1 -1

		--- src/json_report.c
		+++ src/json_report.c
		@@ -155,11 +155,11 @@
155	155	**
156	156	** report=int (CLI: -report # or -r #) is the report number to run.
157	157	**
158	158	** limit=int (CLI: -limit # or -n #) -n is for compat. with other commands.
159	159	**
160		-** format=a\|o Specifies result format: a=each row is an arry, o=each
	160	+** format=a\|o Specifies result format: a=each row is an array, o=each
161	161	** row is an object. Default=o.
162	162	*/
163	163	static cson_value * json_report_run(void){
164	164	int nReport;
165	165	Stmt q = empty_Stmt;
166	166

	--- src/json_report.c
	+++ src/json_report.c
	@@ -155,11 +155,11 @@
155	**
156	** report=int (CLI: -report # or -r #) is the report number to run.
157	**
158	** limit=int (CLI: -limit # or -n #) -n is for compat. with other commands.
159	**
160	** format=a\|o Specifies result format: a=each row is an arry, o=each
161	** row is an object. Default=o.
162	*/
163	static cson_value * json_report_run(void){
164	int nReport;
165	Stmt q = empty_Stmt;
166

	--- src/json_report.c
	+++ src/json_report.c
	@@ -155,11 +155,11 @@
155	**
156	** report=int (CLI: -report # or -r #) is the report number to run.
157	**
158	** limit=int (CLI: -limit # or -n #) -n is for compat. with other commands.
159	**
160	** format=a\|o Specifies result format: a=each row is an array, o=each
161	** row is an object. Default=o.
162	*/
163	static cson_value * json_report_run(void){
164	int nReport;
165	Stmt q = empty_Stmt;
166

M src/login.c

+6 -6

		--- src/login.c
		+++ src/login.c
		@@ -293,11 +293,11 @@
293	293	**
294	294	** This function also updates the user.cookie, user.ipaddr,
295	295	** and user.cexpire fields for the given user.
296	296	**
297	297	** If zDest is not NULL then the generated cookie is copied to
298		-** *zDdest and ownership is transfered to the caller (who should
	298	+** *zDdest and ownership is transferred to the caller (who should
299	299	** eventually pass it to free()).
300	300	**
301	301	** If bSessionCookie is true, the cookie will be a session cookie,
302	302	** else a persistent cookie. If it's a session cookie, the
303	303	** [user].[cexpire] and [user].[cookie] entries will be modified as if
		@@ -379,11 +379,11 @@
379	379	** If bSessionCookie is true, the cookie will be a session cookie.
380	380	**
381	381	** Search for tag-20250817a to find the code that recognizes this cookie.
382	382	*/
383	383	void login_set_anon_cookie(char **zCookieDest, int bSessionCookie){
384		- char zNow; / Current time (julian day number) */
	384	+ char zNow; / Current time (Julian day number) */
385	385	char zCookie; / The login cookie */
386	386	const char zUserAgent; / The user agent */
387	387	const char zCookieName; / Name of the login cookie */
388	388	Blob b; /* Blob used during cookie construction */
389	389	int expires = bSessionCookie ? 0 : anon_cookie_lifespan();
		@@ -1931,11 +1931,11 @@
1931	1931	}
1932	1932	}
1933	1933
1934	1934	/*
1935	1935	** Call this routine if the user lacks g.perm.Hyperlink permission. If
1936		-** the anonymous user has Hyperlink permission, then paint a mesage
	1936	+** the anonymous user has Hyperlink permission, then paint a message
1937	1937	** to inform the user that much more information is available by
1938	1938	** logging in as anonymous.
1939	1939	*/
1940	1940	void login_anonymous_available(void){
1941	1941	if( !g.perm.Hyperlink && g.anon.Hyperlink && anon_cookie_lifespan()>0 ){
		@@ -1955,11 +1955,11 @@
1955	1955	}
1956	1956
1957	1957	/*
1958	1958	** Check to see if the candidate username zUserID is already used.
1959	1959	** Return 1 if it is already in use. Return 0 if the name is
1960		-** available for a self-registeration.
	1960	+** available for a self-registration.
1961	1961	*/
1962	1962	static int login_self_choosen_userid_already_exists(const char *zUserID){
1963	1963	int rc = db_exists(
1964	1964	"SELECT 1 FROM user WHERE login=%Q "
1965	1965	"UNION ALL "
		@@ -2212,11 +2212,11 @@
2212	2212	);
2213	2213	if( db_exists("SELECT 1 FROM subscriber WHERE semail=%Q"
2214	2214	" AND sverified", zEAddr) ){
2215	2215	/* This the case where the user was formerly a verified subscriber
2216	2216	** and here they have also registered as a user as well. It is
2217		- ** not necessary to repeat the verfication step */
	2217	+ ** not necessary to repeat the verification step */
2218	2218	login_redirect_to_g();
2219	2219	}
2220	2220	/* A verification email */
2221	2221	pSender = alert_sender_new(0,0);
2222	2222	blob_init(&hdr,0,0);
		@@ -2383,11 +2383,11 @@
2383	2383	style_finish_page();
2384	2384	return;
2385	2385	}
2386	2386	zEAddr = PDT("ea","");
2387	2387
2388		- /* Verify user imputs */
	2388	+ /* Verify user inputs */
2389	2389	if( !cgi_csrf_safe(1) \|\| P("reqpwreset")==0 ){
2390	2390	/* This is the initial display of the form. No processing or error
2391	2391	** checking is to be done. Fall through into the form display
2392	2392	**
2393	2393	** cgi_csrf_safe(): Nothing interesting happens on this page without
2394	2394

	--- src/login.c
	+++ src/login.c
	@@ -293,11 +293,11 @@
293	**
294	** This function also updates the user.cookie, user.ipaddr,
295	** and user.cexpire fields for the given user.
296	**
297	** If zDest is not NULL then the generated cookie is copied to
298	** *zDdest and ownership is transfered to the caller (who should
299	** eventually pass it to free()).
300	**
301	** If bSessionCookie is true, the cookie will be a session cookie,
302	** else a persistent cookie. If it's a session cookie, the
303	** [user].[cexpire] and [user].[cookie] entries will be modified as if
	@@ -379,11 +379,11 @@
379	** If bSessionCookie is true, the cookie will be a session cookie.
380	**
381	** Search for tag-20250817a to find the code that recognizes this cookie.
382	*/
383	void login_set_anon_cookie(char **zCookieDest, int bSessionCookie){
384	char zNow; / Current time (julian day number) */
385	char zCookie; / The login cookie */
386	const char zUserAgent; / The user agent */
387	const char zCookieName; / Name of the login cookie */
388	Blob b; /* Blob used during cookie construction */
389	int expires = bSessionCookie ? 0 : anon_cookie_lifespan();
	@@ -1931,11 +1931,11 @@
1931	}
1932	}
1933
1934	/*
1935	** Call this routine if the user lacks g.perm.Hyperlink permission. If
1936	** the anonymous user has Hyperlink permission, then paint a mesage
1937	** to inform the user that much more information is available by
1938	** logging in as anonymous.
1939	*/
1940	void login_anonymous_available(void){
1941	if( !g.perm.Hyperlink && g.anon.Hyperlink && anon_cookie_lifespan()>0 ){
	@@ -1955,11 +1955,11 @@
1955	}
1956
1957	/*
1958	** Check to see if the candidate username zUserID is already used.
1959	** Return 1 if it is already in use. Return 0 if the name is
1960	** available for a self-registeration.
1961	*/
1962	static int login_self_choosen_userid_already_exists(const char *zUserID){
1963	int rc = db_exists(
1964	"SELECT 1 FROM user WHERE login=%Q "
1965	"UNION ALL "
	@@ -2212,11 +2212,11 @@
2212	);
2213	if( db_exists("SELECT 1 FROM subscriber WHERE semail=%Q"
2214	" AND sverified", zEAddr) ){
2215	/* This the case where the user was formerly a verified subscriber
2216	** and here they have also registered as a user as well. It is
2217	** not necessary to repeat the verfication step */
2218	login_redirect_to_g();
2219	}
2220	/* A verification email */
2221	pSender = alert_sender_new(0,0);
2222	blob_init(&hdr,0,0);
	@@ -2383,11 +2383,11 @@
2383	style_finish_page();
2384	return;
2385	}
2386	zEAddr = PDT("ea","");
2387
2388	/* Verify user imputs */
2389	if( !cgi_csrf_safe(1) \|\| P("reqpwreset")==0 ){
2390	/* This is the initial display of the form. No processing or error
2391	** checking is to be done. Fall through into the form display
2392	**
2393	** cgi_csrf_safe(): Nothing interesting happens on this page without
2394

	--- src/login.c
	+++ src/login.c
	@@ -293,11 +293,11 @@
293	**
294	** This function also updates the user.cookie, user.ipaddr,
295	** and user.cexpire fields for the given user.
296	**
297	** If zDest is not NULL then the generated cookie is copied to
298	** *zDdest and ownership is transferred to the caller (who should
299	** eventually pass it to free()).
300	**
301	** If bSessionCookie is true, the cookie will be a session cookie,
302	** else a persistent cookie. If it's a session cookie, the
303	** [user].[cexpire] and [user].[cookie] entries will be modified as if
	@@ -379,11 +379,11 @@
379	** If bSessionCookie is true, the cookie will be a session cookie.
380	**
381	** Search for tag-20250817a to find the code that recognizes this cookie.
382	*/
383	void login_set_anon_cookie(char **zCookieDest, int bSessionCookie){
384	char zNow; / Current time (Julian day number) */
385	char zCookie; / The login cookie */
386	const char zUserAgent; / The user agent */
387	const char zCookieName; / Name of the login cookie */
388	Blob b; /* Blob used during cookie construction */
389	int expires = bSessionCookie ? 0 : anon_cookie_lifespan();
	@@ -1931,11 +1931,11 @@
1931	}
1932	}
1933
1934	/*
1935	** Call this routine if the user lacks g.perm.Hyperlink permission. If
1936	** the anonymous user has Hyperlink permission, then paint a message
1937	** to inform the user that much more information is available by
1938	** logging in as anonymous.
1939	*/
1940	void login_anonymous_available(void){
1941	if( !g.perm.Hyperlink && g.anon.Hyperlink && anon_cookie_lifespan()>0 ){
	@@ -1955,11 +1955,11 @@
1955	}
1956
1957	/*
1958	** Check to see if the candidate username zUserID is already used.
1959	** Return 1 if it is already in use. Return 0 if the name is
1960	** available for a self-registration.
1961	*/
1962	static int login_self_choosen_userid_already_exists(const char *zUserID){
1963	int rc = db_exists(
1964	"SELECT 1 FROM user WHERE login=%Q "
1965	"UNION ALL "
	@@ -2212,11 +2212,11 @@
2212	);
2213	if( db_exists("SELECT 1 FROM subscriber WHERE semail=%Q"
2214	" AND sverified", zEAddr) ){
2215	/* This the case where the user was formerly a verified subscriber
2216	** and here they have also registered as a user as well. It is
2217	** not necessary to repeat the verification step */
2218	login_redirect_to_g();
2219	}
2220	/* A verification email */
2221	pSender = alert_sender_new(0,0);
2222	blob_init(&hdr,0,0);
	@@ -2383,11 +2383,11 @@
2383	style_finish_page();
2384	return;
2385	}
2386	zEAddr = PDT("ea","");
2387
2388	/* Verify user inputs */
2389	if( !cgi_csrf_safe(1) \|\| P("reqpwreset")==0 ){
2390	/* This is the initial display of the form. No processing or error
2391	** checking is to be done. Fall through into the form display
2392	**
2393	** cgi_csrf_safe(): Nothing interesting happens on this page without
2394

M src/main.c

+3 -3

		--- src/main.c
		+++ src/main.c
		@@ -63,11 +63,11 @@
63	63	#ifdef HAVE_BACKTRACE
64	64	# include <execinfo.h>
65	65	#endif
66	66
67	67	/*
68		-** Default length of a timeout for serving an HTTP request. Changable
	68	+** Default length of a timeout for serving an HTTP request. Changeable
69	69	** using the "--timeout N" command-line option or via "timeout: N" in the
70	70	** CGI script.
71	71	*/
72	72	#ifndef FOSSIL_DEFAULT_TIMEOUT
73	73	# define FOSSIL_DEFAULT_TIMEOUT 600 /* 10 minutes */
		@@ -1190,11 +1190,11 @@
1190	1190	** list and this function immediately returns. The effect is to treat
1191	1191	** all arguments after "--" as non-flags (conventionally used to
1192	1192	** enable passing-in of filenames which start with a dash).
1193	1193	**
1194	1194	** This function must normally only be called one time per app
1195		-** invokation. The exception is commands which process their
	1195	+** invocation. The exception is commands which process their
1196	1196	** arguments, call this to confirm that there are no extraneous flags,
1197	1197	** then modify the arguments list for forwarding to another
1198	1198	** (sub)command (which itself will call this to confirm its own
1199	1199	** arguments).
1200	1200	*/
		@@ -1402,11 +1402,11 @@
1402	1402	style_finish_page();
1403	1403	}
1404	1404
1405	1405
1406	1406	/*
1407		-** Set the g.zBaseURL value to the full URL for the toplevel of
	1407	+** Set the g.zBaseURL value to the full URL for the top level of
1408	1408	** the fossil tree. Set g.zTop to g.zBaseURL without the
1409	1409	** leading "http://" and the host and port.
1410	1410	**
1411	1411	** The g.zBaseURL is normally set based on HTTP_HOST and SCRIPT_NAME
1412	1412	** environment variables. However, if zAltBase is not NULL then it
1413	1413

	--- src/main.c
	+++ src/main.c
	@@ -63,11 +63,11 @@
63	#ifdef HAVE_BACKTRACE
64	# include <execinfo.h>
65	#endif
66
67	/*
68	** Default length of a timeout for serving an HTTP request. Changable
69	** using the "--timeout N" command-line option or via "timeout: N" in the
70	** CGI script.
71	*/
72	#ifndef FOSSIL_DEFAULT_TIMEOUT
73	# define FOSSIL_DEFAULT_TIMEOUT 600 /* 10 minutes */
	@@ -1190,11 +1190,11 @@
1190	** list and this function immediately returns. The effect is to treat
1191	** all arguments after "--" as non-flags (conventionally used to
1192	** enable passing-in of filenames which start with a dash).
1193	**
1194	** This function must normally only be called one time per app
1195	** invokation. The exception is commands which process their
1196	** arguments, call this to confirm that there are no extraneous flags,
1197	** then modify the arguments list for forwarding to another
1198	** (sub)command (which itself will call this to confirm its own
1199	** arguments).
1200	*/
	@@ -1402,11 +1402,11 @@
1402	style_finish_page();
1403	}
1404
1405
1406	/*
1407	** Set the g.zBaseURL value to the full URL for the toplevel of
1408	** the fossil tree. Set g.zTop to g.zBaseURL without the
1409	** leading "http://" and the host and port.
1410	**
1411	** The g.zBaseURL is normally set based on HTTP_HOST and SCRIPT_NAME
1412	** environment variables. However, if zAltBase is not NULL then it
1413

	--- src/main.c
	+++ src/main.c
	@@ -63,11 +63,11 @@
63	#ifdef HAVE_BACKTRACE
64	# include <execinfo.h>
65	#endif
66
67	/*
68	** Default length of a timeout for serving an HTTP request. Changeable
69	** using the "--timeout N" command-line option or via "timeout: N" in the
70	** CGI script.
71	*/
72	#ifndef FOSSIL_DEFAULT_TIMEOUT
73	# define FOSSIL_DEFAULT_TIMEOUT 600 /* 10 minutes */
	@@ -1190,11 +1190,11 @@
1190	** list and this function immediately returns. The effect is to treat
1191	** all arguments after "--" as non-flags (conventionally used to
1192	** enable passing-in of filenames which start with a dash).
1193	**
1194	** This function must normally only be called one time per app
1195	** invocation. The exception is commands which process their
1196	** arguments, call this to confirm that there are no extraneous flags,
1197	** then modify the arguments list for forwarding to another
1198	** (sub)command (which itself will call this to confirm its own
1199	** arguments).
1200	*/
	@@ -1402,11 +1402,11 @@
1402	style_finish_page();
1403	}
1404
1405
1406	/*
1407	** Set the g.zBaseURL value to the full URL for the top level of
1408	** the fossil tree. Set g.zTop to g.zBaseURL without the
1409	** leading "http://" and the host and port.
1410	**
1411	** The g.zBaseURL is normally set based on HTTP_HOST and SCRIPT_NAME
1412	** environment variables. However, if zAltBase is not NULL then it
1413

M src/manifest.c

+2 -2

		--- src/manifest.c
		+++ src/manifest.c
		@@ -2994,11 +2994,11 @@
2994	2994	KVP_STR(1, uuid, pF->zUuid);
2995	2995	KVP_STR(1, perm, pF->zPerm);
2996	2996	KVP_STR(1, rename, pF->zPrior);
2997	2997	blob_append_char(b, '}');
2998	2998	}
2999		- /* Special case: model checkins with no F-card as having an empty
	2999	+ /* Special case: model check-ins with no F-card as having an empty
3000	3000	** array, rather than no F-cards, to hypothetically simplify
3001	3001	** handling in JSON queries. */
3002	3002	blob_append_char(b, ']');
3003	3003	}
3004	3004	CARD_STR2(G, p->zThreadRoot);
		@@ -3038,11 +3038,11 @@
3038	3038	blob_append_char(b, '[');
3039	3039	for( i = 0; i < p->nParent; ++i ){
3040	3040	if( i>0 ) blob_append_char(b, ',');
3041	3041	blob_appendf(b, "%!j", p->azParent[i]);
3042	3042	}
3043		- /* Special case: model checkins with no P-card as having an empty
	3043	+ /* Special case: model check-ins with no P-card as having an empty
3044	3044	** array, as per F-cards. */
3045	3045	blob_append_char(b, ']');
3046	3046	}
3047	3047	if( p->nCherrypick ){
3048	3048	CARD_LETTER(Q);
3049	3049

	--- src/manifest.c
	+++ src/manifest.c
	@@ -2994,11 +2994,11 @@
2994	KVP_STR(1, uuid, pF->zUuid);
2995	KVP_STR(1, perm, pF->zPerm);
2996	KVP_STR(1, rename, pF->zPrior);
2997	blob_append_char(b, '}');
2998	}
2999	/* Special case: model checkins with no F-card as having an empty
3000	** array, rather than no F-cards, to hypothetically simplify
3001	** handling in JSON queries. */
3002	blob_append_char(b, ']');
3003	}
3004	CARD_STR2(G, p->zThreadRoot);
	@@ -3038,11 +3038,11 @@
3038	blob_append_char(b, '[');
3039	for( i = 0; i < p->nParent; ++i ){
3040	if( i>0 ) blob_append_char(b, ',');
3041	blob_appendf(b, "%!j", p->azParent[i]);
3042	}
3043	/* Special case: model checkins with no P-card as having an empty
3044	** array, as per F-cards. */
3045	blob_append_char(b, ']');
3046	}
3047	if( p->nCherrypick ){
3048	CARD_LETTER(Q);
3049

	--- src/manifest.c
	+++ src/manifest.c
	@@ -2994,11 +2994,11 @@
2994	KVP_STR(1, uuid, pF->zUuid);
2995	KVP_STR(1, perm, pF->zPerm);
2996	KVP_STR(1, rename, pF->zPrior);
2997	blob_append_char(b, '}');
2998	}
2999	/* Special case: model check-ins with no F-card as having an empty
3000	** array, rather than no F-cards, to hypothetically simplify
3001	** handling in JSON queries. */
3002	blob_append_char(b, ']');
3003	}
3004	CARD_STR2(G, p->zThreadRoot);
	@@ -3038,11 +3038,11 @@
3038	blob_append_char(b, '[');
3039	for( i = 0; i < p->nParent; ++i ){
3040	if( i>0 ) blob_append_char(b, ',');
3041	blob_appendf(b, "%!j", p->azParent[i]);
3042	}
3043	/* Special case: model check-ins with no P-card as having an empty
3044	** array, as per F-cards. */
3045	blob_append_char(b, ']');
3046	}
3047	if( p->nCherrypick ){
3048	CARD_LETTER(Q);
3049

M src/markdown.c

+4 -4

		--- src/markdown.c
		+++ src/markdown.c
		@@ -530,12 +530,12 @@
530	530	}
531	531	}
532	532
533	533	/*
534	534	** data[*pI] should be a "`" character that introduces a code-span.
535		-** The code-span boundry mark can be any number of one or more "`"
536		-** characters. We do not know the size of the boundry marker, only
	535	+** The code-span boundary mark can be any number of one or more "`"
	536	+** characters. We do not know the size of the boundary marker, only
537	537	** that there is at least one "`" at data[*pI].
538	538	**
539	539	** This routine increases *pI to move it past the code-span, including
540	540	** the closing boundary mark. Or, if the code-span is unterminated,
541	541	** this routine moves *pI past the opening boundary mark only.
		@@ -634,11 +634,11 @@
634	634	** punct alnum (*x yes no
635	635	** alnum space a* no yes
636	636	** alnum punct a*( no yes
637	637	** alnum alnum a*x yes yes
638	638	**
639		-** The following routines determine whether a delimitor is left
	639	+** The following routines determine whether a delimiter is left
640	640	** or right flanking.
641	641	*/
642	642	static int left_flanking(char before, char after){
643	643	if( fossil_isspace(after) ) return 0;
644	644	if( fossil_isalnum(after) ) return 1;
		@@ -2533,11 +2533,11 @@
2533	2533
2534	2534	/* failfast if data is too short */
2535	2535	if( beg+5>=end ) return 0;
2536	2536	i = beg;
2537	2537
2538		- /* footnote definition must start at the begining of a line */
	2538	+ /* footnote definition must start at the beginning of a line */
2539	2539	if( data[i]!='[' ) return 0;
2540	2540	i++;
2541	2541	if( data[i]!='^' ) return 0;
2542	2542	id_offset = ++i;
2543	2543
2544	2544

	--- src/markdown.c
	+++ src/markdown.c
	@@ -530,12 +530,12 @@
530	}
531	}
532
533	/*
534	** data[*pI] should be a "`" character that introduces a code-span.
535	** The code-span boundry mark can be any number of one or more "`"
536	** characters. We do not know the size of the boundry marker, only
537	** that there is at least one "`" at data[*pI].
538	**
539	** This routine increases *pI to move it past the code-span, including
540	** the closing boundary mark. Or, if the code-span is unterminated,
541	** this routine moves *pI past the opening boundary mark only.
	@@ -634,11 +634,11 @@
634	** punct alnum (*x yes no
635	** alnum space a* no yes
636	** alnum punct a*( no yes
637	** alnum alnum a*x yes yes
638	**
639	** The following routines determine whether a delimitor is left
640	** or right flanking.
641	*/
642	static int left_flanking(char before, char after){
643	if( fossil_isspace(after) ) return 0;
644	if( fossil_isalnum(after) ) return 1;
	@@ -2533,11 +2533,11 @@
2533
2534	/* failfast if data is too short */
2535	if( beg+5>=end ) return 0;
2536	i = beg;
2537
2538	/* footnote definition must start at the begining of a line */
2539	if( data[i]!='[' ) return 0;
2540	i++;
2541	if( data[i]!='^' ) return 0;
2542	id_offset = ++i;
2543
2544

	--- src/markdown.c
	+++ src/markdown.c
	@@ -530,12 +530,12 @@
530	}
531	}
532
533	/*
534	** data[*pI] should be a "`" character that introduces a code-span.
535	** The code-span boundary mark can be any number of one or more "`"
536	** characters. We do not know the size of the boundary marker, only
537	** that there is at least one "`" at data[*pI].
538	**
539	** This routine increases *pI to move it past the code-span, including
540	** the closing boundary mark. Or, if the code-span is unterminated,
541	** this routine moves *pI past the opening boundary mark only.
	@@ -634,11 +634,11 @@
634	** punct alnum (*x yes no
635	** alnum space a* no yes
636	** alnum punct a*( no yes
637	** alnum alnum a*x yes yes
638	**
639	** The following routines determine whether a delimiter is left
640	** or right flanking.
641	*/
642	static int left_flanking(char before, char after){
643	if( fossil_isspace(after) ) return 0;
644	if( fossil_isalnum(after) ) return 1;
	@@ -2533,11 +2533,11 @@
2533
2534	/* failfast if data is too short */
2535	if( beg+5>=end ) return 0;
2536	i = beg;
2537
2538	/* footnote definition must start at the beginning of a line */
2539	if( data[i]!='[' ) return 0;
2540	i++;
2541	if( data[i]!='^' ) return 0;
2542	id_offset = ++i;
2543
2544

M src/merge.c

+3 -3

		--- src/merge.c
		+++ src/merge.c
		@@ -794,11 +794,11 @@
794	794	char vAncestor = 'p'; /* If P is an ancestor of V then 'p', else 'n' */
795	795	const char zVersion; / The VERSION argument */
796	796	int bMultiMerge = 0; /* True if there are two or more VERSION arguments */
797	797	int nMerge = 0; /* Number of prior merges processed */
798	798	int useUndo = 1; /* True to record changes in the undo log */
799		- Stmt q; /* SQL statment used for merge processing */
	799	+ Stmt q; /* SQL statement used for merge processing */
800	800
801	801
802	802	/* Notation:
803	803	**
804	804	** V The current check-out
		@@ -1044,11 +1044,11 @@
1044	1044	}
1045	1045	if( showVfileFlag ) debug_show_vfile();
1046	1046
1047	1047	/*
1048	1048	** The vfile.pathname field is used to match files against each other. The
1049		- ** FV table contains one row for each each unique filename in
	1049	+ ** FV table contains one row for each unique filename in
1050	1050	** in the current check-out, the pivot, and the version being merged.
1051	1051	*/
1052	1052	db_multi_exec(
1053	1053	"DROP TABLE IF EXISTS fv;"
1054	1054	"CREATE TEMP TABLE fv(\n"
		@@ -1564,11 +1564,11 @@
1564	1564	zFullName = mprintf("%s%s", g.zLocalRoot, zName);
1565	1565	if( file_isfile_or_link(zFullName)
1566	1566	&& !db_exists("SELECT 1 FROM fv WHERE fn=%Q", zName) ){
1567	1567	/* Name of backup file with Original content */
1568	1568	char *zOrig = file_newname(zFullName, "original", 1);
1569		- /* Backup previously unanaged file before to be overwritten */
	1569	+ /* Backup previously unmanaged file before being overwritten */
1570	1570	file_copy(zFullName, zOrig);
1571	1571	fossil_free(zOrig);
1572	1572	fossil_print("ADDED %s (overwrites an unmanaged file)", zName);
1573	1573	if( !dryRunFlag ) fossil_print(", original copy backed up locally");
1574	1574	fossil_print("\n");
1575	1575

	--- src/merge.c
	+++ src/merge.c
	@@ -794,11 +794,11 @@
794	char vAncestor = 'p'; /* If P is an ancestor of V then 'p', else 'n' */
795	const char zVersion; / The VERSION argument */
796	int bMultiMerge = 0; /* True if there are two or more VERSION arguments */
797	int nMerge = 0; /* Number of prior merges processed */
798	int useUndo = 1; /* True to record changes in the undo log */
799	Stmt q; /* SQL statment used for merge processing */
800
801
802	/* Notation:
803	**
804	** V The current check-out
	@@ -1044,11 +1044,11 @@
1044	}
1045	if( showVfileFlag ) debug_show_vfile();
1046
1047	/*
1048	** The vfile.pathname field is used to match files against each other. The
1049	** FV table contains one row for each each unique filename in
1050	** in the current check-out, the pivot, and the version being merged.
1051	*/
1052	db_multi_exec(
1053	"DROP TABLE IF EXISTS fv;"
1054	"CREATE TEMP TABLE fv(\n"
	@@ -1564,11 +1564,11 @@
1564	zFullName = mprintf("%s%s", g.zLocalRoot, zName);
1565	if( file_isfile_or_link(zFullName)
1566	&& !db_exists("SELECT 1 FROM fv WHERE fn=%Q", zName) ){
1567	/* Name of backup file with Original content */
1568	char *zOrig = file_newname(zFullName, "original", 1);
1569	/* Backup previously unanaged file before to be overwritten */
1570	file_copy(zFullName, zOrig);
1571	fossil_free(zOrig);
1572	fossil_print("ADDED %s (overwrites an unmanaged file)", zName);
1573	if( !dryRunFlag ) fossil_print(", original copy backed up locally");
1574	fossil_print("\n");
1575

	--- src/merge.c
	+++ src/merge.c
	@@ -794,11 +794,11 @@
794	char vAncestor = 'p'; /* If P is an ancestor of V then 'p', else 'n' */
795	const char zVersion; / The VERSION argument */
796	int bMultiMerge = 0; /* True if there are two or more VERSION arguments */
797	int nMerge = 0; /* Number of prior merges processed */
798	int useUndo = 1; /* True to record changes in the undo log */
799	Stmt q; /* SQL statement used for merge processing */
800
801
802	/* Notation:
803	**
804	** V The current check-out
	@@ -1044,11 +1044,11 @@
1044	}
1045	if( showVfileFlag ) debug_show_vfile();
1046
1047	/*
1048	** The vfile.pathname field is used to match files against each other. The
1049	** FV table contains one row for each unique filename in
1050	** in the current check-out, the pivot, and the version being merged.
1051	*/
1052	db_multi_exec(
1053	"DROP TABLE IF EXISTS fv;"
1054	"CREATE TEMP TABLE fv(\n"
	@@ -1564,11 +1564,11 @@
1564	zFullName = mprintf("%s%s", g.zLocalRoot, zName);
1565	if( file_isfile_or_link(zFullName)
1566	&& !db_exists("SELECT 1 FROM fv WHERE fn=%Q", zName) ){
1567	/* Name of backup file with Original content */
1568	char *zOrig = file_newname(zFullName, "original", 1);
1569	/* Backup previously unmanaged file before being overwritten */
1570	file_copy(zFullName, zOrig);
1571	fossil_free(zOrig);
1572	fossil_print("ADDED %s (overwrites an unmanaged file)", zName);
1573	if( !dryRunFlag ) fossil_print(", original copy backed up locally");
1574	fossil_print("\n");
1575

M src/merge3.c

+2 -2

		--- src/merge3.c
		+++ src/merge3.c
		@@ -175,11 +175,11 @@
175	175	/* These are generic methods for MergeBuilder. They just output debugging
176	176	** information. But some of them are useful as base methods for other useful
177	177	** implementations of MergeBuilder.
178	178	*/
179	179
180		-/* xStart() and xEnd() are called to generate header and fotter information
	180	+/* xStart() and xEnd() are called to generate header and footer information
181	181	** in the output. This is a no-op in the generic implementation.
182	182	*/
183	183	static void dbgStartEnd(MergeBuilder *p){ (void)p; }
184	184
185	185	/* The next N lines of PIVOT are unchanged in both V1 and V2
		@@ -716,11 +716,11 @@
716	716	*/
717	717	static int skip_conflict(
718	718	int aC, / Array of integer triples describing the edit */
719	719	int i, /* Index in aC[] of current location */
720	720	int sz, /* Lines of A that have been skipped */
721		- unsigned int pLn / OUT: Lines of B to skip to keep aligment with A */
	721	+ unsigned int pLn / OUT: Lines of B to skip to keep alignment with A */
722	722	){
723	723	*pLn = 0;
724	724	while( sz>0 ){
725	725	if( aC[i]==0 && aC[i+1]==0 && aC[i+2]==0 ) break;
726	726	if( aC[i]>=sz ){
727	727

	--- src/merge3.c
	+++ src/merge3.c
	@@ -175,11 +175,11 @@
175	/* These are generic methods for MergeBuilder. They just output debugging
176	** information. But some of them are useful as base methods for other useful
177	** implementations of MergeBuilder.
178	*/
179
180	/* xStart() and xEnd() are called to generate header and fotter information
181	** in the output. This is a no-op in the generic implementation.
182	*/
183	static void dbgStartEnd(MergeBuilder *p){ (void)p; }
184
185	/* The next N lines of PIVOT are unchanged in both V1 and V2
	@@ -716,11 +716,11 @@
716	*/
717	static int skip_conflict(
718	int aC, / Array of integer triples describing the edit */
719	int i, /* Index in aC[] of current location */
720	int sz, /* Lines of A that have been skipped */
721	unsigned int pLn / OUT: Lines of B to skip to keep aligment with A */
722	){
723	*pLn = 0;
724	while( sz>0 ){
725	if( aC[i]==0 && aC[i+1]==0 && aC[i+2]==0 ) break;
726	if( aC[i]>=sz ){
727

	--- src/merge3.c
	+++ src/merge3.c
	@@ -175,11 +175,11 @@
175	/* These are generic methods for MergeBuilder. They just output debugging
176	** information. But some of them are useful as base methods for other useful
177	** implementations of MergeBuilder.
178	*/
179
180	/* xStart() and xEnd() are called to generate header and footer information
181	** in the output. This is a no-op in the generic implementation.
182	*/
183	static void dbgStartEnd(MergeBuilder *p){ (void)p; }
184
185	/* The next N lines of PIVOT are unchanged in both V1 and V2
	@@ -716,11 +716,11 @@
716	*/
717	static int skip_conflict(
718	int aC, / Array of integer triples describing the edit */
719	int i, /* Index in aC[] of current location */
720	int sz, /* Lines of A that have been skipped */
721	unsigned int pLn / OUT: Lines of B to skip to keep alignment with A */
722	){
723	*pLn = 0;
724	while( sz>0 ){
725	if( aC[i]==0 && aC[i+1]==0 && aC[i+2]==0 ) break;
726	if( aC[i]>=sz ){
727

M src/printf.c

+6 -6

		--- src/printf.c
		+++ src/printf.c
		@@ -13,11 +13,11 @@
13	13	** [email protected]
14	14	** http://www.hwaci.com/drh/
15	15	**
16	16	*******************************************************************************
17	17	**
18		-** This file contains implementions of routines for formatting output
	18	+** This file contains implementations of routines for formatting output
19	19	** (ex: mprintf()) and for output to the console.
20	20	*/
21	21	#include "config.h"
22	22	#include "printf.h"
23	23	#if defined(_WIN32)
		@@ -89,11 +89,11 @@
89	89	#define etBLOB 11 /* Blob objects. %b */
90	90	#define etBLOBSQL 12 /* Blob objects quoted for SQL. %B */
91	91	#define etSQLESCAPE 13 /* Strings with '\'' doubled. %q */
92	92	#define etSQLESCAPE2 14 /* Strings with '\'' doubled and enclosed in '',
93	93	NULL pointers replaced by SQL NULL. %Q */
94		-#define etSQLESCAPE3 15 /* Double '"' characters within an indentifier. %w */
	94	+#define etSQLESCAPE3 15 /* Double '"' characters within an identifier. %w */
95	95	#define etPOINTER 16 /* The %p conversion */
96	96	#define etHTMLIZE 17 /* Make text safe for HTML */
97	97	#define etHTTPIZE 18 /* Make text safe for HTTP. "/" encoded as %2f */
98	98	#define etURLIZE 19 /* Make text safe for HTTP. "/" not encoded */
99	99	#define etFOSSILIZE 20 /* The fossil header encoding format. */
		@@ -265,12 +265,12 @@
265	265	** configuration parameters.
266	266	**
267	267	** The altForm2 argument is true for "%!W" (with the "!" alternate-form-2
268	268	** flags) and is false for plain "%W". The ! flag indicates that the
269	269	** formatting is for display of a check-in comment on the timeline. Such
270		-** comments used to be renderedd differently, but ever since 2020, they
271		-** have been rendered identially, so the ! flag does not make any different
	270	+** comments used to be rendered differently, but ever since 2020, they
	271	+** have been rendered identically, so the ! flag does not make any different
272	272	** in the output any more.
273	273	*/
274	274	int wiki_convert_flags(int altForm2){
275	275	static int wikiFlags = 0;
276	276	(void)altForm2;
		@@ -1188,13 +1188,13 @@
1188	1188	**
1189	1189	** The main difference between fossil_fatal() and fossil_panic() is that
1190	1190	** fossil_panic() makes an entry in the error log whereas fossil_fatal()
1191	1191	** does not. On POSIX platforms, if there is not an error log, then both
1192	1192	** routines work similarly with respect to user-visible effects. Hence,
1193		-** the routines are interchangable for commands and only act differently
	1193	+** the routines are interchangeable for commands and only act differently
1194	1194	** when processing web pages. On the Windows platform, fossil_panic()
1195		-** also displays a pop-up stating that an error has occured and allowing
	1195	+** also displays a pop-up stating that an error has occurred and allowing
1196	1196	** just-in-time debugging to commence. On all platforms, fossil_panic()
1197	1197	** ends execution with a SIGABRT signal, bypassing atexit processing.
1198	1198	** This signal can also produce a core dump on POSIX platforms.
1199	1199	**
1200	1200	** Use fossil_fatal() for malformed inputs that should be reported back
1201	1201

	--- src/printf.c
	+++ src/printf.c
	@@ -13,11 +13,11 @@
13	** [email protected]
14	** http://www.hwaci.com/drh/
15	**
16	*******************************************************************************
17	**
18	** This file contains implementions of routines for formatting output
19	** (ex: mprintf()) and for output to the console.
20	*/
21	#include "config.h"
22	#include "printf.h"
23	#if defined(_WIN32)
	@@ -89,11 +89,11 @@
89	#define etBLOB 11 /* Blob objects. %b */
90	#define etBLOBSQL 12 /* Blob objects quoted for SQL. %B */
91	#define etSQLESCAPE 13 /* Strings with '\'' doubled. %q */
92	#define etSQLESCAPE2 14 /* Strings with '\'' doubled and enclosed in '',
93	NULL pointers replaced by SQL NULL. %Q */
94	#define etSQLESCAPE3 15 /* Double '"' characters within an indentifier. %w */
95	#define etPOINTER 16 /* The %p conversion */
96	#define etHTMLIZE 17 /* Make text safe for HTML */
97	#define etHTTPIZE 18 /* Make text safe for HTTP. "/" encoded as %2f */
98	#define etURLIZE 19 /* Make text safe for HTTP. "/" not encoded */
99	#define etFOSSILIZE 20 /* The fossil header encoding format. */
	@@ -265,12 +265,12 @@
265	** configuration parameters.
266	**
267	** The altForm2 argument is true for "%!W" (with the "!" alternate-form-2
268	** flags) and is false for plain "%W". The ! flag indicates that the
269	** formatting is for display of a check-in comment on the timeline. Such
270	** comments used to be renderedd differently, but ever since 2020, they
271	** have been rendered identially, so the ! flag does not make any different
272	** in the output any more.
273	*/
274	int wiki_convert_flags(int altForm2){
275	static int wikiFlags = 0;
276	(void)altForm2;
	@@ -1188,13 +1188,13 @@
1188	**
1189	** The main difference between fossil_fatal() and fossil_panic() is that
1190	** fossil_panic() makes an entry in the error log whereas fossil_fatal()
1191	** does not. On POSIX platforms, if there is not an error log, then both
1192	** routines work similarly with respect to user-visible effects. Hence,
1193	** the routines are interchangable for commands and only act differently
1194	** when processing web pages. On the Windows platform, fossil_panic()
1195	** also displays a pop-up stating that an error has occured and allowing
1196	** just-in-time debugging to commence. On all platforms, fossil_panic()
1197	** ends execution with a SIGABRT signal, bypassing atexit processing.
1198	** This signal can also produce a core dump on POSIX platforms.
1199	**
1200	** Use fossil_fatal() for malformed inputs that should be reported back
1201

	--- src/printf.c
	+++ src/printf.c
	@@ -13,11 +13,11 @@
13	** [email protected]
14	** http://www.hwaci.com/drh/
15	**
16	*******************************************************************************
17	**
18	** This file contains implementations of routines for formatting output
19	** (ex: mprintf()) and for output to the console.
20	*/
21	#include "config.h"
22	#include "printf.h"
23	#if defined(_WIN32)
	@@ -89,11 +89,11 @@
89	#define etBLOB 11 /* Blob objects. %b */
90	#define etBLOBSQL 12 /* Blob objects quoted for SQL. %B */
91	#define etSQLESCAPE 13 /* Strings with '\'' doubled. %q */
92	#define etSQLESCAPE2 14 /* Strings with '\'' doubled and enclosed in '',
93	NULL pointers replaced by SQL NULL. %Q */
94	#define etSQLESCAPE3 15 /* Double '"' characters within an identifier. %w */
95	#define etPOINTER 16 /* The %p conversion */
96	#define etHTMLIZE 17 /* Make text safe for HTML */
97	#define etHTTPIZE 18 /* Make text safe for HTTP. "/" encoded as %2f */
98	#define etURLIZE 19 /* Make text safe for HTTP. "/" not encoded */
99	#define etFOSSILIZE 20 /* The fossil header encoding format. */
	@@ -265,12 +265,12 @@
265	** configuration parameters.
266	**
267	** The altForm2 argument is true for "%!W" (with the "!" alternate-form-2
268	** flags) and is false for plain "%W". The ! flag indicates that the
269	** formatting is for display of a check-in comment on the timeline. Such
270	** comments used to be rendered differently, but ever since 2020, they
271	** have been rendered identically, so the ! flag does not make any different
272	** in the output any more.
273	*/
274	int wiki_convert_flags(int altForm2){
275	static int wikiFlags = 0;
276	(void)altForm2;
	@@ -1188,13 +1188,13 @@
1188	**
1189	** The main difference between fossil_fatal() and fossil_panic() is that
1190	** fossil_panic() makes an entry in the error log whereas fossil_fatal()
1191	** does not. On POSIX platforms, if there is not an error log, then both
1192	** routines work similarly with respect to user-visible effects. Hence,
1193	** the routines are interchangeable for commands and only act differently
1194	** when processing web pages. On the Windows platform, fossil_panic()
1195	** also displays a pop-up stating that an error has occurred and allowing
1196	** just-in-time debugging to commence. On all platforms, fossil_panic()
1197	** ends execution with a SIGABRT signal, bypassing atexit processing.
1198	** This signal can also produce a core dump on POSIX platforms.
1199	**
1200	** Use fossil_fatal() for malformed inputs that should be reported back
1201

M src/purge.c

+2 -2

		--- src/purge.c
		+++ src/purge.c
		@@ -62,11 +62,11 @@
62	62	#define PURGE_EXPLAIN_ONLY 0x0002 /* Show what would have happened */
63	63	#define PURGE_PRINT_SUMMARY 0x0004 /* Print a summary report at end */
64	64	#endif
65	65
66	66	/*
67		-** This routine purges multiple artifacts from the repository, transfering
	67	+** This routine purges multiple artifacts from the repository, transferring
68	68	** those artifacts into the PURGEITEM table.
69	69	**
70	70	** Prior to invoking this routine, the caller must create a (TEMP) table
71	71	** named zTab that contains the RID of every artifact to be purged.
72	72	**
		@@ -256,11 +256,11 @@
256	256	** When bExclusive is false, then all artifacts used by the check-ins
257	257	** are added even if those artifacts are also used by other check-ins
258	258	** not in the set.
259	259	**
260	260	** The "fossil publish" command with the (undocumented) --test and
261		-** --exclusive options can be used for interactiving testing of this
	261	+** --exclusive options can be used for interactive testing of this
262	262	** function.
263	263	*/
264	264	void find_checkin_associates(const char *zTab, int bExclusive){
265	265	db_begin_transaction();
266	266
267	267

	--- src/purge.c
	+++ src/purge.c
	@@ -62,11 +62,11 @@
62	#define PURGE_EXPLAIN_ONLY 0x0002 /* Show what would have happened */
63	#define PURGE_PRINT_SUMMARY 0x0004 /* Print a summary report at end */
64	#endif
65
66	/*
67	** This routine purges multiple artifacts from the repository, transfering
68	** those artifacts into the PURGEITEM table.
69	**
70	** Prior to invoking this routine, the caller must create a (TEMP) table
71	** named zTab that contains the RID of every artifact to be purged.
72	**
	@@ -256,11 +256,11 @@
256	** When bExclusive is false, then all artifacts used by the check-ins
257	** are added even if those artifacts are also used by other check-ins
258	** not in the set.
259	**
260	** The "fossil publish" command with the (undocumented) --test and
261	** --exclusive options can be used for interactiving testing of this
262	** function.
263	*/
264	void find_checkin_associates(const char *zTab, int bExclusive){
265	db_begin_transaction();
266
267

	--- src/purge.c
	+++ src/purge.c
	@@ -62,11 +62,11 @@
62	#define PURGE_EXPLAIN_ONLY 0x0002 /* Show what would have happened */
63	#define PURGE_PRINT_SUMMARY 0x0004 /* Print a summary report at end */
64	#endif
65
66	/*
67	** This routine purges multiple artifacts from the repository, transferring
68	** those artifacts into the PURGEITEM table.
69	**
70	** Prior to invoking this routine, the caller must create a (TEMP) table
71	** named zTab that contains the RID of every artifact to be purged.
72	**
	@@ -256,11 +256,11 @@
256	** When bExclusive is false, then all artifacts used by the check-ins
257	** are added even if those artifacts are also used by other check-ins
258	** not in the set.
259	**
260	** The "fossil publish" command with the (undocumented) --test and
261	** --exclusive options can be used for interactive testing of this
262	** function.
263	*/
264	void find_checkin_associates(const char *zTab, int bExclusive){
265	db_begin_transaction();
266
267

M src/report.c

+1 -1

		--- src/report.c
		+++ src/report.c
		@@ -447,11 +447,11 @@
447	447	int rn;
448	448	const char zTitle; / Title of the report */
449	449	const char *z;
450	450	const char zOwner; / Owner of the report */
451	451	const char zClrKey; / Color key - used to add colors to lines */
452		- char zSQL; / The SQL text that gnerates the report */
	452	+ char zSQL; / The SQL text that generates the report */
453	453	char zErr = 0; / An error message */
454	454	const char zDesc; / Extra descriptive text about the report */
455	455	const char zMimetype; / Mimetype for zDesc */
456	456	const char zTag; / Symbolic name for this report */
457	457	int dflt = P("dflt") ? 1 : 0;
458	458

	--- src/report.c
	+++ src/report.c
	@@ -447,11 +447,11 @@
447	int rn;
448	const char zTitle; / Title of the report */
449	const char *z;
450	const char zOwner; / Owner of the report */
451	const char zClrKey; / Color key - used to add colors to lines */
452	char zSQL; / The SQL text that gnerates the report */
453	char zErr = 0; / An error message */
454	const char zDesc; / Extra descriptive text about the report */
455	const char zMimetype; / Mimetype for zDesc */
456	const char zTag; / Symbolic name for this report */
457	int dflt = P("dflt") ? 1 : 0;
458

	--- src/report.c
	+++ src/report.c
	@@ -447,11 +447,11 @@
447	int rn;
448	const char zTitle; / Title of the report */
449	const char *z;
450	const char zOwner; / Owner of the report */
451	const char zClrKey; / Color key - used to add colors to lines */
452	char zSQL; / The SQL text that generates the report */
453	char zErr = 0; / An error message */
454	const char zDesc; / Extra descriptive text about the report */
455	const char zMimetype; / Mimetype for zDesc */
456	const char zTag; / Symbolic name for this report */
457	int dflt = P("dflt") ? 1 : 0;
458

M src/schema.c

+2 -2

		--- src/schema.c
		+++ src/schema.c
		@@ -365,11 +365,11 @@
365	365	@ -- Each artifact can have one or more tags. A tag
366	366	@ -- is defined by a row in the next table.
367	367	@ --
368	368	@ -- Wiki pages are tagged with "wiki-NAME" where NAME is the name of
369	369	@ -- the wiki page. Tickets changes are tagged with "ticket-HASH" where
370		-@ -- HASH is the indentifier of the ticket. Tags used to assign symbolic
	370	+@ -- HASH is the identifier of the ticket. Tags used to assign symbolic
371	371	@ -- names to baselines are branches are of the form "sym-NAME" where
372	372	@ -- NAME is the symbolic name.
373	373	@ --
374	374	@ CREATE TABLE tag(
375	375	@ tagid INTEGER PRIMARY KEY, -- Numeric tag ID
		@@ -500,11 +500,11 @@
500	500	** Allowed values for MIMEtype codes
501	501	*/
502	502	#if INTERFACE
503	503	# define MT_NONE 0 /* unspecified */
504	504	# define MT_WIKI 1 /* Wiki */
505		-# define MT_MARKDOWN 2 /* Markdonw */
	505	+# define MT_MARKDOWN 2 /* Markdown */
506	506	# define MT_UNKNOWN 3 /* unknown */
507	507	# define ValidMTC(X) ((X)>=0 && (X)<=3) /* True if MIMEtype code is valid */
508	508	#endif
509	509
510	510	/*
511	511

	--- src/schema.c
	+++ src/schema.c
	@@ -365,11 +365,11 @@
365	@ -- Each artifact can have one or more tags. A tag
366	@ -- is defined by a row in the next table.
367	@ --
368	@ -- Wiki pages are tagged with "wiki-NAME" where NAME is the name of
369	@ -- the wiki page. Tickets changes are tagged with "ticket-HASH" where
370	@ -- HASH is the indentifier of the ticket. Tags used to assign symbolic
371	@ -- names to baselines are branches are of the form "sym-NAME" where
372	@ -- NAME is the symbolic name.
373	@ --
374	@ CREATE TABLE tag(
375	@ tagid INTEGER PRIMARY KEY, -- Numeric tag ID
	@@ -500,11 +500,11 @@
500	** Allowed values for MIMEtype codes
501	*/
502	#if INTERFACE
503	# define MT_NONE 0 /* unspecified */
504	# define MT_WIKI 1 /* Wiki */
505	# define MT_MARKDOWN 2 /* Markdonw */
506	# define MT_UNKNOWN 3 /* unknown */
507	# define ValidMTC(X) ((X)>=0 && (X)<=3) /* True if MIMEtype code is valid */
508	#endif
509
510	/*
511

	--- src/schema.c
	+++ src/schema.c
	@@ -365,11 +365,11 @@
365	@ -- Each artifact can have one or more tags. A tag
366	@ -- is defined by a row in the next table.
367	@ --
368	@ -- Wiki pages are tagged with "wiki-NAME" where NAME is the name of
369	@ -- the wiki page. Tickets changes are tagged with "ticket-HASH" where
370	@ -- HASH is the identifier of the ticket. Tags used to assign symbolic
371	@ -- names to baselines are branches are of the form "sym-NAME" where
372	@ -- NAME is the symbolic name.
373	@ --
374	@ CREATE TABLE tag(
375	@ tagid INTEGER PRIMARY KEY, -- Numeric tag ID
	@@ -500,11 +500,11 @@
500	** Allowed values for MIMEtype codes
501	*/
502	#if INTERFACE
503	# define MT_NONE 0 /* unspecified */
504	# define MT_WIKI 1 /* Wiki */
505	# define MT_MARKDOWN 2 /* Markdown */
506	# define MT_UNKNOWN 3 /* unknown */
507	# define ValidMTC(X) ((X)>=0 && (X)<=3) /* True if MIMEtype code is valid */
508	#endif
509
510	/*
511

M src/search.c

+2 -2

		--- src/search.c
		+++ src/search.c
		@@ -589,11 +589,11 @@
589	589	** or use "--highlight 91" to force it on. Change the argument to --highlight
590	590	** to change the color.
591	591	**
592	592	** Options:
593	593	** -a\|--all Search everything
594		-** -c\|--checkins Search checkin comments
	594	+** -c\|--checkins Search check-in comments
595	595	** --docs Search embedded documentation
596	596	** --forum Search forum posts
597	597	** -h\|--bi-help Search built-in help
598	598	** --highlight N Used VT100 color N for matching text. 0 means "off".
599	599	** -n\|--limit N Limit output to N matches
		@@ -2865,11 +2865,11 @@
2865	2865	rc = fts5MatchinfoIter(pApi, pFts, p, fts5MatchinfoLocalCb);
2866	2866	}
2867	2867	if( rc!=SQLITE_OK ){
2868	2868	sqlite3_result_error_code(pCtx, rc);
2869	2869	}else{
2870		- /* No errors has occured, so return a copy of the array of integers. */
	2870	+ /* No error has occurred, so return a copy of the array of integers. */
2871	2871	int nByte = p->nRet * sizeof(u32);
2872	2872	sqlite3_result_blob(pCtx, (void*)p->aRet, nByte, SQLITE_TRANSIENT);
2873	2873	}
2874	2874	}
2875	2875
2876	2876

	--- src/search.c
	+++ src/search.c
	@@ -589,11 +589,11 @@
589	** or use "--highlight 91" to force it on. Change the argument to --highlight
590	** to change the color.
591	**
592	** Options:
593	** -a\|--all Search everything
594	** -c\|--checkins Search checkin comments
595	** --docs Search embedded documentation
596	** --forum Search forum posts
597	** -h\|--bi-help Search built-in help
598	** --highlight N Used VT100 color N for matching text. 0 means "off".
599	** -n\|--limit N Limit output to N matches
	@@ -2865,11 +2865,11 @@
2865	rc = fts5MatchinfoIter(pApi, pFts, p, fts5MatchinfoLocalCb);
2866	}
2867	if( rc!=SQLITE_OK ){
2868	sqlite3_result_error_code(pCtx, rc);
2869	}else{
2870	/* No errors has occured, so return a copy of the array of integers. */
2871	int nByte = p->nRet * sizeof(u32);
2872	sqlite3_result_blob(pCtx, (void*)p->aRet, nByte, SQLITE_TRANSIENT);
2873	}
2874	}
2875
2876

	--- src/search.c
	+++ src/search.c
	@@ -589,11 +589,11 @@
589	** or use "--highlight 91" to force it on. Change the argument to --highlight
590	** to change the color.
591	**
592	** Options:
593	** -a\|--all Search everything
594	** -c\|--checkins Search check-in comments
595	** --docs Search embedded documentation
596	** --forum Search forum posts
597	** -h\|--bi-help Search built-in help
598	** --highlight N Used VT100 color N for matching text. 0 means "off".
599	** -n\|--limit N Limit output to N matches
	@@ -2865,11 +2865,11 @@
2865	rc = fts5MatchinfoIter(pApi, pFts, p, fts5MatchinfoLocalCb);
2866	}
2867	if( rc!=SQLITE_OK ){
2868	sqlite3_result_error_code(pCtx, rc);
2869	}else{
2870	/* No error has occurred, so return a copy of the array of integers. */
2871	int nByte = p->nRet * sizeof(u32);
2872	sqlite3_result_blob(pCtx, (void*)p->aRet, nByte, SQLITE_TRANSIENT);
2873	}
2874	}
2875
2876

M src/security_audit.c

+1 -1

		--- src/security_audit.c
		+++ src/security_audit.c
		@@ -389,11 +389,11 @@
389	389	@ <a href="setup_ulist">User Configuration</a> page in case we
390	390	@ ever reuse the letter for another purpose.
391	391	}
392	392
393	393	/* If anonymous users are allowed to create new Wiki, then
394		- ** wiki moderation should be activated to pervent spam.
	394	+ ** wiki moderation should be activated to prevent spam.
395	395	*/
396	396	if( hasAnyCap(zAnonCap, "fk") ){
397	397	if( db_get_boolean("modreq-wiki",0)==0 ){
398	398	@ <li><p><b>WARNING:</b>
399	399	@ Anonymous users can create or edit wiki without moderation.
400	400

	--- src/security_audit.c
	+++ src/security_audit.c
	@@ -389,11 +389,11 @@
389	@ <a href="setup_ulist">User Configuration</a> page in case we
390	@ ever reuse the letter for another purpose.
391	}
392
393	/* If anonymous users are allowed to create new Wiki, then
394	** wiki moderation should be activated to pervent spam.
395	*/
396	if( hasAnyCap(zAnonCap, "fk") ){
397	if( db_get_boolean("modreq-wiki",0)==0 ){
398	@ <li><p><b>WARNING:</b>
399	@ Anonymous users can create or edit wiki without moderation.
400

	--- src/security_audit.c
	+++ src/security_audit.c
	@@ -389,11 +389,11 @@
389	@ <a href="setup_ulist">User Configuration</a> page in case we
390	@ ever reuse the letter for another purpose.
391	}
392
393	/* If anonymous users are allowed to create new Wiki, then
394	** wiki moderation should be activated to prevent spam.
395	*/
396	if( hasAnyCap(zAnonCap, "fk") ){
397	if( db_get_boolean("modreq-wiki",0)==0 ){
398	@ <li><p><b>WARNING:</b>
399	@ Anonymous users can create or edit wiki without moderation.
400

M src/setupuser.c

+1 -1

		--- src/setupuser.c
		+++ src/setupuser.c
		@@ -617,11 +617,11 @@
617	617	zLogin, zLogin
618	618	);
619	619	zOldLogin = zLogin;
620	620	}
621	621	#if 0
622		- /* Problem: when renaming a user we need to update the subcriber
	622	+ /* Problem: when renaming a user we need to update the subscriber
623	623	** names to match but we cannot know from here if each member of
624	624	** the login group has the subscriber tables, so we cannot blindly
625	625	** include this SQL. */
626	626	else if( fossil_strcmp(zLogin, zOldLogin)!=0
627	627	&& alert_tables_exist() ){
628	628

	--- src/setupuser.c
	+++ src/setupuser.c
	@@ -617,11 +617,11 @@
617	zLogin, zLogin
618	);
619	zOldLogin = zLogin;
620	}
621	#if 0
622	/* Problem: when renaming a user we need to update the subcriber
623	** names to match but we cannot know from here if each member of
624	** the login group has the subscriber tables, so we cannot blindly
625	** include this SQL. */
626	else if( fossil_strcmp(zLogin, zOldLogin)!=0
627	&& alert_tables_exist() ){
628

	--- src/setupuser.c
	+++ src/setupuser.c
	@@ -617,11 +617,11 @@
617	zLogin, zLogin
618	);
619	zOldLogin = zLogin;
620	}
621	#if 0
622	/* Problem: when renaming a user we need to update the subscriber
623	** names to match but we cannot know from here if each member of
624	** the login group has the subscriber tables, so we cannot blindly
625	** include this SQL. */
626	else if( fossil_strcmp(zLogin, zOldLogin)!=0
627	&& alert_tables_exist() ){
628

M src/sha1.c

+1 -1

		--- src/sha1.c
		+++ src/sha1.c
		@@ -257,11 +257,11 @@
257	257	for (i = 0; i < 20; i++)
258	258	digest[i] = (unsigned char)
259	259	((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
260	260	}
261	261	}
262		-#endif /* Built-in SHA1 implemenation */
	262	+#endif /* Built-in SHA1 implementation */
263	263
264	264	/*
265	265	** Convert a digest into base-16. digest should be declared as
266	266	** "unsigned char digest[20]" in the calling function. The SHA1
267	267	** digest is stored in the first 20 bytes. zBuf should
268	268

	--- src/sha1.c
	+++ src/sha1.c
	@@ -257,11 +257,11 @@
257	for (i = 0; i < 20; i++)
258	digest[i] = (unsigned char)
259	((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
260	}
261	}
262	#endif /* Built-in SHA1 implemenation */
263
264	/*
265	** Convert a digest into base-16. digest should be declared as
266	** "unsigned char digest[20]" in the calling function. The SHA1
267	** digest is stored in the first 20 bytes. zBuf should
268

	--- src/sha1.c
	+++ src/sha1.c
	@@ -257,11 +257,11 @@
257	for (i = 0; i < 20; i++)
258	digest[i] = (unsigned char)
259	((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
260	}
261	}
262	#endif /* Built-in SHA1 implementation */
263
264	/*
265	** Convert a digest into base-16. digest should be declared as
266	** "unsigned char digest[20]" in the calling function. The SHA1
267	** digest is stored in the first 20 bytes. zBuf should
268

M src/skins.c

+1 -1

		--- src/skins.c
		+++ src/skins.c
		@@ -162,11 +162,11 @@
162	162	** 2) The "skin" display setting cookie or URL argument, in that
163	163	** order. If the "skin" URL argument is provided and refers to a legal
164	164	** skin then that will update the display cookie. If the skin name is
165	165	** illegal it is silently ignored.
166	166	**
167		-** 3) The built-in skin identfied by the "default-skin" setting, if such
	167	+** 3) The built-in skin identified by the "default-skin" setting, if such
168	168	** a setting exists and matches one of the built-in skin names.
169	169	**
170	170	** 4) Skin properties (settings "css", "details", "footer", "header",
171	171	** and "js") from the CONFIG db table
172	172	**
173	173

	--- src/skins.c
	+++ src/skins.c
	@@ -162,11 +162,11 @@
162	** 2) The "skin" display setting cookie or URL argument, in that
163	** order. If the "skin" URL argument is provided and refers to a legal
164	** skin then that will update the display cookie. If the skin name is
165	** illegal it is silently ignored.
166	**
167	** 3) The built-in skin identfied by the "default-skin" setting, if such
168	** a setting exists and matches one of the built-in skin names.
169	**
170	** 4) Skin properties (settings "css", "details", "footer", "header",
171	** and "js") from the CONFIG db table
172	**
173

	--- src/skins.c
	+++ src/skins.c
	@@ -162,11 +162,11 @@
162	** 2) The "skin" display setting cookie or URL argument, in that
163	** order. If the "skin" URL argument is provided and refers to a legal
164	** skin then that will update the display cookie. If the skin name is
165	** illegal it is silently ignored.
166	**
167	** 3) The built-in skin identified by the "default-skin" setting, if such
168	** a setting exists and matches one of the built-in skin names.
169	**
170	** 4) Skin properties (settings "css", "details", "footer", "header",
171	** and "js") from the CONFIG db table
172	**
173

M src/smtp.c

+1 -1

		--- src/smtp.c
		+++ src/smtp.c
		@@ -565,11 +565,11 @@
565	565	** Return 0 on success. Otherwise an error code.
566	566	*/
567	567	int smtp_send_msg(
568	568	SmtpSession p, / The SMTP server to which the message is sent */
569	569	const char zFrom, / Who the message is from */
570		- int nTo, /* Number of receipients */
	570	+ int nTo, /* Number of recipients */
571	571	const char *azTo, / Email address of each recipient */
572	572	const char zMsg / Body of the message */
573	573	){
574	574	int i;
575	575	int iCode = 0;
576	576

	--- src/smtp.c
	+++ src/smtp.c
	@@ -565,11 +565,11 @@
565	** Return 0 on success. Otherwise an error code.
566	*/
567	int smtp_send_msg(
568	SmtpSession p, / The SMTP server to which the message is sent */
569	const char zFrom, / Who the message is from */
570	int nTo, /* Number of receipients */
571	const char *azTo, / Email address of each recipient */
572	const char zMsg / Body of the message */
573	){
574	int i;
575	int iCode = 0;
576

	--- src/smtp.c
	+++ src/smtp.c
	@@ -565,11 +565,11 @@
565	** Return 0 on success. Otherwise an error code.
566	*/
567	int smtp_send_msg(
568	SmtpSession p, / The SMTP server to which the message is sent */
569	const char zFrom, / Who the message is from */
570	int nTo, /* Number of recipients */
571	const char *azTo, / Email address of each recipient */
572	const char zMsg / Body of the message */
573	){
574	int i;
575	int iCode = 0;
576

M src/sqlcmd.c

+1 -1

		--- src/sqlcmd.c
		+++ src/sqlcmd.c
		@@ -168,11 +168,11 @@
168	168	** WARNING:
169	169	** Do not instantiate these functions for any Fossil webpage or command
170	170	** method other than the "fossil sql" command. If an attacker gains access
171	171	** to these functions, he will be able to disable other defense mechanisms.
172	172	**
173		-** This routines are for interactiving testing only. They are experimental
	173	+** This routines are for interactive testing only. They are experimental
174	174	** and undocumented (apart from this comments) and might go away or change
175	175	** in future releases.
176	176	**
177	177	** 2020-11-29: These functions are now only available if the "fossil sql"
178	178	** command is started with the --test option.
179	179

	--- src/sqlcmd.c
	+++ src/sqlcmd.c
	@@ -168,11 +168,11 @@
168	** WARNING:
169	** Do not instantiate these functions for any Fossil webpage or command
170	** method other than the "fossil sql" command. If an attacker gains access
171	** to these functions, he will be able to disable other defense mechanisms.
172	**
173	** This routines are for interactiving testing only. They are experimental
174	** and undocumented (apart from this comments) and might go away or change
175	** in future releases.
176	**
177	** 2020-11-29: These functions are now only available if the "fossil sql"
178	** command is started with the --test option.
179

	--- src/sqlcmd.c
	+++ src/sqlcmd.c
	@@ -168,11 +168,11 @@
168	** WARNING:
169	** Do not instantiate these functions for any Fossil webpage or command
170	** method other than the "fossil sql" command. If an attacker gains access
171	** to these functions, he will be able to disable other defense mechanisms.
172	**
173	** This routines are for interactive testing only. They are experimental
174	** and undocumented (apart from this comments) and might go away or change
175	** in future releases.
176	**
177	** 2020-11-29: These functions are now only available if the "fossil sql"
178	** command is started with the --test option.
179

M src/style.c

+5 -5

		--- src/style.c
		+++ src/style.c
		@@ -226,11 +226,11 @@
226	226	**
227	227	** As a defense against robots, the action=ARG might instead by data-action=ARG
228	228	** and javascript (href.js) added to the page so that the data-action= is
229	229	** changed into action= after the page loads. Whether or not this happens
230	230	** depends on if the user has the "h" privilege and whether or not the
231		-** auto-hyperlink setting is on. These setings determine the values of
	231	+** auto-hyperlink setting is on. These settings determine the values of
232	232	** variables g.perm.Hyperlink and g.jsHref.
233	233	**
234	234	** User has "h" auto-hyperlink g.perm.Hyperlink g.jsHref
235	235	** ------------ -------------- ---------------- --------
236	236	** 1: 0 0 0 0
		@@ -913,14 +913,14 @@
913	913	@ </script>
914	914	builtin_fulfill_js_requests();
915	915	}
916	916
917	917	/*
918		-** Transorm input string into a token that is safe for inclusion into
	918	+** Transform input string into a token that is safe for inclusion into
919	919	** class attribute. Digits and low-case letter are passed unchanged,
920	920	** upper-case letters are transformed to low-case, everything else is
921		-** tranformed into hyphens; consequtive and pending hyphens are squeezed.
	921	+** transformed into hyphens; consecutive and pending hyphens are squeezed.
922	922	** If result does not fit into szOut chars then it is truncated.
923	923	** Result is always terminated with null.
924	924	*/
925	925	void style_derive_classname(const char zIn, char zOut, int szOut){
926	926	assert( zOut );
		@@ -1219,11 +1219,11 @@
1219	1219
1220	1220	/*
1221	1221	** Check for "name" or "page" query parameters on an /style.css
1222	1222	** page request. If present, then page-specific CSS is requested,
1223	1223	** so add that CSS to pOut. If the "name" and "page" query parameters
1224		-** are omitted, then pOut is unchnaged.
	1224	+** are omitted, then pOut is unchanged.
1225	1225	*/
1226	1226	static void page_style_css_append_page_style(Blob *pOut){
1227	1227	const char *zPage = PD("name",P("page"));
1228	1228	char * zFile;
1229	1229	int nFile = 0;
		@@ -1252,11 +1252,11 @@
1252	1252	}
1253	1253
1254	1254	/*
1255	1255	** WEBPAGE: style.css loadavg-exempt
1256	1256	**
1257		-** Return the style sheet. The style sheet is assemblied from
	1257	+** Return the style sheet. The style sheet is assembled from
1258	1258	** multiple sources, in order:
1259	1259	**
1260	1260	** (1) The built-in "default.css" style sheet containing basic defaults.
1261	1261	**
1262	1262	** (2) The page-specific style sheet taken from the built-in
1263	1263

	--- src/style.c
	+++ src/style.c
	@@ -226,11 +226,11 @@
226	**
227	** As a defense against robots, the action=ARG might instead by data-action=ARG
228	** and javascript (href.js) added to the page so that the data-action= is
229	** changed into action= after the page loads. Whether or not this happens
230	** depends on if the user has the "h" privilege and whether or not the
231	** auto-hyperlink setting is on. These setings determine the values of
232	** variables g.perm.Hyperlink and g.jsHref.
233	**
234	** User has "h" auto-hyperlink g.perm.Hyperlink g.jsHref
235	** ------------ -------------- ---------------- --------
236	** 1: 0 0 0 0
	@@ -913,14 +913,14 @@
913	@ </script>
914	builtin_fulfill_js_requests();
915	}
916
917	/*
918	** Transorm input string into a token that is safe for inclusion into
919	** class attribute. Digits and low-case letter are passed unchanged,
920	** upper-case letters are transformed to low-case, everything else is
921	** tranformed into hyphens; consequtive and pending hyphens are squeezed.
922	** If result does not fit into szOut chars then it is truncated.
923	** Result is always terminated with null.
924	*/
925	void style_derive_classname(const char zIn, char zOut, int szOut){
926	assert( zOut );
	@@ -1219,11 +1219,11 @@
1219
1220	/*
1221	** Check for "name" or "page" query parameters on an /style.css
1222	** page request. If present, then page-specific CSS is requested,
1223	** so add that CSS to pOut. If the "name" and "page" query parameters
1224	** are omitted, then pOut is unchnaged.
1225	*/
1226	static void page_style_css_append_page_style(Blob *pOut){
1227	const char *zPage = PD("name",P("page"));
1228	char * zFile;
1229	int nFile = 0;
	@@ -1252,11 +1252,11 @@
1252	}
1253
1254	/*
1255	** WEBPAGE: style.css loadavg-exempt
1256	**
1257	** Return the style sheet. The style sheet is assemblied from
1258	** multiple sources, in order:
1259	**
1260	** (1) The built-in "default.css" style sheet containing basic defaults.
1261	**
1262	** (2) The page-specific style sheet taken from the built-in
1263

	--- src/style.c
	+++ src/style.c
	@@ -226,11 +226,11 @@
226	**
227	** As a defense against robots, the action=ARG might instead by data-action=ARG
228	** and javascript (href.js) added to the page so that the data-action= is
229	** changed into action= after the page loads. Whether or not this happens
230	** depends on if the user has the "h" privilege and whether or not the
231	** auto-hyperlink setting is on. These settings determine the values of
232	** variables g.perm.Hyperlink and g.jsHref.
233	**
234	** User has "h" auto-hyperlink g.perm.Hyperlink g.jsHref
235	** ------------ -------------- ---------------- --------
236	** 1: 0 0 0 0
	@@ -913,14 +913,14 @@
913	@ </script>
914	builtin_fulfill_js_requests();
915	}
916
917	/*
918	** Transform input string into a token that is safe for inclusion into
919	** class attribute. Digits and low-case letter are passed unchanged,
920	** upper-case letters are transformed to low-case, everything else is
921	** transformed into hyphens; consecutive and pending hyphens are squeezed.
922	** If result does not fit into szOut chars then it is truncated.
923	** Result is always terminated with null.
924	*/
925	void style_derive_classname(const char zIn, char zOut, int szOut){
926	assert( zOut );
	@@ -1219,11 +1219,11 @@
1219
1220	/*
1221	** Check for "name" or "page" query parameters on an /style.css
1222	** page request. If present, then page-specific CSS is requested,
1223	** so add that CSS to pOut. If the "name" and "page" query parameters
1224	** are omitted, then pOut is unchanged.
1225	*/
1226	static void page_style_css_append_page_style(Blob *pOut){
1227	const char *zPage = PD("name",P("page"));
1228	char * zFile;
1229	int nFile = 0;
	@@ -1252,11 +1252,11 @@
1252	}
1253
1254	/*
1255	** WEBPAGE: style.css loadavg-exempt
1256	**
1257	** Return the style sheet. The style sheet is assembled from
1258	** multiple sources, in order:
1259	**
1260	** (1) The built-in "default.css" style sheet containing basic defaults.
1261	**
1262	** (2) The page-specific style sheet taken from the built-in
1263

M src/sync.c

+1 -1

		--- src/sync.c
		+++ src/sync.c
		@@ -307,11 +307,11 @@
307	307	** URL is the server name. PAYLOAD is the name of a temporary file
308	308	** that will contain the xfer-protocol payload to send to the server.
309	309	** REPLY is a temporary filename in which COMMAND should write the
310	310	** content of the reply from the server.
311	311	**
312		- ** CMD is reponsible for HTTP redirects. The following Fossil command
	312	+ ** CMD is responsible for HTTP redirects. The following Fossil command
313	313	** can be used for CMD to achieve a working sync:
314	314	**
315	315	** fossil test-httpmsg --xfer
316	316	*/
317	317	g.zHttpCmd = find_option("transport-command",0,1);
318	318

	--- src/sync.c
	+++ src/sync.c
	@@ -307,11 +307,11 @@
307	** URL is the server name. PAYLOAD is the name of a temporary file
308	** that will contain the xfer-protocol payload to send to the server.
309	** REPLY is a temporary filename in which COMMAND should write the
310	** content of the reply from the server.
311	**
312	** CMD is reponsible for HTTP redirects. The following Fossil command
313	** can be used for CMD to achieve a working sync:
314	**
315	** fossil test-httpmsg --xfer
316	*/
317	g.zHttpCmd = find_option("transport-command",0,1);
318

	--- src/sync.c
	+++ src/sync.c
	@@ -307,11 +307,11 @@
307	** URL is the server name. PAYLOAD is the name of a temporary file
308	** that will contain the xfer-protocol payload to send to the server.
309	** REPLY is a temporary filename in which COMMAND should write the
310	** content of the reply from the server.
311	**
312	** CMD is responsible for HTTP redirects. The following Fossil command
313	** can be used for CMD to achieve a working sync:
314	**
315	** fossil test-httpmsg --xfer
316	*/
317	g.zHttpCmd = find_option("transport-command",0,1);
318

M src/tar.c

+2 -2

		--- src/tar.c
		+++ src/tar.c
		@@ -809,11 +809,11 @@
809	809	** /tarball/fossil-20251018193920-d6c9aee97df.tar.gz
810	810	**
811	811	** In other words, filename itself contains sufficient information to
812	812	** uniquely identify the check-in, including a timestamp of the form
813	813	** YYYYMMDDHHMMSS and a prefix of the check-in hash. The timestamp
814		-** and hash must immediately preceed the first "." in the name.
	814	+** and hash must immediately precede the first "." in the name.
815	815	*/
816	816	char tar_uuid_from_name(char *pzName){
817	817	char zName = pzName; /* Original input */
818	818	int n1 = 0; /* Bytes in first prefix (tag-name) */
819	819	int n2 = 0; /* Bytes in second prefix (check-in-name) */
		@@ -1167,11 +1167,11 @@
1167	1167	&azItem, &anItem, &nItem);
1168	1168	bPlainTextCom = db_get_boolean("timeline-plaintext",0);
1169	1169	for(i=0; i<nItem-3; i+=4){
1170	1170	int cnt; /* The number of instances of zLabel to use */
1171	1171	char zLabel; / The label to match */
1172		- double rStart; /* Starting time, julian day number */
	1172	+ double rStart; /* Starting time, Julian day number */
1173	1173	char zComment = 0; / Comment to apply */
1174	1174	if( anItem[i]==1 && azItem[i][0]=='*' ){
1175	1175	cnt = -1;
1176	1176	}else if( anItem[i]<1 ){
1177	1177	cnt = 0;
1178	1178

	--- src/tar.c
	+++ src/tar.c
	@@ -809,11 +809,11 @@
809	** /tarball/fossil-20251018193920-d6c9aee97df.tar.gz
810	**
811	** In other words, filename itself contains sufficient information to
812	** uniquely identify the check-in, including a timestamp of the form
813	** YYYYMMDDHHMMSS and a prefix of the check-in hash. The timestamp
814	** and hash must immediately preceed the first "." in the name.
815	*/
816	char tar_uuid_from_name(char *pzName){
817	char zName = pzName; /* Original input */
818	int n1 = 0; /* Bytes in first prefix (tag-name) */
819	int n2 = 0; /* Bytes in second prefix (check-in-name) */
	@@ -1167,11 +1167,11 @@
1167	&azItem, &anItem, &nItem);
1168	bPlainTextCom = db_get_boolean("timeline-plaintext",0);
1169	for(i=0; i<nItem-3; i+=4){
1170	int cnt; /* The number of instances of zLabel to use */
1171	char zLabel; / The label to match */
1172	double rStart; /* Starting time, julian day number */
1173	char zComment = 0; / Comment to apply */
1174	if( anItem[i]==1 && azItem[i][0]=='*' ){
1175	cnt = -1;
1176	}else if( anItem[i]<1 ){
1177	cnt = 0;
1178

	--- src/tar.c
	+++ src/tar.c
	@@ -809,11 +809,11 @@
809	** /tarball/fossil-20251018193920-d6c9aee97df.tar.gz
810	**
811	** In other words, filename itself contains sufficient information to
812	** uniquely identify the check-in, including a timestamp of the form
813	** YYYYMMDDHHMMSS and a prefix of the check-in hash. The timestamp
814	** and hash must immediately precede the first "." in the name.
815	*/
816	char tar_uuid_from_name(char *pzName){
817	char zName = pzName; /* Original input */
818	int n1 = 0; /* Bytes in first prefix (tag-name) */
819	int n2 = 0; /* Bytes in second prefix (check-in-name) */
	@@ -1167,11 +1167,11 @@
1167	&azItem, &anItem, &nItem);
1168	bPlainTextCom = db_get_boolean("timeline-plaintext",0);
1169	for(i=0; i<nItem-3; i+=4){
1170	int cnt; /* The number of instances of zLabel to use */
1171	char zLabel; / The label to match */
1172	double rStart; /* Starting time, Julian day number */
1173	char zComment = 0; / Comment to apply */
1174	if( anItem[i]==1 && azItem[i][0]=='*' ){
1175	cnt = -1;
1176	}else if( anItem[i]<1 ){
1177	cnt = 0;
1178

M src/terminal.c

+1 -1

		--- src/terminal.c
		+++ src/terminal.c
		@@ -45,11 +45,11 @@
45	45	#endif
46	46
47	47
48	48	/* Get the current terminal size by calling a system service.
49	49	**
50		-** Return 1 on success. This sets the size parameters to the values retured by
	50	+** Return 1 on success. This sets the size parameters to the values returned by
51	51	** the system call, when such is supported; set the size to zero otherwise.
52	52	** Return 0 on the system service call failure.
53	53	**
54	54	** Under Linux/bash the size info is also available from env $LINES, $COLUMNS.
55	55	** Or it can be queried using tput `echo -e "lines\ncols"\|tput -S`.
56	56

	--- src/terminal.c
	+++ src/terminal.c
	@@ -45,11 +45,11 @@
45	#endif
46
47
48	/* Get the current terminal size by calling a system service.
49	**
50	** Return 1 on success. This sets the size parameters to the values retured by
51	** the system call, when such is supported; set the size to zero otherwise.
52	** Return 0 on the system service call failure.
53	**
54	** Under Linux/bash the size info is also available from env $LINES, $COLUMNS.
55	** Or it can be queried using tput `echo -e "lines\ncols"\|tput -S`.
56

	--- src/terminal.c
	+++ src/terminal.c
	@@ -45,11 +45,11 @@
45	#endif
46
47
48	/* Get the current terminal size by calling a system service.
49	**
50	** Return 1 on success. This sets the size parameters to the values returned by
51	** the system call, when such is supported; set the size to zero otherwise.
52	** Return 0 on the system service call failure.
53	**
54	** Under Linux/bash the size info is also available from env $LINES, $COLUMNS.
55	** Or it can be queried using tput `echo -e "lines\ncols"\|tput -S`.
56

M src/th.c

+1 -1

		--- src/th.c
		+++ src/th.c
		@@ -1029,11 +1029,11 @@
1029	1029	** * If iFrame is negative, then the nth frame up the stack, where
1030	1030	** n is the absolute value of iFrame. A value of -1 means the
1031	1031	** calling procedure.
1032	1032	**
1033	1033	** * If iFrame is +ve, then the nth frame from the bottom of the
1034		-** stack. An iFrame value of 1 means the toplevel (global) frame.
	1034	+** stack. An iFrame value of 1 means the top level (global) frame.
1035	1035	*/
1036	1036	static Th_Frame getFrame(Th_Interp interp, int iFrame){
1037	1037	Th_Frame *p = interp->pFrame;
1038	1038	int i;
1039	1039	if( iFrame>0 ){
1040	1040

	--- src/th.c
	+++ src/th.c
	@@ -1029,11 +1029,11 @@
1029	** * If iFrame is negative, then the nth frame up the stack, where
1030	** n is the absolute value of iFrame. A value of -1 means the
1031	** calling procedure.
1032	**
1033	** * If iFrame is +ve, then the nth frame from the bottom of the
1034	** stack. An iFrame value of 1 means the toplevel (global) frame.
1035	*/
1036	static Th_Frame getFrame(Th_Interp interp, int iFrame){
1037	Th_Frame *p = interp->pFrame;
1038	int i;
1039	if( iFrame>0 ){
1040

	--- src/th.c
	+++ src/th.c
	@@ -1029,11 +1029,11 @@
1029	** * If iFrame is negative, then the nth frame up the stack, where
1030	** n is the absolute value of iFrame. A value of -1 means the
1031	** calling procedure.
1032	**
1033	** * If iFrame is +ve, then the nth frame from the bottom of the
1034	** stack. An iFrame value of 1 means the top level (global) frame.
1035	*/
1036	static Th_Frame getFrame(Th_Interp interp, int iFrame){
1037	Th_Frame *p = interp->pFrame;
1038	int i;
1039	if( iFrame>0 ){
1040

M src/th_main.c

+1 -1

		--- src/th_main.c
		+++ src/th_main.c
		@@ -74,11 +74,11 @@
74	74	*/
75	75	#if defined(TH_MEMDEBUG)
76	76	/*
77	77	** Global variable counting the number of outstanding calls to malloc()
78	78	** made by the th1 implementation. This is used to catch memory leaks
79		-** in the interpreter. Obviously, it also means th1 is not threadsafe.
	79	+** in the interpreter. Obviously, it also means th1 is not thread-safe.
80	80	*/
81	81	static int nOutstandingMalloc = 0;
82	82
83	83	/*
84	84	** Implementations of malloc() and free() to pass to the interpreter.
85	85

	--- src/th_main.c
	+++ src/th_main.c
	@@ -74,11 +74,11 @@
74	*/
75	#if defined(TH_MEMDEBUG)
76	/*
77	** Global variable counting the number of outstanding calls to malloc()
78	** made by the th1 implementation. This is used to catch memory leaks
79	** in the interpreter. Obviously, it also means th1 is not threadsafe.
80	*/
81	static int nOutstandingMalloc = 0;
82
83	/*
84	** Implementations of malloc() and free() to pass to the interpreter.
85

	--- src/th_main.c
	+++ src/th_main.c
	@@ -74,11 +74,11 @@
74	*/
75	#if defined(TH_MEMDEBUG)
76	/*
77	** Global variable counting the number of outstanding calls to malloc()
78	** made by the th1 implementation. This is used to catch memory leaks
79	** in the interpreter. Obviously, it also means th1 is not thread-safe.
80	*/
81	static int nOutstandingMalloc = 0;
82
83	/*
84	** Implementations of malloc() and free() to pass to the interpreter.
85

M src/timeline.c

+7 -7

		--- src/timeline.c
		+++ src/timeline.c
		@@ -22,11 +22,11 @@
22	22	#include <string.h>
23	23	#include <time.h>
24	24	#include "timeline.h"
25	25
26	26	/*
27		-** The value of one second in julianday notation
	27	+** The value of one second in Julian day notation
28	28	*/
29	29	#define ONE_SECOND (1.0/86400.0)
30	30
31	31	/*
32	32	** timeline mode options
		@@ -1045,11 +1045,11 @@
1045	1045	** Mnemonic: "Same Branch".
1046	1046	** f: 0x01: a leaf node, 0x02: a closed leaf node.
1047	1047	** au: An array of integers that define thick-line risers for branches.
1048	1048	** The integers are in pairs. For each pair, the first integer is
1049	1049	** is the rail on which the riser should run and the second integer
1050		- ** is the id of the node upto which the riser should run. If there
	1050	+ ** is the id of the node up to which the riser should run. If there
1051	1051	** are no risers, this array does not exist.
1052	1052	** mi: "merge-in". An array of integer rail positions from which
1053	1053	** merge arrows should be drawn into this node. If the value is
1054	1054	** negative, then the rail position is -1-mi[] and a thin merge-arrow
1055	1055	** descender is drawn to the bottom of the screen. This array is
		@@ -1623,12 +1623,12 @@
1623	1623	** COMMAND: test-endpoint
1624	1624	**
1625	1625	** Usage: fossil test-endpoint BASE TAG ?OPTIONS?
1626	1626	**
1627	1627	** Show the first check-in with TAG that is a descendant or ancestor
1628		-** of BASE. The first descendant checkin is shown by default. Use
1629		-** the --backto to see the first ancestor checkin.
	1628	+** of BASE. The first descendant check-in is shown by default. Use
	1629	+** the --backto to see the first ancestor check-in.
1630	1630	**
1631	1631	** Options:
1632	1632	**
1633	1633	** --backto Show ancestor. Others defaults to descendants.
1634	1634	*/
		@@ -1800,11 +1800,11 @@
1800	1800	int useDividers = P("nd")==0; /* Show dividers if "nd" is missing */
1801	1801	int renameOnly = P("namechng")!=0; /* Show only check-ins that rename files */
1802	1802	int forkOnly = PB("forks"); /* Show only forks and their children */
1803	1803	int bisectLocal = PB("bisect"); /* Show the check-ins of the bisect */
1804	1804	const char zBisect = P("bid"); / Bisect description */
1805		- int cpOnly = PB("cherrypicks"); /* Show all cherrypick checkins */
	1805	+ int cpOnly = PB("cherrypicks"); /* Show all cherrypick check-ins */
1806	1806	int tmFlags = 0; /* Timeline flags */
1807	1807	const char zThisTag = 0; / Suppress links to this tag */
1808	1808	const char zThisUser = 0; / Suppress links to this user */
1809	1809	HQuery url; /* URL for various branch links */
1810	1810	int from_rid = name_to_typed_rid(P("from"),"ci"); /* from= for paths */
		@@ -2003,11 +2003,11 @@
2003	2003	/* Finish preliminary processing of tag match queries. */
2004	2004	matchStyle = match_style(zMatchStyle, MS_EXACT);
2005	2005	if( zTagName ){
2006	2006	zType = "ci";
2007	2007	if( matchStyle==MS_EXACT ){
2008		- /* For exact maching, inhibit links to the selected tag. */
	2008	+ /* For exact matching, inhibit links to the selected tag. */
2009	2009	zThisTag = zTagName;
2010	2010	Th_StoreUnsafe("current_checkin", zTagName);
2011	2011	}
2012	2012
2013	2013	/* Display a checkbox to enable/disable display of related check-ins. */
		@@ -3670,11 +3670,11 @@
3670	3670	&& fossil_isdigit(z[0])
3671	3671	&& fossil_isdigit(z[5]);
3672	3672	}
3673	3673
3674	3674	/*
3675		-** Return true if the input string can be converted to a julianday.
	3675	+** Return true if the input string can be converted to a Julian day.
3676	3676	*/
3677	3677	static int fossil_is_julianday(const char *zDate){
3678	3678	return db_int(0, "SELECT EXISTS (SELECT julianday(%Q) AS jd"
3679	3679	" WHERE jd IS NOT NULL)", zDate);
3680	3680	}
3681	3681

	--- src/timeline.c
	+++ src/timeline.c
	@@ -22,11 +22,11 @@
22	#include <string.h>
23	#include <time.h>
24	#include "timeline.h"
25
26	/*
27	** The value of one second in julianday notation
28	*/
29	#define ONE_SECOND (1.0/86400.0)
30
31	/*
32	** timeline mode options
	@@ -1045,11 +1045,11 @@
1045	** Mnemonic: "Same Branch".
1046	** f: 0x01: a leaf node, 0x02: a closed leaf node.
1047	** au: An array of integers that define thick-line risers for branches.
1048	** The integers are in pairs. For each pair, the first integer is
1049	** is the rail on which the riser should run and the second integer
1050	** is the id of the node upto which the riser should run. If there
1051	** are no risers, this array does not exist.
1052	** mi: "merge-in". An array of integer rail positions from which
1053	** merge arrows should be drawn into this node. If the value is
1054	** negative, then the rail position is -1-mi[] and a thin merge-arrow
1055	** descender is drawn to the bottom of the screen. This array is
	@@ -1623,12 +1623,12 @@
1623	** COMMAND: test-endpoint
1624	**
1625	** Usage: fossil test-endpoint BASE TAG ?OPTIONS?
1626	**
1627	** Show the first check-in with TAG that is a descendant or ancestor
1628	** of BASE. The first descendant checkin is shown by default. Use
1629	** the --backto to see the first ancestor checkin.
1630	**
1631	** Options:
1632	**
1633	** --backto Show ancestor. Others defaults to descendants.
1634	*/
	@@ -1800,11 +1800,11 @@
1800	int useDividers = P("nd")==0; /* Show dividers if "nd" is missing */
1801	int renameOnly = P("namechng")!=0; /* Show only check-ins that rename files */
1802	int forkOnly = PB("forks"); /* Show only forks and their children */
1803	int bisectLocal = PB("bisect"); /* Show the check-ins of the bisect */
1804	const char zBisect = P("bid"); / Bisect description */
1805	int cpOnly = PB("cherrypicks"); /* Show all cherrypick checkins */
1806	int tmFlags = 0; /* Timeline flags */
1807	const char zThisTag = 0; / Suppress links to this tag */
1808	const char zThisUser = 0; / Suppress links to this user */
1809	HQuery url; /* URL for various branch links */
1810	int from_rid = name_to_typed_rid(P("from"),"ci"); /* from= for paths */
	@@ -2003,11 +2003,11 @@
2003	/* Finish preliminary processing of tag match queries. */
2004	matchStyle = match_style(zMatchStyle, MS_EXACT);
2005	if( zTagName ){
2006	zType = "ci";
2007	if( matchStyle==MS_EXACT ){
2008	/* For exact maching, inhibit links to the selected tag. */
2009	zThisTag = zTagName;
2010	Th_StoreUnsafe("current_checkin", zTagName);
2011	}
2012
2013	/* Display a checkbox to enable/disable display of related check-ins. */
	@@ -3670,11 +3670,11 @@
3670	&& fossil_isdigit(z[0])
3671	&& fossil_isdigit(z[5]);
3672	}
3673
3674	/*
3675	** Return true if the input string can be converted to a julianday.
3676	*/
3677	static int fossil_is_julianday(const char *zDate){
3678	return db_int(0, "SELECT EXISTS (SELECT julianday(%Q) AS jd"
3679	" WHERE jd IS NOT NULL)", zDate);
3680	}
3681

	--- src/timeline.c
	+++ src/timeline.c
	@@ -22,11 +22,11 @@
22	#include <string.h>
23	#include <time.h>
24	#include "timeline.h"
25
26	/*
27	** The value of one second in Julian day notation
28	*/
29	#define ONE_SECOND (1.0/86400.0)
30
31	/*
32	** timeline mode options
	@@ -1045,11 +1045,11 @@
1045	** Mnemonic: "Same Branch".
1046	** f: 0x01: a leaf node, 0x02: a closed leaf node.
1047	** au: An array of integers that define thick-line risers for branches.
1048	** The integers are in pairs. For each pair, the first integer is
1049	** is the rail on which the riser should run and the second integer
1050	** is the id of the node up to which the riser should run. If there
1051	** are no risers, this array does not exist.
1052	** mi: "merge-in". An array of integer rail positions from which
1053	** merge arrows should be drawn into this node. If the value is
1054	** negative, then the rail position is -1-mi[] and a thin merge-arrow
1055	** descender is drawn to the bottom of the screen. This array is
	@@ -1623,12 +1623,12 @@
1623	** COMMAND: test-endpoint
1624	**
1625	** Usage: fossil test-endpoint BASE TAG ?OPTIONS?
1626	**
1627	** Show the first check-in with TAG that is a descendant or ancestor
1628	** of BASE. The first descendant check-in is shown by default. Use
1629	** the --backto to see the first ancestor check-in.
1630	**
1631	** Options:
1632	**
1633	** --backto Show ancestor. Others defaults to descendants.
1634	*/
	@@ -1800,11 +1800,11 @@
1800	int useDividers = P("nd")==0; /* Show dividers if "nd" is missing */
1801	int renameOnly = P("namechng")!=0; /* Show only check-ins that rename files */
1802	int forkOnly = PB("forks"); /* Show only forks and their children */
1803	int bisectLocal = PB("bisect"); /* Show the check-ins of the bisect */
1804	const char zBisect = P("bid"); / Bisect description */
1805	int cpOnly = PB("cherrypicks"); /* Show all cherrypick check-ins */
1806	int tmFlags = 0; /* Timeline flags */
1807	const char zThisTag = 0; / Suppress links to this tag */
1808	const char zThisUser = 0; / Suppress links to this user */
1809	HQuery url; /* URL for various branch links */
1810	int from_rid = name_to_typed_rid(P("from"),"ci"); /* from= for paths */
	@@ -2003,11 +2003,11 @@
2003	/* Finish preliminary processing of tag match queries. */
2004	matchStyle = match_style(zMatchStyle, MS_EXACT);
2005	if( zTagName ){
2006	zType = "ci";
2007	if( matchStyle==MS_EXACT ){
2008	/* For exact matching, inhibit links to the selected tag. */
2009	zThisTag = zTagName;
2010	Th_StoreUnsafe("current_checkin", zTagName);
2011	}
2012
2013	/* Display a checkbox to enable/disable display of related check-ins. */
	@@ -3670,11 +3670,11 @@
3670	&& fossil_isdigit(z[0])
3671	&& fossil_isdigit(z[5]);
3672	}
3673
3674	/*
3675	** Return true if the input string can be converted to a Julian day.
3676	*/
3677	static int fossil_is_julianday(const char *zDate){
3678	return db_int(0, "SELECT EXISTS (SELECT julianday(%Q) AS jd"
3679	" WHERE jd IS NOT NULL)", zDate);
3680	}
3681

M src/tkt.c

+2 -2

		--- src/tkt.c
		+++ src/tkt.c
		@@ -1528,11 +1528,11 @@
1528	1528	** Run the ticket report, identified by the report format title
1529	1529	** used in the GUI. The data is written as flat file on stdout,
1530	1530	** using TAB as separator. The separator can be changed using
1531	1531	** the -l or --limit option.
1532	1532	**
1533		-** If TICKETFILTER is given on the commandline, the query is
	1533	+** If TICKETFILTER is given on the command line, the query is
1534	1534	** limited with a new WHERE-condition.
1535	1535	** example: Report lists a column # with the uuid
1536	1536	** TICKETFILTER may be [#]='uuuuuuuuu'
1537	1537	** example: Report only lists rows with status not open
1538	1538	** TICKETFILTER: status != 'open'
		@@ -1567,11 +1567,11 @@
1567	1567	** names include: type, status, subsystem, priority, severity, foundin,
1568	1568	** resolution, title, and comment, but other field names can be added
1569	1569	** or substituted in customized installations.
1570	1570	**
1571	1571	** If you use +FIELD, the VALUE is appended to the field FIELD. You
1572		-** can use more than one field/value pair on the commandline. Using
	1572	+** can use more than one field/value pair on the command line. Using
1573	1573	** --quote enables the special character decoding as in "ticket
1574	1574	** show", which allows setting multiline text or text with special
1575	1575	** characters.
1576	1576	**
1577	1577	** > fossil ticket add FIELD VALUE ?FIELD VALUE .. ? ?-q\|--quote?
1578	1578

	--- src/tkt.c
	+++ src/tkt.c
	@@ -1528,11 +1528,11 @@
1528	** Run the ticket report, identified by the report format title
1529	** used in the GUI. The data is written as flat file on stdout,
1530	** using TAB as separator. The separator can be changed using
1531	** the -l or --limit option.
1532	**
1533	** If TICKETFILTER is given on the commandline, the query is
1534	** limited with a new WHERE-condition.
1535	** example: Report lists a column # with the uuid
1536	** TICKETFILTER may be [#]='uuuuuuuuu'
1537	** example: Report only lists rows with status not open
1538	** TICKETFILTER: status != 'open'
	@@ -1567,11 +1567,11 @@
1567	** names include: type, status, subsystem, priority, severity, foundin,
1568	** resolution, title, and comment, but other field names can be added
1569	** or substituted in customized installations.
1570	**
1571	** If you use +FIELD, the VALUE is appended to the field FIELD. You
1572	** can use more than one field/value pair on the commandline. Using
1573	** --quote enables the special character decoding as in "ticket
1574	** show", which allows setting multiline text or text with special
1575	** characters.
1576	**
1577	** > fossil ticket add FIELD VALUE ?FIELD VALUE .. ? ?-q\|--quote?
1578

	--- src/tkt.c
	+++ src/tkt.c
	@@ -1528,11 +1528,11 @@
1528	** Run the ticket report, identified by the report format title
1529	** used in the GUI. The data is written as flat file on stdout,
1530	** using TAB as separator. The separator can be changed using
1531	** the -l or --limit option.
1532	**
1533	** If TICKETFILTER is given on the command line, the query is
1534	** limited with a new WHERE-condition.
1535	** example: Report lists a column # with the uuid
1536	** TICKETFILTER may be [#]='uuuuuuuuu'
1537	** example: Report only lists rows with status not open
1538	** TICKETFILTER: status != 'open'
	@@ -1567,11 +1567,11 @@
1567	** names include: type, status, subsystem, priority, severity, foundin,
1568	** resolution, title, and comment, but other field names can be added
1569	** or substituted in customized installations.
1570	**
1571	** If you use +FIELD, the VALUE is appended to the field FIELD. You
1572	** can use more than one field/value pair on the command line. Using
1573	** --quote enables the special character decoding as in "ticket
1574	** show", which allows setting multiline text or text with special
1575	** characters.
1576	**
1577	** > fossil ticket add FIELD VALUE ?FIELD VALUE .. ? ?-q\|--quote?
1578

M src/tktsetup.c

+1 -1

		--- src/tktsetup.c
		+++ src/tktsetup.c
		@@ -1018,11 +1018,11 @@
1018	1018	}
1019	1019
1020	1020	/*
1021	1021	** WEBPAGE: tktsetup_timeline
1022	1022	**
1023		-** Administrative page used ot configure how tickets are
	1023	+** Administrative page used to configure how tickets are
1024	1024	** rendered on timeline views.
1025	1025	*/
1026	1026	void tktsetup_timeline_page(void){
1027	1027	login_check_credentials();
1028	1028	if( !g.perm.Setup ){
1029	1029

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -1018,11 +1018,11 @@
1018	}
1019
1020	/*
1021	** WEBPAGE: tktsetup_timeline
1022	**
1023	** Administrative page used ot configure how tickets are
1024	** rendered on timeline views.
1025	*/
1026	void tktsetup_timeline_page(void){
1027	login_check_credentials();
1028	if( !g.perm.Setup ){
1029

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -1018,11 +1018,11 @@
1018	}
1019
1020	/*
1021	** WEBPAGE: tktsetup_timeline
1022	**
1023	** Administrative page used to configure how tickets are
1024	** rendered on timeline views.
1025	*/
1026	void tktsetup_timeline_page(void){
1027	login_check_credentials();
1028	if( !g.perm.Setup ){
1029

M src/undo.c

+2 -2

		--- src/undo.c
		+++ src/undo.c
		@@ -23,11 +23,11 @@
23	23	#if INTERFACE
24	24	/*
25	25	** Possible return values from the undo_maybe_save() routine.
26	26	*/
27	27	#define UNDO_NONE (0) /* Placeholder only used to initialize vars. */
28		-#define UNDO_SAVED_OK (1) /* The specified file was saved succesfully. */
	28	+#define UNDO_SAVED_OK (1) /* The specified file was saved successfully. */
29	29	#define UNDO_DISABLED (2) /* File not saved, subsystem is disabled. */
30	30	#define UNDO_INACTIVE (3) /* File not saved, subsystem is not active. */
31	31	#define UNDO_TOOBIG (4) /* File not saved, it exceeded a size limit. */
32	32	#endif
33	33
		@@ -289,11 +289,11 @@
289	289	** function instead.
290	290	**
291	291	** The return value of this function will always be one of the
292	292	** following codes:
293	293	**
294		-** UNDO_SAVED_OK: The specified file was saved succesfully.
	294	+** UNDO_SAVED_OK: The specified file was saved successfully.
295	295	**
296	296	** UNDO_DISABLED: The specified file was NOT saved, because the
297	297	** "undo subsystem" is disabled. This error may
298	298	** indicate that a call to undo_disable() was
299	299	** issued.
300	300

	--- src/undo.c
	+++ src/undo.c
	@@ -23,11 +23,11 @@
23	#if INTERFACE
24	/*
25	** Possible return values from the undo_maybe_save() routine.
26	*/
27	#define UNDO_NONE (0) /* Placeholder only used to initialize vars. */
28	#define UNDO_SAVED_OK (1) /* The specified file was saved succesfully. */
29	#define UNDO_DISABLED (2) /* File not saved, subsystem is disabled. */
30	#define UNDO_INACTIVE (3) /* File not saved, subsystem is not active. */
31	#define UNDO_TOOBIG (4) /* File not saved, it exceeded a size limit. */
32	#endif
33
	@@ -289,11 +289,11 @@
289	** function instead.
290	**
291	** The return value of this function will always be one of the
292	** following codes:
293	**
294	** UNDO_SAVED_OK: The specified file was saved succesfully.
295	**
296	** UNDO_DISABLED: The specified file was NOT saved, because the
297	** "undo subsystem" is disabled. This error may
298	** indicate that a call to undo_disable() was
299	** issued.
300

	--- src/undo.c
	+++ src/undo.c
	@@ -23,11 +23,11 @@
23	#if INTERFACE
24	/*
25	** Possible return values from the undo_maybe_save() routine.
26	*/
27	#define UNDO_NONE (0) /* Placeholder only used to initialize vars. */
28	#define UNDO_SAVED_OK (1) /* The specified file was saved successfully. */
29	#define UNDO_DISABLED (2) /* File not saved, subsystem is disabled. */
30	#define UNDO_INACTIVE (3) /* File not saved, subsystem is not active. */
31	#define UNDO_TOOBIG (4) /* File not saved, it exceeded a size limit. */
32	#endif
33
	@@ -289,11 +289,11 @@
289	** function instead.
290	**
291	** The return value of this function will always be one of the
292	** following codes:
293	**
294	** UNDO_SAVED_OK: The specified file was saved successfully.
295	**
296	** UNDO_DISABLED: The specified file was NOT saved, because the
297	** "undo subsystem" is disabled. This error may
298	** indicate that a call to undo_disable() was
299	** issued.
300

M src/unicode.c

+1 -1

		--- src/unicode.c
		+++ src/unicode.c
		@@ -189,11 +189,11 @@
189	189	/*
190	190	** If the argument is a codepoint corresponding to a lowercase letter
191	191	** in the ASCII range with a diacritic added, return the codepoint
192	192	** of the ASCII letter only. For example, if passed 235 - "LATIN
193	193	** SMALL LETTER E WITH DIAERESIS" - return 65 ("LATIN SMALL LETTER
194		-** E"). The resuls of passing a codepoint that corresponds to an
	194	+** E"). The results of passing a codepoint that corresponds to an
195	195	** uppercase letter are undefined.
196	196	*/
197	197	static int unicode_remove_diacritic(int c, int bComplex){
198	198	static const unsigned short aDia[] = {
199	199	0, 1797, 1848, 1859, 1891, 1928, 1940, 1995,
200	200

	--- src/unicode.c
	+++ src/unicode.c
	@@ -189,11 +189,11 @@
189	/*
190	** If the argument is a codepoint corresponding to a lowercase letter
191	** in the ASCII range with a diacritic added, return the codepoint
192	** of the ASCII letter only. For example, if passed 235 - "LATIN
193	** SMALL LETTER E WITH DIAERESIS" - return 65 ("LATIN SMALL LETTER
194	** E"). The resuls of passing a codepoint that corresponds to an
195	** uppercase letter are undefined.
196	*/
197	static int unicode_remove_diacritic(int c, int bComplex){
198	static const unsigned short aDia[] = {
199	0, 1797, 1848, 1859, 1891, 1928, 1940, 1995,
200

	--- src/unicode.c
	+++ src/unicode.c
	@@ -189,11 +189,11 @@
189	/*
190	** If the argument is a codepoint corresponding to a lowercase letter
191	** in the ASCII range with a diacritic added, return the codepoint
192	** of the ASCII letter only. For example, if passed 235 - "LATIN
193	** SMALL LETTER E WITH DIAERESIS" - return 65 ("LATIN SMALL LETTER
194	** E"). The results of passing a codepoint that corresponds to an
195	** uppercase letter are undefined.
196	*/
197	static int unicode_remove_diacritic(int c, int bComplex){
198	static const unsigned short aDia[] = {
199	0, 1797, 1848, 1859, 1891, 1928, 1940, 1995,
200

M src/update.c

+2 -2

		--- src/update.c
		+++ src/update.c
		@@ -256,11 +256,11 @@
256	256	fossil_fatal("missing content, unable to update");
257	257	};
258	258
259	259	/*
260	260	** The record.fn field is used to match files against each other. The
261		- ** FV table contains one row for each each unique filename in
	261	+ ** FV table contains one row for each unique filename in
262	262	** in the current check-out, the pivot, and the version being merged.
263	263	*/
264	264	db_multi_exec(
265	265	"DROP TABLE IF EXISTS fv;"
266	266	"CREATE TEMP TABLE fv("
		@@ -451,11 +451,11 @@
451	451	}else if( idt>0 && idv==0 ){
452	452	/* File added in the target. */
453	453	if( file_isfile_or_link(zFullPath) ){
454	454	/* Name of backup file with Original content */
455	455	char *zOrig = file_newname(zFullPath, "original", 1);
456		- /* Backup previously unanaged file before to be overwritten */
	456	+ /* Backup previously unmanaged file before being overwritten */
457	457	file_copy(zFullPath, zOrig);
458	458	fossil_free(zOrig);
459	459	fossil_print("ADD %s - overwrites an unmanaged file", zName);
460	460	if( !dryRunFlag ) fossil_print(", original copy backed up locally");
461	461	fossil_print("\n");
462	462

	--- src/update.c
	+++ src/update.c
	@@ -256,11 +256,11 @@
256	fossil_fatal("missing content, unable to update");
257	};
258
259	/*
260	** The record.fn field is used to match files against each other. The
261	** FV table contains one row for each each unique filename in
262	** in the current check-out, the pivot, and the version being merged.
263	*/
264	db_multi_exec(
265	"DROP TABLE IF EXISTS fv;"
266	"CREATE TEMP TABLE fv("
	@@ -451,11 +451,11 @@
451	}else if( idt>0 && idv==0 ){
452	/* File added in the target. */
453	if( file_isfile_or_link(zFullPath) ){
454	/* Name of backup file with Original content */
455	char *zOrig = file_newname(zFullPath, "original", 1);
456	/* Backup previously unanaged file before to be overwritten */
457	file_copy(zFullPath, zOrig);
458	fossil_free(zOrig);
459	fossil_print("ADD %s - overwrites an unmanaged file", zName);
460	if( !dryRunFlag ) fossil_print(", original copy backed up locally");
461	fossil_print("\n");
462

	--- src/update.c
	+++ src/update.c
	@@ -256,11 +256,11 @@
256	fossil_fatal("missing content, unable to update");
257	};
258
259	/*
260	** The record.fn field is used to match files against each other. The
261	** FV table contains one row for each unique filename in
262	** in the current check-out, the pivot, and the version being merged.
263	*/
264	db_multi_exec(
265	"DROP TABLE IF EXISTS fv;"
266	"CREATE TEMP TABLE fv("
	@@ -451,11 +451,11 @@
451	}else if( idt>0 && idv==0 ){
452	/* File added in the target. */
453	if( file_isfile_or_link(zFullPath) ){
454	/* Name of backup file with Original content */
455	char *zOrig = file_newname(zFullPath, "original", 1);
456	/* Backup previously unmanaged file before being overwritten */
457	file_copy(zFullPath, zOrig);
458	fossil_free(zOrig);
459	fossil_print("ADD %s - overwrites an unmanaged file", zName);
460	if( !dryRunFlag ) fossil_print(", original copy backed up locally");
461	fossil_print("\n");
462

M src/util.c

+1 -1

		--- src/util.c
		+++ src/util.c
		@@ -234,11 +234,11 @@
234	234
235	235	/*
236	236	** Check the input string to ensure that it is safe to pass into system().
237	237	** A string is unsafe for system() on unix if it contains any of the following:
238	238	**
239		-** * Any occurrance of '$' or '`' except single-quoted or after \
	239	+** * Any occurrence of '$' or '`' except single-quoted or after \
240	240	** * Any of the following characters, unquoted: ;\|& or \n except
241	241	** these characters are allowed as the very last character in the
242	242	** string.
243	243	** * Unbalanced single or double quotes
244	244	**
245	245

	--- src/util.c
	+++ src/util.c
	@@ -234,11 +234,11 @@
234
235	/*
236	** Check the input string to ensure that it is safe to pass into system().
237	** A string is unsafe for system() on unix if it contains any of the following:
238	**
239	** * Any occurrance of '$' or '`' except single-quoted or after \
240	** * Any of the following characters, unquoted: ;\|& or \n except
241	** these characters are allowed as the very last character in the
242	** string.
243	** * Unbalanced single or double quotes
244	**
245

	--- src/util.c
	+++ src/util.c
	@@ -234,11 +234,11 @@
234
235	/*
236	** Check the input string to ensure that it is safe to pass into system().
237	** A string is unsafe for system() on unix if it contains any of the following:
238	**
239	** * Any occurrence of '$' or '`' except single-quoted or after \
240	** * Any of the following characters, unquoted: ;\|& or \n except
241	** these characters are allowed as the very last character in the
242	** string.
243	** * Unbalanced single or double quotes
244	**
245

M src/wiki.c

+1 -1

		--- src/wiki.c
		+++ src/wiki.c
		@@ -2273,11 +2273,11 @@
2273	2273	** of timestamp with the most recent
2274	2274	** first.
2275	2275	** -a\|--show-associated Show wiki pages associated with
2276	2276	** check-ins and branches.
2277	2277	** -s\|--show-technote-ids The id of the tech note will be listed
2278		-** along side the timestamp. The tech note
	2278	+** alongside the timestamp. The tech note
2279	2279	** id will be the first word on each line.
2280	2280	** This option only applies if the
2281	2281	** --technote option is also specified.
2282	2282	**
2283	2283	** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
2284	2284

	--- src/wiki.c
	+++ src/wiki.c
	@@ -2273,11 +2273,11 @@
2273	** of timestamp with the most recent
2274	** first.
2275	** -a\|--show-associated Show wiki pages associated with
2276	** check-ins and branches.
2277	** -s\|--show-technote-ids The id of the tech note will be listed
2278	** along side the timestamp. The tech note
2279	** id will be the first word on each line.
2280	** This option only applies if the
2281	** --technote option is also specified.
2282	**
2283	** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
2284

	--- src/wiki.c
	+++ src/wiki.c
	@@ -2273,11 +2273,11 @@
2273	** of timestamp with the most recent
2274	** first.
2275	** -a\|--show-associated Show wiki pages associated with
2276	** check-ins and branches.
2277	** -s\|--show-technote-ids The id of the tech note will be listed
2278	** alongside the timestamp. The tech note
2279	** id will be the first word on each line.
2280	** This option only applies if the
2281	** --technote option is also specified.
2282	**
2283	** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
2284

M src/wikiformat.c

+5 -5

		--- src/wikiformat.c
		+++ src/wikiformat.c
		@@ -25,11 +25,11 @@
25	25	/*
26	26	** Allowed wiki transformation operations
27	27	*/
28	28	#define WIKI_HTMLONLY 0x0001 /* HTML markup only. No wiki */
29	29	#define WIKI_INLINE 0x0002 /* Do not surround with <p>..</p> */
30		-/* avalable for reuse: 0x0004 --- formerly WIKI_NOBLOCK */
	30	+/* available for reuse: 0x0004 --- formerly WIKI_NOBLOCK */
31	31	#define WIKI_BUTTONS 0x0008 /* Allow sub-menu buttons */
32	32	#define WIKI_NOBADLINKS 0x0010 /* Ignore broken hyperlinks */
33	33	#define WIKI_LINKSONLY 0x0020 /* No markup. Only decorate links */
34	34	#define WIKI_NEWLINE 0x0040 /* Honor \n - break lines at each \n */
35	35	#define WIKI_MARKDOWNLINKS 0x0080 /* Resolve hyperlinks as in markdown */
		@@ -566,11 +566,11 @@
566	566	** &
567	567	** \n
568	568	** [
569	569	**
570	570	** The "[" is only considered if flags contain ALLOW_LINKS or ALLOW_WIKI.
571		-** The "\n" is only considered interesting if the flags constains ALLOW_WIKI.
	571	+** The "\n" is only considered interesting if the flags contains ALLOW_WIKI.
572	572	*/
573	573	static int textLength(const char *z, int flags){
574	574	const char *zReject;
575	575	if( flags & ALLOW_WIKI ){
576	576	zReject = "<&[\n";
		@@ -1811,11 +1811,11 @@
1811	1811	/* Enter <verbatim> processing. With verbatim enabled, all other
1812	1812	** markup other than the corresponding end-tag with the same ID is
1813	1813	** ignored.
1814	1814	*/
1815	1815	if( markup.iCode==MARKUP_VERBATIM ){
1816		- int ii; //, vAttrDidAppend=0;
	1816	+ int ii; /, vAttrDidAppend=0;/
1817	1817	const char *zClass = 0;
1818	1818	p->zVerbatimId = 0;
1819	1819	p->inVerbatim = 1;
1820	1820	p->preVerbState = p->state;
1821	1821	p->state &= ~ALLOW_WIKI;
		@@ -2745,11 +2745,11 @@
2745	2745	p->nAlloc = 0;
2746	2746	p->aStack = p->aSpace;
2747	2747	}
2748	2748
2749	2749	/*
2750		-** Push a new element onto the tag statk
	2750	+** Push a new element onto the tag stack
2751	2751	*/
2752	2752	static void html_tagstack_push(HtmlTagStack *p, int e){
2753	2753	if( p->n>=ArraySize(p->aSpace) && p->n>=p->nAlloc ){
2754	2754	if( p->nAlloc==0 ){
2755	2755	int *aNew;
		@@ -2813,11 +2813,11 @@
2813	2813	**
2814	2814	** When safe_html() is asked to sanitize some HTML, it will ignore
2815	2815	** any text in between two consecutive instances of the nonce. The
2816	2816	** nonce itself is an HTML comment so it is harmless to keep the
2817	2817	** nonce in the middle of the HTML stream. A different nonce is
2818		-** choosen each time Fossil is run, using a lot of randomness, so
	2818	+** chosen each time Fossil is run, using a lot of randomness, so
2819	2819	** an attacker will be unable to guess the nonce in advance.
2820	2820	**
2821	2821	** The original use-case for this mechanism is to allow Pikchr-generated
2822	2822	** SVG in the middle of HTML generated from Markdown. The Markdown
2823	2823	** output will normally be processed by safe_html() to prevent accidental
2824	2824

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -25,11 +25,11 @@
25	/*
26	** Allowed wiki transformation operations
27	*/
28	#define WIKI_HTMLONLY 0x0001 /* HTML markup only. No wiki */
29	#define WIKI_INLINE 0x0002 /* Do not surround with <p>..</p> */
30	/* avalable for reuse: 0x0004 --- formerly WIKI_NOBLOCK */
31	#define WIKI_BUTTONS 0x0008 /* Allow sub-menu buttons */
32	#define WIKI_NOBADLINKS 0x0010 /* Ignore broken hyperlinks */
33	#define WIKI_LINKSONLY 0x0020 /* No markup. Only decorate links */
34	#define WIKI_NEWLINE 0x0040 /* Honor \n - break lines at each \n */
35	#define WIKI_MARKDOWNLINKS 0x0080 /* Resolve hyperlinks as in markdown */
	@@ -566,11 +566,11 @@
566	** &
567	** \n
568	** [
569	**
570	** The "[" is only considered if flags contain ALLOW_LINKS or ALLOW_WIKI.
571	** The "\n" is only considered interesting if the flags constains ALLOW_WIKI.
572	*/
573	static int textLength(const char *z, int flags){
574	const char *zReject;
575	if( flags & ALLOW_WIKI ){
576	zReject = "<&[\n";
	@@ -1811,11 +1811,11 @@
1811	/* Enter <verbatim> processing. With verbatim enabled, all other
1812	** markup other than the corresponding end-tag with the same ID is
1813	** ignored.
1814	*/
1815	if( markup.iCode==MARKUP_VERBATIM ){
1816	int ii; //, vAttrDidAppend=0;
1817	const char *zClass = 0;
1818	p->zVerbatimId = 0;
1819	p->inVerbatim = 1;
1820	p->preVerbState = p->state;
1821	p->state &= ~ALLOW_WIKI;
	@@ -2745,11 +2745,11 @@
2745	p->nAlloc = 0;
2746	p->aStack = p->aSpace;
2747	}
2748
2749	/*
2750	** Push a new element onto the tag statk
2751	*/
2752	static void html_tagstack_push(HtmlTagStack *p, int e){
2753	if( p->n>=ArraySize(p->aSpace) && p->n>=p->nAlloc ){
2754	if( p->nAlloc==0 ){
2755	int *aNew;
	@@ -2813,11 +2813,11 @@
2813	**
2814	** When safe_html() is asked to sanitize some HTML, it will ignore
2815	** any text in between two consecutive instances of the nonce. The
2816	** nonce itself is an HTML comment so it is harmless to keep the
2817	** nonce in the middle of the HTML stream. A different nonce is
2818	** choosen each time Fossil is run, using a lot of randomness, so
2819	** an attacker will be unable to guess the nonce in advance.
2820	**
2821	** The original use-case for this mechanism is to allow Pikchr-generated
2822	** SVG in the middle of HTML generated from Markdown. The Markdown
2823	** output will normally be processed by safe_html() to prevent accidental
2824

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -25,11 +25,11 @@
25	/*
26	** Allowed wiki transformation operations
27	*/
28	#define WIKI_HTMLONLY 0x0001 /* HTML markup only. No wiki */
29	#define WIKI_INLINE 0x0002 /* Do not surround with <p>..</p> */
30	/* available for reuse: 0x0004 --- formerly WIKI_NOBLOCK */
31	#define WIKI_BUTTONS 0x0008 /* Allow sub-menu buttons */
32	#define WIKI_NOBADLINKS 0x0010 /* Ignore broken hyperlinks */
33	#define WIKI_LINKSONLY 0x0020 /* No markup. Only decorate links */
34	#define WIKI_NEWLINE 0x0040 /* Honor \n - break lines at each \n */
35	#define WIKI_MARKDOWNLINKS 0x0080 /* Resolve hyperlinks as in markdown */
	@@ -566,11 +566,11 @@
566	** &
567	** \n
568	** [
569	**
570	** The "[" is only considered if flags contain ALLOW_LINKS or ALLOW_WIKI.
571	** The "\n" is only considered interesting if the flags contains ALLOW_WIKI.
572	*/
573	static int textLength(const char *z, int flags){
574	const char *zReject;
575	if( flags & ALLOW_WIKI ){
576	zReject = "<&[\n";
	@@ -1811,11 +1811,11 @@
1811	/* Enter <verbatim> processing. With verbatim enabled, all other
1812	** markup other than the corresponding end-tag with the same ID is
1813	** ignored.
1814	*/
1815	if( markup.iCode==MARKUP_VERBATIM ){
1816	int ii; /, vAttrDidAppend=0;/
1817	const char *zClass = 0;
1818	p->zVerbatimId = 0;
1819	p->inVerbatim = 1;
1820	p->preVerbState = p->state;
1821	p->state &= ~ALLOW_WIKI;
	@@ -2745,11 +2745,11 @@
2745	p->nAlloc = 0;
2746	p->aStack = p->aSpace;
2747	}
2748
2749	/*
2750	** Push a new element onto the tag stack
2751	*/
2752	static void html_tagstack_push(HtmlTagStack *p, int e){
2753	if( p->n>=ArraySize(p->aSpace) && p->n>=p->nAlloc ){
2754	if( p->nAlloc==0 ){
2755	int *aNew;
	@@ -2813,11 +2813,11 @@
2813	**
2814	** When safe_html() is asked to sanitize some HTML, it will ignore
2815	** any text in between two consecutive instances of the nonce. The
2816	** nonce itself is an HTML comment so it is harmless to keep the
2817	** nonce in the middle of the HTML stream. A different nonce is
2818	** chosen each time Fossil is run, using a lot of randomness, so
2819	** an attacker will be unable to guess the nonce in advance.
2820	**
2821	** The original use-case for this mechanism is to allow Pikchr-generated
2822	** SVG in the middle of HTML generated from Markdown. The Markdown
2823	** output will normally be processed by safe_html() to prevent accidental
2824

M src/winhttp.c

+1 -1

		--- src/winhttp.c
		+++ src/winhttp.c
		@@ -805,11 +805,11 @@
805	805	(LPWSTR) &tmp,
806	806	0,
807	807	NULL
808	808	);
809	809	if( !nMsg ){
810		- /* No english, get what the system has available. */
	810	+ /* No English, get what the system has available. */
811	811	nMsg = FormatMessageW(
812	812	FORMAT_MESSAGE_ALLOCATE_BUFFER \|
813	813	FORMAT_MESSAGE_FROM_SYSTEM \|
814	814	FORMAT_MESSAGE_IGNORE_INSERTS,
815	815	NULL,
816	816

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -805,11 +805,11 @@
805	(LPWSTR) &tmp,
806	0,
807	NULL
808	);
809	if( !nMsg ){
810	/* No english, get what the system has available. */
811	nMsg = FormatMessageW(
812	FORMAT_MESSAGE_ALLOCATE_BUFFER \|
813	FORMAT_MESSAGE_FROM_SYSTEM \|
814	FORMAT_MESSAGE_IGNORE_INSERTS,
815	NULL,
816

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -805,11 +805,11 @@
805	(LPWSTR) &tmp,
806	0,
807	NULL
808	);
809	if( !nMsg ){
810	/* No English, get what the system has available. */
811	nMsg = FormatMessageW(
812	FORMAT_MESSAGE_ALLOCATE_BUFFER \|
813	FORMAT_MESSAGE_FROM_SYSTEM \|
814	FORMAT_MESSAGE_IGNORE_INSERTS,
815	NULL,
816

M src/xfer.c

+2 -2

		--- src/xfer.c
		+++ src/xfer.c
		@@ -52,11 +52,11 @@
52	52	int resync; /* Send igot cards for all holdings */
53	53	u8 syncPrivate; /* True to enable syncing private content */
54	54	u8 nextIsPrivate; /* If true, next "file" received is a private */
55	55	u32 remoteVersion; /* Version of fossil running on the other side */
56	56	u32 remoteDate; /* Date for specific client software edition */
57		- u32 remoteTime; /* Time of date correspoding on remoteDate */
	57	+ u32 remoteTime; /* Time of date corresponding on remoteDate */
58	58	time_t maxTime; /* Time when this transfer should be finished */
59	59	};
60	60
61	61
62	62	/*
		@@ -1216,11 +1216,11 @@
1216	1216	return xfer_run_script(xfer_common_code(), 0, 0);
1217	1217	}
1218	1218
1219	1219	/*
1220	1220	** This routine makes a "syncwith:URL" entry in the CONFIG table to
1221		-** indicate that a sync is occuring with zUrl.
	1221	+** indicate that a sync is occurring with zUrl.
1222	1222	**
1223	1223	** Add a "syncfrom:URL" entry instead of "syncwith:URL" if bSyncFrom is true.
1224	1224	*/
1225	1225	static void xfer_syncwith(const char *zUrl, int bSyncFrom){
1226	1226	UrlData x;
1227	1227

	--- src/xfer.c
	+++ src/xfer.c
	@@ -52,11 +52,11 @@
52	int resync; /* Send igot cards for all holdings */
53	u8 syncPrivate; /* True to enable syncing private content */
54	u8 nextIsPrivate; /* If true, next "file" received is a private */
55	u32 remoteVersion; /* Version of fossil running on the other side */
56	u32 remoteDate; /* Date for specific client software edition */
57	u32 remoteTime; /* Time of date correspoding on remoteDate */
58	time_t maxTime; /* Time when this transfer should be finished */
59	};
60
61
62	/*
	@@ -1216,11 +1216,11 @@
1216	return xfer_run_script(xfer_common_code(), 0, 0);
1217	}
1218
1219	/*
1220	** This routine makes a "syncwith:URL" entry in the CONFIG table to
1221	** indicate that a sync is occuring with zUrl.
1222	**
1223	** Add a "syncfrom:URL" entry instead of "syncwith:URL" if bSyncFrom is true.
1224	*/
1225	static void xfer_syncwith(const char *zUrl, int bSyncFrom){
1226	UrlData x;
1227

	--- src/xfer.c
	+++ src/xfer.c
	@@ -52,11 +52,11 @@
52	int resync; /* Send igot cards for all holdings */
53	u8 syncPrivate; /* True to enable syncing private content */
54	u8 nextIsPrivate; /* If true, next "file" received is a private */
55	u32 remoteVersion; /* Version of fossil running on the other side */
56	u32 remoteDate; /* Date for specific client software edition */
57	u32 remoteTime; /* Time of date corresponding on remoteDate */
58	time_t maxTime; /* Time when this transfer should be finished */
59	};
60
61
62	/*
	@@ -1216,11 +1216,11 @@
1216	return xfer_run_script(xfer_common_code(), 0, 0);
1217	}
1218
1219	/*
1220	** This routine makes a "syncwith:URL" entry in the CONFIG table to
1221	** indicate that a sync is occurring with zUrl.
1222	**
1223	** Add a "syncfrom:URL" entry instead of "syncwith:URL" if bSyncFrom is true.
1224	*/
1225	static void xfer_syncwith(const char *zUrl, int bSyncFrom){
1226	UrlData x;
1227

M src/xsystem.c

+3 -3

		--- src/xsystem.c
		+++ src/xsystem.c
		@@ -41,11 +41,11 @@
41	41	(void)argv;
42	42	fossil_print("%z = ", cgi_iso8601_datestamp());
43	43	fossil_print("%z\n", cgi_rfc822_datestamp(time(0)));
44	44	}
45	45
46		-/* Present working diretory */
	46	+/* Present working directory */
47	47	void xsystem_pwd(int argc, char **argv){
48	48	char *zPwd = file_getcwd(0, 0);
49	49	fossil_print("%z\n", zPwd);
50	50	}
51	51
		@@ -168,11 +168,11 @@
168	168	file_directory_list_free(azList);
169	169	}
170	170	}
171	171
172	172	/*
173		-** Return arguments to ORDER BY that will correctly sort the entires.
	173	+** Return arguments to ORDER BY that will correctly sort the entries.
174	174	*/
175	175	static const char *xsystem_ls_orderby(int mFlags){
176	176	static const char *zSortTypes[] = {
177	177	"fn COLLATE NOCASE",
178	178	"mtime DESC",
		@@ -343,11 +343,11 @@
343	343
344	344	/* List files "ls"
345	345	** Options:
346	346	**
347	347	** -a Show files that begin with "."
348		-** -C List by colums
	348	+** -C List by columns
349	349	** --color=WHEN Colorize output?
350	350	** -d Show just directory names, not content
351	351	** -l Long listing
352	352	** -m Comma-separated list
353	353	** -r Reverse sort
354	354

	--- src/xsystem.c
	+++ src/xsystem.c
	@@ -41,11 +41,11 @@
41	(void)argv;
42	fossil_print("%z = ", cgi_iso8601_datestamp());
43	fossil_print("%z\n", cgi_rfc822_datestamp(time(0)));
44	}
45
46	/* Present working diretory */
47	void xsystem_pwd(int argc, char **argv){
48	char *zPwd = file_getcwd(0, 0);
49	fossil_print("%z\n", zPwd);
50	}
51
	@@ -168,11 +168,11 @@
168	file_directory_list_free(azList);
169	}
170	}
171
172	/*
173	** Return arguments to ORDER BY that will correctly sort the entires.
174	*/
175	static const char *xsystem_ls_orderby(int mFlags){
176	static const char *zSortTypes[] = {
177	"fn COLLATE NOCASE",
178	"mtime DESC",
	@@ -343,11 +343,11 @@
343
344	/* List files "ls"
345	** Options:
346	**
347	** -a Show files that begin with "."
348	** -C List by colums
349	** --color=WHEN Colorize output?
350	** -d Show just directory names, not content
351	** -l Long listing
352	** -m Comma-separated list
353	** -r Reverse sort
354

	--- src/xsystem.c
	+++ src/xsystem.c
	@@ -41,11 +41,11 @@
41	(void)argv;
42	fossil_print("%z = ", cgi_iso8601_datestamp());
43	fossil_print("%z\n", cgi_rfc822_datestamp(time(0)));
44	}
45
46	/* Present working directory */
47	void xsystem_pwd(int argc, char **argv){
48	char *zPwd = file_getcwd(0, 0);
49	fossil_print("%z\n", zPwd);
50	}
51
	@@ -168,11 +168,11 @@
168	file_directory_list_free(azList);
169	}
170	}
171
172	/*
173	** Return arguments to ORDER BY that will correctly sort the entries.
174	*/
175	static const char *xsystem_ls_orderby(int mFlags){
176	static const char *zSortTypes[] = {
177	"fn COLLATE NOCASE",
178	"mtime DESC",
	@@ -343,11 +343,11 @@
343
344	/* List files "ls"
345	** Options:
346	**
347	** -a Show files that begin with "."
348	** -C List by columns
349	** --color=WHEN Colorize output?
350	** -d Show just directory names, not content
351	** -l Long listing
352	** -m Comma-separated list
353	** -r Reverse sort
354

M src/zip.c

+2 -2

		--- src/zip.c
		+++ src/zip.c
		@@ -230,11 +230,11 @@
230	230	dosTime = (H<<11) + (M<<5) + (S>>1);
231	231	dosDate = ((y-1980)<<9) + (m<<5) + d;
232	232	}
233	233
234	234	/*
235		-** Set the date and time from a julian day number.
	235	+** Set the date and time from a Julian day number.
236	236	*/
237	237	void zip_set_timedate(double rDate){
238	238	char *zDate = db_text(0, "SELECT datetime(%.17g)", rDate);
239	239	zip_set_timedate_from_str(zDate);
240	240	fossil_free(zDate);
		@@ -267,11 +267,11 @@
267	267	char zHdr[30];
268	268	char zExTime[13];
269	269	char zBuf[100];
270	270	char zOutBuf[100000];
271	271
272		- /* Fill in as much of the header as we know.
	272	+ /* Fill inasmuch of the header as we know.
273	273	*/
274	274	nameLen = (int)strlen(zName);
275	275	if( nameLen==0 ) return;
276	276	nBlob = pFile ? blob_size(pFile) : 0;
277	277	if( pFile ){ /* This is a file, possibly empty... */
278	278

	--- src/zip.c
	+++ src/zip.c
	@@ -230,11 +230,11 @@
230	dosTime = (H<<11) + (M<<5) + (S>>1);
231	dosDate = ((y-1980)<<9) + (m<<5) + d;
232	}
233
234	/*
235	** Set the date and time from a julian day number.
236	*/
237	void zip_set_timedate(double rDate){
238	char *zDate = db_text(0, "SELECT datetime(%.17g)", rDate);
239	zip_set_timedate_from_str(zDate);
240	fossil_free(zDate);
	@@ -267,11 +267,11 @@
267	char zHdr[30];
268	char zExTime[13];
269	char zBuf[100];
270	char zOutBuf[100000];
271
272	/* Fill in as much of the header as we know.
273	*/
274	nameLen = (int)strlen(zName);
275	if( nameLen==0 ) return;
276	nBlob = pFile ? blob_size(pFile) : 0;
277	if( pFile ){ /* This is a file, possibly empty... */
278

	--- src/zip.c
	+++ src/zip.c
	@@ -230,11 +230,11 @@
230	dosTime = (H<<11) + (M<<5) + (S>>1);
231	dosDate = ((y-1980)<<9) + (m<<5) + d;
232	}
233
234	/*
235	** Set the date and time from a Julian day number.
236	*/
237	void zip_set_timedate(double rDate){
238	char *zDate = db_text(0, "SELECT datetime(%.17g)", rDate);
239	zip_set_timedate_from_str(zDate);
240	fossil_free(zDate);
	@@ -267,11 +267,11 @@
267	char zHdr[30];
268	char zExTime[13];
269	char zBuf[100];
270	char zOutBuf[100000];
271
272	/* Fill inasmuch of the header as we know.
273	*/
274	nameLen = (int)strlen(zName);
275	if( nameLen==0 ) return;
276	nBlob = pFile ? blob_size(pFile) : 0;
277	if( pFile ){ /* This is a file, possibly empty... */
278

M tools/codecheck1.c

+1 -1

		--- tools/codecheck1.c
		+++ tools/codecheck1.c
		@@ -443,11 +443,11 @@
443	443	const struct FmtFunc pB = (const struct FmtFunc)pBB;
444	444	return strcmp(pA->zFName, pB->zFName);
445	445	}
446	446
447	447	/*
448		-** Determine if the indentifier zIdent of length nIndent is a Fossil
	448	+** Determine if the identifier zIdent of length nIndent is a Fossil
449	449	** internal interface that uses a printf-style argument. Return zero if not.
450	450	** Return the index of the format string if true with the left-most
451	451	** argument having an index of 1.
452	452	*/
453	453	static int isFormatFunc(const char zIdent, int nIdent, unsigned pFlags){
454	454

	--- tools/codecheck1.c
	+++ tools/codecheck1.c
	@@ -443,11 +443,11 @@
443	const struct FmtFunc pB = (const struct FmtFunc)pBB;
444	return strcmp(pA->zFName, pB->zFName);
445	}
446
447	/*
448	** Determine if the indentifier zIdent of length nIndent is a Fossil
449	** internal interface that uses a printf-style argument. Return zero if not.
450	** Return the index of the format string if true with the left-most
451	** argument having an index of 1.
452	*/
453	static int isFormatFunc(const char zIdent, int nIdent, unsigned pFlags){
454

	--- tools/codecheck1.c
	+++ tools/codecheck1.c
	@@ -443,11 +443,11 @@
443	const struct FmtFunc pB = (const struct FmtFunc)pBB;
444	return strcmp(pA->zFName, pB->zFName);
445	}
446
447	/*
448	** Determine if the identifier zIdent of length nIndent is a Fossil
449	** internal interface that uses a printf-style argument. Return zero if not.
450	** Return the index of the format string if true with the left-most
451	** argument having an index of 1.
452	*/
453	static int isFormatFunc(const char zIdent, int nIdent, unsigned pFlags){
454

Fossil SCM

Keyboard Shortcuts