From 501216f5a2e959d948fd7009209ba4927c0d6b6c Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Thu, 30 Oct 2008 23:41:22 +0100
Subject: [PATCH] Removed now obsolete namespaces.c/h from testsuite and
commandline tools.
---
src/sieve-bin/Makefile.am | 6 ++----
src/sieve-bin/namespaces.c | 35 -------------------------------
src/sieve-bin/namespaces.h | 7 -------
src/sieve-bin/sieve-exec.c | 15 ++++++++-----
src/sieve-bin/sieve-test.c | 13 +++++++++---
src/testsuite/Makefile.am | 4 +---
src/testsuite/namespaces.c | 35 -------------------------------
src/testsuite/namespaces.h | 12 -----------
src/testsuite/testsuite-common.c | 2 +-
src/testsuite/testsuite-objects.c | 2 --
src/testsuite/testsuite.c | 23 +++++++++++++++++---
11 files changed, 44 insertions(+), 110 deletions(-)
delete mode 100644 src/sieve-bin/namespaces.c
delete mode 100644 src/sieve-bin/namespaces.h
delete mode 100644 src/testsuite/namespaces.c
delete mode 100644 src/testsuite/namespaces.h
diff --git a/src/sieve-bin/Makefile.am b/src/sieve-bin/Makefile.am
index dd6882f20..650c4a825 100644
--- a/src/sieve-bin/Makefile.am
+++ b/src/sieve-bin/Makefile.am
@@ -47,8 +47,7 @@ sieve_test_DEPENDENCIES = $(libs)
sieve_exec_DEPENDENCIES = $(libs)
common_sources = \
- bin-common.c \
- namespaces.c
+ bin-common.c
sievec_SOURCES = \
$(common_sources) \
@@ -67,5 +66,4 @@ sieve_exec_SOURCES = \
sieve-exec.c
noinst_HEADERS = \
- bin-common.h \
- namespaces.h
+ bin-common.h
diff --git a/src/sieve-bin/namespaces.c b/src/sieve-bin/namespaces.c
deleted file mode 100644
index 996741282..000000000
--- a/src/sieve-bin/namespaces.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
- */
-
-#include "lib.h"
-#include "istream.h"
-#include "istream-seekable.h"
-#include "fd-set-nonblock.h"
-#include "str.h"
-#include "str-sanitize.h"
-#include "strescape.h"
-#include "message-address.h"
-#include "mail-storage.h"
-
-#include "namespaces.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <pwd.h>
-
-#define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON"
-
-void namespaces_init(void)
-{
- mail_storage_init();
- mail_storage_register_all();
- mailbox_list_register_all();
-}
-
-void namespaces_deinit(void)
-{
- mail_storage_deinit();
-}
-
diff --git a/src/sieve-bin/namespaces.h b/src/sieve-bin/namespaces.h
deleted file mode 100644
index 572127f20..000000000
--- a/src/sieve-bin/namespaces.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __NAMESPACES_H
-#define __NAMESPACES_H
-
-void namespaces_init(void);
-void namespaces_deinit(void);
-
-#endif /* __NAMESPACES_H */
diff --git a/src/sieve-bin/sieve-exec.c b/src/sieve-bin/sieve-exec.c
index d5be0901c..18c554754 100644
--- a/src/sieve-bin/sieve-exec.c
+++ b/src/sieve-bin/sieve-exec.c
@@ -9,7 +9,6 @@
#include "bin-common.h"
#include "mail-raw.h"
-#include "namespaces.h"
#include "sieve.h"
#include "sieve-binary.h"
@@ -160,7 +159,10 @@ int main(int argc, char **argv)
user = bin_get_user();
home = getenv("HOME");
- namespaces_init();
+ /* Initialize mail storages */
+ mail_storage_init();
+ mail_storage_register_all();
+ mailbox_list_register_all();
/* Obtain mail namespaces from -l argument */
if ( mailloc != NULL ) {
@@ -177,7 +179,7 @@ int main(int argc, char **argv)
ns = mail_user->namespaces;
}
- /* Open text file as mail message */
+ /* Initialize raw mail object from file */
mail_raw_init(user);
mailr = mail_raw_open_file(mailfile);
@@ -228,14 +230,17 @@ int main(int argc, char **argv)
sieve_close(&sbin);
sieve_error_handler_unref(&ehandler);
-
+
+ /* De-initialize raw mail object */
mail_raw_close(mailr);
mail_raw_deinit();
+ /* De-initialize mail user object */
if ( mail_user != NULL )
mail_user_deinit(&mail_user);
- namespaces_deinit();
+ /* De-intialize mail storages */
+ mail_storage_deinit();
bin_deinit();
return 0;
diff --git a/src/sieve-bin/sieve-test.c b/src/sieve-bin/sieve-test.c
index 146bb1a7f..4c952f571 100644
--- a/src/sieve-bin/sieve-test.c
+++ b/src/sieve-bin/sieve-test.c
@@ -7,7 +7,6 @@
#include "bin-common.h"
#include "mail-raw.h"
-#include "namespaces.h"
#include "sieve.h"
#include "sieve-binary.h"
@@ -133,7 +132,12 @@ int main(int argc, char **argv)
user = bin_get_user();
- namespaces_init();
+ /* Initialize mail storages */
+ mail_storage_init();
+ mail_storage_register_all();
+ mailbox_list_register_all();
+
+ /* Initialize raw mail object */
mail_raw_init(user);
mailr = mail_raw_open_file(mailfile);
@@ -177,9 +181,12 @@ int main(int argc, char **argv)
sieve_close(&sbin);
sieve_error_handler_unref(&ehandler);
+ /* De-initialize raw mail object */
mail_raw_close(mailr);
mail_raw_deinit();
- namespaces_deinit();
+
+ /* De-initialize mail storages */
+ mail_storage_deinit();
bin_deinit();
return 0;
diff --git a/src/testsuite/Makefile.am b/src/testsuite/Makefile.am
index 8634fdba6..b20e4dfbd 100644
--- a/src/testsuite/Makefile.am
+++ b/src/testsuite/Makefile.am
@@ -45,7 +45,6 @@ tests = \
tst-test-result.c
testsuite_SOURCES = \
- namespaces.c \
testsuite-common.c \
testsuite-objects.c \
testsuite-result.c \
@@ -57,6 +56,5 @@ testsuite_SOURCES = \
noinst_HEADERS = \
testsuite-common.h \
testsuite-objects.h \
- testsuite-result.h \
- namespaces.h
+ testsuite-result.h
diff --git a/src/testsuite/namespaces.c b/src/testsuite/namespaces.c
deleted file mode 100644
index 996741282..000000000
--- a/src/testsuite/namespaces.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
- */
-
-#include "lib.h"
-#include "istream.h"
-#include "istream-seekable.h"
-#include "fd-set-nonblock.h"
-#include "str.h"
-#include "str-sanitize.h"
-#include "strescape.h"
-#include "message-address.h"
-#include "mail-storage.h"
-
-#include "namespaces.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <pwd.h>
-
-#define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON"
-
-void namespaces_init(void)
-{
- mail_storage_init();
- mail_storage_register_all();
- mailbox_list_register_all();
-}
-
-void namespaces_deinit(void)
-{
- mail_storage_deinit();
-}
-
diff --git a/src/testsuite/namespaces.h b/src/testsuite/namespaces.h
deleted file mode 100644
index c89016712..000000000
--- a/src/testsuite/namespaces.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Copyright (c) 2002-2008 Dovecot Sieve authors, see the included COPYING file
- */
-
-/* FIXME: Duplicated */
-
-#ifndef __NAMESPACES_H
-#define __NAMESPACES_H
-
-void namespaces_init(void);
-void namespaces_deinit(void);
-
-#endif /* __NAMESPACES_H */
diff --git a/src/testsuite/testsuite-common.c b/src/testsuite/testsuite-common.c
index d0cd43452..c349ebce9 100644
--- a/src/testsuite/testsuite-common.c
+++ b/src/testsuite/testsuite-common.c
@@ -10,7 +10,7 @@
#include "env-util.h"
#include "mail-raw.h"
-#include "namespaces.h"
+
#include "sieve.h"
#include "sieve-error-private.h"
#include "sieve-code.h"
diff --git a/src/testsuite/testsuite-objects.c b/src/testsuite/testsuite-objects.c
index 3371c8815..c26c6fd2f 100644
--- a/src/testsuite/testsuite-objects.c
+++ b/src/testsuite/testsuite-objects.c
@@ -7,8 +7,6 @@
#include "hash.h"
#include "mail-storage.h"
-#include "mail-raw.h"
-#include "namespaces.h"
#include "sieve.h"
#include "sieve-code.h"
#include "sieve-commands.h"
diff --git a/src/testsuite/testsuite.c b/src/testsuite/testsuite.c
index f31d2de07..b4e951d47 100644
--- a/src/testsuite/testsuite.c
+++ b/src/testsuite/testsuite.c
@@ -10,7 +10,6 @@
#include "env-util.h"
#include "mail-raw.h"
-#include "namespaces.h"
#include "sieve.h"
#include "sieve-extensions.h"
@@ -48,6 +47,10 @@ static void sig_die(int signo, void *context ATTR_UNUSED)
exit(1);
}
+/*
+ * Testsuite initialization
+ */
+
static void testsuite_bin_init(void)
{
lib_init();
@@ -79,6 +82,10 @@ static void testsuite_bin_deinit(void)
lib_deinit();
}
+/*
+ * Testsuite execution
+ */
+
static const char *_get_user(void)
{
uid_t process_euid = geteuid();
@@ -194,6 +201,7 @@ int main(int argc, char **argv)
struct sieve_script_env scriptenv;
bool trace = FALSE;
+ /* Initialize testsuite */
testsuite_bin_init();
/* Parse arguments */
@@ -242,7 +250,12 @@ int main(int argc, char **argv)
/* Dump script */
_dump_sieve_binary_to(sbin, dumpfile);
- namespaces_init();
+ /* Initialize mail storages */
+ mail_storage_init();
+ mail_storage_register_all();
+ mailbox_list_register_all();
+
+ /* Initialize message environment */
user = _get_user();
testsuite_message_init(user);
@@ -269,9 +282,13 @@ int main(int argc, char **argv)
sieve_close(&sbin);
+ /* De-initialize message environment */
testsuite_message_deinit();
- namespaces_deinit();
+ /* De-initialize mail storages */
+ mail_storage_deinit();
+
+ /* De-initialize testsuite */
testsuite_bin_deinit();
return testsuite_testcase_result();
--
GitLab