1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00

:-) (CVS 174)

FossilOrigin-Name: 5ddeeb477148295b66fdd78d102827386852fed3
This commit is contained in:
drh
2001-01-04 14:27:07 +00:00
parent 4b2d64a9c9
commit 660f68d6a2
4 changed files with 17 additions and 10 deletions

View File

@ -24,7 +24,7 @@
** This file contains code to implement the "sqlite" command line
** utility for accessing SQLite databases.
**
** $Id: shell.c,v 1.28 2001/01/04 14:20:18 drh Exp $
** $Id: shell.c,v 1.29 2001/01/04 14:27:08 drh Exp $
*/
#include <stdlib.h>
#include <string.h>
@ -688,6 +688,7 @@ int main(int argc, char **argv){
char *zErrMsg = 0;
char *argv0 = argv[0];
struct callback_data data;
int echo = 0;
memset(&data, 0, sizeof(data));
data.mode = MODE_List;
@ -721,6 +722,10 @@ int main(int argc, char **argv){
data.showHeader = 0;
argc--;
argv++;
}else if( strcmp(argv[1],"-echo")==0 ){
echo = 1;
argc--;
argv++;
}else{
fprintf(stderr,"%s: unknown option: %s\n", argv0, argv[1]);
return 1;
@ -763,6 +768,7 @@ int main(int argc, char **argv){
);
}
while( (zLine = one_input_line(zSql, istty))!=0 ){
if( echo ) printf("%s\n", zLine);
if( zLine && zLine[0]=='.' ){
do_meta_command(zLine, db, &data);
free(zLine);
@ -792,7 +798,7 @@ int main(int argc, char **argv){
data.cnt = 0;
if( sqlite_exec(db, zSql, callback, &data, &zErrMsg)!=0
&& zErrMsg!=0 ){
if( !istty ) printf("%s\n",zSql);
if( !istty && !echo ) printf("%s\n",zSql);
printf("SQL error: %s\n", zErrMsg);
free(zErrMsg);
zErrMsg = 0;