style: auto-format C/C++ sources with clang-format

This commit is contained in:
Leonmmcoset
2026-04-18 12:28:27 +00:00
committed by github-actions[bot]
parent 14b86d50bd
commit 42159d1af8
92 changed files with 1078 additions and 1536 deletions

View File

@@ -3,12 +3,13 @@ static int ush_cmd_ansi(void) {
ush_writeln("\x1B[1;36mansi color demo\x1B[0m");
ush_writeln(" \x1B[30mblack\x1B[0m \x1B[31mred\x1B[0m \x1B[32mgreen\x1B[0m \x1B[33myellow\x1B[0m");
ush_writeln(" \x1B[34mblue\x1B[0m \x1B[35mmagenta\x1B[0m \x1B[36mcyan\x1B[0m \x1B[37mwhite\x1B[0m");
ush_writeln(" \x1B[90mbright-black\x1B[0m \x1B[91mbright-red\x1B[0m \x1B[92mbright-green\x1B[0m \x1B[93mbright-yellow\x1B[0m");
ush_writeln(" \x1B[94mbright-blue\x1B[0m \x1B[95mbright-magenta\x1B[0m \x1B[96mbright-cyan\x1B[0m \x1B[97mbright-white\x1B[0m");
ush_writeln(" \x1B[90mbright-black\x1B[0m \x1B[91mbright-red\x1B[0m \x1B[92mbright-green\x1B[0m "
"\x1B[93mbright-yellow\x1B[0m");
ush_writeln(" \x1B[94mbright-blue\x1B[0m \x1B[95mbright-magenta\x1B[0m \x1B[96mbright-cyan\x1B[0m "
"\x1B[97mbright-white\x1B[0m");
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -50,4 +51,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -3,8 +3,10 @@ static int ush_cmd_ansi(void) {
ush_writeln("\x1B[1;36mansi color demo\x1B[0m");
ush_writeln(" \x1B[30mblack\x1B[0m \x1B[31mred\x1B[0m \x1B[32mgreen\x1B[0m \x1B[33myellow\x1B[0m");
ush_writeln(" \x1B[34mblue\x1B[0m \x1B[35mmagenta\x1B[0m \x1B[36mcyan\x1B[0m \x1B[37mwhite\x1B[0m");
ush_writeln(" \x1B[90mbright-black\x1B[0m \x1B[91mbright-red\x1B[0m \x1B[92mbright-green\x1B[0m \x1B[93mbright-yellow\x1B[0m");
ush_writeln(" \x1B[94mbright-blue\x1B[0m \x1B[95mbright-magenta\x1B[0m \x1B[96mbright-cyan\x1B[0m \x1B[97mbright-white\x1B[0m");
ush_writeln(" \x1B[90mbright-black\x1B[0m \x1B[91mbright-red\x1B[0m \x1B[92mbright-green\x1B[0m "
"\x1B[93mbright-yellow\x1B[0m");
ush_writeln(" \x1B[94mbright-blue\x1B[0m \x1B[95mbright-magenta\x1B[0m \x1B[96mbright-cyan\x1B[0m "
"\x1B[97mbright-white\x1B[0m");
return 1;
}
@@ -107,7 +109,8 @@ static int ush_cmd_ansitest(void) {
ush_write_char('\n');
ush_writeln("truecolor demo:");
ush_writeln(" \x1B[38;2;255;64;64mRGB(255,64,64)\x1B[0m \x1B[38;2;64;255;64mRGB(64,255,64)\x1B[0m \x1B[38;2;64;128;255mRGB(64,128,255)\x1B[0m");
ush_writeln(" \x1B[38;2;255;64;64mRGB(255,64,64)\x1B[0m \x1B[38;2;64;255;64mRGB(64,255,64)\x1B[0m "
"\x1B[38;2;64;128;255mRGB(64,128,255)\x1B[0m");
ush_writeln("cursor control demo:");
ush_write(" 0123456789");
@@ -131,7 +134,6 @@ static int ush_cmd_ansitest(void) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -173,4 +175,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -44,7 +44,6 @@ static int ush_cmd_append(const ush_state *sh, const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -88,4 +87,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -61,7 +61,6 @@ static int ush_cmd_cat(const ush_state *sh, const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -105,4 +104,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -21,7 +21,6 @@ static int ush_cmd_cd(ush_state *sh, const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -65,4 +64,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -4,7 +4,6 @@ static int ush_cmd_clear(void) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -46,4 +45,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -526,17 +526,12 @@ int ush_split_first_and_rest(const char *arg, char *out_first, u64 out_first_siz
return 1;
}
int ush_split_two_args(const char *arg,
char *out_first,
u64 out_first_size,
char *out_second,
u64 out_second_size) {
int ush_split_two_args(const char *arg, char *out_first, u64 out_first_size, char *out_second, u64 out_second_size) {
u64 i = 0ULL;
u64 p = 0ULL;
if (arg == (const char *)0 ||
out_first == (char *)0 || out_first_size == 0ULL ||
out_second == (char *)0 || out_second_size == 0ULL) {
if (arg == (const char *)0 || out_first == (char *)0 || out_first_size == 0ULL || out_second == (char *)0 ||
out_second_size == 0ULL) {
return 0;
}

View File

@@ -9,21 +9,21 @@
typedef long long i64;
#define USH_CMD_MAX 32ULL
#define USH_ARG_MAX 160ULL
#define USH_LINE_MAX 192ULL
#define USH_PATH_MAX 192ULL
#define USH_CAT_MAX 512ULL
#define USH_SCRIPT_MAX 1024ULL
#define USH_CLEAR_LINES 56ULL
#define USH_HISTORY_MAX 16ULL
#define USH_DMESG_DEFAULT 64ULL
#define USH_DMESG_LINE_MAX 256ULL
#define USH_COPY_MAX 65536U
#define USH_CMD_MAX 32ULL
#define USH_ARG_MAX 160ULL
#define USH_LINE_MAX 192ULL
#define USH_PATH_MAX 192ULL
#define USH_CAT_MAX 512ULL
#define USH_SCRIPT_MAX 1024ULL
#define USH_CLEAR_LINES 56ULL
#define USH_HISTORY_MAX 16ULL
#define USH_DMESG_DEFAULT 64ULL
#define USH_DMESG_LINE_MAX 256ULL
#define USH_COPY_MAX 65536U
#define USH_CMD_CTX_PATH "/temp/.ush_cmd_ctx.bin"
#define USH_CMD_RET_PATH "/temp/.ush_cmd_ret.bin"
#define USH_CMD_RET_FLAG_CWD 0x1ULL
#define USH_CMD_RET_FLAG_CWD 0x1ULL
#define USH_CMD_RET_FLAG_EXIT 0x2ULL
typedef struct ush_state {
@@ -90,11 +90,7 @@ int ush_path_is_under_system(const char *path);
int ush_path_is_under_temp(const char *path);
int ush_split_first_and_rest(const char *arg, char *out_first, u64 out_first_size, const char **out_rest);
int ush_split_two_args(const char *arg,
char *out_first,
u64 out_first_size,
char *out_second,
u64 out_second_size);
int ush_split_two_args(const char *arg, char *out_first, u64 out_first_size, char *out_second, u64 out_second_size);
int ush_command_ctx_read(ush_cmd_ctx *out_ctx);
int ush_command_ret_write(const ush_cmd_ret *ret);

View File

@@ -39,9 +39,7 @@ static int ush_copy_file(const char *src_path, const char *dst_path) {
{
u64 written_total = 0ULL;
while (written_total < got) {
u64 written = cleonos_sys_fd_write(dst_fd,
copy_buf + written_total,
got - written_total);
u64 written = cleonos_sys_fd_write(dst_fd, copy_buf + written_total, got - written_total);
if (written == (u64)-1 || written == 0ULL) {
(void)cleonos_sys_fd_close(dst_fd);
(void)cleonos_sys_fd_close(src_fd);
@@ -88,7 +86,6 @@ static int ush_cmd_cp(const ush_state *sh, const char *arg) {
return ush_copy_file(src_path, dst_path);
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -132,4 +129,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -18,11 +18,7 @@ static int ush_cut_parse_delim(const char *token, char *out_delim) {
return 1;
}
static int ush_cut_parse_args(const char *arg,
char *out_delim,
u64 *out_field,
char *out_file,
u64 out_file_size) {
static int ush_cut_parse_args(const char *arg, char *out_delim, u64 *out_field, char *out_file, u64 out_file_size) {
char token[USH_PATH_MAX];
char value[USH_PATH_MAX];
const char *cursor = arg;
@@ -223,7 +219,6 @@ static int ush_cmd_cut(const ush_state *sh, const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;

View File

@@ -34,7 +34,6 @@ static int ush_cmd_dmesg(const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -78,4 +77,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -61,7 +61,6 @@ static int ush_cmd_exec(const ush_state *sh, const char *arg) {
return 0;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -105,4 +104,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -20,7 +20,6 @@ static int ush_cmd_exit(ush_state *sh, const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -64,4 +63,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -166,7 +166,6 @@ static int ush_cmd_fastfetch(const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -210,4 +209,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -52,8 +52,7 @@ static int ush_fg_pick_latest_job(u64 *out_pid) {
continue;
}
if (snap.state != CLEONOS_PROC_STATE_PENDING &&
snap.state != CLEONOS_PROC_STATE_RUNNING &&
if (snap.state != CLEONOS_PROC_STATE_PENDING && snap.state != CLEONOS_PROC_STATE_RUNNING &&
snap.state != CLEONOS_PROC_STATE_STOPPED) {
continue;
}

View File

@@ -11,7 +11,6 @@ static int ush_cmd_fsstat(void) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -53,4 +52,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -203,7 +203,6 @@ static int ush_cmd_grep(const ush_state *sh, const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -247,4 +246,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -165,7 +165,6 @@ static int ush_cmd_head(const ush_state *sh, const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;

View File

@@ -45,7 +45,6 @@ static int ush_cmd_help(void) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;

View File

@@ -9,7 +9,6 @@ static int ush_cmd_kbdstat(void) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -51,4 +50,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -167,8 +167,7 @@ static int ush_cmd_kdbg(const char *arg) {
if (ush_streq(subcmd, "bt") != 0) {
if (ush_kdbg_next_token(&cursor, tok0, (u64)sizeof(tok0)) == 0 ||
ush_kdbg_next_token(&cursor, tok1, (u64)sizeof(tok1)) == 0 ||
ush_kdbg_has_more_tokens(cursor) != 0) {
ush_kdbg_next_token(&cursor, tok1, (u64)sizeof(tok1)) == 0 || ush_kdbg_has_more_tokens(cursor) != 0) {
ush_kdbg_usage();
return 0;
}

View File

@@ -23,12 +23,12 @@ static void test_fail(const char *group, int line, const char *expr) {
(void)printf("[libctest][FAIL] %s:%d %s\n", group, line, expr);
}
#define TEST_ASSERT(group, expr) \
do { \
g_total++; \
if (!(expr)) { \
test_fail((group), __LINE__, #expr); \
} \
#define TEST_ASSERT(group, expr) \
do { \
g_total++; \
if (!(expr)) { \
test_fail((group), __LINE__, #expr); \
} \
} while (0)
static void test_string_lib(void) {

View File

@@ -125,19 +125,13 @@ static void ush_ls_print_one(const char *name, u64 type, u64 size, int long_mode
clio_write_char('\n');
}
static int ush_ls_parse_args(const char *arg,
int *out_long_mode,
int *out_recursive,
char *out_target,
static int ush_ls_parse_args(const char *arg, int *out_long_mode, int *out_recursive, char *out_target,
u64 out_target_size) {
char token[USH_PATH_MAX];
u64 i = 0ULL;
int path_set = 0;
if (out_long_mode == (int *)0 ||
out_recursive == (int *)0 ||
out_target == (char *)0 ||
out_target_size == 0ULL) {
if (out_long_mode == (int *)0 || out_recursive == (int *)0 || out_target == (char *)0 || out_target_size == 0ULL) {
return 0;
}
@@ -196,11 +190,7 @@ static int ush_ls_parse_args(const char *arg,
return 1;
}
static int ush_ls_dir(const char *path,
int long_mode,
int recursive,
int print_header,
u64 depth) {
static int ush_ls_dir(const char *path, int long_mode, int recursive, int print_header, u64 depth) {
u64 count;
u64 i;
@@ -309,7 +299,6 @@ static int ush_cmd_ls(const ush_state *sh, const char *arg) {
return ush_ls_dir(path, long_mode, recursive, recursive, 0ULL);
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -353,4 +342,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -8,7 +8,6 @@ static int ush_cmd_memstat(void) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -50,4 +49,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -25,7 +25,6 @@ static int ush_cmd_mkdir(const ush_state *sh, const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -69,4 +68,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -82,7 +82,6 @@ static int ush_cmd_mv(const ush_state *sh, const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -126,4 +125,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -4,7 +4,6 @@ static int ush_cmd_pid(void) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -46,4 +45,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -4,7 +4,6 @@ static int ush_cmd_pwd(const ush_state *sh) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -46,4 +45,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -5,7 +5,6 @@ static int ush_cmd_restart(void) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -47,4 +46,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -25,7 +25,6 @@ static int ush_cmd_rm(const ush_state *sh, const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -69,4 +68,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -1,10 +1,10 @@
#include "shell_internal.h"
#define USH_DMESG_DEFAULT 64ULL
#define USH_DMESG_DEFAULT 64ULL
#define USH_DMESG_LINE_MAX 256ULL
#define USH_COPY_MAX 65536U
#define USH_COPY_MAX 65536U
#define USH_PIPELINE_MAX_STAGES 8ULL
#define USH_PIPE_CAPTURE_MAX USH_COPY_MAX
#define USH_PIPE_CAPTURE_MAX USH_COPY_MAX
#define USH_PIPE_TMP_A "/temp/.ush_pipe_a.bin"
#define USH_PIPE_TMP_B "/temp/.ush_pipe_b.bin"
#define USH_SORT_MAX_LINES 4096ULL
@@ -22,7 +22,6 @@ static u64 ush_pipeline_stdin_len = 0ULL;
static char ush_pipeline_capture_a[USH_PIPE_CAPTURE_MAX + 1U];
static char ush_pipeline_capture_b[USH_PIPE_CAPTURE_MAX + 1U];
static int ush_path_is_under_temp(const char *path) {
if (path == (const char *)0) {
return 0;
@@ -71,17 +70,13 @@ static int ush_split_first_and_rest(const char *arg, char *out_first, u64 out_fi
return 1;
}
static int ush_split_two_args(const char *arg,
char *out_first,
u64 out_first_size,
char *out_second,
static int ush_split_two_args(const char *arg, char *out_first, u64 out_first_size, char *out_second,
u64 out_second_size) {
u64 i = 0ULL;
u64 p = 0ULL;
if (arg == (const char *)0 ||
out_first == (char *)0 || out_first_size == 0ULL ||
out_second == (char *)0 || out_second_size == 0ULL) {
if (arg == (const char *)0 || out_first == (char *)0 || out_first_size == 0ULL || out_second == (char *)0 ||
out_second_size == 0ULL) {
return 0;
}
@@ -278,19 +273,13 @@ static void ush_ls_print_one(const char *name, u64 type, u64 size, int long_mode
ush_write_char('\n');
}
static int ush_ls_parse_args(const char *arg,
int *out_long_mode,
int *out_recursive,
char *out_target,
static int ush_ls_parse_args(const char *arg, int *out_long_mode, int *out_recursive, char *out_target,
u64 out_target_size) {
char token[USH_PATH_MAX];
u64 i = 0ULL;
int path_set = 0;
if (out_long_mode == (int *)0 ||
out_recursive == (int *)0 ||
out_target == (char *)0 ||
out_target_size == 0ULL) {
if (out_long_mode == (int *)0 || out_recursive == (int *)0 || out_target == (char *)0 || out_target_size == 0ULL) {
return 0;
}
@@ -349,11 +338,7 @@ static int ush_ls_parse_args(const char *arg,
return 1;
}
static int ush_ls_dir(const char *path,
int long_mode,
int recursive,
int print_header,
u64 depth) {
static int ush_ls_dir(const char *path, int long_mode, int recursive, int print_header, u64 depth) {
u64 count;
u64 i;
@@ -756,19 +741,14 @@ static int ush_text_parse_optional_file(const char *arg, char *out_file, u64 out
return 1;
}
static int ush_text_load_input(const ush_state *sh,
const char *cmd,
const char *file_arg,
const char **out_input,
static int ush_text_load_input(const ush_state *sh, const char *cmd, const char *file_arg, const char **out_input,
u64 *out_input_len) {
static char file_buf[USH_COPY_MAX + 1U];
char path[USH_PATH_MAX];
u64 size;
u64 got;
if (sh == (const ush_state *)0 ||
cmd == (const char *)0 ||
out_input == (const char **)0 ||
if (sh == (const ush_state *)0 || cmd == (const char *)0 || out_input == (const char **)0 ||
out_input_len == (u64 *)0) {
return 0;
}
@@ -1126,11 +1106,7 @@ static int ush_cut_parse_delim(const char *token, char *out_delim) {
return 1;
}
static int ush_cut_parse_args(const char *arg,
char *out_delim,
u64 *out_field,
char *out_file,
u64 out_file_size) {
static int ush_cut_parse_args(const char *arg, char *out_delim, u64 *out_field, char *out_file, u64 out_file_size) {
char token[USH_PATH_MAX];
char value[USH_PATH_MAX];
const char *cursor = arg;
@@ -1711,8 +1687,10 @@ static int ush_cmd_ansi(void) {
ush_writeln("\x1B[1;36mansi color demo\x1B[0m");
ush_writeln(" \x1B[30mblack\x1B[0m \x1B[31mred\x1B[0m \x1B[32mgreen\x1B[0m \x1B[33myellow\x1B[0m");
ush_writeln(" \x1B[34mblue\x1B[0m \x1B[35mmagenta\x1B[0m \x1B[36mcyan\x1B[0m \x1B[37mwhite\x1B[0m");
ush_writeln(" \x1B[90mbright-black\x1B[0m \x1B[91mbright-red\x1B[0m \x1B[92mbright-green\x1B[0m \x1B[93mbright-yellow\x1B[0m");
ush_writeln(" \x1B[94mbright-blue\x1B[0m \x1B[95mbright-magenta\x1B[0m \x1B[96mbright-cyan\x1B[0m \x1B[97mbright-white\x1B[0m");
ush_writeln(" \x1B[90mbright-black\x1B[0m \x1B[91mbright-red\x1B[0m \x1B[92mbright-green\x1B[0m "
"\x1B[93mbright-yellow\x1B[0m");
ush_writeln(" \x1B[94mbright-blue\x1B[0m \x1B[95mbright-magenta\x1B[0m \x1B[96mbright-cyan\x1B[0m "
"\x1B[97mbright-white\x1B[0m");
return 1;
}
@@ -1815,7 +1793,8 @@ static int ush_cmd_ansitest(void) {
ush_write_char('\n');
ush_writeln("truecolor demo:");
ush_writeln(" \x1B[38;2;255;64;64mRGB(255,64,64)\x1B[0m \x1B[38;2;64;255;64mRGB(64,255,64)\x1B[0m \x1B[38;2;64;128;255mRGB(64,128,255)\x1B[0m");
ush_writeln(" \x1B[38;2;255;64;64mRGB(255,64,64)\x1B[0m \x1B[38;2;64;255;64mRGB(64,255,64)\x1B[0m "
"\x1B[38;2;64;128;255mRGB(64,128,255)\x1B[0m");
ush_writeln("cursor control demo:");
ush_write(" 0123456789");
@@ -2456,12 +2435,8 @@ static void ush_report_external_not_found(const char *cmd) {
ush_writeln(cmd);
}
static int ush_execute_single_command(ush_state *sh,
const char *cmd,
const char *arg,
int allow_external,
int *out_known,
int *out_success) {
static int ush_execute_single_command(ush_state *sh, const char *cmd, const char *arg, int allow_external,
int *out_known, int *out_success) {
int known = 1;
int success = 0;
@@ -2708,16 +2683,14 @@ static int ush_pipeline_parse_stage(ush_pipeline_stage *stage, const char *segme
return 1;
}
static int ush_pipeline_parse(const char *line,
ush_pipeline_stage *stages,
u64 max_stages,
u64 *out_stage_count) {
static int ush_pipeline_parse(const char *line, ush_pipeline_stage *stages, u64 max_stages, u64 *out_stage_count) {
char segment[USH_LINE_MAX];
u64 i = 0ULL;
u64 seg_pos = 0ULL;
u64 stage_count = 0ULL;
if (line == (const char *)0 || stages == (ush_pipeline_stage *)0 || max_stages == 0ULL || out_stage_count == (u64 *)0) {
if (line == (const char *)0 || stages == (ush_pipeline_stage *)0 || max_stages == 0ULL ||
out_stage_count == (u64 *)0) {
return 0;
}
@@ -2888,10 +2861,7 @@ static int ush_pipeline_open_redirect_fd(const ush_state *sh, const ush_pipeline
return 1;
}
static int ush_execute_pipeline(ush_state *sh,
const char *line,
int *out_known,
int *out_success) {
static int ush_execute_pipeline(ush_state *sh, const char *line, int *out_known, int *out_success) {
ush_pipeline_stage stages[USH_PIPELINE_MAX_STAGES];
u64 stage_count = 0ULL;
u64 i;
@@ -2950,8 +2920,7 @@ static int ush_execute_pipeline(ush_state *sh,
if (i + 1ULL < stage_count) {
stage_pipe_out = (pipe_output_toggle_external == 0) ? USH_PIPE_TMP_A : USH_PIPE_TMP_B;
if (ush_pipeline_open_write_fd(stage_pipe_out,
CLEONOS_O_WRONLY | CLEONOS_O_CREAT | CLEONOS_O_TRUNC,
if (ush_pipeline_open_write_fd(stage_pipe_out, CLEONOS_O_WRONLY | CLEONOS_O_CREAT | CLEONOS_O_TRUNC,
&opened_out_fd) == 0) {
ush_writeln("pipe: failed to open temp stream");
@@ -2977,13 +2946,8 @@ static int ush_execute_pipeline(ush_state *sh,
stage_stdout_fd = opened_out_fd;
}
stage_known = ush_try_exec_external_with_fds(sh,
stages[i].cmd,
stages[i].arg,
stage_stdin_fd,
stage_stdout_fd,
CLEONOS_FD_INHERIT,
&stage_success);
stage_known = ush_try_exec_external_with_fds(sh, stages[i].cmd, stages[i].arg, stage_stdin_fd,
stage_stdout_fd, CLEONOS_FD_INHERIT, &stage_success);
if (opened_in_fd != (u64)-1) {
(void)cleonos_sys_fd_close(opened_in_fd);
@@ -3040,9 +3004,7 @@ static int ush_execute_pipeline(ush_state *sh,
}
if (pipe_input_path != (const char *)0) {
if (ush_pipeline_read_path_into_buffer(pipe_input_path,
pipe_input_buffer,
(u64)USH_PIPE_CAPTURE_MAX + 1ULL,
if (ush_pipeline_read_path_into_buffer(pipe_input_path, pipe_input_buffer, (u64)USH_PIPE_CAPTURE_MAX + 1ULL,
&pipe_input_len) == 0) {
ush_writeln("pipe: failed to read stage input");
success = 0;
@@ -3057,8 +3019,7 @@ static int ush_execute_pipeline(ush_state *sh,
if (i + 1ULL < stage_count) {
stage_pipe_out = (pipe_output_toggle == 0) ? USH_PIPE_TMP_A : USH_PIPE_TMP_B;
if (ush_pipeline_open_write_fd(stage_pipe_out,
CLEONOS_O_WRONLY | CLEONOS_O_CREAT | CLEONOS_O_TRUNC,
if (ush_pipeline_open_write_fd(stage_pipe_out, CLEONOS_O_WRONLY | CLEONOS_O_CREAT | CLEONOS_O_TRUNC,
&stage_fd) == 0) {
ush_writeln("pipe: failed to open temp stream");
success = 0;
@@ -3097,8 +3058,8 @@ static int ush_execute_pipeline(ush_state *sh,
if (i + 1ULL < stage_count) {
pipe_input_path = stage_pipe_out;
pipe_input_buffer = (pipe_input_buffer == ush_pipeline_capture_a) ? ush_pipeline_capture_b
: ush_pipeline_capture_a;
pipe_input_buffer =
(pipe_input_buffer == ush_pipeline_capture_a) ? ush_pipeline_capture_b : ush_pipeline_capture_a;
pipe_output_toggle = (pipe_output_toggle == 0) ? 1 : 0;
}
}
@@ -3165,6 +3126,3 @@ void ush_execute_line(ush_state *sh, const char *line) {
sh->cmd_unknown++;
}
}

View File

@@ -137,13 +137,8 @@ int ush_command_ret_read(ush_cmd_ret *out_ret) {
return (got == (u64)sizeof(*out_ret)) ? 1 : 0;
}
int ush_try_exec_external_with_fds(ush_state *sh,
const char *cmd,
const char *arg,
u64 stdin_fd,
u64 stdout_fd,
u64 stderr_fd,
int *out_success) {
int ush_try_exec_external_with_fds(ush_state *sh, const char *cmd, const char *arg, u64 stdin_fd, u64 stdout_fd,
u64 stderr_fd, int *out_success) {
const char *canonical;
char path[USH_PATH_MAX];
char env_line[USH_PATH_MAX + USH_CMD_MAX + 96ULL];
@@ -230,11 +225,6 @@ int ush_try_exec_external_with_fds(ush_state *sh,
}
int ush_try_exec_external(ush_state *sh, const char *cmd, const char *arg, int *out_success) {
return ush_try_exec_external_with_fds(sh,
cmd,
arg,
CLEONOS_FD_INHERIT,
CLEONOS_FD_INHERIT,
CLEONOS_FD_INHERIT,
return ush_try_exec_external_with_fds(sh, cmd, arg, CLEONOS_FD_INHERIT, CLEONOS_FD_INHERIT, CLEONOS_FD_INHERIT,
out_success);
}

View File

@@ -712,4 +712,3 @@ void ush_read_line(ush_state *sh, char *out_line, u64 out_size) {
}
}
}

View File

@@ -9,33 +9,33 @@
typedef long long i64;
#define USH_CMD_MAX 32ULL
#define USH_ARG_MAX 160ULL
#define USH_LINE_MAX 192ULL
#define USH_PATH_MAX 192ULL
#define USH_CAT_MAX 512ULL
#define USH_SCRIPT_MAX 1024ULL
#define USH_CLEAR_LINES 56ULL
#define USH_HISTORY_MAX 16ULL
#define USH_CMD_MAX 32ULL
#define USH_ARG_MAX 160ULL
#define USH_LINE_MAX 192ULL
#define USH_PATH_MAX 192ULL
#define USH_CAT_MAX 512ULL
#define USH_SCRIPT_MAX 1024ULL
#define USH_CLEAR_LINES 56ULL
#define USH_HISTORY_MAX 16ULL
#define USH_KEY_LEFT ((char)0x01)
#define USH_KEY_RIGHT ((char)0x02)
#define USH_KEY_UP ((char)0x03)
#define USH_KEY_DOWN ((char)0x04)
#define USH_KEY_HOME ((char)0x05)
#define USH_KEY_END ((char)0x06)
#define USH_KEY_DELETE ((char)0x07)
#define USH_KEY_LEFT ((char)0x01)
#define USH_KEY_RIGHT ((char)0x02)
#define USH_KEY_UP ((char)0x03)
#define USH_KEY_DOWN ((char)0x04)
#define USH_KEY_HOME ((char)0x05)
#define USH_KEY_END ((char)0x06)
#define USH_KEY_DELETE ((char)0x07)
#define USH_KEY_SELECT_ALL ((char)0x10)
#define USH_KEY_COPY ((char)0x11)
#define USH_KEY_PASTE ((char)0x12)
#define USH_KEY_COPY ((char)0x11)
#define USH_KEY_PASTE ((char)0x12)
#define USH_KEY_SHIFT_LEFT ((char)0x13)
#define USH_KEY_SHIFT_RIGHT ((char)0x14)
#define USH_KEY_SHIFT_HOME ((char)0x15)
#define USH_KEY_SHIFT_END ((char)0x16)
#define USH_KEY_SHIFT_END ((char)0x16)
#define USH_CMD_CTX_PATH "/temp/.ush_cmd_ctx.bin"
#define USH_CMD_RET_PATH "/temp/.ush_cmd_ret.bin"
#define USH_CMD_RET_FLAG_CWD 0x1ULL
#define USH_CMD_RET_FLAG_CWD 0x1ULL
#define USH_CMD_RET_FLAG_EXIT 0x2ULL
typedef struct ush_state {
@@ -112,13 +112,7 @@ void ush_command_ret_reset(void);
int ush_command_ret_write(const ush_cmd_ret *ret);
int ush_command_ret_read(ush_cmd_ret *out_ret);
int ush_try_exec_external(ush_state *sh, const char *cmd, const char *arg, int *out_success);
int ush_try_exec_external_with_fds(ush_state *sh,
const char *cmd,
const char *arg,
u64 stdin_fd,
u64 stdout_fd,
u64 stderr_fd,
int *out_success);
int ush_try_exec_external_with_fds(ush_state *sh, const char *cmd, const char *arg, u64 stdin_fd, u64 stdout_fd,
u64 stderr_fd, int *out_success);
#endif

View File

@@ -194,7 +194,8 @@ int ush_path_is_under_system(const char *path) {
return 0;
}
if (path[0] != '/' || path[1] != 's' || path[2] != 'y' || path[3] != 's' || path[4] != 't' || path[5] != 'e' || path[6] != 'm') {
if (path[0] != '/' || path[1] != 's' || path[2] != 'y' || path[3] != 's' || path[4] != 't' || path[5] != 'e' ||
path[6] != 'm') {
return 0;
}

View File

@@ -7,8 +7,7 @@ int cleonos_app_main(void) {
ush_init_state(&sh);
ush_writeln("\x1B[92m[USER][SHELL]\x1B[0m interactive framework online");
if (ush_run_script_file(&sh, "/shell/init.cmd") == 0 &&
ush_run_script_file(&sh, "/shell/INIT.CMD") == 0 &&
if (ush_run_script_file(&sh, "/shell/init.cmd") == 0 && ush_run_script_file(&sh, "/shell/INIT.CMD") == 0 &&
ush_run_script_file(&sh, "/SHELL/INIT.CMD") == 0) {
ush_writeln("\x1B[33m[USER][SHELL]\x1B[0m init script not found, continue interactive mode");
}

View File

@@ -10,7 +10,6 @@ static int ush_cmd_shstat(const ush_state *sh) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -52,4 +51,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -5,7 +5,6 @@ static int ush_cmd_shutdown(void) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -47,4 +46,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -18,7 +18,6 @@ static int ush_cmd_sleep(const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -62,4 +61,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -28,7 +28,8 @@ static int ush_sort_parse_args(const char *arg, char *out_file, u64 out_file_siz
return 1;
}
static int ush_sort_load_input(const ush_state *sh, const char *file_arg, char *out_buf, u64 out_buf_size, u64 *out_len) {
static int ush_sort_load_input(const ush_state *sh, const char *file_arg, char *out_buf, u64 out_buf_size,
u64 *out_len) {
char path[USH_PATH_MAX];
u64 size;
u64 got;
@@ -221,7 +222,6 @@ static int ush_cmd_sort(const ush_state *sh, const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;

View File

@@ -48,7 +48,6 @@ static int ush_cmd_spawn(const ush_state *sh, const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -92,4 +91,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -1,8 +1,7 @@
#include <stdio.h>
int cleonos_app_main(void) {
static const char banner[] =
"spin: busy loop started (test Alt+Ctrl+C force stop)\n";
static const char banner[] = "spin: busy loop started (test Alt+Ctrl+C force stop)\n";
volatile unsigned long long noise = 0xC1E0C1E0ULL;
(void)fputs(banner, 1);

View File

@@ -74,7 +74,6 @@ static int ush_cmd_stats(const ush_state *sh) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -116,4 +115,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -12,79 +12,152 @@ typedef struct ush_sysstat_entry {
static const char *ush_sysstat_name_for_id(u64 id) {
switch (id) {
case CLEONOS_SYSCALL_LOG_WRITE: return "LOG_WRITE";
case CLEONOS_SYSCALL_TIMER_TICKS: return "TIMER_TICKS";
case CLEONOS_SYSCALL_TASK_COUNT: return "TASK_COUNT";
case CLEONOS_SYSCALL_CUR_TASK: return "CUR_TASK";
case CLEONOS_SYSCALL_SERVICE_COUNT: return "SERVICE_COUNT";
case CLEONOS_SYSCALL_SERVICE_READY_COUNT: return "SERVICE_READY";
case CLEONOS_SYSCALL_CONTEXT_SWITCHES: return "CONTEXT_SWITCH";
case CLEONOS_SYSCALL_KELF_COUNT: return "KELF_COUNT";
case CLEONOS_SYSCALL_KELF_RUNS: return "KELF_RUNS";
case CLEONOS_SYSCALL_FS_NODE_COUNT: return "FS_NODE_COUNT";
case CLEONOS_SYSCALL_FS_CHILD_COUNT: return "FS_CHILD_COUNT";
case CLEONOS_SYSCALL_FS_GET_CHILD_NAME: return "FS_CHILD_NAME";
case CLEONOS_SYSCALL_FS_READ: return "FS_READ";
case CLEONOS_SYSCALL_EXEC_PATH: return "EXEC_PATH";
case CLEONOS_SYSCALL_EXEC_REQUESTS: return "EXEC_REQUESTS";
case CLEONOS_SYSCALL_EXEC_SUCCESS: return "EXEC_SUCCESS";
case CLEONOS_SYSCALL_USER_SHELL_READY: return "USER_SHELL_READY";
case CLEONOS_SYSCALL_USER_EXEC_REQUESTED: return "USER_EXEC_REQ";
case CLEONOS_SYSCALL_USER_LAUNCH_TRIES: return "USER_LAUNCH_TRY";
case CLEONOS_SYSCALL_USER_LAUNCH_OK: return "USER_LAUNCH_OK";
case CLEONOS_SYSCALL_USER_LAUNCH_FAIL: return "USER_LAUNCH_FAIL";
case CLEONOS_SYSCALL_TTY_COUNT: return "TTY_COUNT";
case CLEONOS_SYSCALL_TTY_ACTIVE: return "TTY_ACTIVE";
case CLEONOS_SYSCALL_TTY_SWITCH: return "TTY_SWITCH";
case CLEONOS_SYSCALL_TTY_WRITE: return "TTY_WRITE";
case CLEONOS_SYSCALL_TTY_WRITE_CHAR: return "TTY_WRITE_CHAR";
case CLEONOS_SYSCALL_KBD_GET_CHAR: return "KBD_GET_CHAR";
case CLEONOS_SYSCALL_FS_STAT_TYPE: return "FS_STAT_TYPE";
case CLEONOS_SYSCALL_FS_STAT_SIZE: return "FS_STAT_SIZE";
case CLEONOS_SYSCALL_FS_MKDIR: return "FS_MKDIR";
case CLEONOS_SYSCALL_FS_WRITE: return "FS_WRITE";
case CLEONOS_SYSCALL_FS_APPEND: return "FS_APPEND";
case CLEONOS_SYSCALL_FS_REMOVE: return "FS_REMOVE";
case CLEONOS_SYSCALL_LOG_JOURNAL_COUNT: return "LOG_JCOUNT";
case CLEONOS_SYSCALL_LOG_JOURNAL_READ: return "LOG_JREAD";
case CLEONOS_SYSCALL_KBD_BUFFERED: return "KBD_BUFFERED";
case CLEONOS_SYSCALL_KBD_PUSHED: return "KBD_PUSHED";
case CLEONOS_SYSCALL_KBD_POPPED: return "KBD_POPPED";
case CLEONOS_SYSCALL_KBD_DROPPED: return "KBD_DROPPED";
case CLEONOS_SYSCALL_KBD_HOTKEY_SWITCHES: return "KBD_HOTKEYS";
case CLEONOS_SYSCALL_GETPID: return "GETPID";
case CLEONOS_SYSCALL_SPAWN_PATH: return "SPAWN_PATH";
case CLEONOS_SYSCALL_WAITPID: return "WAITPID";
case CLEONOS_SYSCALL_EXIT: return "EXIT";
case CLEONOS_SYSCALL_SLEEP_TICKS: return "SLEEP_TICKS";
case CLEONOS_SYSCALL_YIELD: return "YIELD";
case CLEONOS_SYSCALL_SHUTDOWN: return "SHUTDOWN";
case CLEONOS_SYSCALL_RESTART: return "RESTART";
case CLEONOS_SYSCALL_AUDIO_AVAILABLE: return "AUDIO_AVAIL";
case CLEONOS_SYSCALL_AUDIO_PLAY_TONE: return "AUDIO_TONE";
case CLEONOS_SYSCALL_AUDIO_STOP: return "AUDIO_STOP";
case CLEONOS_SYSCALL_EXEC_PATHV: return "EXEC_PATHV";
case CLEONOS_SYSCALL_SPAWN_PATHV: return "SPAWN_PATHV";
case CLEONOS_SYSCALL_PROC_ARGC: return "PROC_ARGC";
case CLEONOS_SYSCALL_PROC_ARGV: return "PROC_ARGV";
case CLEONOS_SYSCALL_PROC_ENVC: return "PROC_ENVC";
case CLEONOS_SYSCALL_PROC_ENV: return "PROC_ENV";
case CLEONOS_SYSCALL_PROC_LAST_SIGNAL: return "PROC_LAST_SIG";
case CLEONOS_SYSCALL_PROC_FAULT_VECTOR: return "PROC_FAULT_VEC";
case CLEONOS_SYSCALL_PROC_FAULT_ERROR: return "PROC_FAULT_ERR";
case CLEONOS_SYSCALL_PROC_FAULT_RIP: return "PROC_FAULT_RIP";
case CLEONOS_SYSCALL_PROC_COUNT: return "PROC_COUNT";
case CLEONOS_SYSCALL_PROC_PID_AT: return "PROC_PID_AT";
case CLEONOS_SYSCALL_PROC_SNAPSHOT: return "PROC_SNAPSHOT";
case CLEONOS_SYSCALL_PROC_KILL: return "PROC_KILL";
case CLEONOS_SYSCALL_KDBG_SYM: return "KDBG_SYM";
case CLEONOS_SYSCALL_KDBG_BT: return "KDBG_BT";
case CLEONOS_SYSCALL_KDBG_REGS: return "KDBG_REGS";
case CLEONOS_SYSCALL_STATS_TOTAL: return "STATS_TOTAL";
case CLEONOS_SYSCALL_STATS_ID_COUNT: return "STATS_ID_COUNT";
case CLEONOS_SYSCALL_STATS_RECENT_WINDOW: return "STATS_RECENT_WIN";
case CLEONOS_SYSCALL_STATS_RECENT_ID: return "STATS_RECENT_ID";
default: return "UNKNOWN";
case CLEONOS_SYSCALL_LOG_WRITE:
return "LOG_WRITE";
case CLEONOS_SYSCALL_TIMER_TICKS:
return "TIMER_TICKS";
case CLEONOS_SYSCALL_TASK_COUNT:
return "TASK_COUNT";
case CLEONOS_SYSCALL_CUR_TASK:
return "CUR_TASK";
case CLEONOS_SYSCALL_SERVICE_COUNT:
return "SERVICE_COUNT";
case CLEONOS_SYSCALL_SERVICE_READY_COUNT:
return "SERVICE_READY";
case CLEONOS_SYSCALL_CONTEXT_SWITCHES:
return "CONTEXT_SWITCH";
case CLEONOS_SYSCALL_KELF_COUNT:
return "KELF_COUNT";
case CLEONOS_SYSCALL_KELF_RUNS:
return "KELF_RUNS";
case CLEONOS_SYSCALL_FS_NODE_COUNT:
return "FS_NODE_COUNT";
case CLEONOS_SYSCALL_FS_CHILD_COUNT:
return "FS_CHILD_COUNT";
case CLEONOS_SYSCALL_FS_GET_CHILD_NAME:
return "FS_CHILD_NAME";
case CLEONOS_SYSCALL_FS_READ:
return "FS_READ";
case CLEONOS_SYSCALL_EXEC_PATH:
return "EXEC_PATH";
case CLEONOS_SYSCALL_EXEC_REQUESTS:
return "EXEC_REQUESTS";
case CLEONOS_SYSCALL_EXEC_SUCCESS:
return "EXEC_SUCCESS";
case CLEONOS_SYSCALL_USER_SHELL_READY:
return "USER_SHELL_READY";
case CLEONOS_SYSCALL_USER_EXEC_REQUESTED:
return "USER_EXEC_REQ";
case CLEONOS_SYSCALL_USER_LAUNCH_TRIES:
return "USER_LAUNCH_TRY";
case CLEONOS_SYSCALL_USER_LAUNCH_OK:
return "USER_LAUNCH_OK";
case CLEONOS_SYSCALL_USER_LAUNCH_FAIL:
return "USER_LAUNCH_FAIL";
case CLEONOS_SYSCALL_TTY_COUNT:
return "TTY_COUNT";
case CLEONOS_SYSCALL_TTY_ACTIVE:
return "TTY_ACTIVE";
case CLEONOS_SYSCALL_TTY_SWITCH:
return "TTY_SWITCH";
case CLEONOS_SYSCALL_TTY_WRITE:
return "TTY_WRITE";
case CLEONOS_SYSCALL_TTY_WRITE_CHAR:
return "TTY_WRITE_CHAR";
case CLEONOS_SYSCALL_KBD_GET_CHAR:
return "KBD_GET_CHAR";
case CLEONOS_SYSCALL_FS_STAT_TYPE:
return "FS_STAT_TYPE";
case CLEONOS_SYSCALL_FS_STAT_SIZE:
return "FS_STAT_SIZE";
case CLEONOS_SYSCALL_FS_MKDIR:
return "FS_MKDIR";
case CLEONOS_SYSCALL_FS_WRITE:
return "FS_WRITE";
case CLEONOS_SYSCALL_FS_APPEND:
return "FS_APPEND";
case CLEONOS_SYSCALL_FS_REMOVE:
return "FS_REMOVE";
case CLEONOS_SYSCALL_LOG_JOURNAL_COUNT:
return "LOG_JCOUNT";
case CLEONOS_SYSCALL_LOG_JOURNAL_READ:
return "LOG_JREAD";
case CLEONOS_SYSCALL_KBD_BUFFERED:
return "KBD_BUFFERED";
case CLEONOS_SYSCALL_KBD_PUSHED:
return "KBD_PUSHED";
case CLEONOS_SYSCALL_KBD_POPPED:
return "KBD_POPPED";
case CLEONOS_SYSCALL_KBD_DROPPED:
return "KBD_DROPPED";
case CLEONOS_SYSCALL_KBD_HOTKEY_SWITCHES:
return "KBD_HOTKEYS";
case CLEONOS_SYSCALL_GETPID:
return "GETPID";
case CLEONOS_SYSCALL_SPAWN_PATH:
return "SPAWN_PATH";
case CLEONOS_SYSCALL_WAITPID:
return "WAITPID";
case CLEONOS_SYSCALL_EXIT:
return "EXIT";
case CLEONOS_SYSCALL_SLEEP_TICKS:
return "SLEEP_TICKS";
case CLEONOS_SYSCALL_YIELD:
return "YIELD";
case CLEONOS_SYSCALL_SHUTDOWN:
return "SHUTDOWN";
case CLEONOS_SYSCALL_RESTART:
return "RESTART";
case CLEONOS_SYSCALL_AUDIO_AVAILABLE:
return "AUDIO_AVAIL";
case CLEONOS_SYSCALL_AUDIO_PLAY_TONE:
return "AUDIO_TONE";
case CLEONOS_SYSCALL_AUDIO_STOP:
return "AUDIO_STOP";
case CLEONOS_SYSCALL_EXEC_PATHV:
return "EXEC_PATHV";
case CLEONOS_SYSCALL_SPAWN_PATHV:
return "SPAWN_PATHV";
case CLEONOS_SYSCALL_PROC_ARGC:
return "PROC_ARGC";
case CLEONOS_SYSCALL_PROC_ARGV:
return "PROC_ARGV";
case CLEONOS_SYSCALL_PROC_ENVC:
return "PROC_ENVC";
case CLEONOS_SYSCALL_PROC_ENV:
return "PROC_ENV";
case CLEONOS_SYSCALL_PROC_LAST_SIGNAL:
return "PROC_LAST_SIG";
case CLEONOS_SYSCALL_PROC_FAULT_VECTOR:
return "PROC_FAULT_VEC";
case CLEONOS_SYSCALL_PROC_FAULT_ERROR:
return "PROC_FAULT_ERR";
case CLEONOS_SYSCALL_PROC_FAULT_RIP:
return "PROC_FAULT_RIP";
case CLEONOS_SYSCALL_PROC_COUNT:
return "PROC_COUNT";
case CLEONOS_SYSCALL_PROC_PID_AT:
return "PROC_PID_AT";
case CLEONOS_SYSCALL_PROC_SNAPSHOT:
return "PROC_SNAPSHOT";
case CLEONOS_SYSCALL_PROC_KILL:
return "PROC_KILL";
case CLEONOS_SYSCALL_KDBG_SYM:
return "KDBG_SYM";
case CLEONOS_SYSCALL_KDBG_BT:
return "KDBG_BT";
case CLEONOS_SYSCALL_KDBG_REGS:
return "KDBG_REGS";
case CLEONOS_SYSCALL_STATS_TOTAL:
return "STATS_TOTAL";
case CLEONOS_SYSCALL_STATS_ID_COUNT:
return "STATS_ID_COUNT";
case CLEONOS_SYSCALL_STATS_RECENT_WINDOW:
return "STATS_RECENT_WIN";
case CLEONOS_SYSCALL_STATS_RECENT_ID:
return "STATS_RECENT_ID";
default:
return "UNKNOWN";
}
}
@@ -141,7 +214,8 @@ static int ush_sysstat_parse_args(const char *arg, int *out_show_all, u64 *out_l
}
if (ush_streq(token, "-n") != 0 || ush_streq(token, "--top") != 0) {
if (ush_sysstat_next_token(&cursor, token, (u64)sizeof(token)) == 0 || ush_parse_u64_dec(token, &limit) == 0) {
if (ush_sysstat_next_token(&cursor, token, (u64)sizeof(token)) == 0 ||
ush_parse_u64_dec(token, &limit) == 0) {
return 0;
}
continue;

View File

@@ -198,7 +198,6 @@ static int ush_cmd_tail(const ush_state *sh, const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;

View File

@@ -8,7 +8,6 @@ static int ush_cmd_taskstat(void) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -50,4 +49,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -117,8 +117,7 @@ static void ush_top_render_frame(u64 frame_index, u64 delay_ticks) {
continue;
}
if (snap.state != CLEONOS_PROC_STATE_PENDING &&
snap.state != CLEONOS_PROC_STATE_RUNNING &&
if (snap.state != CLEONOS_PROC_STATE_PENDING && snap.state != CLEONOS_PROC_STATE_RUNNING &&
snap.state != CLEONOS_PROC_STATE_STOPPED) {
continue;
}

View File

@@ -26,7 +26,6 @@ static int ush_cmd_touch(const ush_state *sh, const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -70,4 +69,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -33,7 +33,6 @@ static int ush_cmd_tty(const char *arg) {
}
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -77,4 +76,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -169,7 +169,6 @@ static int ush_cmd_uniq(const ush_state *sh, const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;

View File

@@ -13,7 +13,6 @@ static int ush_cmd_userstat(void) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -55,4 +54,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -37,7 +37,6 @@ static int ush_cmd_wait(const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -81,4 +80,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -1,10 +1,10 @@
#include "cmd_runtime.h"
#define USH_WAVPLAY_DEFAULT_STEPS 256ULL
#define USH_WAVPLAY_MAX_STEPS 4096ULL
#define USH_WAVPLAY_DEFAULT_TICKS 1ULL
#define USH_WAVPLAY_MAX_TICKS 64ULL
#define USH_WAVPLAY_RUN_TICK_MAX 512ULL
#define USH_WAVPLAY_DEFAULT_STEPS 256ULL
#define USH_WAVPLAY_MAX_STEPS 4096ULL
#define USH_WAVPLAY_DEFAULT_TICKS 1ULL
#define USH_WAVPLAY_MAX_TICKS 64ULL
#define USH_WAVPLAY_RUN_TICK_MAX 512ULL
typedef struct ush_wav_info {
u64 data_size;
@@ -20,9 +20,7 @@ static unsigned int ush_wav_le16(const unsigned char *ptr) {
}
static unsigned int ush_wav_le32(const unsigned char *ptr) {
return (unsigned int)ptr[0] |
((unsigned int)ptr[1] << 8U) |
((unsigned int)ptr[2] << 16U) |
return (unsigned int)ptr[0] | ((unsigned int)ptr[1] << 8U) | ((unsigned int)ptr[2] << 16U) |
((unsigned int)ptr[3] << 24U);
}
@@ -31,9 +29,7 @@ static int ush_wav_tag_eq(const unsigned char *tag, const char *lit4) {
return 0;
}
return (tag[0] == (unsigned char)lit4[0] &&
tag[1] == (unsigned char)lit4[1] &&
tag[2] == (unsigned char)lit4[2] &&
return (tag[0] == (unsigned char)lit4[0] && tag[1] == (unsigned char)lit4[1] && tag[2] == (unsigned char)lit4[2] &&
tag[3] == (unsigned char)lit4[3])
? 1
: 0;
@@ -278,11 +274,7 @@ static u64 ush_wav_frame_deviation(const ush_wav_info *info, const unsigned char
return 0ULL;
}
static int ush_wavplay_parse_args(const char *arg,
char *out_path,
u64 out_path_size,
u64 *out_steps,
u64 *out_ticks,
static int ush_wavplay_parse_args(const char *arg, char *out_path, u64 out_path_size, u64 *out_steps, u64 *out_ticks,
int *out_stop) {
char first[USH_PATH_MAX];
char second[32];

View File

@@ -163,7 +163,6 @@ static int ush_cmd_wc(const ush_state *sh, const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;

View File

@@ -44,7 +44,6 @@ static int ush_cmd_write(const ush_state *sh, const char *arg) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -88,4 +87,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}

View File

@@ -4,7 +4,6 @@ static int ush_cmd_yield(void) {
return 1;
}
int cleonos_app_main(void) {
ush_cmd_ctx ctx;
ush_cmd_ret ret;
@@ -46,4 +45,3 @@ int cleonos_app_main(void) {
return (success != 0) ? 0 : 1;
}