picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fileio: use _cleanup_ for FILE unlocking

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-09-23 10:48:09 +02:00
parent 620218fbd9
commit f858e5148e
1 changed files with 27 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/basic/fileio.c
View file

@ -1513,10 +1513,13 @@ int mkdtemp_malloc(const char *template, char **ret) {
return 0;
}
static inline void funlockfilep(FILE **f) {
funlockfile(*f);
}
int read_line(FILE *f, size_t limit, char **ret) {
_cleanup_free_ char *buffer = NULL;
size_t n = 0, allocated = 0, count = 0;
int r;
assert(f);
@ -1538,48 +1541,42 @@ int read_line(FILE *f, size_t limit, char **ret) {
return -ENOMEM;
}
flockfile(f);
{
_cleanup_(funlockfilep) FILE *flocked = f;
flockfile(f);
for (;;) {
int c;
for (;;) {
int c;
if (n >= limit) {
funlockfile(f);
return -ENOBUFS;
}
if (n >= limit)
return -ENOBUFS;
errno = 0;
c = fgetc_unlocked(f);
if (c == EOF) {
/* if we read an error, and have no data to return, then propagate the error */
if (ferror_unlocked(f) && n == 0) {
r = errno > 0 ? -errno : -EIO;
funlockfile(f);
return r;
errno = 0;
c = fgetc_unlocked(f);
if (c == EOF) {
/* if we read an error, and have no data to return, then propagate the error */
if (ferror_unlocked(f) && n == 0)
return errno > 0 ? -errno : -EIO;
break;
}
break;
}
count++;
count++;
if (IN_SET(c, '\n', 0)) /* Reached a delimiter */
break;
if (IN_SET(c, '\n', 0)) /* Reached a delimiter */
break;
if (ret) {
if (!GREEDY_REALLOC(buffer, allocated, n + 2))
return -ENOMEM;
if (ret) {
if (!GREEDY_REALLOC(buffer, allocated, n + 2)) {
funlockfile(f);
return -ENOMEM;
buffer[n] = (char) c;
}
buffer[n] = (char) c;
n++;
}
n++;
}
funlockfile(f);
if (ret) {
buffer[n] = 0;