colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

main: use _nm_utils_ascii_str_to_int64 instead of strtol for reading pid

Browse Source 
Also removes the errno check, since it's already done within _nm_utils_ascii_str_to_int64()

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1727
This commit is contained in:
Jan Vaclav
2023-09-26 11:18:01 +02:00
committed by Beniamino Galvani
parent 28f7a6638f
commit 50f34217f9
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/main-utils.c
View File

@@ -158,7 +158,8 @@ nm_main_utils_ensure_not_running_pidfile(const char *pidfile)
gs_free char *contents = NULL; gs_free char *contents = NULL;
gs_free char *proc_cmdline = NULL; gs_free char *proc_cmdline = NULL;
gsize len = 0; gsize len = 0;
long pid; pid_t pid;
gint64 pid64;
const char *process_name; const char *process_name;
const char *prgname = g_get_prgname(); const char *prgname = g_get_prgname();
@@ -173,12 +174,13 @@ nm_main_utils_ensure_not_running_pidfile(const char *pidfile)
return; return;
errno = 0; errno = 0;
pid = strtol(contents, NULL, 10); pid64 = _nm_utils_ascii_str_to_int64(contents, 10, 0, G_MAXINT64, -1);
if (pid <= 0 || errno) pid = (pid_t) pid64;
if (pid <= 0 || (gint64) pid != pid64)
return; return;
nm_clear_g_free(&contents); nm_clear_g_free(&contents);
proc_cmdline = g_strdup_printf("/proc/%ld/cmdline", pid); proc_cmdline = g_strdup_printf("/proc/%" G_GINT64_FORMAT "/cmdline", (gint64) pid);
if (!g_file_get_contents(proc_cmdline, &contents, &len, NULL)) if (!g_file_get_contents(proc_cmdline, &contents, &len, NULL))
return; return;
@@ -190,7 +192,10 @@ nm_main_utils_ensure_not_running_pidfile(const char *pidfile)
if (strcmp(process_name, prgname) == 0) { if (strcmp(process_name, prgname) == 0) {
/* Check that the process exists */ /* Check that the process exists */
if (kill(pid, 0) == 0) { if (kill(pid, 0) == 0) {
fprintf(stderr, _("%s is already running (pid %ld)\n"), prgname, pid); fprintf(stderr,
_("%s is already running (pid %" G_GINT64_FORMAT ")\n"),
prgname,
(gint64) pid);
exit(1); exit(1);
} }
} }