Do that last CLI fix more simply, using established means.

FossilOrigin-Name: a1823b297616bc2bd64eda9df4850fb460d8da8959ae3728195db896d1f89e7b
This commit is contained in:
larrybr 2023-06-02 13:31:12 +00:00
parent 4e8a0eb4e7
commit a3f943942c
3 changed files with 9 additions and 13 deletions

View File

@ -1,5 +1,5 @@
C Fix\sCLI\sfault\son\smissing\s-nonce\sreported\sby\s[forum:/info/f8c14a1134|forum\spost\sf8c14a1134].
D 2023-06-02T12:56:32.764
C Do\sthat\slast\sCLI\sfix\smore\ssimply,\susing\sestablished\smeans.
D 2023-06-02T13:31:12.174
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@ -638,7 +638,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032
F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
F src/select.c 0f9b9bfd0ea01aeb15ed5e92a99a28465d3421e0686ce08a2bfad1c61f7ec357
F src/shell.c.in 3ed9747b7f7e51e3107728a548cd9dcbfd29a655571161c4678920096a398768
F src/shell.c.in 6915835eee0775c02ea1fb474da19f07ed76acbfc92444aef09e16b963abb46f
F src/sqlite.h.in 03515ff55fafc0ba9ec75adbee250905cb59275f1714f0b6562e0bd466776334
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@ -2072,8 +2072,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 73d7b14b1713d93c4ae07995e9aa6485cbad90bd6125584dbaeccb0cc9410ea3
R 0053d572c555ac64e37f43c64d178fb7
P cd24178bbaad4a1dafc3848e7d74240f90030160b5c43c93e1e0e11b073c2df5
R 82919da296f71693b73364c8679802ba
U larrybr
Z 6eac4228400e5fde498516e8b7b43abc
Z dcbd07d0b87a8855abf3514a8f1d56da
# Remove this line to create a well-formed Fossil manifest.

View File

@ -1 +1 @@
cd24178bbaad4a1dafc3848e7d74240f90030160b5c43c93e1e0e11b073c2df5
a1823b297616bc2bd64eda9df4850fb460d8da8959ae3728195db896d1f89e7b

View File

@ -12220,12 +12220,8 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
}else if( cli_strcmp(z,"-bail")==0 ){
bail_on_error = 1;
}else if( cli_strcmp(z,"-nonce")==0 ){
if( data.zNonce ) free(data.zNonce);
if( i+1 < argc ) data.zNonce = strdup(argv[++i]);
else{
data.zNonce = 0;
break;
}
free(data.zNonce);
data.zNonce = strdup(cmdline_option_value(argc, argv, ++i));
}else if( cli_strcmp(z,"-unsafe-testing")==0 ){
ShellSetFlag(&data,SHFLG_TestingMode);
}else if( cli_strcmp(z,"-safe")==0 ){