-
Notifications
You must be signed in to change notification settings - Fork 292
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
yanglint FEATURE enable multiline for linenoise
Had to add a new 'cli' command to yanglint in interactive mode. Although the Multiline is more suitable for interactive mode, it creates a problem for tcl tests because it often adds ANSI escape codes. So at the beginning of the tcl tests, multiline is turned off.
- Loading branch information
Showing
7 changed files
with
147 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,6 +14,7 @@ set(lintsrc | |
cmd_help.c | ||
cmd_verb.c | ||
cmd_debug.c | ||
cmd_cli.c | ||
yl_opt.c | ||
yl_schema_features.c | ||
common.c | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
/** | ||
* @file cli_verb.c | ||
* @author Adam Piecek <[email protected]> | ||
* @brief 'cli' command of the libyang's yanglint tool. | ||
* | ||
* Copyright (c) 2024-2024 CESNET, z.s.p.o. | ||
* | ||
* This source code is licensed under BSD 3-Clause License (the "License"). | ||
* You may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://opensource.org/licenses/BSD-3-Clause | ||
*/ | ||
|
||
#include "cmd.h" | ||
|
||
#include <getopt.h> | ||
#include <stdint.h> | ||
#include <stdio.h> | ||
#include <strings.h> | ||
|
||
#include "libyang.h" | ||
#include "linenoise/linenoise.h" | ||
|
||
#include "common.h" | ||
#include "yl_opt.h" | ||
|
||
#define LY_CLI_SINGLELINE 0x1 | ||
|
||
uint8_t cli_flags; | ||
|
||
void | ||
cmd_cli_help(void) | ||
{ | ||
printf("Usage: cli [-s]\n" | ||
" Settings for the command line interface.\n\n" | ||
" -s, --toggle-singleline\n" | ||
" The singleline settings toggles how the cli handles the overflow of typed text\n" | ||
" across the screen. By default, it puts overflow text on a new line. But this\n" | ||
" setting will make the text will scroll towards right to make room while\n" | ||
" sending much less ANSI escape codes.\n"); | ||
} | ||
|
||
int | ||
cmd_cli_opt(struct yl_opt *yo, const char *cmdline, char ***posv, int *posc) | ||
{ | ||
int rc = 0, argc = 0; | ||
int opt, opt_index; | ||
struct option options[] = { | ||
{"toggle-singleline", no_argument, NULL, 's'}, | ||
{"help", no_argument, NULL, 'h'}, | ||
{NULL, 0, NULL, 0} | ||
}; | ||
|
||
if ((rc = parse_cmdline(cmdline, &argc, &yo->argv))) { | ||
return rc; | ||
} | ||
|
||
while ((opt = getopt_long(argc, yo->argv, commands[CMD_CLI].optstring, options, &opt_index)) != -1) { | ||
switch (opt) { | ||
case 's': | ||
yo->cli_flags |= LY_CLI_SINGLELINE; | ||
break; | ||
case 'h': | ||
cmd_cli_help(); | ||
return 1; | ||
default: | ||
YLMSG_E("Unknown option."); | ||
return 1; | ||
} | ||
} | ||
|
||
*posv = &yo->argv[optind]; | ||
*posc = argc - optind; | ||
|
||
return 0; | ||
} | ||
|
||
int | ||
cmd_cli_dep(struct yl_opt *yo, int posc) | ||
{ | ||
(void) yo; | ||
|
||
if (posc != 0) { | ||
YLMSG_E("Only options are expected."); | ||
cmd_verb_help(); | ||
return 1; | ||
} | ||
|
||
return 0; | ||
} | ||
|
||
int | ||
cmd_cli_exec(struct ly_ctx **ctx, struct yl_opt *yo, const char *posv) | ||
{ | ||
(void) ctx, (void) posv; | ||
|
||
if (yo->cli_flags & LY_CLI_SINGLELINE) { | ||
if (cli_flags & LY_CLI_SINGLELINE) { | ||
cli_flags &= ~LY_CLI_SINGLELINE; | ||
linenoiseSetMultiLine(1); | ||
} else { | ||
cli_flags |= LY_CLI_SINGLELINE; | ||
linenoiseSetMultiLine(0); | ||
} | ||
} | ||
|
||
return 0; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -78,6 +78,9 @@ struct yl_opt { | |
|
||
uint32_t dbg_groups; | ||
|
||
/* cli command settings */ | ||
uint8_t cli_flags; | ||
|
||
/* | ||
* schema | ||
*/ | ||
|