emo/ndhc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use safe_write() in nk/exec.c

Browse Source
This commit is contained in:
Nicholas J. Kain 2022-02-25 00:05:57 -05:00
parent 286b86d62c
commit 62aef529f4
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nk/exec.c
View File

@ -10,6 +10,7 @@
#include <limits.h> #include <limits.h>
#include <pwd.h> #include <pwd.h>
#include "nk/exec.h" #include "nk/exec.h"
#include "nk/io.h"
#define DEFAULT_ROOT_PATH "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" #define DEFAULT_ROOT_PATH "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
#define DEFAULT_PATH "/bin:/usr/bin:/usr/local/bin" #define DEFAULT_PATH "/bin:/usr/bin:/usr/local/bin"
@ -110,7 +111,7 @@ out:
ssize_t snlen = snprintf(argbuf, argbuflen, GEN_STR "0", __VA_ARGS__); \ ssize_t snlen = snprintf(argbuf, argbuflen, GEN_STR "0", __VA_ARGS__); \
if (snlen < 0 || (size_t)snlen >= argbuflen) { \ if (snlen < 0 || (size_t)snlen >= argbuflen) { \
static const char errstr[] = "nk_execute: constructing argument list failed\n"; \ static const char errstr[] = "nk_execute: constructing argument list failed\n"; \
write(STDERR_FILENO, errstr, sizeof errstr); \ safe_write(STDERR_FILENO, errstr, sizeof errstr); \
_Exit(EXIT_FAILURE); \ _Exit(EXIT_FAILURE); \
} \ } \
if (snlen > 0) argbuf[snlen-1] = 0; \ if (snlen > 0) argbuf[snlen-1] = 0; \
@ -118,10 +119,6 @@ out:
argbuf += snlen; argbuflen -= (size_t)snlen; \ argbuf += snlen; argbuflen -= (size_t)snlen; \
} while (0) } while (0)
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-result"
#endif
void __attribute__((noreturn)) void __attribute__((noreturn))
nk_execute(const char *command, const char *args, char * const envp[]) nk_execute(const char *command, const char *args, char * const envp[])
{ {
@ -167,7 +164,7 @@ endarg:
// Push an argument. // Push an argument.
if (q > p) { if (q > p) {
static const char errstr[] = "nk_execute: argument length too long\n"; static const char errstr[] = "nk_execute: argument length too long\n";
write(STDERR_FILENO, errstr, sizeof errstr); safe_write(STDERR_FILENO, errstr, sizeof errstr);
_Exit(EXIT_FAILURE); _Exit(EXIT_FAILURE);
} }
const size_t len = (size_t)(p - q); const size_t len = (size_t)(p - q);
@ -181,11 +178,8 @@ endarg:
execve(command, argv, envp); execve(command, argv, envp);
{ {
static const char errstr[] = "nk_execute: execve failed\n"; static const char errstr[] = "nk_execute: execve failed\n";
write(STDERR_FILENO, errstr, sizeof errstr); safe_write(STDERR_FILENO, errstr, sizeof errstr);
_Exit(EXIT_FAILURE); _Exit(EXIT_FAILURE);
} }
} }
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif