Comment
This commit is contained in:
1 parent
987d50eba6
commit
ffe164c09e
1 file changed
+5
-4
+5
-4
@@ -540,19 +540,20 @@ string_fgets(string_t v, FILE *f, string_fgets_t arg)
|
|||||||
M_ASSUME(v->ptr != NULL);
|
M_ASSUME(v->ptr != NULL);
|
||||||
v->size = 0;
|
v->size = 0;
|
||||||
v->ptr[0] = 0;
|
v->ptr[0] = 0;
|
||||||
bool retcode = false;
|
bool retcode = false; /* Nothing has been read yet */
|
||||||
while (fgets(&v->ptr[v->size], v->alloc - v->size, f) != NULL) {
|
while (fgets(&v->ptr[v->size], v->alloc - v->size, f) != NULL) {
|
||||||
retcode = true;
|
retcode = true; /* Something has been read */
|
||||||
char *p = strchr(&v->ptr[v->size], '\n');
|
char *p = strchr(&v->ptr[v->size], '\n');
|
||||||
v->size += strlen(&v->ptr[v->size]);
|
v->size += strlen(&v->ptr[v->size]);
|
||||||
STRING_CONTRACT(v);
|
STRING_CONTRACT(v);
|
||||||
if (arg != STRING_READ_FILE && p != NULL) {
|
if (arg != STRING_READ_FILE && p != NULL) {
|
||||||
if (arg == STRING_READ_PURE_LINE) {
|
if (arg == STRING_READ_PURE_LINE) {
|
||||||
|
/* Remove EOL */
|
||||||
*p = 0;
|
*p = 0;
|
||||||
v->size --;
|
v->size --;
|
||||||
}
|
}
|
||||||
STRING_CONTRACT(v);
|
STRING_CONTRACT(v);
|
||||||
return retcode;
|
return retcode; /* Normal terminaison */
|
||||||
} else if (p == NULL && !feof(f)) {
|
} else if (p == NULL && !feof(f)) {
|
||||||
/* The string buffer is not big enough:
|
/* The string buffer is not big enough:
|
||||||
increase it and continue reading */
|
increase it and continue reading */
|
||||||
@@ -560,7 +561,7 @@ string_fgets(string_t v, FILE *f, string_fgets_t arg)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
STRING_CONTRACT (v);
|
STRING_CONTRACT (v);
|
||||||
return retcode;
|
return retcode; /* Abnormal terminaison */
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
|
|||||||
Reference in new issue
Block a user