Fix namespace (pm -> mf)

9 files changed, 86 insertions, 88 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index ee16f861..f1ccf972 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 sbin_PROGRAMS = mailfromd calloutd
-bin_PROGRAMS = pmtool
+bin_PROGRAMS = mfdbtool
 SUBDIRS = builtin
 incdir=$(pkgdatadir)/$(VERSION)/include
 inc_DATA = status.mf status.mfh
@@ -47,7 +47,7 @@ mailfromd_SOURCES = \
 mailfromd_LDADD = \
  ./libcallout.a\
  builtin/libbuiltin.a\
- ../lib/libpmdb.a\
+ ../lib/libmfdb.a\
  ../lib/libmf.a\
  ../lib/libdbm.a\
  ../gnu/libgnu.a\
@@ -69,18 +69,18 @@ calloutd_SOURCES = \
 
 calloutd_LDADD = \
  ./libcallout.a\
- ../lib/libpmdb.a\
+ ../lib/libmfdb.a\
  ../lib/libmf.a\
  ../lib/libdbm.a\
  ../gnu/libgnu.a\
  $(MAILUTILS_LIBS)\
  $(MILTER)
 
-pmtool_SOURCES = \
- pmtool.c
+mfdbtool_SOURCES = \
+ mfdbtool.c
 
-pmtool_LDADD = \
- ../lib/libpmdb.a\
+mfdbtool_LDADD = \
+ ../lib/libmfdb.a\
  ../lib/libmf.a\
  ../lib/libdbm.a\
  ../gnu/libgnu.a\
diff --git a/src/builtin/db.bi b/src/builtin/db.bi
index 376689bf..693e7a19 100644
--- a/src/builtin/db.bi
+++ b/src/builtin/db.bi
@@ -16,7 +16,7 @@
 
 #define DEFAULT_DB_MODE 0640
 #include <fnmatch.h>
