Allow empty lines in the configuration file.

This commit is contained in:
Andrea Mazzoleni 2011-06-21 21:34:58 +02:00
parent 371a9ab667
commit 7acaf53dc9
3 changed files with 5 additions and 4 deletions

View file

@ -111,6 +111,7 @@ void state_config(struct snapraid_state* state, const char* path, int verbose, i
/* here we use strtoken_trim() to eat extra spaces inserted by the user */
/* skip ending spaces */
--ret;
while (ret>0 && isspace(s[ret-1])) {
--ret;
s[ret] = 0;

4
util.c
View file

@ -40,7 +40,7 @@ int strgets(char* s, unsigned size, FILE* f)
*i++ = c;
if (i == send) {
return -1;
return -1; /* return error if the buffer is full */
}
}
@ -64,7 +64,7 @@ int strgets(char* s, unsigned size, FILE* f)
*i = 0;
return i - s;
return i - s + 1;
}
int stru32(const char* s, uint32_t* value)

4
util.h
View file

@ -47,7 +47,7 @@ static inline char* strtoken_trim(char* s)
++s;
}
/* skip ending spaces */
/* skip spaces */
while (*s && isspace(*s))
++s;
@ -56,7 +56,7 @@ static inline char* strtoken_trim(char* s)
/**
* Gets a text line from a file.
* Returns -1 on error, 0 on oef, or the number of chars read.
* Returns -1 on error, 0 on OEF, or the number of chars returned in the buffer, including the ending 0.
*/
int strgets(char* s, unsigned size, FILE* f);