mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-10-29 05:40:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup + add timeouts for pid_workspace list

Browse source
This commit is contained in:
Zandr Martin 2016-06-11 12:43:34 -05:00
parent 66caee645c
commit 2298143d09
No known key found for this signature in database
GPG key ID: AA2BB8EF77F7BBDC
5 changed files with 65 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

32
common/util.c
View file

@ -74,30 +74,22 @@ pid_t get_parent_pid(pid_t child) {
char file_name[100];
char *buffer = NULL;
char *token = NULL;
const char sep[2] = " ";
const char *sep = " ";
FILE *stat = NULL;
sway_log(L_DEBUG, "trying to get parent pid for child pid %d", child);
sprintf(file_name, "/proc/%d/stat", child);
if (!(stat = fopen(file_name, "r")) || !(buffer = read_line(stat))) {
return -1;
if ((stat = fopen(file_name, "r")) && (buffer = read_line(stat))) {
fclose(stat);
token = strtok(buffer, sep); // pid
token = strtok(NULL, sep); // executable name
token = strtok(NULL, sep); // state
token = strtok(NULL, sep); // parent pid
parent = strtol(token, NULL, 10);
return (parent == child) ? -1 : parent;
}
fclose(stat);
sway_log(L_DEBUG, "buffer string is %s", buffer);
token = strtok(buffer, sep);
for (int i = 0; i < 3; i++) {
token = strtok(NULL, sep);
}
parent = strtol(token, NULL, 10);
sway_log(L_DEBUG, "found parent pid %d for child pid %d", parent, child);
return (parent == child) ? -1 : parent;
return -1;
}