Fossil SCM

Use fossil_getenv/fossil_fopen in stead of getenv/fopen in a few places, so on Win32 non-ASCII characters in filenames and environment variable values are handled correctly. For shell.c this must be handled by the makefiles, because this file comes from SQLite.

jan.nijtmans 2013-11-07 13:29 trunk
Commit aab8ce2fcc857d993461c967c50bb31f02b03a9b
Parent dda5b18b0dd67c6…
8 files changed +1 -1 +6 -3 +6 -2 +1 -1 +1 -1 +1 -1 +1 -1 +1 -1
~ src/json.c ~ src/makemake.tcl ~ src/printf.c ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M src/json.c
+1 -1
--- src/json.c
+++ src/json.c
@@ -987,11 +987,11 @@
987987
 if(!jfile || !*jfile){
988988
 break;
989989
 }
990990
 inFile = (0==strcmp("-",jfile))
991991
 ? stdin
992
- : fopen(jfile,"rb");
992
+ : fossil_fopen(jfile,"rb");
993993
 if(!inFile){
994994
 g.json.resultCode = FSL_JSON_E_FILE_OPEN_FAILED;
995995
 fossil_fatal("Could not open JSON file [%s].",jfile)
996996
 /* Does not return. */
997997
 ;
998998
--- src/json.c
+++ src/json.c
@@ -987,11 +987,11 @@
987 if(!jfile || !*jfile){
988 break;
989 }
990 inFile = (0==strcmp("-",jfile))
991 ? stdin
992 : fopen(jfile,"rb");
993 if(!inFile){
994 g.json.resultCode = FSL_JSON_E_FILE_OPEN_FAILED;
995 fossil_fatal("Could not open JSON file [%s].",jfile)
996 /* Does not return. */
997 ;
998
--- src/json.c
+++ src/json.c
@@ -987,11 +987,11 @@
987 if(!jfile || !*jfile){
988 break;
989 }
990 inFile = (0==strcmp("-",jfile))
991 ? stdin
992 : fossil_fopen(jfile,"rb");
993 if(!inFile){
994 g.json.resultCode = FSL_JSON_E_FILE_OPEN_FAILED;
995 fossil_fatal("Could not open JSON file [%s].",jfile)
996 /* Does not return. */
997 ;
998
M src/makemake.tcl
+6 -3
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -781,10 +781,13 @@
781781
 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
782782
 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
783783
784784
 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
785785
 set opt {-Dmain=sqlite3_shell}
786
+append opt " -Dsqlite3_strglob=strglob"
787
+append opt " -Dgetenv=fossil_getenv"
788
+append opt " -Dfopen=fossil_fopen"
786789
 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
787790
 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
788791
789792
 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
790793
 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
@@ -888,11 +891,11 @@
888891
889892
 version$E: $B\src\mkversion.c
890893
 $(BCC) -o$@ $**
891894
892895
 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
893
- $(TCC) -o$@ -c -Dmain=sqlite3_shell $(SQLITE_OPTIONS) $**
896
+ $(TCC) -o$@ -c -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SQLITE_OPTIONS) $**
894897
895898
 $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
896899
 $(TCC) -o$@ -c $(SQLITE_OPTIONS) $**
897900
898901
 $(OBJDIR)\th$O : $(SRCDIR)\th.c
@@ -1091,11 +1094,11 @@
10911094
10921095
 mkversion$E: $B\src\mkversion.c
10931096
 $(BCC) $**
10941097
10951098
 $(OX)\shell$O : $(SRCDIR)\shell.c
1096
- $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
1099
+ $(TCC) /Fo$@ /Dmain=sqlite3_shell /Dsqlite3_strglob=strglob /Dgetenv=fossil_getenv /Dfopen=fossil_fopen $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
10971100
10981101
 $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
10991102
 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
11001103
11011104
 $(OX)\th$O : $(SRCDIR)\th.c
@@ -1277,11 +1280,11 @@
12771280
12781281
 # define the sqlite shell files, which need special flags on compile
12791282
 SQLITESHELLSRC=shell.c
12801283
 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
12811284
 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1282
-SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob
1285
+SQLITESHELLDEFINES=-Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1
12831286
12841287
 # define the th scripting files, which need special flags on compile
12851288
 THSRC=th.c th_lang.c
12861289
 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
12871290
 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
12881291
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -781,10 +781,13 @@
781 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
782 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
783
784 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
785 set opt {-Dmain=sqlite3_shell}
 
 
 
786 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
787 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
788
789 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
790 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
@@ -888,11 +891,11 @@
888
889 version$E: $B\src\mkversion.c
890 $(BCC) -o$@ $**
891
892 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
893 $(TCC) -o$@ -c -Dmain=sqlite3_shell $(SQLITE_OPTIONS) $**
894
895 $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
896 $(TCC) -o$@ -c $(SQLITE_OPTIONS) $**
897
898 $(OBJDIR)\th$O : $(SRCDIR)\th.c
@@ -1091,11 +1094,11 @@
1091
1092 mkversion$E: $B\src\mkversion.c
1093 $(BCC) $**
1094
1095 $(OX)\shell$O : $(SRCDIR)\shell.c
1096 $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
1097
1098 $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
1099 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
1100
1101 $(OX)\th$O : $(SRCDIR)\th.c
@@ -1277,11 +1280,11 @@
1277
1278 # define the sqlite shell files, which need special flags on compile
1279 SQLITESHELLSRC=shell.c
1280 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
1281 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1282 SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob
1283
1284 # define the th scripting files, which need special flags on compile
1285 THSRC=th.c th_lang.c
1286 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
1287 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
1288
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -781,10 +781,13 @@
781 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
782 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
783
784 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
785 set opt {-Dmain=sqlite3_shell}
786 append opt " -Dsqlite3_strglob=strglob"
787 append opt " -Dgetenv=fossil_getenv"
788 append opt " -Dfopen=fossil_fopen"
789 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
790 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
791
792 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
793 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
@@ -888,11 +891,11 @@
891
892 version$E: $B\src\mkversion.c
893 $(BCC) -o$@ $**
894
895 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
896 $(TCC) -o$@ -c -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SQLITE_OPTIONS) $**
897
898 $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
899 $(TCC) -o$@ -c $(SQLITE_OPTIONS) $**
900
901 $(OBJDIR)\th$O : $(SRCDIR)\th.c
@@ -1091,11 +1094,11 @@
1094
1095 mkversion$E: $B\src\mkversion.c
1096 $(BCC) $**
1097
1098 $(OX)\shell$O : $(SRCDIR)\shell.c
1099 $(TCC) /Fo$@ /Dmain=sqlite3_shell /Dsqlite3_strglob=strglob /Dgetenv=fossil_getenv /Dfopen=fossil_fopen $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
1100
1101 $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
1102 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
1103
1104 $(OX)\th$O : $(SRCDIR)\th.c
@@ -1277,11 +1280,11 @@
1280
1281 # define the sqlite shell files, which need special flags on compile
1282 SQLITESHELLSRC=shell.c
1283 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
1284 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
1285 SQLITESHELLDEFINES=-Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1
1286
1287 # define the th scripting files, which need special flags on compile
1288 THSRC=th.c th_lang.c
1289 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
1290 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
1291
M src/printf.c
+6 -2
--- src/printf.c
+++ src/printf.c
@@ -922,11 +922,11 @@
922922
 va_list ap;
923923
 static const char *azEnv[] = { "HTTP_HOST", "HTTP_USER_AGENT",
924924
 "PATH_INFO", "QUERY_STRING", "REMOTE_ADDR", "REQUEST_METHOD",
925925
 "REQUEST_URI", "SCRIPT_NAME" };
926926
 if( g.zErrlog==0 ) return;
927
- out = fopen(g.zErrlog, "a");
927
+ out = fossil_fopen(g.zErrlog, "a");
928928
 if( out==0 ) return;
929929
 now = time(0);
930930
 pNow = gmtime(&now);
931931
 fprintf(out, "------------- %04d-%02d-%02d %02d:%02d:%02d UTC ------------\n",
932932
 pNow->tm_year+1900, pNow->tm_mon+1, pNow->tm_mday+1,
@@ -934,11 +934,15 @@
934934
 va_start(ap, zFormat);
935935
 vfprintf(out, zFormat, ap);
936936
 fprintf(out, "\n");
937937
 va_end(ap);
938938
 for(i=0; i<sizeof(azEnv)/sizeof(azEnv[0]); i++){
939
- if( (z = getenv(azEnv[i]))!=0 || (z = P(azEnv[i]))!=0 ){
939
+ char *p;
940
+ if( (p = fossil_getenv(azEnv[i]))!=0 ){
941
+ fprintf(out, "%s=%s\n", azEnv[i], p);
942
+ fossil_filename_free(p);
943
+ }else if( (z = P(azEnv[i]))!=0 ){
940944
 fprintf(out, "%s=%s\n", azEnv[i], z);
941945
 }
942946
 }
943947
 fclose(out);
944948
 }
945949
--- src/printf.c
+++ src/printf.c
@@ -922,11 +922,11 @@
922 va_list ap;
923 static const char *azEnv[] = { "HTTP_HOST", "HTTP_USER_AGENT",
924 "PATH_INFO", "QUERY_STRING", "REMOTE_ADDR", "REQUEST_METHOD",
925 "REQUEST_URI", "SCRIPT_NAME" };
926 if( g.zErrlog==0 ) return;
927 out = fopen(g.zErrlog, "a");
928 if( out==0 ) return;
929 now = time(0);
930 pNow = gmtime(&now);
931 fprintf(out, "------------- %04d-%02d-%02d %02d:%02d:%02d UTC ------------\n",
932 pNow->tm_year+1900, pNow->tm_mon+1, pNow->tm_mday+1,
@@ -934,11 +934,15 @@
934 va_start(ap, zFormat);
935 vfprintf(out, zFormat, ap);
936 fprintf(out, "\n");
937 va_end(ap);
938 for(i=0; i<sizeof(azEnv)/sizeof(azEnv[0]); i++){
939 if( (z = getenv(azEnv[i]))!=0 || (z = P(azEnv[i]))!=0 ){
 
 
 
 
940 fprintf(out, "%s=%s\n", azEnv[i], z);
941 }
942 }
943 fclose(out);
944 }
945
--- src/printf.c
+++ src/printf.c
@@ -922,11 +922,11 @@
922 va_list ap;
923 static const char *azEnv[] = { "HTTP_HOST", "HTTP_USER_AGENT",
924 "PATH_INFO", "QUERY_STRING", "REMOTE_ADDR", "REQUEST_METHOD",
925 "REQUEST_URI", "SCRIPT_NAME" };
926 if( g.zErrlog==0 ) return;
927 out = fossil_fopen(g.zErrlog, "a");
928 if( out==0 ) return;
929 now = time(0);
930 pNow = gmtime(&now);
931 fprintf(out, "------------- %04d-%02d-%02d %02d:%02d:%02d UTC ------------\n",
932 pNow->tm_year+1900, pNow->tm_mon+1, pNow->tm_mday+1,
@@ -934,11 +934,15 @@
934 va_start(ap, zFormat);
935 vfprintf(out, zFormat, ap);
936 fprintf(out, "\n");
937 va_end(ap);
938 for(i=0; i<sizeof(azEnv)/sizeof(azEnv[0]); i++){
939 char *p;
940 if( (p = fossil_getenv(azEnv[i]))!=0 ){
941 fprintf(out, "%s=%s\n", azEnv[i], p);
942 fossil_filename_free(p);
943 }else if( (z = P(azEnv[i]))!=0 ){
944 fprintf(out, "%s=%s\n", azEnv[i], z);
945 }
946 }
947 fclose(out);
948 }
949
M win/Makefile.PellesCGMake
+1 -1
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -89,11 +89,11 @@
8989
9090
 # define the sqlite shell files, which need special flags on compile
9191
 SQLITESHELLSRC=shell.c
9292
 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
9393
 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94
-SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob
94
+SQLITESHELLDEFINES=-Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1
9595
9696
 # define the th scripting files, which need special flags on compile
9797
 THSRC=th.c th_lang.c
9898
 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
9999
 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
100100
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -89,11 +89,11 @@
89
90 # define the sqlite shell files, which need special flags on compile
91 SQLITESHELLSRC=shell.c
92 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94 SQLITESHELLDEFINES=-Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -Dsqlite3_strglob=strglob
95
96 # define the th scripting files, which need special flags on compile
97 THSRC=th.c th_lang.c
98 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
99 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
100
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -89,11 +89,11 @@
89
90 # define the sqlite shell files, which need special flags on compile
91 SQLITESHELLSRC=shell.c
92 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94 SQLITESHELLDEFINES=-Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1
95
96 # define the th scripting files, which need special flags on compile
97 THSRC=th.c th_lang.c
98 ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf))
99 THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj))
100
M win/Makefile.dmc
+1 -1
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -66,11 +66,11 @@
6666
6767
 version$E: $B\src\mkversion.c
