Fossil SCM

Factor the sql-command shell out into a separate source file. Add the new content(X) SQL function for accessing uncompressed and undeltaed artifact content.

drh 2010-11-24 12:03 trunk
Commit b4687be448ba0c35e145463dd86c9f3c24505ad1
Parent e1dac0e4f68d7bc…
5 files changed -28 +12 -2 +1 +2 -2 +17
~ src/main.c ~ src/main.mk ~ src/makemake.tcl ~ src/shell.c + src/sqlcmd.c
M src/main.c
-28
--- src/main.c
+++ src/main.c
@@ -1189,33 +1189,5 @@
11891189
 }
11901190
 db_close();
11911191
 win32_http_server(iPort, mxPort, zBrowserCmd, zStopperFile, zNotFound, flags);
11921192
 #endif
11931193
 }
1194
-
1195
-/*
1196
-** COMMAND: sqlite3
1197
-**
1198
-** Usage: %fossil sqlite3 ?DATABASE? ?OPTIONS?
1199
-**
1200
-** Run the standalone sqlite3 command-line shell on DATABASE with OPTIONS.
1201
-** If DATABASE is omitted, then the repository that serves the working
1202
-** directory is opened.
1203
-**
1204
-** WARNING: Careless use of this command can corrupt a Fossil repository
1205
-** in ways that are unrecoverable. Be sure you know what you are doing before
1206
-** running any SQL commands that modifies the repository database.
1207
-*/
1208
-void sqlite3_cmd(void){
1209
- extern int sqlite3_shell(int, char**);
1210
- sqlite3_shell(g.argc-1, g.argv+1);
1211
-}
1212
-
1213
-/*
1214
-** This routine is called by the patched sqlite3 command-line shell in order
1215
-** to load the name and database connection for the open Fossil database.
1216
-*/
1217
-void fossil_open(sqlite3 **pDb, const char **pzRepoName){
1218
- db_must_be_within_tree();
1219
- *pDb = 0;
1220
- *pzRepoName = g.zRepositoryName;
1221
-}
12221194
--- src/main.c
+++ src/main.c
@@ -1189,33 +1189,5 @@
1189 }
1190 db_close();
1191 win32_http_server(iPort, mxPort, zBrowserCmd, zStopperFile, zNotFound, flags);
1192 #endif
1193 }
1194
1195 /*
1196 ** COMMAND: sqlite3
1197 **
1198 ** Usage: %fossil sqlite3 ?DATABASE? ?OPTIONS?
1199 **
1200 ** Run the standalone sqlite3 command-line shell on DATABASE with OPTIONS.
1201 ** If DATABASE is omitted, then the repository that serves the working
1202 ** directory is opened.
1203 **
1204 ** WARNING: Careless use of this command can corrupt a Fossil repository
1205 ** in ways that are unrecoverable. Be sure you know what you are doing before
1206 ** running any SQL commands that modifies the repository database.
1207 */
1208 void sqlite3_cmd(void){
1209 extern int sqlite3_shell(int, char**);
1210 sqlite3_shell(g.argc-1, g.argv+1);
1211 }
1212
1213 /*
1214 ** This routine is called by the patched sqlite3 command-line shell in order
1215 ** to load the name and database connection for the open Fossil database.
1216 */
1217 void fossil_open(sqlite3 **pDb, const char **pzRepoName){
1218 db_must_be_within_tree();
1219 *pDb = 0;
1220 *pzRepoName = g.zRepositoryName;
1221 }
1222
--- src/main.c
+++ src/main.c
@@ -1189,33 +1189,5 @@
1189 }
1190 db_close();
1191 win32_http_server(iPort, mxPort, zBrowserCmd, zStopperFile, zNotFound, flags);
1192 #endif
1193 }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1194
M src/main.mk
+12 -2
--- src/main.mk
+++ src/main.mk
@@ -66,10 +66,11 @@
6666
 $(SRCDIR)/search.c \
6767
 $(SRCDIR)/setup.c \
6868
 $(SRCDIR)/sha1.c \
6969
 $(SRCDIR)/shun.c \
7070
 $(SRCDIR)/skins.c \
71
+ $(SRCDIR)/sqlcmd.c \
7172
 $(SRCDIR)/stat.c \
7273
 $(SRCDIR)/style.c \
7374
 $(SRCDIR)/sync.c \
7475
 $(SRCDIR)/tag.c \
7576
 $(SRCDIR)/th_main.c \
@@ -142,10 +143,11 @@
142143
 search_.c \
