From f87b70418237ae434e99fa797286e40389dc3bff Mon Sep 17 00:00:00 2001
From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Sat, 16 Sep 2006 09:06:45 +0000
Subject: [PATCH] Add -p param=value command line argument.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1001 d4fa192b-c00b-0410-8231-f00ffab90ce4
---
 varnish-cache/bin/varnishd/varnishd.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/varnish-cache/bin/varnishd/varnishd.c b/varnish-cache/bin/varnishd/varnishd.c
index 2923e5c5..707da128 100644
--- a/varnish-cache/bin/varnishd/varnishd.c
+++ b/varnish-cache/bin/varnishd/varnishd.c
@@ -145,6 +145,8 @@ usage(void)
 	    "  -h classic,<buckets>");
 	fprintf(stderr, "    %-28s # %s\n", "",
 	    "  -h classic,<buckets>,<buckets_per_mutex>");
+	fprintf(stderr, "    %-28s # %s\n", "-p param=value",
+	    "set parameter");
 	fprintf(stderr, "    %-28s # %s\n",
 	    "-s kind[,storageoptions]", "Backend storage specification");
 	fprintf(stderr, "    %-28s # %s\n", "",
@@ -334,12 +336,12 @@ main(int argc, char *argv[])
 {
 	int o;
 	unsigned d_flag = 0;
-	const char *a_arg = NULL;
 	const char *b_arg = NULL;
 	const char *f_arg = NULL;
 	const char *h_flag = "classic";
 	const char *s_arg = "file";
 	const char *T_arg = NULL;
+	char *p;
 	struct params param;
 	struct cli cli[1];
 
@@ -359,10 +361,11 @@ main(int argc, char *argv[])
 	MCF_ParamInit(cli);
 	cli_check(cli);
 
-	while ((o = getopt(argc, argv, "a:b:df:h:s:t:T:Vw:")) != -1)
+	while ((o = getopt(argc, argv, "a:b:df:h:p:s:t:T:Vw:")) != -1)
 		switch (o) {
 		case 'a':
-			a_arg = optarg;
+			MCF_ParamSet(cli, "listen_address", optarg);
+			cli_check(cli);
 			break;
 		case 'b':
 			b_arg = optarg;
@@ -376,6 +379,14 @@ main(int argc, char *argv[])
 		case 'h':
 			h_flag = optarg;
 			break;
+		case 'p':
+			p = strchr(optarg, '=');
+			if (p == NULL)
+				usage();
+			*p++ = '\0';
+			MCF_ParamSet(cli, optarg, p);
+			cli_check(cli);
+			break;
 		case 's':
 			s_arg = optarg;
 			break;
@@ -418,10 +429,6 @@ main(int argc, char *argv[])
 	setup_storage(s_arg);
 	setup_hash(h_flag);
 
-	if (a_arg != NULL)
-		MCF_ParamSet(cli, "listen_address", a_arg);
-	cli_check(cli);
-
 	VSL_MgtInit(SHMLOG_FILENAME, 8*1024*1024);
 
 	if (d_flag == 1)
-- 
2.39.5