database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-06 15:49:35 +03:00
Code Activity

Do not report an error if the input to the sqlite shell ends in a comment.

Browse Source 
Ticket #211. (CVS 838)

FossilOrigin-Name: 32a8e6e9771d636c0ad3042632d35865bc08585b
This commit is contained in:
drh
2003-01-18 17:05:00 +00:00
parent 799550beb0
commit be4f31c226
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/shell.c
View File

@@ -12,7 +12,7 @@
** This file contains code to implement the "sqlite" command line
** utility for accessing SQLite databases.
**
** $Id: shell.c,v 1.64 2003/01/08 13:02:53 drh Exp $
** $Id: shell.c,v 1.65 2003/01/18 17:05:01 drh Exp $
*/
#include <stdlib.h>
#include <string.h>
@@ -912,6 +912,20 @@ static int do_meta_command(char *zLine, sqlite *db, struct callback_data *p){
return rc;
}
/*
** Skip over an SQL comments and whitespace. Return a pointer to the text that
** follows the comments and whitespace.
*/
static char *skip_whitespace(char *z){
while( isspace(*z) ){ z++; }
while( z[0]=='-' && z[1]=='-' ){
z += 2;
while( *z && *z!='\n' ){ z++; }
while( isspace(*z) ){ z++; }
}
return z;
}
/*
** Read input from *in and process it. If *in==0 then input
** is interactive - the user is typing it it. Otherwise, input
@@ -976,7 +990,8 @@ static void process_input(struct callback_data *p, FILE *in){
}
}
if( zSql ){
printf("Incomplete SQL: %s\n", zSql);
char *zTail = skip_whitespace(zSql);
if( zTail && zTail[0] ) printf("Incomplete SQL: %s\n", zSql);
free(zSql);
}
}