Use libbb/get_line_from_file instead of getline
This commit is contained in:
parent
11adab0535
commit
b323162aab
@ -1057,7 +1057,6 @@ char **create_list(const char *filename)
|
|||||||
FILE *list_stream;
|
FILE *list_stream;
|
||||||
char **file_list = NULL;
|
char **file_list = NULL;
|
||||||
char *line = NULL;
|
char *line = NULL;
|
||||||
int length = 0;
|
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
/* dont use [xw]fopen here, handle error ourself */
|
/* dont use [xw]fopen here, handle error ourself */
|
||||||
@ -1066,14 +1065,13 @@ char **create_list(const char *filename)
|
|||||||
return(NULL);
|
return(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
while (getline(&line, &length, list_stream) != -1) {
|
while ((line = get_line_from_file(list_stream)) != NULL) {
|
||||||
file_list = xrealloc(file_list, sizeof(char *) * (count + 2));
|
file_list = xrealloc(file_list, sizeof(char *) * (count + 2));
|
||||||
chomp(line);
|
chomp(line);
|
||||||
file_list[count] = xstrdup(line);
|
file_list[count] = line;
|
||||||
count++;
|
count++;
|
||||||
}
|
}
|
||||||
fclose(list_stream);
|
fclose(list_stream);
|
||||||
free(line);
|
|
||||||
|
|
||||||
if (count == 0) {
|
if (count == 0) {
|
||||||
return(NULL);
|
return(NULL);
|
||||||
|
Loading…
Reference in New Issue
Block a user