Rename cli.h to vcli.h and allow it to export the varnishapi VCLI

convenience functions unless this is disabled with a #define.

bin/varnishadm/varnishadm.c

@@ -41,7 +41,7 @@
 #include <editline/readline.h>
 #endif
 
-#include "cli.h"
+#include "vcli.h"
 #include "cli_common.h"
 #include "libvarnish.h"
 #include "varnishapi.h"

bin/varnishd/cache_acceptor.c

@@ -41,7 +41,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include "cli.h"
+#include "vcli.h"
 #include "cli_priv.h"
 #include "cache.h"
 #include "cache_waiter.h"

bin/varnishd/cache_ban.c

@@ -51,7 +51,7 @@
 
 #include <pcre.h>
 
-#include "cli.h"
+#include "vcli.h"
 #include "vend.h"
 #include "cli_priv.h"
 #include "cache.h"

bin/varnishd/cache_cli.c

@@ -43,7 +43,7 @@
 #include <unistd.h>
 #include <poll.h>
 
-#include "cli.h"
+#include "vcli.h"
 #include "cli_priv.h"
 #include "cli_common.h"
 #include "cli_serve.h"

bin/varnishd/cache_vcl.c

@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <dlfcn.h>
 
-#include "cli.h"
+#include "vcli.h"
 #include "cli_priv.h"
 #include "vcl.h"
 #include "cache.h"

bin/varnishd/mgt_child.c

@@ -46,7 +46,7 @@
 #include "mgt.h"
 #include "vsm.h"
 #include "heritage.h"
-#include "cli.h"
+#include "vcli.h"
 #include "cli_priv.h"
 #include "mgt_cli.h"
 #include "vev.h"

bin/varnishd/mgt_cli.c

@@ -47,7 +47,7 @@
 #endif
 
 #include "cli_priv.h"
-#include "cli.h"
+#include "vcli.h"
 #include "vsb.h"
 #include "cli_common.h"
 #include "cli_serve.h"

bin/varnishd/mgt_param.c

@@ -40,7 +40,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "cli.h"
+#include "vcli.h"
 #include "cli_priv.h"
 #include "cli_common.h"
 #include "mgt.h"

bin/varnishd/mgt_vcc.c

@@ -44,7 +44,7 @@
 #include "vsb.h"
 
 #include "libvcl.h"
-#include "cli.h"
+#include "vcli.h"
 #include "cli_priv.h"
 #include "cli_common.h"
 

bin/varnishd/storage_persistent.c

@@ -48,7 +48,7 @@
 #include "stevedore.h"
 #include "hash_slinger.h"
 #include "vsha256.h"
-#include "cli.h"
+#include "vcli.h"
 #include "cli_priv.h"
 #include "vend.h"
 

bin/varnishd/varnishd.c

@@ -55,7 +55,7 @@
 #include "vpf.h"
 #include "vsha256.h"
 
-#include "cli.h"
+#include "vcli.h"
 #include "cli_priv.h"
 #include "cli_common.h"
 

bin/varnishtest/vtc_varnish.c

@@ -46,7 +46,7 @@
 #include "miniobj.h"
 #include "libvarnish.h"
 #include "varnishapi.h"
-#include "cli.h"
+#include "vcli.h"
 #include "cli_common.h"
 #include "vss.h"
 #include "vsb.h"

include/Makefile.am

@@ -3,6 +3,7 @@
 pkginclude_HEADERS = \
 	vsm.h \
 	vsl.h \
+	vcli.h \
 	vsl_tags.h \
 	vsc_fields.h \
 	vsc_all.h \
@@ -12,7 +13,6 @@ pkginclude_HEADERS = \
 nobase_noinst_HEADERS = \
 	ban_vars.h \
 	binary_heap.h \
-	cli.h \
 	cli_common.h \
 	cli_priv.h \
 	cli_serve.h \

include/cli_common.h

@@ -43,9 +43,3 @@ struct cli {
 	struct vlu		*vlu;
 	struct VCLS		*cls;
 };
-
-int VCLI_WriteResult(int fd, unsigned status, const char *result);
-int VCLI_ReadResult(int fd, unsigned *status, char **ptr, double tmo);
-
-void VCLI_AuthResponse(int S_fd, const char *challenge,
-    char reponse[CLI_AUTH_RESPONSE_LEN + 1]);

include/cli.h → include/vcli.h

@@ -208,3 +208,10 @@ enum VCLI_status_e {
 #define CLI_LINE0_LEN	13
 #define CLI_AUTH_RESPONSE_LEN		64	/* 64 hex + NUL */
 
+#if !defined(VCLI_PROTOCOL_ONLY)
+/* Convenience functions exported in libvarnishapi */
+int VCLI_WriteResult(int fd, unsigned status, const char *result);
+int VCLI_ReadResult(int fd, unsigned *status, char **ptr, double tmo);
+void VCLI_AuthResponse(int S_fd, const char *challenge,
+    char reponse[CLI_AUTH_RESPONSE_LEN + 1]);
+#endif

lib/libvarnish/cli_auth.c

@@ -32,8 +32,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "cli.h"
-#include "cli_common.h"
+#include "vcli.h"
 #include "libvarnish.h"
 #include "vsha256.h"
 

lib/libvarnish/cli_common.c

@@ -46,7 +46,7 @@
 
 #include "libvarnish.h"
 
-#include "cli.h"
+#include "vcli.h"
 #include "cli_priv.h"
 #include "cli_common.h"
 

lib/libvarnish/cli_serve.c

@@ -41,7 +41,7 @@
 #include <vqueue.h>
 #include <vsb.h>
 #include <vlu.h>
-#include <cli.h>
+#include <vcli.h>
 #include <cli_priv.h>
 #include <cli_common.h>
 #include <cli_serve.h>