-#include "mu_dbm.h"
+#include "mf-dbm.h"
 
 struct db_prop {                /* Database properties */
 	char *pat;              /* Database name pattern */
diff --git a/src/calloutd.c b/src/calloutd.c
index 959ad7c0..1b338b02 100644
--- a/src/calloutd.c
+++ b/src/calloutd.c
@@ -38,8 +38,8 @@
 #include "srvman.h"
 #include "srvcfg.h"
 #include "debug.h"
-#include "pmdb.h"
-#include "mu_dbm.h"
+#include "mfdb.h"
+#include "mf-dbm.h"
 
 void
 xalloc_die()
@@ -131,7 +131,7 @@ static struct argp argp = {
 
 
 int
-pm_server_function(const char *key, mfd_server_func_t *pret)
+mf_server_function(const char *key, mfd_server_func_t *pret)
 {
 	*pret = callout_session_server;
 	return 0;
@@ -159,7 +159,7 @@ main(int argc, char **argv)
 	database_cfg_init();
 	mu_acl_cfg_init();
 	srvman_init();
-	pm_srvcfg_init(NULL);
+	mf_srvcfg_init(NULL);
 
 	mu_argp_init(program_version, "<" PACKAGE_BUGREPORT ">");
 	mu_app_rcfile = SYSCONFDIR "/calloutd.conf";//FIXME
@@ -167,7 +167,7 @@ main(int argc, char **argv)
 			  0, NULL, NULL, NULL);
 	if (rc)
 		exit(EX_CONFIG);
-	pm_srvcfg_flush();
+	mf_srvcfg_flush();
 
 	mf_server_start("calloutd", mailfromd_state_dir, pidfile,
 			server_flags);
diff --git a/src/mailfromd.h b/src/mailfromd.h
index d3058c71..2dc0d143 100644
--- a/src/mailfromd.h
+++ b/src/mailfromd.h
@@ -28,7 +28,7 @@
 #include <obstack.h>
 
 #include "libmf.h"
-#include "pmdb.h"
+#include "mfdb.h"
 #include "bitmask.h"
 #include "filenames.h"
 
diff --git a/src/main.c b/src/main.c
index 32d91a56..ba36fd92 100644
--- a/src/main.c
+++ b/src/main.c
@@ -43,7 +43,7 @@
 #include "inttostr.h"
 #include "srvcfg.h"
 #include "filenames.h"
-#include "mu_dbm.h"
+#include "mf-dbm.h"
 #include "builtin.h"
 #include "prog.h"
 
@@ -304,9 +304,9 @@ option_relay(char *opt, void **pval, char *newval)
 	return 0;
 }
 
-struct pm_option_cache option_cache[] = {
-	{ "stack-trace", NULL, pm_option_boolean, set_stack_trace },
-	{ "milter-timeout", NULL, pm_option_time, set_milter_timeout },
+struct mf_option_cache option_cache[] = {
+	{ "stack-trace", NULL, mf_option_boolean, set_stack_trace },
+	{ "milter-timeout", NULL, mf_option_time, set_milter_timeout },
 	{ "relay", NULL, option_relay, set_relay },
 	{ NULL }
 };
@@ -548,7 +548,7 @@ parse_opt(int key, char *arg, struct argp_state *state)
 		break;
 		
 	case 'p':
-		pm_optcache_set_option("port", arg);
+		mf_optcache_set_option("port", arg);
 		break;
 		
 	case OPTION_RUN:
@@ -604,7 +604,7 @@ parse_opt(int key, char *arg, struct argp_state *state)
 		break;
 		
 	case OPTION_DOMAIN_FILE:
-		pm_optcache_set_option("relay", arg);
+		mf_optcache_set_option("relay", arg);
 		break;
 
 	case OPTION_DUMP_CODE:
@@ -649,7 +649,7 @@ parse_opt(int key, char *arg, struct argp_state *state)
 	}
 		
 	case OPTION_MILTER_TIMEOUT:
-		pm_optcache_set_option("milter-timeout", arg);
+		mf_optcache_set_option("milter-timeout", arg);
 		break;
 
 	case OPTION_MTASIM:
@@ -663,11 +663,11 @@ parse_opt(int key, char *arg, struct argp_state *state)
 		break;
 
 	case OPTION_STACK_TRACE:
-		pm_optcache_set_option("stack-trace", "yes");
+		mf_optcache_set_option("stack-trace", "yes");
 		break;
 
 	case OPTION_TIMEOUT:
-		pm_optcache_set_option("timeout", arg);
+		mf_optcache_set_option("timeout", arg);
 		break;
 
 	case OPTION_TRACE:
@@ -1144,7 +1144,7 @@ provide_default_milter_server()
 		mu_diag_output(MU_DIAG_WARNING,
 			       _("no servers defined; will listen on %s"),
 			       DEFAULT_SOCKET);
-		pm_srvcfg_add("milter", DEFAULT_SOCKET);
+		mf_srvcfg_add("milter", DEFAULT_SOCKET);
 	}
 }	
 
@@ -1163,7 +1163,7 @@ provide_default_callout_server()
 		val.v.literal = string_alloc(DEFAULT_CALLOUT_SOCKET,
 					     sizeof(DEFAULT_CALLOUT_SOCKET)-1);
 		ensure_initialized_variable("callout_server_url", &val); 
-		pm_srvcfg_add("callout", val.v.literal->text);
+		mf_srvcfg_add("callout", val.v.literal->text);
 	}
 }
 
