From c8ba212665d5d04cfb962c42a9c53360e7f3d4ee Mon Sep 17 00:00:00 2001 From: drh Date: Wed, 23 Mar 2011 11:16:22 +0000 Subject: [PATCH] In the shell, make sure the ".log" command has at least one argument. FossilOrigin-Name: 1ed5e361ca7bfa9226fec265704394e0f228f0c5 --- manifest | 24 +++++++++++++++++------- manifest.uuid | 2 +- src/shell.c | 2 +- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index f013a88380..04ac2cbb62 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,8 @@ -C Fix\sa\snumbering\sissue\sin\srtree6.test.\sAdd\sa\scouple\sof\sextra\stests. -D 2011-03-23T10:52:24 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +C In\sthe\sshell,\smake\ssure\sthe\s".log"\scommand\shas\sat\sleast\sone\sargument. +D 2011-03-23T11:16:22.642 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -177,7 +180,7 @@ F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50 F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697 F src/select.c d24406c45dd2442eb2eeaac413439066b149c944 -F src/shell.c 4a5e0ad845475c84881f0b25b1abba2ddaab0a72 +F src/shell.c 9dc0b4bb59290c0a35256d278cab0f314987ad6a F src/sqlite.h.in 9d85096265a53db6c9d452eb478d5ced15308275 F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754 F src/sqliteInt.h 1de0edab31cc9e5c2f3540e08e8b97926f84bfeb @@ -915,7 +918,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 387b55aa9bb0f978641f9c2fa40f84fd98662047 -R 42f78a66f5fb996ecb166be6e5e2801d -U dan -Z 48e98177ee9f2d2bd6fc7fbe27e37892 +P 0b7668a71ef8995ea0306c7d890f87761961426e +R 88a09b7469ff1146f51987afec7567e4 +U drh +Z f1bfc5b8226ce4dbe953fcf48ca565ea +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFNidaJoxKgR168RlERApqOAJwNgpXn213VO6fr+LnJXQLkyKs6wACePFP8 +pc1Sc0TC4VKU22K9u5+NaOQ= +=M8WR +-----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index cb2b1b4819..1e4ab125fd 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0b7668a71ef8995ea0306c7d890f87761961426e \ No newline at end of file +1ed5e361ca7bfa9226fec265704394e0f228f0c5 \ No newline at end of file diff --git a/src/shell.c b/src/shell.c index 7eed290918..be4e0de281 100644 --- a/src/shell.c +++ b/src/shell.c @@ -1851,7 +1851,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){ }else #endif - if( c=='l' && strncmp(azArg[0], "log", n)==0 && nArg>=1 ){ + if( c=='l' && strncmp(azArg[0], "log", n)==0 && nArg>=2 ){ const char *zFile = azArg[1]; if( p->pLog && p->pLog!=stdout && p->pLog!=stderr ){ fclose(p->pLog);