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

Minor style nits from previous patches.

Browse Source
This commit is contained in:
Joris Vink 2023-04-02 10:31:10 +02:00
parent 54f6234e4f
commit 5dd2e922b3
1 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/cli.c
View File

@ -72,6 +72,8 @@
#define BUILD_C 1 #define BUILD_C 1
#define BUILD_CXX 2 #define BUILD_CXX 2
#define CLANGDB_FILE_PATH "compile_commands.json"
struct cli_buf { struct cli_buf {
u_int8_t *data; u_int8_t *data;
size_t length; size_t length;
@ -138,8 +140,8 @@ static char *cli_text_trim(char *, size_t);
static char *cli_read_line(FILE *, char *, size_t); 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(struct cfile *, char **,
static int cli_generate_compiler_args(char **, char **, struct cfile *); char **, size_t);
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))
@ -207,7 +209,6 @@ static void cli_help(int, char **);
static void cli_info(int, char **); static void cli_info(int, char **);
static void cli_build(int, char **); static void cli_build(int, char **);
static void cli_build_help(void); static void cli_build_help(void);
static void cli_build_clangdb(const char *);
static void cli_clean(int, char **); static void cli_clean(int, char **);
static void cli_source(int, char **); static void cli_source(int, char **);
static void cli_reload(int, char **); static void cli_reload(int, char **);
@ -216,6 +217,7 @@ static void cli_cflags(int, char **);
static void cli_ldflags(int, char **); static void cli_ldflags(int, char **);
static void cli_genasset(int, char **); static void cli_genasset(int, char **);
static void cli_genasset_help(void); static void cli_genasset_help(void);
static void cli_build_clangdb(const char *);
#if !defined(KODEV_MINIMAL) #if !defined(KODEV_MINIMAL)
static void cli_create(int, char **); static void cli_create(int, char **);
@ -585,35 +587,32 @@ cli_flavor(int argc, char **argv)
static void static void
cli_build_clangdb(const char *pwd) cli_build_clangdb(const char *pwd)
{ {
const char *filename = "compile_commands.json"; struct cfile *cf;
struct cfile *cf; int fd, i, nargs, genpath_len;
int fd, i, args_count, genpath_len; char *args[64 + CFLAGS_MAX], *genpath, *ext;
char *args[34 + CFLAGS_MAX], *genpath;
char *compiler_unused;
printf("generating %s...\n", filename); printf("generating %s...\n", CLANGDB_FILE_PATH);
(void)unlink(filename);
genpath_len = cli_vasprintf(&genpath, "%s/", object_dir); genpath_len = cli_vasprintf(&genpath, "%s/", object_dir);
cli_file_open(filename, O_CREAT | O_TRUNC | O_WRONLY, &fd); cli_file_open(CLANGDB_FILE_PATH, O_CREAT | O_TRUNC | O_WRONLY, &fd);
cli_file_writef(fd, "[\n"); cli_file_writef(fd, "[\n");
TAILQ_FOREACH(cf, &source_files, list) { TAILQ_FOREACH(cf, &source_files, list) {
int tempbuild = cf->build; int tempbuild = cf->build;
// exclude generated source files /* Exclude generated source files. */
if (!strncmp(cf->fpath, genpath, genpath_len)) if (!strncmp(cf->fpath, genpath, genpath_len))
continue; continue;
if (cf->build == BUILD_NOBUILD) { if (cf->build == BUILD_NOBUILD) {
char *ext = strrchr(cf->fpath, '.'); if ((ext = strrchr(cf->fpath, '.')) == NULL)
if (ext == NULL)
continue; continue;
// temporarily rewrite build to our file type to include unchanged files /*
* Temporarily rewrite build to our file type to
* include unchanged files.
*/
if (!strcmp(ext, ".cpp")) if (!strcmp(ext, ".cpp"))
cf->build = BUILD_CXX; cf->build = BUILD_CXX;
else if (!strcmp(ext, ".c")) else if (!strcmp(ext, ".c"))
@ -623,19 +622,21 @@ cli_build_clangdb(const char *pwd)
} }
cli_file_writef(fd, "\t{\n"); cli_file_writef(fd, "\t{\n");
cli_file_writef(fd, "\t\t\"arguments\": [\n"); cli_file_writef(fd, "\t\t\"arguments\": [\n");
args_count = cli_generate_compiler_args(&compiler_unused, args, cf);
for (i = 0; i < args_count; i++)
{
cli_file_writef(fd, "\t\t\t\"%s\"%s\n",
args[i], i == args_count - 1 ? "" : ",");
}
cli_file_writef(fd, "\t\t],\n");
nargs = cli_generate_compiler_args(cf, NULL, args,
64 + CFLAGS_MAX);
for (i = 0; i < nargs; i++) {
cli_file_writef(fd, "\t\t\t\"%s\"%s\n",
args[i], i == nargs - 1 ? "" : ",");
}
cli_file_writef(fd, "\t\t],\n");
cli_file_writef(fd, "\t\t\"directory\": \"%s\",\n", pwd); cli_file_writef(fd, "\t\t\"directory\": \"%s\",\n", pwd);
cli_file_writef(fd, "\t\t\"file\": \"%s\"\n", cf->fpath); cli_file_writef(fd, "\t\t\"file\": \"%s\"\n", cf->fpath);
cli_file_writef(fd, "\t}%s\n", cf == TAILQ_LAST(&source_files, cfile_list) ? "" : ","); cli_file_writef(fd, "\t}%s\n",
cf == TAILQ_LAST(&source_files, cfile_list) ? "" : ",");
cf->build = tempbuild; cf->build = tempbuild;
} }
@ -645,7 +646,7 @@ cli_build_clangdb(const char *pwd)
free(genpath); free(genpath);
printf("%s generated successfully...\n", filename); printf("%s generated successfully...\n", CLANGDB_FILE_PATH);
} }
static void static void
@ -1658,33 +1659,36 @@ cli_generate_certs(void)
#endif #endif
static int static int
cli_generate_compiler_args(char **compiler_out, char **args, struct cfile *cf) cli_generate_compiler_args(struct cfile *cf, char **cout,
char **args, size_t elm)
{ {
int idx, i; char *compiler, **flags;
char **flags; int idx, i, flags_count;
char *compiler;
int flags_count;
switch (cf->build) { switch (cf->build) {
case BUILD_C: case BUILD_C:
compiler = compiler_c;
flags = cflags; flags = cflags;
compiler = compiler_c;
flags_count = cflags_count; flags_count = cflags_count;
break; break;
case BUILD_CXX: case BUILD_CXX:
compiler = compiler_cpp;
flags = cxxflags; flags = cxxflags;
compiler = compiler_cpp;
flags_count = cxxflags_count; flags_count = cxxflags_count;
break; break;
default: default:
fatal("cli_compile_file: unexpected file type: %d", fatal("%s: unexpected file type: %d", __func__, cf->build);
cf->build); /* NOTREACHED */
break;
} }
idx = 0; if ((size_t)flags_count + 2 >= elm)
fatal("%s: flags %d >= %zu", __func__, flags_count, elm);
*compiler_out = args[idx++] = compiler; if (cout != NULL)
*cout = compiler;
idx = 0;
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];
@ -1697,18 +1701,16 @@ cli_generate_compiler_args(char **compiler_out, char **args, struct cfile *cf)
args[idx++] = cf->opath; args[idx++] = cf->opath;
args[idx] = NULL; args[idx] = NULL;
return idx; return (idx);
} }
static void static void
cli_compile_source_file(void *arg) cli_compile_source_file(void *arg)
{ {
struct cfile *cf; char *compiler;
char *compiler; char *args[64 + CFLAGS_MAX];
char *args[34 + CFLAGS_MAX];
cf = arg; cli_generate_compiler_args(arg, &compiler, args, 64 + CFLAGS_MAX);
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);