10000 update to 3.6.21 · githubzhaoliang/sqlcipher@090d3d3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 090d3d3

Browse files
sjlombardosjlombardo
committed
update to 3.6.21
1 parent 7941e18 commit 090d3d3

File tree

178 files changed

+11915
-10533
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+11915
-10533
lines changed

‎Makefile.in

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ OBJS0 = alter.lo analyze.lo attach.lo auth.lo backup.lo bitvec.lo btmutex.lo \
175175
random.lo resolve.lo rowset.lo select.lo status.lo \
176176
table.lo tokenize.lo trigger.lo update.lo \
177177
util.lo vacuum.lo \
178-
vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo \
178+
vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbetrace.lo \
179179
walker.lo where.lo utf.lo vtab.lo
180180

181181
# Object files for the amalgamation.
@@ -272,6 +272,7 @@ SRC = \
272272
$(TOP)/src/vdbeaux.c \
273273
$(TOP)/src/vdbeblob.c \
274274
$(TOP)/src/vdbemem.c \
275+
$(TOP)/src/vdbetrace.c \
275276
$(TOP)/src/vdbeInt.h \
276277
$(TOP)/src/vtab.c \
277278
$(TOP)/src/walker.c \
@@ -311,15 +312,17 @@ SRC += \
311312
SRC += \
312313
$(TOP)/ext/fts3/fts3.c \
313314
$(TOP)/ext/fts3/fts3.h \
315+
$(TOP)/ext/fts3/fts3Int.h \
314316
$(TOP)/ext/fts3/fts3_expr.c \
315-
$(TOP)/ext/fts3/fts3_expr.h \
316317
$(TOP)/ext/fts3/fts3_hash.c \
317318
$(TOP)/ext/fts3/fts3_hash.h \
318319
$(TOP)/ext/fts3/fts3_icu.c \
319320
$(TOP)/ext/fts3/fts3_porter.c \
321+
$(TOP)/ext/fts3/fts3_snippet.c \
320322
$(TOP)/ext/fts3/fts3_tokenizer.h \
321323
$(TOP)/ext/fts3/fts3_tokenizer.c \
322-
$(TOP)/ext/fts3/fts3_tokenizer1.c
324+
$(TOP)/ext/fts3/fts3_tokenizer1.c \
325+
$(TOP)/ext/fts3/fts3_write.c
323326
SRC += \
324327
$(TOP)/ext/icu/sqliteicu.h \
325328
$(TOP)/ext/icu/icu.c
@@ -359,6 +362,7 @@ TESTSRC2 = \
359362
$(TOP)/src/vdbeapi.c \
360363
$(TOP)/src/vdbeaux.c \
361364
$(TOP)/src/vdbemem.c \
365+
$(TOP)/src/vdbetrace.c \
362366
$(TOP)/src/where.c \
363367
parse.c
364368

@@ -383,6 +387,7 @@ TESTSRC = \
383387
$(TOP)/src/test_func.c \
384388
$(TOP)/src/test_hexio.c \
385389
$(TOP)/src/test_init.c \
390+
$(TOP)/src/test_intarray.c \
386391
$(TOP)/src/test_journal.c \
387392
$(TOP)/src/test_malloc.c \
388393
$(TOP)/src/test_mutex.c \
@@ -427,7 +432,7 @@ HDR += \
427432
$(TOP)/ext/fts2/fts2_tokenizer.h
428433
HDR += \
429434
$(TOP)/ext/fts3/fts3.h \
430-
$(TOP)/ext/fts3/fts3_expr.h \
435+
$(TOP)/ext/fts3/fts3Int.h \
431436
$(TOP)/ext/fts3/fts3_hash.h \
432437
$(TOP)/ext/fts3/fts3_tokenizer.h
433438
HDR += \
@@ -456,13 +461,6 @@ Makefile: $(TOP)/Makefile.in
456461
sqlite3.pc: $(TOP)/sqlite3.pc.in
457462
./config.status
458463

