database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Fix for ticket #71: Correctly handle CR and CRLF line terminators in the

Browse Source 
input files for the COPY command. (CVS 694)

FossilOrigin-Name: be1315755ef801b5ec07f469134e0d33a3ece990
This commit is contained in:
drh
2002-07-30 17:20:40 +00:00
parent 368c7f6df1
commit 62160e798c
6 changed files with 63 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/vdbe.c
View File

@@ -30,7 +30,7 @@
** But other routines are also provided to help in building up
** a program instruction by instruction.
**
** $Id: vdbe.c,v 1.165 2002/07/18 00:34:12 drh Exp $
** $Id: vdbe.c,v 1.166 2002/07/30 17:20:40 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -1240,6 +1240,32 @@ static int byteSwap(int x){
# define VERIFY(X) X
#endif
/*
** The following routine works like a replacement for the standard
** library routine fgets(). The difference is in how end-of-line (EOL)
** is handled. Standard fgets() uses LF for EOL under unix, CRLF
** under windows, and CR under mac. This routine accepts any of these
** character sequences as an EOL mark. The EOL mark is replaced by
** a single LF character in zBuf.
*/
static char *vdbe_fgets(char *zBuf, int nBuf, FILE *in){
int i, c;
for(i=0; i<nBuf-1 && (c=getc(in))!=EOF; i++){
zBuf[i] = c;
if( c=='\r' || c=='\n' ){
if( c=='\r' ){
zBuf[i] = '\n';
c = getc(in);
if( c!=EOF && c!='\n' ) ungetc(c, in);
}
i++;
break;
}
}
zBuf[i] = 0;
return i>0 ? zBuf : 0;
}
/*
** Execute the program in the VDBE.
**
@@ -4470,7 +4496,7 @@ case OP_FileRead: {
}
p->zLine = zLine;
}
if( fgets(&p->zLine[n], p->nLineAlloc-n, p->pFile)==0 ){
if( vdbe_fgets(&p->zLine[n], p->nLineAlloc-n, p->pFile)==0 ){
eol = 1;
p->zLine[n] = 0;
}else{