diff options
author | 2016-06-11 17:47:26 -0400 | |
---|---|---|
committer | 2016-06-11 17:47:26 -0400 | |
commit | f1268053a62a83c0169b61451d01649a3f3185e3 (patch) | |
tree | 3c429a61e9e56bd1adb7ac95f375ac78ae09e888 /common/util.c | |
parent | Merge pull request #701 from zandrmartin/assign-command (diff) | |
parent | couple small fixes (diff) | |
download | sway-f1268053a62a83c0169b61451d01649a3f3185e3.tar.gz sway-f1268053a62a83c0169b61451d01649a3f3185e3.tar.zst sway-f1268053a62a83c0169b61451d01649a3f3185e3.zip |
Merge pull request #708 from zandrmartin/assign-command
couple small fixes
Diffstat (limited to 'common/util.c')
-rw-r--r-- | common/util.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/common/util.c b/common/util.c index 12cb7470..31a75a9b 100644 --- a/common/util.c +++ b/common/util.c | |||
@@ -70,7 +70,7 @@ int get_modifier_names(const char **names, uint32_t modifier_masks) { | |||
70 | } | 70 | } |
71 | 71 | ||
72 | pid_t get_parent_pid(pid_t child) { | 72 | pid_t get_parent_pid(pid_t child) { |
73 | pid_t parent; | 73 | pid_t parent = -1; |
74 | char file_name[100]; | 74 | char file_name[100]; |
75 | char *buffer = NULL; | 75 | char *buffer = NULL; |
76 | char *token = NULL; | 76 | char *token = NULL; |
@@ -79,15 +79,19 @@ pid_t get_parent_pid(pid_t child) { | |||
79 | 79 | ||
80 | sprintf(file_name, "/proc/%d/stat", child); | 80 | sprintf(file_name, "/proc/%d/stat", child); |
81 | 81 | ||
82 | if ((stat = fopen(file_name, "r")) && (buffer = read_line(stat))) { | 82 | if ((stat = fopen(file_name, "r"))) { |
83 | fclose(stat); | 83 | if ((buffer = read_line(stat))) { |
84 | token = strtok(buffer, sep); // pid | ||
85 | token = strtok(NULL, sep); // executable name | ||
86 | token = strtok(NULL, sep); // state | ||
87 | token = strtok(NULL, sep); // parent pid | ||
88 | parent = strtol(token, NULL, 10); | ||
89 | } | ||
84 | 90 | ||
85 | token = strtok(buffer, sep); // pid | 91 | fclose(stat); |
86 | token = strtok(NULL, sep); // executable name | 92 | } |
87 | token = strtok(NULL, sep); // state | ||
88 | token = strtok(NULL, sep); // parent pid | ||
89 | 93 | ||
90 | parent = strtol(token, NULL, 10); | 94 | if (parent) { |
91 | return (parent == child) ? -1 : parent; | 95 | return (parent == child) ? -1 : parent; |
92 | } | 96 | } |
93 | 97 | ||