Branch
Hash :
e9903bbd
Author :
Thomas de Grivel
Date :
2025-11-13T16:45:49
wip dedup ikc3/kc3s
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504
--- kc3s/kc3s.c Mon Oct 27 15:49:13 2025
+++ ikc3/ikc3.c Mon Oct 27 13:41:08 2025
@@ -23,6 +23,12 @@
#include "../tls/tls_server.h"
#include "../tls/tls_config.h"
+#if HAVE_WINEDITLINE
+# include "buf_wineditline.h"
+#else
+# include "buf_linenoise.h"
+#endif
+
#define BUFSZ 0x10000
static bool g_client = false;
@@ -42,18 +48,20 @@
// TODO: use positive return value to increment argc and argv
// TODO: remove one reference level (*)
-static int kc3s_arg_client (s_env *env, int *argc, char ***argv);
-static int kc3s_arg_dump (s_env *env, int *argc, char ***argv);
-static int kc3s_arg_load (s_env *env, int *argc, char ***argv);
-static int kc3s_arg_server (s_env *env, int *argc, char ***argv);
-static int kc3s_arg_tls (s_env *env, int *argc, char ***argv);
-static void kc3s_client_clean (void);
-static int kc3s_client_init (void);
-static int kc3s_client_init_tls (void);
-static sw kc3s_run (void);
-static void kc3s_server_clean (s_env *env);
-static int kc3s_server_init (s_env *env);
-static int kc3s_server_init_tls (s_env *env);
+static int ikc3_arg_client (s_env *env, int *argc, char ***argv);
+static int ikc3_arg_dump (s_env *env, int *argc, char ***argv);
+static int ikc3_arg_load (s_env *env, int *argc, char ***argv);
+static int ikc3_arg_server (s_env *env, int *argc, char ***argv);
+static int ikc3_arg_tls (s_env *env, int *argc, char ***argv);
+static void ikc3_buf_editline_close (s_buf *buf);
+static void ikc3_buf_editline_open_r (s_buf *buf);
+static void ikc3_client_clean (void);
+static int ikc3_client_init (void);
+static int ikc3_client_init_tls (void);
+static sw ikc3_run (void);
+static void ikc3_server_clean (s_env *env);
+static int ikc3_server_init (s_env *env);
+static int ikc3_server_init_tls (s_env *env);
static int usage (char *argv0);
static sw buf_ignore_character (s_buf *buf)
@@ -73,21 +81,21 @@
return csize;
}
-static int kc3s_arg_client (s_env *env, int *argc, char ***argv)
+static int ikc3_arg_client (s_env *env, int *argc, char ***argv)
{
if (g_server) {
- err_puts("kc3s_arg_client: --client and --server are mutually"
+ err_puts("ikc3_arg_client: --client and --server are mutually"
" exclusive");
usage(env->argv[0]);
return -1;
}
if (g_client) {
- err_puts("kc3s_arg_client: --client can only be set once");
+ err_puts("ikc3_arg_client: --client can only be set once");
usage(env->argv[0]);
return -1;
}
if (*argc < 3 || ! (*argv)[0] || ! (*argv)[1] || ! (*argv)[2]) {
- err_puts("kc3s_arg_client: --client invalid argument");
+ err_puts("ikc3_arg_client: --client invalid argument");
usage(env->argv[0]);
return -1;
}
@@ -95,8 +103,8 @@
str_init_1(&g_port, NULL, (*argv)[2]);
g_client = true;
if (! env_module_load(env, &g_sym_RPC_Response)) {
- err_puts("kc3s_arg_client: failed to load RPC.Response module");
- assert(! "kc3s_arg_client: failed to load RPC.Response module");
+ err_puts("ikc3_arg_client: failed to load RPC.Response module");
+ assert(! "ikc3_arg_client: failed to load RPC.Response module");
return -1;
}
*argc -= 3;
@@ -104,11 +112,11 @@
return 3;
}
-static int kc3s_arg_dump (s_env *env, int *argc, char ***argv)
+static int ikc3_arg_dump (s_env *env, int *argc, char ***argv)
{
s_str path = {0};
if (*argc < 2 || ! (*argv)[0] || ! (*argv)[1]) {
- err_puts("kc3s_arg_dump: invalid argument");
+ err_puts("ikc3_arg_dump: invalid argument");
usage(env->argv[0]);
return -1;
}
@@ -123,7 +131,7 @@
return 2;
}
-static int kc3s_arg_load (s_env *env, int *argc, char ***argv)
+static int ikc3_arg_load (s_env *env, int *argc, char ***argv)
{
sw e = 0;
FILE *fp = 0;
@@ -134,12 +142,12 @@
s_str path = {0};
sw r;
if (*argc < 2) {
- err_puts("kc3s_arg_load: --load without an argument");
- assert(! "kc3s_arg_load: --load without an argument");
+ err_puts("ikc3_arg_load: --load without an argument");
+ assert(! "ikc3_arg_load: --load without an argument");
return -1;
}
if (env->trace) {
- err_write_1("kc3s_arg_load: ");
+ err_write_1("ikc3_arg_load: ");
err_write_1((*argv)[1]);
err_write_1("\n");
}
@@ -147,12 +155,12 @@
fp = file_open(&path, "rb");
if (! fp) {
e = errno;
- err_write_1("kc3s: ");
+ err_write_1("ikc3: ");
err_inspect_str(&path);
err_write_1(": ");
err_write_1(strerror(e));
err_write_1("\n");
- assert(! "kc3s: fopen");
+ assert(! "ikc3: fopen");
return 1;
}
str_clean(&path);
@@ -169,7 +177,7 @@
buf_file_close(env->in);
return -1;
}
- r = kc3s_run();
+ r = ikc3_run();
*file_dir = file_dir_save;
*file_path = file_path_save;
buf_file_close(env->in);
@@ -181,21 +189,21 @@
return 0;
}
-static int kc3s_arg_server (s_env *env, int *argc, char ***argv)
+static int ikc3_arg_server (s_env *env, int *argc, char ***argv)
{
if (g_client) {
- err_puts("kc3s_arg_server: --client and --server are mutually"
+ err_puts("ikc3_arg_server: --client and --server are mutually"
" exclusive");
usage(env->argv[0]);
return -1;
}
if (g_server) {
- err_puts("kc3s_arg_server: --server can only be set once");
+ err_puts("ikc3_arg_server: --server can only be set once");
usage(env->argv[0]);
return -1;
}
if (*argc < 3 || ! (*argv)[0] || ! (*argv)[1] || ! (*argv)[2]) {
- err_puts("kc3s_arg_server: --server invalid argument");
+ err_puts("ikc3_arg_server: --server invalid argument");
usage(env->argv[0]);
return -1;
}
@@ -203,13 +211,13 @@
str_init_1(&g_port, NULL, (*argv)[2]);
g_server = true;
if (! env_module_load(env, &g_sym_RPC)) {
- err_puts("kc3s_arg_client: failed to load RPC module");
- assert(! "kc3s_arg_client: failed to load RPC module");
+ err_puts("ikc3_arg_client: failed to load RPC module");
+ assert(! "ikc3_arg_client: failed to load RPC module");
return -1;
}
if (! env_module_load(env, &g_sym_RPC_Response)) {
- err_puts("kc3s_arg_client: failed to load RPC.Response module");
- assert(! "kc3s_arg_client: failed to load RPC.Response module");
+ err_puts("ikc3_arg_client: failed to load RPC.Response module");
+ assert(! "ikc3_arg_client: failed to load RPC.Response module");
return -1;
}
*argc -= 3;
@@ -217,11 +225,11 @@
return 3;
}
-static int kc3s_arg_tls (s_env *env, int *argc, char ***argv)
+static int ikc3_arg_tls (s_env *env, int *argc, char ***argv)
{
(void) env;
if (g_tls) {
- err_puts("kc3s_arg_tls: --tls can only be set once");
+ err_puts("ikc3_arg_tls: --tls can only be set once");
usage(env->argv[0]);
return -1;
}
@@ -231,18 +239,36 @@
return 1;
}
-static void kc3s_client_clean (void)
+static void ikc3_buf_editline_close (s_buf *buf)
{
+#if HAVE_WINEDITLINE
+ buf_wineditline_close(buf, ".ikc3_history");
+#else
+ buf_linenoise_close(buf, ".ikc3_history");
+#endif
+}
+
+static void ikc3_buf_editline_open_r (s_buf *buf)
+{
+#if HAVE_WINEDITLINE
+ buf_wineditline_open_r(buf, "ikc3> ", ".ikc3_history");
+#else
+ buf_linenoise_open_r(buf, "ikc3> ", ".ikc3_history");
+#endif
+}
+
+static void ikc3_client_clean (void)
+{
if (g_tls)
kc3_tls_client_clean(&g_tls_client);
else
socket_buf_close(&g_socket_buf);
}
-static int kc3s_client_init (void)
+static int ikc3_client_init (void)
{
if (! socket_buf_init_connect(&g_socket_buf, &g_host, &g_port)) {
- err_write_1("kc3s: unable to connect to ");
+ err_write_1("ikc3: unable to connect to ");
err_inspect_str(&g_host);
err_write_1(" ");
err_inspect_str(&g_port);
@@ -250,7 +276,7 @@
return 1;
}
if (true) {
- io_write_1("kc3s: connected to ");
+ io_write_1("ikc3: connected to ");
io_inspect_str(&g_host);
io_write_1(" ");
io_inspect_str(&g_port);
@@ -259,7 +285,7 @@
return 0;
}
-static int kc3s_client_init_tls (void)
+static int ikc3_client_init_tls (void)
{
p_tls tls;
p_tls_config tls_config;
@@ -305,7 +331,7 @@
return 1;
}
if (true) {
- io_write_1("kc3s: connected with TLS ");
+ io_write_1("ikc3: connected with TLS ");
io_write_1(tls_conn_version(tls));
io_write_1(" to ");
io_inspect_str(&g_host);
@@ -316,7 +342,7 @@
return 0;
}
-static sw kc3s_run (void)
+static sw ikc3_run (void)
{
s_env *env;
s_buf *env_err;
@@ -394,8 +420,8 @@
! (response = result.data.pstruct->tag) ||
response[0].type != TAG_STR ||
response[1].type != TAG_STR) {
- err_puts("kc3s_run: invalid RPC response");
- assert(! "kc3s_run: invalid RPC response");
+ err_puts("ikc3_run: invalid RPC response");
+ assert(! "ikc3_run: invalid RPC response");
tag_clean(&result);
tag_clean(&input);
r = 1;
@@ -403,7 +429,7 @@
}
buf_write_str(env->err, &response[0].data.str);
buf_write_str(env->out, &response[1].data.str);
- // ikc3: buf_inspect_tag(env->out, &response[2]);
+ buf_inspect_tag(env->out, &response[2]);
}
else if (! eval_tag(&input, &result)) {
tag_clean(&input);
@@ -432,7 +458,7 @@
goto next;
}
tag_clean(&input);
- if (g_server) {
+ if (! g_client) {
if (buf_inspect_tag(env->out, &result) < 0) {
tag_clean(&result);
r = 0;
@@ -448,6 +474,10 @@
goto clean;
}
next:
+ if ((r = buf_write_1(env->out, "\n")) < 0) {
+ r = 1;
+ goto clean;
+ }
if ((r = buf_flush(env->out)) < 0) {
r = 1;
goto clean;
@@ -461,7 +491,7 @@
return r;
}
-static void kc3s_server_clean (s_env *env)
+static void ikc3_server_clean (s_env *env)
{
env->in = g_server_env_in;
env->out = g_server_env_out;
@@ -474,11 +504,11 @@
}
}
-static int kc3s_server_init (s_env *env)
+static int ikc3_server_init (s_env *env)
{
assert(env);
if (! socket_init_listen(&g_server_socket, &g_host, &g_port)) {
- err_write_1("kc3s: failed to listen on ");
+ err_write_1("ikc3: failed to listen on ");
err_inspect_str(&g_host);
err_write_1(" ");
err_inspect_str(&g_port);
@@ -486,19 +516,19 @@
return 1;
}
if (true) {
- io_write_1("kc3s: listening on ");
+ io_write_1("ikc3: listening on ");
io_inspect_str(&g_host);
io_write_1(" ");
io_inspect_str(&g_port);
io_write_1("\n");
}
if (! socket_buf_init_accept(&g_socket_buf, &g_server_socket)) {
- err_puts("kc3s: kc3s_server_init: socket_buf_init_accept");
+ err_puts("ikc3: ikc3_server_init: socket_buf_init_accept");
socket_close(&g_server_socket);
return 1;
}
if (true) {
- io_write_1("kc3s: connected to ");
+ io_write_1("ikc3: connected to ");
io_inspect_str(&g_socket_buf.addr_str);
io_write_1("\n");
}
@@ -510,7 +540,7 @@
return 0;
}
-static int kc3s_server_init_tls (s_env *env)
+static int ikc3_server_init_tls (s_env *env)
{
p_tls tls = NULL;
p_tls tls_tmp = NULL;
@@ -557,7 +587,7 @@
return 1;
}
if (! socket_init_listen(&g_server_socket, &g_host, &g_port)) {
- err_write_1("kc3s: TLS server: failed to listen on ");
+ err_write_1("ikc3: TLS server: failed to listen on ");
err_inspect_str(&g_host);
err_write_1(" ");
err_inspect_str(&g_port);
@@ -565,7 +595,7 @@
return 1;
}
if (true) {
- io_write_1("kc3s: TLS server: listening on ");
+ io_write_1("ikc3: TLS server: listening on ");
io_inspect_str(&g_host);
io_write_1(" ");
io_inspect_str(&g_port);
@@ -573,11 +603,11 @@
}
if (! kc3_tls_server_init_accept(&g_tls_server, &g_server_socket,
&tls)) {
- err_puts("kc3s_server_init_tls: kc3_tls_server_init_accept");
- assert(! "kc3s_server_init_tls: kc3_tls_server_init_accept");
+ err_puts("ikc3_server_init_tls: kc3_tls_server_init_accept");
+ assert(! "ikc3_server_init_tls: kc3_tls_server_init_accept");
return 1;
}
- io_write_1("kc3s: TLS server: client connected: ");
+ io_write_1("ikc3: TLS server: client connected: ");
io_inspect_str(&g_tls_server.socket_buf.addr_str);
io_write_1(" ");
io_inspect_str(&g_port);
@@ -598,7 +628,7 @@
s_buf in_original = {0};
sw r = 0;
if (argc < 1)
- return usage("kc3s");
+ return usage("ikc3");
g_env_argv0_default = PROG;
g_env_argv0_dir_default = PREFIX;
if (! kc3_init(NULL, &argc, &argv))
@@ -607,24 +637,24 @@
in_original = *env->in;
while (argc) {
if (! strcmp("--client", *argv)) {
- if ((r = kc3s_arg_client(env, &argc, &argv)) < 0)
+ if ((r = ikc3_arg_client(env, &argc, &argv)) < 0)
goto clean;
}
else if (! strcmp(argv[0], "--dump")) {
- if ((r = kc3s_arg_dump(env, &argc, &argv)) < 0)
+ if ((r = ikc3_arg_dump(env, &argc, &argv)) < 0)
goto clean;
}
else if (! strcmp("--load", *argv) ||
! strcmp("-l", *argv)) {
- if ((r = kc3s_arg_load(env, &argc, &argv)) < 0)
+ if ((r = ikc3_arg_load(env, &argc, &argv)) < 0)
goto clean;
}
else if (! strcmp("--server", *argv)) {
- if ((r = kc3s_arg_server(env, &argc, &argv)) < 0)
+ if ((r = ikc3_arg_server(env, &argc, &argv)) < 0)
goto clean;
}
else if (! strcmp("--tls", *argv)) {
- if ((r = kc3s_arg_tls(env, &argc, &argv)) < 0)
+ if ((r = ikc3_arg_tls(env, &argc, &argv)) < 0)
goto clean;
}
else if (argc == 1 &&
@@ -636,42 +666,42 @@
break;
}
if (g_client && g_server) {
- err_puts("kc3s: --client and --server is not supported");
+ err_puts("ikc3: --client and --server is not supported");
return usage(env->argv[0]);
}
if (g_tls) {
if (! g_client && ! g_server) {
- err_puts("kc3s: --tls without --client or --server");
+ err_puts("ikc3: --tls without --client or --server");
return usage(env->argv[0]);
}
}
*env->in = in_original;
if (g_server) {
if (g_tls) {
- if (kc3s_server_init_tls(env))
+ if (ikc3_server_init_tls(env))
goto clean;
}
- else if (kc3s_server_init(env))
+ else if (ikc3_server_init(env))
goto clean;
- r = kc3s_run();
+ r = ikc3_run();
goto clean;
}
- // kc3s_buf_editline_open_r(env->in);
+ ikc3_buf_editline_open_r(env->in);
if (g_client) {
if (g_tls) {
- if (kc3s_client_init_tls())
+ if (ikc3_client_init_tls())
goto close;
}
- else if (kc3s_client_init())
+ else if (ikc3_client_init())
goto close;
}
- r = kc3s_run();
+ r = ikc3_run();
if (g_client)
- kc3s_client_clean();
+ ikc3_client_clean();
else if (g_server)
- kc3s_server_clean(env);
+ ikc3_server_clean(env);
close:
- // kc3s_buf_editline_close(env->in);
+ ikc3_buf_editline_close(env->in);
clean:
*env->in = in_original;
kc3_clean(NULL);