shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

util: introduce FOREACH_LINE for iterating through files

Browse Source
This commit is contained in:
Lennart Poettering 2013-02-11 05:09:29 +01:00
parent 9b5d6bd909
commit f74e605fc0
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/shared/util.c
View File

@ -1063,10 +1063,10 @@ int get_process_exe(pid_t pid, char **name) {
}
static int get_process_id(pid_t pid, const char *field, uid_t *uid) {
char *p;
FILE *f;
int r;
_cleanup_fclose_ FILE *f = NULL;
_cleanup_free_ char *p = NULL;
assert(field);
assert(uid);
if (pid == 0)
@ -1076,21 +1076,11 @@ static int get_process_id(pid_t pid, const char *field, uid_t *uid) {
return -ENOMEM;
f = fopen(p, "re");
free(p);
if (!f)
return -errno;
while (!feof(f)) {
char line[LINE_MAX], *l;
if (!fgets(line, sizeof(line), f)) {
if (feof(f))
break;
r = -errno;
goto finish;
}
FOREACH_LINE(f, line, return -errno) {
char *l;
l = strstrip(line);
@ -1100,17 +1090,11 @@ static int get_process_id(pid_t pid, const char *field, uid_t *uid) {
l[strcspn(l, WHITESPACE)] = 0;
r = parse_uid(l, uid);
goto finish;
return parse_uid(l, uid);
}
}
r = -EIO;
finish:
fclose(f);
return r;
return -EIO;
}
int get_process_uid(pid_t pid, uid_t *uid) {

9
src/shared/util.h
View File

@ -567,3 +567,12 @@ char *strreplace(const char *text, const char *old_string, const char *new_strin
char *strip_tab_ansi(char **p, size_t *l);
int on_ac_power(void);
#define FOREACH_LINE(f, line, on_error) \
for (char line[LINE_MAX]; !feof(f); ) \
if (!fgets(line, sizeof(line), f)) { \
if (ferror(f)) { \
on_error; \
} \
break; \
} else