r713 - in trunk/varnish-cache: bin/varnishd bin/varnishlog bin/varnishncsa bin/varnishstat bin/varnishtop include lib/libvarnish
des at projects.linpro.no
des at projects.linpro.no
Mon Aug 7 14:35:50 CEST 2006
Author: des
Date: 2006-08-07 14:35:50 +0200 (Mon, 07 Aug 2006)
New Revision: 713
Added:
trunk/varnish-cache/lib/libvarnish/version.c
Modified:
trunk/varnish-cache/bin/varnishd/varnishd.c
trunk/varnish-cache/bin/varnishlog/varnishlog.c
trunk/varnish-cache/bin/varnishncsa/Makefile.am
trunk/varnish-cache/bin/varnishncsa/varnishncsa.c
trunk/varnish-cache/bin/varnishstat/Makefile.am
trunk/varnish-cache/bin/varnishstat/varnishstat.c
trunk/varnish-cache/bin/varnishtop/varnishtop.c
trunk/varnish-cache/include/libvarnish.h
trunk/varnish-cache/lib/libvarnish/Makefile.am
Log:
Add a -V option (display version and exit) to all programs.
Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c 2006-08-07 11:09:30 UTC (rev 712)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c 2006-08-07 12:35:50 UTC (rev 713)
@@ -151,6 +151,7 @@
fprintf(stderr, " %-28s # %s\n", "",
" -s file,<dir_or_file>,<size>");
fprintf(stderr, " %-28s # %s\n", "-t", "Default TTL");
+ fprintf(stderr, " %-28s # %s\n", "-V", "version");
fprintf(stderr, " %-28s # %s\n", "-w int[,int[,int]]",
"Number of worker threads");
fprintf(stderr, " %-28s # %s\n", "",
@@ -335,7 +336,7 @@
heritage.wthread_timeout = 10;
heritage.mem_workspace = 4096;
- while ((o = getopt(argc, argv, "b:df:h:p:s:t:w:")) != -1)
+ while ((o = getopt(argc, argv, "b:df:h:p:s:t:Vw:")) != -1)
switch (o) {
case 'b':
bflag = optarg;
@@ -358,6 +359,9 @@
case 't':
heritage.default_ttl = strtoul(optarg, NULL, 0);
break;
+ case 'V':
+ varnish_version("varnishd");
+ exit(0);
case 'w':
tackle_warg(optarg);
break;
Modified: trunk/varnish-cache/bin/varnishlog/varnishlog.c
===================================================================
--- trunk/varnish-cache/bin/varnishlog/varnishlog.c 2006-08-07 11:09:30 UTC (rev 712)
+++ trunk/varnish-cache/bin/varnishlog/varnishlog.c 2006-08-07 12:35:50 UTC (rev 713)
@@ -184,10 +184,10 @@
/*--------------------------------------------------------------------*/
static void
-Usage(void)
+usage(void)
{
- fprintf(stderr, "Usage: varnishlog [-o] [-w file] [-r file]\n");
- exit(2);
+ fprintf(stderr, "usage: varnishlog [-oV] [-w file] [-r file]\n");
+ exit(1);
}
int
@@ -204,7 +204,7 @@
vd = VSL_New();
- while ((c = getopt(argc, argv, VSL_ARGS "how:")) != -1) {
+ while ((c = getopt(argc, argv, VSL_ARGS "hoVw:")) != -1) {
i = VSL_Arg(vd, c, optarg);
if (i < 0)
exit (1);
@@ -217,11 +217,14 @@
case 'o':
o_flag = 1;
break;
+ case 'V':
+ varnish_version("varnishlog");
+ exit(0);
case 'w':
w_opt = optarg;
break;
default:
- Usage();
+ usage();
}
}
@@ -229,7 +232,7 @@
exit (1);
if (o_flag && w_opt != NULL)
- Usage();
+ usage();
if (w_opt != NULL) {
if (!strcmp(w_opt, "-"))
Modified: trunk/varnish-cache/bin/varnishncsa/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishncsa/Makefile.am 2006-08-07 11:09:30 UTC (rev 712)
+++ trunk/varnish-cache/bin/varnishncsa/Makefile.am 2006-08-07 12:35:50 UTC (rev 713)
@@ -12,4 +12,5 @@
varnishncsa_LDADD = \
$(top_builddir)/lib/libvarnish/libvarnish.la \
+ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
$(top_builddir)/lib/libvarnishapi/libvarnishapi.la
Modified: trunk/varnish-cache/bin/varnishncsa/varnishncsa.c
===================================================================
--- trunk/varnish-cache/bin/varnishncsa/varnishncsa.c 2006-08-07 11:09:30 UTC (rev 712)
+++ trunk/varnish-cache/bin/varnishncsa/varnishncsa.c 2006-08-07 12:35:50 UTC (rev 713)
@@ -192,10 +192,10 @@
/*--------------------------------------------------------------------*/
static void
-Usage(void)
+usage(void)
{
- fprintf(stderr, "Usage: varnishlogfile [-w file] [-r file]\n");
- exit(2);
+ fprintf(stderr, "usage: varnishncsa [-V] [-w file] [-r file]\n");
+ exit(1);
}
int
@@ -217,11 +217,14 @@
if (i > 0)
continue;
switch (c) {
+ case 'V':
+ varnish_version("varnishncsa");
+ exit(0);
case 'w':
w_opt = optarg;
break;
default:
- Usage();
+ usage();
}
}
Modified: trunk/varnish-cache/bin/varnishstat/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishstat/Makefile.am 2006-08-07 11:09:30 UTC (rev 712)
+++ trunk/varnish-cache/bin/varnishstat/Makefile.am 2006-08-07 12:35:50 UTC (rev 713)
@@ -11,5 +11,6 @@
varnishstat_CFLAGS = -include config.h
varnishstat_LDADD = \
- -lcurses \
- $(top_builddir)/lib/libvarnishapi/libvarnishapi.la
+ $(top_builddir)/lib/libvarnish/libvarnish.la \
+ $(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
+ -lcurses
Modified: trunk/varnish-cache/bin/varnishstat/varnishstat.c
===================================================================
--- trunk/varnish-cache/bin/varnishstat/varnishstat.c 2006-08-07 11:09:30 UTC (rev 712)
+++ trunk/varnish-cache/bin/varnishstat/varnishstat.c 2006-08-07 12:35:50 UTC (rev 713)
@@ -95,6 +95,13 @@
}
}
+static void
+usage(void)
+{
+ fprintf(stderr, "usage: varnishstat [-cV]\n");
+ exit(1);
+}
+
int
main(int argc, char **argv)
{
@@ -104,14 +111,16 @@
VSL_stats = VSL_OpenStats();
- while ((c = getopt(argc, argv, "c")) != -1) {
+ while ((c = getopt(argc, argv, "cV")) != -1) {
switch (c) {
case 'c':
c_flag = 1;
break;
+ case 'V':
+ varnish_version("varnishstat");
+ exit(0);
default:
- fprintf(stderr, "Usage: varnishstat [-c]\n");
- exit (2);
+ usage();
}
}
Modified: trunk/varnish-cache/bin/varnishtop/varnishtop.c
===================================================================
--- trunk/varnish-cache/bin/varnishtop/varnishtop.c 2006-08-07 11:09:30 UTC (rev 712)
+++ trunk/varnish-cache/bin/varnishtop/varnishtop.c 2006-08-07 12:35:50 UTC (rev 713)
@@ -34,10 +34,10 @@
/*--------------------------------------------------------------------*/
static void
-Usage(void)
+usage(void)
{
- fprintf(stderr, "Usage: varnishtop\n");
- exit(2);
+ fprintf(stderr, "usage: varnishtop [-1V]\n");
+ exit(1);
}
static void
@@ -89,7 +89,7 @@
vd = VSL_New();
- while ((c = getopt(argc, argv, VSL_ARGS "1")) != -1) {
+ while ((c = getopt(argc, argv, VSL_ARGS "1V")) != -1) {
i = VSL_Arg(vd, c, optarg);
if (i < 0)
exit (1);
@@ -99,8 +99,11 @@
case '1':
one_flag = 1;
break;
+ case 'V':
+ varnish_version("varnishtop");
+ exit(0);
default:
- Usage();
+ usage();
}
}
Modified: trunk/varnish-cache/include/libvarnish.h
===================================================================
--- trunk/varnish-cache/include/libvarnish.h 2006-08-07 11:09:30 UTC (rev 712)
+++ trunk/varnish-cache/include/libvarnish.h 2006-08-07 12:35:50 UTC (rev 713)
@@ -12,5 +12,8 @@
time_t TIM_parse(const char *p);
#endif
+/* from libvarnish/version.c */
+void varnish_version(const char *);
+
/* Assert zero return value */
#define AZ(foo) do { assert((foo) == 0); } while (0)
Modified: trunk/varnish-cache/lib/libvarnish/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libvarnish/Makefile.am 2006-08-07 11:09:30 UTC (rev 712)
+++ trunk/varnish-cache/lib/libvarnish/Makefile.am 2006-08-07 12:35:50 UTC (rev 713)
@@ -10,6 +10,7 @@
cli.c \
cli_common.c \
time.c \
+ version.c \
vsb.c
libvarnish_la_CFLAGS = -include config.h
Added: trunk/varnish-cache/lib/libvarnish/version.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/version.c 2006-08-07 11:09:30 UTC (rev 712)
+++ trunk/varnish-cache/lib/libvarnish/version.c 2006-08-07 12:35:50 UTC (rev 713)
@@ -0,0 +1,17 @@
+/*
+ * $Id$
+ *
+ * Display a standardized version message.
+ */
+
+#include <stdio.h>
+
+#include "libvarnish.h"
+
+void
+varnish_version(const char *progname)
+{
+ fprintf(stderr, "%s (%s-%s)\n", progname,
+ PACKAGE_TARNAME, PACKAGE_VERSION);
+ fprintf(stderr, "Copyright (c) 2006 Linpro AS / Verdens Gang AS\n");
+}
Property changes on: trunk/varnish-cache/lib/libvarnish/version.c
___________________________________________________________________
Name: svn:keywords
+ Id
More information about the varnish-commit
mailing list