Skip to content

Commit 9b613b4

Browse files
committed
Added version info to shell application
1 parent e27c041 commit 9b613b4

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

readme.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ The code was mainly developed under Windows, but was tested under Linux as well.
1414

1515
* 1.1.2 - *December 2020*
1616
- Fixed a bug on cipher configuration via PRAGMA commands or URI parameters
17+
- Added SQLite3 Multple Ciphers version info to shell application
1718
* 1.1.1 - *December 2020*
1819
- Fixed a bug on removing encryption from an encrypted database
1920
* 1.1.0 - *December 2020*

scripts/patchshell.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/sh
2+
# Generate patched shell.c from SQLite3 amalgamation distribution and write it to stdout.
3+
# Usage: ./script/patchshell.sh shell.c >shellpatched.c
4+
5+
INPUT="$([ "$#" -eq 1 ] && echo "$1" || echo "shell.c")"
6+
if ! [ -f "$INPUT" ]; then
7+
echo "Usage: $0 <SQLITE3_SHELL_AMALGAMATION>" >&2
8+
echo " e.g.: $0 shell.c" >&2
9+
exit 1
10+
fi
11+
12+
die() {
13+
echo "[-]" "$@" >&2
14+
exit 2
15+
}
16+
17+
sed -e '/int nHistory;/{n;N;N;N;N;d}' "$INPUT" \
18+
| sed '/int nHistory;/a \ extern char* sqlite3mc_version();\n printf(\n "SQLite version \%s \%.19s" \/\*extra-version-info\*\/\n " (\%s)\\n" \/\*SQLite3-Multiple-Ciphers-version-info\*\/\n "Enter \\".help\\" for usage hints.\\n\",\n sqlite3_libversion(), sqlite3_sourceid(), sqlite3mc_version()\n );'

src/shell.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21323,10 +21323,12 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
2132321323
char *zHome;
2132421324
char *zHistory;
2132521325
int nHistory;
21326+
extern char* sqlite3mc_version();
2132621327
printf(
21327-
"SQLite version %s %.19s\n" /*extra-version-info*/
21328+
"SQLite version %s %.19s" /*extra-version-info*/
21329+
" (%s)\n" /*SQLite3-Multiple-Ciphers-version-info*/
2132821330
"Enter \".help\" for usage hints.\n",
21329-
sqlite3_libversion(), sqlite3_sourceid()
21331+
sqlite3_libversion(), sqlite3_sourceid(), sqlite3mc_version()
2133021332
);
2133121333
if( warnInmemoryDb ){
2133221334
printf("Connected to a ");

0 commit comments

Comments
 (0)