mirror of
https://github.com/troglobit/finit.git
synced 2026-11-06 15:51:03 +00:00
Refactor, check return value from fgets()
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
1 parent
5342881bf4
commit
d40b426c1b
1 file changed
+10
-8
+10
-8
@@ -96,35 +96,37 @@ char *pid_cmdline(int pid, char *buf, size_t len)
|
|||||||
|
|
||||||
char *pid_comm(int pid, char *buf, size_t len)
|
char *pid_comm(int pid, char *buf, size_t len)
|
||||||
{
|
{
|
||||||
|
char *ptr = NULL;
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
|
|
||||||
fp = fopenf("r", "/proc/%d/comm", pid);
|
fp = fopenf("r", "/proc/%d/comm", pid);
|
||||||
if (!fp)
|
if (!fp)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
fgets(buf, len, fp);
|
if (fgets(buf, len, fp))
|
||||||
|
ptr = chomp(buf);
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
|
||||||
return chomp(buf);
|
return ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *pid_cgroup(int pid, char *buf, size_t len)
|
char *pid_cgroup(int pid, char *buf, size_t len)
|
||||||
{
|
{
|
||||||
char *ptr;
|
char *ptr = NULL;
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
|
|
||||||
fp = fopenf("r", "/proc/%d/cgroup", pid);
|
fp = fopenf("r", "/proc/%d/cgroup", pid);
|
||||||
if (!fp)
|
if (!fp)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
fgets(buf, len, fp);
|
if (fgets(buf, len, fp))
|
||||||
|
ptr = chomp(buf);
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
|
||||||
ptr = strchr(buf, '/');
|
if (ptr)
|
||||||
if (!ptr)
|
ptr = strchr(buf, '/');
|
||||||
return NULL;
|
|
||||||
|
|
||||||
return chomp(ptr);
|
return ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint64_t cgroup_uint64(char *path, char *file)
|
static uint64_t cgroup_uint64(char *path, char *file)
|
||||||
|
|||||||
Reference in new issue
Block a user