Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

finish cmd-help-fix #120

Merged
merged 1 commit into from
Mar 22, 2023
Merged

finish cmd-help-fix #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions app/cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,9 +478,11 @@ int ZSV_CLI_MAIN(int argc, const char *argv[]) {
};
if(help_builtin->main)
return help_builtin->main(2, argv_tmp);
else if(help_builtin->cmd)
return help_builtin->cmd(2, argv_tmp, NULL, NULL);
else
else if(help_builtin->cmd) {
char opts_used[ZSV_OPTS_SIZE_MAX] = { 0 };
struct zsv_opts opts = { 0 };
return help_builtin->cmd(2, argv_tmp, &opts, opts_used);
} else
return fprintf(stderr, "Unexpected syntax!\n");
} else {
const char *ext_cmd = extension_cmd_from_arg(argv[2]);
Expand Down
2 changes: 2 additions & 0 deletions app/test/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ test-cli: ${CLI}
@[ "${CLI}" = "" ] && echo 1>&2 'test-cli: missing CLI env var' && exit 1 || exit 0
@$< help select 2>&1 > ${TMP_DIR}/[email protected]
@[ "`head -1 ${TMP_DIR}/[email protected]`" = "select: streaming CSV parser" ] && [ $$(( `cat ${TMP_DIR}/[email protected] | wc -l` )) = "35" ] && ${TEST_PASS} || ${TEST_FAIL}
@$< help count 2>&1 > ${TMP_DIR}/[email protected]
@[ "`head -1 ${TMP_DIR}/[email protected]`" = "Usage: count [options]" ] && [ $$(( `cat ${TMP_DIR}/[email protected] | wc -l` )) = "5" ] && ${TEST_PASS} || ${TEST_FAIL}

test-1-count test-1-count-pull: test-1-% : ${BUILD_DIR}/bin/zsv_%${EXE} worldcitiespop_mil.csv
@${TEST_INIT}
Expand Down