chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: fix error checking after fgets()
[elogind.git]
/
src
/
util.c
diff --git
a/src/util.c
b/src/util.c
index e93e6f6cf5c962e90ac7b8a4a29cc8cfe00a80ce..da71e4d08b270a8da6c9d7a347f8cbb33ef451b0 100644
(file)
--- a/
src/util.c
+++ b/
src/util.c
@@
-516,7
+516,7
@@
int get_parent_of_pid(pid_t pid, pid_t *_ppid) {
return -errno;
if (!(fgets(line, sizeof(line), f))) {
return -errno;
if (!(fgets(line, sizeof(line), f))) {
- r = -errno;
+ r =
feof(f) ? -EIO :
-errno;
fclose(f);
return r;
}
fclose(f);
return r;
}
@@
-561,7
+561,7
@@
int get_starttime_of_pid(pid_t pid, unsigned long long *st) {
return -errno;
if (!(fgets(line, sizeof(line), f))) {
return -errno;
if (!(fgets(line, sizeof(line), f))) {
- r = -errno;
+ r =
feof(f) ? -EIO :
-errno;
fclose(f);
return r;
}
fclose(f);
return r;
}
@@
-708,7
+708,7
@@
int read_one_line_file(const char *fn, char **line) {
return -errno;
if (!(fgets(t, sizeof(t), f))) {
return -errno;
if (!(fgets(t, sizeof(t), f))) {
- r = -errno;
+ r =
feof(f) ? -EIO :
-errno;
goto finish;
}
goto finish;
}
@@
-3266,7
+3266,7
@@
int get_ctty_devnr(pid_t pid, dev_t *d) {
return -errno;
if (!fgets(line, sizeof(line), f)) {
return -errno;
if (!fgets(line, sizeof(line), f)) {
- k = -errno;
+ k =
feof(f) ? -EIO :
-errno;
fclose(f);
return k;
}
fclose(f);
return k;
}