@@ -1177,7 +1177,7 @@ static char *modnames[] = {
 
 
 int
-pm_server_function(const char *key, mfd_server_func_t *pret)
+mf_server_function(const char *key, mfd_server_func_t *pret)
 {
 	if (!key || strcmp(key, "default") == 0 || strcmp(key, "milter") == 0)
 		*pret = milter_session_server;
@@ -1222,13 +1222,13 @@ main(int argc, char **argv)
 	db_format_setup();
 	include_path_setup();
 	pragma_setup();
-	pm_optcache_add(option_cache, 0, PM_OCF_NULL|PM_OCF_STATIC);
+	mf_optcache_add(option_cache, 0, MF_OCF_NULL|MF_OCF_STATIC);
 	mf_server_save_cmdline(argc, argv);
 
 	mu_acl_cfg_init();
 	database_cfg_init();
 	srvman_init();
-	pm_srvcfg_init(N_("(milter | server)"));
+	mf_srvcfg_init(N_("(milter | server)"));
 	
 	mu_argp_init(program_version, "<" PACKAGE_BUGREPORT ">");
 	mu_app_rcfile = DEFAULT_CONFIG_FILE;
@@ -1282,7 +1282,7 @@ main(int argc, char **argv)
 		if (parse_program(script_file, script_ydebug))
 			exit(EX_CONFIG);
 	}
-	pm_srvcfg_flush();
+	mf_srvcfg_flush();
 
 	fixup_create_script();
 	
@@ -1342,8 +1342,8 @@ main(int argc, char **argv)
 	free_string_space();
 	free_parser_data();
 
-	pm_namefixup_run(mailfromd_state_dir);
-	pm_namefixup_free();
+	mf_namefixup_run(mailfromd_state_dir);
+	mf_namefixup_free();
 	
 	switch (mode) {
 	case MAILFROMD_DAEMON:
diff --git a/src/pmtool.c b/src/mfdbtool.c
index d0c250fd..b996d296 100644
--- a/src/pmtool.c
+++ b/src/mfdbtool.c
@@ -29,12 +29,10 @@
 #include <mailutils/daemon.h>
 
 #include "libmf.h"
-#include "pmdb.h"
-#include "mu_dbm.h"
+#include "mfdb.h"
+#include "mf-dbm.h"
 #include "debug.h"
 
-#define PMTOOL_SOURCE 0
-
 char *state_dir = DEFAULT_STATE_DIR;
 char *file_option;               /* File name for DB management commands */
 struct db_format *format_option;
@@ -100,7 +98,7 @@ convert_rate(const char *arg, double *rate)
                 
 
 void
-pmtool_delete(int argc, char **argv)
+mfdbtool_delete(int argc, char **argv)
 {
 	int i;
 	char *name = get_db_name();
@@ -110,7 +108,7 @@ pmtool_delete(int argc, char **argv)
 }
 
 void
-pmtool_list(int argc, char **argv)
+mfdbtool_list(int argc, char **argv)
 {
 	int rc;
 	char *name = get_db_name();
@@ -143,7 +141,7 @@ db_proc_enumerator(struct db_format *fmt, void *data)
 }
 
 void
-pmtool_expire(int argc, char **argv)
+mfdbtool_expire(int argc, char **argv)
 {
 	//priv_setup();FIXME
 	if (all_option) 
@@ -158,7 +156,7 @@ pmtool_expire(int argc, char **argv)
 }	
 
 void
-pmtool_compact(int argc, char **argv)
+mfdbtool_compact(int argc, char **argv)
 {
 	//priv_setup();FIXME
 	if (all_option) 
@@ -174,8 +172,8 @@ pmtool_compact(int argc, char **argv)
 
 
 
-const char *program_version = "pmtool (" PACKAGE_STRING ")";
-static char doc[] = N_("pmtool -- PostMACS database management tool");
+const char *program_version = "mfdbtool (" PACKAGE_STRING ")";
+static char doc[] = N_("mfdbtool -- Mailfromd database management tool");
 static char args_doc[] = "";
 
 enum {
@@ -256,17 +254,17 @@ parse_opt(int key, char *arg, struct argp_state *state)
 {
 	switch (key) {
 	case OPTION_STATE_DIRECTORY:
-		pm_optcache_set_option("state-directory", arg);
+		mf_optcache_set_option("state-directory", arg);
 		break;
 #if 0
 		/* FIXME */
 	case OPTION_LOCK_RETRY_COUNT:
-		pm_optcacheset_option("lock-retry-count", arg);
+		mf_optcacheset_option("lock-retry-count", arg);
 	case OPTION_LOCK_RETRY_TIMEOUT:
-		pm_optcacheset_option("lock-retry-timeout", arg);
+		mf_optcacheset_option("lock-retry-timeout", arg);
 #endif
 	case 'd':
-		pm_optcache_set_option("debug", arg);
+		mf_optcache_set_option("debug", arg);
 		break;
 		
 	case 'e': {
@@ -311,26 +309,26 @@ parse_opt(int key, char *arg, struct argp_state *state)
 		break;
 		
 	case OPTION_DELETE:
-		run = pmtool_delete;
+		run = mfdbtool_delete;
 		break;
 		
 	case OPTION_LIST:
-		run = pmtool_list;
+		run = mfdbtool_list;
 		break;
 		
 	case OPTION_EXPIRE:
-		run = pmtool_expire;
+		run = mfdbtool_expire;
 		break;
 		
 	case OPTION_COMPACT:
-		run = pmtool_compact;
+		run = mfdbtool_compact;
 		break;
 		
 	case ARGP_KEY_FINI:
 		if (!run)
 			argp_error(state, _("you must specify one of --list, --delete, --expire or --compat"));
 		if (all_option &&
-		    !(run == pmtool_compact || run == pmtool_expire))
+		    !(run == mfdbtool_compact || run == mfdbtool_expire))
 			argp_error(state,
 				   _("--all is meaningful only with "
 				     "--expire or --compact option"));
@@ -391,9 +389,9 @@ set_debug(void *value)
 	debug_parse_spec(value);
 }
 
-static struct pm_option_cache option_cache[] = {
-	{ "state-directory", NULL, pm_option_string, set_state_directory },
-	{ "debug", NULL, pm_option_string, set_debug },
+static struct mf_option_cache option_cache[] = {
+	{ "state-directory", NULL, mf_option_string, set_state_directory },
+	{ "debug", NULL, mf_option_string, set_debug },
 	{ NULL }
 };
 
@@ -416,7 +414,7 @@ static struct argp argp = {
 static void
 version(FILE *stream, struct argp_state *state)
 {
-	mailfromd_version("pmtool", stream);
+	mailfromd_version("mfdbtool", stream);
 }
 
 void
@@ -440,16 +438,16 @@ main(int argc, char **argv)
 	db_format_setup();
 	database_cfg_init();
 
-	pm_optcache_add(option_cache, 0, PM_OCF_NULL|PM_OCF_STATIC);
+	mf_optcache_add(option_cache, 0, MF_OCF_NULL|MF_OCF_STATIC);
 
 	mu_argp_init(program_version, "<" PACKAGE_BUGREPORT ">");
-	mu_app_rcfile = SYSCONFDIR "/pmtool.conf";//FIXME
+	mu_app_rcfile = SYSCONFDIR "/mfdbtool.conf";//FIXME
 	rc = mfd_app_init(&argp, capa, callout_cfg_param, argc, argv,
 			  0, &index, NULL, NULL);
 	if (rc)
 		exit(EX_CONFIG);
 
-	pm_optcache_flush();
+	mf_optcache_flush();
 
 	argv += index;
 	argc -= index;
diff --git a/src/savsrv.c b/src/savsrv.c
index 234f0b95..96850d66 100644
--- a/src/savsrv.c
+++ b/src/savsrv.c
@@ -35,8 +35,8 @@
 #include "libmf.h"
 #include "callout.h"
 #include "debug.h"
-#include "pmdb.h"
-#include "mu_dbm.h"
+#include "mfdb.h"
+#include "mf-dbm.h"
 #include "callout-dbgmod.h"
 
 char *ehlo_domain;
diff --git a/src/srvcfg.c b/src/srvcfg.c
index 2064c4a0..2a0951ca 100644
--- a/src/srvcfg.c
+++ b/src/srvcfg.c
@@ -72,7 +72,7 @@ time_t negative_expire_interval = DEFAULT_EXPIRE_INTERVAL/2;
                                  /* Expire negative cache entries after this
 				    number of seconds */
 
-extern int pm_server_function(const char *key, mfd_server_func_t *pret);
+extern int mf_server_function(const char *key, mfd_server_func_t *pret);
 
 
 static const char *
@@ -220,7 +220,7 @@ option_pidfile(char *opt, void **pval, char *newval)
 		mu_error(_("invalid pidfile name: must be absolute"));
 		return 1;
 	}
-	return pm_option_string(opt, pval, newval);
+	return mf_option_string(opt, pval, newval);
 }
 
 static void
@@ -280,7 +280,7 @@ option_state_directory(char *opt, void **pval, char *newval)
 }
 
 void
-pm_srvcfg_add(const char *type, const char *urlstr)
+mf_srvcfg_add(const char *type, const char *urlstr)
 {
 	mu_url_t url;
 	const char *id = next_server_id();
@@ -288,7 +288,7 @@ pm_srvcfg_add(const char *type, const char *urlstr)
 	mfd_server_func_t server;
 	
 	mu_diag_get_debug(&dbg);
-	if (pm_server_function(type, &server)) {
+	if (mf_server_function(type, &server)) {
 		mu_error(_("INTERNAL ERROR: no such server type: %s"), type);
 		exit(EX_SOFTWARE);
 	}
@@ -305,7 +305,7 @@ pm_srvcfg_add(const char *type, const char *urlstr)
 static void
 set_port(void *value)
 {
-	pm_srvcfg_add("default", value);
+	mf_srvcfg_add("default", value);
 }
 
 static int
@@ -345,18 +345,18 @@ set_source_ip(void *value)
 	source_address = *(unsigned long*)value;
 }
 
-static struct pm_option_cache srv_option_cache[] = {
-	{ "debug", NULL, pm_option_string, set_debug },
-	{ "source-info", NULL, pm_option_boolean, set_source_info },
-	{ "user", NULL, pm_option_string, set_user },
+static struct mf_option_cache srv_option_cache[] = {
+	{ "debug", NULL, mf_option_string, set_debug },
+	{ "source-info", NULL, mf_option_boolean, set_source_info },
+	{ "user", NULL, mf_option_string, set_user },
 	{ "group", NULL, option_group, NULL },
 	{ "pidfile", NULL, option_pidfile, set_pidfile },
 	{ "source-ip", NULL, option_source_ip, set_source_ip },
-	{ "io-timeout", NULL, pm_option_time, set_io_timeout },
-	{ "logger", NULL, pm_option_string, set_logger_option },
+	{ "io-timeout", NULL, mf_option_time, set_io_timeout },
+	{ "logger", NULL, mf_option_string, set_logger_option },
 	{ "state-directory", NULL, option_state_directory,
 	  set_state_directory },
-	{ "port", NULL, pm_option_string, set_port },
+	{ "port", NULL, mf_option_string, set_port },
 	{ NULL }
 };
 
@@ -448,7 +448,7 @@ server_section_parser(enum mu_cfg_section_stage stage,
 					      tree->debug))
 			return 1;
 		/* FIXME */
-		if (pm_server_function(node->label->v.string,
+		if (mf_server_function(node->label->v.string,
 				       &server_config_stmt.server)) {
 			mu_cfg_format_error (tree->debug,
 					     MU_DEBUG_ERROR,
@@ -715,7 +715,7 @@ srv_parse_opt(int key, char *arg, struct argp_state *state)
 {
 	switch (key) {
 	case 'd':
-		pm_optcache_set_option("debug", arg);
+		mf_optcache_set_option("debug", arg);
 		break;
 
 	case OPTION_LOG_TAG:
@@ -727,7 +727,7 @@ srv_parse_opt(int key, char *arg, struct argp_state *state)
 		break;
 
         case 'S':
-		pm_optcache_set_option("source-ip", arg);
+		mf_optcache_set_option("source-ip", arg);
 		break;
 		
 	case 's':
@@ -735,11 +735,11 @@ srv_parse_opt(int key, char *arg, struct argp_state *state)
 		break;
 
 	case 'u':
-		pm_optcache_set_option("user", arg);
+		mf_optcache_set_option("user", arg);
 		break;
 
 	case 'g':
-		pm_optcache_set_option("group", arg);
+		mf_optcache_set_option("group", arg);
 		break;
 
 	case 'X':
@@ -752,11 +752,11 @@ srv_parse_opt(int key, char *arg, struct argp_state *state)
 		break;
 
 	case OPTION_LOGGER:
-		pm_optcache_set_option("logger", arg);
+		mf_optcache_set_option("logger", arg);
 		break;
 		
 	case OPTION_PIDFILE:
-		pm_optcache_set_option("pidfile", arg);
+		mf_optcache_set_option("pidfile", arg);
 		break;
 
 	case OPTION_SINGLE_PROCESS:
@@ -764,11 +764,11 @@ srv_parse_opt(int key, char *arg, struct argp_state *state)
 		break;
 		
 	case OPTION_SOURCE_INFO:
-		pm_optcache_set_option("source-info", "yes");
+		mf_optcache_set_option("source-info", "yes");
 		break;
 		
 	case OPTION_STATE_DIRECTORY:
-		pm_optcache_set_option("state-directory", arg);
+		mf_optcache_set_option("state-directory", arg);
 		break;
 		
 	case OPTION_SYSLOG:
@@ -804,7 +804,7 @@ srvcfg_gocs_init(enum mu_gocs_op op, void *data)
 }
 
 void
-pm_srvcfg_init(const char *label)
+mf_srvcfg_init(const char *label)
 {
 	struct mu_cfg_section *section;
 
@@ -814,7 +814,7 @@ pm_srvcfg_init(const char *label)
 	mailfromd_state_dir = DEFAULT_STATE_DIR;
 	pidfile = DEFAULT_PIDFILE;
 
-	pm_optcache_add(srv_option_cache, 0, PM_OCF_NULL|PM_OCF_STATIC);
+	mf_optcache_add(srv_option_cache, 0, MF_OCF_NULL|MF_OCF_STATIC);
 	mu_gocs_register(".pm:server", srvcfg_gocs_init);
 	if (mu_register_argp_capa(".pm:server", &_srv_argp_child)) {
 		mu_error(_("INTERNAL ERROR: "
@@ -844,11 +844,11 @@ init_ehlo_domain()
 }
 
 void
-pm_srvcfg_flush()
+mf_srvcfg_flush()
 {
 	int i;
 		
-	pm_optcache_flush();
+	mf_optcache_flush();
 	
 	FD_ZERO(&srvman_param.keepfds);
 	logger_fdset(&srvman_param.keepfds);
diff --git a/src/srvcfg.h b/src/srvcfg.h
index 652c2a30..6873c765 100644
--- a/src/srvcfg.h
+++ b/src/srvcfg.h
@@ -14,10 +14,10 @@ extern size_t max_callout_mx;
 extern time_t smtp_timeout_soft[SMTP_NUM_TIMEOUT];
 extern time_t smtp_timeout_hard[SMTP_NUM_TIMEOUT];
 
-void pm_srvcfg_init(const char *label);
-void pm_srvcfg_add(const char *type, const char *urlstr);
-void pm_srvcfg_flush(void);
-/* int pm_server_function(const char *key, mfd_server_func_t *pret); */
+void mf_srvcfg_init(const char *label);
+void mf_srvcfg_add(const char *type, const char *urlstr);
+void mf_srvcfg_flush(void);
+/* int mf_server_function(const char *key, mfd_server_func_t *pret); */
 void mf_error_on_locus(mu_debug_t err, const char *fmt, ...)
 	MU_PRINTFLIKE(2,3);