diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2023-12-20 15:39:14 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2023-12-20 15:39:14 +0000 |
| commit | 0b151f11291a9f97c30d5f1cb6f7dcbddb19282f (patch) | |
| tree | f48c736701cfe2ee6c6d88e20a37a5ae78bbeea6 | |
| parent | 06002d274f542a10a261837c2a843099af770be3 (diff) | |
| download | mdevd-0b151f11291a9f97c30d5f1cb6f7dcbddb19282f.tar.gz mdevd-0b151f11291a9f97c30d5f1cb6f7dcbddb19282f.tar.xz mdevd-0b151f11291a9f97c30d5f1cb6f7dcbddb19282f.zip | |
env_merge() should never fail, by policy
Signed-off-by: Laurent Bercot <ska@appnovation.com>
| -rw-r--r-- | src/mdevd/mdevd.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/mdevd/mdevd.c b/src/mdevd/mdevd.c index b7e9665..dcd3198 100644 --- a/src/mdevd/mdevd.c +++ b/src/mdevd/mdevd.c @@ -562,11 +562,7 @@ static inline void spawn_command (char const *command, struct uevent_s const *ev char const *argv[4] = { isel ? "execlineb" : "/bin/sh", isel ? "-Pc" : "-c", command, 0 } ; size_t envlen = env_len((char const **)environ) ; char const *envp[envlen + event->varn + 1] ; - if (!env_merge(envp, envlen + event->varn + 1, (char const **)environ, envlen, event->buf + event->vars[1], event->len - event->vars[1])) - { - if (verbosity) strerr_warnwu1sys("merge environment to spawn command") ; - return ; - } + env_merge(envp, envlen + event->varn + 1, (char const **)environ, envlen, event->buf + event->vars[1], event->len - event->vars[1]) ; ud->pid = cspawn(argv[0], argv, envp, CSPAWN_FLAGS_SELFPIPE_FINISH, 0, 0) ; if (!ud->pid) { |