459-
# Generate the file "last_change" which contains the date of change
460-
# of the most recently modified source code file
461-
#
462-
last_change: $(SRC)
463-
cat $(SRC) | grep '$$Id: ' | sort -k 5 | tail -1 \
464-
| $(NAWK) '{print $$5,$$6}' >last_change
465-
466464
libsqlite3.la: $(LIBOBJ)
467465
$(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \
468466
${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8"
@@ -733,6 +731,9 @@ vdbeblob.lo: $(TOP)/src/vdbeblob.c $(HDR)
733731
vdbemem.lo: $(TOP)/src/vdbemem.c $(HDR)
734732
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vdbemem.c
735733

734+
vdbetrace.lo: $(TOP)/src/vdbetrace.c $(HDR)
735+
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vdbetrace.c
736+
736737
vtab.lo: $(TOP)/src/vtab.c $(HDR)
737738
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vtab.c
738739

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.20
1+
3.6.21

‎configure

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.62 for sqlite 3.6.20.
3+
# Generated by GNU Autoconf 2.62 for sqlite 3.6.21.
44
#
55
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
66
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
743743
# Identity of this package.
744744
PACKAGE_NAME='sqlite'
745745
PACKAGE_TARNAME='sqlite'
746-
PACKAGE_VERSION='3.6.20'
747-
PACKAGE_STRING='sqlite 3.6.20'
746+
PACKAGE_VERSION='3.6.21'
747+
PACKAGE_STRING='sqlite 3.6.21'
748748
PACKAGE_BUGREPORT=''
749749

750750
# Factoring default headers for most tests.
@@ -1487,7 +1487,7 @@ if test "$ac_init_help" = "long"; then
14871487
# Omit some internal or obsolete options to make the list less imposing.
14881488
# This message is too long to be a string in the A/UX 3.1 sh.
14891489
cat <<_ACEOF
1490-
\`configure' configures sqlite 3.6.20 to adapt to many kinds of systems.
1490+
\`configure' configures sqlite 3.6.21 to adapt to many kinds of systems.
14911491
14921492
Usage: $0 [OPTION]... [VAR=VALUE]...
14931493
@@ -1552,7 +1552,7 @@ fi
15521552

15531553
if test -n "$ac_init_help"; then
15541554
case $ac_init_help in
1555-
short | recursive ) echo "Configuration of sqlite 3.6.20:";;
1555+
short | recursive ) echo "Configuration of sqlite 3.6.21:";;
15561556
esac
15571557
cat <<\_ACEOF
15581558
@@ -1670,7 +1670,7 @@ fi
16701670
test -n "$ac_init_help" && exit $ac_status
16711671
if $ac_init_version; then
16721672
cat <<\_ACEOF
1673-
sqlite configure 3.6.20
1673+
sqlite configure 3.6.21
16741674
generated by GNU Autoconf 2.62
16751675
16761676
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1684,7 +1684,7 @@ cat >config.log <<_ACEOF
16841684
This file contains any messages produced by compilers while
16851685
running configure, to aid debugging if configure makes a mistake.
16861686
1687-
It was created by sqlite $as_me 3.6.20, which was
1687+
It was created by sqlite $as_me 3.6.21, which was
16881688
generated by GNU Autoconf 2.62. Invocation command line was
16891689
16901690
$ $0 $@
@@ -13972,7 +13972,7 @@ exec 6>&1
1397213972
# report actual input values of CONFIG_FILES etc. instead of their
1397313973
# values after options handling.
1397413974
ac_log="
13975-
This file was extended by sqlite $as_me 3.6.20, which was
13975+
This file was extended by sqlite $as_me 3.6.21, which was
1397613976
generated by GNU Autoconf 2.62. Invocation command line was
1397713977
1397813978
CONFIG_FILES = $CONFIG_FILES
@@ -14025,7 +14025,7 @@ Report bugs to <bug-autoconf@gnu.org>."
1402514025
_ACEOF
1402614026
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1402714027
ac_cs_version="\\
14028-
sqlite config.status 3.6.20
14028+
sqlite config.status 3.6.21
1402914029
configured by $0, generated by GNU Autoconf 2.62,
1403014030
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
1403114031

‎ext/async/sqlite3async.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1231,8 +1231,8 @@ static int asyncFullPathname(
12311231
*/
12321232
if( rc==SQLITE_OK ){
12331233
int i, j;
1234-
int n = nPathOut;
12351234
char *z = zPathOut;
1235+
int n = strlen(z);
12361236
while( n>1 && z[n-1]=='/' ){ n--; }
12371237
for(i=j=0; i<n; i++){
12381238
if( z[i]=='/' ){

0 commit comments

Comments
 (0)
0