3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-12-29 16:25:54 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #212 from pas2k/master

Browse Source 
Consume \n in mg_fgets when reading from membuf
This commit is contained in:
Sergey Lyubka 2013-08-12 04:16:19 -07:00
commit b5d397c74f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mongoose.c
View File

@ -2415,14 +2415,21 @@ static int parse_auth_header(struct mg_connection *conn, char *buf,
static char *mg_fgets(char *buf, size_t size, struct file *filep, char **p) {
char *eof;
size_t len;
char *memend;
if (filep->membuf != NULL && *p != NULL) {
eof = (char *) memchr(*p, '\n', &filep->membuf[filep->size] - *p);
len = (size_t) (eof - *p) > size - 1 ? size - 1 : (size_t) (eof - *p);
memend = (char *) &filep->membuf[filep->size];
eof = (char *) memchr(*p, '\n', memend - *p); // Search for \n from p till the end of stream
if (eof != NULL) {
eof += 1; // Include \n
} else {
eof = memend; // Copy remaining data
}
len = (size_t) (eof - *p) > size - 1 ? size - 1 : (size_t) (eof - *p);
memcpy(buf, *p, len);
buf[len] = '\0';
*p = eof;
return eof;
*p += len;
return len ? eof : NULL;
} else if (filep->fp != NULL) {
return fgets(buf, size, filep->fp);
} else {