6868
 $(BCC) -o$@ $**
6969
7070
 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
71
- $(TCC) -o$@ -c -Dmain=sqlite3_shell $(SQLITE_OPTIONS) $**
71
+ $(TCC) -o$@ -c -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SQLITE_OPTIONS) $**
7272
7373
 $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
7474
 $(TCC) -o$@ -c $(SQLITE_OPTIONS) $**
7575
7676
 $(OBJDIR)\th$O : $(SRCDIR)\th.c
7777
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -66,11 +66,11 @@
66
67 version$E: $B\src\mkversion.c
68 $(BCC) -o$@ $**
69
70 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
71 $(TCC) -o$@ -c -Dmain=sqlite3_shell $(SQLITE_OPTIONS) $**
72
73 $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
74 $(TCC) -o$@ -c $(SQLITE_OPTIONS) $**
75
76 $(OBJDIR)\th$O : $(SRCDIR)\th.c
77
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -66,11 +66,11 @@
66
67 version$E: $B\src\mkversion.c
68 $(BCC) -o$@ $**
69
70 $(OBJDIR)\shell$O : $(SRCDIR)\shell.c
71 $(TCC) -o$@ -c -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen $(SQLITE_OPTIONS) $**
72
73 $(OBJDIR)\sqlite3$O : $(SRCDIR)\sqlite3.c
74 $(TCC) -o$@ -c $(SQLITE_OPTIONS) $**
75
76 $(OBJDIR)\th$O : $(SRCDIR)\th.c
77
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1693,11 +1693,11 @@
16931693
 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
