blackbeard420/kore
1
0
Fork 0
mirror of https://github.com/jorisvink/kore synced 2025-03-09 04:29:02 -04:00
Code Issues Projects Releases Wiki Activity

kodev: split generating compiler commandline to separate function

Browse Source 
args array is supposed to hold 34 + CFLAGS_MAX pointers and like the original
function lacks any checks
This commit is contained in:
Alibek Omarov 2023-03-22 15:14:33 +03:00 committed by Joris Vink
parent f9e64ea5f0
commit b3802d186d
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/cli.c
View File

@ -139,6 +139,8 @@ static char *cli_read_line(FILE *, char *, size_t);
static long long cli_strtonum(const char *, long long, long long); static long long cli_strtonum(const char *, long long, long long);
static int cli_split_string(char *, const char *, char **, size_t); static int cli_split_string(char *, const char *, char **, size_t);
static int cli_generate_compiler_args(char **, char **, struct cfile *);
static void usage(void) __attribute__((noreturn)); static void usage(void) __attribute__((noreturn));
static void fatal(const char *, ...) __attribute__((noreturn)) static void fatal(const char *, ...) __attribute__((noreturn))
__attribute__((format (printf, 1, 2))); __attribute__((format (printf, 1, 2)));
@ -1554,17 +1556,13 @@ cli_generate_certs(void)
} }
#endif #endif
static void static int
cli_compile_source_file(void *arg) cli_generate_compiler_args(char **compiler_out, char **args, struct cfile *cf)
{ {
struct cfile *cf;
int idx, i; int idx, i;
char **flags; char **flags;
char *compiler; char *compiler;
int flags_count; int flags_count;
char *args[34 + CFLAGS_MAX];
cf = arg;
switch (cf->build) { switch (cf->build) {
case BUILD_C: case BUILD_C:
@ -1584,7 +1582,8 @@ cli_compile_source_file(void *arg)
} }
idx = 0; idx = 0;
args[idx++] = compiler;
*compiler_out = args[idx++] = compiler;
for (i = 0; i < flags_count; i++) for (i = 0; i < flags_count; i++)
args[idx++] = flags[i]; args[idx++] = flags[i];
@ -1597,6 +1596,19 @@ cli_compile_source_file(void *arg)
args[idx++] = cf->opath; args[idx++] = cf->opath;
args[idx] = NULL; args[idx] = NULL;
return idx;
}
static void
cli_compile_source_file(void *arg)
{
struct cfile *cf;
char *compiler;
char *args[34 + CFLAGS_MAX];
cf = arg;
cli_generate_compiler_args(&compiler, args, cf);
execvp(compiler, args); execvp(compiler, args);
fatal("failed to start '%s': %s", compiler, errno_s); fatal("failed to start '%s': %s", compiler, errno_s);
} }