143144
 setup_.c \
144145
 sha1_.c \
145146
 shun_.c \
146147
 skins_.c \
148
+ sqlcmd_.c \
147149
 stat_.c \
148150
 style_.c \
149151
 sync_.c \
150152
 tag_.c \
151153
 th_main_.c \
@@ -218,10 +220,11 @@
218220
 $(OBJDIR)/search.o \
219221
 $(OBJDIR)/setup.o \
220222
 $(OBJDIR)/sha1.o \
221223
 $(OBJDIR)/shun.o \
222224
 $(OBJDIR)/skins.o \
225
+ $(OBJDIR)/sqlcmd.o \
223226
 $(OBJDIR)/stat.o \
224227
 $(OBJDIR)/style.o \
225228
 $(OBJDIR)/sync.o \
226229
 $(OBJDIR)/tag.o \
227230
 $(OBJDIR)/th_main.o \
@@ -284,16 +287,16 @@
284287
 # noop
285288
286289
 clean:
287290
 rm -f $(OBJDIR)/*.o *_.c $(APPNAME) VERSION.h
288291
 rm -f translate makeheaders mkindex page_index.h headers
289
- rm -f add.h allrepo.h attach.h bag.h blob.h branch.h browse.h captcha.h cgi.h checkin.h checkout.h clearsign.h clone.h comformat.h configure.h content.h db.h delta.h deltacmd.h descendants.h diff.h diffcmd.h doc.h encode.h event.h export.h file.h finfo.h graph.h http.h http_socket.h http_ssl.h http_transport.h import.h info.h login.h main.h manifest.h md5.h merge.h merge3.h name.h pivot.h popen.h pqueue.h printf.h rebuild.h report.h rss.h schema.h search.h setup.h sha1.h shun.h skins.h stat.h style.h sync.h tag.h th_main.h timeline.h tkt.h tktsetup.h undo.h update.h url.h user.h verify.h vfile.h wiki.h wikiformat.h winhttp.h xfer.h zip.h
292
+ rm -f add.h allrepo.h attach.h bag.h blob.h branch.h browse.h captcha.h cgi.h checkin.h checkout.h clearsign.h clone.h comformat.h configure.h content.h db.h delta.h deltacmd.h descendants.h diff.h diffcmd.h doc.h encode.h event.h export.h file.h finfo.h graph.h http.h http_socket.h http_ssl.h http_transport.h import.h info.h login.h main.h manifest.h md5.h merge.h merge3.h name.h pivot.h popen.h pqueue.h printf.h rebuild.h report.h rss.h schema.h search.h setup.h sha1.h shun.h skins.h sqlcmd.h stat.h style.h sync.h tag.h th_main.h timeline.h tkt.h tktsetup.h undo.h update.h url.h user.h verify.h vfile.h wiki.h wikiformat.h winhttp.h xfer.h zip.h
290293
291294
 page_index.h: $(TRANS_SRC) mkindex
292295
 ./mkindex $(TRANS_SRC) >$@
293296
 headers: page_index.h makeheaders VERSION.h
294
- ./makeheaders add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h VERSION.h
297
+ ./makeheaders add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h VERSION.h
295298
 touch headers
296299
 headers: Makefile
297300
 Makefile:
298301
 add_.c: $(SRCDIR)/add.c translate
299302
 ./translate $(SRCDIR)/add.c >add_.c
@@ -678,10 +681,17 @@
678681
679682
 $(OBJDIR)/skins.o: skins_.c skins.h $(SRCDIR)/config.h
680683
 $(XTCC) -o $(OBJDIR)/skins.o -c skins_.c
681684
682685
 skins.h: headers
686
+sqlcmd_.c: $(SRCDIR)/sqlcmd.c translate
687
+ ./translate $(SRCDIR)/sqlcmd.c >sqlcmd_.c
688
+
689
+$(OBJDIR)/sqlcmd.o: sqlcmd_.c sqlcmd.h $(SRCDIR)/config.h
690
+ $(XTCC) -o $(OBJDIR)/sqlcmd.o -c sqlcmd_.c
691
+
692
+sqlcmd.h: headers
683693
 stat_.c: $(SRCDIR)/stat.c translate
684694
 ./translate $(SRCDIR)/stat.c >stat_.c
685695
686696
 $(OBJDIR)/stat.o: stat_.c stat.h $(SRCDIR)/config.h
687697
 $(XTCC) -o $(OBJDIR)/stat.o -c stat_.c
688698
--- src/main.mk
+++ src/main.mk
@@ -66,10 +66,11 @@
66 $(SRCDIR)/search.c \
67 $(SRCDIR)/setup.c \
68 $(SRCDIR)/sha1.c \
69 $(SRCDIR)/shun.c \
70 $(SRCDIR)/skins.c \
 
71 $(SRCDIR)/stat.c \
72 $(SRCDIR)/style.c \
73 $(SRCDIR)/sync.c \
74 $(SRCDIR)/tag.c \
75 $(SRCDIR)/th_main.c \
@@ -142,10 +143,11 @@
142 search_.c \
143 setup_.c \
144 sha1_.c \
145 shun_.c \
146 skins_.c \
 
147 stat_.c \
148 style_.c \
149 sync_.c \
150 tag_.c \
151 th_main_.c \
@@ -218,10 +220,11 @@
218 $(OBJDIR)/search.o \
219 $(OBJDIR)/setup.o \
220 $(OBJDIR)/sha1.o \
221 $(OBJDIR)/shun.o \
222 $(OBJDIR)/skins.o \
 
223 $(OBJDIR)/stat.o \
224 $(OBJDIR)/style.o \
225 $(OBJDIR)/sync.o \
226 $(OBJDIR)/tag.o \
227 $(OBJDIR)/th_main.o \
@@ -284,16 +287,16 @@
284 # noop
285
286 clean:
287 rm -f $(OBJDIR)/*.o *_.c $(APPNAME) VERSION.h
288 rm -f translate makeheaders mkindex page_index.h headers
289 rm -f add.h allrepo.h attach.h bag.h blob.h branch.h browse.h captcha.h cgi.h checkin.h checkout.h clearsign.h clone.h comformat.h configure.h content.h db.h delta.h deltacmd.h descendants.h diff.h diffcmd.h doc.h encode.h event.h export.h file.h finfo.h graph.h http.h http_socket.h http_ssl.h http_transport.h import.h info.h login.h main.h manifest.h md5.h merge.h merge3.h name.h pivot.h popen.h pqueue.h printf.h rebuild.h report.h rss.h schema.h search.h setup.h sha1.h shun.h skins.h stat.h style.h sync.h tag.h th_main.h timeline.h tkt.h tktsetup.h undo.h update.h url.h user.h verify.h vfile.h wiki.h wikiformat.h winhttp.h xfer.h zip.h
290
291 page_index.h: $(TRANS_SRC) mkindex
292 ./mkindex $(TRANS_SRC) >$@
293 headers: page_index.h makeheaders VERSION.h
294 ./makeheaders add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h VERSION.h
295 touch headers
296 headers: Makefile
297 Makefile:
298 add_.c: $(SRCDIR)/add.c translate
299 ./translate $(SRCDIR)/add.c >add_.c
@@ -678,10 +681,17 @@
678
679 $(OBJDIR)/skins.o: skins_.c skins.h $(SRCDIR)/config.h
680 $(XTCC) -o $(OBJDIR)/skins.o -c skins_.c
681
682 skins.h: headers
 
 
 
 
 
 
 
683 stat_.c: $(SRCDIR)/stat.c translate
684 ./translate $(SRCDIR)/stat.c >stat_.c
685
686 $(OBJDIR)/stat.o: stat_.c stat.h $(SRCDIR)/config.h
687 $(XTCC) -o $(OBJDIR)/stat.o -c stat_.c
688
--- src/main.mk
+++ src/main.mk
@@ -66,10 +66,11 @@
66 $(SRCDIR)/search.c \
67 $(SRCDIR)/setup.c \
68 $(SRCDIR)/sha1.c \
69 $(SRCDIR)/shun.c \
70 $(SRCDIR)/skins.c \
71 $(SRCDIR)/sqlcmd.c \
72 $(SRCDIR)/stat.c \
73 $(SRCDIR)/style.c \
74 $(SRCDIR)/sync.c \
75 $(SRCDIR)/tag.c \
76 $(SRCDIR)/th_main.c \
@@ -142,10 +143,11 @@
143 search_.c \
144 setup_.c \
145 sha1_.c \
146 shun_.c \
147 skins_.c \
148 sqlcmd_.c \
149 stat_.c \
150 style_.c \
151 sync_.c \
152 tag_.c \
153 th_main_.c \
@@ -218,10 +220,11 @@
220 $(OBJDIR)/search.o \
221 $(OBJDIR)/setup.o \
222 $(OBJDIR)/sha1.o \
223 $(OBJDIR)/shun.o \
224 $(OBJDIR)/skins.o \
225 $(OBJDIR)/sqlcmd.o \
226 $(OBJDIR)/stat.o \
227 $(OBJDIR)/style.o \
228 $(OBJDIR)/sync.o \
229 $(OBJDIR)/tag.o \
230 $(OBJDIR)/th_main.o \
@@ -284,16 +287,16 @@
287 # noop
288
289 clean:
290 rm -f $(OBJDIR)/*.o *_.c $(APPNAME) VERSION.h
291 rm -f translate makeheaders mkindex page_index.h headers
292 rm -f add.h allrepo.h attach.h bag.h blob.h branch.h browse.h captcha.h cgi.h checkin.h checkout.h clearsign.h clone.h comformat.h configure.h content.h db.h delta.h deltacmd.h descendants.h diff.h diffcmd.h doc.h encode.h event.h export.h file.h finfo.h graph.h http.h http_socket.h http_ssl.h http_transport.h import.h info.h login.h main.h manifest.h md5.h merge.h merge3.h name.h pivot.h popen.h pqueue.h printf.h rebuild.h report.h rss.h schema.h search.h setup.h sha1.h shun.h skins.h sqlcmd.h stat.h style.h sync.h tag.h th_main.h timeline.h tkt.h tktsetup.h undo.h update.h url.h user.h verify.h vfile.h wiki.h wikiformat.h winhttp.h xfer.h zip.h
293
294 page_index.h: $(TRANS_SRC) mkindex
295 ./mkindex $(TRANS_SRC) >$@
296 headers: page_index.h makeheaders VERSION.h
297 ./makeheaders add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h VERSION.h
298 touch headers
299 headers: Makefile
300 Makefile:
301 add_.c: $(SRCDIR)/add.c translate
302 ./translate $(SRCDIR)/add.c >add_.c
@@ -678,10 +681,17 @@
681
682 $(OBJDIR)/skins.o: skins_.c skins.h $(SRCDIR)/config.h
683 $(XTCC) -o $(OBJDIR)/skins.o -c skins_.c
684
685 skins.h: headers
686 sqlcmd_.c: $(SRCDIR)/sqlcmd.c translate
687 ./translate $(SRCDIR)/sqlcmd.c >sqlcmd_.c
688
689 $(OBJDIR)/sqlcmd.o: sqlcmd_.c sqlcmd.h $(SRCDIR)/config.h
690 $(XTCC) -o $(OBJDIR)/sqlcmd.o -c sqlcmd_.c
691
692 sqlcmd.h: headers
693 stat_.c: $(SRCDIR)/stat.c translate
694 ./translate $(SRCDIR)/stat.c >stat_.c
695
696 $(OBJDIR)/stat.o: stat_.c stat.h $(SRCDIR)/config.h
697 $(XTCC) -o $(OBJDIR)/stat.o -c stat_.c
698
M src/makemake.tcl
+1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -59,10 +59,11 @@
5959
 search
6060
 setup
6161
 sha1
6262
 shun
6363
 skins
64
+ sqlcmd
6465
 stat
6566
 style
6667
 sync
6768
 tag
6869
 th_main
6970
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -59,10 +59,11 @@
59 search
60 setup
61 sha1
62 shun
63 skins
 
64 stat
65 style
66 sync
67 tag
68 th_main
69
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -59,10 +59,11 @@
59 search
60 setup
61 sha1
62 shun
63 skins
64 sqlcmd
65 stat
66 style
67 sync
68 tag
69 th_main
70
M src/shell.c
+2 -2
--- src/shell.c
+++ src/shell.c
@@ -2570,12 +2570,12 @@
25702570
 #else
25712571
 data.zDbFilename = 0;
25722572
 #endif
25732573
 /***** Begin Fossil Patch *****/
