chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow block and char classes in DeviceAllow bus properties (#4353)
[elogind.git]
/
src
/
basic
/
process-util.c
diff --git
a/src/basic/process-util.c
b/src/basic/process-util.c
index dd77df2ab10c196327819d5a02efe9c7986c8351..cd9c0f7e5d5155abf9ea63fed1d6b7b292112ec4 100644
(file)
--- a/
src/basic/process-util.c
+++ b/
src/basic/process-util.c
@@
-160,6
+160,8
@@
int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
if (len > 0)
r[len] = 0;
if (len > 0)
r[len] = 0;
+ else
+ r = mfree(r);
} else {
bool dotdotdot = false;
} else {
bool dotdotdot = false;
@@
-193,7
+195,7
@@
int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
*(k++) = (char) c;
left--;
*(k++) = (char) c;
left--;
- }
else if (k > r)
+ } else if (k > r)
space = true;
}
space = true;
}
@@
-213,7
+215,7
@@
int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
}
strncpy(k, "...", left-1);
}
strncpy(k, "...", left-1);
- k[left] = 0;
+ k[left
-1
] = 0;
} else
*k = 0;
}
} else
*k = 0;
}
@@
-556,7
+558,7
@@
int wait_for_terminate(pid_t pid, siginfo_t *status) {
if (errno == EINTR)
continue;
if (errno == EINTR)
continue;
- return
-errno
;
+ return
negative_errno()
;
}
return 0;
}
return 0;
@@
-629,8
+631,10
@@
int kill_and_sigcont(pid_t pid, int sig) {
r = kill(pid, sig) < 0 ? -errno : 0;
r = kill(pid, sig) < 0 ? -errno : 0;
- if (r >= 0)
- kill(pid, SIGCONT);
+ /* If this worked, also send SIGCONT, unless we already just sent a SIGCONT, or SIGKILL was sent which isn't
+ * affected by a process being suspended anyway. */
+ if (r >= 0 && !IN_SET(SIGCONT, SIGKILL))
+ (void) kill(pid, SIGCONT);
return r;
}
return r;
}
@@
-810,7
+814,7
@@
void valgrind_summary_hack(void) {
#ifdef HAVE_VALGRIND_VALGRIND_H
if (getpid() == 1 && RUNNING_ON_VALGRIND) {
pid_t pid;
#ifdef HAVE_VALGRIND_VALGRIND_H
if (getpid() == 1 && RUNNING_ON_VALGRIND) {
pid_t pid;
- pid = raw_clone(SIGCHLD
, NULL
);
+ pid = raw_clone(SIGCHLD);
if (pid < 0)
log_emergency_errno(errno, "Failed to fork off valgrind helper: %m");
else if (pid == 0)
if (pid < 0)
log_emergency_errno(errno, "Failed to fork off valgrind helper: %m");
else if (pid == 0)