Fossil SCM

Merge latest changes from trunk.

mgagnon 2023-04-17 21:50 UTC merge-conflict-when-no-file-on-pivot merge
Commit 88a76afc2c8adb8f0880340d3df2481dd0a726bc4fd95ec01d2b7449c6cb2297
+52 -78
--- Dockerfile
+++ Dockerfile
@@ -1,60 +1,47 @@
1
-# syntax=docker/dockerfile:1.4
1
+# syntax=docker/dockerfile:1.3
22
# See www/containers.md for documentation on how to use this file.
33
44
## ---------------------------------------------------------------------
5
-## STAGE 1: Build static Fossil & BusyBox binaries atop Alpine Linux
5
+## STAGE 1: Build static Fossil binary
66
## ---------------------------------------------------------------------
77
8
+### We aren't pinning to a more stable version of Alpine because we want
9
+### to build with the latest tools and libraries available in case they
10
+### fixed something that matters to us since the last build. Everything
11
+### below depends on this layer, and so, alas, we toss this container's
12
+### cache on Alpine's release schedule, roughly once a month.
813
FROM alpine:latest AS builder
914
WORKDIR /tmp
1015
11
-### Bake the basic Alpine Linux into a base layer so we never have to
12
-### repeat that step unless we change the package set. Although we're
13
-### going to throw this layer away below, we still pass --no-cache
14
-### because that cache is of no use in an immutable layer.
16
+### Bake the basic Alpine Linux into a base layer so it only changes
17
+### when the upstream image is updated or we change the package set.
1518
RUN set -x \
1619
&& apk update \
1720
&& apk upgrade --no-cache \
1821
&& apk add --no-cache \
1922
gcc make \
2023
linux-headers musl-dev \
2124
openssl-dev openssl-libs-static \
2225
zlib-dev zlib-static
2326
24
-### Bake the custom BusyBox into another layer. The intent is that this
25
-### changes only when we change BBXVER. That will force an update of
26
-### the layers below, but this is a rare occurrence.
27
-ARG BBXVER="1_35_0"
28
-ENV BBXURL "https://github.com/mirror/busybox/tarball/${BBXVER}"
29
-COPY containers/busybox-config /tmp/bbx/.config
30
-ADD $BBXURL /tmp/bbx/src.tar.gz
31
-RUN set -x \
32
- && tar --strip-components=1 -C bbx -xzf bbx/src.tar.gz \
33
- && ( cd bbx && yes "" | make oldconfig && make -j11 )
34
-
35
-# Copy in dummied-up OS release info file for those using nspawn.
36
-# Without this, it'll gripe that the rootfs dir doesn't look like
37
-# it contains an OS.
38
-COPY containers/os-release /etc/os-release
39
-
40
-### The changeable Fossil layer is the only one in the first stage that
41
-### changes often, so add it last, to make it independent of the others.
27
+### Build Fossil as a separate layer so we don't have to rebuild the
28
+### Alpine environment for each iteration of Fossil's dev cycle.
4229
###
43
-### $FSLSTB can be either a file or a directory due to a ADD's bizarre
44
-### behavior: it unpacks tarballs when added from a local file but not
45
-### from a URL! It matters because we default to a URL in case you're
46
-### building outside a Fossil checkout, but when building via the
47
-### container-image target, we can avoid a costly hit on the Fossil
48
-### project's home site by pulling the data from the local repo via the
49
-### "tarball" command. This is a DVCS, after all!
30
+### We must cope with a bizarre ADD misfeature here: it unpacks tarballs
31
+### automatically when you give it a local file name but not if you give
32
+### it a /tarball URL! It matters because we default to a URL in case
33
+### you're building outside a Fossil checkout, but when building via the
34
+### container-image target, we avoid a costly hit on fossil-scm.org
35
+### by leveraging its DVCS nature via the "tarball" command and passing
36
+### the resulting file's name in.
5037
ARG FSLCFG=""
5138
ARG FSLVER="trunk"
5239
ARG FSLURL="https://fossil-scm.org/home/tarball/src?r=${FSLVER}"
5340
ENV FSLSTB=/tmp/fsl/src.tar.gz
5441
ADD $FSLURL $FSLSTB
55
-RUN set -x \
42
+RUN set -x \
5643
&& if [ -d $FSLSTB ] ; then mv $FSLSTB/src fsl ; \
5744
else tar -C fsl -xzf fsl/src.tar.gz ; fi \
5845
&& m=fsl/src/src/main.mk \
5946
&& fsl/src/configure --static CFLAGS='-Os -s' $FSLCFG && make -j11
6047
@@ -61,56 +48,43 @@
6148
6249
## ---------------------------------------------------------------------
6350
## STAGE 2: Pare that back to the bare essentials.
6451
## ---------------------------------------------------------------------
6552
66
-FROM scratch
67
-WORKDIR /jail
53
+FROM busybox AS os
6854
ARG UID=499
69
-ENV PATH "/bin:/usr/bin:/jail/bin"
70
-
71
-### Lay BusyBox down as the first base layer. Coupled with the host's
72
-### kernel, this is the "OS."
73
-COPY --from=builder /tmp/bbx/busybox /bin/
74
-COPY --from=builder /etc/os-release /etc/
75
-RUN [ "/bin/busybox", "--install", "/bin" ]
7655
7756
### Set up that base OS for our specific use without tying it to
7857
### anything likely to change often. So long as the user leaves
7958
### UID alone, this layer will be durable.
80
-RUN set -x \
81
- && echo 'root:x:0:0:SysAdmin:/:/bin/nologin' > /etc/passwd \
82
- && echo 'root:x:0:root' > /etc/group \
83
- && addgroup -S -g ${UID} fossil \
84
- && adduser -S -h `pwd` -g 'Fossil User' -G fossil -u ${UID} fossil \
85
- && install -d -m 700 -o fossil -g fossil log museum \
86
- && install -d -m 755 -o fossil -g fossil dev \
87
- && install -d -m 755 -o root -g root /usr/bin \
88
- && install -d -m 400 -o root -g root /run \
89
- && install -d -m 1777 -o root -g root /tmp \
90
- && mknod -m 666 dev/null c 1 3 \
91
- && mknod -m 444 dev/urandom c 1 9
92
-
93
-### Do Fossil-specific things atop those base layers; this will change
94
-### as often as the Fossil build-from-source layer above.
95
-COPY --from=builder /tmp/fossil bin/
96
-RUN set -x \
97
- && ln -s /jail/bin/fossil /usr/bin/f \
98
- && echo -e '#!/bin/sh\nfossil sha1sum "$@"' > /usr/bin/sha1sum \
99
- && echo -e '#!/bin/sh\nfossil sha3sum "$@"' > /usr/bin/sha3sum \
100
- && echo -e '#!/bin/sh\nfossil sqlite3 --no-repository "$@"' > \
101
- /usr/bin/sqlite3 \
102
- && chmod +x /usr/bin/sha?sum /usr/bin/sqlite3
103
-
104
-
105
-## ---------------------------------------------------------------------
106
-## STAGE 3: Run!
107
-## ---------------------------------------------------------------------
108
-
109
-EXPOSE 8080/tcp
110
-CMD [ \
111
- "fossil", "server", \
112
- "--chroot", "/jail", \
113
- "--create", \
114
- "--jsmode", "bundled", \
115
- "--user", "admin", \
116
- "museum/repo.fossil"]
59
+RUN set -x \
60
+ && mkdir log museum \
61
+ && echo "root:x:0:0:Admin:/:/false" > /tmp/passwd \
62
+ && echo "root:x:0:root" > /tmp/group \
63
+ && echo "fossil:x:${UID}:${UID}:User:/museum:/false" >> /tmp/passwd \
64
+ && echo "fossil:x:${UID}:fossil" >> /tmp/group
65
+
66
+
67
+## ---------------------------------------------------------------------
68
+## STAGE 3: Drop BusyBox, too, now that we're done with its /bin/sh &c
69
+## ---------------------------------------------------------------------
70
+
71
+FROM scratch AS run
72
+COPY --from=os /tmp/group /tmp/passwd /etc/
73
+COPY --from=os --chown=fossil:fossil /log /log/
74
+COPY --from=os --chown=fossil:fossil /museum /museum/
75
+COPY --from=os --chmod=1777 /tmp /tmp/
76
+COPY --from=builder /tmp/fossil /bin/
77
+
78
+
79
+## ---------------------------------------------------------------------
80
+## RUN!
81
+## ---------------------------------------------------------------------
82
+
83
+ENV PATH "/bin"
84
+EXPOSE 8080/tcp
85
+USER fossil
86
+ENTRYPOINT [ "fossil", "server", "museum/repo.fossil" ]
87
+CMD [ \
88
+ "--create", \
89
+ "--jsmode", "bundled", \
90
+ "--user", "admin" ]
11791
--- Dockerfile
+++ Dockerfile
@@ -1,60 +1,47 @@
1 # syntax=docker/dockerfile:1.4
2 # See www/containers.md for documentation on how to use this file.
3
4 ## ---------------------------------------------------------------------
5 ## STAGE 1: Build static Fossil & BusyBox binaries atop Alpine Linux
6 ## ---------------------------------------------------------------------
7
 
 
 
 
 
8 FROM alpine:latest AS builder
9 WORKDIR /tmp
10
11 ### Bake the basic Alpine Linux into a base layer so we never have to
12 ### repeat that step unless we change the package set. Although we're
13 ### going to throw this layer away below, we still pass --no-cache
14 ### because that cache is of no use in an immutable layer.
15 RUN set -x \
16 && apk update \
17 && apk upgrade --no-cache \
18 && apk add --no-cache \
19 gcc make \
20 linux-headers musl-dev \
21 openssl-dev openssl-libs-static \
22 zlib-dev zlib-static
23
24 ### Bake the custom BusyBox into another layer. The intent is that this
25 ### changes only when we change BBXVER. That will force an update of
26 ### the layers below, but this is a rare occurrence.
27 ARG BBXVER="1_35_0"
28 ENV BBXURL "https://github.com/mirror/busybox/tarball/${BBXVER}"
29 COPY containers/busybox-config /tmp/bbx/.config
30 ADD $BBXURL /tmp/bbx/src.tar.gz
31 RUN set -x \
32 && tar --strip-components=1 -C bbx -xzf bbx/src.tar.gz \
33 && ( cd bbx && yes "" | make oldconfig && make -j11 )
34
35 # Copy in dummied-up OS release info file for those using nspawn.
36 # Without this, it'll gripe that the rootfs dir doesn't look like
37 # it contains an OS.
38 COPY containers/os-release /etc/os-release
39
40 ### The changeable Fossil layer is the only one in the first stage that
41 ### changes often, so add it last, to make it independent of the others.
42 ###
43 ### $FSLSTB can be either a file or a directory due to a ADD's bizarre
44 ### behavior: it unpacks tarballs when added from a local file but not
45 ### from a URL! It matters because we default to a URL in case you're
46 ### building outside a Fossil checkout, but when building via the
47 ### container-image target, we can avoid a costly hit on the Fossil
48 ### project's home site by pulling the data from the local repo via the
49 ### "tarball" command. This is a DVCS, after all!
50 ARG FSLCFG=""
51 ARG FSLVER="trunk"
52 ARG FSLURL="https://fossil-scm.org/home/tarball/src?r=${FSLVER}"
53 ENV FSLSTB=/tmp/fsl/src.tar.gz
54 ADD $FSLURL $FSLSTB
55 RUN set -x \
56 && if [ -d $FSLSTB ] ; then mv $FSLSTB/src fsl ; \
57 else tar -C fsl -xzf fsl/src.tar.gz ; fi \
58 && m=fsl/src/src/main.mk \
59 && fsl/src/configure --static CFLAGS='-Os -s' $FSLCFG && make -j11
60
@@ -61,56 +48,43 @@
61
62 ## ---------------------------------------------------------------------
63 ## STAGE 2: Pare that back to the bare essentials.
64 ## ---------------------------------------------------------------------
65
66 FROM scratch
67 WORKDIR /jail
68 ARG UID=499
69 ENV PATH "/bin:/usr/bin:/jail/bin"
70
71 ### Lay BusyBox down as the first base layer. Coupled with the host's
72 ### kernel, this is the "OS."
73 COPY --from=builder /tmp/bbx/busybox /bin/
74 COPY --from=builder /etc/os-release /etc/
75 RUN [ "/bin/busybox", "--install", "/bin" ]
76
77 ### Set up that base OS for our specific use without tying it to
78 ### anything likely to change often. So long as the user leaves
79 ### UID alone, this layer will be durable.
80 RUN set -x \
81 && echo 'root:x:0:0:SysAdmin:/:/bin/nologin' > /etc/passwd \
82 && echo 'root:x:0:root' > /etc/group \
83 && addgroup -S -g ${UID} fossil \
84 && adduser -S -h `pwd` -g 'Fossil User' -G fossil -u ${UID} fossil \
85 && install -d -m 700 -o fossil -g fossil log museum \
86 && install -d -m 755 -o fossil -g fossil dev \
87 && install -d -m 755 -o root -g root /usr/bin \
88 && install -d -m 400 -o root -g root /run \
89 && install -d -m 1777 -o root -g root /tmp \
90 && mknod -m 666 dev/null c 1 3 \
91 && mknod -m 444 dev/urandom c 1 9
92
93 ### Do Fossil-specific things atop those base layers; this will change
94 ### as often as the Fossil build-from-source layer above.
95 COPY --from=builder /tmp/fossil bin/
96 RUN set -x \
97 && ln -s /jail/bin/fossil /usr/bin/f \
98 && echo -e '#!/bin/sh\nfossil sha1sum "$@"' > /usr/bin/sha1sum \
99 && echo -e '#!/bin/sh\nfossil sha3sum "$@"' > /usr/bin/sha3sum \
100 && echo -e '#!/bin/sh\nfossil sqlite3 --no-repository "$@"' > \
101 /usr/bin/sqlite3 \
102 && chmod +x /usr/bin/sha?sum /usr/bin/sqlite3
103
104
105 ## ---------------------------------------------------------------------
106 ## STAGE 3: Run!
107 ## ---------------------------------------------------------------------
108
109 EXPOSE 8080/tcp
110 CMD [ \
111 "fossil", "server", \
112 "--chroot", "/jail", \
113 "--create", \
114 "--jsmode", "bundled", \
115 "--user", "admin", \
116 "museum/repo.fossil"]
117
--- Dockerfile
+++ Dockerfile
@@ -1,60 +1,47 @@
1 # syntax=docker/dockerfile:1.3
2 # See www/containers.md for documentation on how to use this file.
3
4 ## ---------------------------------------------------------------------
5 ## STAGE 1: Build static Fossil binary
6 ## ---------------------------------------------------------------------
7
8 ### We aren't pinning to a more stable version of Alpine because we want
9 ### to build with the latest tools and libraries available in case they
10 ### fixed something that matters to us since the last build. Everything
11 ### below depends on this layer, and so, alas, we toss this container's
12 ### cache on Alpine's release schedule, roughly once a month.
13 FROM alpine:latest AS builder
14 WORKDIR /tmp
15
16 ### Bake the basic Alpine Linux into a base layer so it only changes
17 ### when the upstream image is updated or we change the package set.
 
 
18 RUN set -x \
19 && apk update \
20 && apk upgrade --no-cache \
21 && apk add --no-cache \
22 gcc make \
23 linux-headers musl-dev \
24 openssl-dev openssl-libs-static \
25 zlib-dev zlib-static
26
27 ### Build Fossil as a separate layer so we don't have to rebuild the
28 ### Alpine environment for each iteration of Fossil's dev cycle.
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
29 ###
30 ### We must cope with a bizarre ADD misfeature here: it unpacks tarballs
31 ### automatically when you give it a local file name but not if you give
32 ### it a /tarball URL! It matters because we default to a URL in case
33 ### you're building outside a Fossil checkout, but when building via the
34 ### container-image target, we avoid a costly hit on fossil-scm.org
35 ### by leveraging its DVCS nature via the "tarball" command and passing
36 ### the resulting file's name in.
37 ARG FSLCFG=""
38 ARG FSLVER="trunk"
39 ARG FSLURL="https://fossil-scm.org/home/tarball/src?r=${FSLVER}"
40 ENV FSLSTB=/tmp/fsl/src.tar.gz
41 ADD $FSLURL $FSLSTB
42 RUN set -x \
43 && if [ -d $FSLSTB ] ; then mv $FSLSTB/src fsl ; \
44 else tar -C fsl -xzf fsl/src.tar.gz ; fi \
45 && m=fsl/src/src/main.mk \
46 && fsl/src/configure --static CFLAGS='-Os -s' $FSLCFG && make -j11
47
@@ -61,56 +48,43 @@
48
49 ## ---------------------------------------------------------------------
50 ## STAGE 2: Pare that back to the bare essentials.
51 ## ---------------------------------------------------------------------
52
53 FROM busybox AS os
 
54 ARG UID=499
 
 
 
 
 
 
 
55
56 ### Set up that base OS for our specific use without tying it to
57 ### anything likely to change often. So long as the user leaves
58 ### UID alone, this layer will be durable.
59 RUN set -x \
60 && mkdir log museum \
61 && echo "root:x:0:0:Admin:/:/false" > /tmp/passwd \
62 && echo "root:x:0:root" > /tmp/group \
63 && echo "fossil:x:${UID}:${UID}:User:/museum:/false" >> /tmp/passwd \
64 && echo "fossil:x:${UID}:fossil" >> /tmp/group
65
66
67 ## ---------------------------------------------------------------------
68 ## STAGE 3: Drop BusyBox, too, now that we're done with its /bin/sh &c
69 ## ---------------------------------------------------------------------
70
71 FROM scratch AS run
72 COPY --from=os /tmp/group /tmp/passwd /etc/
73 COPY --from=os --chown=fossil:fossil /log /log/
74 COPY --from=os --chown=fossil:fossil /museum /museum/
75 COPY --from=os --chmod=1777 /tmp /tmp/
76 COPY --from=builder /tmp/fossil /bin/
77
78
79 ## ---------------------------------------------------------------------
80 ## RUN!
81 ## ---------------------------------------------------------------------
82
83 ENV PATH "/bin"
84 EXPOSE 8080/tcp
85 USER fossil
86 ENTRYPOINT [ "fossil", "server", "museum/repo.fossil" ]
87 CMD [ \
88 "--create", \
89 "--jsmode", "bundled", \
90 "--user", "admin" ]
 
 
 
 
 
91
+12 -11
--- Makefile.in
+++ Makefile.in
@@ -121,15 +121,16 @@
121121
122122
# Container stuff
123123
SRCTB := src-@[email protected]
124124
IMGVER := fossil:@FOSSIL_CI_PFX@
125125
CNTVER := fossil-@FOSSIL_CI_PFX@
126
+CENGINE := docker
126127
container:
127
- docker image inspect $(IMGVER) > /dev/null 2>&1 || \
128
+ $(CENGINE) image inspect $(IMGVER) > /dev/null 2>&1 || \
128129
$(MAKE) container-image
129
- docker container inspect $(CNTVER) > /dev/null 2>&1 || \
130
- docker create \
130
+ $(CENGINE) container inspect $(CNTVER) > /dev/null 2>&1 || \
131
+ $(CENGINE) create \
131132
--name $(CNTVER) \
132133
--cap-drop AUDIT_WRITE \
133134
--cap-drop CHOWN \
134135
--cap-drop FSETID \
135136
--cap-drop KILL \
@@ -137,31 +138,31 @@
137138
--cap-drop NET_BIND_SERVICE \
138139
--cap-drop NET_RAW \
139140
--cap-drop SETFCAP \
140141
--cap-drop SETPCAP \
141142
--publish 8080:8080 \
142
- $(DCFLAGS) $(IMGVER)
143
+ $(DCFLAGS) $(IMGVER) $(DCCMD)
143144
144145
container-clean:
145
- -docker container kill $(CNTVER)
146
- -docker container rm $(CNTVER)
147
- -docker image rm $(IMGVER)
146
+ -$(CENGINE) container kill $(CNTVER)
147
+ -$(CENGINE) container rm $(CNTVER)
148
+ -$(CENGINE) image rm $(IMGVER)
148149
149150
container-image:
150151
$(APPNAME) tarball --name src @FOSSIL_CI_PFX@ $(SRCTB)
151
- docker buildx build \
152
+ $(CENGINE) buildx build \
152153
--load \
153154
--tag $(IMGVER) \
154155
--build-arg FSLURL=$(SRCTB) \
155156
$(DBFLAGS) @srcdir@
156157
rm -f $(SRCTB)
157158
158159
container-run container-start: container
159
- docker start $(DSFLAGS) $(CNTVER)
160
+ $(CENGINE) start $(DSFLAGS) $(CNTVER)
160161
@sleep 1 # decrease likelihood of logging race condition
161
- docker container logs $(CNTVER)
162
+ $(CENGINE) container logs $(CNTVER)
162163
163164
container-stop:
164
- docker stop $(CNTVER)
165
+ $(CENGINE) stop $(CNTVER)
165166
166167
container-version:
167168
@echo $(CNTVER)
168169
--- Makefile.in
+++ Makefile.in
@@ -121,15 +121,16 @@
121
122 # Container stuff
123 SRCTB := src-@[email protected]
124 IMGVER := fossil:@FOSSIL_CI_PFX@
125 CNTVER := fossil-@FOSSIL_CI_PFX@
 
126 container:
127 docker image inspect $(IMGVER) > /dev/null 2>&1 || \
128 $(MAKE) container-image
129 docker container inspect $(CNTVER) > /dev/null 2>&1 || \
130 docker create \
131 --name $(CNTVER) \
132 --cap-drop AUDIT_WRITE \
133 --cap-drop CHOWN \
134 --cap-drop FSETID \
135 --cap-drop KILL \
@@ -137,31 +138,31 @@
137 --cap-drop NET_BIND_SERVICE \
138 --cap-drop NET_RAW \
139 --cap-drop SETFCAP \
140 --cap-drop SETPCAP \
141 --publish 8080:8080 \
142 $(DCFLAGS) $(IMGVER)
143
144 container-clean:
145 -docker container kill $(CNTVER)
146 -docker container rm $(CNTVER)
147 -docker image rm $(IMGVER)
148
149 container-image:
150 $(APPNAME) tarball --name src @FOSSIL_CI_PFX@ $(SRCTB)
151 docker buildx build \
152 --load \
153 --tag $(IMGVER) \
154 --build-arg FSLURL=$(SRCTB) \
155 $(DBFLAGS) @srcdir@
156 rm -f $(SRCTB)
157
158 container-run container-start: container
159 docker start $(DSFLAGS) $(CNTVER)
160 @sleep 1 # decrease likelihood of logging race condition
161 docker container logs $(CNTVER)
162
163 container-stop:
164 docker stop $(CNTVER)
165
166 container-version:
167 @echo $(CNTVER)
168
--- Makefile.in
+++ Makefile.in
@@ -121,15 +121,16 @@
121
122 # Container stuff
123 SRCTB := src-@[email protected]
124 IMGVER := fossil:@FOSSIL_CI_PFX@
125 CNTVER := fossil-@FOSSIL_CI_PFX@
126 CENGINE := docker
127 container:
128 $(CENGINE) image inspect $(IMGVER) > /dev/null 2>&1 || \
129 $(MAKE) container-image
130 $(CENGINE) container inspect $(CNTVER) > /dev/null 2>&1 || \
131 $(CENGINE) create \
132 --name $(CNTVER) \
133 --cap-drop AUDIT_WRITE \
134 --cap-drop CHOWN \
135 --cap-drop FSETID \
136 --cap-drop KILL \
@@ -137,31 +138,31 @@
138 --cap-drop NET_BIND_SERVICE \
139 --cap-drop NET_RAW \
140 --cap-drop SETFCAP \
141 --cap-drop SETPCAP \
142 --publish 8080:8080 \
143 $(DCFLAGS) $(IMGVER) $(DCCMD)
144
145 container-clean:
146 -$(CENGINE) container kill $(CNTVER)
147 -$(CENGINE) container rm $(CNTVER)
148 -$(CENGINE) image rm $(IMGVER)
149
150 container-image:
151 $(APPNAME) tarball --name src @FOSSIL_CI_PFX@ $(SRCTB)
152 $(CENGINE) buildx build \
153 --load \
154 --tag $(IMGVER) \
155 --build-arg FSLURL=$(SRCTB) \
156 $(DBFLAGS) @srcdir@
157 rm -f $(SRCTB)
158
159 container-run container-start: container
160 $(CENGINE) start $(DSFLAGS) $(CNTVER)
161 @sleep 1 # decrease likelihood of logging race condition
162 $(CENGINE) container logs $(CNTVER)
163
164 container-stop:
165 $(CENGINE) stop $(CNTVER)
166
167 container-version:
168 @echo $(CNTVER)
169
-1
--- auto.def
+++ auto.def
@@ -773,9 +773,8 @@
773773
# them, it also changes the URL we fetch the source tarball from, so
774774
# repeated builds of a given version generate and fetch the source
775775
# tarball once only, keeping it in the local Docker/Podman cache.
776776
set ci [readfile "$::autosetup(srcdir)/manifest.uuid"]
777777
define FOSSIL_CI_PFX [string range $ci 0 11]
778
-make-template containers/os-release.in
779778
780779
make-template Makefile.in
781780
make-config-header autoconfig.h -auto {USE_* FOSSIL_*}
782781
783782
DELETED containers/Dockerfile-nojail.patch
784783
DELETED containers/busybox-config
785784
DELETED containers/os-release.in
--- auto.def
+++ auto.def
@@ -773,9 +773,8 @@
773 # them, it also changes the URL we fetch the source tarball from, so
774 # repeated builds of a given version generate and fetch the source
775 # tarball once only, keeping it in the local Docker/Podman cache.
776 set ci [readfile "$::autosetup(srcdir)/manifest.uuid"]
777 define FOSSIL_CI_PFX [string range $ci 0 11]
778 make-template containers/os-release.in
779
780 make-template Makefile.in
781 make-config-header autoconfig.h -auto {USE_* FOSSIL_*}
782
783 ELETED containers/Dockerfile-nojail.patch
784 ELETED containers/busybox-config
785 ELETED containers/os-release.in
--- auto.def
+++ auto.def
@@ -773,9 +773,8 @@
773 # them, it also changes the URL we fetch the source tarball from, so
774 # repeated builds of a given version generate and fetch the source
775 # tarball once only, keeping it in the local Docker/Podman cache.
776 set ci [readfile "$::autosetup(srcdir)/manifest.uuid"]
777 define FOSSIL_CI_PFX [string range $ci 0 11]
 
778
779 make-template Makefile.in
780 make-config-header autoconfig.h -auto {USE_* FOSSIL_*}
781
782 ELETED containers/Dockerfile-nojail.patch
783 ELETED containers/busybox-config
784 ELETED containers/os-release.in
D containers/Dockerfile-nojail.patch
-5
--- a/containers/Dockerfile-nojail.patch
+++ b/containers/Dockerfile-nojail.patch
@@ -1,5 +0,0 @@
1
-Index: Doc62,13 +62: DocIndebbx/busybox /bin/
2
- etc/os-release /etc/
3
-@@ -84,19 +84,17 @@
4
- && adduser -S -h `pwd` -g 'Fossil User'7,10 +105,9 @@
5
- ##
--- a/containers/Dockerfile-nojail.patch
+++ b/containers/Dockerfile-nojail.patch
@@ -1,5 +0,0 @@
1 Index: Doc62,13 +62: DocIndebbx/busybox /bin/
2 etc/os-release /etc/
3 @@ -84,19 +84,17 @@
4 && adduser -S -h `pwd` -g 'Fossil User'7,10 +105,9 @@
5 ##
--- a/containers/Dockerfile-nojail.patch
+++ b/containers/Dockerfile-nojail.patch
@@ -1,5 +0,0 @@
 
 
 
 
 
D containers/busybox-config
-1200
--- a/containers/busybox-config
+++ b/containers/busybox-config
@@ -1,1200 +0,0 @@
1
-#
2
-# Automatically generated make config: don't edit
3
-# Busybox version: 1.35.0
4
-# Tue Aug 16 02:15:21 2022
5
-#
6
-CONFIG_HAVE_DOT_CONFIG=y
7
-
8
-#
9
-# Settings
10
-#
11
-CONFIG_DESKTOP=y
12
-# CONFIG_EXTRA_COMPAT is not set
13
-# CONFIG_FEDORA_COMPAT is not set
14
-CONFIG_INCLUDE_SUSv2=y
15
-CONFIG_LONG_OPTS=y
16
-CONFIG_SHOW_USAGE=y
17
-CONFIG_FEATURE_VERBOSE_USAGE=y
18
-CONFIG_FEATURE_COMPRESS_USAGE=y
19
-CONFIG_LFS=y
20
-# CONFIG_PAM is not set
21
-CONFIG_FEATURE_DEVPTS=y
22
-CONFIG_FEATURE_UTMP=y
23
-CONFIG_FEATURE_WTMP=y
24
-CONFIG_FEATURE_PIDFILE=y
25
-CONFIG_PID_FILE_PATH="/var/run"
26
-CONFIG_BUSYBOX=y
27
-CONFIG_FEATURE_SHOW_SCRIPT=y
28
-CONFIG_FEATURE_INSTALLER=y
29
-# CONFIG_INSTALL_NO_USR is not set
30
-CONFIG_FEATURE_SUID=y
31
-CONFIG_FEATURE_SUID_CONFIG=y
32
-CONFIG_FEATURE_SUID_CONFIG_QUIET=y
33
-# CONFIG_FEATURE_PREFER_APPLETS is not set
34
-CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
35
-# CONFIG_SELINUX is not set
36
-# CONFIG_FEATURE_CLEAN_UP is not set
37
-CONFIG_FEATURE_SYSLOG_INFO=y
38
-CONFIG_FEATURE_SYSLOG=y
39
-
40
-#
41
-# Build Options
42
-#
43
-CONFIG_STATIC=y
44
-# CONFIG_PIE is not set
45
-# CONFIG_NOMMU is not set
46
-# CONFIG_BUILD_LIBBUSYBOX is not set
47
-# CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set
48
-# CONFIG_FEATURE_INDIVIDUAL is not set
49
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
50
-CONFIG_CROSS_COMPILER_PREFIX=""
51
-CONFIG_SYSROOT=""
52
-CONFIG_EXTRA_CFLAGS=""
53
-CONFIG_EXTRA_LDFLAGS=""
54
-CONFIG_EXTRA_LDLIBS=""
55
-# CONFIG_USE_PORTABLE_CODE is not set
56
-CONFIG_STACK_OPTIMIZATION_386=y
57
-CONFIG_STATIC_LIBGCC=y
58
-
59
-#
60
-# Installation Options ("make install" behavior)
61
-#
62
-CONFIG_INSTALL_APPLET_SYMLINKS=y
63
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
64
-# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
65
-# CONFIG_INSTALL_APPLET_DONT is not set
66
-# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
67
-# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
68
-# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
69
-CONFIG_PREFIX="./_install"
70
-
71
-#
72
-# Debugging Options
73
-#
74
-# CONFIG_DEBUG is not set
75
-# CONFIG_DEBUG_PESSIMIZE is not set
76
-# CONFIG_DEBUG_SANITIZE is not set
77
-# CONFIG_UNIT_TEST is not set
78
-# CONFIG_WERROR is not set
79
-# CONFIG_WARN_SIMPLE_MSG is not set
80
-CONFIG_NO_DEBUG_LIB=y
81
-# CONFIG_DMALLOC is not set
82
-# CONFIG_EFENCE is not set
83
-
84
-#
85
-# Library Tuning
86
-#
87
-# CONFIG_FEATURE_USE_BSS_TAIL is not set
88
-CONFIG_FLOAT_DURATION=y
89
-CONFIG_FEATURE_RTMINMAX=y
90
-CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS=y
91
-CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
92
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
93
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
94
-CONFIG_PASSWORD_MINLEN=6
95
-CONFIG_MD5_SMALL=1
96
-CONFIG_SHA3_SMALL=1
97
-CONFIG_FEATURE_NON_POSIX_CP=y
98
-# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
99
-CONFIG_FEATURE_USE_SENDFILE=y
100
-CONFIG_FEATURE_COPYBUF_KB=4
101
-CONFIG_MONOTONIC_SYSCALL=y
102
-CONFIG_IOCTL_HEX2STR_ERROR=y
103
-CONFIG_FEATURE_EDITING=y
104
-CONFIG_FEATURE_EDITING_MAX_LEN=1024
105
-# CONFIG_FEATURE_EDITING_VI is not set
106
-CONFIG_FEATURE_EDITING_HISTORY=255
107
-CONFIG_FEATURE_EDITING_SAVEHISTORY=y
108
-# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
109
-CONFIG_FEATURE_REVERSE_SEARCH=y
110
-CONFIG_FEATURE_TAB_COMPLETION=y
111
-CONFIG_FEATURE_USERNAME_COMPLETION=y
112
-CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
113
-CONFIG_FEATURE_EDITING_WINCH=y
114
-# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
115
-# CONFIG_LOCALE_SUPPORT is not set
116
-CONFIG_UNICODE_SUPPORT=y
117
-# CONFIG_UNICODE_USING_LOCALE is not set
118
-# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
119
-CONFIG_SUBST_WCHAR=63
120
-CONFIG_LAST_SUPPORTED_WCHAR=767
121
-# CONFIG_UNICODE_COMBINING_WCHARS is not set
122
-# CONFIG_UNICODE_WIDE_WCHARS is not set
123
-# CONFIG_UNICODE_BIDI_SUPPORT is not set
124
-# CONFIG_UNICODE_NEUTRAL_TABLE is not set
125
-# CONFIG_UNICODE_PRESERVE_BROKEN is not set
126
-
127
-#
128
-# Applets
129
-#
130
-
131
-#
132
-# Archival Utilities
133
-#
134
-# CONFIG_FEATURE_SEAMLESS_XZ is not set
135
-# CONFIG_FEATURE_SEAMLESS_LZMA is not set
136
-# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
137
-CONFIG_FEATURE_SEAMLESS_GZ=y
138
-# CONFIG_FEATURE_SEAMLESS_Z is not set
139
-# CONFIG_AR is not set
140
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
141
-# CONFIG_FEATURE_AR_CREATE is not set
142
-# CONFIG_UNCOMPRESS is not set
143
-CONFIG_GUNZIP=y
144
-CONFIG_ZCAT=y
145
-CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y
146
-# CONFIG_BUNZIP2 is not set
147
-# CONFIG_BZCAT is not set
148
-# CONFIG_UNLZMA is not set
149
-# CONFIG_LZCAT is not set
150
-# CONFIG_LZMA is not set
151
-# CONFIG_UNXZ is not set
152
-# CONFIG_XZCAT is not set
153
-# CONFIG_XZ is not set
154
-# CONFIG_BZIP2 is not set
155
-CONFIG_BZIP2_SMALL=0
156
-# CONFIG_FEATURE_BZIP2_DECOMPRESS is not set
157
-# CONFIG_CPIO is not set
158
-# CONFIG_FEATURE_CPIO_O is not set
159
-# CONFIG_FEATURE_CPIO_P is not set
160
-# CONFIG_FEATURE_CPIO_IGNORE_DEVNO is not set
161
-# CONFIG_FEATURE_CPIO_RENUMBER_INODES is not set
162
-# CONFIG_DPKG is not set
163
-# CONFIG_DPKG_DEB is not set
164
-CONFIG_GZIP=y
165
-CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
166
-CONFIG_GZIP_FAST=0
167
-# CONFIG_FEATURE_GZIP_LEVELS is not set
168
-CONFIG_FEATURE_GZIP_DECOMPRESS=y
169
-# CONFIG_LZOP is not set
170
-# CONFIG_UNLZOP is not set
171
-# CONFIG_LZOPCAT is not set
172
-# CONFIG_LZOP_COMPR_HIGH is not set
173
-# CONFIG_RPM is not set
174
-# CONFIG_RPM2CPIO is not set
175
-CONFIG_TAR=y
176
-CONFIG_FEATURE_TAR_LONG_OPTIONS=y
177
-CONFIG_FEATURE_TAR_CREATE=y
178
-CONFIG_FEATURE_TAR_AUTODETECT=y
179
-CONFIG_FEATURE_TAR_FROM=y
180
-# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
181
-# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
182
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
183
-# CONFIG_FEATURE_TAR_TO_COMMAND is not set
184
-CONFIG_FEATURE_TAR_UNAME_GNAME=y
185
-CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
186
-# CONFIG_FEATURE_TAR_SELINUX is not set
187
-CONFIG_UNZIP=y
188
-CONFIG_FEATURE_UNZIP_CDF=y
189
-CONFIG_FEATURE_UNZIP_BZIP2=y
190
-CONFIG_FEATURE_UNZIP_LZMA=y
191
-CONFIG_FEATURE_UNZIP_XZ=y
192
-# CONFIG_FEATURE_LZMA_FAST is not set
193
-
194
-#
195
-# Coreutils
196
-#
197
-CONFIG_FEATURE_VERBOSE=y
198
-
199
-#
200
-# Common options for date and touch
201
-#
202
-CONFIG_FEATURE_TIMEZONE=y
203
-
204
-#
205
-# Common options for cp and mv
206
-#
207
-CONFIG_FEATURE_PRESERVE_HARDLINKS=y
208
-
209
-#
210
-# Common options for df, du, ls
211
-#
212
-CONFIG_FEATURE_HUMAN_READABLE=y
213
-CONFIG_BASENAME=y
214
-CONFIG_CAT=y
215
-CONFIG_FEATURE_CATN=y
216
-CONFIG_FEATURE_CATV=y
217
-CONFIG_CHGRP=y
218
-CONFIG_CHMOD=y
219
-CONFIG_CHOWN=y
220
-CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
221
-CONFIG_CHROOT=y
222
-# CONFIG_CKSUM is not set
223
-# CONFIG_CRC32 is not set
224
-CONFIG_COMM=y
225
-CONFIG_CP=y
226
-CONFIG_FEATURE_CP_LONG_OPTIONS=y
227
-CONFIG_FEATURE_CP_REFLINK=y
228
-CONFIG_CUT=y
229
-CONFIG_FEATURE_CUT_REGEX=y
230
-CONFIG_DATE=y
231
-CONFIG_FEATURE_DATE_ISOFMT=y
232
-# CONFIG_FEATURE_DATE_NANO is not set
233
-CONFIG_FEATURE_DATE_COMPAT=y
234
-CONFIG_DD=y
235
-CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
236
-CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
237
-CONFIG_FEATURE_DD_IBS_OBS=y
238
-CONFIG_FEATURE_DD_STATUS=y
239
-CONFIG_DF=y
240
-CONFIG_FEATURE_DF_FANCY=y
241
-CONFIG_FEATURE_SKIP_ROOTFS=y
242
-CONFIG_DIRNAME=y
243
-CONFIG_DOS2UNIX=y
244
-CONFIG_UNIX2DOS=y
245
-CONFIG_DU=y
246
-CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
247
-# CONFIG_ECHO is not set
248
-CONFIG_FEATURE_FANCY_ECHO=y
249
-CONFIG_ENV=y
250
-CONFIG_EXPAND=y
251
-CONFIG_UNEXPAND=y
252
-CONFIG_EXPR=y
253
-CONFIG_EXPR_MATH_SUPPORT_64=y
254
-# CONFIG_FACTOR is not set
255
-CONFIG_FALSE=y
256
-CONFIG_FOLD=y
257
-CONFIG_HEAD=y
258
-CONFIG_FEATURE_FANCY_HEAD=y
259
-CONFIG_HOSTID=y
260
-CONFIG_ID=y
261
-CONFIG_GROUPS=y
262
-CONFIG_INSTALL=y
263
-CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
264
-CONFIG_LINK=y
265
-CONFIG_LN=y
266
-# CONFIG_LOGNAME is not set
267
-CONFIG_LS=y
268
-CONFIG_FEATURE_LS_FILETYPES=y
269
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
270
-CONFIG_FEATURE_LS_RECURSIVE=y
271
-CONFIG_FEATURE_LS_WIDTH=y
272
-CONFIG_FEATURE_LS_SORTFILES=y
273
-CONFIG_FEATURE_LS_TIMESTAMPS=y
274
-CONFIG_FEATURE_LS_USERNAME=y
275
-CONFIG_FEATURE_LS_COLOR=y
276
-CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
277
-# CONFIG_MD5SUM is not set
278
-# CONFIG_SHA1SUM is not set
279
-# CONFIG_SHA256SUM is not set
280
-# CONFIG_SHA512SUM is not set
281
-# CONFIG_SHA3SUM is not set
282
-# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set
283
-CONFIG_MKDIR=y
284
-CONFIG_MKFIFO=y
285
-CONFIG_MKNOD=y
286
-CONFIG_MKTEMP=y
287
-CONFIG_MV=y
288
-CONFIG_NICE=y
289
-CONFIG_NL=y
290
-CONFIG_NOHUP=y
291
-CONFIG_NPROC=y
292
-CONFIG_OD=y
293
-CONFIG_PASTE=y
294
-# CONFIG_PRINTENV is not set
295
-# CONFIG_PRINTF is not set
296
-CONFIG_PWD=y
297
-CONFIG_READLINK=y
298
-CONFIG_FEATURE_READLINK_FOLLOW=y
299
-CONFIG_REALPATH=y
300
-CONFIG_RM=y
301
-CONFIG_RMDIR=y
302
-CONFIG_SEQ=y
303
-CONFIG_SHRED=y
304
-CONFIG_SHUF=y
305
-CONFIG_SLEEP=y
306
-CONFIG_FEATURE_FANCY_SLEEP=y
307
-CONFIG_SORT=y
308
-# CONFIG_FEATURE_SORT_BIG is not set
309
-# CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set
310
-CONFIG_SPLIT=y
311
-CONFIG_FEATURE_SPLIT_FANCY=y
312
-CONFIG_STAT=y
313
-CONFIG_FEATURE_STAT_FORMAT=y
314
-CONFIG_FEATURE_STAT_FILESYSTEM=y
315
-CONFIG_STTY=y
316
-# CONFIG_SUM is not set
317
-CONFIG_SYNC=y
318
-CONFIG_FEATURE_SYNC_FANCY=y
319
-CONFIG_FSYNC=y
320
-CONFIG_TAC=y
321
-CONFIG_TAIL=y
322
-CONFIG_FEATURE_FANCY_TAIL=y
323
-CONFIG_TEE=y
324
-CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
325
-# CONFIG_TEST is not set
326
-# CONFIG_TEST1 is not set
327
-# CONFIG_TEST2 is not set
328
-# CONFIG_FEATURE_TEST_64 is not set
329
-CONFIG_TIMEOUT=y
330
-CONFIG_TOUCH=y
331
-CONFIG_FEATURE_TOUCH_SUSV3=y
332
-CONFIG_TR=y
333
-CONFIG_FEATURE_TR_CLASSES=y
334
-CONFIG_FEATURE_TR_EQUIV=y
335
-CONFIG_TRUE=y
336
-CONFIG_TRUNCATE=y
337
-CONFIG_TTY=y
338
-CONFIG_UNAME=y
339
-CONFIG_UNAME_OSNAME="GNU/Linux"
340
-CONFIG_BB_ARCH=y
341
-CONFIG_UNIQ=y
342
-CONFIG_UNLINK=y
343
-CONFIG_USLEEP=y
344
-CONFIG_UUDECODE=y
345
-CONFIG_BASE32=y
346
-CONFIG_BASE64=y
347
-CONFIG_UUENCODE=y
348
-CONFIG_WC=y
349
-CONFIG_FEATURE_WC_LARGE=y
350
-CONFIG_WHO=y
351
-CONFIG_W=y
352
-CONFIG_USERS=y
353
-CONFIG_WHOAMI=y
354
-CONFIG_YES=y
355
-
356
-#
357
-# Console Utilities
358
-#
359
-# CONFIG_CHVT is not set
360
-CONFIG_CLEAR=y
361
-# CONFIG_DEALLOCVT is not set
362
-# CONFIG_DUMPKMAP is not set
363
-# CONFIG_FGCONSOLE is not set
364
-# CONFIG_KBD_MODE is not set
365
-# CONFIG_LOADFONT is not set
366
-# CONFIG_SETFONT is not set
367
-# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
368
-CONFIG_DEFAULT_SETFONT_DIR=""
369
-# CONFIG_FEATURE_LOADFONT_PSF2 is not set
370
-# CONFIG_FEATURE_LOADFONT_RAW is not set
371
-# CONFIG_LOADKMAP is not set
372
-# CONFIG_OPENVT is not set
373
-# CONFIG_RESET is not set
374
-# CONFIG_RESIZE is not set
375
-# CONFIG_FEATURE_RESIZE_PRINT is not set
376
-# CONFIG_SETCONSOLE is not set
377
-# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
378
-# CONFIG_SETKEYCODES is not set
379
-# CONFIG_SETLOGCONS is not set
380
-# CONFIG_SHOWKEY is not set
381
-
382
-#
383
-# Debian Utilities
384
-#
385
-# CONFIG_PIPE_PROGRESS is not set
386
-# CONFIG_RUN_PARTS is not set
387
-# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
388
-# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
389
-# CONFIG_START_STOP_DAEMON is not set
390
-# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
391
-# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
392
-CONFIG_WHICH=y
393
-
394
-#
395
-# klibc-utils
396
-#
397
-# CONFIG_MINIPS is not set
398
-# CONFIG_NUKE is not set
399
-# CONFIG_RESUME is not set
400
-# CONFIG_RUN_INIT is not set
401
-
402
-#
403
-# Editors
404
-#
405
-# CONFIG_AWK is not set
406
-# CONFIG_FEATURE_AWK_LIBM is not set
407
-# CONFIG_FEATURE_AWK_GNU_EXTENSIONS is not set
408
-# CONFIG_CMP is not set
409
-CONFIG_DIFF=y
410
-CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
411
-CONFIG_FEATURE_DIFF_DIR=y
412
-# CONFIG_ED is not set
413
-CONFIG_PATCH=y
414
-CONFIG_SED=y
415
-CONFIG_VI=y
416
-CONFIG_FEATURE_VI_MAX_LEN=4096
417
-# CONFIG_FEATURE_VI_8BIT is not set
418
-CONFIG_FEATURE_VI_COLON=y
419
-CONFIG_FEATURE_VI_COLON_EXPAND=y
420
-CONFIG_FEATURE_VI_YANKMARK=y
421
-CONFIG_FEATURE_VI_SEARCH=y
422
-# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
423
-CONFIG_FEATURE_VI_USE_SIGNALS=y
424
-CONFIG_FEATURE_VI_DOT_CMD=y
425
-CONFIG_FEATURE_VI_READONLY=y
426
-CONFIG_FEATURE_VI_SETOPTS=y
427
-CONFIG_FEATURE_VI_SET=y
428
-CONFIG_FEATURE_VI_WIN_RESIZE=y
429
-CONFIG_FEATURE_VI_ASK_TERMINAL=y
430
-CONFIG_FEATURE_VI_UNDO=y
431
-CONFIG_FEATURE_VI_UNDO_QUEUE=y
432
-CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
433
-CONFIG_FEATURE_VI_VERBOSE_STATUS=y
434
-CONFIG_FEATURE_ALLOW_EXEC=y
435
-
436
-#
437
-# Finding Utilities
438
-#
439
-CONFIG_FIND=y
440
-CONFIG_FEATURE_FIND_PRINT0=y
441
-CONFIG_FEATURE_FIND_MTIME=y
442
-CONFIG_FEATURE_FIND_ATIME=y
443
-CONFIG_FEATURE_FIND_CTIME=y
444
-CONFIG_FEATURE_FIND_MMIN=y
445
-CONFIG_FEATURE_FIND_AMIN=y
446
-CONFIG_FEATURE_FIND_CMIN=y
447
-CONFIG_FEATURE_FIND_PERM=y
448
-CONFIG_FEATURE_FIND_TYPE=y
449
-CONFIG_FEATURE_FIND_EXECUTABLE=y
450
-CONFIG_FEATURE_FIND_XDEV=y
451
-CONFIG_FEATURE_FIND_MAXDEPTH=y
452
-CONFIG_FEATURE_FIND_NEWER=y
453
-CONFIG_FEATURE_FIND_INUM=y
454
-CONFIG_FEATURE_FIND_SAMEFILE=y
455
-CONFIG_FEATURE_FIND_EXEC=y
456
-CONFIG_FEATURE_FIND_EXEC_PLUS=y
457
-CONFIG_FEATURE_FIND_USER=y
458
-CONFIG_FEATURE_FIND_GROUP=y
459
-CONFIG_FEATURE_FIND_NOT=y
460
-CONFIG_FEATURE_FIND_DEPTH=y
461
-CONFIG_FEATURE_FIND_PAREN=y
462
-CONFIG_FEATURE_FIND_SIZE=y
463
-CONFIG_FEATURE_FIND_PRUNE=y
464
-CONFIG_FEATURE_FIND_QUIT=y
465
-CONFIG_FEATURE_FIND_DELETE=y
466
-CONFIG_FEATURE_FIND_EMPTY=y
467
-CONFIG_FEATURE_FIND_PATH=y
468
-CONFIG_FEATURE_FIND_REGEX=y
469
-# CONFIG_FEATURE_FIND_CONTEXT is not set
470
-CONFIG_FEATURE_FIND_LINKS=y
471
-CONFIG_GREP=y
472
-# CONFIG_EGREP is not set
473
-# CONFIG_FGREP is not set
474
-CONFIG_FEATURE_GREP_CONTEXT=y
475
-CONFIG_XARGS=y
476
-CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
477
-CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
478
-CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
479
-CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
480
-CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
481
-CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL=y
482
-CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y
483
-
484
-#
485
-# Init Utilities
486
-#
487
-# CONFIG_BOOTCHARTD is not set
488
-# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
489
-# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
490
-# CONFIG_HALT is not set
491
-# CONFIG_POWEROFF is not set
492
-# CONFIG_REBOOT is not set
493
-# CONFIG_FEATURE_WAIT_FOR_INIT is not set
494
-# CONFIG_FEATURE_CALL_TELINIT is not set
495
-CONFIG_TELINIT_PATH=""
496
-# CONFIG_INIT is not set
497
-# CONFIG_LINUXRC is not set
498
-# CONFIG_FEATURE_USE_INITTAB is not set
499
-# CONFIG_FEATURE_KILL_REMOVED is not set
500
-CONFIG_FEATURE_KILL_DELAY=0
501
-# CONFIG_FEATURE_INIT_SCTTY is not set
502
-# CONFIG_FEATURE_INIT_SYSLOG is not set
503
-# CONFIG_FEATURE_INIT_QUIET is not set
504
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
505
-CONFIG_INIT_TERMINAL_TYPE=""
506
-# CONFIG_FEATURE_INIT_MODIFY_CMDLINE is not set
507
-
508
-#
509
-# Login/Password Management Utilities
510
-#
511
-# CONFIG_FEATURE_SHADOWPASSWDS is not set
512
-CONFIG_USE_BB_PWD_GRP=y
513
-# CONFIG_USE_BB_SHADOW is not set
514
-CONFIG_USE_BB_CRYPT=y
515
-CONFIG_USE_BB_CRYPT_SHA=y
516
-# CONFIG_ADD_SHELL is not set
517
-# CONFIG_REMOVE_SHELL is not set
518
-CONFIG_ADDGROUP=y
519
-# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
520
-CONFIG_ADDUSER=y
521
-# CONFIG_FEATURE_CHECK_NAMES is not set
522
-CONFIG_LAST_ID=60000
523
-CONFIG_FIRST_SYSTEM_ID=100
524
-CONFIG_LAST_SYSTEM_ID=999
525
-# CONFIG_CHPASSWD is not set
526
-CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
527
-# CONFIG_CRYPTPW is not set
528
-# CONFIG_MKPASSWD is not set
529
-# CONFIG_DELUSER is not set
530
-# CONFIG_DELGROUP is not set
531
-# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
532
-# CONFIG_GETTY is not set
533
-# CONFIG_LOGIN is not set
534
-# CONFIG_LOGIN_SESSION_AS_CHILD is not set
535
-# CONFIG_LOGIN_SCRIPTS is not set
536
-# CONFIG_FEATURE_NOLOGIN is not set
537
-# CONFIG_FEATURE_SECURETTY is not set
538
-# CONFIG_PASSWD is not set
539
-# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
540
-# CONFIG_SU is not set
541
-# CONFIG_FEATURE_SU_SYSLOG is not set
542
-# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
543
-# CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY is not set
544
-# CONFIG_SULOGIN is not set
545
-# CONFIG_VLOCK is not set
546
-
547
-#
548
-# Linux Ext2 FS Progs
549
-#
550
-# CONFIG_CHATTR is not set
551
-# CONFIG_FSCK is not set
552
-# CONFIG_LSATTR is not set
553
-# CONFIG_TUNE2FS is not set
554
-
555
-#
556
-# Linux Module Utilities
557
-#
558
-# CONFIG_MODPROBE_SMALL is not set
559
-# CONFIG_DEPMOD is not set
560
-# CONFIG_INSMOD is not set
561
-# CONFIG_LSMOD is not set
562
-# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
563
-# CONFIG_MODINFO is not set
564
-# CONFIG_MODPROBE is not set
565
-# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
566
-# CONFIG_RMMOD is not set
567
-
568
-#
569
-# Options common to multiple modutils
570
-#
571
-# CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS is not set
572
-# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
573
-# CONFIG_FEATURE_2_4_MODULES is not set
574
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
575
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
576
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
577
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
578
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
579
-# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
580
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
581
-# CONFIG_FEATURE_MODUTILS_ALIAS is not set
582
-# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
583
-CONFIG_DEFAULT_MODULES_DIR=""
584
-CONFIG_DEFAULT_DEPMOD_FILE=""
585
-
586
-#
587
-# Linux System Utilities
588
-#
589
-# CONFIG_ACPID is not set
590
-# CONFIG_FEATURE_ACPID_COMPAT is not set
591
-# CONFIG_BLKDISCARD is not set
592
-# CONFIG_BLKID is not set
593
-# CONFIG_FEATURE_BLKID_TYPE is not set
594
-# CONFIG_BLOCKDEV is not set
595
-# CONFIG_CAL is not set
596
-# CONFIG_CHRT is not set
597
-# CONFIG_DMESG is not set
598
-# CONFIG_FEATURE_DMESG_PRETTY is not set
599
-# CONFIG_EJECT is not set
600
-# CONFIG_FEATURE_EJECT_SCSI is not set
601
-# CONFIG_FALLOCATE is not set
602
-# CONFIG_FATATTR is not set
603
-# CONFIG_FBSET is not set
604
-# CONFIG_FEATURE_FBSET_FANCY is not set
605
-# CONFIG_FEATURE_FBSET_READMODE is not set
606
-# CONFIG_FDFORMAT is not set
607
-# CONFIG_FDISK is not set
608
-# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
609
-# CONFIG_FEATURE_FDISK_WRITABLE is not set
610
-# CONFIG_FEATURE_AIX_LABEL is not set
611
-# CONFIG_FEATURE_SGI_LABEL is not set
612
-# CONFIG_FEATURE_SUN_LABEL is not set
613
-# CONFIG_FEATURE_OSF_LABEL is not set
614
-# CONFIG_FEATURE_GPT_LABEL is not set
615
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
616
-# CONFIG_FINDFS is not set
617
-# CONFIG_FLOCK is not set
618
-# CONFIG_FDFLUSH is not set
619
-# CONFIG_FREERAMDISK is not set
620
-# CONFIG_FSCK_MINIX is not set
621
-# CONFIG_FSFREEZE is not set
622
-# CONFIG_FSTRIM is not set
623
-# CONFIG_GETOPT is not set
624
-# CONFIG_FEATURE_GETOPT_LONG is not set
625
-CONFIG_HEXDUMP=y
626
-CONFIG_HD=y
627
-CONFIG_XXD=y
628
-# CONFIG_HWCLOCK is not set
629
-# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
630
-# CONFIG_IONICE is not set
631
-# CONFIG_IPCRM is not set
632
-# CONFIG_IPCS is not set
633
-# CONFIG_LAST is not set
634
-# CONFIG_FEATURE_LAST_FANCY is not set
635
-# CONFIG_LOSETUP is not set
636
-# CONFIG_LSPCI is not set
637
-# CONFIG_LSUSB is not set
638
-# CONFIG_MDEV is not set
639
-# CONFIG_FEATURE_MDEV_CONF is not set
640
-# CONFIG_FEATURE_MDEV_RENAME is not set
641
-# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
642
-# CONFIG_FEATURE_MDEV_EXEC is not set
643
-# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
644
-# CONFIG_FEATURE_MDEV_DAEMON is not set
645
-# CONFIG_MESG is not set
646
-# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
647
-# CONFIG_MKE2FS is not set
648
-# CONFIG_MKFS_EXT2 is not set
649
-# CONFIG_MKFS_MINIX is not set
650
-# CONFIG_FEATURE_MINIX2 is not set
651
-# CONFIG_MKFS_REISER is not set
652
-# CONFIG_MKDOSFS is not set
653
-# CONFIG_MKFS_VFAT is not set
654
-# CONFIG_MKSWAP is not set
655
-# CONFIG_FEATURE_MKSWAP_UUID is not set
656
-CONFIG_MORE=y
657
-CONFIG_MOUNT=y
658
-CONFIG_FEATURE_MOUNT_FAKE=y
659
-CONFIG_FEATURE_MOUNT_VERBOSE=y
660
-# CONFIG_FEATURE_MOUNT_HELPERS is not set
661
-# CONFIG_FEATURE_MOUNT_LABEL is not set
662
-# CONFIG_FEATURE_MOUNT_NFS is not set
663
-# CONFIG_FEATURE_MOUNT_CIFS is not set
664
-CONFIG_FEATURE_MOUNT_FLAGS=y
665
-CONFIG_FEATURE_MOUNT_FSTAB=y
666
-CONFIG_FEATURE_MOUNT_OTHERTAB=y
667
-# CONFIG_MOUNTPOINT is not set
668
-CONFIG_NOLOGIN=y
669
-# CONFIG_NOLOGIN_DEPENDENCIES is not set
670
-# CONFIG_NSENTER is not set
671
-# CONFIG_PIVOT_ROOT is not set
672
-# CONFIG_RDATE is not set
673
-# CONFIG_RDEV is not set
674
-# CONFIG_READPROFILE is not set
675
-CONFIG_RENICE=y
676
-CONFIG_REV=y
677
-# CONFIG_RTCWAKE is not set
678
-# CONFIG_SCRIPT is not set
679
-# CONFIG_SCRIPTREPLAY is not set
680
-# CONFIG_SETARCH is not set
681
-# CONFIG_LINUX32 is not set
682
-# CONFIG_LINUX64 is not set
683
-# CONFIG_SETPRIV is not set
684
-# CONFIG_FEATURE_SETPRIV_DUMP is not set
685
-# CONFIG_FEATURE_SETPRIV_CAPABILITIES is not set
686
-# CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES is not set
687
-# CONFIG_SETSID is not set
688
-# CONFIG_SWAPON is not set
689
-# CONFIG_FEATURE_SWAPON_DISCARD is not set
690
-# CONFIG_FEATURE_SWAPON_PRI is not set
691
-# CONFIG_SWAPOFF is not set
692
-# CONFIG_FEATURE_SWAPONOFF_LABEL is not set
693
-# CONFIG_SWITCH_ROOT is not set
694
-# CONFIG_TASKSET is not set
695
-# CONFIG_FEATURE_TASKSET_FANCY is not set
696
-# CONFIG_FEATURE_TASKSET_CPULIST is not set
697
-# CONFIG_UEVENT is not set
698
-CONFIG_UMOUNT=y
699
-CONFIG_FEATURE_UMOUNT_ALL=y
700
-# CONFIG_UNSHARE is not set
701
-# CONFIG_WALL is not set
702
-
703
-#
704
-# Common options for mount/umount
705
-#
706
-# CONFIG_FEATURE_MOUNT_LOOP is not set
707
-# CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set
708
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
709
-# CONFIG_VOLUMEID is not set
710
-# CONFIG_FEATURE_VOLUMEID_BCACHE is not set
711
-# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
712
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
713
-# CONFIG_FEATURE_VOLUMEID_EROFS is not set
714
-# CONFIG_FEATURE_VOLUMEID_EXFAT is not set
715
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
716
-# CONFIG_FEATURE_VOLUMEID_F2FS is not set
717
-# CONFIG_FEATURE_VOLUMEID_FAT is not set
718
-# CONFIG_FEATURE_VOLUMEID_HFS is not set
719
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
720
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
721
-# CONFIG_FEATURE_VOLUMEID_LFS is not set
722
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
723
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
724
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
725
-# CONFIG_FEATURE_VOLUMEID_MINIX is not set
726
-# CONFIG_FEATURE_VOLUMEID_NILFS is not set
727
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
728
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
729
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
730
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
731
-# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
732
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
733
-# CONFIG_FEATURE_VOLUMEID_UBIFS is not set
734
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
735
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
736
-
737
-#
738
-# Miscellaneous Utilities
739
-#
740
-# CONFIG_ADJTIMEX is not set
741
-# CONFIG_ASCII is not set
742
-# CONFIG_BBCONFIG is not set
743
-# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
744
-CONFIG_BC=y
745
-# CONFIG_DC is not set
746
-CONFIG_FEATURE_DC_BIG=y
747
-# CONFIG_FEATURE_DC_LIBM is not set
748
-# CONFIG_FEATURE_BC_INTERACTIVE is not set
749
-# CONFIG_FEATURE_BC_LONG_OPTIONS is not set
750
-# CONFIG_BEEP is not set
751
-CONFIG_FEATURE_BEEP_FREQ=0
752
-CONFIG_FEATURE_BEEP_LENGTH_MS=0
753
-# CONFIG_CHAT is not set
754
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
755
-# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
756
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
757
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
758
-# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
759
-# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
760
-# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
761
-# CONFIG_CONSPY is not set
762
-CONFIG_CROND=y
763
-CONFIG_FEATURE_CROND_D=y
764
-CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
765
-CONFIG_FEATURE_CROND_SPECIAL_TIMES=y
766
-CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
767
-CONFIG_CRONTAB=y
768
-# CONFIG_DEVFSD is not set
769
-# CONFIG_DEVFSD_MODLOAD is not set
770
-# CONFIG_DEVFSD_FG_NP is not set
771
-# CONFIG_DEVFSD_VERBOSE is not set
772
-# CONFIG_FEATURE_DEVFS is not set
773
-# CONFIG_DEVMEM is not set
774
-# CONFIG_FBSPLASH is not set
775
-# CONFIG_FLASH_ERASEALL is not set
776
-# CONFIG_FLASH_LOCK is not set
777
-# CONFIG_FLASH_UNLOCK is not set
778
-# CONFIG_FLASHCP is not set
779
-# CONFIG_HDPARM is not set
780
-# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
781
-# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
782
-# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
783
-# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
784
-# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
785
-# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
786
-CONFIG_HEXEDIT=y
787
-# CONFIG_I2CGET is not set
788
-# CONFIG_I2CSET is not set
789
-# CONFIG_I2CDUMP is not set
790
-# CONFIG_I2CDETECT is not set
791
-# CONFIG_I2CTRANSFER is not set
792
-# CONFIG_INOTIFYD is not set
793
-CONFIG_LESS=y
794
-CONFIG_FEATURE_LESS_MAXLINES=9999999
795
-CONFIG_FEATURE_LESS_BRACKETS=y
796
-CONFIG_FEATURE_LESS_FLAGS=y
797
-CONFIG_FEATURE_LESS_TRUNCATE=y
798
-CONFIG_FEATURE_LESS_MARKS=y
799
-CONFIG_FEATURE_LESS_REGEXP=y
800
-CONFIG_FEATURE_LESS_WINCH=y
801
-CONFIG_FEATURE_LESS_ASK_TERMINAL=y
802
-CONFIG_FEATURE_LESS_DASHCMD=y
803
-CONFIG_FEATURE_LESS_LINENUMS=y
804
-CONFIG_FEATURE_LESS_RAW=y
805
-CONFIG_FEATURE_LESS_ENV=y
806
-# CONFIG_LSSCSI is not set
807
-# CONFIG_MAKEDEVS is not set
808
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
809
-# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
810
-# CONFIG_MAN is not set
811
-# CONFIG_MICROCOM is not set
812
-# CONFIG_MIM is not set
813
-# CONFIG_MT is not set
814
-# CONFIG_NANDWRITE is not set
815
-# CONFIG_NANDDUMP is not set
816
-# CONFIG_PARTPROBE is not set
817
-# CONFIG_RAIDAUTORUN is not set
818
-# CONFIG_READAHEAD is not set
819
-# CONFIG_RFKILL is not set
820
-# CONFIG_RUNLEVEL is not set
821
-# CONFIG_RX is not set
822
-# CONFIG_SETFATTR is not set
823
-# CONFIG_SETSERIAL is not set
824
-CONFIG_STRINGS=y
825
-CONFIG_TIME=y
826
-# CONFIG_TS is not set
827
-# CONFIG_TTYSIZE is not set
828
-# CONFIG_UBIATTACH is not set
829
-# CONFIG_UBIDETACH is not set
830
-# CONFIG_UBIMKVOL is not set
831
-# CONFIG_UBIRMVOL is not set
832
-# CONFIG_UBIRSVOL is not set
833
-# CONFIG_UBIUPDATEVOL is not set
834
-# CONFIG_UBIRENAME is not set
835
-# CONFIG_VOLNAME is not set
836
-# CONFIG_WATCHDOG is not set
837
-# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set
838
-
839
-#
840
-# Networking Utilities
841
-#
842
-CONFIG_FEATURE_IPV6=y
843
-# CONFIG_FEATURE_UNIX_LOCAL is not set
844
-CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
845
-# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
846
-# CONFIG_FEATURE_ETC_NETWORKS is not set
847
-# CONFIG_FEATURE_ETC_SERVICES is not set
848
-# CONFIG_FEATURE_HWIB is not set
849
-# CONFIG_FEATURE_TLS_SHA1 is not set
850
-# CONFIG_ARP is not set
851
-# CONFIG_ARPING is not set
852
-# CONFIG_BRCTL is not set
853
-# CONFIG_FEATURE_BRCTL_FANCY is not set
854
-# CONFIG_FEATURE_BRCTL_SHOW is not set
855
-# CONFIG_DNSD is not set
856
-# CONFIG_ETHER_WAKE is not set
857
-# CONFIG_FTPD is not set
858
-# CONFIG_FEATURE_FTPD_WRITE is not set
859
-# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
860
-# CONFIG_FEATURE_FTPD_AUTHENTICATION is not set
861
-# CONFIG_FTPGET is not set
862
-# CONFIG_FTPPUT is not set
863
-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
864
-# CONFIG_HOSTNAME is not set
865
-# CONFIG_DNSDOMAINNAME is not set
866
-# CONFIG_HTTPD is not set
867
-CONFIG_FEATURE_HTTPD_PORT_DEFAULT=0
868
-# CONFIG_FEATURE_HTTPD_RANGES is not set
869
-# CONFIG_FEATURE_HTTPD_SETUID is not set
870
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
871
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
872
-# CONFIG_FEATURE_HTTPD_CGI is not set
873
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
874
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
875
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
876
-# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
877
-# CONFIG_FEATURE_HTTPD_PROXY is not set
878
-# CONFIG_FEATURE_HTTPD_GZIP is not set
879
-# CONFIG_FEATURE_HTTPD_ETAG is not set
880
-# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set
881
-# CONFIG_FEATURE_HTTPD_DATE is not set
882
-# CONFIG_FEATURE_HTTPD_ACL_IP is not set
883
-CONFIG_IFCONFIG=y
884
-CONFIG_FEATURE_IFCONFIG_STATUS=y
885
-# CONFIG_FEATURE_IFCONFIG_SLIP is not set
886
-CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
887
-CONFIG_FEATURE_IFCONFIG_HW=y
888
-CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
889
-# CONFIG_IFENSLAVE is not set
890
-# CONFIG_IFPLUGD is not set
891
-# CONFIG_IFUP is not set
892
-# CONFIG_IFDOWN is not set
893
-CONFIG_IFUPDOWN_IFSTATE_PATH=""
894
-# CONFIG_FEATURE_IFUPDOWN_IP is not set
895
-# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set
896
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
897
-# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
898
-# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
899
-CONFIG_INETD=y
900
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
901
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
902
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
903
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
904
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
905
-# CONFIG_FEATURE_INETD_RPC is not set
906
-CONFIG_IP=y
907
-# CONFIG_IPADDR is not set
908
-# CONFIG_IPLINK is not set
909
-# CONFIG_IPROUTE is not set
910
-# CONFIG_IPTUNNEL is not set
911
-# CONFIG_IPRULE is not set
912
-# CONFIG_IPNEIGH is not set
913
-CONFIG_FEATURE_IP_ADDRESS=y
914
-CONFIG_FEATURE_IP_LINK=y
915
-CONFIG_FEATURE_IP_ROUTE=y
916
-CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2"
917
-# CONFIG_FEATURE_IP_TUNNEL is not set
918
-# CONFIG_FEATURE_IP_RULE is not set
919
-CONFIG_FEATURE_IP_NEIGH=y
920
-# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
921
-CONFIG_IPCALC=y
922
-CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
923
-CONFIG_FEATURE_IPCALC_FANCY=y
924
-# CONFIG_FAKEIDENTD is not set
925
-# CONFIG_NAMEIF is not set
926
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
927
-# CONFIG_NBDCLIENT is not set
928
-CONFIG_NC=y
929
-# CONFIG_NETCAT is not set
930
-CONFIG_NC_SERVER=y
931
-CONFIG_NC_EXTRA=y
932
-CONFIG_NC_110_COMPAT=y
933
-# CONFIG_NETSTAT is not set
934
-# CONFIG_FEATURE_NETSTAT_WIDE is not set
935
-# CONFIG_FEATURE_NETSTAT_PRG is not set
936
-# CONFIG_NSLOOKUP is not set
937
-# CONFIG_FEATURE_NSLOOKUP_BIG is not set
938
-# CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS is not set
939
-# CONFIG_NTPD is not set
940
-# CONFIG_FEATURE_NTPD_SERVER is not set
941
-# CONFIG_FEATURE_NTPD_CONF is not set
942
-# CONFIG_FEATURE_NTP_AUTH is not set
943
-# CONFIG_PING is not set
944
-# CONFIG_PING6 is not set
945
-# CONFIG_FEATURE_FANCY_PING is not set
946
-# CONFIG_PSCAN is not set
947
-CONFIG_ROUTE=y
948
-# CONFIG_SLATTACH is not set
949
-CONFIG_SSL_CLIENT=y
950
-# CONFIG_TC is not set
951
-# CONFIG_FEATURE_TC_INGRESS is not set
952
-# CONFIG_TCPSVD is not set
953
-# CONFIG_UDPSVD is not set
954
-# CONFIG_TELNET is not set
955
-# CONFIG_FEATURE_TELNET_TTYPE is not set
956
-# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
957
-# CONFIG_FEATURE_TELNET_WIDTH is not set
958
-# CONFIG_TELNETD is not set
959
-# CONFIG_FEATURE_TELNETD_STANDALONE is not set
960
-CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0
961
-# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
962
-# CONFIG_TFTP is not set
963
-# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
964
-# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set
965
-# CONFIG_TFTPD is not set
966
-# CONFIG_FEATURE_TFTP_GET is not set
967
-# CONFIG_FEATURE_TFTP_PUT is not set
968
-# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
969
-# CONFIG_TFTP_DEBUG is not set
970
-CONFIG_TLS=y
971
-# CONFIG_TRACEROUTE is not set
972
-# CONFIG_TRACEROUTE6 is not set
973
-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
974
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
975
-# CONFIG_TUNCTL is not set
976
-# CONFIG_FEATURE_TUNCTL_UG is not set
977
-# CONFIG_VCONFIG is not set
978
-CONFIG_WGET=y
979
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
980
-CONFIG_FEATURE_WGET_STATUSBAR=y
981
-CONFIG_FEATURE_WGET_FTP=y
982
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
983
-CONFIG_FEATURE_WGET_TIMEOUT=y
984
-CONFIG_FEATURE_WGET_HTTPS=y
985
-CONFIG_FEATURE_WGET_OPENSSL=y
986
-CONFIG_WHOIS=y
987
-# CONFIG_ZCIP is not set
988
-# CONFIG_UDHCPD is not set
989
-# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
990
-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
991
-CONFIG_DHCPD_LEASES_FILE=""
992
-# CONFIG_DUMPLEASES is not set
993
-# CONFIG_DHCPRELAY is not set
994
-# CONFIG_UDHCPC is not set
995
-# CONFIG_FEATURE_UDHCPC_ARPING is not set
996
-# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
997
-CONFIG_UDHCPC_DEFAULT_SCRIPT=""
998
-# CONFIG_UDHCPC6 is not set
999
-# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
1000
-# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
1001
-# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
1002
-# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
1003
-CONFIG_UDHCPC_DEFAULT_INTERFACE=""
1004
-# CONFIG_FEATURE_UDHCP_PORT is not set
1005
-CONFIG_UDHCP_DEBUG=0
1006
-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
1007
-# CONFIG_FEATURE_UDHCP_RFC3397 is not set
1008
-# CONFIG_FEATURE_UDHCP_8021Q is not set
1009
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
1010
-
1011
-#
1012
-# Print Utilities
1013
-#
1014
-# CONFIG_LPD is not set
1015
-# CONFIG_LPR is not set
1016
-# CONFIG_LPQ is not set
1017
-
1018
-#
1019
-# Mail Utilities
1020
-#
1021
-CONFIG_FEATURE_MIME_CHARSET="utf-8"
1022
-# CONFIG_MAKEMIME is not set
1023
-# CONFIG_POPMAILDIR is not set
1024
-# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
1025
-# CONFIG_REFORMIME is not set
1026
-# CONFIG_FEATURE_REFORMIME_COMPAT is not set
1027
-CONFIG_SENDMAIL=y
1028
-
1029
-#
1030
-# Process Utilities
1031
-#
1032
-# CONFIG_FEATURE_FAST_TOP is not set
1033
-CONFIG_FEATURE_SHOW_THREADS=y
1034
-CONFIG_FREE=y
1035
-CONFIG_FUSER=y
1036
-CONFIG_IOSTAT=y
1037
-CONFIG_KILL=y
1038
-CONFIG_KILLALL=y
1039
-# CONFIG_KILLALL5 is not set
1040
-CONFIG_LSOF=y
1041
-CONFIG_MPSTAT=y
1042
-CONFIG_NMETER=y
1043
-CONFIG_PGREP=y
1044
-CONFIG_PKILL=y
1045
-CONFIG_PIDOF=y
1046
-CONFIG_FEATURE_PIDOF_SINGLE=y
1047
-CONFIG_FEATURE_PIDOF_OMIT=y
1048
-CONFIG_PMAP=y
1049
-# CONFIG_POWERTOP is not set
1050
-# CONFIG_FEATURE_POWERTOP_INTERACTIVE is not set
1051
-CONFIG_PS=y
1052
-# CONFIG_FEATURE_PS_WIDE is not set
1053
-# CONFIG_FEATURE_PS_LONG is not set
1054
-CONFIG_FEATURE_PS_TIME=y
1055
-# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
1056
-CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
1057
-CONFIG_PSTREE=y
1058
-CONFIG_PWDX=y
1059
-CONFIG_SMEMCAP=y
1060
-CONFIG_BB_SYSCTL=y
1061
-CONFIG_TOP=y
1062
-CONFIG_FEATURE_TOP_INTERACTIVE=y
1063
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
1064
-CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
1065
-CONFIG_FEATURE_TOP_SMP_CPU=y
1066
-CONFIG_FEATURE_TOP_DECIMALS=y
1067
-CONFIG_FEATURE_TOP_SMP_PROCESS=y
1068
-CONFIG_FEATURE_TOPMEM=y
1069
-CONFIG_UPTIME=y
1070
-CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y
1071
-CONFIG_WATCH=y
1072
-
1073
-#
1074
-# Runit Utilities
1075
-#
1076
-CONFIG_CHPST=y
1077
-CONFIG_SETUIDGID=y
1078
-CONFIG_ENVUIDGID=y
1079
-CONFIG_ENVDIR=y
1080
-CONFIG_SOFTLIMIT=y
1081
-CONFIG_RUNSV=y
1082
-CONFIG_RUNSVDIR=y
1083
-# CONFIG_FEATURE_RUNSVDIR_LOG is not set
1084
-CONFIG_SV=y
1085
-CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service"
1086
-CONFIG_SVC=y
1087
-CONFIG_SVOK=y
1088
-CONFIG_SVLOGD=y
1089
-# CONFIG_CHCON is not set
1090
-# CONFIG_GETENFORCE is not set
1091
-# CONFIG_GETSEBOOL is not set
1092
-# CONFIG_LOAD_POLICY is not set
1093
-# CONFIG_MATCHPATHCON is not set
1094
-# CONFIG_RUNCON is not set
1095
-# CONFIG_SELINUXENABLED is not set
1096
-# CONFIG_SESTATUS is not set
1097
-# CONFIG_SETENFORCE is not set
1098
-# CONFIG_SETFILES is not set
1099
-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
1100
-# CONFIG_RESTORECON is not set
1101
-# CONFIG_SETSEBOOL is not set
1102
-
1103
-#
1104
-# Shells
1105
-#
1106
-CONFIG_SH_IS_ASH=y
1107
-# CONFIG_SH_IS_HUSH is not set
1108
-# CONFIG_SH_IS_NONE is not set
1109
-# CONFIG_BASH_IS_ASH is not set
1110
-# CONFIG_BASH_IS_HUSH is not set
1111
-CONFIG_BASH_IS_NONE=y
1112
-CONFIG_SHELL_ASH=y
1113
-CONFIG_ASH=y
1114
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
1115
-CONFIG_ASH_INTERNAL_GLOB=y
1116
-CONFIG_ASH_BASH_COMPAT=y
1117
-# CONFIG_ASH_BASH_SOURCE_CURDIR is not set
1118
-CONFIG_ASH_BASH_NOT_FOUND_HOOK=y
1119
-CONFIG_ASH_JOB_CONTROL=y
1120
-CONFIG_ASH_ALIAS=y
1121
-CONFIG_ASH_RANDOM_SUPPORT=y
1122
-CONFIG_ASH_EXPAND_PRMT=y
1123
-CONFIG_ASH_IDLE_TIMEOUT=y
1124
-CONFIG_ASH_MAIL=y
1125
-CONFIG_ASH_ECHO=y
1126
-CONFIG_ASH_PRINTF=y
1127
-CONFIG_ASH_TEST=y
1128
-CONFIG_ASH_HELP=y
1129
-CONFIG_ASH_GETOPTS=y
1130
-CONFIG_ASH_CMDCMD=y
1131
-# CONFIG_CTTYHACK is not set
1132
-# CONFIG_HUSH is not set
1133
-# CONFIG_SHELL_HUSH is not set
1134
-# CONFIG_HUSH_BASH_COMPAT is not set
1135
-# CONFIG_HUSH_BRACE_EXPANSION is not set
1136
-# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
1137
-# CONFIG_HUSH_LINENO_VAR is not set
1138
-# CONFIG_HUSH_INTERACTIVE is not set
1139
-# CONFIG_HUSH_SAVEHISTORY is not set
1140
-# CONFIG_HUSH_JOB is not set
1141
-# CONFIG_HUSH_TICK is not set
1142
-# CONFIG_HUSH_IF is not set
1143
-# CONFIG_HUSH_LOOPS is not set
1144
-# CONFIG_HUSH_CASE is not set
1145
-# CONFIG_HUSH_FUNCTIONS is not set
1146
-# CONFIG_HUSH_LOCAL is not set
1147
-# CONFIG_HUSH_RANDOM_SUPPORT is not set
1148
-# CONFIG_HUSH_MODE_X is not set
1149
-# CONFIG_HUSH_ECHO is not set
1150
-# CONFIG_HUSH_PRINTF is not set
1151
-# CONFIG_HUSH_TEST is not set
1152
-# CONFIG_HUSH_HELP is not set
1153
-# CONFIG_HUSH_EXPORT is not set
1154
-# CONFIG_HUSH_EXPORT_N is not set
1155
-# CONFIG_HUSH_READONLY is not set
1156
-# CONFIG_HUSH_KILL is not set
1157
-# CONFIG_HUSH_WAIT is not set
1158
-# CONFIG_HUSH_COMMAND is not set
1159
-# CONFIG_HUSH_TRAP is not set
1160
-# CONFIG_HUSH_TYPE is not set
1161
-# CONFIG_HUSH_TIMES is not set
1162
-# CONFIG_HUSH_READ is not set
1163
-# CONFIG_HUSH_SET is not set
1164
-# CONFIG_HUSH_UNSET is not set
1165
-# CONFIG_HUSH_ULIMIT is not set
1166
-# CONFIG_HUSH_UMASK is not set
1167
-# CONFIG_HUSH_GETOPTS is not set
1168
-# CONFIG_HUSH_MEMLEAK is not set
1169
-
1170
-#
1171
-# Options common to all shells
1172
-#
1173
-CONFIG_FEATURE_SH_MATH=y
1174
-CONFIG_FEATURE_SH_MATH_64=y
1175
-CONFIG_FEATURE_SH_MATH_BASE=y
1176
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
1177
-# CONFIG_FEATURE_SH_STANDALONE is not set
1178
-# CONFIG_FEATURE_SH_NOFORK is not set
1179
-CONFIG_FEATURE_SH_READ_FRAC=y
1180
-CONFIG_FEATURE_SH_HISTFILESIZE=y
1181
-CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y
1182
-
1183
-#
1184
-# System Logging Utilities
1185
-#
1186
-# CONFIG_KLOGD is not set
1187
-# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
1188
-# CONFIG_LOGGER is not set
1189
-# CONFIG_LOGREAD is not set
1190
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
1191
-# CONFIG_SYSLOGD is not set
1192
-# CONFIG_FEATURE_ROTATE_LOGFILE is not set
1193
-# CONFIG_FEATURE_REMOTE_LOG is not set
1194
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
1195
-# CONFIG_FEATURE_SYSLOGD_CFG is not set
1196
-# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
1197
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
1198
-# CONFIG_FEATURE_IPC_SYSLOG is not set
1199
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
1200
-# CONFIG_FEATURE_KMSG_SYSLOG is not set
--- a/containers/busybox-config
+++ b/containers/busybox-config
@@ -1,1200 +0,0 @@
1 #
2 # Automatically generated make config: don't edit
3 # Busybox version: 1.35.0
4 # Tue Aug 16 02:15:21 2022
5 #
6 CONFIG_HAVE_DOT_CONFIG=y
7
8 #
9 # Settings
10 #
11 CONFIG_DESKTOP=y
12 # CONFIG_EXTRA_COMPAT is not set
13 # CONFIG_FEDORA_COMPAT is not set
14 CONFIG_INCLUDE_SUSv2=y
15 CONFIG_LONG_OPTS=y
16 CONFIG_SHOW_USAGE=y
17 CONFIG_FEATURE_VERBOSE_USAGE=y
18 CONFIG_FEATURE_COMPRESS_USAGE=y
19 CONFIG_LFS=y
20 # CONFIG_PAM is not set
21 CONFIG_FEATURE_DEVPTS=y
22 CONFIG_FEATURE_UTMP=y
23 CONFIG_FEATURE_WTMP=y
24 CONFIG_FEATURE_PIDFILE=y
25 CONFIG_PID_FILE_PATH="/var/run"
26 CONFIG_BUSYBOX=y
27 CONFIG_FEATURE_SHOW_SCRIPT=y
28 CONFIG_FEATURE_INSTALLER=y
29 # CONFIG_INSTALL_NO_USR is not set
30 CONFIG_FEATURE_SUID=y
31 CONFIG_FEATURE_SUID_CONFIG=y
32 CONFIG_FEATURE_SUID_CONFIG_QUIET=y
33 # CONFIG_FEATURE_PREFER_APPLETS is not set
34 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
35 # CONFIG_SELINUX is not set
36 # CONFIG_FEATURE_CLEAN_UP is not set
37 CONFIG_FEATURE_SYSLOG_INFO=y
38 CONFIG_FEATURE_SYSLOG=y
39
40 #
41 # Build Options
42 #
43 CONFIG_STATIC=y
44 # CONFIG_PIE is not set
45 # CONFIG_NOMMU is not set
46 # CONFIG_BUILD_LIBBUSYBOX is not set
47 # CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set
48 # CONFIG_FEATURE_INDIVIDUAL is not set
49 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
50 CONFIG_CROSS_COMPILER_PREFIX=""
51 CONFIG_SYSROOT=""
52 CONFIG_EXTRA_CFLAGS=""
53 CONFIG_EXTRA_LDFLAGS=""
54 CONFIG_EXTRA_LDLIBS=""
55 # CONFIG_USE_PORTABLE_CODE is not set
56 CONFIG_STACK_OPTIMIZATION_386=y
57 CONFIG_STATIC_LIBGCC=y
58
59 #
60 # Installation Options ("make install" behavior)
61 #
62 CONFIG_INSTALL_APPLET_SYMLINKS=y
63 # CONFIG_INSTALL_APPLET_HARDLINKS is not set
64 # CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
65 # CONFIG_INSTALL_APPLET_DONT is not set
66 # CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
67 # CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
68 # CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
69 CONFIG_PREFIX="./_install"
70
71 #
72 # Debugging Options
73 #
74 # CONFIG_DEBUG is not set
75 # CONFIG_DEBUG_PESSIMIZE is not set
76 # CONFIG_DEBUG_SANITIZE is not set
77 # CONFIG_UNIT_TEST is not set
78 # CONFIG_WERROR is not set
79 # CONFIG_WARN_SIMPLE_MSG is not set
80 CONFIG_NO_DEBUG_LIB=y
81 # CONFIG_DMALLOC is not set
82 # CONFIG_EFENCE is not set
83
84 #
85 # Library Tuning
86 #
87 # CONFIG_FEATURE_USE_BSS_TAIL is not set
88 CONFIG_FLOAT_DURATION=y
89 CONFIG_FEATURE_RTMINMAX=y
90 CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS=y
91 CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
92 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
93 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
94 CONFIG_PASSWORD_MINLEN=6
95 CONFIG_MD5_SMALL=1
96 CONFIG_SHA3_SMALL=1
97 CONFIG_FEATURE_NON_POSIX_CP=y
98 # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
99 CONFIG_FEATURE_USE_SENDFILE=y
100 CONFIG_FEATURE_COPYBUF_KB=4
101 CONFIG_MONOTONIC_SYSCALL=y
102 CONFIG_IOCTL_HEX2STR_ERROR=y
103 CONFIG_FEATURE_EDITING=y
104 CONFIG_FEATURE_EDITING_MAX_LEN=1024
105 # CONFIG_FEATURE_EDITING_VI is not set
106 CONFIG_FEATURE_EDITING_HISTORY=255
107 CONFIG_FEATURE_EDITING_SAVEHISTORY=y
108 # CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
109 CONFIG_FEATURE_REVERSE_SEARCH=y
110 CONFIG_FEATURE_TAB_COMPLETION=y
111 CONFIG_FEATURE_USERNAME_COMPLETION=y
112 CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
113 CONFIG_FEATURE_EDITING_WINCH=y
114 # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
115 # CONFIG_LOCALE_SUPPORT is not set
116 CONFIG_UNICODE_SUPPORT=y
117 # CONFIG_UNICODE_USING_LOCALE is not set
118 # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
119 CONFIG_SUBST_WCHAR=63
120 CONFIG_LAST_SUPPORTED_WCHAR=767
121 # CONFIG_UNICODE_COMBINING_WCHARS is not set
122 # CONFIG_UNICODE_WIDE_WCHARS is not set
123 # CONFIG_UNICODE_BIDI_SUPPORT is not set
124 # CONFIG_UNICODE_NEUTRAL_TABLE is not set
125 # CONFIG_UNICODE_PRESERVE_BROKEN is not set
126
127 #
128 # Applets
129 #
130
131 #
132 # Archival Utilities
133 #
134 # CONFIG_FEATURE_SEAMLESS_XZ is not set
135 # CONFIG_FEATURE_SEAMLESS_LZMA is not set
136 # CONFIG_FEATURE_SEAMLESS_BZ2 is not set
137 CONFIG_FEATURE_SEAMLESS_GZ=y
138 # CONFIG_FEATURE_SEAMLESS_Z is not set
139 # CONFIG_AR is not set
140 # CONFIG_FEATURE_AR_LONG_FILENAMES is not set
141 # CONFIG_FEATURE_AR_CREATE is not set
142 # CONFIG_UNCOMPRESS is not set
143 CONFIG_GUNZIP=y
144 CONFIG_ZCAT=y
145 CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y
146 # CONFIG_BUNZIP2 is not set
147 # CONFIG_BZCAT is not set
148 # CONFIG_UNLZMA is not set
149 # CONFIG_LZCAT is not set
150 # CONFIG_LZMA is not set
151 # CONFIG_UNXZ is not set
152 # CONFIG_XZCAT is not set
153 # CONFIG_XZ is not set
154 # CONFIG_BZIP2 is not set
155 CONFIG_BZIP2_SMALL=0
156 # CONFIG_FEATURE_BZIP2_DECOMPRESS is not set
157 # CONFIG_CPIO is not set
158 # CONFIG_FEATURE_CPIO_O is not set
159 # CONFIG_FEATURE_CPIO_P is not set
160 # CONFIG_FEATURE_CPIO_IGNORE_DEVNO is not set
161 # CONFIG_FEATURE_CPIO_RENUMBER_INODES is not set
162 # CONFIG_DPKG is not set
163 # CONFIG_DPKG_DEB is not set
164 CONFIG_GZIP=y
165 CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
166 CONFIG_GZIP_FAST=0
167 # CONFIG_FEATURE_GZIP_LEVELS is not set
168 CONFIG_FEATURE_GZIP_DECOMPRESS=y
169 # CONFIG_LZOP is not set
170 # CONFIG_UNLZOP is not set
171 # CONFIG_LZOPCAT is not set
172 # CONFIG_LZOP_COMPR_HIGH is not set
173 # CONFIG_RPM is not set
174 # CONFIG_RPM2CPIO is not set
175 CONFIG_TAR=y
176 CONFIG_FEATURE_TAR_LONG_OPTIONS=y
177 CONFIG_FEATURE_TAR_CREATE=y
178 CONFIG_FEATURE_TAR_AUTODETECT=y
179 CONFIG_FEATURE_TAR_FROM=y
180 # CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
181 # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
182 CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
183 # CONFIG_FEATURE_TAR_TO_COMMAND is not set
184 CONFIG_FEATURE_TAR_UNAME_GNAME=y
185 CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
186 # CONFIG_FEATURE_TAR_SELINUX is not set
187 CONFIG_UNZIP=y
188 CONFIG_FEATURE_UNZIP_CDF=y
189 CONFIG_FEATURE_UNZIP_BZIP2=y
190 CONFIG_FEATURE_UNZIP_LZMA=y
191 CONFIG_FEATURE_UNZIP_XZ=y
192 # CONFIG_FEATURE_LZMA_FAST is not set
193
194 #
195 # Coreutils
196 #
197 CONFIG_FEATURE_VERBOSE=y
198
199 #
200 # Common options for date and touch
201 #
202 CONFIG_FEATURE_TIMEZONE=y
203
204 #
205 # Common options for cp and mv
206 #
207 CONFIG_FEATURE_PRESERVE_HARDLINKS=y
208
209 #
210 # Common options for df, du, ls
211 #
212 CONFIG_FEATURE_HUMAN_READABLE=y
213 CONFIG_BASENAME=y
214 CONFIG_CAT=y
215 CONFIG_FEATURE_CATN=y
216 CONFIG_FEATURE_CATV=y
217 CONFIG_CHGRP=y
218 CONFIG_CHMOD=y
219 CONFIG_CHOWN=y
220 CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
221 CONFIG_CHROOT=y
222 # CONFIG_CKSUM is not set
223 # CONFIG_CRC32 is not set
224 CONFIG_COMM=y
225 CONFIG_CP=y
226 CONFIG_FEATURE_CP_LONG_OPTIONS=y
227 CONFIG_FEATURE_CP_REFLINK=y
228 CONFIG_CUT=y
229 CONFIG_FEATURE_CUT_REGEX=y
230 CONFIG_DATE=y
231 CONFIG_FEATURE_DATE_ISOFMT=y
232 # CONFIG_FEATURE_DATE_NANO is not set
233 CONFIG_FEATURE_DATE_COMPAT=y
234 CONFIG_DD=y
235 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
236 CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
237 CONFIG_FEATURE_DD_IBS_OBS=y
238 CONFIG_FEATURE_DD_STATUS=y
239 CONFIG_DF=y
240 CONFIG_FEATURE_DF_FANCY=y
241 CONFIG_FEATURE_SKIP_ROOTFS=y
242 CONFIG_DIRNAME=y
243 CONFIG_DOS2UNIX=y
244 CONFIG_UNIX2DOS=y
245 CONFIG_DU=y
246 CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
247 # CONFIG_ECHO is not set
248 CONFIG_FEATURE_FANCY_ECHO=y
249 CONFIG_ENV=y
250 CONFIG_EXPAND=y
251 CONFIG_UNEXPAND=y
252 CONFIG_EXPR=y
253 CONFIG_EXPR_MATH_SUPPORT_64=y
254 # CONFIG_FACTOR is not set
255 CONFIG_FALSE=y
256 CONFIG_FOLD=y
257 CONFIG_HEAD=y
258 CONFIG_FEATURE_FANCY_HEAD=y
259 CONFIG_HOSTID=y
260 CONFIG_ID=y
261 CONFIG_GROUPS=y
262 CONFIG_INSTALL=y
263 CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
264 CONFIG_LINK=y
265 CONFIG_LN=y
266 # CONFIG_LOGNAME is not set
267 CONFIG_LS=y
268 CONFIG_FEATURE_LS_FILETYPES=y
269 CONFIG_FEATURE_LS_FOLLOWLINKS=y
270 CONFIG_FEATURE_LS_RECURSIVE=y
271 CONFIG_FEATURE_LS_WIDTH=y
272 CONFIG_FEATURE_LS_SORTFILES=y
273 CONFIG_FEATURE_LS_TIMESTAMPS=y
274 CONFIG_FEATURE_LS_USERNAME=y
275 CONFIG_FEATURE_LS_COLOR=y
276 CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
277 # CONFIG_MD5SUM is not set
278 # CONFIG_SHA1SUM is not set
279 # CONFIG_SHA256SUM is not set
280 # CONFIG_SHA512SUM is not set
281 # CONFIG_SHA3SUM is not set
282 # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set
283 CONFIG_MKDIR=y
284 CONFIG_MKFIFO=y
285 CONFIG_MKNOD=y
286 CONFIG_MKTEMP=y
287 CONFIG_MV=y
288 CONFIG_NICE=y
289 CONFIG_NL=y
290 CONFIG_NOHUP=y
291 CONFIG_NPROC=y
292 CONFIG_OD=y
293 CONFIG_PASTE=y
294 # CONFIG_PRINTENV is not set
295 # CONFIG_PRINTF is not set
296 CONFIG_PWD=y
297 CONFIG_READLINK=y
298 CONFIG_FEATURE_READLINK_FOLLOW=y
299 CONFIG_REALPATH=y
300 CONFIG_RM=y
301 CONFIG_RMDIR=y
302 CONFIG_SEQ=y
303 CONFIG_SHRED=y
304 CONFIG_SHUF=y
305 CONFIG_SLEEP=y
306 CONFIG_FEATURE_FANCY_SLEEP=y
307 CONFIG_SORT=y
308 # CONFIG_FEATURE_SORT_BIG is not set
309 # CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set
310 CONFIG_SPLIT=y
311 CONFIG_FEATURE_SPLIT_FANCY=y
312 CONFIG_STAT=y
313 CONFIG_FEATURE_STAT_FORMAT=y
314 CONFIG_FEATURE_STAT_FILESYSTEM=y
315 CONFIG_STTY=y
316 # CONFIG_SUM is not set
317 CONFIG_SYNC=y
318 CONFIG_FEATURE_SYNC_FANCY=y
319 CONFIG_FSYNC=y
320 CONFIG_TAC=y
321 CONFIG_TAIL=y
322 CONFIG_FEATURE_FANCY_TAIL=y
323 CONFIG_TEE=y
324 CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
325 # CONFIG_TEST is not set
326 # CONFIG_TEST1 is not set
327 # CONFIG_TEST2 is not set
328 # CONFIG_FEATURE_TEST_64 is not set
329 CONFIG_TIMEOUT=y
330 CONFIG_TOUCH=y
331 CONFIG_FEATURE_TOUCH_SUSV3=y
332 CONFIG_TR=y
333 CONFIG_FEATURE_TR_CLASSES=y
334 CONFIG_FEATURE_TR_EQUIV=y
335 CONFIG_TRUE=y
336 CONFIG_TRUNCATE=y
337 CONFIG_TTY=y
338 CONFIG_UNAME=y
339 CONFIG_UNAME_OSNAME="GNU/Linux"
340 CONFIG_BB_ARCH=y
341 CONFIG_UNIQ=y
342 CONFIG_UNLINK=y
343 CONFIG_USLEEP=y
344 CONFIG_UUDECODE=y
345 CONFIG_BASE32=y
346 CONFIG_BASE64=y
347 CONFIG_UUENCODE=y
348 CONFIG_WC=y
349 CONFIG_FEATURE_WC_LARGE=y
350 CONFIG_WHO=y
351 CONFIG_W=y
352 CONFIG_USERS=y
353 CONFIG_WHOAMI=y
354 CONFIG_YES=y
355
356 #
357 # Console Utilities
358 #
359 # CONFIG_CHVT is not set
360 CONFIG_CLEAR=y
361 # CONFIG_DEALLOCVT is not set
362 # CONFIG_DUMPKMAP is not set
363 # CONFIG_FGCONSOLE is not set
364 # CONFIG_KBD_MODE is not set
365 # CONFIG_LOADFONT is not set
366 # CONFIG_SETFONT is not set
367 # CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
368 CONFIG_DEFAULT_SETFONT_DIR=""
369 # CONFIG_FEATURE_LOADFONT_PSF2 is not set
370 # CONFIG_FEATURE_LOADFONT_RAW is not set
371 # CONFIG_LOADKMAP is not set
372 # CONFIG_OPENVT is not set
373 # CONFIG_RESET is not set
374 # CONFIG_RESIZE is not set
375 # CONFIG_FEATURE_RESIZE_PRINT is not set
376 # CONFIG_SETCONSOLE is not set
377 # CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
378 # CONFIG_SETKEYCODES is not set
379 # CONFIG_SETLOGCONS is not set
380 # CONFIG_SHOWKEY is not set
381
382 #
383 # Debian Utilities
384 #
385 # CONFIG_PIPE_PROGRESS is not set
386 # CONFIG_RUN_PARTS is not set
387 # CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
388 # CONFIG_FEATURE_RUN_PARTS_FANCY is not set
389 # CONFIG_START_STOP_DAEMON is not set
390 # CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
391 # CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
392 CONFIG_WHICH=y
393
394 #
395 # klibc-utils
396 #
397 # CONFIG_MINIPS is not set
398 # CONFIG_NUKE is not set
399 # CONFIG_RESUME is not set
400 # CONFIG_RUN_INIT is not set
401
402 #
403 # Editors
404 #
405 # CONFIG_AWK is not set
406 # CONFIG_FEATURE_AWK_LIBM is not set
407 # CONFIG_FEATURE_AWK_GNU_EXTENSIONS is not set
408 # CONFIG_CMP is not set
409 CONFIG_DIFF=y
410 CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
411 CONFIG_FEATURE_DIFF_DIR=y
412 # CONFIG_ED is not set
413 CONFIG_PATCH=y
414 CONFIG_SED=y
415 CONFIG_VI=y
416 CONFIG_FEATURE_VI_MAX_LEN=4096
417 # CONFIG_FEATURE_VI_8BIT is not set
418 CONFIG_FEATURE_VI_COLON=y
419 CONFIG_FEATURE_VI_COLON_EXPAND=y
420 CONFIG_FEATURE_VI_YANKMARK=y
421 CONFIG_FEATURE_VI_SEARCH=y
422 # CONFIG_FEATURE_VI_REGEX_SEARCH is not set
423 CONFIG_FEATURE_VI_USE_SIGNALS=y
424 CONFIG_FEATURE_VI_DOT_CMD=y
425 CONFIG_FEATURE_VI_READONLY=y
426 CONFIG_FEATURE_VI_SETOPTS=y
427 CONFIG_FEATURE_VI_SET=y
428 CONFIG_FEATURE_VI_WIN_RESIZE=y
429 CONFIG_FEATURE_VI_ASK_TERMINAL=y
430 CONFIG_FEATURE_VI_UNDO=y
431 CONFIG_FEATURE_VI_UNDO_QUEUE=y
432 CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
433 CONFIG_FEATURE_VI_VERBOSE_STATUS=y
434 CONFIG_FEATURE_ALLOW_EXEC=y
435
436 #
437 # Finding Utilities
438 #
439 CONFIG_FIND=y
440 CONFIG_FEATURE_FIND_PRINT0=y
441 CONFIG_FEATURE_FIND_MTIME=y
442 CONFIG_FEATURE_FIND_ATIME=y
443 CONFIG_FEATURE_FIND_CTIME=y
444 CONFIG_FEATURE_FIND_MMIN=y
445 CONFIG_FEATURE_FIND_AMIN=y
446 CONFIG_FEATURE_FIND_CMIN=y
447 CONFIG_FEATURE_FIND_PERM=y
448 CONFIG_FEATURE_FIND_TYPE=y
449 CONFIG_FEATURE_FIND_EXECUTABLE=y
450 CONFIG_FEATURE_FIND_XDEV=y
451 CONFIG_FEATURE_FIND_MAXDEPTH=y
452 CONFIG_FEATURE_FIND_NEWER=y
453 CONFIG_FEATURE_FIND_INUM=y
454 CONFIG_FEATURE_FIND_SAMEFILE=y
455 CONFIG_FEATURE_FIND_EXEC=y
456 CONFIG_FEATURE_FIND_EXEC_PLUS=y
457 CONFIG_FEATURE_FIND_USER=y
458 CONFIG_FEATURE_FIND_GROUP=y
459 CONFIG_FEATURE_FIND_NOT=y
460 CONFIG_FEATURE_FIND_DEPTH=y
461 CONFIG_FEATURE_FIND_PAREN=y
462 CONFIG_FEATURE_FIND_SIZE=y
463 CONFIG_FEATURE_FIND_PRUNE=y
464 CONFIG_FEATURE_FIND_QUIT=y
465 CONFIG_FEATURE_FIND_DELETE=y
466 CONFIG_FEATURE_FIND_EMPTY=y
467 CONFIG_FEATURE_FIND_PATH=y
468 CONFIG_FEATURE_FIND_REGEX=y
469 # CONFIG_FEATURE_FIND_CONTEXT is not set
470 CONFIG_FEATURE_FIND_LINKS=y
471 CONFIG_GREP=y
472 # CONFIG_EGREP is not set
473 # CONFIG_FGREP is not set
474 CONFIG_FEATURE_GREP_CONTEXT=y
475 CONFIG_XARGS=y
476 CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
477 CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
478 CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
479 CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
480 CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
481 CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL=y
482 CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y
483
484 #
485 # Init Utilities
486 #
487 # CONFIG_BOOTCHARTD is not set
488 # CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
489 # CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
490 # CONFIG_HALT is not set
491 # CONFIG_POWEROFF is not set
492 # CONFIG_REBOOT is not set
493 # CONFIG_FEATURE_WAIT_FOR_INIT is not set
494 # CONFIG_FEATURE_CALL_TELINIT is not set
495 CONFIG_TELINIT_PATH=""
496 # CONFIG_INIT is not set
497 # CONFIG_LINUXRC is not set
498 # CONFIG_FEATURE_USE_INITTAB is not set
499 # CONFIG_FEATURE_KILL_REMOVED is not set
500 CONFIG_FEATURE_KILL_DELAY=0
501 # CONFIG_FEATURE_INIT_SCTTY is not set
502 # CONFIG_FEATURE_INIT_SYSLOG is not set
503 # CONFIG_FEATURE_INIT_QUIET is not set
504 # CONFIG_FEATURE_INIT_COREDUMPS is not set
505 CONFIG_INIT_TERMINAL_TYPE=""
506 # CONFIG_FEATURE_INIT_MODIFY_CMDLINE is not set
507
508 #
509 # Login/Password Management Utilities
510 #
511 # CONFIG_FEATURE_SHADOWPASSWDS is not set
512 CONFIG_USE_BB_PWD_GRP=y
513 # CONFIG_USE_BB_SHADOW is not set
514 CONFIG_USE_BB_CRYPT=y
515 CONFIG_USE_BB_CRYPT_SHA=y
516 # CONFIG_ADD_SHELL is not set
517 # CONFIG_REMOVE_SHELL is not set
518 CONFIG_ADDGROUP=y
519 # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
520 CONFIG_ADDUSER=y
521 # CONFIG_FEATURE_CHECK_NAMES is not set
522 CONFIG_LAST_ID=60000
523 CONFIG_FIRST_SYSTEM_ID=100
524 CONFIG_LAST_SYSTEM_ID=999
525 # CONFIG_CHPASSWD is not set
526 CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
527 # CONFIG_CRYPTPW is not set
528 # CONFIG_MKPASSWD is not set
529 # CONFIG_DELUSER is not set
530 # CONFIG_DELGROUP is not set
531 # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
532 # CONFIG_GETTY is not set
533 # CONFIG_LOGIN is not set
534 # CONFIG_LOGIN_SESSION_AS_CHILD is not set
535 # CONFIG_LOGIN_SCRIPTS is not set
536 # CONFIG_FEATURE_NOLOGIN is not set
537 # CONFIG_FEATURE_SECURETTY is not set
538 # CONFIG_PASSWD is not set
539 # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
540 # CONFIG_SU is not set
541 # CONFIG_FEATURE_SU_SYSLOG is not set
542 # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
543 # CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY is not set
544 # CONFIG_SULOGIN is not set
545 # CONFIG_VLOCK is not set
546
547 #
548 # Linux Ext2 FS Progs
549 #
550 # CONFIG_CHATTR is not set
551 # CONFIG_FSCK is not set
552 # CONFIG_LSATTR is not set
553 # CONFIG_TUNE2FS is not set
554
555 #
556 # Linux Module Utilities
557 #
558 # CONFIG_MODPROBE_SMALL is not set
559 # CONFIG_DEPMOD is not set
560 # CONFIG_INSMOD is not set
561 # CONFIG_LSMOD is not set
562 # CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
563 # CONFIG_MODINFO is not set
564 # CONFIG_MODPROBE is not set
565 # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
566 # CONFIG_RMMOD is not set
567
568 #
569 # Options common to multiple modutils
570 #
571 # CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS is not set
572 # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
573 # CONFIG_FEATURE_2_4_MODULES is not set
574 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
575 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
576 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
577 # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
578 # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
579 # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
580 # CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
581 # CONFIG_FEATURE_MODUTILS_ALIAS is not set
582 # CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
583 CONFIG_DEFAULT_MODULES_DIR=""
584 CONFIG_DEFAULT_DEPMOD_FILE=""
585
586 #
587 # Linux System Utilities
588 #
589 # CONFIG_ACPID is not set
590 # CONFIG_FEATURE_ACPID_COMPAT is not set
591 # CONFIG_BLKDISCARD is not set
592 # CONFIG_BLKID is not set
593 # CONFIG_FEATURE_BLKID_TYPE is not set
594 # CONFIG_BLOCKDEV is not set
595 # CONFIG_CAL is not set
596 # CONFIG_CHRT is not set
597 # CONFIG_DMESG is not set
598 # CONFIG_FEATURE_DMESG_PRETTY is not set
599 # CONFIG_EJECT is not set
600 # CONFIG_FEATURE_EJECT_SCSI is not set
601 # CONFIG_FALLOCATE is not set
602 # CONFIG_FATATTR is not set
603 # CONFIG_FBSET is not set
604 # CONFIG_FEATURE_FBSET_FANCY is not set
605 # CONFIG_FEATURE_FBSET_READMODE is not set
606 # CONFIG_FDFORMAT is not set
607 # CONFIG_FDISK is not set
608 # CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
609 # CONFIG_FEATURE_FDISK_WRITABLE is not set
610 # CONFIG_FEATURE_AIX_LABEL is not set
611 # CONFIG_FEATURE_SGI_LABEL is not set
612 # CONFIG_FEATURE_SUN_LABEL is not set
613 # CONFIG_FEATURE_OSF_LABEL is not set
614 # CONFIG_FEATURE_GPT_LABEL is not set
615 # CONFIG_FEATURE_FDISK_ADVANCED is not set
616 # CONFIG_FINDFS is not set
617 # CONFIG_FLOCK is not set
618 # CONFIG_FDFLUSH is not set
619 # CONFIG_FREERAMDISK is not set
620 # CONFIG_FSCK_MINIX is not set
621 # CONFIG_FSFREEZE is not set
622 # CONFIG_FSTRIM is not set
623 # CONFIG_GETOPT is not set
624 # CONFIG_FEATURE_GETOPT_LONG is not set
625 CONFIG_HEXDUMP=y
626 CONFIG_HD=y
627 CONFIG_XXD=y
628 # CONFIG_HWCLOCK is not set
629 # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
630 # CONFIG_IONICE is not set
631 # CONFIG_IPCRM is not set
632 # CONFIG_IPCS is not set
633 # CONFIG_LAST is not set
634 # CONFIG_FEATURE_LAST_FANCY is not set
635 # CONFIG_LOSETUP is not set
636 # CONFIG_LSPCI is not set
637 # CONFIG_LSUSB is not set
638 # CONFIG_MDEV is not set
639 # CONFIG_FEATURE_MDEV_CONF is not set
640 # CONFIG_FEATURE_MDEV_RENAME is not set
641 # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
642 # CONFIG_FEATURE_MDEV_EXEC is not set
643 # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
644 # CONFIG_FEATURE_MDEV_DAEMON is not set
645 # CONFIG_MESG is not set
646 # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
647 # CONFIG_MKE2FS is not set
648 # CONFIG_MKFS_EXT2 is not set
649 # CONFIG_MKFS_MINIX is not set
650 # CONFIG_FEATURE_MINIX2 is not set
651 # CONFIG_MKFS_REISER is not set
652 # CONFIG_MKDOSFS is not set
653 # CONFIG_MKFS_VFAT is not set
654 # CONFIG_MKSWAP is not set
655 # CONFIG_FEATURE_MKSWAP_UUID is not set
656 CONFIG_MORE=y
657 CONFIG_MOUNT=y
658 CONFIG_FEATURE_MOUNT_FAKE=y
659 CONFIG_FEATURE_MOUNT_VERBOSE=y
660 # CONFIG_FEATURE_MOUNT_HELPERS is not set
661 # CONFIG_FEATURE_MOUNT_LABEL is not set
662 # CONFIG_FEATURE_MOUNT_NFS is not set
663 # CONFIG_FEATURE_MOUNT_CIFS is not set
664 CONFIG_FEATURE_MOUNT_FLAGS=y
665 CONFIG_FEATURE_MOUNT_FSTAB=y
666 CONFIG_FEATURE_MOUNT_OTHERTAB=y
667 # CONFIG_MOUNTPOINT is not set
668 CONFIG_NOLOGIN=y
669 # CONFIG_NOLOGIN_DEPENDENCIES is not set
670 # CONFIG_NSENTER is not set
671 # CONFIG_PIVOT_ROOT is not set
672 # CONFIG_RDATE is not set
673 # CONFIG_RDEV is not set
674 # CONFIG_READPROFILE is not set
675 CONFIG_RENICE=y
676 CONFIG_REV=y
677 # CONFIG_RTCWAKE is not set
678 # CONFIG_SCRIPT is not set
679 # CONFIG_SCRIPTREPLAY is not set
680 # CONFIG_SETARCH is not set
681 # CONFIG_LINUX32 is not set
682 # CONFIG_LINUX64 is not set
683 # CONFIG_SETPRIV is not set
684 # CONFIG_FEATURE_SETPRIV_DUMP is not set
685 # CONFIG_FEATURE_SETPRIV_CAPABILITIES is not set
686 # CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES is not set
687 # CONFIG_SETSID is not set
688 # CONFIG_SWAPON is not set
689 # CONFIG_FEATURE_SWAPON_DISCARD is not set
690 # CONFIG_FEATURE_SWAPON_PRI is not set
691 # CONFIG_SWAPOFF is not set
692 # CONFIG_FEATURE_SWAPONOFF_LABEL is not set
693 # CONFIG_SWITCH_ROOT is not set
694 # CONFIG_TASKSET is not set
695 # CONFIG_FEATURE_TASKSET_FANCY is not set
696 # CONFIG_FEATURE_TASKSET_CPULIST is not set
697 # CONFIG_UEVENT is not set
698 CONFIG_UMOUNT=y
699 CONFIG_FEATURE_UMOUNT_ALL=y
700 # CONFIG_UNSHARE is not set
701 # CONFIG_WALL is not set
702
703 #
704 # Common options for mount/umount
705 #
706 # CONFIG_FEATURE_MOUNT_LOOP is not set
707 # CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set
708 # CONFIG_FEATURE_MTAB_SUPPORT is not set
709 # CONFIG_VOLUMEID is not set
710 # CONFIG_FEATURE_VOLUMEID_BCACHE is not set
711 # CONFIG_FEATURE_VOLUMEID_BTRFS is not set
712 # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
713 # CONFIG_FEATURE_VOLUMEID_EROFS is not set
714 # CONFIG_FEATURE_VOLUMEID_EXFAT is not set
715 # CONFIG_FEATURE_VOLUMEID_EXT is not set
716 # CONFIG_FEATURE_VOLUMEID_F2FS is not set
717 # CONFIG_FEATURE_VOLUMEID_FAT is not set
718 # CONFIG_FEATURE_VOLUMEID_HFS is not set
719 # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
720 # CONFIG_FEATURE_VOLUMEID_JFS is not set
721 # CONFIG_FEATURE_VOLUMEID_LFS is not set
722 # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
723 # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
724 # CONFIG_FEATURE_VOLUMEID_LUKS is not set
725 # CONFIG_FEATURE_VOLUMEID_MINIX is not set
726 # CONFIG_FEATURE_VOLUMEID_NILFS is not set
727 # CONFIG_FEATURE_VOLUMEID_NTFS is not set
728 # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
729 # CONFIG_FEATURE_VOLUMEID_REISERFS is not set
730 # CONFIG_FEATURE_VOLUMEID_ROMFS is not set
731 # CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
732 # CONFIG_FEATURE_VOLUMEID_SYSV is not set
733 # CONFIG_FEATURE_VOLUMEID_UBIFS is not set
734 # CONFIG_FEATURE_VOLUMEID_UDF is not set
735 # CONFIG_FEATURE_VOLUMEID_XFS is not set
736
737 #
738 # Miscellaneous Utilities
739 #
740 # CONFIG_ADJTIMEX is not set
741 # CONFIG_ASCII is not set
742 # CONFIG_BBCONFIG is not set
743 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
744 CONFIG_BC=y
745 # CONFIG_DC is not set
746 CONFIG_FEATURE_DC_BIG=y
747 # CONFIG_FEATURE_DC_LIBM is not set
748 # CONFIG_FEATURE_BC_INTERACTIVE is not set
749 # CONFIG_FEATURE_BC_LONG_OPTIONS is not set
750 # CONFIG_BEEP is not set
751 CONFIG_FEATURE_BEEP_FREQ=0
752 CONFIG_FEATURE_BEEP_LENGTH_MS=0
753 # CONFIG_CHAT is not set
754 # CONFIG_FEATURE_CHAT_NOFAIL is not set
755 # CONFIG_FEATURE_CHAT_TTY_HIFI is not set
756 # CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
757 # CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
758 # CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
759 # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
760 # CONFIG_FEATURE_CHAT_CLR_ABORT is not set
761 # CONFIG_CONSPY is not set
762 CONFIG_CROND=y
763 CONFIG_FEATURE_CROND_D=y
764 CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
765 CONFIG_FEATURE_CROND_SPECIAL_TIMES=y
766 CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
767 CONFIG_CRONTAB=y
768 # CONFIG_DEVFSD is not set
769 # CONFIG_DEVFSD_MODLOAD is not set
770 # CONFIG_DEVFSD_FG_NP is not set
771 # CONFIG_DEVFSD_VERBOSE is not set
772 # CONFIG_FEATURE_DEVFS is not set
773 # CONFIG_DEVMEM is not set
774 # CONFIG_FBSPLASH is not set
775 # CONFIG_FLASH_ERASEALL is not set
776 # CONFIG_FLASH_LOCK is not set
777 # CONFIG_FLASH_UNLOCK is not set
778 # CONFIG_FLASHCP is not set
779 # CONFIG_HDPARM is not set
780 # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
781 # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
782 # CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
783 # CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
784 # CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
785 # CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
786 CONFIG_HEXEDIT=y
787 # CONFIG_I2CGET is not set
788 # CONFIG_I2CSET is not set
789 # CONFIG_I2CDUMP is not set
790 # CONFIG_I2CDETECT is not set
791 # CONFIG_I2CTRANSFER is not set
792 # CONFIG_INOTIFYD is not set
793 CONFIG_LESS=y
794 CONFIG_FEATURE_LESS_MAXLINES=9999999
795 CONFIG_FEATURE_LESS_BRACKETS=y
796 CONFIG_FEATURE_LESS_FLAGS=y
797 CONFIG_FEATURE_LESS_TRUNCATE=y
798 CONFIG_FEATURE_LESS_MARKS=y
799 CONFIG_FEATURE_LESS_REGEXP=y
800 CONFIG_FEATURE_LESS_WINCH=y
801 CONFIG_FEATURE_LESS_ASK_TERMINAL=y
802 CONFIG_FEATURE_LESS_DASHCMD=y
803 CONFIG_FEATURE_LESS_LINENUMS=y
804 CONFIG_FEATURE_LESS_RAW=y
805 CONFIG_FEATURE_LESS_ENV=y
806 # CONFIG_LSSCSI is not set
807 # CONFIG_MAKEDEVS is not set
808 # CONFIG_FEATURE_MAKEDEVS_LEAF is not set
809 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
810 # CONFIG_MAN is not set
811 # CONFIG_MICROCOM is not set
812 # CONFIG_MIM is not set
813 # CONFIG_MT is not set
814 # CONFIG_NANDWRITE is not set
815 # CONFIG_NANDDUMP is not set
816 # CONFIG_PARTPROBE is not set
817 # CONFIG_RAIDAUTORUN is not set
818 # CONFIG_READAHEAD is not set
819 # CONFIG_RFKILL is not set
820 # CONFIG_RUNLEVEL is not set
821 # CONFIG_RX is not set
822 # CONFIG_SETFATTR is not set
823 # CONFIG_SETSERIAL is not set
824 CONFIG_STRINGS=y
825 CONFIG_TIME=y
826 # CONFIG_TS is not set
827 # CONFIG_TTYSIZE is not set
828 # CONFIG_UBIATTACH is not set
829 # CONFIG_UBIDETACH is not set
830 # CONFIG_UBIMKVOL is not set
831 # CONFIG_UBIRMVOL is not set
832 # CONFIG_UBIRSVOL is not set
833 # CONFIG_UBIUPDATEVOL is not set
834 # CONFIG_UBIRENAME is not set
835 # CONFIG_VOLNAME is not set
836 # CONFIG_WATCHDOG is not set
837 # CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set
838
839 #
840 # Networking Utilities
841 #
842 CONFIG_FEATURE_IPV6=y
843 # CONFIG_FEATURE_UNIX_LOCAL is not set
844 CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
845 # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
846 # CONFIG_FEATURE_ETC_NETWORKS is not set
847 # CONFIG_FEATURE_ETC_SERVICES is not set
848 # CONFIG_FEATURE_HWIB is not set
849 # CONFIG_FEATURE_TLS_SHA1 is not set
850 # CONFIG_ARP is not set
851 # CONFIG_ARPING is not set
852 # CONFIG_BRCTL is not set
853 # CONFIG_FEATURE_BRCTL_FANCY is not set
854 # CONFIG_FEATURE_BRCTL_SHOW is not set
855 # CONFIG_DNSD is not set
856 # CONFIG_ETHER_WAKE is not set
857 # CONFIG_FTPD is not set
858 # CONFIG_FEATURE_FTPD_WRITE is not set
859 # CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
860 # CONFIG_FEATURE_FTPD_AUTHENTICATION is not set
861 # CONFIG_FTPGET is not set
862 # CONFIG_FTPPUT is not set
863 # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
864 # CONFIG_HOSTNAME is not set
865 # CONFIG_DNSDOMAINNAME is not set
866 # CONFIG_HTTPD is not set
867 CONFIG_FEATURE_HTTPD_PORT_DEFAULT=0
868 # CONFIG_FEATURE_HTTPD_RANGES is not set
869 # CONFIG_FEATURE_HTTPD_SETUID is not set
870 # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
871 # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
872 # CONFIG_FEATURE_HTTPD_CGI is not set
873 # CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
874 # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
875 # CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
876 # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
877 # CONFIG_FEATURE_HTTPD_PROXY is not set
878 # CONFIG_FEATURE_HTTPD_GZIP is not set
879 # CONFIG_FEATURE_HTTPD_ETAG is not set
880 # CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set
881 # CONFIG_FEATURE_HTTPD_DATE is not set
882 # CONFIG_FEATURE_HTTPD_ACL_IP is not set
883 CONFIG_IFCONFIG=y
884 CONFIG_FEATURE_IFCONFIG_STATUS=y
885 # CONFIG_FEATURE_IFCONFIG_SLIP is not set
886 CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
887 CONFIG_FEATURE_IFCONFIG_HW=y
888 CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
889 # CONFIG_IFENSLAVE is not set
890 # CONFIG_IFPLUGD is not set
891 # CONFIG_IFUP is not set
892 # CONFIG_IFDOWN is not set
893 CONFIG_IFUPDOWN_IFSTATE_PATH=""
894 # CONFIG_FEATURE_IFUPDOWN_IP is not set
895 # CONFIG_FEATURE_IFUPDOWN_IPV4 is not set
896 # CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
897 # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
898 # CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
899 CONFIG_INETD=y
900 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
901 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
902 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
903 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
904 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
905 # CONFIG_FEATURE_INETD_RPC is not set
906 CONFIG_IP=y
907 # CONFIG_IPADDR is not set
908 # CONFIG_IPLINK is not set
909 # CONFIG_IPROUTE is not set
910 # CONFIG_IPTUNNEL is not set
911 # CONFIG_IPRULE is not set
912 # CONFIG_IPNEIGH is not set
913 CONFIG_FEATURE_IP_ADDRESS=y
914 CONFIG_FEATURE_IP_LINK=y
915 CONFIG_FEATURE_IP_ROUTE=y
916 CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2"
917 # CONFIG_FEATURE_IP_TUNNEL is not set
918 # CONFIG_FEATURE_IP_RULE is not set
919 CONFIG_FEATURE_IP_NEIGH=y
920 # CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
921 CONFIG_IPCALC=y
922 CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
923 CONFIG_FEATURE_IPCALC_FANCY=y
924 # CONFIG_FAKEIDENTD is not set
925 # CONFIG_NAMEIF is not set
926 # CONFIG_FEATURE_NAMEIF_EXTENDED is not set
927 # CONFIG_NBDCLIENT is not set
928 CONFIG_NC=y
929 # CONFIG_NETCAT is not set
930 CONFIG_NC_SERVER=y
931 CONFIG_NC_EXTRA=y
932 CONFIG_NC_110_COMPAT=y
933 # CONFIG_NETSTAT is not set
934 # CONFIG_FEATURE_NETSTAT_WIDE is not set
935 # CONFIG_FEATURE_NETSTAT_PRG is not set
936 # CONFIG_NSLOOKUP is not set
937 # CONFIG_FEATURE_NSLOOKUP_BIG is not set
938 # CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS is not set
939 # CONFIG_NTPD is not set
940 # CONFIG_FEATURE_NTPD_SERVER is not set
941 # CONFIG_FEATURE_NTPD_CONF is not set
942 # CONFIG_FEATURE_NTP_AUTH is not set
943 # CONFIG_PING is not set
944 # CONFIG_PING6 is not set
945 # CONFIG_FEATURE_FANCY_PING is not set
946 # CONFIG_PSCAN is not set
947 CONFIG_ROUTE=y
948 # CONFIG_SLATTACH is not set
949 CONFIG_SSL_CLIENT=y
950 # CONFIG_TC is not set
951 # CONFIG_FEATURE_TC_INGRESS is not set
952 # CONFIG_TCPSVD is not set
953 # CONFIG_UDPSVD is not set
954 # CONFIG_TELNET is not set
955 # CONFIG_FEATURE_TELNET_TTYPE is not set
956 # CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
957 # CONFIG_FEATURE_TELNET_WIDTH is not set
958 # CONFIG_TELNETD is not set
959 # CONFIG_FEATURE_TELNETD_STANDALONE is not set
960 CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0
961 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
962 # CONFIG_TFTP is not set
963 # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
964 # CONFIG_FEATURE_TFTP_HPA_COMPAT is not set
965 # CONFIG_TFTPD is not set
966 # CONFIG_FEATURE_TFTP_GET is not set
967 # CONFIG_FEATURE_TFTP_PUT is not set
968 # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
969 # CONFIG_TFTP_DEBUG is not set
970 CONFIG_TLS=y
971 # CONFIG_TRACEROUTE is not set
972 # CONFIG_TRACEROUTE6 is not set
973 # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
974 # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
975 # CONFIG_TUNCTL is not set
976 # CONFIG_FEATURE_TUNCTL_UG is not set
977 # CONFIG_VCONFIG is not set
978 CONFIG_WGET=y
979 CONFIG_FEATURE_WGET_LONG_OPTIONS=y
980 CONFIG_FEATURE_WGET_STATUSBAR=y
981 CONFIG_FEATURE_WGET_FTP=y
982 CONFIG_FEATURE_WGET_AUTHENTICATION=y
983 CONFIG_FEATURE_WGET_TIMEOUT=y
984 CONFIG_FEATURE_WGET_HTTPS=y
985 CONFIG_FEATURE_WGET_OPENSSL=y
986 CONFIG_WHOIS=y
987 # CONFIG_ZCIP is not set
988 # CONFIG_UDHCPD is not set
989 # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
990 # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
991 CONFIG_DHCPD_LEASES_FILE=""
992 # CONFIG_DUMPLEASES is not set
993 # CONFIG_DHCPRELAY is not set
994 # CONFIG_UDHCPC is not set
995 # CONFIG_FEATURE_UDHCPC_ARPING is not set
996 # CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
997 CONFIG_UDHCPC_DEFAULT_SCRIPT=""
998 # CONFIG_UDHCPC6 is not set
999 # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
1000 # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
1001 # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
1002 # CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
1003 CONFIG_UDHCPC_DEFAULT_INTERFACE=""
1004 # CONFIG_FEATURE_UDHCP_PORT is not set
1005 CONFIG_UDHCP_DEBUG=0
1006 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
1007 # CONFIG_FEATURE_UDHCP_RFC3397 is not set
1008 # CONFIG_FEATURE_UDHCP_8021Q is not set
1009 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
1010
1011 #
1012 # Print Utilities
1013 #
1014 # CONFIG_LPD is not set
1015 # CONFIG_LPR is not set
1016 # CONFIG_LPQ is not set
1017
1018 #
1019 # Mail Utilities
1020 #
1021 CONFIG_FEATURE_MIME_CHARSET="utf-8"
1022 # CONFIG_MAKEMIME is not set
1023 # CONFIG_POPMAILDIR is not set
1024 # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
1025 # CONFIG_REFORMIME is not set
1026 # CONFIG_FEATURE_REFORMIME_COMPAT is not set
1027 CONFIG_SENDMAIL=y
1028
1029 #
1030 # Process Utilities
1031 #
1032 # CONFIG_FEATURE_FAST_TOP is not set
1033 CONFIG_FEATURE_SHOW_THREADS=y
1034 CONFIG_FREE=y
1035 CONFIG_FUSER=y
1036 CONFIG_IOSTAT=y
1037 CONFIG_KILL=y
1038 CONFIG_KILLALL=y
1039 # CONFIG_KILLALL5 is not set
1040 CONFIG_LSOF=y
1041 CONFIG_MPSTAT=y
1042 CONFIG_NMETER=y
1043 CONFIG_PGREP=y
1044 CONFIG_PKILL=y
1045 CONFIG_PIDOF=y
1046 CONFIG_FEATURE_PIDOF_SINGLE=y
1047 CONFIG_FEATURE_PIDOF_OMIT=y
1048 CONFIG_PMAP=y
1049 # CONFIG_POWERTOP is not set
1050 # CONFIG_FEATURE_POWERTOP_INTERACTIVE is not set
1051 CONFIG_PS=y
1052 # CONFIG_FEATURE_PS_WIDE is not set
1053 # CONFIG_FEATURE_PS_LONG is not set
1054 CONFIG_FEATURE_PS_TIME=y
1055 # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
1056 CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
1057 CONFIG_PSTREE=y
1058 CONFIG_PWDX=y
1059 CONFIG_SMEMCAP=y
1060 CONFIG_BB_SYSCTL=y
1061 CONFIG_TOP=y
1062 CONFIG_FEATURE_TOP_INTERACTIVE=y
1063 CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
1064 CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
1065 CONFIG_FEATURE_TOP_SMP_CPU=y
1066 CONFIG_FEATURE_TOP_DECIMALS=y
1067 CONFIG_FEATURE_TOP_SMP_PROCESS=y
1068 CONFIG_FEATURE_TOPMEM=y
1069 CONFIG_UPTIME=y
1070 CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y
1071 CONFIG_WATCH=y
1072
1073 #
1074 # Runit Utilities
1075 #
1076 CONFIG_CHPST=y
1077 CONFIG_SETUIDGID=y
1078 CONFIG_ENVUIDGID=y
1079 CONFIG_ENVDIR=y
1080 CONFIG_SOFTLIMIT=y
1081 CONFIG_RUNSV=y
1082 CONFIG_RUNSVDIR=y
1083 # CONFIG_FEATURE_RUNSVDIR_LOG is not set
1084 CONFIG_SV=y
1085 CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service"
1086 CONFIG_SVC=y
1087 CONFIG_SVOK=y
1088 CONFIG_SVLOGD=y
1089 # CONFIG_CHCON is not set
1090 # CONFIG_GETENFORCE is not set
1091 # CONFIG_GETSEBOOL is not set
1092 # CONFIG_LOAD_POLICY is not set
1093 # CONFIG_MATCHPATHCON is not set
1094 # CONFIG_RUNCON is not set
1095 # CONFIG_SELINUXENABLED is not set
1096 # CONFIG_SESTATUS is not set
1097 # CONFIG_SETENFORCE is not set
1098 # CONFIG_SETFILES is not set
1099 # CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
1100 # CONFIG_RESTORECON is not set
1101 # CONFIG_SETSEBOOL is not set
1102
1103 #
1104 # Shells
1105 #
1106 CONFIG_SH_IS_ASH=y
1107 # CONFIG_SH_IS_HUSH is not set
1108 # CONFIG_SH_IS_NONE is not set
1109 # CONFIG_BASH_IS_ASH is not set
1110 # CONFIG_BASH_IS_HUSH is not set
1111 CONFIG_BASH_IS_NONE=y
1112 CONFIG_SHELL_ASH=y
1113 CONFIG_ASH=y
1114 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
1115 CONFIG_ASH_INTERNAL_GLOB=y
1116 CONFIG_ASH_BASH_COMPAT=y
1117 # CONFIG_ASH_BASH_SOURCE_CURDIR is not set
1118 CONFIG_ASH_BASH_NOT_FOUND_HOOK=y
1119 CONFIG_ASH_JOB_CONTROL=y
1120 CONFIG_ASH_ALIAS=y
1121 CONFIG_ASH_RANDOM_SUPPORT=y
1122 CONFIG_ASH_EXPAND_PRMT=y
1123 CONFIG_ASH_IDLE_TIMEOUT=y
1124 CONFIG_ASH_MAIL=y
1125 CONFIG_ASH_ECHO=y
1126 CONFIG_ASH_PRINTF=y
1127 CONFIG_ASH_TEST=y
1128 CONFIG_ASH_HELP=y
1129 CONFIG_ASH_GETOPTS=y
1130 CONFIG_ASH_CMDCMD=y
1131 # CONFIG_CTTYHACK is not set
1132 # CONFIG_HUSH is not set
1133 # CONFIG_SHELL_HUSH is not set
1134 # CONFIG_HUSH_BASH_COMPAT is not set
1135 # CONFIG_HUSH_BRACE_EXPANSION is not set
1136 # CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
1137 # CONFIG_HUSH_LINENO_VAR is not set
1138 # CONFIG_HUSH_INTERACTIVE is not set
1139 # CONFIG_HUSH_SAVEHISTORY is not set
1140 # CONFIG_HUSH_JOB is not set
1141 # CONFIG_HUSH_TICK is not set
1142 # CONFIG_HUSH_IF is not set
1143 # CONFIG_HUSH_LOOPS is not set
1144 # CONFIG_HUSH_CASE is not set
1145 # CONFIG_HUSH_FUNCTIONS is not set
1146 # CONFIG_HUSH_LOCAL is not set
1147 # CONFIG_HUSH_RANDOM_SUPPORT is not set
1148 # CONFIG_HUSH_MODE_X is not set
1149 # CONFIG_HUSH_ECHO is not set
1150 # CONFIG_HUSH_PRINTF is not set
1151 # CONFIG_HUSH_TEST is not set
1152 # CONFIG_HUSH_HELP is not set
1153 # CONFIG_HUSH_EXPORT is not set
1154 # CONFIG_HUSH_EXPORT_N is not set
1155 # CONFIG_HUSH_READONLY is not set
1156 # CONFIG_HUSH_KILL is not set
1157 # CONFIG_HUSH_WAIT is not set
1158 # CONFIG_HUSH_COMMAND is not set
1159 # CONFIG_HUSH_TRAP is not set
1160 # CONFIG_HUSH_TYPE is not set
1161 # CONFIG_HUSH_TIMES is not set
1162 # CONFIG_HUSH_READ is not set
1163 # CONFIG_HUSH_SET is not set
1164 # CONFIG_HUSH_UNSET is not set
1165 # CONFIG_HUSH_ULIMIT is not set
1166 # CONFIG_HUSH_UMASK is not set
1167 # CONFIG_HUSH_GETOPTS is not set
1168 # CONFIG_HUSH_MEMLEAK is not set
1169
1170 #
1171 # Options common to all shells
1172 #
1173 CONFIG_FEATURE_SH_MATH=y
1174 CONFIG_FEATURE_SH_MATH_64=y
1175 CONFIG_FEATURE_SH_MATH_BASE=y
1176 CONFIG_FEATURE_SH_EXTRA_QUIET=y
1177 # CONFIG_FEATURE_SH_STANDALONE is not set
1178 # CONFIG_FEATURE_SH_NOFORK is not set
1179 CONFIG_FEATURE_SH_READ_FRAC=y
1180 CONFIG_FEATURE_SH_HISTFILESIZE=y
1181 CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y
1182
1183 #
1184 # System Logging Utilities
1185 #
1186 # CONFIG_KLOGD is not set
1187 # CONFIG_FEATURE_KLOGD_KLOGCTL is not set
1188 # CONFIG_LOGGER is not set
1189 # CONFIG_LOGREAD is not set
1190 # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
1191 # CONFIG_SYSLOGD is not set
1192 # CONFIG_FEATURE_ROTATE_LOGFILE is not set
1193 # CONFIG_FEATURE_REMOTE_LOG is not set
1194 # CONFIG_FEATURE_SYSLOGD_DUP is not set
1195 # CONFIG_FEATURE_SYSLOGD_CFG is not set
1196 # CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
1197 CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
1198 # CONFIG_FEATURE_IPC_SYSLOG is not set
1199 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
1200 # CONFIG_FEATURE_KMSG_SYSLOG is not set
--- a/containers/busybox-config
+++ b/containers/busybox-config
@@ -1,1200 +0,0 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
D containers/os-release.in
-3
--- a/containers/os-release.in
+++ b/containers/os-release.in
@@ -1,3 +0,0 @@
1
-NAME="Fossil Bus@FOSSIL_CI_PFX@="fslbbx"
2
-VERSION="Fossil 2"
3
-HOME_URL="https://fossil-scm.org/home/doc/trunk/www/contain
--- a/containers/os-release.in
+++ b/containers/os-release.in
@@ -1,3 +0,0 @@
1 NAME="Fossil Bus@FOSSIL_CI_PFX@="fslbbx"
2 VERSION="Fossil 2"
3 HOME_URL="https://fossil-scm.org/home/doc/trunk/www/contain
--- a/containers/os-release.in
+++ b/containers/os-release.in
@@ -1,3 +0,0 @@
 
 
 
+108 -187
--- extsrc/shell.c
+++ extsrc/shell.c
@@ -115,10 +115,11 @@
115115
116116
#include <stdlib.h>
117117
#include <string.h>
118118
#include <stdio.h>
119119
#include <assert.h>
120
+#include <math.h>
120121
#include "sqlite3.h"
121122
typedef sqlite3_int64 i64;
122123
typedef sqlite3_uint64 u64;
123124
typedef unsigned char u8;
124125
#if SQLITE_USER_AUTHENTICATION
@@ -3171,10 +3172,11 @@
31713172
#ifndef U8_TYPEDEF
31723173
/* typedef unsigned char u8; */
31733174
#define U8_TYPEDEF
31743175
#endif
31753176
3177
+/* Decoding table, ASCII (7-bit) value to base 64 digit value or other */
31763178
static const u8 b64DigitValues[128] = {
31773179
/* HT LF VT FF CR */
31783180
ND,ND,ND,ND, ND,ND,ND,ND, ND,WS,WS,WS, WS,WS,ND,ND,
31793181
/* US */
31803182
ND,ND,ND,ND, ND,ND,ND,ND, ND,ND,ND,ND, ND,ND,ND,ND,
@@ -8771,11 +8773,14 @@
87718773
}else{
87728774
/* Figure out if this is a directory or a zero-sized file. Consider
87738775
** it to be a directory either if the mode suggests so, or if
87748776
** the final character in the name is '/'. */
87758777
u32 mode = pCDS->iExternalAttr >> 16;
8776
- if( !(mode & S_IFDIR) && pCDS->zFile[pCDS->nFile-1]!='/' ){
8778
+ if( !(mode & S_IFDIR)
8779
+ && pCDS->nFile>=1
8780
+ && pCDS->zFile[pCDS->nFile-1]!='/'
8781
+ ){
87778782
sqlite3_result_blob(ctx, "", 0, SQLITE_STATIC);
87788783
}
87798784
}
87808785
}
87818786
break;
@@ -12505,11 +12510,10 @@
1250512510
#endif
1250612511
1250712512
#endif /* ifndef _SQLITE_RECOVER_H */
1250812513
1250912514
/************************* End ../ext/recover/sqlite3recover.h ********************/
12510
-# ifndef SQLITE_HAVE_SQLITE3R
1251112515
/************************* Begin ../ext/recover/dbdata.c ******************/
1251212516
/*
1251312517
** 2019-04-17
1251412518
**
1251512519
** The author disclaims copyright to this source code. In place of
@@ -12676,10 +12680,11 @@
1267612680
int rc = sqlite3_declare_vtab(db, pAux ? DBPTR_SCHEMA : DBDATA_SCHEMA);
1267712681
1267812682
(void)argc;
1267912683
(void)argv;
1268012684
(void)pzErr;
12685
+ sqlite3_vtab_config(db, SQLITE_VTAB_USES_ALL_SCHEMAS);
1268112686
if( rc==SQLITE_OK ){
1268212687
pTab = (DbdataTable*)sqlite3_malloc64(sizeof(DbdataTable));
1268312688
if( pTab==0 ){
1268412689
rc = SQLITE_NOMEM;
1268512690
}else{
@@ -13021,14 +13026,18 @@
1302113026
if( pCsr->aPage==0 ){
1302213027
while( 1 ){
1302313028
if( pCsr->bOnePage==0 && pCsr->iPgno>pCsr->szDb ) return SQLITE_OK;
1302413029
rc = dbdataLoadPage(pCsr, pCsr->iPgno, &pCsr->aPage, &pCsr->nPage);
1302513030
if( rc!=SQLITE_OK ) return rc;
13026
- if( pCsr->aPage ) break;
13031
+ if( pCsr->aPage && pCsr->nPage>=256 ) break;
13032
+ sqlite3_free(pCsr->aPage);
13033
+ pCsr->aPage = 0;
1302713034
if( pCsr->bOnePage ) return SQLITE_OK;
1302813035
pCsr->iPgno++;
1302913036
}
13037
+
13038
+ assert( iOff+3+2<=pCsr->nPage );
1303013039
pCsr->iCell = pTab->bPtr ? -2 : 0;
1303113040
pCsr->nCell = get_uint16(&pCsr->aPage[iOff+3]);
1303213041
}
1303313042
1303413043
if( pTab->bPtr ){
@@ -13259,12 +13268,11 @@
1325913268
static int dbdataGetEncoding(DbdataCursor *pCsr){
1326013269
int rc = SQLITE_OK;
1326113270
int nPg1 = 0;
1326213271
u8 *aPg1 = 0;
1326313272
rc = dbdataLoadPage(pCsr, 1, &aPg1, &nPg1);
13264
- assert( rc!=SQLITE_OK || nPg1==0 || nPg1>=512 );
13265
- if( rc==SQLITE_OK && nPg1>0 ){
13273
+ if( rc==SQLITE_OK && nPg1>=(56+4) ){
1326613274
pCsr->enc = get_uint32(&aPg1[56]);
1326713275
}
1326813276
sqlite3_free(aPg1);
1326913277
return rc;
1327013278
}
@@ -13318,19 +13326,21 @@
1331813326
);
1331913327
}
1332013328
}
1332113329
if( rc==SQLITE_OK ){
1332213330
rc = sqlite3_bind_text(pCsr->pStmt, 1, zSchema, -1, SQLITE_TRANSIENT);
13323
- }else{
13324
- pTab->base.zErrMsg = sqlite3_mprintf("%s", sqlite3_errmsg(pTab->db));
1332513331
}
1332613332
1332713333
/* Try to determine the encoding of the db by inspecting the header
1332813334
** field on page 1. */
1332913335
if( rc==SQLITE_OK ){
1333013336
rc = dbdataGetEncoding(pCsr);
1333113337
}
13338
+
13339
+ if( rc!=SQLITE_OK ){
13340
+ pTab->base.zErrMsg = sqlite3_mprintf("%s", sqlite3_errmsg(pTab->db));
13341
+ }
1333213342
1333313343
if( rc==SQLITE_OK ){
1333413344
rc = dbdataNext(pCursor);
1333513345
}
1333613346
return rc;
@@ -16330,11 +16340,10 @@
1633016340
}
1633116341
1633216342
#endif /* ifndef SQLITE_OMIT_VIRTUALTABLE */
1633316343
1633416344
/************************* End ../ext/recover/sqlite3recover.c ********************/
16335
-# endif
1633616345
#endif
1633716346
#ifdef SQLITE_SHELL_EXTSRC
1633816347
# include SHELL_STRINGIFY(SQLITE_SHELL_EXTSRC)
1633916348
#endif
1634016349
@@ -17233,10 +17242,11 @@
1723317242
const char *zOrig = z;
1723417243
static const char *azTerm[] = { "", "*/", "\n" };
1723517244
int i;
1723617245
for(i=0; i<ArraySize(azTerm); i++){
1723717246
char *zNew = sqlite3_mprintf("%s%s;", zOrig, azTerm[i]);
17247
+ shell_check_oom(zNew);
1723817248
if( sqlite3_complete(zNew) ){
1723917249
size_t n = strlen(zNew);
1724017250
zNew[n-1] = 0;
1724117251
zToFree = zNew;
1724217252
z = zNew;
@@ -17667,13 +17677,13 @@
1766717677
char z[50];
1766817678
double r = sqlite3_column_double(p->pStmt, i);
1766917679
sqlite3_uint64 ur;
1767017680
memcpy(&ur,&r,sizeof(r));
1767117681
if( ur==0x7ff0000000000000LL ){
17672
- raw_printf(p->out, "1e999");
17682
+ raw_printf(p->out, "9.0e+999");
1767317683
}else if( ur==0xfff0000000000000LL ){
17674
- raw_printf(p->out, "-1e999");
17684
+ raw_printf(p->out, "-9.0e+999");
1767517685
}else{
1767617686
sqlite3_int64 ir = (sqlite3_int64)r;
1767717687
if( r==(double)ir ){
1767817688
sqlite3_snprintf(50,z,"%lld.0", ir);
1767917689
}else{
@@ -17713,13 +17723,13 @@
1771317723
char z[50];
1771417724
double r = sqlite3_column_double(p->pStmt, i);
1771517725
sqlite3_uint64 ur;
1771617726
memcpy(&ur,&r,sizeof(r));
1771717727
if( ur==0x7ff0000000000000LL ){
17718
- raw_printf(p->out, "1e999");
17728
+ raw_printf(p->out, "9.0e+999");
1771917729
}else if( ur==0xfff0000000000000LL ){
17720
- raw_printf(p->out, "-1e999");
17730
+ raw_printf(p->out, "-9.0e+999");
1772117731
}else{
1772217732
sqlite3_snprintf(50,z,"%!.20g", r);
1772317733
raw_printf(p->out, "%s", z);
1772417734
}
1772517735
}else if( aiType && aiType[i]==SQLITE_BLOB && p->pStmt ){
@@ -17919,10 +17929,11 @@
1791917929
char *zMsg;
1792017930
int i;
1792117931
if( db==0
1792217932
|| zSql==0
1792317933
|| (iOffset = sqlite3_error_offset(db))<0
17934
+ || iOffset>=(int)strlen(zSql)
1792417935
){
1792517936
return sqlite3_mprintf("");
1792617937
}
1792717938
while( iOffset>50 ){
1792817939
iOffset--;
@@ -17930,11 +17941,11 @@
1793017941
while( (zSql[0]&0xc0)==0x80 ){ zSql++; iOffset--; }
1793117942
}
1793217943
len = strlen(zSql);
1793317944
if( len>78 ){
1793417945
len = 78;
17935
- while( (zSql[len]&0xc0)==0x80 ) len--;
17946
+ while( len>0 && (zSql[len]&0xc0)==0x80 ) len--;
1793617947
}
1793717948
zCode = sqlite3_mprintf("%.*s", len, zSql);
1793817949
shell_check_oom(zCode);
1793917950
for(i=0; zCode[i]; i++){ if( IsSpace(zSql[i]) ) zCode[i] = ' '; }
1794017951
if( iOffset<25 ){
@@ -18531,26 +18542,31 @@
1853118542
1853218543
nVar = sqlite3_bind_parameter_count(pStmt);
1853318544
if( nVar==0 ) return; /* Nothing to do */
1853418545
if( sqlite3_table_column_metadata(pArg->db, "TEMP", "sqlite_parameters",
1853518546
"key", 0, 0, 0, 0, 0)!=SQLITE_OK ){
18536
- return; /* Parameter table does not exist */
18547
+ rc = SQLITE_NOTFOUND;
18548
+ pQ = 0;
18549
+ }else{
18550
+ rc = sqlite3_prepare_v2(pArg->db,
18551
+ "SELECT value FROM temp.sqlite_parameters"
18552
+ " WHERE key=?1", -1, &pQ, 0);
1853718553
}
18538
- rc = sqlite3_prepare_v2(pArg->db,
18539
- "SELECT value FROM temp.sqlite_parameters"
18540
- " WHERE key=?1", -1, &pQ, 0);
18541
- if( rc || pQ==0 ) return;
1854218554
for(i=1; i<=nVar; i++){
1854318555
char zNum[30];
1854418556
const char *zVar = sqlite3_bind_parameter_name(pStmt, i);
1854518557
if( zVar==0 ){
1854618558
sqlite3_snprintf(sizeof(zNum),zNum,"?%d",i);
1854718559
zVar = zNum;
1854818560
}
1854918561
sqlite3_bind_text(pQ, 1, zVar, -1, SQLITE_STATIC);
18550
- if( sqlite3_step(pQ)==SQLITE_ROW ){
18562
+ if( rc==SQLITE_OK && pQ && sqlite3_step(pQ)==SQLITE_ROW ){
1855118563
sqlite3_bind_value(pStmt, i, sqlite3_column_value(pQ, 0));
18564
+ }else if( sqlite3_strlike("_NAN", zVar, 0)==0 ){
18565
+ sqlite3_bind_double(pStmt, i, NAN);
18566
+ }else if( sqlite3_strlike("_INF", zVar, 0)==0 ){
18567
+ sqlite3_bind_double(pStmt, i, INFINITY);
1855218568
}else{
1855318569
sqlite3_bind_null(pStmt, i);
1855418570
}
1855518571
sqlite3_reset(pQ);
1855618572
}
@@ -19768,12 +19784,14 @@
1976819784
" Options:",
1976919785
" fkey-indexes Find missing foreign key indexes",
1977019786
#if !defined(SQLITE_OMIT_LOAD_EXTENSION) && !defined(SQLITE_SHELL_FIDDLE)
1977119787
".load FILE ?ENTRY? Load an extension library",
1977219788
#endif
19773
-#ifndef SQLITE_SHELL_FIDDLE
19774
- ".log FILE|off Turn logging on or off. FILE can be stderr/stdout",
19789
+#if !defined(SQLITE_SHELL_FIDDLE)
19790
+ ".log FILE|on|off Turn logging on or off. FILE can be stderr/stdout",
19791
+#else
19792
+ ".log on|off Turn logging on or off.",
1977519793
#endif
1977619794
".mode MODE ?OPTIONS? Set output mode",
1977719795
" MODE is one of:",
1977819796
" ascii Columns/rows delimited by 0x1F and 0x1E",
1977919797
" box Tables using unicode box-drawing characters",
@@ -20037,20 +20055,31 @@
2003720055
static char *readFile(const char *zName, int *pnByte){
2003820056
FILE *in = fopen(zName, "rb");
2003920057
long nIn;
2004020058
size_t nRead;
2004120059
char *pBuf;
20060
+ int rc;
2004220061
if( in==0 ) return 0;
20043
- fseek(in, 0, SEEK_END);
20062
+ rc = fseek(in, 0, SEEK_END);
20063
+ if( rc!=0 ){
20064
+ raw_printf(stderr, "Error: '%s' not seekable\n", zName);
20065
+ fclose(in);
20066
+ return 0;
20067
+ }
2004420068
nIn = ftell(in);
2004520069
rewind(in);
2004620070
pBuf = sqlite3_malloc64( nIn+1 );
20047
- if( pBuf==0 ){ fclose(in); return 0; }
20071
+ if( pBuf==0 ){
20072
+ raw_printf(stderr, "Error: out of memory\n");
20073
+ fclose(in);
20074
+ return 0;
20075
+ }
2004820076
nRead = fread(pBuf, nIn, 1, in);
2004920077
fclose(in);
2005020078
if( nRead!=1 ){
2005120079
sqlite3_free(pBuf);
20080
+ raw_printf(stderr, "Error: cannot read '%s'\n", zName);
2005220081
return 0;
2005320082
}
2005420083
pBuf[nIn] = 0;
2005520084
if( pnByte ) *pnByte = nIn;
2005620085
return pBuf;
@@ -20235,57 +20264,10 @@
2023520264
utf8_printf(stderr,"Error on line %d of --hexdb input\n", nLine);
2023620265
return 0;
2023720266
}
2023820267
#endif /* SQLITE_OMIT_DESERIALIZE */
2023920268
20240
-/*
20241
-** Scalar function "shell_int32". The first argument to this function
20242
-** must be a blob. The second a non-negative integer. This function
20243
-** reads and returns a 32-bit big-endian integer from byte
20244
-** offset (4*<arg2>) of the blob.
20245
-*/
20246
-static void shellInt32(
20247
- sqlite3_context *context,
20248
- int argc,
20249
- sqlite3_value **argv
20250
-){
20251
- const unsigned char *pBlob;
20252
- int nBlob;
20253
- int iInt;
20254
-
20255
- UNUSED_PARAMETER(argc);
20256
- nBlob = sqlite3_value_bytes(argv[0]);
20257
- pBlob = (const unsigned char*)sqlite3_value_blob(argv[0]);
20258
- iInt = sqlite3_value_int(argv[1]);
20259
-
20260
- if( iInt>=0 && (iInt+1)*4<=nBlob ){
20261
- const unsigned char *a = &pBlob[iInt*4];
20262
- sqlite3_int64 iVal = ((sqlite3_int64)a[0]<<24)
20263
- + ((sqlite3_int64)a[1]<<16)
20264
- + ((sqlite3_int64)a[2]<< 8)
20265
- + ((sqlite3_int64)a[3]<< 0);
20266
- sqlite3_result_int64(context, iVal);
20267
- }
20268
-}
20269
-
20270
-/*
20271
-** Scalar function "shell_idquote(X)" returns string X quoted as an identifier,
20272
-** using "..." with internal double-quote characters doubled.
20273
-*/
20274
-static void shellIdQuote(
20275
- sqlite3_context *context,
20276
- int argc,
20277
- sqlite3_value **argv
20278
-){
20279
- const char *zName = (const char*)sqlite3_value_text(argv[0]);
20280
- UNUSED_PARAMETER(argc);
20281
- if( zName ){
20282
- char *z = sqlite3_mprintf("\"%w\"", zName);
20283
- sqlite3_result_text(context, z, -1, sqlite3_free);
20284
- }
20285
-}
20286
-
2028720269
/*
2028820270
** Scalar function "usleep(X)" invokes sqlite3_sleep(X) and returns X.
2028920271
*/
2029020272
static void shellUSleepFunc(
2029120273
sqlite3_context *context,
@@ -20296,101 +20278,10 @@
2029620278
(void)argcUnused;
2029720279
sqlite3_sleep(sleep/1000);
2029820280
sqlite3_result_int(context, sleep);
2029920281
}
2030020282
20301
-/*
20302
-** Scalar function "shell_escape_crnl" used by the .recover command.
20303
-** The argument passed to this function is the output of built-in
20304
-** function quote(). If the first character of the input is "'",
20305
-** indicating that the value passed to quote() was a text value,
20306
-** then this function searches the input for "\n" and "\r" characters
20307
-** and adds a wrapper similar to the following:
20308
-**
20309
-** replace(replace(<input>, '\n', char(10), '\r', char(13));
20310
-**
20311
-** Or, if the first character of the input is not "'", then a copy
20312
-** of the input is returned.
20313
-*/
20314
-static void shellEscapeCrnl(
20315
- sqlite3_context *context,
20316
- int argc,
20317
- sqlite3_value **argv
20318
-){
20319
- const char *zText = (const char*)sqlite3_value_text(argv[0]);
20320
- UNUSED_PARAMETER(argc);
20321
- if( zText && zText[0]=='\'' ){
20322
- i64 nText = sqlite3_value_bytes(argv[0]);
20323
- i64 i;
20324
- char zBuf1[20];
20325
- char zBuf2[20];
20326
- const char *zNL = 0;
20327
- const char *zCR = 0;
20328
- i64 nCR = 0;
20329
- i64 nNL = 0;
20330
-
20331
- for(i=0; zText[i]; i++){
20332
- if( zNL==0 && zText[i]=='\n' ){
20333
- zNL = unused_string(zText, "\\n", "\\012", zBuf1);
20334
- nNL = strlen(zNL);
20335
- }
20336
- if( zCR==0 && zText[i]=='\r' ){
20337
- zCR = unused_string(zText, "\\r", "\\015", zBuf2);
20338
- nCR = strlen(zCR);
20339
- }
20340
- }
20341
-
20342
- if( zNL || zCR ){
20343
- i64 iOut = 0;
20344
- i64 nMax = (nNL > nCR) ? nNL : nCR;
20345
- i64 nAlloc = nMax * nText + (nMax+64)*2;
20346
- char *zOut = (char*)sqlite3_malloc64(nAlloc);
20347
- if( zOut==0 ){
20348
- sqlite3_result_error_nomem(context);
20349
- return;
20350
- }
20351
-
20352
- if( zNL && zCR ){
20353
- memcpy(&zOut[iOut], "replace(replace(", 16);
20354
- iOut += 16;
20355
- }else{
20356
- memcpy(&zOut[iOut], "replace(", 8);
20357
- iOut += 8;
20358
- }
20359
- for(i=0; zText[i]; i++){
20360
- if( zText[i]=='\n' ){
20361
- memcpy(&zOut[iOut], zNL, nNL);
20362
- iOut += nNL;
20363
- }else if( zText[i]=='\r' ){
20364
- memcpy(&zOut[iOut], zCR, nCR);
20365
- iOut += nCR;
20366
- }else{
20367
- zOut[iOut] = zText[i];
20368
- iOut++;
20369
- }
20370
- }
20371
-
20372
- if( zNL ){
20373
- memcpy(&zOut[iOut], ",'", 2); iOut += 2;
20374
- memcpy(&zOut[iOut], zNL, nNL); iOut += nNL;
20375
- memcpy(&zOut[iOut], "', char(10))", 12); iOut += 12;
20376
- }
20377
- if( zCR ){
20378
- memcpy(&zOut[iOut], ",'", 2); iOut += 2;
20379
- memcpy(&zOut[iOut], zCR, nCR); iOut += nCR;
20380
- memcpy(&zOut[iOut], "', char(13))", 12); iOut += 12;
20381
- }
20382
-
20383
- sqlite3_result_text(context, zOut, iOut, SQLITE_TRANSIENT);
20384
- sqlite3_free(zOut);
20385
- return;
20386
- }
20387
- }
20388
-
20389
- sqlite3_result_value(context, argv[0]);
20390
-}
20391
-
2039220283
/* Flags for open_db().
2039320284
**
2039420285
** The default behavior of open_db() is to exit(1) if the database fails to
2039520286
** open. The OPEN_DB_KEEPALIVE flag changes that so that it prints an error
2039620287
** but still returns without calling exit.
@@ -20452,10 +20343,11 @@
2045220343
sqlite3_open(":memory:", &p->db);
2045320344
return;
2045420345
}
2045520346
exit(1);
2045620347
}
20348
+ sqlite3_db_config(p->db, SQLITE_DBCONFIG_STMT_SCANSTATUS, (int)0, (int*)0);
2045720349
2045820350
#ifndef SQLITE_OMIT_LOAD_EXTENSION
2045920351
sqlite3_enable_load_extension(p->db, 1);
2046020352
#endif
2046120353
sqlite3_shathree_init(p->db, 0, 0);
@@ -20464,17 +20356,17 @@
2046420356
sqlite3_base64_init(p->db, 0, 0);
2046520357
sqlite3_base85_init(p->db, 0, 0);
2046620358
sqlite3_regexp_init(p->db, 0, 0);
2046720359
sqlite3_ieee_init(p->db, 0, 0);
2046820360
sqlite3_series_init(p->db, 0, 0);
20361
+#if SQLITE_SHELL_HAVE_RECOVER
20362
+ sqlite3_dbdata_init(p->db, 0, 0);
20363
+#endif
2046920364
#ifndef SQLITE_SHELL_FIDDLE
2047020365
sqlite3_fileio_init(p->db, 0, 0);
2047120366
sqlite3_completion_init(p->db, 0, 0);
2047220367
#endif
20473
-#if SQLITE_SHELL_HAVE_RECOVER
20474
- sqlite3_dbdata_init(p->db, 0, 0);
20475
-#endif
2047620368
#ifdef SQLITE_HAVE_ZLIB
2047720369
if( !p->bSafeModePersist ){
2047820370
sqlite3_zipfile_init(p->db, 0, 0);
2047920371
sqlite3_sqlar_init(p->db, 0, 0);
2048020372
}
@@ -20511,16 +20403,10 @@
2051120403
shellAddSchemaName, 0, 0);
2051220404
sqlite3_create_function(p->db, "shell_module_schema", 1, SQLITE_UTF8, 0,
2051320405
shellModuleSchema, 0, 0);
2051420406
sqlite3_create_function(p->db, "shell_putsnl", 1, SQLITE_UTF8, p,
2051520407
shellPutsFunc, 0, 0);
20516
- sqlite3_create_function(p->db, "shell_escape_crnl", 1, SQLITE_UTF8, 0,
20517
- shellEscapeCrnl, 0, 0);
20518
- sqlite3_create_function(p->db, "shell_int32", 2, SQLITE_UTF8, 0,
20519
- shellInt32, 0, 0);
20520
- sqlite3_create_function(p->db, "shell_idquote", 1, SQLITE_UTF8, 0,
20521
- shellIdQuote, 0, 0);
2052220408
sqlite3_create_function(p->db, "usleep",1,SQLITE_UTF8,0,
2052320409
shellUSleepFunc, 0, 0);
2052420410
#ifndef SQLITE_NOHAVE_SYSTEM
2052520411
sqlite3_create_function(p->db, "edit", 1, SQLITE_UTF8, 0,
2052620412
editFunc, 0, 0);
@@ -20543,13 +20429,13 @@
2054320429
unsigned char *aData;
2054420430
if( p->openMode==SHELL_OPEN_DESERIALIZE ){
2054520431
aData = (unsigned char*)readFile(zDbFilename, &nData);
2054620432
}else{
2054720433
aData = readHexDb(p, &nData);
20548
- if( aData==0 ){
20549
- return;
20550
- }
20434
+ }
20435
+ if( aData==0 ){
20436
+ return;
2055120437
}
2055220438
rc = sqlite3_deserialize(p->db, "main", aData, nData, nData,
2055320439
SQLITE_DESERIALIZE_RESIZEABLE |
2055420440
SQLITE_DESERIALIZE_FREEONCLOSE);
2055520441
if( rc ){
@@ -20559,12 +20445,17 @@
2055920445
sqlite3_file_control(p->db, "main", SQLITE_FCNTL_SIZE_LIMIT, &p->szMax);
2056020446
}
2056120447
}
2056220448
#endif
2056320449
}
20564
- if( p->bSafeModePersist && p->db!=0 ){
20565
- sqlite3_set_authorizer(p->db, safeModeAuth, p);
20450
+ if( p->db!=0 ){
20451
+ if( p->bSafeModePersist ){
20452
+ sqlite3_set_authorizer(p->db, safeModeAuth, p);
20453
+ }
20454
+ sqlite3_db_config(
20455
+ p->db, SQLITE_DBCONFIG_STMT_SCANSTATUS, p->scanstatsOn, (int*)0
20456
+ );
2056620457
}
2056720458
}
2056820459
2056920460
/*
2057020461
** Attempt to close the databaes connection. Report errors.
@@ -21283,11 +21174,11 @@
2128321174
}
2128421175
sqlite3_finalize(pStmt);
2128521176
return res;
2128621177
}
2128721178
21288
-#if defined(SQLITE_SHELL_HAVE_RECOVER)
21179
+#if SQLITE_SHELL_HAVE_RECOVER
2128921180
/*
2129021181
** Convert a 2-byte or 4-byte big-endian integer into a native integer
2129121182
*/
2129221183
static unsigned int get2byteInt(unsigned char *a){
2129321184
return (a[0]<<8) + a[1];
@@ -23179,11 +23070,10 @@
2317923070
output_reset(p);
2318023071
if( nArg!=2 ){
2318123072
raw_printf(stderr, "Usage: .check GLOB-PATTERN\n");
2318223073
rc = 2;
2318323074
}else if( (zRes = readFile("testcase-out.txt", 0))==0 ){
23184
- raw_printf(stderr, "Error: cannot read 'testcase-out.txt'\n");
2318523075
rc = 2;
2318623076
}else if( testcase_glob(azArg[1],zRes)==0 ){
2318723077
utf8_printf(stderr,
2318823078
"testcase-%s FAILED\n Expected: [%s]\n Got: [%s]\n",
2318923079
p->zTestcase, azArg[1], zRes);
@@ -23309,10 +23199,12 @@
2330923199
{ "legacy_alter_table", SQLITE_DBCONFIG_LEGACY_ALTER_TABLE },
2331023200
{ "legacy_file_format", SQLITE_DBCONFIG_LEGACY_FILE_FORMAT },
2331123201
{ "load_extension", SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION },
2331223202
{ "no_ckpt_on_close", SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE },
2331323203
{ "reset_database", SQLITE_DBCONFIG_RESET_DATABASE },
23204
+ { "reverse_scanorder", SQLITE_DBCONFIG_REVERSE_SCANORDER },
23205
+ { "stmt_scanstatus", SQLITE_DBCONFIG_STMT_SCANSTATUS },
2331423206
{ "trigger_eqp", SQLITE_DBCONFIG_TRIGGER_EQP },
2331523207
{ "trusted_schema", SQLITE_DBCONFIG_TRUSTED_SCHEMA },
2331623208
{ "writable_schema", SQLITE_DBCONFIG_WRITABLE_SCHEMA },
2331723209
};
2331823210
int ii, v;
@@ -24258,23 +24150,29 @@
2425824150
rc = 1;
2425924151
}
2426024152
}else
2426124153
#endif
2426224154
24263
-#ifndef SQLITE_SHELL_FIDDLE
2426424155
if( c=='l' && cli_strncmp(azArg[0], "log", n)==0 ){
24265
- failIfSafeMode(p, "cannot run .log in safe mode");
2426624156
if( nArg!=2 ){
2426724157
raw_printf(stderr, "Usage: .log FILENAME\n");
2426824158
rc = 1;
2426924159
}else{
2427024160
const char *zFile = azArg[1];
24161
+ if( p->bSafeMode
24162
+ && cli_strcmp(zFile,"on")!=0
24163
+ && cli_strcmp(zFile,"off")!=0
24164
+ ){
24165
+ raw_printf(stdout, "cannot set .log to anything other "
24166
+ "than \"on\" or \"off\"\n");
24167
+ zFile = "off";
24168
+ }
2427124169
output_file_close(p->pLog);
24170
+ if( cli_strcmp(zFile,"on")==0 ) zFile = "stdout";
2427224171
p->pLog = output_file_open(zFile, 0);
2427324172
}
2427424173
}else
24275
-#endif
2427624174
2427724175
if( c=='m' && cli_strncmp(azArg[0], "mode", n)==0 ){
2427824176
const char *zMode = 0;
2427924177
const char *zTabname = 0;
2428024178
int i, n2;
@@ -24906,10 +24804,14 @@
2490624804
if( cli_strcmp(azArg[1], "est")==0 ){
2490724805
p->scanstatsOn = 2;
2490824806
}else{
2490924807
p->scanstatsOn = (u8)booleanValue(azArg[1]);
2491024808
}
24809
+ open_db(p, 0);
24810
+ sqlite3_db_config(
24811
+ p->db, SQLITE_DBCONFIG_STMT_SCANSTATUS, p->scanstatsOn, (int*)0
24812
+ );
2491124813
#ifndef SQLITE_ENABLE_STMT_SCANSTATUS
2491224814
raw_printf(stderr, "Warning: .scanstats not available in this build.\n");
2491324815
#endif
2491424816
}else{
2491524817
raw_printf(stderr, "Usage: .scanstats on|off|est\n");
@@ -26786,10 +26688,11 @@
2678626688
2678726689
/*
2678826690
** Show available command line options
2678926691
*/
2679026692
static const char zOptions[] =
26693
+ " -- treat no subsequent arguments as options\n"
2679126694
#if defined(SQLITE_HAVE_ZLIB) && !defined(SQLITE_OMIT_VIRTUALTABLE)
2679226695
" -A ARGS... run \".archive ARGS\" and exit\n"
2679326696
#endif
2679426697
" -append append the database to the end of the file\n"
2679526698
" -ascii set output mode to 'ascii'\n"
@@ -26848,13 +26751,13 @@
2684826751
" -zip open the file as a ZIP Archive\n"
2684926752
#endif
2685026753
;
2685126754
static void usage(int showDetail){
2685226755
utf8_printf(stderr,
26853
- "Usage: %s [OPTIONS] FILENAME [SQL]\n"
26756
+ "Usage: %s [OPTIONS] [FILENAME [SQL]]\n"
2685426757
"FILENAME is the name of an SQLite database. A new database is created\n"
26855
- "if the file does not previously exist.\n", Argv0);
26758
+ "if the file does not previously exist. Defaults to :memory:.\n", Argv0);
2685626759
if( showDetail ){
2685726760
utf8_printf(stderr, "OPTIONS include:\n%s", zOptions);
2685826761
}else{
2685926762
raw_printf(stderr, "Use the -help option for additional information\n");
2686026763
}
@@ -26882,13 +26785,15 @@
2688226785
data->pAuxDb = &data->aAuxDb[0];
2688326786
memcpy(data->colSeparator,SEP_Column, 2);
2688426787
memcpy(data->rowSeparator,SEP_Row, 2);
2688526788
data->showHeader = 0;
2688626789
data->shellFlgs = SHFLG_Lookaside;
26790
+ sqlite3_config(SQLITE_CONFIG_LOG, shellLog, data);
26791
+#if !defined(SQLITE_SHELL_FIDDLE)
2688726792
verify_uninitialized();
26793
+#endif
2688826794
sqlite3_config(SQLITE_CONFIG_URI, 1);
26889
- sqlite3_config(SQLITE_CONFIG_LOG, shellLog, data);
2689026795
sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
2689126796
sqlite3_snprintf(sizeof(mainPrompt), mainPrompt,"sqlite> ");
2689226797
sqlite3_snprintf(sizeof(continuePrompt), continuePrompt," ...> ");
2689326798
}
2689426799
@@ -26961,10 +26866,11 @@
2696126866
int i;
2696226867
int rc = 0;
2696326868
int warnInmemoryDb = 0;
2696426869
int readStdin = 1;
2696526870
int nCmd = 0;
26871
+ int nOptsEnd = argc;
2696626872
char **azCmd = 0;
2696726873
const char *zVfs = 0; /* Value of -vfs command-line option */
2696826874
#if !SQLITE_SHELL_IS_UTF8
2696926875
char **argvToFree = 0;
2697026876
int argcToFree = 0;
@@ -27064,15 +26970,17 @@
2706426970
/* Do an initial pass through the command-line argument to locate
2706526971
** the name of the database file, the name of the initialization file,
2706626972
** the size of the alternative malloc heap,
2706726973
** and the first command to execute.
2706826974
*/
26975
+#ifndef SQLITE_SHELL_FIDDLE
2706926976
verify_uninitialized();
26977
+#endif
2707026978
for(i=1; i<argc; i++){
2707126979
char *z;
2707226980
z = argv[i];
27073
- if( z[0]!='-' ){
26981
+ if( z[0]!='-' || i>nOptsEnd ){
2707426982
if( data.aAuxDb->zDbFilename==0 ){
2707526983
data.aAuxDb->zDbFilename = z;
2707626984
}else{
2707726985
/* Excesss arguments are interpreted as SQL (or dot-commands) and
2707826986
** mean that nothing is read from stdin */
@@ -27080,13 +26988,17 @@
2708026988
nCmd++;
2708126989
azCmd = realloc(azCmd, sizeof(azCmd[0])*nCmd);
2708226990
shell_check_oom(azCmd);
2708326991
azCmd[nCmd-1] = z;
2708426992
}
26993
+ continue;
2708526994
}
2708626995
if( z[1]=='-' ) z++;
27087
- if( cli_strcmp(z,"-separator")==0
26996
+ if( cli_strcmp(z, "-")==0 ){
26997
+ nOptsEnd = i;
26998
+ continue;
26999
+ }else if( cli_strcmp(z,"-separator")==0
2708827000
|| cli_strcmp(z,"-nullvalue")==0
2708927001
|| cli_strcmp(z,"-newline")==0
2709027002
|| cli_strcmp(z,"-cmd")==0
2709127003
){
2709227004
(void)cmdline_option_value(argc, argv, ++i);
@@ -27104,10 +27016,11 @@
2710427016
sqlite3_int64 szHeap;
2710527017
2710627018
zSize = cmdline_option_value(argc, argv, ++i);
2710727019
szHeap = integerValue(zSize);
2710827020
if( szHeap>0x7fff0000 ) szHeap = 0x7fff0000;
27021
+ verify_uninitialized();
2710927022
sqlite3_config(SQLITE_CONFIG_HEAP, malloc((int)szHeap), (int)szHeap, 64);
2711027023
#else
2711127024
(void)cmdline_option_value(argc, argv, ++i);
2711227025
#endif
2711327026
}else if( cli_strcmp(z,"-pagecache")==0 ){
@@ -27117,24 +27030,27 @@
2711727030
if( sz<0 ) sz = 0;
2711827031
n = integerValue(cmdline_option_value(argc,argv,++i));
2711927032
if( sz>0 && n>0 && 0xffffffffffffLL/sz<n ){
2712027033
n = 0xffffffffffffLL/sz;
2712127034
}
27035
+ verify_uninitialized();
2712227036
sqlite3_config(SQLITE_CONFIG_PAGECACHE,
2712327037
(n>0 && sz>0) ? malloc(n*sz) : 0, sz, n);
2712427038
data.shellFlgs |= SHFLG_Pagecache;
2712527039
}else if( cli_strcmp(z,"-lookaside")==0 ){
2712627040
int n, sz;
2712727041
sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
2712827042
if( sz<0 ) sz = 0;
2712927043
n = (int)integerValue(cmdline_option_value(argc,argv,++i));
2713027044
if( n<0 ) n = 0;
27045
+ verify_uninitialized();
2713127046
sqlite3_config(SQLITE_CONFIG_LOOKASIDE, sz, n);
2713227047
if( sz*n==0 ) data.shellFlgs &= ~SHFLG_Lookaside;
2713327048
}else if( cli_strcmp(z,"-threadsafe")==0 ){
2713427049
int n;
2713527050
n = (int)integerValue(cmdline_option_value(argc,argv,++i));
27051
+ verify_uninitialized();
2713627052
switch( n ){
2713727053
case 0: sqlite3_config(SQLITE_CONFIG_SINGLETHREAD); break;
2713827054
case 2: sqlite3_config(SQLITE_CONFIG_MULTITHREAD); break;
2713927055
default: sqlite3_config(SQLITE_CONFIG_SERIALIZED); break;
2714027056
}
@@ -27154,14 +27070,16 @@
2715427070
extern int sqlite3_multiple_initialize(const char*,int);
2715527071
sqlite3_multiplex_initialize(0, 1);
2715627072
#endif
2715727073
}else if( cli_strcmp(z,"-mmap")==0 ){
2715827074
sqlite3_int64 sz = integerValue(cmdline_option_value(argc,argv,++i));
27075
+ verify_uninitialized();
2715927076
sqlite3_config(SQLITE_CONFIG_MMAP_SIZE, sz, sz);
27160
-#ifdef SQLITE_ENABLE_SORTER_REFERENCES
27077
+#if defined(SQLITE_ENABLE_SORTER_REFERENCES)
2716127078
}else if( cli_strcmp(z,"-sorterref")==0 ){
2716227079
sqlite3_int64 sz = integerValue(cmdline_option_value(argc,argv,++i));
27080
+ verify_uninitialized();
2716327081
sqlite3_config(SQLITE_CONFIG_SORTERREF_SIZE, (int)sz);
2716427082
#endif
2716527083
}else if( cli_strcmp(z,"-vfs")==0 ){
2716627084
zVfs = cmdline_option_value(argc, argv, ++i);
2716727085
#ifdef SQLITE_HAVE_ZLIB
@@ -27195,11 +27113,13 @@
2719527113
data.zNonce = strdup(argv[++i]);
2719627114
}else if( cli_strcmp(z,"-safe")==0 ){
2719727115
/* no-op - catch this on the second pass */
2719827116
}
2719927117
}
27118
+#ifndef SQLITE_SHELL_FIDDLE
2720027119
verify_uninitialized();
27120
+#endif
2720127121
2720227122
2720327123
#ifdef SQLITE_SHELL_INIT_PROC
2720427124
{
2720527125
/* If the SQLITE_SHELL_INIT_PROC macro is defined, then it is the name
@@ -27259,11 +27179,11 @@
2725927179
** file is processed so that the command-line arguments will override
2726027180
** settings in the initialization file.
2726127181
*/
2726227182
for(i=1; i<argc; i++){
2726327183
char *z = argv[i];
27264
- if( z[0]!='-' ) continue;
27184
+ if( z[0]!='-' || i>=nOptsEnd ) continue;
2726527185
if( z[1]=='-' ){ z++; }
2726627186
if( cli_strcmp(z,"-init")==0 ){
2726727187
i++;
2726827188
}else if( cli_strcmp(z,"-html")==0 ){
2726927189
data.mode = MODE_Html;
@@ -27443,10 +27363,11 @@
2744327363
free(azCmd);
2744427364
return rc==2 ? 0 : rc;
2744527365
}
2744627366
}else{
2744727367
open_db(&data, 0);
27368
+ echo_group_input(&data, azCmd[i]);
2744827369
rc = shell_exec(&data, azCmd[i], &zErrMsg);
2744927370
if( zErrMsg || rc ){
2745027371
if( zErrMsg!=0 ){
2745127372
utf8_printf(stderr,"Error: %s\n", zErrMsg);
2745227373
}else{
2745327374
--- extsrc/shell.c
+++ extsrc/shell.c
@@ -115,10 +115,11 @@
115
116 #include <stdlib.h>
117 #include <string.h>
118 #include <stdio.h>
119 #include <assert.h>
 
120 #include "sqlite3.h"
121 typedef sqlite3_int64 i64;
122 typedef sqlite3_uint64 u64;
123 typedef unsigned char u8;
124 #if SQLITE_USER_AUTHENTICATION
@@ -3171,10 +3172,11 @@
3171 #ifndef U8_TYPEDEF
3172 /* typedef unsigned char u8; */
3173 #define U8_TYPEDEF
3174 #endif
3175
 
3176 static const u8 b64DigitValues[128] = {
3177 /* HT LF VT FF CR */
3178 ND,ND,ND,ND, ND,ND,ND,ND, ND,WS,WS,WS, WS,WS,ND,ND,
3179 /* US */
3180 ND,ND,ND,ND, ND,ND,ND,ND, ND,ND,ND,ND, ND,ND,ND,ND,
@@ -8771,11 +8773,14 @@
8771 }else{
8772 /* Figure out if this is a directory or a zero-sized file. Consider
8773 ** it to be a directory either if the mode suggests so, or if
8774 ** the final character in the name is '/'. */
8775 u32 mode = pCDS->iExternalAttr >> 16;
8776 if( !(mode & S_IFDIR) && pCDS->zFile[pCDS->nFile-1]!='/' ){
 
 
 
8777 sqlite3_result_blob(ctx, "", 0, SQLITE_STATIC);
8778 }
8779 }
8780 }
8781 break;
@@ -12505,11 +12510,10 @@
12505 #endif
12506
12507 #endif /* ifndef _SQLITE_RECOVER_H */
12508
12509 /************************* End ../ext/recover/sqlite3recover.h ********************/
12510 # ifndef SQLITE_HAVE_SQLITE3R
12511 /************************* Begin ../ext/recover/dbdata.c ******************/
12512 /*
12513 ** 2019-04-17
12514 **
12515 ** The author disclaims copyright to this source code. In place of
@@ -12676,10 +12680,11 @@
12676 int rc = sqlite3_declare_vtab(db, pAux ? DBPTR_SCHEMA : DBDATA_SCHEMA);
12677
12678 (void)argc;
12679 (void)argv;
12680 (void)pzErr;
 
12681 if( rc==SQLITE_OK ){
12682 pTab = (DbdataTable*)sqlite3_malloc64(sizeof(DbdataTable));
12683 if( pTab==0 ){
12684 rc = SQLITE_NOMEM;
12685 }else{
@@ -13021,14 +13026,18 @@
13021 if( pCsr->aPage==0 ){
13022 while( 1 ){
13023 if( pCsr->bOnePage==0 && pCsr->iPgno>pCsr->szDb ) return SQLITE_OK;
13024 rc = dbdataLoadPage(pCsr, pCsr->iPgno, &pCsr->aPage, &pCsr->nPage);
13025 if( rc!=SQLITE_OK ) return rc;
13026 if( pCsr->aPage ) break;
 
 
13027 if( pCsr->bOnePage ) return SQLITE_OK;
13028 pCsr->iPgno++;
13029 }
 
 
13030 pCsr->iCell = pTab->bPtr ? -2 : 0;
13031 pCsr->nCell = get_uint16(&pCsr->aPage[iOff+3]);
13032 }
13033
13034 if( pTab->bPtr ){
@@ -13259,12 +13268,11 @@
13259 static int dbdataGetEncoding(DbdataCursor *pCsr){
13260 int rc = SQLITE_OK;
13261 int nPg1 = 0;
13262 u8 *aPg1 = 0;
13263 rc = dbdataLoadPage(pCsr, 1, &aPg1, &nPg1);
13264 assert( rc!=SQLITE_OK || nPg1==0 || nPg1>=512 );
13265 if( rc==SQLITE_OK && nPg1>0 ){
13266 pCsr->enc = get_uint32(&aPg1[56]);
13267 }
13268 sqlite3_free(aPg1);
13269 return rc;
13270 }
@@ -13318,19 +13326,21 @@
13318 );
13319 }
13320 }
13321 if( rc==SQLITE_OK ){
13322 rc = sqlite3_bind_text(pCsr->pStmt, 1, zSchema, -1, SQLITE_TRANSIENT);
13323 }else{
13324 pTab->base.zErrMsg = sqlite3_mprintf("%s", sqlite3_errmsg(pTab->db));
13325 }
13326
13327 /* Try to determine the encoding of the db by inspecting the header
13328 ** field on page 1. */
13329 if( rc==SQLITE_OK ){
13330 rc = dbdataGetEncoding(pCsr);
13331 }
 
 
 
 
13332
13333 if( rc==SQLITE_OK ){
13334 rc = dbdataNext(pCursor);
13335 }
13336 return rc;
@@ -16330,11 +16340,10 @@
16330 }
16331
16332 #endif /* ifndef SQLITE_OMIT_VIRTUALTABLE */
16333
16334 /************************* End ../ext/recover/sqlite3recover.c ********************/
16335 # endif
16336 #endif
16337 #ifdef SQLITE_SHELL_EXTSRC
16338 # include SHELL_STRINGIFY(SQLITE_SHELL_EXTSRC)
16339 #endif
16340
@@ -17233,10 +17242,11 @@
17233 const char *zOrig = z;
17234 static const char *azTerm[] = { "", "*/", "\n" };
17235 int i;
17236 for(i=0; i<ArraySize(azTerm); i++){
17237 char *zNew = sqlite3_mprintf("%s%s;", zOrig, azTerm[i]);
 
17238 if( sqlite3_complete(zNew) ){
17239 size_t n = strlen(zNew);
17240 zNew[n-1] = 0;
17241 zToFree = zNew;
17242 z = zNew;
@@ -17667,13 +17677,13 @@
17667 char z[50];
17668 double r = sqlite3_column_double(p->pStmt, i);
17669 sqlite3_uint64 ur;
17670 memcpy(&ur,&r,sizeof(r));
17671 if( ur==0x7ff0000000000000LL ){
17672 raw_printf(p->out, "1e999");
17673 }else if( ur==0xfff0000000000000LL ){
17674 raw_printf(p->out, "-1e999");
17675 }else{
17676 sqlite3_int64 ir = (sqlite3_int64)r;
17677 if( r==(double)ir ){
17678 sqlite3_snprintf(50,z,"%lld.0", ir);
17679 }else{
@@ -17713,13 +17723,13 @@
17713 char z[50];
17714 double r = sqlite3_column_double(p->pStmt, i);
17715 sqlite3_uint64 ur;
17716 memcpy(&ur,&r,sizeof(r));
17717 if( ur==0x7ff0000000000000LL ){
17718 raw_printf(p->out, "1e999");
17719 }else if( ur==0xfff0000000000000LL ){
17720 raw_printf(p->out, "-1e999");
17721 }else{
17722 sqlite3_snprintf(50,z,"%!.20g", r);
17723 raw_printf(p->out, "%s", z);
17724 }
17725 }else if( aiType && aiType[i]==SQLITE_BLOB && p->pStmt ){
@@ -17919,10 +17929,11 @@
17919 char *zMsg;
17920 int i;
17921 if( db==0
17922 || zSql==0
17923 || (iOffset = sqlite3_error_offset(db))<0
 
17924 ){
17925 return sqlite3_mprintf("");
17926 }
17927 while( iOffset>50 ){
17928 iOffset--;
@@ -17930,11 +17941,11 @@
17930 while( (zSql[0]&0xc0)==0x80 ){ zSql++; iOffset--; }
17931 }
17932 len = strlen(zSql);
17933 if( len>78 ){
17934 len = 78;
17935 while( (zSql[len]&0xc0)==0x80 ) len--;
17936 }
17937 zCode = sqlite3_mprintf("%.*s", len, zSql);
17938 shell_check_oom(zCode);
17939 for(i=0; zCode[i]; i++){ if( IsSpace(zSql[i]) ) zCode[i] = ' '; }
17940 if( iOffset<25 ){
@@ -18531,26 +18542,31 @@
18531
18532 nVar = sqlite3_bind_parameter_count(pStmt);
18533 if( nVar==0 ) return; /* Nothing to do */
18534 if( sqlite3_table_column_metadata(pArg->db, "TEMP", "sqlite_parameters",
18535 "key", 0, 0, 0, 0, 0)!=SQLITE_OK ){
18536 return; /* Parameter table does not exist */
 
 
 
 
 
18537 }
18538 rc = sqlite3_prepare_v2(pArg->db,
18539 "SELECT value FROM temp.sqlite_parameters"
18540 " WHERE key=?1", -1, &pQ, 0);
18541 if( rc || pQ==0 ) return;
18542 for(i=1; i<=nVar; i++){
18543 char zNum[30];
18544 const char *zVar = sqlite3_bind_parameter_name(pStmt, i);
18545 if( zVar==0 ){
18546 sqlite3_snprintf(sizeof(zNum),zNum,"?%d",i);
18547 zVar = zNum;
18548 }
18549 sqlite3_bind_text(pQ, 1, zVar, -1, SQLITE_STATIC);
18550 if( sqlite3_step(pQ)==SQLITE_ROW ){
18551 sqlite3_bind_value(pStmt, i, sqlite3_column_value(pQ, 0));
 
 
 
 
18552 }else{
18553 sqlite3_bind_null(pStmt, i);
18554 }
18555 sqlite3_reset(pQ);
18556 }
@@ -19768,12 +19784,14 @@
19768 " Options:",
19769 " fkey-indexes Find missing foreign key indexes",
19770 #if !defined(SQLITE_OMIT_LOAD_EXTENSION) && !defined(SQLITE_SHELL_FIDDLE)
19771 ".load FILE ?ENTRY? Load an extension library",
19772 #endif
19773 #ifndef SQLITE_SHELL_FIDDLE
19774 ".log FILE|off Turn logging on or off. FILE can be stderr/stdout",
 
 
19775 #endif
19776 ".mode MODE ?OPTIONS? Set output mode",
19777 " MODE is one of:",
19778 " ascii Columns/rows delimited by 0x1F and 0x1E",
19779 " box Tables using unicode box-drawing characters",
@@ -20037,20 +20055,31 @@
20037 static char *readFile(const char *zName, int *pnByte){
20038 FILE *in = fopen(zName, "rb");
20039 long nIn;
20040 size_t nRead;
20041 char *pBuf;
 
20042 if( in==0 ) return 0;
20043 fseek(in, 0, SEEK_END);
 
 
 
 
 
20044 nIn = ftell(in);
20045 rewind(in);
20046 pBuf = sqlite3_malloc64( nIn+1 );
20047 if( pBuf==0 ){ fclose(in); return 0; }
 
 
 
 
20048 nRead = fread(pBuf, nIn, 1, in);
20049 fclose(in);
20050 if( nRead!=1 ){
20051 sqlite3_free(pBuf);
 
20052 return 0;
20053 }
20054 pBuf[nIn] = 0;
20055 if( pnByte ) *pnByte = nIn;
20056 return pBuf;
@@ -20235,57 +20264,10 @@
20235 utf8_printf(stderr,"Error on line %d of --hexdb input\n", nLine);
20236 return 0;
20237 }
20238 #endif /* SQLITE_OMIT_DESERIALIZE */
20239
20240 /*
20241 ** Scalar function "shell_int32". The first argument to this function
20242 ** must be a blob. The second a non-negative integer. This function
20243 ** reads and returns a 32-bit big-endian integer from byte
20244 ** offset (4*<arg2>) of the blob.
20245 */
20246 static void shellInt32(
20247 sqlite3_context *context,
20248 int argc,
20249 sqlite3_value **argv
20250 ){
20251 const unsigned char *pBlob;
20252 int nBlob;
20253 int iInt;
20254
20255 UNUSED_PARAMETER(argc);
20256 nBlob = sqlite3_value_bytes(argv[0]);
20257 pBlob = (const unsigned char*)sqlite3_value_blob(argv[0]);
20258 iInt = sqlite3_value_int(argv[1]);
20259
20260 if( iInt>=0 && (iInt+1)*4<=nBlob ){
20261 const unsigned char *a = &pBlob[iInt*4];
20262 sqlite3_int64 iVal = ((sqlite3_int64)a[0]<<24)
20263 + ((sqlite3_int64)a[1]<<16)
20264 + ((sqlite3_int64)a[2]<< 8)
20265 + ((sqlite3_int64)a[3]<< 0);
20266 sqlite3_result_int64(context, iVal);
20267 }
20268 }
20269
20270 /*
20271 ** Scalar function "shell_idquote(X)" returns string X quoted as an identifier,
20272 ** using "..." with internal double-quote characters doubled.
20273 */
20274 static void shellIdQuote(
20275 sqlite3_context *context,
20276 int argc,
20277 sqlite3_value **argv
20278 ){
20279 const char *zName = (const char*)sqlite3_value_text(argv[0]);
20280 UNUSED_PARAMETER(argc);
20281 if( zName ){
20282 char *z = sqlite3_mprintf("\"%w\"", zName);
20283 sqlite3_result_text(context, z, -1, sqlite3_free);
20284 }
20285 }
20286
20287 /*
20288 ** Scalar function "usleep(X)" invokes sqlite3_sleep(X) and returns X.
20289 */
20290 static void shellUSleepFunc(
20291 sqlite3_context *context,
@@ -20296,101 +20278,10 @@
20296 (void)argcUnused;
20297 sqlite3_sleep(sleep/1000);
20298 sqlite3_result_int(context, sleep);
20299 }
20300
20301 /*
20302 ** Scalar function "shell_escape_crnl" used by the .recover command.
20303 ** The argument passed to this function is the output of built-in
20304 ** function quote(). If the first character of the input is "'",
20305 ** indicating that the value passed to quote() was a text value,
20306 ** then this function searches the input for "\n" and "\r" characters
20307 ** and adds a wrapper similar to the following:
20308 **
20309 ** replace(replace(<input>, '\n', char(10), '\r', char(13));
20310 **
20311 ** Or, if the first character of the input is not "'", then a copy
20312 ** of the input is returned.
20313 */
20314 static void shellEscapeCrnl(
20315 sqlite3_context *context,
20316 int argc,
20317 sqlite3_value **argv
20318 ){
20319 const char *zText = (const char*)sqlite3_value_text(argv[0]);
20320 UNUSED_PARAMETER(argc);
20321 if( zText && zText[0]=='\'' ){
20322 i64 nText = sqlite3_value_bytes(argv[0]);
20323 i64 i;
20324 char zBuf1[20];
20325 char zBuf2[20];
20326 const char *zNL = 0;
20327 const char *zCR = 0;
20328 i64 nCR = 0;
20329 i64 nNL = 0;
20330
20331 for(i=0; zText[i]; i++){
20332 if( zNL==0 && zText[i]=='\n' ){
20333 zNL = unused_string(zText, "\\n", "\\012", zBuf1);
20334 nNL = strlen(zNL);
20335 }
20336 if( zCR==0 && zText[i]=='\r' ){
20337 zCR = unused_string(zText, "\\r", "\\015", zBuf2);
20338 nCR = strlen(zCR);
20339 }
20340 }
20341
20342 if( zNL || zCR ){
20343 i64 iOut = 0;
20344 i64 nMax = (nNL > nCR) ? nNL : nCR;
20345 i64 nAlloc = nMax * nText + (nMax+64)*2;
20346 char *zOut = (char*)sqlite3_malloc64(nAlloc);
20347 if( zOut==0 ){
20348 sqlite3_result_error_nomem(context);
20349 return;
20350 }
20351
20352 if( zNL && zCR ){
20353 memcpy(&zOut[iOut], "replace(replace(", 16);
20354 iOut += 16;
20355 }else{
20356 memcpy(&zOut[iOut], "replace(", 8);
20357 iOut += 8;
20358 }
20359 for(i=0; zText[i]; i++){
20360 if( zText[i]=='\n' ){
20361 memcpy(&zOut[iOut], zNL, nNL);
20362 iOut += nNL;
20363 }else if( zText[i]=='\r' ){
20364 memcpy(&zOut[iOut], zCR, nCR);
20365 iOut += nCR;
20366 }else{
20367 zOut[iOut] = zText[i];
20368 iOut++;
20369 }
20370 }
20371
20372 if( zNL ){
20373 memcpy(&zOut[iOut], ",'", 2); iOut += 2;
20374 memcpy(&zOut[iOut], zNL, nNL); iOut += nNL;
20375 memcpy(&zOut[iOut], "', char(10))", 12); iOut += 12;
20376 }
20377 if( zCR ){
20378 memcpy(&zOut[iOut], ",'", 2); iOut += 2;
20379 memcpy(&zOut[iOut], zCR, nCR); iOut += nCR;
20380 memcpy(&zOut[iOut], "', char(13))", 12); iOut += 12;
20381 }
20382
20383 sqlite3_result_text(context, zOut, iOut, SQLITE_TRANSIENT);
20384 sqlite3_free(zOut);
20385 return;
20386 }
20387 }
20388
20389 sqlite3_result_value(context, argv[0]);
20390 }
20391
20392 /* Flags for open_db().
20393 **
20394 ** The default behavior of open_db() is to exit(1) if the database fails to
20395 ** open. The OPEN_DB_KEEPALIVE flag changes that so that it prints an error
20396 ** but still returns without calling exit.
@@ -20452,10 +20343,11 @@
20452 sqlite3_open(":memory:", &p->db);
20453 return;
20454 }
20455 exit(1);
20456 }
 
20457
20458 #ifndef SQLITE_OMIT_LOAD_EXTENSION
20459 sqlite3_enable_load_extension(p->db, 1);
20460 #endif
20461 sqlite3_shathree_init(p->db, 0, 0);
@@ -20464,17 +20356,17 @@
20464 sqlite3_base64_init(p->db, 0, 0);
20465 sqlite3_base85_init(p->db, 0, 0);
20466 sqlite3_regexp_init(p->db, 0, 0);
20467 sqlite3_ieee_init(p->db, 0, 0);
20468 sqlite3_series_init(p->db, 0, 0);
 
 
 
20469 #ifndef SQLITE_SHELL_FIDDLE
20470 sqlite3_fileio_init(p->db, 0, 0);
20471 sqlite3_completion_init(p->db, 0, 0);
20472 #endif
20473 #if SQLITE_SHELL_HAVE_RECOVER
20474 sqlite3_dbdata_init(p->db, 0, 0);
20475 #endif
20476 #ifdef SQLITE_HAVE_ZLIB
20477 if( !p->bSafeModePersist ){
20478 sqlite3_zipfile_init(p->db, 0, 0);
20479 sqlite3_sqlar_init(p->db, 0, 0);
20480 }
@@ -20511,16 +20403,10 @@
20511 shellAddSchemaName, 0, 0);
20512 sqlite3_create_function(p->db, "shell_module_schema", 1, SQLITE_UTF8, 0,
20513 shellModuleSchema, 0, 0);
20514 sqlite3_create_function(p->db, "shell_putsnl", 1, SQLITE_UTF8, p,
20515 shellPutsFunc, 0, 0);
20516 sqlite3_create_function(p->db, "shell_escape_crnl", 1, SQLITE_UTF8, 0,
20517 shellEscapeCrnl, 0, 0);
20518 sqlite3_create_function(p->db, "shell_int32", 2, SQLITE_UTF8, 0,
20519 shellInt32, 0, 0);
20520 sqlite3_create_function(p->db, "shell_idquote", 1, SQLITE_UTF8, 0,
20521 shellIdQuote, 0, 0);
20522 sqlite3_create_function(p->db, "usleep",1,SQLITE_UTF8,0,
20523 shellUSleepFunc, 0, 0);
20524 #ifndef SQLITE_NOHAVE_SYSTEM
20525 sqlite3_create_function(p->db, "edit", 1, SQLITE_UTF8, 0,
20526 editFunc, 0, 0);
@@ -20543,13 +20429,13 @@
20543 unsigned char *aData;
20544 if( p->openMode==SHELL_OPEN_DESERIALIZE ){
20545 aData = (unsigned char*)readFile(zDbFilename, &nData);
20546 }else{
20547 aData = readHexDb(p, &nData);
20548 if( aData==0 ){
20549 return;
20550 }
20551 }
20552 rc = sqlite3_deserialize(p->db, "main", aData, nData, nData,
20553 SQLITE_DESERIALIZE_RESIZEABLE |
20554 SQLITE_DESERIALIZE_FREEONCLOSE);
20555 if( rc ){
@@ -20559,12 +20445,17 @@
20559 sqlite3_file_control(p->db, "main", SQLITE_FCNTL_SIZE_LIMIT, &p->szMax);
20560 }
20561 }
20562 #endif
20563 }
20564 if( p->bSafeModePersist && p->db!=0 ){
20565 sqlite3_set_authorizer(p->db, safeModeAuth, p);
 
 
 
 
 
20566 }
20567 }
20568
20569 /*
20570 ** Attempt to close the databaes connection. Report errors.
@@ -21283,11 +21174,11 @@
21283 }
21284 sqlite3_finalize(pStmt);
21285 return res;
21286 }
21287
21288 #if defined(SQLITE_SHELL_HAVE_RECOVER)
21289 /*
21290 ** Convert a 2-byte or 4-byte big-endian integer into a native integer
21291 */
21292 static unsigned int get2byteInt(unsigned char *a){
21293 return (a[0]<<8) + a[1];
@@ -23179,11 +23070,10 @@
23179 output_reset(p);
23180 if( nArg!=2 ){
23181 raw_printf(stderr, "Usage: .check GLOB-PATTERN\n");
23182 rc = 2;
23183 }else if( (zRes = readFile("testcase-out.txt", 0))==0 ){
23184 raw_printf(stderr, "Error: cannot read 'testcase-out.txt'\n");
23185 rc = 2;
23186 }else if( testcase_glob(azArg[1],zRes)==0 ){
23187 utf8_printf(stderr,
23188 "testcase-%s FAILED\n Expected: [%s]\n Got: [%s]\n",
23189 p->zTestcase, azArg[1], zRes);
@@ -23309,10 +23199,12 @@
23309 { "legacy_alter_table", SQLITE_DBCONFIG_LEGACY_ALTER_TABLE },
23310 { "legacy_file_format", SQLITE_DBCONFIG_LEGACY_FILE_FORMAT },
23311 { "load_extension", SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION },
23312 { "no_ckpt_on_close", SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE },
23313 { "reset_database", SQLITE_DBCONFIG_RESET_DATABASE },
 
 
23314 { "trigger_eqp", SQLITE_DBCONFIG_TRIGGER_EQP },
23315 { "trusted_schema", SQLITE_DBCONFIG_TRUSTED_SCHEMA },
23316 { "writable_schema", SQLITE_DBCONFIG_WRITABLE_SCHEMA },
23317 };
23318 int ii, v;
@@ -24258,23 +24150,29 @@
24258 rc = 1;
24259 }
24260 }else
24261 #endif
24262
24263 #ifndef SQLITE_SHELL_FIDDLE
24264 if( c=='l' && cli_strncmp(azArg[0], "log", n)==0 ){
24265 failIfSafeMode(p, "cannot run .log in safe mode");
24266 if( nArg!=2 ){
24267 raw_printf(stderr, "Usage: .log FILENAME\n");
24268 rc = 1;
24269 }else{
24270 const char *zFile = azArg[1];
 
 
 
 
 
 
 
 
24271 output_file_close(p->pLog);
 
24272 p->pLog = output_file_open(zFile, 0);
24273 }
24274 }else
24275 #endif
24276
24277 if( c=='m' && cli_strncmp(azArg[0], "mode", n)==0 ){
24278 const char *zMode = 0;
24279 const char *zTabname = 0;
24280 int i, n2;
@@ -24906,10 +24804,14 @@
24906 if( cli_strcmp(azArg[1], "est")==0 ){
24907 p->scanstatsOn = 2;
24908 }else{
24909 p->scanstatsOn = (u8)booleanValue(azArg[1]);
24910 }
 
 
 
 
24911 #ifndef SQLITE_ENABLE_STMT_SCANSTATUS
24912 raw_printf(stderr, "Warning: .scanstats not available in this build.\n");
24913 #endif
24914 }else{
24915 raw_printf(stderr, "Usage: .scanstats on|off|est\n");
@@ -26786,10 +26688,11 @@
26786
26787 /*
26788 ** Show available command line options
26789 */
26790 static const char zOptions[] =
 
26791 #if defined(SQLITE_HAVE_ZLIB) && !defined(SQLITE_OMIT_VIRTUALTABLE)
26792 " -A ARGS... run \".archive ARGS\" and exit\n"
26793 #endif
26794 " -append append the database to the end of the file\n"
26795 " -ascii set output mode to 'ascii'\n"
@@ -26848,13 +26751,13 @@
26848 " -zip open the file as a ZIP Archive\n"
26849 #endif
26850 ;
26851 static void usage(int showDetail){
26852 utf8_printf(stderr,
26853 "Usage: %s [OPTIONS] FILENAME [SQL]\n"
26854 "FILENAME is the name of an SQLite database. A new database is created\n"
26855 "if the file does not previously exist.\n", Argv0);
26856 if( showDetail ){
26857 utf8_printf(stderr, "OPTIONS include:\n%s", zOptions);
26858 }else{
26859 raw_printf(stderr, "Use the -help option for additional information\n");
26860 }
@@ -26882,13 +26785,15 @@
26882 data->pAuxDb = &data->aAuxDb[0];
26883 memcpy(data->colSeparator,SEP_Column, 2);
26884 memcpy(data->rowSeparator,SEP_Row, 2);
26885 data->showHeader = 0;
26886 data->shellFlgs = SHFLG_Lookaside;
 
 
26887 verify_uninitialized();
 
26888 sqlite3_config(SQLITE_CONFIG_URI, 1);
26889 sqlite3_config(SQLITE_CONFIG_LOG, shellLog, data);
26890 sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
26891 sqlite3_snprintf(sizeof(mainPrompt), mainPrompt,"sqlite> ");
26892 sqlite3_snprintf(sizeof(continuePrompt), continuePrompt," ...> ");
26893 }
26894
@@ -26961,10 +26866,11 @@
26961 int i;
26962 int rc = 0;
26963 int warnInmemoryDb = 0;
26964 int readStdin = 1;
26965 int nCmd = 0;
 
26966 char **azCmd = 0;
26967 const char *zVfs = 0; /* Value of -vfs command-line option */
26968 #if !SQLITE_SHELL_IS_UTF8
26969 char **argvToFree = 0;
26970 int argcToFree = 0;
@@ -27064,15 +26970,17 @@
27064 /* Do an initial pass through the command-line argument to locate
27065 ** the name of the database file, the name of the initialization file,
27066 ** the size of the alternative malloc heap,
27067 ** and the first command to execute.
27068 */
 
27069 verify_uninitialized();
 
27070 for(i=1; i<argc; i++){
27071 char *z;
27072 z = argv[i];
27073 if( z[0]!='-' ){
27074 if( data.aAuxDb->zDbFilename==0 ){
27075 data.aAuxDb->zDbFilename = z;
27076 }else{
27077 /* Excesss arguments are interpreted as SQL (or dot-commands) and
27078 ** mean that nothing is read from stdin */
@@ -27080,13 +26988,17 @@
27080 nCmd++;
27081 azCmd = realloc(azCmd, sizeof(azCmd[0])*nCmd);
27082 shell_check_oom(azCmd);
27083 azCmd[nCmd-1] = z;
27084 }
 
27085 }
27086 if( z[1]=='-' ) z++;
27087 if( cli_strcmp(z,"-separator")==0
 
 
 
27088 || cli_strcmp(z,"-nullvalue")==0
27089 || cli_strcmp(z,"-newline")==0
27090 || cli_strcmp(z,"-cmd")==0
27091 ){
27092 (void)cmdline_option_value(argc, argv, ++i);
@@ -27104,10 +27016,11 @@
27104 sqlite3_int64 szHeap;
27105
27106 zSize = cmdline_option_value(argc, argv, ++i);
27107 szHeap = integerValue(zSize);
27108 if( szHeap>0x7fff0000 ) szHeap = 0x7fff0000;
 
27109 sqlite3_config(SQLITE_CONFIG_HEAP, malloc((int)szHeap), (int)szHeap, 64);
27110 #else
27111 (void)cmdline_option_value(argc, argv, ++i);
27112 #endif
27113 }else if( cli_strcmp(z,"-pagecache")==0 ){
@@ -27117,24 +27030,27 @@
27117 if( sz<0 ) sz = 0;
27118 n = integerValue(cmdline_option_value(argc,argv,++i));
27119 if( sz>0 && n>0 && 0xffffffffffffLL/sz<n ){
27120 n = 0xffffffffffffLL/sz;
27121 }
 
27122 sqlite3_config(SQLITE_CONFIG_PAGECACHE,
27123 (n>0 && sz>0) ? malloc(n*sz) : 0, sz, n);
27124 data.shellFlgs |= SHFLG_Pagecache;
27125 }else if( cli_strcmp(z,"-lookaside")==0 ){
27126 int n, sz;
27127 sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
27128 if( sz<0 ) sz = 0;
27129 n = (int)integerValue(cmdline_option_value(argc,argv,++i));
27130 if( n<0 ) n = 0;
 
27131 sqlite3_config(SQLITE_CONFIG_LOOKASIDE, sz, n);
27132 if( sz*n==0 ) data.shellFlgs &= ~SHFLG_Lookaside;
27133 }else if( cli_strcmp(z,"-threadsafe")==0 ){
27134 int n;
27135 n = (int)integerValue(cmdline_option_value(argc,argv,++i));
 
27136 switch( n ){
27137 case 0: sqlite3_config(SQLITE_CONFIG_SINGLETHREAD); break;
27138 case 2: sqlite3_config(SQLITE_CONFIG_MULTITHREAD); break;
27139 default: sqlite3_config(SQLITE_CONFIG_SERIALIZED); break;
27140 }
@@ -27154,14 +27070,16 @@
27154 extern int sqlite3_multiple_initialize(const char*,int);
27155 sqlite3_multiplex_initialize(0, 1);
27156 #endif
27157 }else if( cli_strcmp(z,"-mmap")==0 ){
27158 sqlite3_int64 sz = integerValue(cmdline_option_value(argc,argv,++i));
 
27159 sqlite3_config(SQLITE_CONFIG_MMAP_SIZE, sz, sz);
27160 #ifdef SQLITE_ENABLE_SORTER_REFERENCES
27161 }else if( cli_strcmp(z,"-sorterref")==0 ){
27162 sqlite3_int64 sz = integerValue(cmdline_option_value(argc,argv,++i));
 
27163 sqlite3_config(SQLITE_CONFIG_SORTERREF_SIZE, (int)sz);
27164 #endif
27165 }else if( cli_strcmp(z,"-vfs")==0 ){
27166 zVfs = cmdline_option_value(argc, argv, ++i);
27167 #ifdef SQLITE_HAVE_ZLIB
@@ -27195,11 +27113,13 @@
27195 data.zNonce = strdup(argv[++i]);
27196 }else if( cli_strcmp(z,"-safe")==0 ){
27197 /* no-op - catch this on the second pass */
27198 }
27199 }
 
27200 verify_uninitialized();
 
27201
27202
27203 #ifdef SQLITE_SHELL_INIT_PROC
27204 {
27205 /* If the SQLITE_SHELL_INIT_PROC macro is defined, then it is the name
@@ -27259,11 +27179,11 @@
27259 ** file is processed so that the command-line arguments will override
27260 ** settings in the initialization file.
27261 */
27262 for(i=1; i<argc; i++){
27263 char *z = argv[i];
27264 if( z[0]!='-' ) continue;
27265 if( z[1]=='-' ){ z++; }
27266 if( cli_strcmp(z,"-init")==0 ){
27267 i++;
27268 }else if( cli_strcmp(z,"-html")==0 ){
27269 data.mode = MODE_Html;
@@ -27443,10 +27363,11 @@
27443 free(azCmd);
27444 return rc==2 ? 0 : rc;
27445 }
27446 }else{
27447 open_db(&data, 0);
 
27448 rc = shell_exec(&data, azCmd[i], &zErrMsg);
27449 if( zErrMsg || rc ){
27450 if( zErrMsg!=0 ){
27451 utf8_printf(stderr,"Error: %s\n", zErrMsg);
27452 }else{
27453
--- extsrc/shell.c
+++ extsrc/shell.c
@@ -115,10 +115,11 @@
115
116 #include <stdlib.h>
117 #include <string.h>
118 #include <stdio.h>
119 #include <assert.h>
120 #include <math.h>
121 #include "sqlite3.h"
122 typedef sqlite3_int64 i64;
123 typedef sqlite3_uint64 u64;
124 typedef unsigned char u8;
125 #if SQLITE_USER_AUTHENTICATION
@@ -3171,10 +3172,11 @@
3172 #ifndef U8_TYPEDEF
3173 /* typedef unsigned char u8; */
3174 #define U8_TYPEDEF
3175 #endif
3176
3177 /* Decoding table, ASCII (7-bit) value to base 64 digit value or other */
3178 static const u8 b64DigitValues[128] = {
3179 /* HT LF VT FF CR */
3180 ND,ND,ND,ND, ND,ND,ND,ND, ND,WS,WS,WS, WS,WS,ND,ND,
3181 /* US */
3182 ND,ND,ND,ND, ND,ND,ND,ND, ND,ND,ND,ND, ND,ND,ND,ND,
@@ -8771,11 +8773,14 @@
8773 }else{
8774 /* Figure out if this is a directory or a zero-sized file. Consider
8775 ** it to be a directory either if the mode suggests so, or if
8776 ** the final character in the name is '/'. */
8777 u32 mode = pCDS->iExternalAttr >> 16;
8778 if( !(mode & S_IFDIR)
8779 && pCDS->nFile>=1
8780 && pCDS->zFile[pCDS->nFile-1]!='/'
8781 ){
8782 sqlite3_result_blob(ctx, "", 0, SQLITE_STATIC);
8783 }
8784 }
8785 }
8786 break;
@@ -12505,11 +12510,10 @@
12510 #endif
12511
12512 #endif /* ifndef _SQLITE_RECOVER_H */
12513
12514 /************************* End ../ext/recover/sqlite3recover.h ********************/
 
12515 /************************* Begin ../ext/recover/dbdata.c ******************/
12516 /*
12517 ** 2019-04-17
12518 **
12519 ** The author disclaims copyright to this source code. In place of
@@ -12676,10 +12680,11 @@
12680 int rc = sqlite3_declare_vtab(db, pAux ? DBPTR_SCHEMA : DBDATA_SCHEMA);
12681
12682 (void)argc;
12683 (void)argv;
12684 (void)pzErr;
12685 sqlite3_vtab_config(db, SQLITE_VTAB_USES_ALL_SCHEMAS);
12686 if( rc==SQLITE_OK ){
12687 pTab = (DbdataTable*)sqlite3_malloc64(sizeof(DbdataTable));
12688 if( pTab==0 ){
12689 rc = SQLITE_NOMEM;
12690 }else{
@@ -13021,14 +13026,18 @@
13026 if( pCsr->aPage==0 ){
13027 while( 1 ){
13028 if( pCsr->bOnePage==0 && pCsr->iPgno>pCsr->szDb ) return SQLITE_OK;
13029 rc = dbdataLoadPage(pCsr, pCsr->iPgno, &pCsr->aPage, &pCsr->nPage);
13030 if( rc!=SQLITE_OK ) return rc;
13031 if( pCsr->aPage && pCsr->nPage>=256 ) break;
13032 sqlite3_free(pCsr->aPage);
13033 pCsr->aPage = 0;
13034 if( pCsr->bOnePage ) return SQLITE_OK;
13035 pCsr->iPgno++;
13036 }
13037
13038 assert( iOff+3+2<=pCsr->nPage );
13039 pCsr->iCell = pTab->bPtr ? -2 : 0;
13040 pCsr->nCell = get_uint16(&pCsr->aPage[iOff+3]);
13041 }
13042
13043 if( pTab->bPtr ){
@@ -13259,12 +13268,11 @@
13268 static int dbdataGetEncoding(DbdataCursor *pCsr){
13269 int rc = SQLITE_OK;
13270 int nPg1 = 0;
13271 u8 *aPg1 = 0;
13272 rc = dbdataLoadPage(pCsr, 1, &aPg1, &nPg1);
13273 if( rc==SQLITE_OK && nPg1>=(56+4) ){
 
13274 pCsr->enc = get_uint32(&aPg1[56]);
13275 }
13276 sqlite3_free(aPg1);
13277 return rc;
13278 }
@@ -13318,19 +13326,21 @@
13326 );
13327 }
13328 }
13329 if( rc==SQLITE_OK ){
13330 rc = sqlite3_bind_text(pCsr->pStmt, 1, zSchema, -1, SQLITE_TRANSIENT);
 
 
13331 }
13332
13333 /* Try to determine the encoding of the db by inspecting the header
13334 ** field on page 1. */
13335 if( rc==SQLITE_OK ){
13336 rc = dbdataGetEncoding(pCsr);
13337 }
13338
13339 if( rc!=SQLITE_OK ){
13340 pTab->base.zErrMsg = sqlite3_mprintf("%s", sqlite3_errmsg(pTab->db));
13341 }
13342
13343 if( rc==SQLITE_OK ){
13344 rc = dbdataNext(pCursor);
13345 }
13346 return rc;
@@ -16330,11 +16340,10 @@
16340 }
16341
16342 #endif /* ifndef SQLITE_OMIT_VIRTUALTABLE */
16343
16344 /************************* End ../ext/recover/sqlite3recover.c ********************/
 
16345 #endif
16346 #ifdef SQLITE_SHELL_EXTSRC
16347 # include SHELL_STRINGIFY(SQLITE_SHELL_EXTSRC)
16348 #endif
16349
@@ -17233,10 +17242,11 @@
17242 const char *zOrig = z;
17243 static const char *azTerm[] = { "", "*/", "\n" };
17244 int i;
17245 for(i=0; i<ArraySize(azTerm); i++){
17246 char *zNew = sqlite3_mprintf("%s%s;", zOrig, azTerm[i]);
17247 shell_check_oom(zNew);
17248 if( sqlite3_complete(zNew) ){
17249 size_t n = strlen(zNew);
17250 zNew[n-1] = 0;
17251 zToFree = zNew;
17252 z = zNew;
@@ -17667,13 +17677,13 @@
17677 char z[50];
17678 double r = sqlite3_column_double(p->pStmt, i);
17679 sqlite3_uint64 ur;
17680 memcpy(&ur,&r,sizeof(r));
17681 if( ur==0x7ff0000000000000LL ){
17682 raw_printf(p->out, "9.0e+999");
17683 }else if( ur==0xfff0000000000000LL ){
17684 raw_printf(p->out, "-9.0e+999");
17685 }else{
17686 sqlite3_int64 ir = (sqlite3_int64)r;
17687 if( r==(double)ir ){
17688 sqlite3_snprintf(50,z,"%lld.0", ir);
17689 }else{
@@ -17713,13 +17723,13 @@
17723 char z[50];
17724 double r = sqlite3_column_double(p->pStmt, i);
17725 sqlite3_uint64 ur;
17726 memcpy(&ur,&r,sizeof(r));
17727 if( ur==0x7ff0000000000000LL ){
17728 raw_printf(p->out, "9.0e+999");
17729 }else if( ur==0xfff0000000000000LL ){
17730 raw_printf(p->out, "-9.0e+999");
17731 }else{
17732 sqlite3_snprintf(50,z,"%!.20g", r);
17733 raw_printf(p->out, "%s", z);
17734 }
17735 }else if( aiType && aiType[i]==SQLITE_BLOB && p->pStmt ){
@@ -17919,10 +17929,11 @@
17929 char *zMsg;
17930 int i;
17931 if( db==0
17932 || zSql==0
17933 || (iOffset = sqlite3_error_offset(db))<0
17934 || iOffset>=(int)strlen(zSql)
17935 ){
17936 return sqlite3_mprintf("");
17937 }
17938 while( iOffset>50 ){
17939 iOffset--;
@@ -17930,11 +17941,11 @@
17941 while( (zSql[0]&0xc0)==0x80 ){ zSql++; iOffset--; }
17942 }
17943 len = strlen(zSql);
17944 if( len>78 ){
17945 len = 78;
17946 while( len>0 && (zSql[len]&0xc0)==0x80 ) len--;
17947 }
17948 zCode = sqlite3_mprintf("%.*s", len, zSql);
17949 shell_check_oom(zCode);
17950 for(i=0; zCode[i]; i++){ if( IsSpace(zSql[i]) ) zCode[i] = ' '; }
17951 if( iOffset<25 ){
@@ -18531,26 +18542,31 @@
18542
18543 nVar = sqlite3_bind_parameter_count(pStmt);
18544 if( nVar==0 ) return; /* Nothing to do */
18545 if( sqlite3_table_column_metadata(pArg->db, "TEMP", "sqlite_parameters",
18546 "key", 0, 0, 0, 0, 0)!=SQLITE_OK ){
18547 rc = SQLITE_NOTFOUND;
18548 pQ = 0;
18549 }else{
18550 rc = sqlite3_prepare_v2(pArg->db,
18551 "SELECT value FROM temp.sqlite_parameters"
18552 " WHERE key=?1", -1, &pQ, 0);
18553 }
 
 
 
 
18554 for(i=1; i<=nVar; i++){
18555 char zNum[30];
18556 const char *zVar = sqlite3_bind_parameter_name(pStmt, i);
18557 if( zVar==0 ){
18558 sqlite3_snprintf(sizeof(zNum),zNum,"?%d",i);
18559 zVar = zNum;
18560 }
18561 sqlite3_bind_text(pQ, 1, zVar, -1, SQLITE_STATIC);
18562 if( rc==SQLITE_OK && pQ && sqlite3_step(pQ)==SQLITE_ROW ){
18563 sqlite3_bind_value(pStmt, i, sqlite3_column_value(pQ, 0));
18564 }else if( sqlite3_strlike("_NAN", zVar, 0)==0 ){
18565 sqlite3_bind_double(pStmt, i, NAN);
18566 }else if( sqlite3_strlike("_INF", zVar, 0)==0 ){
18567 sqlite3_bind_double(pStmt, i, INFINITY);
18568 }else{
18569 sqlite3_bind_null(pStmt, i);
18570 }
18571 sqlite3_reset(pQ);
18572 }
@@ -19768,12 +19784,14 @@
19784 " Options:",
19785 " fkey-indexes Find missing foreign key indexes",
19786 #if !defined(SQLITE_OMIT_LOAD_EXTENSION) && !defined(SQLITE_SHELL_FIDDLE)
19787 ".load FILE ?ENTRY? Load an extension library",
19788 #endif
19789 #if !defined(SQLITE_SHELL_FIDDLE)
19790 ".log FILE|on|off Turn logging on or off. FILE can be stderr/stdout",
19791 #else
19792 ".log on|off Turn logging on or off.",
19793 #endif
19794 ".mode MODE ?OPTIONS? Set output mode",
19795 " MODE is one of:",
19796 " ascii Columns/rows delimited by 0x1F and 0x1E",
19797 " box Tables using unicode box-drawing characters",
@@ -20037,20 +20055,31 @@
20055 static char *readFile(const char *zName, int *pnByte){
20056 FILE *in = fopen(zName, "rb");
20057 long nIn;
20058 size_t nRead;
20059 char *pBuf;
20060 int rc;
20061 if( in==0 ) return 0;
20062 rc = fseek(in, 0, SEEK_END);
20063 if( rc!=0 ){
20064 raw_printf(stderr, "Error: '%s' not seekable\n", zName);
20065 fclose(in);
20066 return 0;
20067 }
20068 nIn = ftell(in);
20069 rewind(in);
20070 pBuf = sqlite3_malloc64( nIn+1 );
20071 if( pBuf==0 ){
20072 raw_printf(stderr, "Error: out of memory\n");
20073 fclose(in);
20074 return 0;
20075 }
20076 nRead = fread(pBuf, nIn, 1, in);
20077 fclose(in);
20078 if( nRead!=1 ){
20079 sqlite3_free(pBuf);
20080 raw_printf(stderr, "Error: cannot read '%s'\n", zName);
20081 return 0;
20082 }
20083 pBuf[nIn] = 0;
20084 if( pnByte ) *pnByte = nIn;
20085 return pBuf;
@@ -20235,57 +20264,10 @@
20264 utf8_printf(stderr,"Error on line %d of --hexdb input\n", nLine);
20265 return 0;
20266 }
20267 #endif /* SQLITE_OMIT_DESERIALIZE */
20268
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
20269 /*
20270 ** Scalar function "usleep(X)" invokes sqlite3_sleep(X) and returns X.
20271 */
20272 static void shellUSleepFunc(
20273 sqlite3_context *context,
@@ -20296,101 +20278,10 @@
20278 (void)argcUnused;
20279 sqlite3_sleep(sleep/1000);
20280 sqlite3_result_int(context, sleep);
20281 }
20282
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
20283 /* Flags for open_db().
20284 **
20285 ** The default behavior of open_db() is to exit(1) if the database fails to
20286 ** open. The OPEN_DB_KEEPALIVE flag changes that so that it prints an error
20287 ** but still returns without calling exit.
@@ -20452,10 +20343,11 @@
20343 sqlite3_open(":memory:", &p->db);
20344 return;
20345 }
20346 exit(1);
20347 }
20348 sqlite3_db_config(p->db, SQLITE_DBCONFIG_STMT_SCANSTATUS, (int)0, (int*)0);
20349
20350 #ifndef SQLITE_OMIT_LOAD_EXTENSION
20351 sqlite3_enable_load_extension(p->db, 1);
20352 #endif
20353 sqlite3_shathree_init(p->db, 0, 0);
@@ -20464,17 +20356,17 @@
20356 sqlite3_base64_init(p->db, 0, 0);
20357 sqlite3_base85_init(p->db, 0, 0);
20358 sqlite3_regexp_init(p->db, 0, 0);
20359 sqlite3_ieee_init(p->db, 0, 0);
20360 sqlite3_series_init(p->db, 0, 0);
20361 #if SQLITE_SHELL_HAVE_RECOVER
20362 sqlite3_dbdata_init(p->db, 0, 0);
20363 #endif
20364 #ifndef SQLITE_SHELL_FIDDLE
20365 sqlite3_fileio_init(p->db, 0, 0);
20366 sqlite3_completion_init(p->db, 0, 0);
20367 #endif
 
 
 
20368 #ifdef SQLITE_HAVE_ZLIB
20369 if( !p->bSafeModePersist ){
20370 sqlite3_zipfile_init(p->db, 0, 0);
20371 sqlite3_sqlar_init(p->db, 0, 0);
20372 }
@@ -20511,16 +20403,10 @@
20403 shellAddSchemaName, 0, 0);
20404 sqlite3_create_function(p->db, "shell_module_schema", 1, SQLITE_UTF8, 0,
20405 shellModuleSchema, 0, 0);
20406 sqlite3_create_function(p->db, "shell_putsnl", 1, SQLITE_UTF8, p,
20407 shellPutsFunc, 0, 0);
 
 
 
 
 
 
20408 sqlite3_create_function(p->db, "usleep",1,SQLITE_UTF8,0,
20409 shellUSleepFunc, 0, 0);
20410 #ifndef SQLITE_NOHAVE_SYSTEM
20411 sqlite3_create_function(p->db, "edit", 1, SQLITE_UTF8, 0,
20412 editFunc, 0, 0);
@@ -20543,13 +20429,13 @@
20429 unsigned char *aData;
20430 if( p->openMode==SHELL_OPEN_DESERIALIZE ){
20431 aData = (unsigned char*)readFile(zDbFilename, &nData);
20432 }else{
20433 aData = readHexDb(p, &nData);
20434 }
20435 if( aData==0 ){
20436 return;
20437 }
20438 rc = sqlite3_deserialize(p->db, "main", aData, nData, nData,
20439 SQLITE_DESERIALIZE_RESIZEABLE |
20440 SQLITE_DESERIALIZE_FREEONCLOSE);
20441 if( rc ){
@@ -20559,12 +20445,17 @@
20445 sqlite3_file_control(p->db, "main", SQLITE_FCNTL_SIZE_LIMIT, &p->szMax);
20446 }
20447 }
20448 #endif
20449 }
20450 if( p->db!=0 ){
20451 if( p->bSafeModePersist ){
20452 sqlite3_set_authorizer(p->db, safeModeAuth, p);
20453 }
20454 sqlite3_db_config(
20455 p->db, SQLITE_DBCONFIG_STMT_SCANSTATUS, p->scanstatsOn, (int*)0
20456 );
20457 }
20458 }
20459
20460 /*
20461 ** Attempt to close the databaes connection. Report errors.
@@ -21283,11 +21174,11 @@
21174 }
21175 sqlite3_finalize(pStmt);
21176 return res;
21177 }
21178
21179 #if SQLITE_SHELL_HAVE_RECOVER
21180 /*
21181 ** Convert a 2-byte or 4-byte big-endian integer into a native integer
21182 */
21183 static unsigned int get2byteInt(unsigned char *a){
21184 return (a[0]<<8) + a[1];
@@ -23179,11 +23070,10 @@
23070 output_reset(p);
23071 if( nArg!=2 ){
23072 raw_printf(stderr, "Usage: .check GLOB-PATTERN\n");
23073 rc = 2;
23074 }else if( (zRes = readFile("testcase-out.txt", 0))==0 ){
 
23075 rc = 2;
23076 }else if( testcase_glob(azArg[1],zRes)==0 ){
23077 utf8_printf(stderr,
23078 "testcase-%s FAILED\n Expected: [%s]\n Got: [%s]\n",
23079 p->zTestcase, azArg[1], zRes);
@@ -23309,10 +23199,12 @@
23199 { "legacy_alter_table", SQLITE_DBCONFIG_LEGACY_ALTER_TABLE },
23200 { "legacy_file_format", SQLITE_DBCONFIG_LEGACY_FILE_FORMAT },
23201 { "load_extension", SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION },
23202 { "no_ckpt_on_close", SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE },
23203 { "reset_database", SQLITE_DBCONFIG_RESET_DATABASE },
23204 { "reverse_scanorder", SQLITE_DBCONFIG_REVERSE_SCANORDER },
23205 { "stmt_scanstatus", SQLITE_DBCONFIG_STMT_SCANSTATUS },
23206 { "trigger_eqp", SQLITE_DBCONFIG_TRIGGER_EQP },
23207 { "trusted_schema", SQLITE_DBCONFIG_TRUSTED_SCHEMA },
23208 { "writable_schema", SQLITE_DBCONFIG_WRITABLE_SCHEMA },
23209 };
23210 int ii, v;
@@ -24258,23 +24150,29 @@
24150 rc = 1;
24151 }
24152 }else
24153 #endif
24154
 
24155 if( c=='l' && cli_strncmp(azArg[0], "log", n)==0 ){
 
24156 if( nArg!=2 ){
24157 raw_printf(stderr, "Usage: .log FILENAME\n");
24158 rc = 1;
24159 }else{
24160 const char *zFile = azArg[1];
24161 if( p->bSafeMode
24162 && cli_strcmp(zFile,"on")!=0
24163 && cli_strcmp(zFile,"off")!=0
24164 ){
24165 raw_printf(stdout, "cannot set .log to anything other "
24166 "than \"on\" or \"off\"\n");
24167 zFile = "off";
24168 }
24169 output_file_close(p->pLog);
24170 if( cli_strcmp(zFile,"on")==0 ) zFile = "stdout";
24171 p->pLog = output_file_open(zFile, 0);
24172 }
24173 }else
 
24174
24175 if( c=='m' && cli_strncmp(azArg[0], "mode", n)==0 ){
24176 const char *zMode = 0;
24177 const char *zTabname = 0;
24178 int i, n2;
@@ -24906,10 +24804,14 @@
24804 if( cli_strcmp(azArg[1], "est")==0 ){
24805 p->scanstatsOn = 2;
24806 }else{
24807 p->scanstatsOn = (u8)booleanValue(azArg[1]);
24808 }
24809 open_db(p, 0);
24810 sqlite3_db_config(
24811 p->db, SQLITE_DBCONFIG_STMT_SCANSTATUS, p->scanstatsOn, (int*)0
24812 );
24813 #ifndef SQLITE_ENABLE_STMT_SCANSTATUS
24814 raw_printf(stderr, "Warning: .scanstats not available in this build.\n");
24815 #endif
24816 }else{
24817 raw_printf(stderr, "Usage: .scanstats on|off|est\n");
@@ -26786,10 +26688,11 @@
26688
26689 /*
26690 ** Show available command line options
26691 */
26692 static const char zOptions[] =
26693 " -- treat no subsequent arguments as options\n"
26694 #if defined(SQLITE_HAVE_ZLIB) && !defined(SQLITE_OMIT_VIRTUALTABLE)
26695 " -A ARGS... run \".archive ARGS\" and exit\n"
26696 #endif
26697 " -append append the database to the end of the file\n"
26698 " -ascii set output mode to 'ascii'\n"
@@ -26848,13 +26751,13 @@
26751 " -zip open the file as a ZIP Archive\n"
26752 #endif
26753 ;
26754 static void usage(int showDetail){
26755 utf8_printf(stderr,
26756 "Usage: %s [OPTIONS] [FILENAME [SQL]]\n"
26757 "FILENAME is the name of an SQLite database. A new database is created\n"
26758 "if the file does not previously exist. Defaults to :memory:.\n", Argv0);
26759 if( showDetail ){
26760 utf8_printf(stderr, "OPTIONS include:\n%s", zOptions);
26761 }else{
26762 raw_printf(stderr, "Use the -help option for additional information\n");
26763 }
@@ -26882,13 +26785,15 @@
26785 data->pAuxDb = &data->aAuxDb[0];
26786 memcpy(data->colSeparator,SEP_Column, 2);
26787 memcpy(data->rowSeparator,SEP_Row, 2);
26788 data->showHeader = 0;
26789 data->shellFlgs = SHFLG_Lookaside;
26790 sqlite3_config(SQLITE_CONFIG_LOG, shellLog, data);
26791 #if !defined(SQLITE_SHELL_FIDDLE)
26792 verify_uninitialized();
26793 #endif
26794 sqlite3_config(SQLITE_CONFIG_URI, 1);
 
26795 sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
26796 sqlite3_snprintf(sizeof(mainPrompt), mainPrompt,"sqlite> ");
26797 sqlite3_snprintf(sizeof(continuePrompt), continuePrompt," ...> ");
26798 }
26799
@@ -26961,10 +26866,11 @@
26866 int i;
26867 int rc = 0;
26868 int warnInmemoryDb = 0;
26869 int readStdin = 1;
26870 int nCmd = 0;
26871 int nOptsEnd = argc;
26872 char **azCmd = 0;
26873 const char *zVfs = 0; /* Value of -vfs command-line option */
26874 #if !SQLITE_SHELL_IS_UTF8
26875 char **argvToFree = 0;
26876 int argcToFree = 0;
@@ -27064,15 +26970,17 @@
26970 /* Do an initial pass through the command-line argument to locate
26971 ** the name of the database file, the name of the initialization file,
26972 ** the size of the alternative malloc heap,
26973 ** and the first command to execute.
26974 */
26975 #ifndef SQLITE_SHELL_FIDDLE
26976 verify_uninitialized();
26977 #endif
26978 for(i=1; i<argc; i++){
26979 char *z;
26980 z = argv[i];
26981 if( z[0]!='-' || i>nOptsEnd ){
26982 if( data.aAuxDb->zDbFilename==0 ){
26983 data.aAuxDb->zDbFilename = z;
26984 }else{
26985 /* Excesss arguments are interpreted as SQL (or dot-commands) and
26986 ** mean that nothing is read from stdin */
@@ -27080,13 +26988,17 @@
26988 nCmd++;
26989 azCmd = realloc(azCmd, sizeof(azCmd[0])*nCmd);
26990 shell_check_oom(azCmd);
26991 azCmd[nCmd-1] = z;
26992 }
26993 continue;
26994 }
26995 if( z[1]=='-' ) z++;
26996 if( cli_strcmp(z, "-")==0 ){
26997 nOptsEnd = i;
26998 continue;
26999 }else if( cli_strcmp(z,"-separator")==0
27000 || cli_strcmp(z,"-nullvalue")==0
27001 || cli_strcmp(z,"-newline")==0
27002 || cli_strcmp(z,"-cmd")==0
27003 ){
27004 (void)cmdline_option_value(argc, argv, ++i);
@@ -27104,10 +27016,11 @@
27016 sqlite3_int64 szHeap;
27017
27018 zSize = cmdline_option_value(argc, argv, ++i);
27019 szHeap = integerValue(zSize);
27020 if( szHeap>0x7fff0000 ) szHeap = 0x7fff0000;
27021 verify_uninitialized();
27022 sqlite3_config(SQLITE_CONFIG_HEAP, malloc((int)szHeap), (int)szHeap, 64);
27023 #else
27024 (void)cmdline_option_value(argc, argv, ++i);
27025 #endif
27026 }else if( cli_strcmp(z,"-pagecache")==0 ){
@@ -27117,24 +27030,27 @@
27030 if( sz<0 ) sz = 0;
27031 n = integerValue(cmdline_option_value(argc,argv,++i));
27032 if( sz>0 && n>0 && 0xffffffffffffLL/sz<n ){
27033 n = 0xffffffffffffLL/sz;
27034 }
27035 verify_uninitialized();
27036 sqlite3_config(SQLITE_CONFIG_PAGECACHE,
27037 (n>0 && sz>0) ? malloc(n*sz) : 0, sz, n);
27038 data.shellFlgs |= SHFLG_Pagecache;
27039 }else if( cli_strcmp(z,"-lookaside")==0 ){
27040 int n, sz;
27041 sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
27042 if( sz<0 ) sz = 0;
27043 n = (int)integerValue(cmdline_option_value(argc,argv,++i));
27044 if( n<0 ) n = 0;
27045 verify_uninitialized();
27046 sqlite3_config(SQLITE_CONFIG_LOOKASIDE, sz, n);
27047 if( sz*n==0 ) data.shellFlgs &= ~SHFLG_Lookaside;
27048 }else if( cli_strcmp(z,"-threadsafe")==0 ){
27049 int n;
27050 n = (int)integerValue(cmdline_option_value(argc,argv,++i));
27051 verify_uninitialized();
27052 switch( n ){
27053 case 0: sqlite3_config(SQLITE_CONFIG_SINGLETHREAD); break;
27054 case 2: sqlite3_config(SQLITE_CONFIG_MULTITHREAD); break;
27055 default: sqlite3_config(SQLITE_CONFIG_SERIALIZED); break;
27056 }
@@ -27154,14 +27070,16 @@
27070 extern int sqlite3_multiple_initialize(const char*,int);
27071 sqlite3_multiplex_initialize(0, 1);
27072 #endif
27073 }else if( cli_strcmp(z,"-mmap")==0 ){
27074 sqlite3_int64 sz = integerValue(cmdline_option_value(argc,argv,++i));
27075 verify_uninitialized();
27076 sqlite3_config(SQLITE_CONFIG_MMAP_SIZE, sz, sz);
27077 #if defined(SQLITE_ENABLE_SORTER_REFERENCES)
27078 }else if( cli_strcmp(z,"-sorterref")==0 ){
27079 sqlite3_int64 sz = integerValue(cmdline_option_value(argc,argv,++i));
27080 verify_uninitialized();
27081 sqlite3_config(SQLITE_CONFIG_SORTERREF_SIZE, (int)sz);
27082 #endif
27083 }else if( cli_strcmp(z,"-vfs")==0 ){
27084 zVfs = cmdline_option_value(argc, argv, ++i);
27085 #ifdef SQLITE_HAVE_ZLIB
@@ -27195,11 +27113,13 @@
27113 data.zNonce = strdup(argv[++i]);
27114 }else if( cli_strcmp(z,"-safe")==0 ){
27115 /* no-op - catch this on the second pass */
27116 }
27117 }
27118 #ifndef SQLITE_SHELL_FIDDLE
27119 verify_uninitialized();
27120 #endif
27121
27122
27123 #ifdef SQLITE_SHELL_INIT_PROC
27124 {
27125 /* If the SQLITE_SHELL_INIT_PROC macro is defined, then it is the name
@@ -27259,11 +27179,11 @@
27179 ** file is processed so that the command-line arguments will override
27180 ** settings in the initialization file.
27181 */
27182 for(i=1; i<argc; i++){
27183 char *z = argv[i];
27184 if( z[0]!='-' || i>=nOptsEnd ) continue;
27185 if( z[1]=='-' ){ z++; }
27186 if( cli_strcmp(z,"-init")==0 ){
27187 i++;
27188 }else if( cli_strcmp(z,"-html")==0 ){
27189 data.mode = MODE_Html;
@@ -27443,10 +27363,11 @@
27363 free(azCmd);
27364 return rc==2 ? 0 : rc;
27365 }
27366 }else{
27367 open_db(&data, 0);
27368 echo_group_input(&data, azCmd[i]);
27369 rc = shell_exec(&data, azCmd[i], &zErrMsg);
27370 if( zErrMsg || rc ){
27371 if( zErrMsg!=0 ){
27372 utf8_printf(stderr,"Error: %s\n", zErrMsg);
27373 }else{
27374
+2592 -1793
--- extsrc/sqlite3.c
+++ extsrc/sqlite3.c
@@ -1,8 +1,8 @@
11
/******************************************************************************
22
** This file is an amalgamation of many separate C source files from SQLite
3
-** version 3.41.1. By combining all the individual C code files into this
3
+** version 3.42.0. By combining all the individual C code files into this
44
** single large file, the entire code can be compiled as a single translation
55
** unit. This allows many compilers to do optimizations that would not be
66
** possible if the files were compiled separately. Performance improvements
77
** of 5% or more are commonly seen when SQLite is compiled as a single
88
** translation unit.
@@ -450,13 +450,13 @@
450450
**
451451
** See also: [sqlite3_libversion()],
452452
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
453453
** [sqlite_version()] and [sqlite_source_id()].
454454
*/
455
-#define SQLITE_VERSION "3.41.1"
456
-#define SQLITE_VERSION_NUMBER 3041001
457
-#define SQLITE_SOURCE_ID "2023-03-09 16:04:34 cc8a0ee40cfc83ab42a0ff452de0a53fe17784aefb944ea7ac2cb078a8310730"
455
+#define SQLITE_VERSION "3.42.0"
456
+#define SQLITE_VERSION_NUMBER 3042000
457
+#define SQLITE_SOURCE_ID "2023-04-10 18:44:00 4c5a3c5fb351cc1c2ce16c33314ce19c53531f09263f87456283d9d756002f9d"
458458
459459
/*
460460
** CAPI3REF: Run-Time Library Version Numbers
461461
** KEYWORDS: sqlite3_version sqlite3_sourceid
462462
**
@@ -1959,23 +1959,26 @@
19591959
**
19601960
** <b>The sqlite3_config() interface is not threadsafe. The application
19611961
** must ensure that no other SQLite interfaces are invoked by other
19621962
** threads while sqlite3_config() is running.</b>
19631963
**
1964
-** The sqlite3_config() interface
1965
-** may only be invoked prior to library initialization using
1966
-** [sqlite3_initialize()] or after shutdown by [sqlite3_shutdown()].
1967
-** ^If sqlite3_config() is called after [sqlite3_initialize()] and before
1968
-** [sqlite3_shutdown()] then it will return SQLITE_MISUSE.
1969
-** Note, however, that ^sqlite3_config() can be called as part of the
1970
-** implementation of an application-defined [sqlite3_os_init()].
1971
-**
19721964
** The first argument to sqlite3_config() is an integer
19731965
** [configuration option] that determines
19741966
** what property of SQLite is to be configured. Subsequent arguments
19751967
** vary depending on the [configuration option]
19761968
** in the first argument.
1969
+**
1970
+** For most configuration options, the sqlite3_config() interface
1971
+** may only be invoked prior to library initialization using
1972
+** [sqlite3_initialize()] or after shutdown by [sqlite3_shutdown()].
1973
+** The exceptional configuration options that may be invoked at any time
1974
+** are called "anytime configuration options".
1975
+** ^If sqlite3_config() is called after [sqlite3_initialize()] and before
1976
+** [sqlite3_shutdown()] with a first argument that is not an anytime
1977
+** configuration option, then the sqlite3_config() call will return SQLITE_MISUSE.
1978
+** Note, however, that ^sqlite3_config() can be called as part of the
1979
+** implementation of an application-defined [sqlite3_os_init()].
19771980
**
19781981
** ^When a configuration option is set, sqlite3_config() returns [SQLITE_OK].
19791982
** ^If the option is unknown or SQLite is unable to set the option
19801983
** then this routine returns a non-zero [error code].
19811984
*/
@@ -2079,10 +2082,27 @@
20792082
** CAPI3REF: Configuration Options
20802083
** KEYWORDS: {configuration option}
20812084
**
20822085
** These constants are the available integer configuration options that
20832086
** can be passed as the first argument to the [sqlite3_config()] interface.
2087
+**
2088
+** Most of the configuration options for sqlite3_config()
2089
+** will only work if invoked prior to [sqlite3_initialize()] or after
2090
+** [sqlite3_shutdown()]. The few exceptions to this rule are called
2091
+** "anytime configuration options".
2092
+** ^Calling [sqlite3_config()] with a first argument that is not an
2093
+** anytime configuration option in between calls to [sqlite3_initialize()] and
2094
+** [sqlite3_shutdown()] is a no-op that returns SQLITE_MISUSE.
2095
+**
2096
+** The set of anytime configuration options can change (by insertions
2097
+** and/or deletions) from one release of SQLite to the next.
2098
+** As of SQLite version 3.42.0, the complete set of anytime configuration
2099
+** options is:
2100
+** <ul>
2101
+** <li> SQLITE_CONFIG_LOG
2102
+** <li> SQLITE_CONFIG_PCACHE_HDRSZ
2103
+** </ul>
20842104
**
20852105
** New configuration options may be added in future releases of SQLite.
20862106
** Existing configuration options might be discontinued. Applications
20872107
** should check the return code from [sqlite3_config()] to make sure that
20882108
** the call worked. The [sqlite3_config()] interface will return a
@@ -2740,10 +2760,30 @@
27402760
** the [VACUUM] command will fail with an obscure error when attempting to
27412761
** process a table with generated columns and a descending index. This is
27422762
** not considered a bug since SQLite versions 3.3.0 and earlier do not support
27432763
** either generated columns or decending indexes.
27442764
** </dd>
2765
+**
2766
+** [[SQLITE_DBCONFIG_STMT_SCANSTATUS]]
2767
+** <dt>SQLITE_DBCONFIG_STMT_SCANSTATUS</td>
2768
+** <dd>The SQLITE_DBCONFIG_STMT_SCANSTATUS option is only useful in
2769
+** SQLITE_ENABLE_STMT_SCANSTATUS builds. In this case, it sets or clears
2770
+** a flag that enables collection of the sqlite3_stmt_scanstatus_v2()
2771
+** statistics. For statistics to be collected, the flag must be set on
2772
+** the database handle both when the SQL statement is prepared and when it
2773
+** is stepped. The flag is set (collection of statistics is enabled)
2774
+** by default.</dd>
2775
+**
2776
+** [[SQLITE_DBCONFIG_REVERSE_SCANORDER]]
2777
+** <dt>SQLITE_DBCONFIG_REVERSE_SCANORDER</td>
2778
+** <dd>The SQLITE_DBCONFIG_REVERSE_SCANORDER option change the default order
2779
+** in which tables and indexes are scanned so that the scans start at the end
2780
+** and work toward the beginning rather than starting at the beginning and
2781
+** working toward the end. Setting SQLITE_DBCONFIG_REVERSE_SCANORDER is the
2782
+** same as setting [PRAGMA reverse_unordered_selects]. This configuration option
2783
+** is useful for application testing.</dd>
2784
+**
27452785
** </dl>
27462786
*/
27472787
#define SQLITE_DBCONFIG_MAINDBNAME 1000 /* const char* */
27482788
#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */
27492789
#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */
@@ -2760,11 +2800,13 @@
27602800
#define SQLITE_DBCONFIG_DQS_DML 1013 /* int int* */
27612801
#define SQLITE_DBCONFIG_DQS_DDL 1014 /* int int* */
27622802
#define SQLITE_DBCONFIG_ENABLE_VIEW 1015 /* int int* */
27632803
#define SQLITE_DBCONFIG_LEGACY_FILE_FORMAT 1016 /* int int* */
27642804
#define SQLITE_DBCONFIG_TRUSTED_SCHEMA 1017 /* int int* */
2765
-#define SQLITE_DBCONFIG_MAX 1017 /* Largest DBCONFIG */
2805
+#define SQLITE_DBCONFIG_STMT_SCANSTATUS 1018 /* int int* */
2806
+#define SQLITE_DBCONFIG_REVERSE_SCANORDER 1019 /* int int* */
2807
+#define SQLITE_DBCONFIG_MAX 1019 /* Largest DBCONFIG */
27662808
27672809
/*
27682810
** CAPI3REF: Enable Or Disable Extended Result Codes
27692811
** METHOD: sqlite3
27702812
**
@@ -9868,22 +9910,32 @@
98689910
** </dd>
98699911
**
98709912
** [[SQLITE_VTAB_INNOCUOUS]]<dt>SQLITE_VTAB_INNOCUOUS</dt>
98719913
** <dd>Calls of the form
98729914
** [sqlite3_vtab_config](db,SQLITE_VTAB_INNOCUOUS) from within the
9873
-** the [xConnect] or [xCreate] methods of a [virtual table] implmentation
9915
+** the [xConnect] or [xCreate] methods of a [virtual table] implementation
98749916
** identify that virtual table as being safe to use from within triggers
98759917
** and views. Conceptually, the SQLITE_VTAB_INNOCUOUS tag means that the
98769918
** virtual table can do no serious harm even if it is controlled by a
98779919
** malicious hacker. Developers should avoid setting the SQLITE_VTAB_INNOCUOUS
98789920
** flag unless absolutely necessary.
98799921
** </dd>
9922
+**
9923
+** [[SQLITE_VTAB_USES_ALL_SCHEMAS]]<dt>SQLITE_VTAB_USES_ALL_SCHEMAS</dt>
9924
+** <dd>Calls of the form
9925
+** [sqlite3_vtab_config](db,SQLITE_VTAB_USES_ALL_SCHEMA) from within the
9926
+** the [xConnect] or [xCreate] methods of a [virtual table] implementation
9927
+** instruct the query planner to begin at least a read transaction on
9928
+** all schemas ("main", "temp", and any ATTACH-ed databases) whenever the
9929
+** virtual table is used.
9930
+** </dd>
98809931
** </dl>
98819932
*/
98829933
#define SQLITE_VTAB_CONSTRAINT_SUPPORT 1
98839934
#define SQLITE_VTAB_INNOCUOUS 2
98849935
#define SQLITE_VTAB_DIRECTONLY 3
9936
+#define SQLITE_VTAB_USES_ALL_SCHEMAS 4
98859937
98869938
/*
98879939
** CAPI3REF: Determine The Virtual Table Conflict Policy
98889940
**
98899941
** This function may only be called from within a call to the [xUpdate] method
@@ -12217,13 +12269,27 @@
1221712269
**
1221812270
** <dt>SQLITE_CHANGESETAPPLY_INVERT <dd>
1221912271
** Invert the changeset before applying it. This is equivalent to inverting
1222012272
** a changeset using sqlite3changeset_invert() before applying it. It is
1222112273
** an error to specify this flag with a patchset.
12274
+**
12275
+** <dt>SQLITE_CHANGESETAPPLY_IGNORENOOP <dd>
12276
+** Do not invoke the conflict handler callback for any changes that
12277
+** would not actually modify the database even if they were applied.
12278
+** Specifically, this means that the conflict handler is not invoked
12279
+** for:
12280
+** <ul>
12281
+** <li>a delete change if the row being deleted cannot be found,
12282
+** <li>an update change if the modified fields are already set to
12283
+** their new values in the conflicting row, or
12284
+** <li>an insert change if all fields of the conflicting row match
12285
+** the row being inserted.
12286
+** </ul>
1222212287
*/
1222312288
#define SQLITE_CHANGESETAPPLY_NOSAVEPOINT 0x0001
1222412289
#define SQLITE_CHANGESETAPPLY_INVERT 0x0002
12290
+#define SQLITE_CHANGESETAPPLY_IGNORENOOP 0x0004
1222512291
1222612292
/*
1222712293
** CAPI3REF: Constants Passed To The Conflict Handler
1222812294
**
1222912295
** Values that may be passed as the second argument to a conflict-handler.
@@ -13516,12 +13582,12 @@
1351613582
#pragma warn -csu /* Comparing signed and unsigned */
1351713583
#pragma warn -spa /* Suspicious pointer arithmetic */
1351813584
#endif
1351913585
1352013586
/*
13521
-** WAL mode depends on atomic aligned 32-bit loads and stores in a few
13522
-** places. The following macros try to make this explicit.
13587
+** A few places in the code require atomic load/store of aligned
13588
+** integer values.
1352313589
*/
1352413590
#ifndef __has_extension
1352513591
# define __has_extension(x) 0 /* compatibility with non-clang compilers */
1352613592
#endif
1352713593
#if GCC_VERSION>=4007000 || __has_extension(c_atomic)
@@ -13573,19 +13639,26 @@
1357313639
# define SQLITE_INT_TO_PTR(X) ((void*)(X))
1357413640
# define SQLITE_PTR_TO_INT(X) ((int)(X))
1357513641
#endif
1357613642
1357713643
/*
13578
-** A macro to hint to the compiler that a function should not be
13644
+** Macros to hint to the compiler that a function should or should not be
1357913645
** inlined.
1358013646
*/
1358113647
#if defined(__GNUC__)
1358213648
# define SQLITE_NOINLINE __attribute__((noinline))
13649
+# define SQLITE_INLINE __attribute__((always_inline)) inline
1358313650
#elif defined(_MSC_VER) && _MSC_VER>=1310
1358413651
# define SQLITE_NOINLINE __declspec(noinline)
13652
+# define SQLITE_INLINE __forceinline
1358513653
#else
1358613654
# define SQLITE_NOINLINE
13655
+# define SQLITE_INLINE
13656
+#endif
13657
+#if defined(SQLITE_COVERAGE_TEST)
13658
+# undef SQLITE_INLINE
13659
+# define SQLITE_INLINE
1358713660
#endif
1358813661
1358913662
/*
1359013663
** Make sure that the compiler intrinsics we desire are enabled when
1359113664
** compiling with an appropriate version of MSVC unless prevented by
@@ -16541,10 +16614,14 @@
1654116614
#endif
1654216615
1654316616
#if defined(SQLITE_DEBUG) || defined(VDBE_PROFILE)
1654416617
SQLITE_PRIVATE void sqlite3VdbePrintOp(FILE*, int, VdbeOp*);
1654516618
#endif
16619
+
16620
+#if defined(SQLITE_ENABLE_CURSOR_HINTS) && defined(SQLITE_DEBUG)
16621
+SQLITE_PRIVATE int sqlite3CursorRangeHintExprCheck(Walker *pWalker, Expr *pExpr);
16622
+#endif
1654616623
1654716624
#endif /* SQLITE_VDBE_H */
1654816625
1654916626
/************** End of vdbe.h ************************************************/
1655016627
/************** Continuing where we left off in sqliteInt.h ******************/
@@ -16590,11 +16667,11 @@
1659016667
/**********************************************************************
1659116668
** Elements above, except pCache, are public. All that follow are
1659216669
** private to pcache.c and should not be accessed by other modules.
1659316670
** pCache is grouped with the public elements for efficiency.
1659416671
*/
16595
- i16 nRef; /* Number of users of this page */
16672
+ i64 nRef; /* Number of users of this page */
1659616673
PgHdr *pDirtyNext; /* Next element in list of dirty pages */
1659716674
PgHdr *pDirtyPrev; /* Previous element in list of dirty pages */
1659816675
/* NB: pDirtyNext and pDirtyPrev are undefined if the
1659916676
** PgHdr object is not dirty */
1660016677
};
@@ -16671,16 +16748,16 @@
1667116748
1667216749
/* Discard the contents of the cache */
1667316750
SQLITE_PRIVATE void sqlite3PcacheClear(PCache*);
1667416751
1667516752
/* Return the total number of outstanding page references */
16676
-SQLITE_PRIVATE int sqlite3PcacheRefCount(PCache*);
16753
+SQLITE_PRIVATE i64 sqlite3PcacheRefCount(PCache*);
1667716754
1667816755
/* Increment the reference count of an existing page */
1667916756
SQLITE_PRIVATE void sqlite3PcacheRef(PgHdr*);
1668016757
16681
-SQLITE_PRIVATE int sqlite3PcachePageRefcount(PgHdr*);
16758
+SQLITE_PRIVATE i64 sqlite3PcachePageRefcount(PgHdr*);
1668216759
1668316760
/* Return the total number of pages stored in the cache */
1668416761
SQLITE_PRIVATE int sqlite3PcachePagecount(PCache*);
1668516762
1668616763
#if defined(SQLITE_CHECK_PAGES) || defined(SQLITE_DEBUG)
@@ -17251,11 +17328,11 @@
1725117328
#define SQLITE_TrustedSchema 0x00000080 /* Allow unsafe functions and
1725217329
** vtabs in the schema definition */
1725317330
#define SQLITE_NullCallback 0x00000100 /* Invoke the callback once if the */
1725417331
/* result set is empty */
1725517332
#define SQLITE_IgnoreChecks 0x00000200 /* Do not enforce check constraints */
17256
-#define SQLITE_ReadUncommit 0x00000400 /* READ UNCOMMITTED in shared-cache */
17333
+#define SQLITE_StmtScanStatus 0x00000400 /* Enable stmt_scanstats() counters */
1725717334
#define SQLITE_NoCkptOnClose 0x00000800 /* No checkpoint on close()/DETACH */
1725817335
#define SQLITE_ReverseOrder 0x00001000 /* Reverse unordered SELECTs */
1725917336
#define SQLITE_RecTriggers 0x00002000 /* Enable recursive triggers */
1726017337
#define SQLITE_ForeignKeys 0x00004000 /* Enforce foreign key constraints */
1726117338
#define SQLITE_AutoIndex 0x00008000 /* Enable automatic indexes */
@@ -17277,10 +17354,11 @@
1727717354
#define SQLITE_EnableView 0x80000000 /* Enable the use of views */
1727817355
#define SQLITE_CountRows HI(0x00001) /* Count rows changed by INSERT, */
1727917356
/* DELETE, or UPDATE and return */
1728017357
/* the count using a callback. */
1728117358
#define SQLITE_CorruptRdOnly HI(0x00002) /* Prohibit writes due to error */
17359
+#define SQLITE_ReadUncommit HI(0x00004) /* READ UNCOMMITTED in shared-cache */
1728217360
1728317361
/* Flags used only if debugging */
1728417362
#ifdef SQLITE_DEBUG
1728517363
#define SQLITE_SqlTrace HI(0x0100000) /* Debug print SQL as it executes */
1728617364
#define SQLITE_VdbeListing HI(0x0200000) /* Debug listings of VDBE progs */
@@ -17333,10 +17411,11 @@
1733317411
#define SQLITE_ReleaseReg 0x00400000 /* Use OP_ReleaseReg for testing */
1733417412
#define SQLITE_FlttnUnionAll 0x00800000 /* Disable the UNION ALL flattener */
1733517413
/* TH3 expects this value ^^^^^^^^^^ See flatten04.test */
1733617414
#define SQLITE_IndexedExpr 0x01000000 /* Pull exprs from index when able */
1733717415
#define SQLITE_Coroutines 0x02000000 /* Co-routines for subqueries */
17416
+#define SQLITE_NullUnusedCols 0x04000000 /* NULL unused columns in subqueries */
1733817417
#define SQLITE_AllOpts 0xffffffff /* All optimizations */
1733917418
1734017419
/*
1734117420
** Macros for testing whether or not optimizations are enabled or disabled.
1734217421
*/
@@ -17804,10 +17883,11 @@
1780417883
sqlite3 *db; /* Database connection associated with this table */
1780517884
Module *pMod; /* Pointer to module implementation */
1780617885
sqlite3_vtab *pVtab; /* Pointer to vtab instance */
1780717886
int nRef; /* Number of pointers to this structure */
1780817887
u8 bConstraint; /* True if constraints are supported */
17888
+ u8 bAllSchemas; /* True if might use any attached schema */
1780917889
u8 eVtabRisk; /* Riskiness of allowing hacker access */
1781017890
int iSavepoint; /* Depth of the SAVEPOINT stack */
1781117891
VTable *pNext; /* Next in linked list (see above) */
1781217892
};
1781317893
@@ -18835,11 +18915,11 @@
1883518915
#define NC_IsCheck 0x000004 /* True if resolving a CHECK constraint */
1883618916
#define NC_GenCol 0x000008 /* True for a GENERATED ALWAYS AS clause */
1883718917
#define NC_HasAgg 0x000010 /* One or more aggregate functions seen */
1883818918
#define NC_IdxExpr 0x000020 /* True if resolving columns of CREATE INDEX */
1883918919
#define NC_SelfRef 0x00002e /* Combo: PartIdx, isCheck, GenCol, and IdxExpr */
18840
-#define NC_VarSelect 0x000040 /* A correlated subquery has been seen */
18920
+#define NC_Subquery 0x000040 /* A subquery has been seen */
1884118921
#define NC_UEList 0x000080 /* True if uNC.pEList is used */
1884218922
#define NC_UAggInfo 0x000100 /* True if uNC.pAggInfo is used */
1884318923
#define NC_UUpsert 0x000200 /* True if uNC.pUpsert is used */
1884418924
#define NC_UBaseReg 0x000400 /* True if uNC.iBaseReg is used */
1884518925
#define NC_MinMaxAgg 0x001000 /* min/max aggregates seen. See note above */
@@ -19207,10 +19287,13 @@
1920719287
u8 prepFlags; /* SQLITE_PREPARE_* flags */
1920819288
u8 withinRJSubrtn; /* Nesting level for RIGHT JOIN body subroutines */
1920919289
#if defined(SQLITE_DEBUG) || defined(SQLITE_COVERAGE_TEST)
1921019290
u8 earlyCleanup; /* OOM inside sqlite3ParserAddCleanup() */
1921119291
#endif
19292
+#ifdef SQLITE_DEBUG
19293
+ u8 ifNotExists; /* Might be true if IF NOT EXISTS. Assert()s only */
19294
+#endif
1921219295
int nRangeReg; /* Size of the temporary register block */
1921319296
int iRangeReg; /* First register in temporary register block */
1921419297
int nErr; /* Number of errors seen */
1921519298
int nTab; /* Number of previously allocated VDBE cursors */
1921619299
int nMem; /* Number of memory cells used so far */
@@ -19667,10 +19750,11 @@
1966719750
struct RenameCtx *pRename; /* RENAME COLUMN context */
1966819751
struct Table *pTab; /* Table of generated column */
1966919752
struct CoveringIndexCheck *pCovIdxCk; /* Check for covering index */
1967019753
SrcItem *pSrcItem; /* A single FROM clause item */
1967119754
DbFixer *pFix; /* See sqlite3FixSelect() */
19755
+ Mem *aMem; /* See sqlite3BtreeCursorHint() */
1967219756
} u;
1967319757
};
1967419758
1967519759
/*
1967619760
** The following structure contains information used by the sqliteFix...
@@ -20138,10 +20222,14 @@
2013820222
SQLITE_PRIVATE int sqlite3GetTempReg(Parse*);
2013920223
SQLITE_PRIVATE void sqlite3ReleaseTempReg(Parse*,int);
2014020224
SQLITE_PRIVATE int sqlite3GetTempRange(Parse*,int);
2014120225
SQLITE_PRIVATE void sqlite3ReleaseTempRange(Parse*,int,int);
2014220226
SQLITE_PRIVATE void sqlite3ClearTempRegCache(Parse*);
20227
+SQLITE_PRIVATE void sqlite3TouchRegister(Parse*,int);
20228
+#if defined(SQLITE_ENABLE_STAT4) || defined(SQLITE_DEBUG)
20229
+SQLITE_PRIVATE int sqlite3FirstAvailableRegister(Parse*,int);
20230
+#endif
2014320231
#ifdef SQLITE_DEBUG
2014420232
SQLITE_PRIVATE int sqlite3NoTempsInRange(Parse*,int,int);
2014520233
#endif
2014620234
SQLITE_PRIVATE Expr *sqlite3ExprAlloc(sqlite3*,int,const Token*,int);
2014720235
SQLITE_PRIVATE Expr *sqlite3Expr(sqlite3*,int,const char*);
@@ -20288,11 +20376,11 @@
2028820376
SQLITE_PRIVATE int sqlite3Select(Parse*, Select*, SelectDest*);
2028920377
SQLITE_PRIVATE Select *sqlite3SelectNew(Parse*,ExprList*,SrcList*,Expr*,ExprList*,
2029020378
Expr*,ExprList*,u32,Expr*);
2029120379
SQLITE_PRIVATE void sqlite3SelectDelete(sqlite3*, Select*);
2029220380
SQLITE_PRIVATE Table *sqlite3SrcListLookup(Parse*, SrcList*);
20293
-SQLITE_PRIVATE int sqlite3IsReadOnly(Parse*, Table*, int);
20381
+SQLITE_PRIVATE int sqlite3IsReadOnly(Parse*, Table*, Trigger*);
2029420382
SQLITE_PRIVATE void sqlite3OpenTable(Parse*, int iCur, int iDb, Table*, int);
2029520383
#if defined(SQLITE_ENABLE_UPDATE_DELETE_LIMIT) && !defined(SQLITE_OMIT_SUBQUERY)
2029620384
SQLITE_PRIVATE Expr *sqlite3LimitWhere(Parse*,SrcList*,Expr*,ExprList*,Expr*,char*);
2029720385
#endif
2029820386
SQLITE_PRIVATE void sqlite3CodeChangeCount(Vdbe*,int,const char*);
@@ -20825,14 +20913,11 @@
2082520913
SQLITE_PRIVATE int sqlite3VtabCallConnect(Parse*, Table*);
2082620914
SQLITE_PRIVATE int sqlite3VtabCallDestroy(sqlite3*, int, const char *);
2082720915
SQLITE_PRIVATE int sqlite3VtabBegin(sqlite3 *, VTable *);
2082820916
2082920917
SQLITE_PRIVATE FuncDef *sqlite3VtabOverloadFunction(sqlite3 *,FuncDef*, int nArg, Expr*);
20830
-#if (defined(SQLITE_ENABLE_DBPAGE_VTAB) || defined(SQLITE_TEST)) \
20831
- && !defined(SQLITE_OMIT_VIRTUALTABLE)
20832
-SQLITE_PRIVATE void sqlite3VtabUsesAllSchemas(sqlite3_index_info*);
20833
-#endif
20918
+SQLITE_PRIVATE void sqlite3VtabUsesAllSchemas(Parse*);
2083420919
SQLITE_PRIVATE sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context*);
2083520920
SQLITE_PRIVATE int sqlite3VdbeParameterIndex(Vdbe*, const char*, int);
2083620921
SQLITE_PRIVATE int sqlite3TransferBindings(sqlite3_stmt *, sqlite3_stmt *);
2083720922
SQLITE_PRIVATE void sqlite3ParseObjectInit(Parse*,sqlite3*);
2083820923
SQLITE_PRIVATE void sqlite3ParseObjectReset(Parse*);
@@ -21074,10 +21159,16 @@
2107421159
#if defined(VDBE_PROFILE) \
2107521160
|| defined(SQLITE_PERFORMANCE_TRACE) \
2107621161
|| defined(SQLITE_ENABLE_STMT_SCANSTATUS)
2107721162
SQLITE_PRIVATE sqlite3_uint64 sqlite3Hwtime(void);
2107821163
#endif
21164
+
21165
+#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
21166
+# define IS_STMT_SCANSTATUS(db) (db->flags & SQLITE_StmtScanStatus)
21167
+#else
21168
+# define IS_STMT_SCANSTATUS(db) 0
21169
+#endif
2107921170
2108021171
#endif /* SQLITEINT_H */
2108121172
2108221173
/************** End of sqliteInt.h *******************************************/
2108321174
/************** Begin file os_common.h ***************************************/
@@ -22264,11 +22355,11 @@
2226422355
0, /* xAltLocaltime */
2226522356
0x7ffffffe, /* iOnceResetThreshold */
2226622357
SQLITE_DEFAULT_SORTERREF_SIZE, /* szSorterRef */
2226722358
0, /* iPrngSeed */
2226822359
#ifdef SQLITE_DEBUG
22269
- {0,0,0,0,0,0} /* aTune */
22360
+ {0,0,0,0,0,0}, /* aTune */
2227022361
#endif
2227122362
};
2227222363
2227322364
/*
2227422365
** Hash table for global functions - functions common to all
@@ -30069,10 +30160,24 @@
3006930160
*val = (*val - d)*10.0;
3007030161
return (char)digit;
3007130162
}
3007230163
#endif /* SQLITE_OMIT_FLOATING_POINT */
3007330164
30165
+#ifndef SQLITE_OMIT_FLOATING_POINT
30166
+/*
30167
+** "*val" is a u64. *msd is a divisor used to extract the
30168
+** most significant digit of *val. Extract that most significant
30169
+** digit and return it.
30170
+*/
30171
+static char et_getdigit_int(u64 *val, u64 *msd){
30172
+ u64 x = (*val)/(*msd);
30173
+ *val -= x*(*msd);
30174
+ if( *msd>=10 ) *msd /= 10;
30175
+ return '0' + (char)(x & 15);
30176
+}
30177
+#endif /* SQLITE_OMIT_FLOATING_POINT */
30178
+
3007430179
/*
3007530180
** Set the StrAccum object to an error mode.
3007630181
*/
3007730182
SQLITE_PRIVATE void sqlite3StrAccumSetError(StrAccum *p, u8 eError){
3007830183
assert( eError==SQLITE_NOMEM || eError==SQLITE_TOOBIG );
@@ -30161,10 +30266,12 @@
3016130266
etByte xtype = etINVALID; /* Conversion paradigm */
3016230267
u8 bArgList; /* True for SQLITE_PRINTF_SQLFUNC */
3016330268
char prefix; /* Prefix character. "+" or "-" or " " or '\0'. */
3016430269
sqlite_uint64 longvalue; /* Value for integer types */
3016530270
LONGDOUBLE_TYPE realvalue; /* Value for real types */
30271
+ sqlite_uint64 msd; /* Divisor to get most-significant-digit
30272
+ ** of longvalue */
3016630273
const et_info *infop; /* Pointer to the appropriate info structure */
3016730274
char *zOut; /* Rendering buffer */
3016830275
int nOut; /* Size of the rendering buffer */
3016930276
char *zExtra = 0; /* Malloced memory used by some conversion */
3017030277
#ifndef SQLITE_OMIT_FLOATING_POINT
@@ -30467,56 +30574,82 @@
3046730574
realvalue = -realvalue;
3046830575
prefix = '-';
3046930576
}else{
3047030577
prefix = flag_prefix;
3047130578
}
30579
+ exp = 0;
3047230580
if( xtype==etGENERIC && precision>0 ) precision--;
3047330581
testcase( precision>0xfff );
30474
- idx = precision & 0xfff;
30475
- rounder = arRound[idx%10];
30476
- while( idx>=10 ){ rounder *= 1.0e-10; idx -= 10; }
30477
- if( xtype==etFLOAT ){
30478
- double rx = (double)realvalue;
30479
- sqlite3_uint64 u;
30480
- int ex;
30481
- memcpy(&u, &rx, sizeof(u));
30482
- ex = -1023 + (int)((u>>52)&0x7ff);
30483
- if( precision+(ex/3) < 15 ) rounder += realvalue*3e-16;
30484
- realvalue += rounder;
30485
- }
30486
- /* Normalize realvalue to within 10.0 > realvalue >= 1.0 */
30487
- exp = 0;
30488
- if( sqlite3IsNaN((double)realvalue) ){
30489
- bufpt = "NaN";
30490
- length = 3;
30491
- break;
30492
- }
30493
- if( realvalue>0.0 ){
30494
- LONGDOUBLE_TYPE scale = 1.0;
30495
- while( realvalue>=1e100*scale && exp<=350 ){ scale *= 1e100;exp+=100;}
30496
- while( realvalue>=1e10*scale && exp<=350 ){ scale *= 1e10; exp+=10; }
30497
- while( realvalue>=10.0*scale && exp<=350 ){ scale *= 10.0; exp++; }
30498
- realvalue /= scale;
30499
- while( realvalue<1e-8 ){ realvalue *= 1e8; exp-=8; }
30500
- while( realvalue<1.0 ){ realvalue *= 10.0; exp--; }
30501
- if( exp>350 ){
30502
- bufpt = buf;
30503
- buf[0] = prefix;
30504
- memcpy(buf+(prefix!=0),"Inf",4);
30505
- length = 3+(prefix!=0);
30506
- break;
30507
- }
30508
- }
30509
- bufpt = buf;
30582
+ if( realvalue<1.0e+16
30583
+ && realvalue==(LONGDOUBLE_TYPE)(longvalue = (u64)realvalue)
30584
+ ){
30585
+ /* Number is a pure integer that can be represented as u64 */
30586
+ for(msd=1; msd*10<=longvalue; msd *= 10, exp++){}
30587
+ if( exp>precision && xtype!=etFLOAT ){
30588
+ u64 rnd = msd/2;
30589
+ int kk = precision;
30590
+ while( kk-- > 0 ){ rnd /= 10; }
30591
+ longvalue += rnd;
30592
+ }
30593
+ }else{
30594
+ msd = 0;
30595
+ longvalue = 0; /* To prevent a compiler warning */
30596
+ idx = precision & 0xfff;
30597
+ rounder = arRound[idx%10];
30598
+ while( idx>=10 ){ rounder *= 1.0e-10; idx -= 10; }
30599
+ if( xtype==etFLOAT ){
30600
+ double rx = (double)realvalue;
30601
+ sqlite3_uint64 u;
30602
+ int ex;
30603
+ memcpy(&u, &rx, sizeof(u));
30604
+ ex = -1023 + (int)((u>>52)&0x7ff);
30605
+ if( precision+(ex/3) < 15 ) rounder += realvalue*3e-16;
30606
+ realvalue += rounder;
30607
+ }
30608
+ if( sqlite3IsNaN((double)realvalue) ){
30609
+ if( flag_zeropad ){
30610
+ bufpt = "null";
30611
+ length = 4;
30612
+ }else{
30613
+ bufpt = "NaN";
30614
+ length = 3;
30615
+ }
30616
+ break;
30617
+ }
30618
+
30619
+ /* Normalize realvalue to within 10.0 > realvalue >= 1.0 */
30620
+ if( ALWAYS(realvalue>0.0) ){
30621
+ LONGDOUBLE_TYPE scale = 1.0;
30622
+ while( realvalue>=1e100*scale && exp<=350){ scale*=1e100;exp+=100;}
30623
+ while( realvalue>=1e10*scale && exp<=350 ){ scale*=1e10; exp+=10; }
30624
+ while( realvalue>=10.0*scale && exp<=350 ){ scale *= 10.0; exp++; }
30625
+ realvalue /= scale;
30626
+ while( realvalue<1e-8 ){ realvalue *= 1e8; exp-=8; }
30627
+ while( realvalue<1.0 ){ realvalue *= 10.0; exp--; }
30628
+ if( exp>350 ){
30629
+ if( flag_zeropad ){
30630
+ realvalue = 9.0;
30631
+ exp = 999;
30632
+ }else{
30633
+ bufpt = buf;
30634
+ buf[0] = prefix;
30635
+ memcpy(buf+(prefix!=0),"Inf",4);
30636
+ length = 3+(prefix!=0);
30637
+ break;
30638
+ }
30639
+ }
30640
+ if( xtype!=etFLOAT ){
30641
+ realvalue += rounder;
30642
+ if( realvalue>=10.0 ){ realvalue *= 0.1; exp++; }
30643
+ }
30644
+ }
30645
+ }
30646
+
3051030647
/*
3051130648
** If the field type is etGENERIC, then convert to either etEXP
3051230649
** or etFLOAT, as appropriate.
3051330650
*/
30514
- if( xtype!=etFLOAT ){
30515
- realvalue += rounder;
30516
- if( realvalue>=10.0 ){ realvalue *= 0.1; exp++; }
30517
- }
3051830651
if( xtype==etGENERIC ){
3051930652
flag_rtz = !flag_alternateform;
3052030653
if( exp<-4 || exp>precision ){
3052130654
xtype = etEXP;
3052230655
}else{
@@ -30529,28 +30662,33 @@
3052930662
if( xtype==etEXP ){
3053030663
e2 = 0;
3053130664
}else{
3053230665
e2 = exp;
3053330666
}
30667
+ nsd = 16 + flag_altform2*10;
30668
+ bufpt = buf;
3053430669
{
3053530670
i64 szBufNeeded; /* Size of a temporary buffer needed */
3053630671
szBufNeeded = MAX(e2,0)+(i64)precision+(i64)width+15;
3053730672
if( szBufNeeded > etBUFSIZE ){
3053830673
bufpt = zExtra = printfTempBuf(pAccum, szBufNeeded);
3053930674
if( bufpt==0 ) return;
3054030675
}
3054130676
}
3054230677
zOut = bufpt;
30543
- nsd = 16 + flag_altform2*10;
3054430678
flag_dp = (precision>0 ?1:0) | flag_alternateform | flag_altform2;
3054530679
/* The sign in front of the number */
3054630680
if( prefix ){
3054730681
*(bufpt++) = prefix;
3054830682
}
3054930683
/* Digits prior to the decimal point */
3055030684
if( e2<0 ){
3055130685
*(bufpt++) = '0';
30686
+ }else if( msd>0 ){
30687
+ for(; e2>=0; e2--){
30688
+ *(bufpt++) = et_getdigit_int(&longvalue,&msd);
30689
+ }
3055230690
}else{
3055330691
for(; e2>=0; e2--){
3055430692
*(bufpt++) = et_getdigit(&realvalue,&nsd);
3055530693
}
3055630694
}
@@ -30563,12 +30701,18 @@
3056330701
for(e2++; e2<0; precision--, e2++){
3056430702
assert( precision>0 );
3056530703
*(bufpt++) = '0';
3056630704
}
3056730705
/* Significant digits after the decimal point */
30568
- while( (precision--)>0 ){
30569
- *(bufpt++) = et_getdigit(&realvalue,&nsd);
30706
+ if( msd>0 ){
30707
+ while( (precision--)>0 ){
30708
+ *(bufpt++) = et_getdigit_int(&longvalue,&msd);
30709
+ }
30710
+ }else{
30711
+ while( (precision--)>0 ){
30712
+ *(bufpt++) = et_getdigit(&realvalue,&nsd);
30713
+ }
3057030714
}
3057130715
/* Remove trailing zeros and the "." if no digits follow the "." */
3057230716
if( flag_rtz && flag_dp ){
3057330717
while( bufpt[-1]=='0' ) *(--bufpt) = 0;
3057430718
assert( bufpt>zOut );
@@ -31245,16 +31389,26 @@
3124531389
sqlite3_str_vappendf(&acc, zFormat, ap);
3124631390
zBuf[acc.nChar] = 0;
3124731391
return zBuf;
3124831392
}
3124931393
SQLITE_API char *sqlite3_snprintf(int n, char *zBuf, const char *zFormat, ...){
31250
- char *z;
31394
+ StrAccum acc;
3125131395
va_list ap;
31396
+ if( n<=0 ) return zBuf;
31397
+#ifdef SQLITE_ENABLE_API_ARMOR
31398
+ if( zBuf==0 || zFormat==0 ) {
31399
+ (void)SQLITE_MISUSE_BKPT;
31400
+ if( zBuf ) zBuf[0] = 0;
31401
+ return zBuf;
31402
+ }
31403
+#endif
31404
+ sqlite3StrAccumInit(&acc, 0, zBuf, n, 0);
3125231405
va_start(ap,zFormat);
31253
- z = sqlite3_vsnprintf(n, zBuf, zFormat, ap);
31406
+ sqlite3_str_vappendf(&acc, zFormat, ap);
3125431407
va_end(ap);
31255
- return z;
31408
+ zBuf[acc.nChar] = 0;
31409
+ return zBuf;
3125631410
}
3125731411
3125831412
/*
3125931413
** This is the routine that actually formats the sqlite3_log() message.
3126031414
** We house it in a separate routine from sqlite3_log() to avoid using
@@ -52652,11 +52806,11 @@
5265252806
** pointers).
5265352807
*/
5265452808
struct PCache {
5265552809
PgHdr *pDirty, *pDirtyTail; /* List of dirty pages in LRU order */
5265652810
PgHdr *pSynced; /* Last synced page in dirty page list */
52657
- int nRefSum; /* Sum of ref counts over all pages */
52811
+ i64 nRefSum; /* Sum of ref counts over all pages */
5265852812
int szCache; /* Configured cache size */
5265952813
int szSpill; /* Size before spilling occurs */
5266052814
int szPage; /* Size of every page in this cache */
5266152815
int szExtra; /* Size of extra space for each page */
5266252816
u8 bPurgeable; /* True if pages are on backing store */
@@ -52682,11 +52836,11 @@
5268252836
static void pcachePageTrace(int i, sqlite3_pcache_page *pLower){
5268352837
PgHdr *pPg;
5268452838
unsigned char *a;
5268552839
int j;
5268652840
pPg = (PgHdr*)pLower->pExtra;
52687
- printf("%3d: nRef %2d flgs %02x data ", i, pPg->nRef, pPg->flags);
52841
+ printf("%3lld: nRef %2d flgs %02x data ", i, pPg->nRef, pPg->flags);
5268852842
a = (unsigned char *)pLower->pBuf;
5268952843
for(j=0; j<12; j++) printf("%02x", a[j]);
5269052844
printf(" ptr %p\n", pPg);
5269152845
}
5269252846
static void pcacheDump(PCache *pCache){
@@ -53426,18 +53580,18 @@
5342653580
** Return the total number of references to all pages held by the cache.
5342753581
**
5342853582
** This is not the total number of pages referenced, but the sum of the
5342953583
** reference count for all pages.
5343053584
*/
53431
-SQLITE_PRIVATE int sqlite3PcacheRefCount(PCache *pCache){
53585
+SQLITE_PRIVATE i64 sqlite3PcacheRefCount(PCache *pCache){
5343253586
return pCache->nRefSum;
5343353587
}
5343453588
5343553589
/*
5343653590
** Return the number of references to the page supplied as an argument.
5343753591
*/
53438
-SQLITE_PRIVATE int sqlite3PcachePageRefcount(PgHdr *p){
53592
+SQLITE_PRIVATE i64 sqlite3PcachePageRefcount(PgHdr *p){
5343953593
return p->nRef;
5344053594
}
5344153595
5344253596
/*
5344353597
** Return the total number of pages in the cache.
@@ -68091,12 +68245,13 @@
6809168245
int mxErr; /* Stop accumulating errors when this reaches zero */
6809268246
int nErr; /* Number of messages written to zErrMsg so far */
6809368247
int rc; /* SQLITE_OK, SQLITE_NOMEM, or SQLITE_INTERRUPT */
6809468248
u32 nStep; /* Number of steps into the integrity_check process */
6809568249
const char *zPfx; /* Error message prefix */
68096
- Pgno v1; /* Value for first %u substitution in zPfx */
68097
- int v2; /* Value for second %d substitution in zPfx */
68250
+ Pgno v0; /* Value for first %u substitution in zPfx (root page) */
68251
+ Pgno v1; /* Value for second %u substitution in zPfx (current pg) */
68252
+ int v2; /* Value for third %d substitution in zPfx */
6809868253
StrAccum errMsg; /* Accumulate the error message text here */
6809968254
u32 *heap; /* Min-heap used for analyzing cell coverage */
6810068255
sqlite3 *db; /* Database connection running the check */
6810168256
};
6810268257
@@ -68555,12 +68710,12 @@
6855568710
*/
6855668711
#ifdef SQLITE_DEBUG
6855768712
int corruptPageError(int lineno, MemPage *p){
6855868713
char *zMsg;
6855968714
sqlite3BeginBenignMalloc();
68560
- zMsg = sqlite3_mprintf("database corruption page %d of %s",
68561
- (int)p->pgno, sqlite3PagerFilename(p->pBt->pPager, 0)
68715
+ zMsg = sqlite3_mprintf("database corruption page %u of %s",
68716
+ p->pgno, sqlite3PagerFilename(p->pBt->pPager, 0)
6856268717
);
6856368718
sqlite3EndBenignMalloc();
6856468719
if( zMsg ){
6856568720
sqlite3ReportError(SQLITE_CORRUPT, lineno, zMsg);
6856668721
}
@@ -69365,12 +69520,29 @@
6936569520
** and number of the varargs parameters) is determined by the eHintType
6936669521
** parameter. See the definitions of the BTREE_HINT_* macros for details.
6936769522
*/
6936869523
SQLITE_PRIVATE void sqlite3BtreeCursorHint(BtCursor *pCur, int eHintType, ...){
6936969524
/* Used only by system that substitute their own storage engine */
69525
+#ifdef SQLITE_DEBUG
69526
+ if( ALWAYS(eHintType==BTREE_HINT_RANGE) ){
69527
+ va_list ap;
69528
+ Expr *pExpr;
69529
+ Walker w;
69530
+ memset(&w, 0, sizeof(w));
69531
+ w.xExprCallback = sqlite3CursorRangeHintExprCheck;
69532
+ va_start(ap, eHintType);
69533
+ pExpr = va_arg(ap, Expr*);
69534
+ w.u.aMem = va_arg(ap, Mem*);
69535
+ va_end(ap);
69536
+ assert( pExpr!=0 );
69537
+ assert( w.u.aMem!=0 );
69538
+ sqlite3WalkExpr(&w, pExpr);
69539
+ }
69540
+#endif /* SQLITE_DEBUG */
6937069541
}
69371
-#endif
69542
+#endif /* SQLITE_ENABLE_CURSOR_HINTS */
69543
+
6937269544
6937369545
/*
6937469546
** Provide flag hints to the cursor.
6937569547
*/
6937669548
SQLITE_PRIVATE void sqlite3BtreeCursorHintFlags(BtCursor *pCur, unsigned x){
@@ -69451,11 +69623,11 @@
6945169623
}
6945269624
assert( offset <= (int)pBt->usableSize-5 );
6945369625
pPtrmap = (u8 *)sqlite3PagerGetData(pDbPage);
6945469626
6945569627
if( eType!=pPtrmap[offset] || get4byte(&pPtrmap[offset+1])!=parent ){
69456
- TRACE(("PTRMAP_UPDATE: %d->(%d,%d)\n", key, eType, parent));
69628
+ TRACE(("PTRMAP_UPDATE: %u->(%u,%u)\n", key, eType, parent));
6945769629
*pRC= rc = sqlite3PagerWrite(pDbPage);
6945869630
if( rc==SQLITE_OK ){
6945969631
pPtrmap[offset] = eType;
6946069632
put4byte(&pPtrmap[offset+1], parent);
6946169633
}
@@ -69650,31 +69822,35 @@
6965069822
** This routine is a high-runner.
6965169823
*/
6965269824
iKey = *pIter;
6965369825
if( iKey>=0x80 ){
6965469826
u8 x;
69655
- iKey = ((iKey&0x7f)<<7) | ((x = *++pIter) & 0x7f);
69656
- if( x>=0x80 ){
69657
- iKey = (iKey<<7) | ((x =*++pIter) & 0x7f);
69658
- if( x>=0x80 ){
69659
- iKey = (iKey<<7) | ((x = *++pIter) & 0x7f);
69660
- if( x>=0x80 ){
69661
- iKey = (iKey<<7) | ((x = *++pIter) & 0x7f);
69662
- if( x>=0x80 ){
69663
- iKey = (iKey<<7) | ((x = *++pIter) & 0x7f);
69664
- if( x>=0x80 ){
69665
- iKey = (iKey<<7) | ((x = *++pIter) & 0x7f);
69666
- if( x>=0x80 ){
69667
- iKey = (iKey<<7) | ((x = *++pIter) & 0x7f);
69668
- if( x>=0x80 ){
69669
- iKey = (iKey<<8) | (*++pIter);
69670
- }
69671
- }
69672
- }
69673
- }
69674
- }
69675
- }
69827
+ iKey = (iKey<<7) ^ (x = *++pIter);
69828
+ if( x>=0x80 ){
69829
+ iKey = (iKey<<7) ^ (x = *++pIter);
69830
+ if( x>=0x80 ){
69831
+ iKey = (iKey<<7) ^ 0x10204000 ^ (x = *++pIter);
69832
+ if( x>=0x80 ){
69833
+ iKey = (iKey<<7) ^ 0x4000 ^ (x = *++pIter);
69834
+ if( x>=0x80 ){
69835
+ iKey = (iKey<<7) ^ 0x4000 ^ (x = *++pIter);
69836
+ if( x>=0x80 ){
69837
+ iKey = (iKey<<7) ^ 0x4000 ^ (x = *++pIter);
69838
+ if( x>=0x80 ){
69839
+ iKey = (iKey<<7) ^ 0x4000 ^ (x = *++pIter);
69840
+ if( x>=0x80 ){
69841
+ iKey = (iKey<<8) ^ 0x8000 ^ (*++pIter);
69842
+ }
69843
+ }
69844
+ }
69845
+ }
69846
+ }
69847
+ }else{
69848
+ iKey ^= 0x204000;
69849
+ }
69850
+ }else{
69851
+ iKey ^= 0x4000;
6967669852
}
6967769853
}
6967869854
pIter++;
6967969855
6968069856
pInfo->nKey = *(i64*)&iKey;
@@ -69747,14 +69923,57 @@
6974769923
** data header and the local payload, but not any overflow page or
6974869924
** the space used by the cell pointer.
6974969925
**
6975069926
** cellSizePtrNoPayload() => table internal nodes
6975169927
** cellSizePtrTableLeaf() => table leaf nodes
69752
-** cellSizePtr() => all index nodes & table leaf nodes
69928
+** cellSizePtr() => index internal nodes
69929
+** cellSizeIdxLeaf() => index leaf nodes
6975369930
*/
6975469931
static u16 cellSizePtr(MemPage *pPage, u8 *pCell){
69755
- u8 *pIter = pCell + pPage->childPtrSize; /* For looping over bytes of pCell */
69932
+ u8 *pIter = pCell + 4; /* For looping over bytes of pCell */
69933
+ u8 *pEnd; /* End mark for a varint */
69934
+ u32 nSize; /* Size value to return */
69935
+
69936
+#ifdef SQLITE_DEBUG
69937
+ /* The value returned by this function should always be the same as
69938
+ ** the (CellInfo.nSize) value found by doing a full parse of the
69939
+ ** cell. If SQLITE_DEBUG is defined, an assert() at the bottom of
69940
+ ** this function verifies that this invariant is not violated. */
69941
+ CellInfo debuginfo;
69942
+ pPage->xParseCell(pPage, pCell, &debuginfo);
69943
+#endif
69944
+
69945
+ assert( pPage->childPtrSize==4 );
69946
+ nSize = *pIter;
69947
+ if( nSize>=0x80 ){
69948
+ pEnd = &pIter[8];
69949
+ nSize &= 0x7f;
69950
+ do{
69951
+ nSize = (nSize<<7) | (*++pIter & 0x7f);
69952
+ }while( *(pIter)>=0x80 && pIter<pEnd );
69953
+ }
69954
+ pIter++;
69955
+ testcase( nSize==pPage->maxLocal );
69956
+ testcase( nSize==(u32)pPage->maxLocal+1 );
69957
+ if( nSize<=pPage->maxLocal ){
69958
+ nSize += (u32)(pIter - pCell);
69959
+ assert( nSize>4 );
69960
+ }else{
69961
+ int minLocal = pPage->minLocal;
69962
+ nSize = minLocal + (nSize - minLocal) % (pPage->pBt->usableSize - 4);
69963
+ testcase( nSize==pPage->maxLocal );
69964
+ testcase( nSize==(u32)pPage->maxLocal+1 );
69965
+ if( nSize>pPage->maxLocal ){
69966
+ nSize = minLocal;
69967
+ }
69968
+ nSize += 4 + (u16)(pIter - pCell);
69969
+ }
69970
+ assert( nSize==debuginfo.nSize || CORRUPT_DB );
69971
+ return (u16)nSize;
69972
+}
69973
+static u16 cellSizePtrIdxLeaf(MemPage *pPage, u8 *pCell){
69974
+ u8 *pIter = pCell; /* For looping over bytes of pCell */
6975669975
u8 *pEnd; /* End mark for a varint */
6975769976
u32 nSize; /* Size value to return */
6975869977
6975969978
#ifdef SQLITE_DEBUG
6976069979
/* The value returned by this function should always be the same as
@@ -69763,10 +69982,11 @@
6976369982
** this function verifies that this invariant is not violated. */
6976469983
CellInfo debuginfo;
6976569984
pPage->xParseCell(pPage, pCell, &debuginfo);
6976669985
#endif
6976769986
69987
+ assert( pPage->childPtrSize==0 );
6976869988
nSize = *pIter;
6976969989
if( nSize>=0x80 ){
6977069990
pEnd = &pIter[8];
6977169991
nSize &= 0x7f;
6977269992
do{
@@ -69999,14 +70219,14 @@
6999970219
testcase( pc==iCellFirst );
7000070220
testcase( pc==iCellLast );
7000170221
/* These conditions have already been verified in btreeInitPage()
7000270222
** if PRAGMA cell_size_check=ON.
7000370223
*/
70004
- if( pc<iCellStart || pc>iCellLast ){
70224
+ if( pc>iCellLast ){
7000570225
return SQLITE_CORRUPT_PAGE(pPage);
7000670226
}
70007
- assert( pc>=iCellStart && pc<=iCellLast );
70227
+ assert( pc>=0 && pc<=iCellLast );
7000870228
size = pPage->xCellSize(pPage, &src[pc]);
7000970229
cbrk -= size;
7001070230
if( cbrk<iCellStart || pc+size>usableSize ){
7001170231
return SQLITE_CORRUPT_PAGE(pPage);
7001270232
}
@@ -70117,11 +70337,11 @@
7011770337
** all the space together, however. This routine will avoid using
7011870338
** the first two bytes past the cell pointer area since presumably this
7011970339
** allocation is being made in order to insert a new cell, so we will
7012070340
** also end up needing a new cell pointer.
7012170341
*/
70122
-static int allocateSpace(MemPage *pPage, int nByte, int *pIdx){
70342
+static SQLITE_INLINE int allocateSpace(MemPage *pPage, int nByte, int *pIdx){
7012370343
const int hdr = pPage->hdrOffset; /* Local cache of pPage->hdrOffset */
7012470344
u8 * const data = pPage->aData; /* Local cache of pPage->aData */
7012570345
int top; /* First byte of cell content area */
7012670346
int rc = SQLITE_OK; /* Integer return code */
7012770347
u8 *pTmp; /* Temp ptr into data[] */
@@ -70143,17 +70363,18 @@
7014370363
** then the cell content offset of an empty page wants to be 65536.
7014470364
** However, that integer is too large to be stored in a 2-byte unsigned
7014570365
** integer, so a value of 0 is used in its place. */
7014670366
pTmp = &data[hdr+5];
7014770367
top = get2byte(pTmp);
70148
- assert( top<=(int)pPage->pBt->usableSize ); /* by btreeComputeFreeSpace() */
7014970368
if( gap>top ){
7015070369
if( top==0 && pPage->pBt->usableSize==65536 ){
7015170370
top = 65536;
7015270371
}else{
7015370372
return SQLITE_CORRUPT_PAGE(pPage);
7015470373
}
70374
+ }else if( top>(int)pPage->pBt->usableSize ){
70375
+ return SQLITE_CORRUPT_PAGE(pPage);
7015570376
}
7015670377
7015770378
/* If there is enough space between gap and top for one more cell pointer,
7015870379
** and if the freelist is not empty, then search the
7015970380
** freelist looking for a slot big enough to satisfy the request.
@@ -70232,11 +70453,11 @@
7023270453
assert( sqlite3PagerIswriteable(pPage->pDbPage) );
7023370454
assert( CORRUPT_DB || iStart>=pPage->hdrOffset+6+pPage->childPtrSize );
7023470455
assert( CORRUPT_DB || iEnd <= pPage->pBt->usableSize );
7023570456
assert( sqlite3_mutex_held(pPage->pBt->mutex) );
7023670457
assert( iSize>=4 ); /* Minimum cell size is 4 */
70237
- assert( iStart<=pPage->pBt->usableSize-4 );
70458
+ assert( CORRUPT_DB || iStart<=pPage->pBt->usableSize-4 );
7023870459
7023970460
/* The list of freeblocks must be in ascending order. Find the
7024070461
** spot on the list where iStart should be inserted.
7024170462
*/
7024270463
hdr = pPage->hdrOffset;
@@ -70289,10 +70510,15 @@
7028970510
if( nFrag>data[hdr+7] ) return SQLITE_CORRUPT_PAGE(pPage);
7029070511
data[hdr+7] -= nFrag;
7029170512
}
7029270513
pTmp = &data[hdr+5];
7029370514
x = get2byte(pTmp);
70515
+ if( pPage->pBt->btsFlags & BTS_FAST_SECURE ){
70516
+ /* Overwrite deleted information with zeros when the secure_delete
70517
+ ** option is enabled */
70518
+ memset(&data[iStart], 0, iSize);
70519
+ }
7029470520
if( iStart<=x ){
7029570521
/* The new freeblock is at the beginning of the cell content area,
7029670522
** so just extend the cell content area rather than create another
7029770523
** freelist entry */
7029870524
if( iStart<x ) return SQLITE_CORRUPT_PAGE(pPage);
@@ -70300,18 +70526,13 @@
7030070526
put2byte(&data[hdr+1], iFreeBlk);
7030170527
put2byte(&data[hdr+5], iEnd);
7030270528
}else{
7030370529
/* Insert the new freeblock into the freelist */
7030470530
put2byte(&data[iPtr], iStart);
70305
- }
70306
- if( pPage->pBt->btsFlags & BTS_FAST_SECURE ){
70307
- /* Overwrite deleted information with zeros when the secure_delete
70308
- ** option is enabled */
70309
- memset(&data[iStart], 0, iSize);
70310
- }
70311
- put2byte(&data[iStart], iFreeBlk);
70312
- put2byte(&data[iStart+2], iSize);
70531
+ put2byte(&data[iStart], iFreeBlk);
70532
+ put2byte(&data[iStart+2], iSize);
70533
+ }
7031370534
pPage->nFree += iOrigSize;
7031470535
return SQLITE_OK;
7031570536
}
7031670537
7031770538
/*
@@ -70344,18 +70565,18 @@
7034470565
pPage->maxLocal = pBt->maxLeaf;
7034570566
pPage->minLocal = pBt->minLeaf;
7034670567
}else if( flagByte==(PTF_ZERODATA | PTF_LEAF) ){
7034770568
pPage->intKey = 0;
7034870569
pPage->intKeyLeaf = 0;
70349
- pPage->xCellSize = cellSizePtr;
70570
+ pPage->xCellSize = cellSizePtrIdxLeaf;
7035070571
pPage->xParseCell = btreeParseCellPtrIndex;
7035170572
pPage->maxLocal = pBt->maxLocal;
7035270573
pPage->minLocal = pBt->minLocal;
7035370574
}else{
7035470575
pPage->intKey = 0;
7035570576
pPage->intKeyLeaf = 0;
70356
- pPage->xCellSize = cellSizePtr;
70577
+ pPage->xCellSize = cellSizePtrIdxLeaf;
7035770578
pPage->xParseCell = btreeParseCellPtrIndex;
7035870579
return SQLITE_CORRUPT_PAGE(pPage);
7035970580
}
7036070581
}else{
7036170582
pPage->childPtrSize = 4;
@@ -72217,11 +72438,11 @@
7221772438
assert( sqlite3_mutex_held(pBt->mutex) );
7221872439
assert( pDbPage->pBt==pBt );
7221972440
if( iDbPage<3 ) return SQLITE_CORRUPT_BKPT;
7222072441
7222172442
/* Move page iDbPage from its current location to page number iFreePage */
72222
- TRACE(("AUTOVACUUM: Moving %d to free page %d (ptr page %d type %d)\n",
72443
+ TRACE(("AUTOVACUUM: Moving %u to free page %u (ptr page %u type %u)\n",
7222372444
iDbPage, iFreePage, iPtrPage, eType));
7222472445
rc = sqlite3PagerMovepage(pPager, pDbPage->pDbPage, iFreePage, isCommit);
7222572446
if( rc!=SQLITE_OK ){
7222672447
return rc;
7222772448
}
@@ -74503,11 +74724,12 @@
7450374724
}
7450474725
}
7450574726
7450674727
pPage = pCur->pPage;
7450774728
idx = ++pCur->ix;
74508
- if( NEVER(!pPage->isInit) || sqlite3FaultSim(412) ){
74729
+ if( sqlite3FaultSim(412) ) pPage->isInit = 0;
74730
+ if( !pPage->isInit ){
7450974731
return SQLITE_CORRUPT_BKPT;
7451074732
}
7451174733
7451274734
if( idx>=pPage->nCell ){
7451374735
if( !pPage->leaf ){
@@ -74766,11 +74988,11 @@
7476674988
}
7476774989
*pPgno = iTrunk;
7476874990
memcpy(&pPage1->aData[32], &pTrunk->aData[0], 4);
7476974991
*ppPage = pTrunk;
7477074992
pTrunk = 0;
74771
- TRACE(("ALLOCATE: %d trunk - %d free pages left\n", *pPgno, n-1));
74993
+ TRACE(("ALLOCATE: %u trunk - %u free pages left\n", *pPgno, n-1));
7477274994
}else if( k>(u32)(pBt->usableSize/4 - 2) ){
7477374995
/* Value of k is out of range. Database corruption */
7477474996
rc = SQLITE_CORRUPT_PGNO(iTrunk);
7477574997
goto end_allocate_page;
7477674998
#ifndef SQLITE_OMIT_AUTOVACUUM
@@ -74832,11 +75054,11 @@
7483275054
}
7483375055
put4byte(&pPrevTrunk->aData[0], iNewTrunk);
7483475056
}
7483575057
}
7483675058
pTrunk = 0;
74837
- TRACE(("ALLOCATE: %d trunk - %d free pages left\n", *pPgno, n-1));
75059
+ TRACE(("ALLOCATE: %u trunk - %u free pages left\n", *pPgno, n-1));
7483875060
#endif
7483975061
}else if( k>0 ){
7484075062
/* Extract a leaf from the trunk */
7484175063
u32 closest;
7484275064
Pgno iPage;
@@ -74877,12 +75099,12 @@
7487775099
if( !searchList
7487875100
|| (iPage==nearby || (iPage<nearby && eMode==BTALLOC_LE))
7487975101
){
7488075102
int noContent;
7488175103
*pPgno = iPage;
74882
- TRACE(("ALLOCATE: %d was leaf %d of %d on trunk %d"
74883
- ": %d more free pages\n",
75104
+ TRACE(("ALLOCATE: %u was leaf %u of %u on trunk %u"
75105
+ ": %u more free pages\n",
7488475106
*pPgno, closest+1, k, pTrunk->pgno, n-1));
7488575107
rc = sqlite3PagerWrite(pTrunk->pDbPage);
7488675108
if( rc ) goto end_allocate_page;
7488775109
if( closest<k-1 ){
7488875110
memcpy(&aData[8+closest*4], &aData[4+k*4], 4);
@@ -74934,11 +75156,11 @@
7493475156
/* If *pPgno refers to a pointer-map page, allocate two new pages
7493575157
** at the end of the file instead of one. The first allocated page
7493675158
** becomes a new pointer-map page, the second is used by the caller.
7493775159
*/
7493875160
MemPage *pPg = 0;
74939
- TRACE(("ALLOCATE: %d from end of file (pointer-map page)\n", pBt->nPage));
75161
+ TRACE(("ALLOCATE: %u from end of file (pointer-map page)\n", pBt->nPage));
7494075162
assert( pBt->nPage!=PENDING_BYTE_PAGE(pBt) );
7494175163
rc = btreeGetUnusedPage(pBt, pBt->nPage, &pPg, bNoContent);
7494275164
if( rc==SQLITE_OK ){
7494375165
rc = sqlite3PagerWrite(pPg->pDbPage);
7494475166
releasePage(pPg);
@@ -74957,11 +75179,11 @@
7495775179
rc = sqlite3PagerWrite((*ppPage)->pDbPage);
7495875180
if( rc!=SQLITE_OK ){
7495975181
releasePage(*ppPage);
7496075182
*ppPage = 0;
7496175183
}
74962
- TRACE(("ALLOCATE: %d from end of file\n", *pPgno));
75184
+ TRACE(("ALLOCATE: %u from end of file\n", *pPgno));
7496375185
}
7496475186
7496575187
assert( CORRUPT_DB || *pPgno!=PENDING_BYTE_PAGE(pBt) );
7496675188
7496775189
end_allocate_page:
@@ -75085,11 +75307,11 @@
7508575307
if( pPage && (pBt->btsFlags & BTS_SECURE_DELETE)==0 ){
7508675308
sqlite3PagerDontWrite(pPage->pDbPage);
7508775309
}
7508875310
rc = btreeSetHasContent(pBt, iPage);
7508975311
}
75090
- TRACE(("FREE-PAGE: %d leaf on trunk page %d\n",pPage->pgno,pTrunk->pgno));
75312
+ TRACE(("FREE-PAGE: %u leaf on trunk page %u\n",pPage->pgno,pTrunk->pgno));
7509175313
goto freepage_out;
7509275314
}
7509375315
}
7509475316
7509575317
/* If control flows to this point, then it was not possible to add the
@@ -75106,11 +75328,11 @@
7510675328
goto freepage_out;
7510775329
}
7510875330
put4byte(pPage->aData, iTrunk);
7510975331
put4byte(&pPage->aData[4], 0);
7511075332
put4byte(&pPage1->aData[32], iPage);
75111
- TRACE(("FREE-PAGE: %d new trunk page replacing %d\n", pPage->pgno, iTrunk));
75333
+ TRACE(("FREE-PAGE: %u new trunk page replacing %u\n", pPage->pgno, iTrunk));
7511275334
7511375335
freepage_out:
7511475336
if( pPage ){
7511575337
pPage->isInit = 0;
7511675338
}
@@ -75465,10 +75687,18 @@
7546575687
** pTemp is not null. Regardless of pTemp, allocate a new entry
7546675688
** in pPage->apOvfl[] and make it point to the cell content (either
7546775689
** in pTemp or the original pCell) and also record its index.
7546875690
** Allocating a new entry in pPage->aCell[] implies that
7546975691
** pPage->nOverflow is incremented.
75692
+**
75693
+** The insertCellFast() routine below works exactly the same as
75694
+** insertCell() except that it lacks the pTemp and iChild parameters
75695
+** which are assumed zero. Other than that, the two routines are the
75696
+** same.
75697
+**
75698
+** Fixes or enhancements to this routine should be reflected in
75699
+** insertCellFast()!
7547075700
*/
7547175701
static int insertCell(
7547275702
MemPage *pPage, /* Page into which we are copying */
7547375703
int i, /* New cell becomes the i-th cell of the page */
7547475704
u8 *pCell, /* Content of the new cell */
@@ -75487,18 +75717,107 @@
7548775717
assert( pPage->nOverflow<=ArraySize(pPage->apOvfl) );
7548875718
assert( ArraySize(pPage->apOvfl)==ArraySize(pPage->aiOvfl) );
7548975719
assert( sqlite3_mutex_held(pPage->pBt->mutex) );
7549075720
assert( sz==pPage->xCellSize(pPage, pCell) || CORRUPT_DB );
7549175721
assert( pPage->nFree>=0 );
75722
+ assert( iChild>0 );
7549275723
if( pPage->nOverflow || sz+2>pPage->nFree ){
7549375724
if( pTemp ){
7549475725
memcpy(pTemp, pCell, sz);
7549575726
pCell = pTemp;
7549675727
}
75497
- if( iChild ){
75498
- put4byte(pCell, iChild);
75728
+ put4byte(pCell, iChild);
75729
+ j = pPage->nOverflow++;
75730
+ /* Comparison against ArraySize-1 since we hold back one extra slot
75731
+ ** as a contingency. In other words, never need more than 3 overflow
75732
+ ** slots but 4 are allocated, just to be safe. */
75733
+ assert( j < ArraySize(pPage->apOvfl)-1 );
75734
+ pPage->apOvfl[j] = pCell;
75735
+ pPage->aiOvfl[j] = (u16)i;
75736
+
75737
+ /* When multiple overflows occur, they are always sequential and in
75738
+ ** sorted order. This invariants arise because multiple overflows can
75739
+ ** only occur when inserting divider cells into the parent page during
75740
+ ** balancing, and the dividers are adjacent and sorted.
75741
+ */
75742
+ assert( j==0 || pPage->aiOvfl[j-1]<(u16)i ); /* Overflows in sorted order */
75743
+ assert( j==0 || i==pPage->aiOvfl[j-1]+1 ); /* Overflows are sequential */
75744
+ }else{
75745
+ int rc = sqlite3PagerWrite(pPage->pDbPage);
75746
+ if( NEVER(rc!=SQLITE_OK) ){
75747
+ return rc;
7549975748
}
75749
+ assert( sqlite3PagerIswriteable(pPage->pDbPage) );
75750
+ data = pPage->aData;
75751
+ assert( &data[pPage->cellOffset]==pPage->aCellIdx );
75752
+ rc = allocateSpace(pPage, sz, &idx);
75753
+ if( rc ){ return rc; }
75754
+ /* The allocateSpace() routine guarantees the following properties
75755
+ ** if it returns successfully */
75756
+ assert( idx >= 0 );
75757
+ assert( idx >= pPage->cellOffset+2*pPage->nCell+2 || CORRUPT_DB );
75758
+ assert( idx+sz <= (int)pPage->pBt->usableSize );
75759
+ pPage->nFree -= (u16)(2 + sz);
75760
+ /* In a corrupt database where an entry in the cell index section of
75761
+ ** a btree page has a value of 3 or less, the pCell value might point
75762
+ ** as many as 4 bytes in front of the start of the aData buffer for
75763
+ ** the source page. Make sure this does not cause problems by not
75764
+ ** reading the first 4 bytes */
75765
+ memcpy(&data[idx+4], pCell+4, sz-4);
75766
+ put4byte(&data[idx], iChild);
75767
+ pIns = pPage->aCellIdx + i*2;
75768
+ memmove(pIns+2, pIns, 2*(pPage->nCell - i));
75769
+ put2byte(pIns, idx);
75770
+ pPage->nCell++;
75771
+ /* increment the cell count */
75772
+ if( (++data[pPage->hdrOffset+4])==0 ) data[pPage->hdrOffset+3]++;
75773
+ assert( get2byte(&data[pPage->hdrOffset+3])==pPage->nCell || CORRUPT_DB );
75774
+#ifndef SQLITE_OMIT_AUTOVACUUM
75775
+ if( pPage->pBt->autoVacuum ){
75776
+ int rc2 = SQLITE_OK;
75777
+ /* The cell may contain a pointer to an overflow page. If so, write
75778
+ ** the entry for the overflow page into the pointer map.
75779
+ */
75780
+ ptrmapPutOvflPtr(pPage, pPage, pCell, &rc2);
75781
+ if( rc2 ) return rc2;
75782
+ }
75783
+#endif
75784
+ }
75785
+ return SQLITE_OK;
75786
+}
75787
+
75788
+/*
75789
+** This variant of insertCell() assumes that the pTemp and iChild
75790
+** parameters are both zero. Use this variant in sqlite3BtreeInsert()
75791
+** for performance improvement, and also so that this variant is only
75792
+** called from that one place, and is thus inlined, and thus runs must
75793
+** faster.
75794
+**
75795
+** Fixes or enhancements to this routine should be reflected into
75796
+** the insertCell() routine.
75797
+*/
75798
+static int insertCellFast(
75799
+ MemPage *pPage, /* Page into which we are copying */
75800
+ int i, /* New cell becomes the i-th cell of the page */
75801
+ u8 *pCell, /* Content of the new cell */
75802
+ int sz /* Bytes of content in pCell */
75803
+){
75804
+ int idx = 0; /* Where to write new cell content in data[] */
75805
+ int j; /* Loop counter */
75806
+ u8 *data; /* The content of the whole page */
75807
+ u8 *pIns; /* The point in pPage->aCellIdx[] where no cell inserted */
75808
+
75809
+ assert( i>=0 && i<=pPage->nCell+pPage->nOverflow );
75810
+ assert( MX_CELL(pPage->pBt)<=10921 );
75811
+ assert( pPage->nCell<=MX_CELL(pPage->pBt) || CORRUPT_DB );
75812
+ assert( pPage->nOverflow<=ArraySize(pPage->apOvfl) );
75813
+ assert( ArraySize(pPage->apOvfl)==ArraySize(pPage->aiOvfl) );
75814
+ assert( sqlite3_mutex_held(pPage->pBt->mutex) );
75815
+ assert( sz==pPage->xCellSize(pPage, pCell) || CORRUPT_DB );
75816
+ assert( pPage->nFree>=0 );
75817
+ assert( pPage->nOverflow==0 );
75818
+ if( sz+2>pPage->nFree ){
7550075819
j = pPage->nOverflow++;
7550175820
/* Comparison against ArraySize-1 since we hold back one extra slot
7550275821
** as a contingency. In other words, never need more than 3 overflow
7550375822
** slots but 4 are allocated, just to be safe. */
7550475823
assert( j < ArraySize(pPage->apOvfl)-1 );
@@ -75526,21 +75845,11 @@
7552675845
** if it returns successfully */
7552775846
assert( idx >= 0 );
7552875847
assert( idx >= pPage->cellOffset+2*pPage->nCell+2 || CORRUPT_DB );
7552975848
assert( idx+sz <= (int)pPage->pBt->usableSize );
7553075849
pPage->nFree -= (u16)(2 + sz);
75531
- if( iChild ){
75532
- /* In a corrupt database where an entry in the cell index section of
75533
- ** a btree page has a value of 3 or less, the pCell value might point
75534
- ** as many as 4 bytes in front of the start of the aData buffer for
75535
- ** the source page. Make sure this does not cause problems by not
75536
- ** reading the first 4 bytes */
75537
- memcpy(&data[idx+4], pCell+4, sz-4);
75538
- put4byte(&data[idx], iChild);
75539
- }else{
75540
- memcpy(&data[idx], pCell, sz);
75541
- }
75850
+ memcpy(&data[idx], pCell, sz);
7554275851
pIns = pPage->aCellIdx + i*2;
7554375852
memmove(pIns+2, pIns, 2*(pPage->nCell - i));
7554475853
put2byte(pIns, idx);
7554575854
pPage->nCell++;
7554675855
/* increment the cell count */
@@ -75721,11 +76030,11 @@
7572176030
int k; /* Current slot in pCArray->apEnd[] */
7572276031
u8 *pSrcEnd; /* Current pCArray->apEnd[k] value */
7572376032
7572476033
assert( i<iEnd );
7572576034
j = get2byte(&aData[hdr+5]);
75726
- if( j>(u32)usableSize ){ j = 0; }
76035
+ if( NEVER(j>(u32)usableSize) ){ j = 0; }
7572776036
memcpy(&pTmp[j], &aData[j], usableSize - j);
7572876037
7572976038
for(k=0; pCArray->ixNx[k]<=i && ALWAYS(k<NB*2); k++){}
7573076039
pSrcEnd = pCArray->apEnd[k];
7573176040
@@ -75865,46 +76174,54 @@
7586576174
){
7586676175
u8 * const aData = pPg->aData;
7586776176
u8 * const pEnd = &aData[pPg->pBt->usableSize];
7586876177
u8 * const pStart = &aData[pPg->hdrOffset + 8 + pPg->childPtrSize];
7586976178
int nRet = 0;
75870
- int i;
76179
+ int i, j;
7587176180
int iEnd = iFirst + nCell;
75872
- u8 *pFree = 0; /* \__ Parameters for pending call to */
75873
- int szFree = 0; /* / freeSpace() */
76181
+ int nFree = 0;
76182
+ int aOfst[10];
76183
+ int aAfter[10];
7587476184
7587576185
for(i=iFirst; i<iEnd; i++){
7587676186
u8 *pCell = pCArray->apCell[i];
7587776187
if( SQLITE_WITHIN(pCell, pStart, pEnd) ){
7587876188
int sz;
76189
+ int iAfter;
76190
+ int iOfst;
7587976191
/* No need to use cachedCellSize() here. The sizes of all cells that
7588076192
** are to be freed have already been computing while deciding which
7588176193
** cells need freeing */
7588276194
sz = pCArray->szCell[i]; assert( sz>0 );
75883
- if( pFree!=(pCell + sz) ){
75884
- if( pFree ){
75885
- assert( pFree>aData && (pFree - aData)<65536 );
75886
- freeSpace(pPg, (u16)(pFree - aData), szFree);
75887
- }
75888
- pFree = pCell;
75889
- szFree = sz;
75890
- if( pFree+sz>pEnd ){
75891
- return 0;
75892
- }
75893
- }else{
75894
- /* The current cell is adjacent to and before the pFree cell.
75895
- ** Combine the two regions into one to reduce the number of calls
75896
- ** to freeSpace(). */
75897
- pFree = pCell;
75898
- szFree += sz;
76195
+ iOfst = (u16)(pCell - aData);
76196
+ iAfter = iOfst+sz;
76197
+ for(j=0; j<nFree; j++){
76198
+ if( aOfst[j]==iAfter ){
76199
+ aOfst[j] = iOfst;
76200
+ break;
76201
+ }else if( aAfter[j]==iOfst ){
76202
+ aAfter[j] = iAfter;
76203
+ break;
76204
+ }
76205
+ }
76206
+ if( j>=nFree ){
76207
+ if( nFree>=sizeof(aOfst)/sizeof(aOfst[0]) ){
76208
+ for(j=0; j<nFree; j++){
76209
+ freeSpace(pPg, aOfst[j], aAfter[j]-aOfst[j]);
76210
+ }
76211
+ nFree = 0;
76212
+ }
76213
+ aOfst[nFree] = iOfst;
76214
+ aAfter[nFree] = iAfter;
76215
+ if( &aData[iAfter]>pEnd ) return 0;
76216
+ nFree++;
7589976217
}
7590076218
nRet++;
7590176219
}
7590276220
}
75903
- if( pFree ){
75904
- assert( pFree>aData && (pFree - aData)<65536 );
75905
- freeSpace(pPg, (u16)(pFree - aData), szFree);
76221
+ for(j=0; j<nFree; j++){
76222
+ freeSpace(pPg, aOfst[j], aAfter[j]-aOfst[j]);
7590676223
}
7590776224
return nRet;
7590876225
}
7590976226
7591076227
/*
@@ -75955,11 +76272,11 @@
7595576272
nCell -= nTail;
7595676273
}
7595776274
7595876275
pData = &aData[get2byteNotZero(&aData[hdr+5])];
7595976276
if( pData<pBegin ) goto editpage_fail;
75960
- if( pData>pPg->aDataEnd ) goto editpage_fail;
76277
+ if( NEVER(pData>pPg->aDataEnd) ) goto editpage_fail;
7596176278
7596276279
/* Add cells to the start of the page */
7596376280
if( iNew<iOld ){
7596476281
int nAdd = MIN(nNew,iOld-iNew);
7596576282
assert( (iOld-iNew)<nNew || nCell==0 || CORRUPT_DB );
@@ -76692,11 +77009,11 @@
7669277009
** (2) pPage is a virtual root page. A virtual root page is when
7669377010
** the real root page is page 1 and we are the only child of
7669477011
** that page.
7669577012
*/
7669677013
assert( cntNew[0]>0 || (pParent->pgno==1 && pParent->nCell==0) || CORRUPT_DB);
76697
- TRACE(("BALANCE: old: %d(nc=%d) %d(nc=%d) %d(nc=%d)\n",
77014
+ TRACE(("BALANCE: old: %u(nc=%u) %u(nc=%u) %u(nc=%u)\n",
7669877015
apOld[0]->pgno, apOld[0]->nCell,
7669977016
nOld>=2 ? apOld[1]->pgno : 0, nOld>=2 ? apOld[1]->nCell : 0,
7670077017
nOld>=3 ? apOld[2]->pgno : 0, nOld>=3 ? apOld[2]->nCell : 0
7670177018
));
7670277019
@@ -76776,12 +77093,12 @@
7677677093
apNew[i]->pgno = pgnoB;
7677777094
apNew[iB]->pgno = pgnoA;
7677877095
}
7677977096
}
7678077097
76781
- TRACE(("BALANCE: new: %d(%d nc=%d) %d(%d nc=%d) %d(%d nc=%d) "
76782
- "%d(%d nc=%d) %d(%d nc=%d)\n",
77098
+ TRACE(("BALANCE: new: %u(%u nc=%u) %u(%u nc=%u) %u(%u nc=%u) "
77099
+ "%u(%u nc=%u) %u(%u nc=%u)\n",
7678377100
apNew[0]->pgno, szNew[0], cntNew[0],
7678477101
nNew>=2 ? apNew[1]->pgno : 0, nNew>=2 ? szNew[1] : 0,
7678577102
nNew>=2 ? cntNew[1] - cntNew[0] - !leafData : 0,
7678677103
nNew>=3 ? apNew[2]->pgno : 0, nNew>=3 ? szNew[2] : 0,
7678777104
nNew>=3 ? cntNew[2] - cntNew[1] - !leafData : 0,
@@ -77022,11 +77339,11 @@
7702277339
ptrmapPut(pBt, key, PTRMAP_BTREE, apNew[i]->pgno, &rc);
7702377340
}
7702477341
}
7702577342
7702677343
assert( pParent->isInit );
77027
- TRACE(("BALANCE: finished: old=%d new=%d cells=%d\n",
77344
+ TRACE(("BALANCE: finished: old=%u new=%u cells=%u\n",
7702877345
nOld, nNew, b.nCell));
7702977346
7703077347
/* Free any old pages that were not reused as new pages.
7703177348
*/
7703277349
for(i=nNew; i<nOld; i++){
@@ -77107,11 +77424,11 @@
7710777424
}
7710877425
assert( sqlite3PagerIswriteable(pChild->pDbPage) );
7710977426
assert( sqlite3PagerIswriteable(pRoot->pDbPage) );
7711077427
assert( pChild->nCell==pRoot->nCell || CORRUPT_DB );
7711177428
77112
- TRACE(("BALANCE: copy root %d into %d\n", pRoot->pgno, pChild->pgno));
77429
+ TRACE(("BALANCE: copy root %u into %u\n", pRoot->pgno, pChild->pgno));
7711377430
7711477431
/* Copy the overflow cells from pRoot to pChild */
7711577432
memcpy(pChild->aiOvfl, pRoot->aiOvfl,
7711677433
pRoot->nOverflow*sizeof(pRoot->aiOvfl[0]));
7711777434
memcpy(pChild->apOvfl, pRoot->apOvfl,
@@ -77605,11 +77922,11 @@
7760577922
rc = btreeComputeFreeSpace(pPage);
7760677923
}
7760777924
if( rc ) return rc;
7760877925
}
7760977926
77610
- TRACE(("INSERT: table=%d nkey=%lld ndata=%d page=%d %s\n",
77927
+ TRACE(("INSERT: table=%u nkey=%lld ndata=%u page=%u %s\n",
7761177928
pCur->pgnoRoot, pX->nKey, pX->nData, pPage->pgno,
7761277929
loc==0 ? "overwrite" : "new entry"));
7761377930
assert( pPage->isInit || CORRUPT_DB );
7761477931
newCell = p->pBt->pTmpSpace;
7761577932
assert( newCell!=0 );
@@ -77632,10 +77949,11 @@
7763277949
if( rc ) goto end_insert;
7763377950
}
7763477951
assert( szNew==pPage->xCellSize(pPage, newCell) );
7763577952
assert( szNew <= MX_CELL_SIZE(p->pBt) );
7763677953
idx = pCur->ix;
77954
+ pCur->info.nSize = 0;
7763777955
if( loc==0 ){
7763877956
CellInfo info;
7763977957
assert( idx>=0 );
7764077958
if( idx>=pPage->nCell ){
7764177959
return SQLITE_CORRUPT_BKPT;
@@ -77680,11 +77998,11 @@
7768077998
idx = ++pCur->ix;
7768177999
pCur->curFlags &= ~BTCF_ValidNKey;
7768278000
}else{
7768378001
assert( pPage->leaf );
7768478002
}
77685
- rc = insertCell(pPage, idx, newCell, szNew, 0, 0);
78003
+ rc = insertCellFast(pPage, idx, newCell, szNew);
7768678004
assert( pPage->nOverflow==0 || rc==SQLITE_OK );
7768778005
assert( rc!=SQLITE_OK || pPage->nCell>0 || pPage->nOverflow>0 );
7768878006
7768978007
/* If no error has occurred and pPage has an overflow cell, call balance()
7769078008
** to redistribute the cells within the tree. Since balance() may move
@@ -77704,11 +78022,10 @@
7770478022
** the b-tree if possible. If the cursor is left pointing to the last
7770578023
** entry in the table, and the next row inserted has an integer key
7770678024
** larger than the largest existing key, it is possible to insert the
7770778025
** row without seeking the cursor. This can be a big performance boost.
7770878026
*/
77709
- pCur->info.nSize = 0;
7771078027
if( pPage->nOverflow ){
7771178028
assert( rc==SQLITE_OK );
7771278029
pCur->curFlags &= ~(BTCF_ValidNKey);
7771378030
rc = balance(pCur);
7771478031
@@ -77904,10 +78221,13 @@
7790478221
return SQLITE_CORRUPT_BKPT;
7790578222
}
7790678223
pCell = findCell(pPage, iCellIdx);
7790778224
if( pPage->nFree<0 && btreeComputeFreeSpace(pPage) ){
7790878225
return SQLITE_CORRUPT_BKPT;
78226
+ }
78227
+ if( pCell<&pPage->aCellIdx[pPage->nCell] ){
78228
+ return SQLITE_CORRUPT_BKPT;
7790978229
}
7791078230
7791178231
/* If the BTREE_SAVEPOSITION bit is on, then the cursor position must
7791278232
** be preserved following this delete operation. If the current delete
7791378233
** will cause a b-tree rebalance, then this is done by saving the cursor
@@ -78653,11 +78973,12 @@
7865378973
va_start(ap, zFormat);
7865478974
if( pCheck->errMsg.nChar ){
7865578975
sqlite3_str_append(&pCheck->errMsg, "\n", 1);
7865678976
}
7865778977
if( pCheck->zPfx ){
78658
- sqlite3_str_appendf(&pCheck->errMsg, pCheck->zPfx, pCheck->v1, pCheck->v2);
78978
+ sqlite3_str_appendf(&pCheck->errMsg, pCheck->zPfx,
78979
+ pCheck->v0, pCheck->v1, pCheck->v2);
7865978980
}
7866078981
sqlite3_str_vappendf(&pCheck->errMsg, zFormat, ap);
7866178982
va_end(ap);
7866278983
if( pCheck->errMsg.accError==SQLITE_NOMEM ){
7866378984
checkOom(pCheck);
@@ -78693,15 +79014,15 @@
7869379014
**
7869479015
** Also check that the page number is in bounds.
7869579016
*/
7869679017
static int checkRef(IntegrityCk *pCheck, Pgno iPage){
7869779018
if( iPage>pCheck->nPage || iPage==0 ){
78698
- checkAppendMsg(pCheck, "invalid page number %d", iPage);
79019
+ checkAppendMsg(pCheck, "invalid page number %u", iPage);
7869979020
return 1;
7870079021
}
7870179022
if( getPageReferenced(pCheck, iPage) ){
78702
- checkAppendMsg(pCheck, "2nd reference to page %d", iPage);
79023
+ checkAppendMsg(pCheck, "2nd reference to page %u", iPage);
7870379024
return 1;
7870479025
}
7870579026
setPageReferenced(pCheck, iPage);
7870679027
return 0;
7870779028
}
@@ -78723,17 +79044,17 @@
7872379044
Pgno iPtrmapParent;
7872479045
7872579046
rc = ptrmapGet(pCheck->pBt, iChild, &ePtrmapType, &iPtrmapParent);
7872679047
if( rc!=SQLITE_OK ){
7872779048
if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ) checkOom(pCheck);
78728
- checkAppendMsg(pCheck, "Failed to read ptrmap key=%d", iChild);
79049
+ checkAppendMsg(pCheck, "Failed to read ptrmap key=%u", iChild);
7872979050
return;
7873079051
}
7873179052
7873279053
if( ePtrmapType!=eType || iPtrmapParent!=iParent ){
7873379054
checkAppendMsg(pCheck,
78734
- "Bad ptr map entry key=%d expected=(%d,%d) got=(%d,%d)",
79055
+ "Bad ptr map entry key=%u expected=(%u,%u) got=(%u,%u)",
7873579056
iChild, eType, iParent, ePtrmapType, iPtrmapParent);
7873679057
}
7873779058
}
7873879059
#endif
7873979060
@@ -78754,11 +79075,11 @@
7875479075
DbPage *pOvflPage;
7875579076
unsigned char *pOvflData;
7875679077
if( checkRef(pCheck, iPage) ) break;
7875779078
N--;
7875879079
if( sqlite3PagerGet(pCheck->pPager, (Pgno)iPage, &pOvflPage, 0) ){
78759
- checkAppendMsg(pCheck, "failed to get page %d", iPage);
79080
+ checkAppendMsg(pCheck, "failed to get page %u", iPage);
7876079081
break;
7876179082
}
7876279083
pOvflData = (unsigned char *)sqlite3PagerGetData(pOvflPage);
7876379084
if( isFreeList ){
7876479085
u32 n = (u32)get4byte(&pOvflData[4]);
@@ -78767,11 +79088,11 @@
7876779088
checkPtrmap(pCheck, iPage, PTRMAP_FREEPAGE, 0);
7876879089
}
7876979090
#endif
7877079091
if( n>pCheck->pBt->usableSize/4-2 ){
7877179092
checkAppendMsg(pCheck,
78772
- "freelist leaf count too big on page %d", iPage);
79093
+ "freelist leaf count too big on page %u", iPage);
7877379094
N--;
7877479095
}else{
7877579096
for(i=0; i<(int)n; i++){
7877679097
Pgno iFreePage = get4byte(&pOvflData[8+i*4]);
7877779098
#ifndef SQLITE_OMIT_AUTOVACUUM
@@ -78799,11 +79120,11 @@
7879979120
iPage = get4byte(pOvflData);
7880079121
sqlite3PagerUnref(pOvflPage);
7880179122
}
7880279123
if( N && nErrAtStart==pCheck->nErr ){
7880379124
checkAppendMsg(pCheck,
78804
- "%s is %d but should be %d",
79125
+ "%s is %u but should be %u",
7880579126
isFreeList ? "size" : "overflow list length",
7880679127
expected-N, expected);
7880779128
}
7880879129
}
7880979130
#endif /* SQLITE_OMIT_INTEGRITY_CHECK */
@@ -78914,12 +79235,12 @@
7891479235
if( pCheck->mxErr==0 ) goto end_of_check;
7891579236
pBt = pCheck->pBt;
7891679237
usableSize = pBt->usableSize;
7891779238
if( iPage==0 ) return 0;
7891879239
if( checkRef(pCheck, iPage) ) return 0;
78919
- pCheck->zPfx = "Page %u: ";
78920
- pCheck->v1 = iPage;
79240
+ pCheck->zPfx = "Tree %u page %u: ";
79241
+ pCheck->v0 = pCheck->v1 = iPage;
7892179242
if( (rc = btreeGetPage(pBt, iPage, &pPage, 0))!=0 ){
7892279243
checkAppendMsg(pCheck,
7892379244
"unable to get the page. error code=%d", rc);
7892479245
goto end_of_check;
7892579246
}
@@ -78941,11 +79262,11 @@
7894179262
}
7894279263
data = pPage->aData;
7894379264
hdr = pPage->hdrOffset;
7894479265
7894579266
/* Set up for cell analysis */
78946
- pCheck->zPfx = "On tree page %u cell %d: ";
79267
+ pCheck->zPfx = "Tree %u page %u cell %u: ";
7894779268
contentOffset = get2byteNotZero(&data[hdr+5]);
7894879269
assert( contentOffset<=usableSize ); /* Enforced by btreeInitPage() */
7894979270
7895079271
/* EVIDENCE-OF: R-37002-32774 The two-byte integer at offset 3 gives the
7895179272
** number of cells on the page. */
@@ -78961,11 +79282,11 @@
7896179282
if( !pPage->leaf ){
7896279283
/* Analyze the right-child page of internal pages */
7896379284
pgno = get4byte(&data[hdr+8]);
7896479285
#ifndef SQLITE_OMIT_AUTOVACUUM
7896579286
if( pBt->autoVacuum ){
78966
- pCheck->zPfx = "On page %u at right child: ";
79287
+ pCheck->zPfx = "Tree %u page %u right child: ";
7896779288
checkPtrmap(pCheck, pgno, PTRMAP_BTREE, iPage);
7896879289
}
7896979290
#endif
7897079291
depth = checkTreePage(pCheck, pgno, &maxKey, maxKey);
7897179292
keyCanBeEqual = 0;
@@ -78985,11 +79306,11 @@
7898579306
pCheck->v2 = i;
7898679307
assert( pCellIdx==&data[cellStart + i*2] );
7898779308
pc = get2byteAligned(pCellIdx);
7898879309
pCellIdx -= 2;
7898979310
if( pc<contentOffset || pc>usableSize-4 ){
78990
- checkAppendMsg(pCheck, "Offset %d out of range %d..%d",
79311
+ checkAppendMsg(pCheck, "Offset %u out of range %u..%u",
7899179312
pc, contentOffset, usableSize-4);
7899279313
doCoverageCheck = 0;
7899379314
continue;
7899479315
}
7899579316
pCell = &data[pc];
@@ -79117,11 +79438,11 @@
7911779438
** EVIDENCE-OF: R-07161-27322 The one-byte integer at offset 7 gives the
7911879439
** number of fragmented free bytes within the cell content area.
7911979440
*/
7912079441
if( heap[0]==0 && nFrag!=data[hdr+7] ){
7912179442
checkAppendMsg(pCheck,
79122
- "Fragmentation of %d bytes reported as %d on page %u",
79443
+ "Fragmentation of %u bytes reported as %u on page %u",
7912379444
nFrag, data[hdr+7], iPage);
7912479445
}
7912579446
}
7912679447
7912779448
end_of_check:
@@ -79214,11 +79535,11 @@
7921479535
if( i<=sCheck.nPage ) setPageReferenced(&sCheck, i);
7921579536
7921679537
/* Check the integrity of the freelist
7921779538
*/
7921879539
if( bCkFreelist ){
79219
- sCheck.zPfx = "Main freelist: ";
79540
+ sCheck.zPfx = "Freelist: ";
7922079541
checkList(&sCheck, 1, get4byte(&pBt->pPage1->aData[32]),
7922179542
get4byte(&pBt->pPage1->aData[36]));
7922279543
sCheck.zPfx = 0;
7922379544
}
7922479545
@@ -79231,11 +79552,11 @@
7923179552
Pgno mxInHdr;
7923279553
for(i=0; (int)i<nRoot; i++) if( mx<aRoot[i] ) mx = aRoot[i];
7923379554
mxInHdr = get4byte(&pBt->pPage1->aData[52]);
7923479555
if( mx!=mxInHdr ){
7923579556
checkAppendMsg(&sCheck,
79236
- "max rootpage (%d) disagrees with header (%d)",
79557
+ "max rootpage (%u) disagrees with header (%u)",
7923779558
mx, mxInHdr
7923879559
);
7923979560
}
7924079561
}else if( get4byte(&pBt->pPage1->aData[64])!=0 ){
7924179562
checkAppendMsg(&sCheck,
@@ -79262,23 +79583,23 @@
7926279583
*/
7926379584
if( !bPartial ){
7926479585
for(i=1; i<=sCheck.nPage && sCheck.mxErr; i++){
7926579586
#ifdef SQLITE_OMIT_AUTOVACUUM
7926679587
if( getPageReferenced(&sCheck, i)==0 ){
79267
- checkAppendMsg(&sCheck, "Page %d is never used", i);
79588
+ checkAppendMsg(&sCheck, "Page %u: never used", i);
7926879589
}
7926979590
#else
7927079591
/* If the database supports auto-vacuum, make sure no tables contain
7927179592
** references to pointer-map pages.
7927279593
*/
7927379594
if( getPageReferenced(&sCheck, i)==0 &&
7927479595
(PTRMAP_PAGENO(pBt, i)!=i || !pBt->autoVacuum) ){
79275
- checkAppendMsg(&sCheck, "Page %d is never used", i);
79596
+ checkAppendMsg(&sCheck, "Page %u: never used", i);
7927679597
}
7927779598
if( getPageReferenced(&sCheck, i)!=0 &&
7927879599
(PTRMAP_PAGENO(pBt, i)==i && pBt->autoVacuum) ){
79279
- checkAppendMsg(&sCheck, "Pointer map page %d is referenced", i);
79600
+ checkAppendMsg(&sCheck, "Page %u: pointer map referenced", i);
7928079601
}
7928179602
#endif
7928279603
}
7928379604
}
7928479605
@@ -80806,11 +81127,11 @@
8080681127
return SQLITE_NOMEM_BKPT;
8080781128
}
8080881129
8080981130
vdbeMemRenderNum(nByte, pMem->z, pMem);
8081081131
assert( pMem->z!=0 );
80811
- assert( pMem->n==sqlite3Strlen30NN(pMem->z) );
81132
+ assert( pMem->n==(int)sqlite3Strlen30NN(pMem->z) );
8081281133
pMem->enc = SQLITE_UTF8;
8081381134
pMem->flags |= MEM_Str|MEM_Term;
8081481135
if( bForce ) pMem->flags &= ~(MEM_Int|MEM_Real|MEM_IntReal);
8081581136
sqlite3VdbeChangeEncoding(pMem, enc);
8081681137
return SQLITE_OK;
@@ -81850,10 +82171,13 @@
8185082171
assert( ExprUseXList(p) );
8185182172
pList = p->x.pList;
8185282173
if( pList ) nVal = pList->nExpr;
8185382174
assert( !ExprHasProperty(p, EP_IntValue) );
8185482175
pFunc = sqlite3FindFunction(db, p->u.zToken, nVal, enc, 0);
82176
+#ifdef SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
82177
+ if( pFunc==0 ) return SQLITE_OK;
82178
+#endif
8185582179
assert( pFunc );
8185682180
if( (pFunc->funcFlags & (SQLITE_FUNC_CONSTANT|SQLITE_FUNC_SLOCHNG))==0
8185782181
|| (pFunc->funcFlags & SQLITE_FUNC_NEEDCOLL)
8185882182
){
8185982183
return SQLITE_OK;
@@ -81886,20 +82210,15 @@
8188682210
rc = ctx.isError;
8188782211
sqlite3ErrorMsg(pCtx->pParse, "%s", sqlite3_value_text(pVal));
8188882212
}else{
8188982213
sqlite3ValueApplyAffinity(pVal, aff, SQLITE_UTF8);
8189082214
assert( rc==SQLITE_OK );
81891
- assert( enc==pVal->enc
81892
- || (pVal->flags & MEM_Str)==0
81893
- || db->mallocFailed );
81894
-#if 0 /* Not reachable except after a prior failure */
8189582215
rc = sqlite3VdbeChangeEncoding(pVal, enc);
81896
- if( rc==SQLITE_OK && sqlite3VdbeMemTooBig(pVal) ){
82216
+ if( NEVER(rc==SQLITE_OK && sqlite3VdbeMemTooBig(pVal)) ){
8189782217
rc = SQLITE_TOOBIG;
8189882218
pCtx->pParse->nErr++;
8189982219
}
81900
-#endif
8190182220
}
8190282221
8190382222
value_from_function_out:
8190482223
if( rc!=SQLITE_OK ){
8190582224
pVal = 0;
@@ -81959,10 +82278,17 @@
8195982278
assert( !ExprHasProperty(pExpr, EP_IntValue) );
8196082279
aff = sqlite3AffinityType(pExpr->u.zToken,0);
8196182280
rc = valueFromExpr(db, pExpr->pLeft, enc, aff, ppVal, pCtx);
8196282281
testcase( rc!=SQLITE_OK );
8196382282
if( *ppVal ){
82283
+#ifdef SQLITE_ENABLE_STAT4
82284
+ rc = ExpandBlob(*ppVal);
82285
+#else
82286
+ /* zero-blobs only come from functions, not literal values. And
82287
+ ** functions are only processed under STAT4 */
82288
+ assert( (ppVal[0][0].flags & MEM_Zero)==0 );
82289
+#endif
8196482290
sqlite3VdbeMemCast(*ppVal, aff, enc);
8196582291
sqlite3ValueApplyAffinity(*ppVal, affinity, enc);
8196682292
}
8196782293
return rc;
8196882294
}
@@ -82805,14 +83131,14 @@
8280583131
** If the bPush flag is true, then make this opcode the parent for
8280683132
** subsequent Explains until sqlite3VdbeExplainPop() is called.
8280783133
*/
8280883134
SQLITE_PRIVATE int sqlite3VdbeExplain(Parse *pParse, u8 bPush, const char *zFmt, ...){
8280983135
int addr = 0;
82810
-#if !defined(SQLITE_DEBUG) && !defined(SQLITE_ENABLE_STMT_SCANSTATUS)
83136
+#if !defined(SQLITE_DEBUG)
8281183137
/* Always include the OP_Explain opcodes if SQLITE_DEBUG is defined.
8281283138
** But omit them (for performance) during production builds */
82813
- if( pParse->explain==2 )
83139
+ if( pParse->explain==2 || IS_STMT_SCANSTATUS(pParse->db) )
8281483140
#endif
8281583141
{
8281683142
char *zMsg;
8281783143
Vdbe *v;
8281883144
va_list ap;
@@ -83484,22 +83810,24 @@
8348483810
int addrLoop, /* Address of loop counter */
8348583811
int addrVisit, /* Address of rows visited counter */
8348683812
LogEst nEst, /* Estimated number of output rows */
8348783813
const char *zName /* Name of table or index being scanned */
8348883814
){
83489
- sqlite3_int64 nByte = (p->nScan+1) * sizeof(ScanStatus);
83490
- ScanStatus *aNew;
83491
- aNew = (ScanStatus*)sqlite3DbRealloc(p->db, p->aScan, nByte);
83492
- if( aNew ){
83493
- ScanStatus *pNew = &aNew[p->nScan++];
83494
- memset(pNew, 0, sizeof(ScanStatus));
83495
- pNew->addrExplain = addrExplain;
83496
- pNew->addrLoop = addrLoop;
83497
- pNew->addrVisit = addrVisit;
83498
- pNew->nEst = nEst;
83499
- pNew->zName = sqlite3DbStrDup(p->db, zName);
83500
- p->aScan = aNew;
83815
+ if( IS_STMT_SCANSTATUS(p->db) ){
83816
+ sqlite3_int64 nByte = (p->nScan+1) * sizeof(ScanStatus);
83817
+ ScanStatus *aNew;
83818
+ aNew = (ScanStatus*)sqlite3DbRealloc(p->db, p->aScan, nByte);
83819
+ if( aNew ){
83820
+ ScanStatus *pNew = &aNew[p->nScan++];
83821
+ memset(pNew, 0, sizeof(ScanStatus));
83822
+ pNew->addrExplain = addrExplain;
83823
+ pNew->addrLoop = addrLoop;
83824
+ pNew->addrVisit = addrVisit;
83825
+ pNew->nEst = nEst;
83826
+ pNew->zName = sqlite3DbStrDup(p->db, zName);
83827
+ p->aScan = aNew;
83828
+ }
8350183829
}
8350283830
}
8350383831
8350483832
/*
8350583833
** Add the range of instructions from addrStart to addrEnd (inclusive) to
@@ -83512,24 +83840,26 @@
8351283840
Vdbe *p,
8351383841
int addrExplain,
8351483842
int addrStart,
8351583843
int addrEnd
8351683844
){
83517
- ScanStatus *pScan = 0;
83518
- int ii;
83519
- for(ii=p->nScan-1; ii>=0; ii--){
83520
- pScan = &p->aScan[ii];
83521
- if( pScan->addrExplain==addrExplain ) break;
83522
- pScan = 0;
83523
- }
83524
- if( pScan ){
83525
- if( addrEnd<0 ) addrEnd = sqlite3VdbeCurrentAddr(p)-1;
83526
- for(ii=0; ii<ArraySize(pScan->aAddrRange); ii+=2){
83527
- if( pScan->aAddrRange[ii]==0 ){
83528
- pScan->aAddrRange[ii] = addrStart;
83529
- pScan->aAddrRange[ii+1] = addrEnd;
83530
- break;
83845
+ if( IS_STMT_SCANSTATUS(p->db) ){
83846
+ ScanStatus *pScan = 0;
83847
+ int ii;
83848
+ for(ii=p->nScan-1; ii>=0; ii--){
83849
+ pScan = &p->aScan[ii];
83850
+ if( pScan->addrExplain==addrExplain ) break;
83851
+ pScan = 0;
83852
+ }
83853
+ if( pScan ){
83854
+ if( addrEnd<0 ) addrEnd = sqlite3VdbeCurrentAddr(p)-1;
83855
+ for(ii=0; ii<ArraySize(pScan->aAddrRange); ii+=2){
83856
+ if( pScan->aAddrRange[ii]==0 ){
83857
+ pScan->aAddrRange[ii] = addrStart;
83858
+ pScan->aAddrRange[ii+1] = addrEnd;
83859
+ break;
83860
+ }
8353183861
}
8353283862
}
8353383863
}
8353483864
}
8353583865
@@ -83542,23 +83872,25 @@
8354283872
Vdbe *p,
8354383873
int addrExplain,
8354483874
int addrLoop,
8354583875
int addrVisit
8354683876
){
83547
- ScanStatus *pScan = 0;
83548
- int ii;
83549
- for(ii=p->nScan-1; ii>=0; ii--){
83550
- pScan = &p->aScan[ii];
83551
- if( pScan->addrExplain==addrExplain ) break;
83552
- pScan = 0;
83553
- }
83554
- if( pScan ){
83555
- pScan->addrLoop = addrLoop;
83556
- pScan->addrVisit = addrVisit;
83877
+ if( IS_STMT_SCANSTATUS(p->db) ){
83878
+ ScanStatus *pScan = 0;
83879
+ int ii;
83880
+ for(ii=p->nScan-1; ii>=0; ii--){
83881
+ pScan = &p->aScan[ii];
83882
+ if( pScan->addrExplain==addrExplain ) break;
83883
+ pScan = 0;
83884
+ }
83885
+ if( pScan ){
83886
+ pScan->addrLoop = addrLoop;
83887
+ pScan->addrVisit = addrVisit;
83888
+ }
8355783889
}
8355883890
}
83559
-#endif
83891
+#endif /* defined(SQLITE_ENABLE_STMT_SCANSTATUS) */
8356083892
8356183893
8356283894
/*
8356383895
** Change the value of the opcode, or P1, P2, P3, or P5 operands
8356483896
** for a specific instruction.
@@ -85682,10 +86014,12 @@
8568286014
db->nDeferredCons = 0;
8568386015
db->nDeferredImmCons = 0;
8568486016
db->flags &= ~(u64)SQLITE_DeferFKs;
8568586017
sqlite3CommitInternalChanges(db);
8568686018
}
86019
+ }else if( p->rc==SQLITE_SCHEMA && db->nVdbeActive>1 ){
86020
+ p->nChange = 0;
8568786021
}else{
8568886022
sqlite3RollbackAll(db, SQLITE_OK);
8568986023
p->nChange = 0;
8569086024
}
8569186025
db->nStatement = 0;
@@ -86000,13 +86334,13 @@
8600086334
vdbeFreeOpArray(db, p->aOp, p->nOp);
8600186335
if( p->zSql ) sqlite3DbNNFreeNN(db, p->zSql);
8600286336
#ifdef SQLITE_ENABLE_NORMALIZE
8600386337
sqlite3DbFree(db, p->zNormSql);
8600486338
{
86005
- DblquoteStr *pThis, *pNext;
86006
- for(pThis=p->pDblStr; pThis; pThis=pNext){
86007
- pNext = pThis->pNextStr;
86339
+ DblquoteStr *pThis, *pNxt;
86340
+ for(pThis=p->pDblStr; pThis; pThis=pNxt){
86341
+ pNxt = pThis->pNextStr;
8600886342
sqlite3DbFree(db, pThis);
8600986343
}
8601086344
}
8601186345
#endif
8601286346
#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
@@ -87629,10 +87963,24 @@
8762987963
return 0;
8763087964
}
8763187965
return 1;
8763287966
}
8763387967
87968
+#if defined(SQLITE_ENABLE_CURSOR_HINTS) && defined(SQLITE_DEBUG)
87969
+/*
87970
+** This Walker callback is used to help verify that calls to
87971
+** sqlite3BtreeCursorHint() with opcode BTREE_HINT_RANGE have
87972
+** byte-code register values correctly initialized.
87973
+*/
87974
+SQLITE_PRIVATE int sqlite3CursorRangeHintExprCheck(Walker *pWalker, Expr *pExpr){
87975
+ if( pExpr->op==TK_REGISTER ){
87976
+ assert( (pWalker->u.aMem[pExpr->iTable].flags & MEM_Undefined)==0 );
87977
+ }
87978
+ return WRC_Continue;
87979
+}
87980
+#endif /* SQLITE_ENABLE_CURSOR_HINTS && SQLITE_DEBUG */
87981
+
8763487982
#ifndef SQLITE_OMIT_VIRTUALTABLE
8763587983
/*
8763687984
** Transfer error message text from an sqlite3_vtab.zErrMsg (text stored
8763787985
** in memory obtained from sqlite3_malloc) into a Vdbe.zErrMsg (text stored
8763887986
** in memory obtained from sqlite3DbMalloc).
@@ -88015,11 +88363,11 @@
8801588363
SQLITE_NULL, /* 0x1d (not possible) */
8801688364
SQLITE_INTEGER, /* 0x1e (not possible) */
8801788365
SQLITE_NULL, /* 0x1f (not possible) */
8801888366
SQLITE_FLOAT, /* 0x20 INTREAL */
8801988367
SQLITE_NULL, /* 0x21 (not possible) */
88020
- SQLITE_TEXT, /* 0x22 INTREAL + TEXT */
88368
+ SQLITE_FLOAT, /* 0x22 INTREAL + TEXT */
8802188369
SQLITE_NULL, /* 0x23 (not possible) */
8802288370
SQLITE_FLOAT, /* 0x24 (not possible) */
8802388371
SQLITE_NULL, /* 0x25 (not possible) */
8802488372
SQLITE_FLOAT, /* 0x26 (not possible) */
8802588373
SQLITE_NULL, /* 0x27 (not possible) */
@@ -89882,19 +90230,28 @@
8988290230
int iScanStatusOp, /* Which metric to return */
8988390231
int flags,
8988490232
void *pOut /* OUT: Write the answer here */
8988590233
){
8988690234
Vdbe *p = (Vdbe*)pStmt;
89887
- ScanStatus *pScan;
90235
+ VdbeOp *aOp = p->aOp;
90236
+ int nOp = p->nOp;
90237
+ ScanStatus *pScan = 0;
8988890238
int idx;
90239
+
90240
+ if( p->pFrame ){
90241
+ VdbeFrame *pFrame;
90242
+ for(pFrame=p->pFrame; pFrame->pParent; pFrame=pFrame->pParent);
90243
+ aOp = pFrame->aOp;
90244
+ nOp = pFrame->nOp;
90245
+ }
8988990246
8989090247
if( iScan<0 ){
8989190248
int ii;
8989290249
if( iScanStatusOp==SQLITE_SCANSTAT_NCYCLE ){
8989390250
i64 res = 0;
89894
- for(ii=0; ii<p->nOp; ii++){
89895
- res += p->aOp[ii].nCycle;
90251
+ for(ii=0; ii<nOp; ii++){
90252
+ res += aOp[ii].nCycle;
8989690253
}
8989790254
*(i64*)pOut = res;
8989890255
return 0;
8989990256
}
8990090257
return 1;
@@ -89916,19 +90273,19 @@
8991690273
if( idx>=p->nScan ) return 1;
8991790274
8991890275
switch( iScanStatusOp ){
8991990276
case SQLITE_SCANSTAT_NLOOP: {
8992090277
if( pScan->addrLoop>0 ){
89921
- *(sqlite3_int64*)pOut = p->aOp[pScan->addrLoop].nExec;
90278
+ *(sqlite3_int64*)pOut = aOp[pScan->addrLoop].nExec;
8992290279
}else{
8992390280
*(sqlite3_int64*)pOut = -1;
8992490281
}
8992590282
break;
8992690283
}
8992790284
case SQLITE_SCANSTAT_NVISIT: {
8992890285
if( pScan->addrVisit>0 ){
89929
- *(sqlite3_int64*)pOut = p->aOp[pScan->addrVisit].nExec;
90286
+ *(sqlite3_int64*)pOut = aOp[pScan->addrVisit].nExec;
8993090287
}else{
8993190288
*(sqlite3_int64*)pOut = -1;
8993290289
}
8993390290
break;
8993490291
}
@@ -89946,27 +90303,27 @@
8994690303
*(const char**)pOut = pScan->zName;
8994790304
break;
8994890305
}
8994990306
case SQLITE_SCANSTAT_EXPLAIN: {
8995090307
if( pScan->addrExplain ){
89951
- *(const char**)pOut = p->aOp[ pScan->addrExplain ].p4.z;
90308
+ *(const char**)pOut = aOp[ pScan->addrExplain ].p4.z;
8995290309
}else{
8995390310
*(const char**)pOut = 0;
8995490311
}
8995590312
break;
8995690313
}
8995790314
case SQLITE_SCANSTAT_SELECTID: {
8995890315
if( pScan->addrExplain ){
89959
- *(int*)pOut = p->aOp[ pScan->addrExplain ].p1;
90316
+ *(int*)pOut = aOp[ pScan->addrExplain ].p1;
8996090317
}else{
8996190318
*(int*)pOut = -1;
8996290319
}
8996390320
break;
8996490321
}
8996590322
case SQLITE_SCANSTAT_PARENTID: {
8996690323
if( pScan->addrExplain ){
89967
- *(int*)pOut = p->aOp[ pScan->addrExplain ].p2;
90324
+ *(int*)pOut = aOp[ pScan->addrExplain ].p2;
8996890325
}else{
8996990326
*(int*)pOut = -1;
8997090327
}
8997190328
break;
8997290329
}
@@ -89980,22 +90337,22 @@
8998090337
int iIns = pScan->aAddrRange[ii];
8998190338
int iEnd = pScan->aAddrRange[ii+1];
8998290339
if( iIns==0 ) break;
8998390340
if( iIns>0 ){
8998490341
while( iIns<=iEnd ){
89985
- res += p->aOp[iIns].nCycle;
90342
+ res += aOp[iIns].nCycle;
8998690343
iIns++;
8998790344
}
8998890345
}else{
8998990346
int iOp;
89990
- for(iOp=0; iOp<p->nOp; iOp++){
89991
- Op *pOp = &p->aOp[iOp];
90347
+ for(iOp=0; iOp<nOp; iOp++){
90348
+ Op *pOp = &aOp[iOp];
8999290349
if( pOp->p1!=iEnd ) continue;
8999390350
if( (sqlite3OpcodeProperty[pOp->opcode] & OPFLG_NCYCLE)==0 ){
8999490351
continue;
8999590352
}
89996
- res += p->aOp[iOp].nCycle;
90353
+ res += aOp[iOp].nCycle;
8999790354
}
8999890355
}
8999990356
}
9000090357
}
9000190358
*(i64*)pOut = res;
@@ -90914,11 +91271,14 @@
9091491271
if( p->flags & (MEM_Int|MEM_IntReal) ){
9091591272
h += p->u.i;
9091691273
}else if( p->flags & MEM_Real ){
9091791274
h += sqlite3VdbeIntValue(p);
9091891275
}else if( p->flags & (MEM_Str|MEM_Blob) ){
90919
- /* no-op */
91276
+ /* All strings have the same hash and all blobs have the same hash,
91277
+ ** though, at least, those hashes are different from each other and
91278
+ ** from NULL. */
91279
+ h += 4093 + (p->flags & (MEM_Str|MEM_Blob));
9092091280
}
9092191281
}
9092291282
return h;
9092391283
}
9092491284
@@ -90964,10 +91324,11 @@
9096491324
Mem *pIn2 = 0; /* 2nd input operand */
9096591325
Mem *pIn3 = 0; /* 3rd input operand */
9096691326
Mem *pOut = 0; /* Output operand */
9096791327
#if defined(SQLITE_ENABLE_STMT_SCANSTATUS) || defined(VDBE_PROFILE)
9096891328
u64 *pnCycle = 0;
91329
+ int bStmtScanStatus = IS_STMT_SCANSTATUS(db)!=0;
9096991330
#endif
9097091331
/*** INSERT STACK UNION HERE ***/
9097191332
9097291333
assert( p->eVdbeState==VDBE_RUN_STATE ); /* sqlite3_step() verifies this */
9097391334
if( DbMaskNonZero(p->lockMask) ){
@@ -91028,17 +91389,21 @@
9102891389
** jumps to abort_due_to_error. */
9102991390
assert( rc==SQLITE_OK );
9103091391
9103191392
assert( pOp>=aOp && pOp<&aOp[p->nOp]);
9103291393
nVmStep++;
91033
-#if defined(SQLITE_ENABLE_STMT_SCANSTATUS) || defined(VDBE_PROFILE)
91394
+
91395
+#if defined(VDBE_PROFILE)
9103491396
pOp->nExec++;
9103591397
pnCycle = &pOp->nCycle;
91036
-# ifdef VDBE_PROFILE
91037
- if( sqlite3NProfileCnt==0 )
91038
-# endif
91398
+ if( sqlite3NProfileCnt==0 ) *pnCycle -= sqlite3Hwtime();
91399
+#elif defined(SQLITE_ENABLE_STMT_SCANSTATUS)
91400
+ if( bStmtScanStatus ){
91401
+ pOp->nExec++;
91402
+ pnCycle = &pOp->nCycle;
9103991403
*pnCycle -= sqlite3Hwtime();
91404
+ }
9104091405
#endif
9104191406
9104291407
/* Only allow tracing if SQLITE_DEBUG is defined.
9104391408
*/
9104491409
#ifdef SQLITE_DEBUG
@@ -92848,10 +93213,16 @@
9284893213
** from the value in that register.
9284993214
**
9285093215
** P5 is a bitmask of data types. SQLITE_INTEGER is the least significant
9285193216
** (0x01) bit. SQLITE_FLOAT is the 0x02 bit. SQLITE_TEXT is 0x04.
9285293217
** SQLITE_BLOB is 0x08. SQLITE_NULL is 0x10.
93218
+**
93219
+** WARNING: This opcode does not reliably distinguish between NULL and REAL
93220
+** when P1>=0. If the database contains a NaN value, this opcode will think
93221
+** that the datatype is REAL when it should be NULL. When P1<0 and the value
93222
+** is already stored in register P3, then this opcode does reliably
93223
+** distinguish between NULL and REAL. The problem only arises then P1>=0.
9285393224
**
9285493225
** Take the jump to address P2 if and only if the datatype of the
9285593226
** value determined by P1 and P3 corresponds to one of the bits in the
9285693227
** P5 bitmask.
9285793228
**
@@ -95196,10 +95567,11 @@
9519695567
#endif
9519795568
VdbeBranchTaken(0,3);
9519895569
break;
9519995570
}
9520095571
nStep--;
95572
+ pC->cacheStatus = CACHE_STALE;
9520195573
rc = sqlite3BtreeNext(pC->uc.pCursor, 0);
9520295574
if( rc ){
9520395575
if( rc==SQLITE_DONE ){
9520495576
rc = SQLITE_OK;
9520595577
goto seekscan_search_fail;
@@ -97848,10 +98220,11 @@
9784898220
sqlite3VdbeError(p, "%s", sqlite3_value_text(pMem));
9784998221
goto abort_due_to_error;
9785098222
}
9785198223
sqlite3VdbeChangeEncoding(pMem, encoding);
9785298224
UPDATE_MAX_BLOBSIZE(pMem);
98225
+ REGISTER_TRACE((int)(pMem-aMem), pMem);
9785398226
break;
9785498227
}
9785598228
9785698229
#ifndef SQLITE_OMIT_WAL
9785798230
/* Opcode: Checkpoint P1 P2 P3 * *
@@ -98986,12 +99359,14 @@
9898699359
9898799360
#if defined(VDBE_PROFILE)
9898899361
*pnCycle += sqlite3NProfileCnt ? sqlite3NProfileCnt : sqlite3Hwtime();
9898999362
pnCycle = 0;
9899099363
#elif defined(SQLITE_ENABLE_STMT_SCANSTATUS)
98991
- *pnCycle += sqlite3Hwtime();
98992
- pnCycle = 0;
99364
+ if( pnCycle ){
99365
+ *pnCycle += sqlite3Hwtime();
99366
+ pnCycle = 0;
99367
+ }
9899399368
#endif
9899499369
9899599370
/* The following code adds nothing to the actual functionality
9899699371
** of the program. It is only here for testing and debugging.
9899799372
** On the other hand, it does burn CPU cycles every time through
@@ -104013,11 +104388,12 @@
104013104388
if( pParse->pTriggerTab!=0 ){
104014104389
int op = pParse->eTriggerOp;
104015104390
assert( op==TK_DELETE || op==TK_UPDATE || op==TK_INSERT );
104016104391
if( pParse->bReturning ){
104017104392
if( (pNC->ncFlags & NC_UBaseReg)!=0
104018
- && (zTab==0 || sqlite3StrICmp(zTab,pParse->pTriggerTab->zName)==0)
104393
+ && ALWAYS(zTab==0
104394
+ || sqlite3StrICmp(zTab,pParse->pTriggerTab->zName)==0)
104019104395
){
104020104396
pExpr->iTable = op!=TK_DELETE;
104021104397
pTab = pParse->pTriggerTab;
104022104398
}
104023104399
}else if( op!=TK_DELETE && zTab && sqlite3StrICmp("new",zTab) == 0 ){
@@ -104798,12 +105174,12 @@
104798105174
sqlite3WalkSelect(pWalker, pExpr->x.pSelect);
104799105175
}
104800105176
assert( pNC->nRef>=nRef );
104801105177
if( nRef!=pNC->nRef ){
104802105178
ExprSetProperty(pExpr, EP_VarSelect);
104803
- pNC->ncFlags |= NC_VarSelect;
104804105179
}
105180
+ pNC->ncFlags |= NC_Subquery;
104805105181
}
104806105182
break;
104807105183
}
104808105184
case TK_VARIABLE: {
104809105185
testcase( pNC->ncFlags & NC_IsCheck );
@@ -105987,15 +106363,14 @@
105987106363
if( p->pLeft && (p->pLeft->flags & EP_Collate)!=0 ){
105988106364
p = p->pLeft;
105989106365
}else{
105990106366
Expr *pNext = p->pRight;
105991106367
/* The Expr.x union is never used at the same time as Expr.pRight */
105992
- assert( ExprUseXList(p) );
105993
- assert( p->x.pList==0 || p->pRight==0 );
105994
- if( p->x.pList!=0 && !db->mallocFailed ){
106368
+ assert( !ExprUseXList(p) || p->x.pList==0 || p->pRight==0 );
106369
+ if( ExprUseXList(p) && p->x.pList!=0 && !db->mallocFailed ){
105995106370
int i;
105996
- for(i=0; ALWAYS(i<p->x.pList->nExpr); i++){
106371
+ for(i=0; i<p->x.pList->nExpr; i++){
105997106372
if( ExprHasProperty(p->x.pList->a[i].pExpr, EP_Collate) ){
105998106373
pNext = p->x.pList->a[i].pExpr;
105999106374
break;
106000106375
}
106001106376
}
@@ -108359,11 +108734,11 @@
108359108734
108360108735
/*
108361108736
** pX is the RHS of an IN operator. If pX is a SELECT statement
108362108737
** that can be simplified to a direct table access, then return
108363108738
** a pointer to the SELECT statement. If pX is not a SELECT statement,
108364
-** or if the SELECT statement needs to be manifested into a transient
108739
+** or if the SELECT statement needs to be materialized into a transient
108365108740
** table, then return NULL.
108366108741
*/
108367108742
#ifndef SQLITE_OMIT_SUBQUERY
108368108743
static Select *isCandidateForInOpt(const Expr *pX){
108369108744
Select *p;
@@ -108645,11 +109020,10 @@
108645109020
Expr *pLhs = sqlite3VectorFieldSubexpr(pX->pLeft, i);
108646109021
Expr *pRhs = pEList->a[i].pExpr;
108647109022
CollSeq *pReq = sqlite3BinaryCompareCollSeq(pParse, pLhs, pRhs);
108648109023
int j;
108649109024
108650
- assert( pReq!=0 || pRhs->iColumn==XN_ROWID || pParse->nErr );
108651109025
for(j=0; j<nExpr; j++){
108652109026
if( pIdx->aiColumn[j]!=pRhs->iColumn ) continue;
108653109027
assert( pIdx->azColl[j] );
108654109028
if( pReq!=0 && sqlite3StrICmp(pReq->zName, pIdx->azColl[j])!=0 ){
108655109029
continue;
@@ -109548,10 +109922,11 @@
109548109922
Column *pCol, /* The generated column */
109549109923
int regOut /* Put the result in this register */
109550109924
){
109551109925
int iAddr;
109552109926
Vdbe *v = pParse->pVdbe;
109927
+ int nErr = pParse->nErr;
109553109928
assert( v!=0 );
109554109929
assert( pParse->iSelfTab!=0 );
109555109930
if( pParse->iSelfTab>0 ){
109556109931
iAddr = sqlite3VdbeAddOp3(v, OP_IfNullRow, pParse->iSelfTab-1, 0, regOut);
109557109932
}else{
@@ -109560,10 +109935,11 @@
109560109935
sqlite3ExprCodeCopy(pParse, sqlite3ColumnExpr(pTab,pCol), regOut);
109561109936
if( pCol->affinity>=SQLITE_AFF_TEXT ){
109562109937
sqlite3VdbeAddOp4(v, OP_Affinity, regOut, 1, 0, &pCol->affinity, 1);
109563109938
}
109564109939
if( iAddr ) sqlite3VdbeJumpHere(v, iAddr);
109940
+ if( pParse->nErr>nErr ) pParse->db->errByteOffset = -1;
109565109941
}
109566109942
#endif /* SQLITE_OMIT_GENERATED_COLUMNS */
109567109943
109568109944
/*
109569109945
** Generate code to extract the value of the iCol-th column of a table.
@@ -109576,10 +109952,11 @@
109576109952
int regOut /* Extract the value into this register */
109577109953
){
109578109954
Column *pCol;
109579109955
assert( v!=0 );
109580109956
assert( pTab!=0 );
109957
+ assert( iCol!=XN_EXPR );
109581109958
if( iCol<0 || iCol==pTab->iPKey ){
109582109959
sqlite3VdbeAddOp2(v, OP_Rowid, iTabCur, regOut);
109583109960
VdbeComment((v, "%s.rowid", pTab->zName));
109584109961
}else{
109585109962
int op;
@@ -109928,11 +110305,23 @@
109928110305
switch( op ){
109929110306
case TK_AGG_COLUMN: {
109930110307
AggInfo *pAggInfo = pExpr->pAggInfo;
109931110308
struct AggInfo_col *pCol;
109932110309
assert( pAggInfo!=0 );
109933
- assert( pExpr->iAgg>=0 && pExpr->iAgg<pAggInfo->nColumn );
110310
+ assert( pExpr->iAgg>=0 );
110311
+ if( pExpr->iAgg>=pAggInfo->nColumn ){
110312
+ /* Happens when the left table of a RIGHT JOIN is null and
110313
+ ** is using an expression index */
110314
+ sqlite3VdbeAddOp2(v, OP_Null, 0, target);
110315
+#ifdef SQLITE_VDBE_COVERAGE
110316
+ /* Verify that the OP_Null above is exercised by tests
110317
+ ** tag-20230325-2 */
110318
+ sqlite3VdbeAddOp2(v, OP_NotNull, target, 1);
110319
+ VdbeCoverageNeverTaken(v);
110320
+#endif
110321
+ break;
110322
+ }
109934110323
pCol = &pAggInfo->aCol[pExpr->iAgg];
109935110324
if( !pAggInfo->directMode ){
109936110325
return AggInfoColumnReg(pAggInfo, pExpr->iAgg);
109937110326
}else if( pAggInfo->useSortingIdx ){
109938110327
Table *pTab = pCol->pTab;
@@ -110103,15 +110492,12 @@
110103110492
return pExpr->iTable;
110104110493
}
110105110494
#ifndef SQLITE_OMIT_CAST
110106110495
case TK_CAST: {
110107110496
/* Expressions of the form: CAST(pLeft AS token) */
110108
- inReg = sqlite3ExprCodeTarget(pParse, pExpr->pLeft, target);
110109
- if( inReg!=target ){
110110
- sqlite3VdbeAddOp2(v, OP_SCopy, inReg, target);
110111
- inReg = target;
110112
- }
110497
+ sqlite3ExprCode(pParse, pExpr->pLeft, target);
110498
+ assert( inReg==target );
110113110499
assert( !ExprHasProperty(pExpr, EP_IntValue) );
110114110500
sqlite3VdbeAddOp2(v, OP_Cast, target,
110115110501
sqlite3AffinityType(pExpr->u.zToken, 0));
110116110502
return inReg;
110117110503
}
@@ -110446,17 +110832,13 @@
110446110832
** "SOFT-COLLATE" that is added to constraints that are pushed down
110447110833
** from outer queries into sub-queries by the push-down optimization.
110448110834
** Clear subtypes as subtypes may not cross a subquery boundary.
110449110835
*/
110450110836
assert( pExpr->pLeft );
110451
- inReg = sqlite3ExprCodeTarget(pParse, pExpr->pLeft, target);
110452
- if( inReg!=target ){
110453
- sqlite3VdbeAddOp2(v, OP_SCopy, inReg, target);
110454
- inReg = target;
110455
- }
110456
- sqlite3VdbeAddOp1(v, OP_ClrSubtype, inReg);
110457
- return inReg;
110837
+ sqlite3ExprCode(pParse, pExpr->pLeft, target);
110838
+ sqlite3VdbeAddOp1(v, OP_ClrSubtype, target);
110839
+ return target;
110458110840
}else{
110459110841
pExpr = pExpr->pLeft;
110460110842
goto expr_code_doover; /* 2018-04-28: Prevent deep recursion. */
110461110843
}
110462110844
}
@@ -110562,16 +110944,13 @@
110562110944
** (1) Temporarily disable factoring of constant expressions
110563110945
** (2) Make sure the computed value really is stored in register
110564110946
** "target" and not someplace else.
110565110947
*/
110566110948
pParse->okConstFactor = 0; /* note (1) above */
110567
- inReg = sqlite3ExprCodeTarget(pParse, pExpr->pLeft, target);
110949
+ sqlite3ExprCode(pParse, pExpr->pLeft, target);
110950
+ assert( target==inReg );
110568110951
pParse->okConstFactor = okConstFactor;
110569
- if( inReg!=target ){ /* note (2) above */
110570
- sqlite3VdbeAddOp2(v, OP_SCopy, inReg, target);
110571
- inReg = target;
110572
- }
110573110952
sqlite3VdbeJumpHere(v, addrINR);
110574110953
break;
110575110954
}
110576110955
110577110956
/*
@@ -110805,11 +111184,13 @@
110805111184
assert( pParse->pVdbe!=0 || pParse->db->mallocFailed );
110806111185
if( pParse->pVdbe==0 ) return;
110807111186
inReg = sqlite3ExprCodeTarget(pParse, pExpr, target);
110808111187
if( inReg!=target ){
110809111188
u8 op;
110810
- if( ALWAYS(pExpr) && ExprHasProperty(pExpr,EP_Subquery) ){
111189
+ if( ALWAYS(pExpr)
111190
+ && (ExprHasProperty(pExpr,EP_Subquery) || pExpr->op==TK_REGISTER)
111191
+ ){
110811111192
op = OP_Copy;
110812111193
}else{
110813111194
op = OP_SCopy;
110814111195
}
110815111196
sqlite3VdbeAddOp2(pParse->pVdbe, op, inReg, target);
@@ -111990,23 +112371,26 @@
111990112371
){
111991112372
AggInfo *pAggInfo = pExpr->pAggInfo;
111992112373
int iAgg = pExpr->iAgg;
111993112374
Parse *pParse = pWalker->pParse;
111994112375
sqlite3 *db = pParse->db;
112376
+ assert( iAgg>=0 );
111995112377
if( pExpr->op!=TK_AGG_FUNCTION ){
111996
- assert( iAgg>=0 && iAgg<pAggInfo->nColumn );
111997
- if( pAggInfo->aCol[iAgg].pCExpr==pExpr ){
112378
+ if( ALWAYS(iAgg<pAggInfo->nColumn)
112379
+ && pAggInfo->aCol[iAgg].pCExpr==pExpr
112380
+ ){
111998112381
pExpr = sqlite3ExprDup(db, pExpr, 0);
111999112382
if( pExpr ){
112000112383
pAggInfo->aCol[iAgg].pCExpr = pExpr;
112001112384
sqlite3ExprDeferredDelete(pParse, pExpr);
112002112385
}
112003112386
}
112004112387
}else{
112005112388
assert( pExpr->op==TK_AGG_FUNCTION );
112006
- assert( iAgg>=0 && iAgg<pAggInfo->nFunc );
112007
- if( pAggInfo->aFunc[iAgg].pFExpr==pExpr ){
112389
+ if( ALWAYS(iAgg<pAggInfo->nFunc)
112390
+ && pAggInfo->aFunc[iAgg].pFExpr==pExpr
112391
+ ){
112008112392
pExpr = sqlite3ExprDup(db, pExpr, 0);
112009112393
if( pExpr ){
112010112394
pAggInfo->aFunc[iAgg].pFExpr = pExpr;
112011112395
sqlite3ExprDeferredDelete(pParse, pExpr);
112012112396
}
@@ -112152,11 +112536,16 @@
112152112536
if( iDataCur<0 ) continue;
112153112537
if( sqlite3ExprCompare(0, pExpr, pIEpr->pExpr, iDataCur)==0 ) break;
112154112538
}
112155112539
if( pIEpr==0 ) break;
112156112540
if( NEVER(!ExprUseYTab(pExpr)) ) break;
112157
- if( pExpr->pAggInfo!=0 ) break; /* Already resolved by outer context */
112541
+ for(i=0; i<pSrcList->nSrc; i++){
112542
+ if( pSrcList->a[0].iCursor==pIEpr->iDataCur ) break;
112543
+ }
112544
+ if( i>=pSrcList->nSrc ) break;
112545
+ if( NEVER(pExpr->pAggInfo!=0) ) break; /* Resolved by outer context */
112546
+ if( pParse->nErr ){ return WRC_Abort; }
112158112547
112159112548
/* If we reach this point, it means that expression pExpr can be
112160112549
** translated into a reference to an index column as described by
112161112550
** pIEpr.
112162112551
*/
@@ -112163,10 +112552,13 @@
112163112552
memset(&tmp, 0, sizeof(tmp));
112164112553
tmp.op = TK_AGG_COLUMN;
112165112554
tmp.iTable = pIEpr->iIdxCur;
112166112555
tmp.iColumn = pIEpr->iIdxCol;
112167112556
findOrCreateAggInfoColumn(pParse, pAggInfo, &tmp);
112557
+ if( pParse->nErr ){ return WRC_Abort; }
112558
+ assert( pAggInfo->aCol!=0 );
112559
+ assert( tmp.iAgg<pAggInfo->nColumn );
112168112560
pAggInfo->aCol[tmp.iAgg].pCExpr = pExpr;
112169112561
pExpr->pAggInfo = pAggInfo;
112170112562
pExpr->iAgg = tmp.iAgg;
112171112563
return WRC_Prune;
112172112564
}
@@ -112339,10 +112731,41 @@
112339112731
SQLITE_PRIVATE void sqlite3ClearTempRegCache(Parse *pParse){
112340112732
pParse->nTempReg = 0;
112341112733
pParse->nRangeReg = 0;
112342112734
}
112343112735
112736
+/*
112737
+** Make sure sufficient registers have been allocated so that
112738
+** iReg is a valid register number.
112739
+*/
112740
+SQLITE_PRIVATE void sqlite3TouchRegister(Parse *pParse, int iReg){
112741
+ if( pParse->nMem<iReg ) pParse->nMem = iReg;
112742
+}
112743
+
112744
+#if defined(SQLITE_ENABLE_STAT4) || defined(SQLITE_DEBUG)
112745
+/*
112746
+** Return the latest reusable register in the set of all registers.
112747
+** The value returned is no less than iMin. If any register iMin or
112748
+** greater is in permanent use, then return one more than that last
112749
+** permanent register.
112750
+*/
112751
+SQLITE_PRIVATE int sqlite3FirstAvailableRegister(Parse *pParse, int iMin){
112752
+ const ExprList *pList = pParse->pConstExpr;
112753
+ if( pList ){
112754
+ int i;
112755
+ for(i=0; i<pList->nExpr; i++){
112756
+ if( pList->a[i].u.iConstExprReg>=iMin ){
112757
+ iMin = pList->a[i].u.iConstExprReg + 1;
112758
+ }
112759
+ }
112760
+ }
112761
+ pParse->nTempReg = 0;
112762
+ pParse->nRangeReg = 0;
112763
+ return iMin;
112764
+}
112765
+#endif /* SQLITE_ENABLE_STAT4 || SQLITE_DEBUG */
112766
+
112344112767
/*
112345112768
** Validate that no temporary register falls within the range of
112346112769
** iFirst..iLast, inclusive. This routine is only call from within assert()
112347112770
** statements.
112348112771
*/
@@ -112357,10 +112780,18 @@
112357112780
}
112358112781
for(i=0; i<pParse->nTempReg; i++){
112359112782
if( pParse->aTempReg[i]>=iFirst && pParse->aTempReg[i]<=iLast ){
112360112783
return 0;
112361112784
}
112785
+ }
112786
+ if( pParse->pConstExpr ){
112787
+ ExprList *pList = pParse->pConstExpr;
112788
+ for(i=0; i<pList->nExpr; i++){
112789
+ int iReg = pList->a[i].u.iConstExprReg;
112790
+ if( iReg==0 ) continue;
112791
+ if( iReg>=iFirst && iReg<=iLast ) return 0;
112792
+ }
112362112793
}
112363112794
return 1;
112364112795
}
112365112796
#endif /* SQLITE_DEBUG */
112366112797
@@ -115641,15 +116072,19 @@
115641116072
int regTemp2 = iMem++; /* Second temporary use register */
115642116073
int regTabname = iMem++; /* Register containing table name */
115643116074
int regIdxname = iMem++; /* Register containing index name */
115644116075
int regStat1 = iMem++; /* Value for the stat column of sqlite_stat1 */
115645116076
int regPrev = iMem; /* MUST BE LAST (see below) */
116077
+#ifdef SQLITE_ENABLE_STAT4
116078
+ int doOnce = 1; /* Flag for a one-time computation */
116079
+#endif
115646116080
#ifdef SQLITE_ENABLE_PREUPDATE_HOOK
115647116081
Table *pStat1 = 0;
115648116082
#endif
115649116083
115650
- pParse->nMem = MAX(pParse->nMem, iMem);
116084
+ sqlite3TouchRegister(pParse, iMem);
116085
+ assert( sqlite3NoTempsInRange(pParse, regNewRowid, iMem) );
115651116086
v = sqlite3GetVdbe(pParse);
115652116087
if( v==0 || NEVER(pTab==0) ){
115653116088
return;
115654116089
}
115655116090
if( !IsOrdinaryTable(pTab) ){
@@ -115751,11 +116186,11 @@
115751116186
115752116187
/* Make sure there are enough memory cells allocated to accommodate
115753116188
** the regPrev array and a trailing rowid (the rowid slot is required
115754116189
** when building a record to insert into the sample column of
115755116190
** the sqlite_stat4 table. */
115756
- pParse->nMem = MAX(pParse->nMem, regPrev+nColTest);
116191
+ sqlite3TouchRegister(pParse, regPrev+nColTest);
115757116192
115758116193
/* Open a read-only cursor on the index being analyzed. */
115759116194
assert( iDb==sqlite3SchemaToIndex(db, pIdx->pSchema) );
115760116195
sqlite3VdbeAddOp3(v, OP_OpenRead, iIdxCur, pIdx->tnum, iDb);
115761116196
sqlite3VdbeSetP4KeyInfo(pParse, pIdx);
@@ -115923,11 +116358,39 @@
115923116358
int regSampleRowid = regCol + nCol;
115924116359
int addrNext;
115925116360
int addrIsNull;
115926116361
u8 seekOp = HasRowid(pTab) ? OP_NotExists : OP_NotFound;
115927116362
115928
- pParse->nMem = MAX(pParse->nMem, regCol+nCol);
116363
+ if( doOnce ){
116364
+ int mxCol = nCol;
116365
+ Index *pX;
116366
+
116367
+ /* Compute the maximum number of columns in any index */
116368
+ for(pX=pTab->pIndex; pX; pX=pX->pNext){
116369
+ int nColX; /* Number of columns in pX */
116370
+ if( !HasRowid(pTab) && IsPrimaryKeyIndex(pX) ){
116371
+ nColX = pX->nKeyCol;
116372
+ }else{
116373
+ nColX = pX->nColumn;
116374
+ }
116375
+ if( nColX>mxCol ) mxCol = nColX;
116376
+ }
116377
+
116378
+ /* Allocate space to compute results for the largest index */
116379
+ sqlite3TouchRegister(pParse, regCol+mxCol);
116380
+ doOnce = 0;
116381
+#ifdef SQLITE_DEBUG
116382
+ /* Verify that the call to sqlite3ClearTempRegCache() below
116383
+ ** really is needed.
116384
+ ** https://sqlite.org/forum/forumpost/83cb4a95a0 (2023-03-25)
116385
+ */
116386
+ testcase( !sqlite3NoTempsInRange(pParse, regEq, regCol+mxCol) );
116387
+#endif
116388
+ sqlite3ClearTempRegCache(pParse); /* tag-20230325-1 */
116389
+ assert( sqlite3NoTempsInRange(pParse, regEq, regCol+mxCol) );
116390
+ }
116391
+ assert( sqlite3NoTempsInRange(pParse, regEq, regCol+nCol) );
115929116392
115930116393
addrNext = sqlite3VdbeCurrentAddr(v);
115931116394
callStatGet(pParse, regStat, STAT_GET_ROWID, regSampleRowid);
115932116395
addrIsNull = sqlite3VdbeAddOp1(v, OP_IsNull, regSampleRowid);
115933116396
VdbeCoverage(v);
@@ -116004,10 +116467,15 @@
116004116467
iTab = pParse->nTab;
116005116468
assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
116006116469
for(k=sqliteHashFirst(&pSchema->tblHash); k; k=sqliteHashNext(k)){
116007116470
Table *pTab = (Table*)sqliteHashData(k);
116008116471
analyzeOneTable(pParse, pTab, 0, iStatCur, iMem, iTab);
116472
+#ifdef SQLITE_ENABLE_STAT4
116473
+ iMem = sqlite3FirstAvailableRegister(pParse, iMem);
116474
+#else
116475
+ assert( iMem==sqlite3FirstAvailableRegister(pParse,iMem) );
116476
+#endif
116009116477
}
116010116478
loadAnalysis(pParse, iDb);
116011116479
}
116012116480
116013116481
/*
@@ -118931,11 +119399,11 @@
118931119399
Hash *pHash;
118932119400
sqlite3 *db = pParse->db;
118933119401
if( pParse->pNewTrigger ){
118934119402
sqlite3ErrorMsg(pParse, "cannot use RETURNING in a trigger");
118935119403
}else{
118936
- assert( pParse->bReturning==0 );
119404
+ assert( pParse->bReturning==0 || pParse->ifNotExists );
118937119405
}
118938119406
pParse->bReturning = 1;
118939119407
pRet = sqlite3DbMallocZero(db, sizeof(*pRet));
118940119408
if( pRet==0 ){
118941119409
sqlite3ExprListDelete(db, pList);
@@ -118957,11 +119425,12 @@
118957119425
pRet->retTrig.step_list = &pRet->retTStep;
118958119426
pRet->retTStep.op = TK_RETURNING;
118959119427
pRet->retTStep.pTrig = &pRet->retTrig;
118960119428
pRet->retTStep.pExprList = pList;
118961119429
pHash = &(db->aDb[1].pSchema->trigHash);
118962
- assert( sqlite3HashFind(pHash, RETURNING_TRIGGER_NAME)==0 || pParse->nErr );
119430
+ assert( sqlite3HashFind(pHash, RETURNING_TRIGGER_NAME)==0
119431
+ || pParse->nErr || pParse->ifNotExists );
118963119432
if( sqlite3HashInsert(pHash, RETURNING_TRIGGER_NAME, &pRet->retTrig)
118964119433
==&pRet->retTrig ){
118965119434
sqlite3OomFault(db);
118966119435
}
118967119436
}
@@ -123830,17 +124299,19 @@
123830124299
**
123831124300
** If pTab is not writable -> generate an error message and return 1.
123832124301
** If pTab is writable but other errors have occurred -> return 1.
123833124302
** If pTab is writable and no prior errors -> return 0;
123834124303
*/
123835
-SQLITE_PRIVATE int sqlite3IsReadOnly(Parse *pParse, Table *pTab, int viewOk){
124304
+SQLITE_PRIVATE int sqlite3IsReadOnly(Parse *pParse, Table *pTab, Trigger *pTrigger){
123836124305
if( tabIsReadOnly(pParse, pTab) ){
123837124306
sqlite3ErrorMsg(pParse, "table %s may not be modified", pTab->zName);
123838124307
return 1;
123839124308
}
123840124309
#ifndef SQLITE_OMIT_VIEW
123841
- if( !viewOk && IsView(pTab) ){
124310
+ if( IsView(pTab)
124311
+ && (pTrigger==0 || (pTrigger->bReturning && pTrigger->pNext==0))
124312
+ ){
123842124313
sqlite3ErrorMsg(pParse,"cannot modify %s because it is a view",pTab->zName);
123843124314
return 1;
123844124315
}
123845124316
#endif
123846124317
return 0;
@@ -124090,11 +124561,11 @@
124090124561
*/
124091124562
if( sqlite3ViewGetColumnNames(pParse, pTab) ){
124092124563
goto delete_from_cleanup;
124093124564
}
124094124565
124095
- if( sqlite3IsReadOnly(pParse, pTab, (pTrigger?1:0)) ){
124566
+ if( sqlite3IsReadOnly(pParse, pTab, pTrigger) ){
124096124567
goto delete_from_cleanup;
124097124568
}
124098124569
iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
124099124570
assert( iDb<db->nDb );
124100124571
rcauth = sqlite3AuthCheck(pParse, SQLITE_DELETE, pTab->zName, 0,
@@ -124199,11 +124670,11 @@
124199124670
}
124200124671
}else
124201124672
#endif /* SQLITE_OMIT_TRUNCATE_OPTIMIZATION */
124202124673
{
124203124674
u16 wcf = WHERE_ONEPASS_DESIRED|WHERE_DUPLICATES_OK;
124204
- if( sNC.ncFlags & NC_VarSelect ) bComplex = 1;
124675
+ if( sNC.ncFlags & NC_Subquery ) bComplex = 1;
124205124676
wcf |= (bComplex ? 0 : WHERE_ONEPASS_MULTIROW);
124206124677
if( HasRowid(pTab) ){
124207124678
/* For a rowid table, initialize the RowSet to an empty set */
124208124679
pPk = 0;
124209124680
nPk = 1;
@@ -128787,49 +129258,51 @@
128787129258
**
128788129259
** Memory for the buffer containing the column index affinity string
128789129260
** is managed along with the rest of the Index structure. It will be
128790129261
** released when sqlite3DeleteIndex() is called.
128791129262
*/
128792
-SQLITE_PRIVATE const char *sqlite3IndexAffinityStr(sqlite3 *db, Index *pIdx){
128793
- if( !pIdx->zColAff ){
128794
- /* The first time a column affinity string for a particular index is
128795
- ** required, it is allocated and populated here. It is then stored as
128796
- ** a member of the Index structure for subsequent use.
128797
- **
128798
- ** The column affinity string will eventually be deleted by
128799
- ** sqliteDeleteIndex() when the Index structure itself is cleaned
128800
- ** up.
128801
- */
128802
- int n;
128803
- Table *pTab = pIdx->pTable;
128804
- pIdx->zColAff = (char *)sqlite3DbMallocRaw(0, pIdx->nColumn+1);
128805
- if( !pIdx->zColAff ){
128806
- sqlite3OomFault(db);
128807
- return 0;
128808
- }
128809
- for(n=0; n<pIdx->nColumn; n++){
128810
- i16 x = pIdx->aiColumn[n];
128811
- char aff;
128812
- if( x>=0 ){
128813
- aff = pTab->aCol[x].affinity;
128814
- }else if( x==XN_ROWID ){
128815
- aff = SQLITE_AFF_INTEGER;
128816
- }else{
128817
- assert( x==XN_EXPR );
128818
- assert( pIdx->bHasExpr );
128819
- assert( pIdx->aColExpr!=0 );
128820
- aff = sqlite3ExprAffinity(pIdx->aColExpr->a[n].pExpr);
128821
- }
128822
- if( aff<SQLITE_AFF_BLOB ) aff = SQLITE_AFF_BLOB;
128823
- if( aff>SQLITE_AFF_NUMERIC) aff = SQLITE_AFF_NUMERIC;
128824
- pIdx->zColAff[n] = aff;
128825
- }
128826
- pIdx->zColAff[n] = 0;
128827
- }
128828
-
129263
+static SQLITE_NOINLINE const char *computeIndexAffStr(sqlite3 *db, Index *pIdx){
129264
+ /* The first time a column affinity string for a particular index is
129265
+ ** required, it is allocated and populated here. It is then stored as
129266
+ ** a member of the Index structure for subsequent use.
129267
+ **
129268
+ ** The column affinity string will eventually be deleted by
129269
+ ** sqliteDeleteIndex() when the Index structure itself is cleaned
129270
+ ** up.
129271
+ */
129272
+ int n;
129273
+ Table *pTab = pIdx->pTable;
129274
+ pIdx->zColAff = (char *)sqlite3DbMallocRaw(0, pIdx->nColumn+1);
129275
+ if( !pIdx->zColAff ){
129276
+ sqlite3OomFault(db);
129277
+ return 0;
129278
+ }
129279
+ for(n=0; n<pIdx->nColumn; n++){
129280
+ i16 x = pIdx->aiColumn[n];
129281
+ char aff;
129282
+ if( x>=0 ){
129283
+ aff = pTab->aCol[x].affinity;
129284
+ }else if( x==XN_ROWID ){
129285
+ aff = SQLITE_AFF_INTEGER;
129286
+ }else{
129287
+ assert( x==XN_EXPR );
129288
+ assert( pIdx->bHasExpr );
129289
+ assert( pIdx->aColExpr!=0 );
129290
+ aff = sqlite3ExprAffinity(pIdx->aColExpr->a[n].pExpr);
129291
+ }
129292
+ if( aff<SQLITE_AFF_BLOB ) aff = SQLITE_AFF_BLOB;
129293
+ if( aff>SQLITE_AFF_NUMERIC) aff = SQLITE_AFF_NUMERIC;
129294
+ pIdx->zColAff[n] = aff;
129295
+ }
129296
+ pIdx->zColAff[n] = 0;
129297
+ return pIdx->zColAff;
129298
+}
129299
+SQLITE_PRIVATE const char *sqlite3IndexAffinityStr(sqlite3 *db, Index *pIdx){
129300
+ if( !pIdx->zColAff ) return computeIndexAffStr(db, pIdx);
128829129301
return pIdx->zColAff;
128830129302
}
129303
+
128831129304
128832129305
/*
128833129306
** Compute an affinity string for a table. Space is obtained
128834129307
** from sqlite3DbMalloc(). The caller is responsible for freeing
128835129308
** the space when done.
@@ -129511,11 +129984,11 @@
129511129984
goto insert_cleanup;
129512129985
}
129513129986
129514129987
/* Cannot insert into a read-only table.
129515129988
*/
129516
- if( sqlite3IsReadOnly(pParse, pTab, tmask) ){
129989
+ if( sqlite3IsReadOnly(pParse, pTab, pTrigger) ){
129517129990
goto insert_cleanup;
129518129991
}
129519129992
129520129993
/* Allocate a VDBE
129521129994
*/
@@ -129958,11 +130431,11 @@
129958130431
sqlite3VdbeJumpHere(v, addr1);
129959130432
sqlite3VdbeAddOp1(v, OP_MustBeInt, regCols); VdbeCoverage(v);
129960130433
}
129961130434
129962130435
/* Copy the new data already generated. */
129963
- assert( pTab->nNVCol>0 );
130436
+ assert( pTab->nNVCol>0 || pParse->nErr>0 );
129964130437
sqlite3VdbeAddOp3(v, OP_Copy, regRowid+1, regCols+1, pTab->nNVCol-1);
129965130438
129966130439
#ifndef SQLITE_OMIT_GENERATED_COLUMNS
129967130440
/* Compute the new value for generated columns after all other
129968130441
** columns have already been computed. This must be done after
@@ -133321,19 +133794,25 @@
133321133794
zEntry = zProc ? zProc : "sqlite3_extension_init";
133322133795
133323133796
/* tag-20210611-1. Some dlopen() implementations will segfault if given
133324133797
** an oversize filename. Most filesystems have a pathname limit of 4K,
133325133798
** so limit the extension filename length to about twice that.
133326
- ** https://sqlite.org/forum/forumpost/08a0d6d9bf */
133799
+ ** https://sqlite.org/forum/forumpost/08a0d6d9bf
133800
+ **
133801
+ ** Later (2023-03-25): Save an extra 6 bytes for the filename suffix.
133802
+ ** See https://sqlite.org/forum/forumpost/24083b579d.
133803
+ */
133327133804
if( nMsg>SQLITE_MAX_PATHLEN ) goto extension_not_found;
133328133805
133329133806
handle = sqlite3OsDlOpen(pVfs, zFile);
133330133807
#if SQLITE_OS_UNIX || SQLITE_OS_WIN
133331133808
for(ii=0; ii<ArraySize(azEndings) && handle==0; ii++){
133332133809
char *zAltFile = sqlite3_mprintf("%s.%s", zFile, azEndings[ii]);
133333133810
if( zAltFile==0 ) return SQLITE_NOMEM_BKPT;
133334
- handle = sqlite3OsDlOpen(pVfs, zAltFile);
133811
+ if( nMsg+strlen(azEndings[ii])+1<=SQLITE_MAX_PATHLEN ){
133812
+ handle = sqlite3OsDlOpen(pVfs, zAltFile);
133813
+ }
133335133814
sqlite3_free(zAltFile);
133336133815
}
133337133816
#endif
133338133817
if( handle==0 ) goto extension_not_found;
133339133818
xInit = (sqlite3_loadext_entry)sqlite3OsDlSym(pVfs, handle, zEntry);
@@ -135824,11 +136303,11 @@
135824136303
if( pTab==0 || !IsOrdinaryTable(pTab) || pTab->u.tab.pFKey==0 ) continue;
135825136304
iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
135826136305
zDb = db->aDb[iDb].zDbSName;
135827136306
sqlite3CodeVerifySchema(pParse, iDb);
135828136307
sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);
135829
- if( pTab->nCol+regRow>pParse->nMem ) pParse->nMem = pTab->nCol + regRow;
136308
+ sqlite3TouchRegister(pParse, pTab->nCol+regRow);
135830136309
sqlite3OpenTable(pParse, 0, iDb, pTab, OP_OpenRead);
135831136310
sqlite3VdbeLoadString(v, regResult, pTab->zName);
135832136311
assert( IsOrdinaryTable(pTab) );
135833136312
for(i=1, pFK=pTab->u.tab.pFKey; pFK; i++, pFK=pFK->pNextFrom){
135834136313
pParent = sqlite3FindTable(db, pFK->zTo, zDb);
@@ -135865,11 +136344,11 @@
135865136344
135866136345
/* Generate code to read the child key values into registers
135867136346
** regRow..regRow+n. If any of the child key values are NULL, this
135868136347
** row cannot cause an FK violation. Jump directly to addrOk in
135869136348
** this case. */
135870
- if( regRow+pFK->nCol>pParse->nMem ) pParse->nMem = regRow+pFK->nCol;
136349
+ sqlite3TouchRegister(pParse, regRow + pFK->nCol);
135871136350
for(j=0; j<pFK->nCol; j++){
135872136351
int iCol = aiCols ? aiCols[j] : pFK->aCol[j].iFrom;
135873136352
sqlite3ExprCodeGetColumnOfTable(v, pTab, 0, iCol, regRow+j);
135874136353
sqlite3VdbeAddOp2(v, OP_IsNull, regRow+j, addrOk); VdbeCoverage(v);
135875136354
}
@@ -135994,10 +136473,11 @@
135994136473
135995136474
if( OMIT_TEMPDB && i==1 ) continue;
135996136475
if( iDb>=0 && i!=iDb ) continue;
135997136476
135998136477
sqlite3CodeVerifySchema(pParse, i);
136478
+ pParse->okConstFactor = 0; /* tag-20230327-1 */
135999136479
136000136480
/* Do an integrity check of the B-Tree
136001136481
**
136002136482
** Begin by finding the root pages numbers
136003136483
** for all tables and indices in the database.
@@ -136029,11 +136509,11 @@
136029136509
}
136030136510
}
136031136511
aRoot[0] = cnt;
136032136512
136033136513
/* Make sure sufficient number of registers have been allocated */
136034
- pParse->nMem = MAX( pParse->nMem, 8+mxIdx );
136514
+ sqlite3TouchRegister(pParse, 8+mxIdx);
136035136515
sqlite3ClearTempRegCache(pParse);
136036136516
136037136517
/* Do the b-tree integrity checks */
136038136518
sqlite3VdbeAddOp4(v, OP_IntegrityCk, 2, cnt, 1, (char*)aRoot,P4_INTARRAY);
136039136519
sqlite3VdbeChangeP5(v, (u8)i);
@@ -136179,19 +136659,33 @@
136179136659
136180136660
labelError = sqlite3VdbeMakeLabel(pParse);
136181136661
labelOk = sqlite3VdbeMakeLabel(pParse);
136182136662
if( pCol->notNull ){
136183136663
/* (1) NOT NULL columns may not contain a NULL */
136664
+ int jmp3;
136184136665
int jmp2 = sqlite3VdbeAddOp4Int(v, OP_IsType, p1, labelOk, p3, p4);
136185
- sqlite3VdbeChangeP5(v, 0x0f);
136186136666
VdbeCoverage(v);
136667
+ if( p1<0 ){
136668
+ sqlite3VdbeChangeP5(v, 0x0f); /* INT, REAL, TEXT, or BLOB */
136669
+ jmp3 = jmp2;
136670
+ }else{
136671
+ sqlite3VdbeChangeP5(v, 0x0d); /* INT, TEXT, or BLOB */
136672
+ /* OP_IsType does not detect NaN values in the database file
136673
+ ** which should be treated as a NULL. So if the header type
136674
+ ** is REAL, we have to load the actual data using OP_Column
136675
+ ** to reliably determine if the value is a NULL. */
136676
+ sqlite3VdbeAddOp3(v, OP_Column, p1, p3, 3);
136677
+ jmp3 = sqlite3VdbeAddOp2(v, OP_NotNull, 3, labelOk);
136678
+ VdbeCoverage(v);
136679
+ }
136187136680
zErr = sqlite3MPrintf(db, "NULL value in %s.%s", pTab->zName,
136188136681
pCol->zCnName);
136189136682
sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, zErr, P4_DYNAMIC);
136190136683
if( doTypeCheck ){
136191136684
sqlite3VdbeGoto(v, labelError);
136192136685
sqlite3VdbeJumpHere(v, jmp2);
136686
+ sqlite3VdbeJumpHere(v, jmp3);
136193136687
}else{
136194136688
/* VDBE byte code will fall thru */
136195136689
}
136196136690
}
136197136691
if( bStrict && doTypeCheck ){
@@ -136295,11 +136789,11 @@
136295136789
** any extra bytes at the end. Verify that this is the case. */
136296136790
if( HasRowid(pTab) ){
136297136791
int jmp7;
136298136792
sqlite3VdbeAddOp2(v, OP_IdxRowid, iIdxCur+j, 3);
136299136793
jmp7 = sqlite3VdbeAddOp3(v, OP_Eq, 3, 0, r1+pIdx->nColumn-1);
136300
- VdbeCoverage(v);
136794
+ VdbeCoverageNeverNull(v);
136301136795
sqlite3VdbeLoadString(v, 3,
136302136796
"rowid not at end-of-record for row ");
136303136797
sqlite3VdbeAddOp3(v, OP_Concat, 7, 3, 3);
136304136798
sqlite3VdbeLoadString(v, 4, " of index ");
136305136799
sqlite3VdbeGoto(v, jmp5-1);
@@ -142129,11 +142623,13 @@
142129142623
assert( pExpr->pRight==0 );
142130142624
if( sqlite3ExprIsVector(pCopy) ){
142131142625
sqlite3VectorErrorMsg(pSubst->pParse, pCopy);
142132142626
}else{
142133142627
sqlite3 *db = pSubst->pParse->db;
142134
- if( pSubst->isOuterJoin ){
142628
+ if( pSubst->isOuterJoin
142629
+ && (pCopy->op!=TK_COLUMN || pCopy->iTable!=pSubst->iNewTable)
142630
+ ){
142135142631
memset(&ifNullRow, 0, sizeof(ifNullRow));
142136142632
ifNullRow.op = TK_IF_NULL_ROW;
142137142633
ifNullRow.pLeft = pCopy;
142138142634
ifNullRow.iTable = pSubst->iNewTable;
142139142635
ifNullRow.iColumn = -99;
@@ -142506,12 +143002,11 @@
142506143002
** (17f) the subquery must not be the RHS of a LEFT JOIN.
142507143003
** (17g) either the subquery is the first element of the outer
142508143004
** query or there are no RIGHT or FULL JOINs in any arm
142509143005
** of the subquery. (This is a duplicate of condition (27b).)
142510143006
** (17h) The corresponding result set expressions in all arms of the
142511
-** compound must have the same affinity. (See restriction (9)
142512
-** on the push-down optimization.)
143007
+** compound must have the same affinity.
142513143008
**
142514143009
** The parent and sub-query may contain WHERE clauses. Subject to
142515143010
** rules (11), (13) and (14), they may also contain ORDER BY,
142516143011
** LIMIT and OFFSET clauses. The subquery cannot use any compound
142517143012
** operator other than UNION ALL because all the other compound
@@ -143375,14 +143870,10 @@
143375143870
**
143376143871
** (8) If the subquery is a compound that uses UNION, INTERSECT,
143377143872
** or EXCEPT, then all of the result set columns for all arms of
143378143873
** the compound must use the BINARY collating sequence.
143379143874
**
143380
-** (9) If the subquery is a compound, then all arms of the compound must
143381
-** have the same affinity. (This is the same as restriction (17h)
143382
-** for query flattening.)
143383
-**
143384143875
**
143385143876
** Return 0 if no changes are made and non-zero if one or more WHERE clause
143386143877
** terms are duplicated into the subquery.
143387143878
*/
143388143879
static int pushDownWhereTerms(
@@ -143409,13 +143900,10 @@
143409143900
}
143410143901
#ifndef SQLITE_OMIT_WINDOWFUNC
143411143902
if( pSel->pWin ) return 0; /* restriction (6b) */
143412143903
#endif
143413143904
}
143414
- if( compoundHasDifferentAffinities(pSubq) ){
143415
- return 0; /* restriction (9) */
143416
- }
143417143905
if( notUnionAll ){
143418143906
/* If any of the compound arms are connected using UNION, INTERSECT,
143419143907
** or EXCEPT, then we must ensure that none of the columns use a
143420143908
** non-BINARY collating sequence. */
143421143909
for(pSel=pSubq; pSel; pSel=pSel->pPrior){
@@ -143502,10 +143990,80 @@
143502143990
}
143503143991
}
143504143992
return nChng;
143505143993
}
143506143994
#endif /* !defined(SQLITE_OMIT_SUBQUERY) || !defined(SQLITE_OMIT_VIEW) */
143995
+
143996
+/*
143997
+** Check to see if a subquery contains result-set columns that are
143998
+** never used. If it does, change the value of those result-set columns
143999
+** to NULL so that they do not cause unnecessary work to compute.
144000
+**
144001
+** Return the number of column that were changed to NULL.
144002
+*/
144003
+static int disableUnusedSubqueryResultColumns(SrcItem *pItem){
144004
+ int nCol;
144005
+ Select *pSub; /* The subquery to be simplified */
144006
+ Select *pX; /* For looping over compound elements of pSub */
144007
+ Table *pTab; /* The table that describes the subquery */
144008
+ int j; /* Column number */
144009
+ int nChng = 0; /* Number of columns converted to NULL */
144010
+ Bitmask colUsed; /* Columns that may not be NULLed out */
144011
+
144012
+ assert( pItem!=0 );
144013
+ if( pItem->fg.isCorrelated || pItem->fg.isCte ){
144014
+ return 0;
144015
+ }
144016
+ assert( pItem->pTab!=0 );
144017
+ pTab = pItem->pTab;
144018
+ assert( pItem->pSelect!=0 );
144019
+ pSub = pItem->pSelect;
144020
+ assert( pSub->pEList->nExpr==pTab->nCol );
144021
+ if( (pSub->selFlags & (SF_Distinct|SF_Aggregate))!=0 ){
144022
+ testcase( pSub->selFlags & SF_Distinct );
144023
+ testcase( pSub->selFlags & SF_Aggregate );
144024
+ return 0;
144025
+ }
144026
+ for(pX=pSub; pX; pX=pX->pPrior){
144027
+ if( pX->pPrior && pX->op!=TK_ALL ){
144028
+ /* This optimization does not work for compound subqueries that
144029
+ ** use UNION, INTERSECT, or EXCEPT. Only UNION ALL is allowed. */
144030
+ return 0;
144031
+ }
144032
+ if( pX->pWin ){
144033
+ /* This optimization does not work for subqueries that use window
144034
+ ** functions. */
144035
+ return 0;
144036
+ }
144037
+ }
144038
+ colUsed = pItem->colUsed;
144039
+ if( pSub->pOrderBy ){
144040
+ ExprList *pList = pSub->pOrderBy;
144041
+ for(j=0; j<pList->nExpr; j++){
144042
+ u16 iCol = pList->a[j].u.x.iOrderByCol;
144043
+ if( iCol>0 ){
144044
+ iCol--;
144045
+ colUsed |= ((Bitmask)1)<<(iCol>=BMS ? BMS-1 : iCol);
144046
+ }
144047
+ }
144048
+ }
144049
+ nCol = pTab->nCol;
144050
+ for(j=0; j<nCol; j++){
144051
+ Bitmask m = j<BMS-1 ? MASKBIT(j) : TOPBIT;
144052
+ if( (m & colUsed)!=0 ) continue;
144053
+ for(pX=pSub; pX; pX=pX->pPrior) {
144054
+ Expr *pY = pX->pEList->a[j].pExpr;
144055
+ if( pY->op==TK_NULL ) continue;
144056
+ pY->op = TK_NULL;
144057
+ ExprClearProperty(pY, EP_Skip|EP_Unlikely);
144058
+ pX->selFlags |= SF_PushDown;
144059
+ nChng++;
144060
+ }
144061
+ }
144062
+ return nChng;
144063
+}
144064
+
143507144065
143508144066
/*
143509144067
** The pFunc is the only aggregate function in the query. Check to see
143510144068
** if the query is a candidate for the min/max optimization.
143511144069
**
@@ -144688,15 +145246,17 @@
144688145246
if( pExpr->pAggInfo==0 ) return WRC_Continue;
144689145247
if( pExpr->op==TK_AGG_COLUMN ) return WRC_Continue;
144690145248
if( pExpr->op==TK_AGG_FUNCTION ) return WRC_Continue;
144691145249
if( pExpr->op==TK_IF_NULL_ROW ) return WRC_Continue;
144692145250
pAggInfo = pExpr->pAggInfo;
144693
- assert( pExpr->iAgg>=0 && pExpr->iAgg<pAggInfo->nColumn );
145251
+ if( NEVER(pExpr->iAgg>=pAggInfo->nColumn) ) return WRC_Continue;
145252
+ assert( pExpr->iAgg>=0 );
144694145253
pCol = &pAggInfo->aCol[pExpr->iAgg];
144695145254
pExpr->op = TK_AGG_COLUMN;
144696145255
pExpr->iTable = pCol->iTable;
144697145256
pExpr->iColumn = pCol->iColumn;
145257
+ ExprClearProperty(pExpr, EP_Skip|EP_Collate);
144698145258
return WRC_Prune;
144699145259
}
144700145260
144701145261
/*
144702145262
** Convert every pAggInfo->aFunc[].pExpr such that any node within
@@ -145046,11 +145606,10 @@
145046145606
sqlite3DbFree(db, p->aCol);
145047145607
sqlite3DbFree(db, p->aFunc);
145048145608
sqlite3DbFreeNN(db, p);
145049145609
}
145050145610
145051
-#ifdef SQLITE_COUNTOFVIEW_OPTIMIZATION
145052145611
/*
145053145612
** Attempt to transform a query of the form
145054145613
**
145055145614
** SELECT count(*) FROM (SELECT x FROM t1 UNION ALL SELECT y FROM t2)
145056145615
**
@@ -145074,10 +145633,11 @@
145074145633
Expr *pCount;
145075145634
sqlite3 *db;
145076145635
if( (p->selFlags & SF_Aggregate)==0 ) return 0; /* This is an aggregate */
145077145636
if( p->pEList->nExpr!=1 ) return 0; /* Single result column */
145078145637
if( p->pWhere ) return 0;
145638
+ if( p->pHaving ) return 0;
145079145639
if( p->pGroupBy ) return 0;
145080145640
if( p->pOrderBy ) return 0;
145081145641
pExpr = p->pEList->a[0].pExpr;
145082145642
if( pExpr->op!=TK_AGG_FUNCTION ) return 0; /* Result is an aggregate */
145083145643
assert( ExprUseUToken(pExpr) );
@@ -145093,11 +145653,12 @@
145093145653
do{
145094145654
if( pSub->op!=TK_ALL && pSub->pPrior ) return 0; /* Must be UNION ALL */
145095145655
if( pSub->pWhere ) return 0; /* No WHERE clause */
145096145656
if( pSub->pLimit ) return 0; /* No LIMIT clause */
145097145657
if( pSub->selFlags & SF_Aggregate ) return 0; /* Not an aggregate */
145098
- pSub = pSub->pPrior; /* Repeat over compound */
145658
+ assert( pSub->pHaving==0 ); /* Due to the previous */
145659
+ pSub = pSub->pPrior; /* Repeat over compound */
145099145660
}while( pSub );
145100145661
145101145662
/* If we reach this point then it is OK to perform the transformation */
145102145663
145103145664
db = pParse->db;
@@ -145136,11 +145697,10 @@
145136145697
sqlite3TreeViewSelect(0, p, 0);
145137145698
}
145138145699
#endif
145139145700
return 1;
145140145701
}
145141
-#endif /* SQLITE_COUNTOFVIEW_OPTIMIZATION */
145142145702
145143145703
/*
145144145704
** If any term of pSrc, or any SF_NestedFrom sub-query, is not the same
145145145705
** as pSrcItem but has the same alias as p0, then return true.
145146145706
** Otherwise return false.
@@ -145525,18 +146085,16 @@
145525146085
#endif
145526146086
}else{
145527146087
TREETRACE(0x2000,pParse,p,("Constant propagation not helpful\n"));
145528146088
}
145529146089
145530
-#ifdef SQLITE_COUNTOFVIEW_OPTIMIZATION
145531146090
if( OptimizationEnabled(db, SQLITE_QueryFlattener|SQLITE_CountOfView)
145532146091
&& countOfViewOptimization(pParse, p)
145533146092
){
145534146093
if( db->mallocFailed ) goto select_end;
145535146094
pTabList = p->pSrc;
145536146095
}
145537
-#endif
145538146096
145539146097
/* For each term in the FROM clause, do two things:
145540146098
** (1) Authorized unreferenced tables
145541146099
** (2) Generate code for all sub-queries
145542146100
*/
@@ -145604,10 +146162,26 @@
145604146162
#endif
145605146163
assert( pItem->pSelect && (pItem->pSelect->selFlags & SF_PushDown)!=0 );
145606146164
}else{
145607146165
TREETRACE(0x4000,pParse,p,("Push-down not possible\n"));
145608146166
}
146167
+
146168
+ /* Convert unused result columns of the subquery into simple NULL
146169
+ ** expressions, to avoid unneeded searching and computation.
146170
+ */
146171
+ if( OptimizationEnabled(db, SQLITE_NullUnusedCols)
146172
+ && disableUnusedSubqueryResultColumns(pItem)
146173
+ ){
146174
+#if TREETRACE_ENABLED
146175
+ if( sqlite3TreeTrace & 0x4000 ){
146176
+ TREETRACE(0x4000,pParse,p,
146177
+ ("Change unused result columns to NULL for subquery %d:\n",
146178
+ pSub->selId));
146179
+ sqlite3TreeViewSelect(0, p, 0);
146180
+ }
146181
+#endif
146182
+ }
145609146183
145610146184
zSavedAuthContext = pParse->zAuthContext;
145611146185
pParse->zAuthContext = pItem->zName;
145612146186
145613146187
/* Generate code to implement the subquery
@@ -146891,10 +147465,11 @@
146891147465
if( !noErr ){
146892147466
sqlite3ErrorMsg(pParse, "trigger %T already exists", pName);
146893147467
}else{
146894147468
assert( !db->init.busy );
146895147469
sqlite3CodeVerifySchema(pParse, iDb);
147470
+ VVA_ONLY( pParse->ifNotExists = 1; )
146896147471
}
146897147472
goto trigger_cleanup;
146898147473
}
146899147474
}
146900147475
@@ -148141,10 +148716,13 @@
148141148716
const int op = pChanges ? TK_UPDATE : TK_DELETE;
148142148717
u32 mask = 0;
148143148718
Trigger *p;
148144148719
148145148720
assert( isNew==1 || isNew==0 );
148721
+ if( IsView(pTab) ){
148722
+ return 0xffffffff;
148723
+ }
148146148724
for(p=pTrigger; p; p=p->pNext){
148147148725
if( p->op==op
148148148726
&& (tr_tm&p->tr_tm)
148149148727
&& checkColumnOverlap(p->pColumns,pChanges)
148150148728
){
@@ -148575,11 +149153,11 @@
148575149153
#endif
148576149154
148577149155
if( sqlite3ViewGetColumnNames(pParse, pTab) ){
148578149156
goto update_cleanup;
148579149157
}
148580
- if( sqlite3IsReadOnly(pParse, pTab, tmask) ){
149158
+ if( sqlite3IsReadOnly(pParse, pTab, pTrigger) ){
148581149159
goto update_cleanup;
148582149160
}
148583149161
148584149162
/* Allocate a cursors for the main database table and for all indices.
148585149163
** The index cursors might not be used, but if they are used they
@@ -148894,16 +149472,26 @@
148894149472
bFinishSeek = 0;
148895149473
}else{
148896149474
/* Begin the database scan.
148897149475
**
148898149476
** Do not consider a single-pass strategy for a multi-row update if
148899
- ** there are any triggers or foreign keys to process, or rows may
148900
- ** be deleted as a result of REPLACE conflict handling. Any of these
148901
- ** things might disturb a cursor being used to scan through the table
148902
- ** or index, causing a single-pass approach to malfunction. */
149477
+ ** there is anything that might disrupt the cursor being used to do
149478
+ ** the UPDATE:
149479
+ ** (1) This is a nested UPDATE
149480
+ ** (2) There are triggers
149481
+ ** (3) There are FOREIGN KEY constraints
149482
+ ** (4) There are REPLACE conflict handlers
149483
+ ** (5) There are subqueries in the WHERE clause
149484
+ */
148903149485
flags = WHERE_ONEPASS_DESIRED;
148904
- if( !pParse->nested && !pTrigger && !hasFK && !chngKey && !bReplace ){
149486
+ if( !pParse->nested
149487
+ && !pTrigger
149488
+ && !hasFK
149489
+ && !chngKey
149490
+ && !bReplace
149491
+ && (sNC.ncFlags & NC_Subquery)==0
149492
+ ){
148905149493
flags |= WHERE_ONEPASS_MULTIROW;
148906149494
}
148907149495
pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere,0,0,0,flags,iIdxCur);
148908149496
if( pWInfo==0 ) goto update_cleanup;
148909149497
@@ -150864,11 +151452,13 @@
150864151452
sCtx.pTab = pTab;
150865151453
sCtx.pVTable = pVTable;
150866151454
sCtx.pPrior = db->pVtabCtx;
150867151455
sCtx.bDeclared = 0;
150868151456
db->pVtabCtx = &sCtx;
151457
+ pTab->nTabRef++;
150869151458
rc = xConstruct(db, pMod->pAux, nArg, azArg, &pVTable->pVtab, &zErr);
151459
+ sqlite3DeleteTable(db, pTab);
150870151460
db->pVtabCtx = sCtx.pPrior;
150871151461
if( rc==SQLITE_NOMEM ) sqlite3OomFault(db);
150872151462
assert( sCtx.pTab==pTab );
150873151463
150874151464
if( SQLITE_OK!=rc ){
@@ -151582,10 +152172,14 @@
151582152172
break;
151583152173
}
151584152174
case SQLITE_VTAB_DIRECTONLY: {
151585152175
p->pVTable->eVtabRisk = SQLITE_VTABRISK_High;
151586152176
break;
152177
+ }
152178
+ case SQLITE_VTAB_USES_ALL_SCHEMAS: {
152179
+ p->pVTable->bAllSchemas = 1;
152180
+ break;
151587152181
}
151588152182
default: {
151589152183
rc = SQLITE_MISUSE_BKPT;
151590152184
break;
151591152185
}
@@ -152356,13 +152950,13 @@
152356152950
sqlite3_str_append(pStr, ")", 1);
152357152951
}
152358152952
152359152953
/*
152360152954
** This function is a no-op unless currently processing an EXPLAIN QUERY PLAN
152361
-** command, or if either SQLITE_DEBUG or SQLITE_ENABLE_STMT_SCANSTATUS was
152362
-** defined at compile-time. If it is not a no-op, a single OP_Explain opcode
152363
-** is added to the output to describe the table scan strategy in pLevel.
152955
+** command, or if stmt_scanstatus_v2() stats are enabled, or if SQLITE_DEBUG
152956
+** was defined at compile-time. If it is not a no-op, a single OP_Explain
152957
+** opcode is added to the output to describe the table scan strategy in pLevel.
152364152958
**
152365152959
** If an OP_Explain opcode is added to the VM, its address is returned.
152366152960
** Otherwise, if no OP_Explain is coded, zero is returned.
152367152961
*/
152368152962
SQLITE_PRIVATE int sqlite3WhereExplainOneScan(
@@ -152370,12 +152964,12 @@
152370152964
SrcList *pTabList, /* Table list this loop refers to */
152371152965
WhereLevel *pLevel, /* Scan to write OP_Explain opcode for */
152372152966
u16 wctrlFlags /* Flags passed to sqlite3WhereBegin() */
152373152967
){
152374152968
int ret = 0;
152375
-#if !defined(SQLITE_DEBUG) && !defined(SQLITE_ENABLE_STMT_SCANSTATUS)
152376
- if( sqlite3ParseToplevel(pParse)->explain==2 )
152969
+#if !defined(SQLITE_DEBUG)
152970
+ if( sqlite3ParseToplevel(pParse)->explain==2 || IS_STMT_SCANSTATUS(pParse->db) )
152377152971
#endif
152378152972
{
152379152973
SrcItem *pItem = &pTabList->a[pLevel->iFrom];
152380152974
Vdbe *v = pParse->pVdbe; /* VM being constructed */
152381152975
sqlite3 *db = pParse->db; /* Database handle */
@@ -152537,31 +153131,33 @@
152537153131
Vdbe *v, /* Vdbe to add scanstatus entry to */
152538153132
SrcList *pSrclist, /* FROM clause pLvl reads data from */
152539153133
WhereLevel *pLvl, /* Level to add scanstatus() entry for */
152540153134
int addrExplain /* Address of OP_Explain (or 0) */
152541153135
){
152542
- const char *zObj = 0;
152543
- WhereLoop *pLoop = pLvl->pWLoop;
152544
- int wsFlags = pLoop->wsFlags;
152545
- int viaCoroutine = 0;
152546
-
152547
- if( (wsFlags & WHERE_VIRTUALTABLE)==0 && pLoop->u.btree.pIndex!=0 ){
152548
- zObj = pLoop->u.btree.pIndex->zName;
152549
- }else{
152550
- zObj = pSrclist->a[pLvl->iFrom].zName;
152551
- viaCoroutine = pSrclist->a[pLvl->iFrom].fg.viaCoroutine;
152552
- }
152553
- sqlite3VdbeScanStatus(
152554
- v, addrExplain, pLvl->addrBody, pLvl->addrVisit, pLoop->nOut, zObj
152555
- );
152556
-
152557
- if( viaCoroutine==0 ){
152558
- if( (wsFlags & (WHERE_MULTI_OR|WHERE_AUTO_INDEX))==0 ){
152559
- sqlite3VdbeScanStatusRange(v, addrExplain, -1, pLvl->iTabCur);
152560
- }
152561
- if( wsFlags & WHERE_INDEXED ){
152562
- sqlite3VdbeScanStatusRange(v, addrExplain, -1, pLvl->iIdxCur);
153136
+ if( IS_STMT_SCANSTATUS( sqlite3VdbeDb(v) ) ){
153137
+ const char *zObj = 0;
153138
+ WhereLoop *pLoop = pLvl->pWLoop;
153139
+ int wsFlags = pLoop->wsFlags;
153140
+ int viaCoroutine = 0;
153141
+
153142
+ if( (wsFlags & WHERE_VIRTUALTABLE)==0 && pLoop->u.btree.pIndex!=0 ){
153143
+ zObj = pLoop->u.btree.pIndex->zName;
153144
+ }else{
153145
+ zObj = pSrclist->a[pLvl->iFrom].zName;
153146
+ viaCoroutine = pSrclist->a[pLvl->iFrom].fg.viaCoroutine;
153147
+ }
153148
+ sqlite3VdbeScanStatus(
153149
+ v, addrExplain, pLvl->addrBody, pLvl->addrVisit, pLoop->nOut, zObj
153150
+ );
153151
+
153152
+ if( viaCoroutine==0 ){
153153
+ if( (wsFlags & (WHERE_MULTI_OR|WHERE_AUTO_INDEX))==0 ){
153154
+ sqlite3VdbeScanStatusRange(v, addrExplain, -1, pLvl->iTabCur);
153155
+ }
153156
+ if( wsFlags & WHERE_INDEXED ){
153157
+ sqlite3VdbeScanStatusRange(v, addrExplain, -1, pLvl->iIdxCur);
153158
+ }
152563153159
}
152564153160
}
152565153161
}
152566153162
#endif
152567153163
@@ -153254,31 +153850,29 @@
153254153850
** know because CCurHint.pIdx!=0) then transform the TK_COLUMN into
153255153851
** an access of the index rather than the original table.
153256153852
*/
153257153853
static int codeCursorHintFixExpr(Walker *pWalker, Expr *pExpr){
153258153854
int rc = WRC_Continue;
153855
+ int reg;
153259153856
struct CCurHint *pHint = pWalker->u.pCCurHint;
153260153857
if( pExpr->op==TK_COLUMN ){
153261153858
if( pExpr->iTable!=pHint->iTabCur ){
153262
- int reg = ++pWalker->pParse->nMem; /* Register for column value */
153263
- sqlite3ExprCode(pWalker->pParse, pExpr, reg);
153859
+ reg = ++pWalker->pParse->nMem; /* Register for column value */
153860
+ reg = sqlite3ExprCodeTarget(pWalker->pParse, pExpr, reg);
153264153861
pExpr->op = TK_REGISTER;
153265153862
pExpr->iTable = reg;
153266153863
}else if( pHint->pIdx!=0 ){
153267153864
pExpr->iTable = pHint->iIdxCur;
153268153865
pExpr->iColumn = sqlite3TableColumnToIndex(pHint->pIdx, pExpr->iColumn);
153269153866
assert( pExpr->iColumn>=0 );
153270153867
}
153271
- }else if( pExpr->op==TK_AGG_FUNCTION ){
153272
- /* An aggregate function in the WHERE clause of a query means this must
153273
- ** be a correlated sub-query, and expression pExpr is an aggregate from
153274
- ** the parent context. Do not walk the function arguments in this case.
153275
- **
153276
- ** todo: It should be possible to replace this node with a TK_REGISTER
153277
- ** expression, as the result of the expression must be stored in a
153278
- ** register at this point. The same holds for TK_AGG_COLUMN nodes. */
153868
+ }else if( pExpr->pAggInfo ){
153279153869
rc = WRC_Prune;
153870
+ reg = ++pWalker->pParse->nMem; /* Register for column value */
153871
+ reg = sqlite3ExprCodeTarget(pWalker->pParse, pExpr, reg);
153872
+ pExpr->op = TK_REGISTER;
153873
+ pExpr->iTable = reg;
153280153874
}
153281153875
return rc;
153282153876
}
153283153877
153284153878
/*
@@ -154170,11 +154764,11 @@
154170154764
** of entries in the tree, so basing the number of steps to try
154171154765
** on the estimated number of rows in the btree seems like a good
154172154766
** guess. */
154173154767
addrSeekScan = sqlite3VdbeAddOp1(v, OP_SeekScan,
154174154768
(pIdx->aiRowLogEst[0]+9)/10);
154175
- if( pRangeStart ){
154769
+ if( pRangeStart || pRangeEnd ){
154176154770
sqlite3VdbeChangeP5(v, 1);
154177154771
sqlite3VdbeChangeP2(v, addrSeekScan, sqlite3VdbeCurrentAddr(v)+1);
154178154772
addrSeekScan = 0;
154179154773
}
154180154774
VdbeCoverage(v);
@@ -154211,20 +154805,11 @@
154211154805
*/
154212154806
nConstraint = nEq;
154213154807
assert( pLevel->p2==0 );
154214154808
if( pRangeEnd ){
154215154809
Expr *pRight = pRangeEnd->pExpr->pRight;
154216
- if( addrSeekScan ){
154217
- /* For a seek-scan that has a range on the lowest term of the index,
154218
- ** we have to make the top of the loop be code that sets the end
154219
- ** condition of the range. Otherwise, the OP_SeekScan might jump
154220
- ** over that initialization, leaving the range-end value set to the
154221
- ** range-start value, resulting in a wrong answer.
154222
- ** See ticket 5981a8c041a3c2f3 (2021-11-02).
154223
- */
154224
- pLevel->p2 = sqlite3VdbeCurrentAddr(v);
154225
- }
154810
+ assert( addrSeekScan==0 );
154226154811
codeExprOrVector(pParse, pRight, regBase+nEq, nTop);
154227154812
whereLikeOptimizationStringFixup(v, pLevel, pRangeEnd);
154228154813
if( (pRangeEnd->wtFlags & TERM_VNULL)==0
154229154814
&& sqlite3ExprCanBeNull(pRight)
154230154815
){
@@ -154254,11 +154839,11 @@
154254154839
}
154255154840
if( zStartAff ) sqlite3DbNNFreeNN(db, zStartAff);
154256154841
if( zEndAff ) sqlite3DbNNFreeNN(db, zEndAff);
154257154842
154258154843
/* Top of the loop body */
154259
- if( pLevel->p2==0 ) pLevel->p2 = sqlite3VdbeCurrentAddr(v);
154844
+ pLevel->p2 = sqlite3VdbeCurrentAddr(v);
154260154845
154261154846
/* Check if the index cursor is past the end of the range. */
154262154847
if( nConstraint ){
154263154848
if( regBignull ){
154264154849
/* Except, skip the end-of-range check while doing the NULL-scan */
@@ -156896,13 +157481,16 @@
156896157481
pColRef->y.pTab = pTab;
156897157482
pItem->colUsed |= sqlite3ExprColUsed(pColRef);
156898157483
pRhs = sqlite3PExpr(pParse, TK_UPLUS,
156899157484
sqlite3ExprDup(pParse->db, pArgs->a[j].pExpr, 0), 0);
156900157485
pTerm = sqlite3PExpr(pParse, TK_EQ, pColRef, pRhs);
156901
- if( pItem->fg.jointype & (JT_LEFT|JT_LTORJ|JT_RIGHT) ){
157486
+ if( pItem->fg.jointype & (JT_LEFT|JT_RIGHT) ){
157487
+ testcase( pItem->fg.jointype & JT_LEFT ); /* testtag-20230227a */
157488
+ testcase( pItem->fg.jointype & JT_RIGHT ); /* testtag-20230227b */
156902157489
joinType = EP_OuterON;
156903157490
}else{
157491
+ testcase( pItem->fg.jointype & JT_LTORJ ); /* testtag-20230227c */
156904157492
joinType = EP_InnerON;
156905157493
}
156906157494
sqlite3SetJoinExpr(pTerm, pItem->iCursor, joinType);
156907157495
whereClauseInsert(pWC, pTerm, TERM_DYNAMIC);
156908157496
}
@@ -157741,11 +158329,11 @@
157741158329
Parse *pParse,
157742158330
Index *pIdx, /* Automatic index to explain */
157743158331
int bPartial, /* True if pIdx is a partial index */
157744158332
int *pAddrExplain /* OUT: Address of OP_Explain */
157745158333
){
157746
- if( pParse->explain!=2 ){
158334
+ if( IS_STMT_SCANSTATUS(pParse->db) && pParse->explain!=2 ){
157747158335
Table *pTab = pIdx->pTable;
157748158336
const char *zSep = "";
157749158337
char *zText = 0;
157750158338
int ii = 0;
157751158339
sqlite3_str *pStr = sqlite3_str_new(pParse->db);
@@ -157802,11 +158390,12 @@
157802158390