diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eaedda2b..b1216be4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,29 @@ jobs: run: (cd util; make) - name: install example run: (cd example; sudo make install) + - name: install utils + run: (cd util; sudo make install) + native-build-fcgi: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + # 1) checkout and compile natively (no test) + - name: install cligen + run: (git clone https://github.com/clicon/cligen.git && cd cligen && ./configure && make && sudo make install) + - name: install dependencies + run: sudo apt install -y libssl-dev libnghttp2-dev + - name: configure + run: ./configure --with-restconf=fcgi + - name: make + run: make -j10 + - name: make install + run: sudo make install install-include + - name: make example + run: (cd example; make) + - name: make utils + run: (cd util; make) + - name: install example + run: (cd example; sudo make install) - name: install utils run: (cd util; sudo make install) docker-run: diff --git a/apps/cli/cli_show.c b/apps/cli/cli_show.c index 89e19df5..98a08572 100644 --- a/apps/cli/cli_show.c +++ b/apps/cli/cli_show.c @@ -182,7 +182,6 @@ xpath_append(cbuf *cb0, * [] Optional YANG path-arg/xpath from mount-point * @param[out] commands vector of function pointers to callback functions * @param[out] helptxt vector of pointers to helptexts - * @see cli_expand_var_generate This is where arg is generated * @see cli_expand_var_generate where api_path_fmt + mt-point are generated */ int @@ -407,7 +406,7 @@ expand_dbvar(void *h, } ok: retval = 0; - done: + done: if (nsc0) cvec_free(nsc0); if (api_path_fmt_cb) diff --git a/apps/restconf/restconf_main_fcgi.c b/apps/restconf/restconf_main_fcgi.c index 7d37934c..454e187a 100644 --- a/apps/restconf/restconf_main_fcgi.c +++ b/apps/restconf/restconf_main_fcgi.c @@ -314,7 +314,7 @@ main(int argc, char *wwwuser; char *inline_config = NULL; size_t sz; - int config_dump; + int config_dump = 0; enum format_enum config_dump_format = FORMAT_XML; /* In the startup, logs to stderr & debug flag set later */ diff --git a/apps/restconf/restconf_stream_fcgi.c b/apps/restconf/restconf_stream_fcgi.c index 4462083c..d46ceadc 100644 --- a/apps/restconf/restconf_stream_fcgi.c +++ b/apps/restconf/restconf_stream_fcgi.c @@ -213,7 +213,7 @@ restconf_stream_cb(int s, clicon_debug(1, "%s", __FUNCTION__); /* get msg (this is the reason this function is called) */ - if (clicon_msg_rcv(s, 0, &reply, &eof) < 0){ + if (clicon_msg_rcv(s, NULL, 0, &reply, &eof) < 0){ clicon_debug(1, "%s msg_rcv error", __FUNCTION__); goto done; } diff --git a/lib/src/clixon_json_parse.l b/lib/src/clixon_json_parse.l index 34e5cf74..f691b450 100644 --- a/lib/src/clixon_json_parse.l +++ b/lib/src/clixon_json_parse.l @@ -128,7 +128,7 @@ hex [A-Fa-f0-9] BEGIN(STRING); if (clixon_unicode2utf8(yytext, buf, 5) < 0) return -1; - strncpy(yytext, buf, 4); + strncpy(yytext, buf, 5); clixon_json_parselval.string = yytext; return J_STRING; }