25742574
 {
2575
- extern void fossil_open(sqlite3**, const char **);
2576
- fossil_open(&data.db, &data.zDbFilename);
2575
+ extern void fossil_open(const char **);
2576
+ fossil_open(&data.zDbFilename);
25772577
 }
25782578
 /***** End Fossil Patch *****/
25792579
 }
25802580
 if( i<argc ){
25812581
 zFirstCmd = argv[i++];
25822582
25832583
ADDED src/sqlcmd.c
--- src/shell.c
+++ src/shell.c
@@ -2570,12 +2570,12 @@
2570 #else
2571 data.zDbFilename = 0;
2572 #endif
2573 /***** Begin Fossil Patch *****/
2574 {
2575 extern void fossil_open(sqlite3**, const char **);
2576 fossil_open(&data.db, &data.zDbFilename);
2577 }
2578 /***** End Fossil Patch *****/
2579 }
2580 if( i<argc ){
2581 zFirstCmd = argv[i++];
2582
2583 DDED src/sqlcmd.c
--- src/shell.c
+++ src/shell.c
@@ -2570,12 +2570,12 @@
2570 #else
2571 data.zDbFilename = 0;
2572 #endif
2573 /***** Begin Fossil Patch *****/
2574 {
2575 extern void fossil_open(const char **);
2576 fossil_open(&data.zDbFilename);
2577 }
2578 /***** End Fossil Patch *****/
2579 }
2580 if( i<argc ){
2581 zFirstCmd = argv[i++];
2582
2583 DDED src/sqlcmd.c
A src/sqlcmd.c
+17
--- a/src/sqlcmd.c
+++ b/src/sqlcmd.c
@@ -0,0 +1,17 @@
1
+
2
+** Copyright (c) 2010 D.
3
+** Copyright (c) 2010 D./* zMainDbTypeies mpressdecompress", 1, SQLITE33333333333_malloc( nOut+4 3+4, sqlite3_free33333_malloc( nOut+1 3sqlite3_free3333mpress* Copyright (c) 2010 D.
4
+333333_shutdown();
5
+ sqlite33sqlite3uncontent
6
+** (c) 2010 D.
7
+** Copyright (c) 2010 D./* zMainDbTypeies mpressdecompress", 1, SQLITE33333333333_malloc( nOut+4 3+4, sqlite3_free33333_malloc( nOut+1 3sqlite3_free3333mpress* Copyright (c) 2010 D.
8
+333333_shutdown();
9
+ sqlite33sqlite3 (c) 2010 D.
10
+** Copyright (c) 2010 D./* zMainDbTypeies mpressdecompress", 1, SQLITE33333333333_malloc( nOut+4 3+4, sqlite3_free33333_malloc( nOut+1 3sqlite3_free3333mpress* Copyright (c) 2010 D.
11
+333333_shutdown();
12
+ sqlite33sqliteTypeies mpressdecompress", 1, SQLIT
13
+** Copyright (c) 2010 D.
14
+** Copyright (c) 2010 D./* zMainDbTypeies mpressdecompress", 1, SQLITE33333333333_malloc( nOut+4 3+4, sqlite3_free33333_malloc( nOut+1 3sqlite3_db_must_be_within_tree();wn();
15
+ sqlite33sqlite3uncontent
16
+** (c) 2010 D.
17
+** Copyright (c) cons
--- a/src/sqlcmd.c
+++ b/src/sqlcmd.c
@@ -0,0 +1,17 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
--- a/src/sqlcmd.c
+++ b/src/sqlcmd.c
@@ -0,0 +1,17 @@
1
2 ** Copyright (c) 2010 D.
3 ** Copyright (c) 2010 D./* zMainDbTypeies mpressdecompress", 1, SQLITE33333333333_malloc( nOut+4 3+4, sqlite3_free33333_malloc( nOut+1 3sqlite3_free3333mpress* Copyright (c) 2010 D.
4 333333_shutdown();
5 sqlite33sqlite3uncontent
6 ** (c) 2010 D.
7 ** Copyright (c) 2010 D./* zMainDbTypeies mpressdecompress", 1, SQLITE33333333333_malloc( nOut+4 3+4, sqlite3_free33333_malloc( nOut+1 3sqlite3_free3333mpress* Copyright (c) 2010 D.
8 333333_shutdown();
9 sqlite33sqlite3 (c) 2010 D.
10 ** Copyright (c) 2010 D./* zMainDbTypeies mpressdecompress", 1, SQLITE33333333333_malloc( nOut+4 3+4, sqlite3_free33333_malloc( nOut+1 3sqlite3_free3333mpress* Copyright (c) 2010 D.
11 333333_shutdown();
12 sqlite33sqliteTypeies mpressdecompress", 1, SQLIT
13 ** Copyright (c) 2010 D.
14 ** Copyright (c) 2010 D./* zMainDbTypeies mpressdecompress", 1, SQLITE33333333333_malloc( nOut+4 3+4, sqlite3_free33333_malloc( nOut+1 3sqlite3_db_must_be_within_tree();wn();
15 sqlite33sqlite3uncontent
16 ** (c) 2010 D.
17 ** Copyright (c) cons

Keyboard Shortcuts

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