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

fix zsv <cmd> help syntax for commands using CLI_BUILTIN_COMMAND() #119

Merged
merged 3 commits into from
Mar 22, 2023
Merged

fix zsv <cmd> help syntax for commands using CLI_BUILTIN_COMMAND() #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe078ac
fix `zsv <cmd> help` syntax for commands using CLI_BUILTIN_COMMAND()
liquidaty Mar 22, 2023
01ff9a0
add simple test
liquidaty Mar 22, 2023
bd2a236
re-connect pre-existing tests
liquidaty Mar 22, 2023
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
9 changes: 7 additions & 2 deletions app/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,8 +415,13 @@ ${YAJL_HELPER_OBJ}: external/yajl_helper/yajl_helper.c
@mkdir -p `dirname "$@"`
${CC} ${CFLAGS} -I${BASEDIR}/yajl_helper ${YAJL_INCLUDE} ${YAJL_HELPER_INCLUDE} -c $< -o $@

test:
@${MAKE} -C test $@ QUIET=1 LEAKS=${LEAKS} CONFIGFILE=${CONFIGFILEPATH} DEBUG=${DEBUG}
test: test-standalone test-cli

test-standalone:
@${MAKE} -C test test QUIET=1 LEAKS=${LEAKS} CONFIGFILE=${CONFIGFILEPATH} DEBUG=${DEBUG}

test-cli: ${CLI}
@${MAKE} -C test $@ QUIET=1 LEAKS=${LEAKS} CONFIGFILE=${CONFIGFILEPATH} DEBUG=${DEBUG} CLI=${CLI}

clean-all: clean clean-external clean-obj clean-lib

Expand Down
7 changes: 6 additions & 1 deletion app/cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,12 @@ int ZSV_CLI_MAIN(int argc, const char *argv[]) {
argv[2],
"--help"
};
return help_builtin->main(2, argv_tmp);
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
return fprintf(stderr, "Unexpected syntax!\n");
} else {
const char *ext_cmd = extension_cmd_from_arg(argv[2]);
if(ext_cmd) {
Expand Down
6 changes: 6 additions & 0 deletions app/test/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,12 @@ worldcitiespop_mil.csv:

test-count test-count-pull: test-% : test-1-% test-2-%

test-cli: ${CLI}
@${TEST_INIT}
@[ "${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}

test-1-count test-1-count-pull: test-1-% : ${BUILD_DIR}/bin/zsv_%${EXE} worldcitiespop_mil.csv
@${TEST_INIT}
@cat worldcitiespop_mil.csv | ${PREFIX} $< ${REDIRECT} ${TMP_DIR}/[email protected]
Expand Down