Fixup pidfile and portspec according to state directory settings

git-svn-id: file:///svnroot/mailfromd/trunk@1411 7a8a7f39-df28-0410-adc6-e0d955640f24

1 files changed, 65 insertions, 26 deletions

diff --git a/src/main.c b/src/main.c
index 13b513bb..d5a2ff62 100644
--- a/src/main.c
+++ b/src/main.c
@@ -63,3 +63,4 @@ unsigned optimization_level = 1; /* Optimization level */
 int log_to_stderr;     /* Use stderr for logging */
-char *portspec = DEFAULT_SOCKET; /* Communication socket specification */
+char *portspec;        /* Communication socket specification.
+			  See init_names() */
 int force_remove;      /* Remove local communication socket if it already
@@ -71,4 +72,4 @@ unsigned long source_address = INADDR_ANY;  /* Source address for TCP
 char *syslog_tag;      /* Tag to mark syslog entries with. */
-char *mailfromd_state_dir;
-char *pidfile = DEFAULT_PIDFILE;
+char *mailfromd_state_dir;       /* see init_names() */ 
+char *pidfile;                   /* see init_names() */
 char *user = DEFAULT_USER;       /* Switch to this user privileges after 
@@ -1493,5 +1494,12 @@ get_db_name()
 void
-db_format_setup()
+init_names()
 {
 	mailfromd_state_dir = xstrdup(DEFAULT_STATE_DIR);
+	portspec = xstrdup(DEFAULT_SOCKET);
+	pidfile = xstrdup(DEFAULT_PIDFILE);
+}
+
+void
+db_format_setup()
+{
 	dns_cache_format = db_format_install(dns_cache_format);
@@ -1502,15 +1510,10 @@ db_format_setup()
 
-static int
-db_fixup_name_enumerator(void *sym, void *data)
+static char *
+state_dir_fixup(char *name)
 {
-	struct db_format *fmt = sym;
-	static size_t slen;
-
-	if (slen == 0)
-		slen = strlen(mailfromd_state_dir);
-	
-	if (fmt->dbname[0] != '/') {
-		size_t olen = strlen(fmt->dbname);
+	if (name[0] != '/') {
+		size_t slen = strlen(mailfromd_state_dir);
+		size_t olen = strlen(name);
 		size_t flen = slen + 1 + olen + 1;
-		char *p = xrealloc(fmt->dbname, flen);
+		char *p = xrealloc(name, flen);
 		memmove(p + slen + 1, p, olen + 1);
@@ -1518,4 +1521,14 @@ db_fixup_name_enumerator(void *sym, void *data)
 		p[slen] = '/';
-		fmt->dbname = p;
+		name = p;
 	}
+	return name;
+}
+
+static int
+db_fixup_name_enumerator(void *sym, void *data)
+{
+	struct db_format *fmt = sym;
+
+	fmt->dbname = state_dir_fixup(fmt->dbname);
+
 	return 0;
@@ -1524,3 +1537,26 @@ db_fixup_name_enumerator(void *sym, void *data)
 static void
-db_fixup_names()
+portspec_fixup()
+{
+	char *proto, *port, *path;
+	
+	if (gacopyz_parse_connection(portspec, &proto, &port, &path)
+	    != MI_SUCCESS)
+		return; /* No need to complain: it is left to gacopyz connect
+			   routines */
+
+	if ((!proto
+	     || strcmp(proto, "unix") == 0 || strcmp(proto, "local") == 0)
+	    && !port
+	    && path[0] != '/') {
+		portspec = state_dir_fixup(path);
+		path = NULL;
+	}
+
+	free(proto);
+	free(port);
+	free(path);
+}
+
+static void
+fixup_state_dir_names()
 {
@@ -1530,2 +1566,4 @@ db_fixup_names()
 	db_format_enumerate(db_fixup_name_enumerator, NULL);
+	pidfile = state_dir_fixup(pidfile);
+	portspec_fixup();
 }
@@ -1633,7 +1671,7 @@ mailfromd_show_defaults()
 	printf("version:             %s\n", VERSION);
-	printf("script file:         %s\n", DEFAULT_SCRIPT_FILE);
-	printf("user:                %s\n", DEFAULT_USER);
-	printf("statedir:            %s\n", DEFAULT_STATE_DIR);
-	printf("socket:              %s\n", DEFAULT_SOCKET);
-	printf("pidfile:             %s\n", DEFAULT_PIDFILE);
+	printf("script file:         %s\n", script_file);
+	printf("user:                %s\n", user);
+	printf("statedir:            %s\n", mailfromd_state_dir);
+	printf("socket:              %s\n", portspec);
+	printf("pidfile:             %s\n", pidfile);
 #ifdef USE_SYSLOG_ASYNC
@@ -1696,3 +1734,4 @@ main(int argc, char **argv)
 	log_setup(!stderr_closed_p());
-	
+
+	init_names();
 	init_string_space();
@@ -1702,4 +1741,4 @@ main(int argc, char **argv)
 	save_cmdline(argc, argv);
-	mu_argp_init (program_version, "<" PACKAGE_BUGREPORT ">");
-	mu_argp_parse (&argp, &argc, &argv, 0, capa, &index, NULL);
+	mu_argp_init(program_version, "<" PACKAGE_BUGREPORT ">");
+	mu_argp_parse(&argp, &argc, &argv, 0, capa, &index, NULL);
 
@@ -1739,3 +1778,3 @@ main(int argc, char **argv)
 	process_options();
-	db_fixup_names();
+	fixup_state_dir_names();