16941694
16951695
 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
16961696
16971697
 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698
- $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1698
+ $(XTCC) -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
16991699
17001700
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
17011701
 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
17021702
17031703
 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
17041704
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1693,11 +1693,11 @@
1693 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696
1697 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699
1700 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1701 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702
1703 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1693,11 +1693,11 @@
1693 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696
1697 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698 $(XTCC) -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699
1700 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1701 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702
1703 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704
M win/Makefile.mingw.mistachkin
+1 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1693,11 +1693,11 @@
16931693
 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
16941694
16951695
 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
16961696
16971697
 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698
- $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1698
+ $(XTCC) -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
16991699
17001700
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
17011701
 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
17021702
17031703
 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
17041704
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1693,11 +1693,11 @@
1693 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696
1697 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699
1700 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1701 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702
1703 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1693,11 +1693,11 @@
1693 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1694
1695 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1696
1697 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1698 $(XTCC) -Dmain=sqlite3_shell -Dsqlite3_strglob=strglob -Dgetenv=fossil_getenv -Dfopen=fossil_fopen -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1699
1700 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1701 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1702
1703 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1704
M win/Makefile.msc
+1 -1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -440,11 +440,11 @@
440440
441441
 mkversion$E: $B\src\mkversion.c
442442
 $(BCC) $**
443443
444444
 $(OX)\shell$O : $(SRCDIR)\shell.c
445
- $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
445
+ $(TCC) /Fo$@ /Dmain=sqlite3_shell /Dsqlite3_strglob=strglob /Dgetenv=fossil_getenv /Dfopen=fossil_fopen $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
446446
447447
 $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
448448
 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
449449
450450
 $(OX)\th$O : $(SRCDIR)\th.c
451451
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -440,11 +440,11 @@
440
441 mkversion$E: $B\src\mkversion.c
442 $(BCC) $**
443
444 $(OX)\shell$O : $(SRCDIR)\shell.c
445 $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
446
447 $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
448 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
449
450 $(OX)\th$O : $(SRCDIR)\th.c
451
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -440,11 +440,11 @@
440
441 mkversion$E: $B\src\mkversion.c
442 $(BCC) $**
443
444 $(OX)\shell$O : $(SRCDIR)\shell.c
445 $(TCC) /Fo$@ /Dmain=sqlite3_shell /Dsqlite3_strglob=strglob /Dgetenv=fossil_getenv /Dfopen=fossil_fopen $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c
446
447 $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c
448 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $**
449
450 $(OX)\th$O : $(SRCDIR)\th.c
451

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button