mirror of
https://github.com/pi-hole/FTL.git
synced 2024-10-26 16:52:18 +02:00
Some improvements for getline()
This commit is contained in:
+4
-2
@@ -43,6 +43,7 @@ char* find_equals(const char* s)
|
||||
// actually point to memory addresses
|
||||
// which we allocate for this buffer.
|
||||
char * linebuffer = NULL;
|
||||
size_t linebuffersize = 0;
|
||||
|
||||
char * read_setupVarsconf(const char * key)
|
||||
{
|
||||
@@ -63,9 +64,8 @@ char * read_setupVarsconf(const char * key)
|
||||
}
|
||||
sprintf(keystr, "%s=", key);
|
||||
|
||||
size_t size;
|
||||
errno = 0;
|
||||
while(getline(&linebuffer, &size, setupVarsfp) != -1)
|
||||
while(getline(&linebuffer, &linebuffersize, setupVarsfp) != -1)
|
||||
{
|
||||
// Strip (possible) newline
|
||||
linebuffer[strcspn(linebuffer, "\n")] = '\0';
|
||||
@@ -97,6 +97,7 @@ char * read_setupVarsconf(const char * key)
|
||||
if(linebuffer != NULL)
|
||||
{
|
||||
free(linebuffer);
|
||||
linebuffersize = 0;
|
||||
linebuffer = NULL;
|
||||
}
|
||||
|
||||
@@ -141,6 +142,7 @@ void clearSetupVarsArray(void)
|
||||
if(linebuffer != NULL)
|
||||
{
|
||||
free(linebuffer);
|
||||
linebuffersize = 0;
|
||||
linebuffer = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user