diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2013-05-04 21:39:27 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2013-05-04 21:39:27 +0000 |
| commit | fec6336699f34758d3e6cb41b2edf902fedb9035 (patch) | |
| tree | 8256c1dbf3ca7c9e58a3dbecf07cf826fb2e0ce2 /src/libicalss/icalsslexer.l | |
| parent | 7dbffd7e2b0067e834801617c5c486e3177f6709 (diff) | |
| download | libical-master.tar.gz | |
libical-1.0HEADlibical-1.0master
Diffstat (limited to 'src/libicalss/icalsslexer.l')
| -rw-r--r-- | src/libicalss/icalsslexer.l | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/libicalss/icalsslexer.l b/src/libicalss/icalsslexer.l index a044051..7003fc0 100644 --- a/src/libicalss/icalsslexer.l +++ b/src/libicalss/icalsslexer.l @@ -36,11 +36,14 @@ const char* input_buffer; const char* input_buffer_p; -#define min(a,b) ((a) < (b) ? (a) : (b)) - int icalss_input(char* buf, int max_size) { - int n = min(max_size,strlen(input_buffer_p)); + int n; + int l; + + l = strlen(input_buffer_p); + if (max_size<l) n = max_size; + else n = l; if (n > 0){ memcpy(buf, input_buffer_p, n); @@ -108,7 +111,9 @@ NULL { return SQLNULL; } \'[\@\*A-Za-z0-9\-\.\:\ ]+\' { int c = input(); - unput(c); + if(c != EOF){ + unput(c); + } if(c!='\''){ sslval.v_string= icalmemory_tmp_copy(yytext); return STRING; |