From 84aa84fdd0a02f703c5e836f258e33f950c66355 Mon Sep 17 00:00:00 2001 From: Dave West Date: Tue, 31 Jul 2007 21:36:03 +0000 Subject: [PATCH] Continue phase 2 of modules stuff. Moved rest of serv_* into modules/* where it can be done without altering the contents of the file or the code modified Makefile.in to build them. --- citadel/Makefile.in | 99 ++++++++++++------- .../autocompletion}/serv_autocompletion.c | 0 .../autocompletion}/serv_autocompletion.h | 0 citadel/{ => modules/bio}/serv_bio.c | 0 .../{ => modules/calendar}/serv_calendar.c | 0 .../{ => modules/calendar}/serv_calendar.h | 0 citadel/{ => modules/chat}/serv_chat.c | 0 citadel/{ => modules/chat}/serv_chat.h | 0 citadel/{ => modules/crypto}/serv_crypto.c | 0 citadel/{ => modules/expire}/serv_expire.c | 0 .../{ => modules/fulltext}/ft_wordbreaker.c | 0 .../{ => modules/fulltext}/ft_wordbreaker.h | 0 .../{ => modules/fulltext}/serv_fulltext.c | 0 .../{ => modules/funambol}/serv_funambol.c | 0 .../{ => modules/funambol}/serv_funambol.h | 0 citadel/{ => modules/inetcfg}/serv_inetcfg.c | 0 citadel/{ => modules/ldap}/serv_ldap.c | 0 citadel/{ => modules/listsub}/serv_listsub.c | 0 .../managesieve}/serv_managesieve.c | 0 citadel/{ => modules/mrtg}/serv_mrtg.c | 0 .../{ => modules/netfilter}/serv_netfilter.c | 0 citadel/{ => modules/network}/serv_network.c | 0 citadel/{ => modules/newuser}/serv_newuser.c | 0 citadel/{ => modules/notes}/serv_notes.c | 0 citadel/{ => modules/pas2}/serv_pas2.c | 0 citadel/{ => modules/pop3}/serv_pop3.c | 0 citadel/{ => modules/pop3}/serv_pop3.h | 0 citadel/{ => modules/rwho}/serv_rwho.c | 0 citadel/{ => modules/sieve}/serv_sieve.c | 0 citadel/{ => modules/smtp}/serv_smtp.c | 0 citadel/{ => modules/spam}/serv_spam.c | 0 citadel/{ => modules/upgrade}/serv_upgrade.c | 0 citadel/{ => modules/upgrade}/serv_upgrade.h | 0 .../{ => modules/vandelay}/serv_vandelay.c | 0 citadel/{ => modules/vcard}/serv_vcard.c | 0 35 files changed, 63 insertions(+), 36 deletions(-) rename citadel/{ => modules/autocompletion}/serv_autocompletion.c (100%) rename citadel/{ => modules/autocompletion}/serv_autocompletion.h (100%) rename citadel/{ => modules/bio}/serv_bio.c (100%) rename citadel/{ => modules/calendar}/serv_calendar.c (100%) rename citadel/{ => modules/calendar}/serv_calendar.h (100%) rename citadel/{ => modules/chat}/serv_chat.c (100%) rename citadel/{ => modules/chat}/serv_chat.h (100%) rename citadel/{ => modules/crypto}/serv_crypto.c (100%) rename citadel/{ => modules/expire}/serv_expire.c (100%) rename citadel/{ => modules/fulltext}/ft_wordbreaker.c (100%) rename citadel/{ => modules/fulltext}/ft_wordbreaker.h (100%) rename citadel/{ => modules/fulltext}/serv_fulltext.c (100%) rename citadel/{ => modules/funambol}/serv_funambol.c (100%) rename citadel/{ => modules/funambol}/serv_funambol.h (100%) rename citadel/{ => modules/inetcfg}/serv_inetcfg.c (100%) rename citadel/{ => modules/ldap}/serv_ldap.c (100%) rename citadel/{ => modules/listsub}/serv_listsub.c (100%) rename citadel/{ => modules/managesieve}/serv_managesieve.c (100%) rename citadel/{ => modules/mrtg}/serv_mrtg.c (100%) rename citadel/{ => modules/netfilter}/serv_netfilter.c (100%) rename citadel/{ => modules/network}/serv_network.c (100%) rename citadel/{ => modules/newuser}/serv_newuser.c (100%) rename citadel/{ => modules/notes}/serv_notes.c (100%) rename citadel/{ => modules/pas2}/serv_pas2.c (100%) rename citadel/{ => modules/pop3}/serv_pop3.c (100%) rename citadel/{ => modules/pop3}/serv_pop3.h (100%) rename citadel/{ => modules/rwho}/serv_rwho.c (100%) rename citadel/{ => modules/sieve}/serv_sieve.c (100%) rename citadel/{ => modules/smtp}/serv_smtp.c (100%) rename citadel/{ => modules/spam}/serv_spam.c (100%) rename citadel/{ => modules/upgrade}/serv_upgrade.c (100%) rename citadel/{ => modules/upgrade}/serv_upgrade.h (100%) rename citadel/{ => modules/vandelay}/serv_vandelay.c (100%) rename citadel/{ => modules/vcard}/serv_vcard.c (100%) diff --git a/citadel/Makefile.in b/citadel/Makefile.in index 5d6837fc1..f2c63032e 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -28,13 +28,14 @@ EXEEXT=@EXEEXT@ CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) stress$(EXEEXT) SERVER_TARGETS=citserver -SERV_MODULES=serv_chat.o \ - serv_upgrade.o \ - serv_smtp.o \ - serv_spam.o \ - serv_pop3.o \ - serv_vcard.o vcard.o \ - serv_mrtg.o \ +SERV_MODULES=modules/chat/serv_chat.o \ + modules/upgrade/serv_upgrade.o \ + modules/smtp/serv_smtp.o \ + modules/spam/serv_spam.o \ + modules/pop3/serv_pop3.o \ + modules/vcard/serv_vcard.o \ + vcard.o \ + modules/mrtg/serv_mrtg.o \ serv_imap.o \ imap_fetch.o \ imap_misc.o \ @@ -44,27 +45,29 @@ SERV_MODULES=serv_chat.o \ imap_metadata.o \ imap_tools.o \ imap_list.o \ - serv_fulltext.o \ - ft_wordbreaker.o \ + modules/fulltext/serv_fulltext.o \ + modules/fulltext/ft_wordbreaker.o \ crc16.o \ - serv_network.o \ - serv_listsub.o \ - serv_netfilter.o \ - serv_newuser.o \ - serv_notes.o \ - serv_pas2.o md5.o \ - serv_inetcfg.o \ - serv_rwho.o \ - serv_bio.o \ - serv_expire.o \ - serv_vandelay.o \ - serv_calendar.o \ - serv_sieve.o \ - serv_managesieve.o \ + modules/network/serv_network.o \ + modules/listsub/serv_listsub.o \ + modules/netfilter/serv_netfilter.o \ + modules/newuser/serv_newuser.o \ + modules/notes/serv_notes.o \ + modules/pas2/serv_pas2.o \ + md5.o \ + modules/inetcfg/serv_inetcfg.o \ + modules/rwho/serv_rwho.o \ + modules/bio/serv_bio.o \ + modules/expire/serv_expire.o \ + modules/vandelay/serv_vandelay.o \ + modules/calendar/serv_calendar.o \ + modules/crypto/serv_crypto.o \ + modules/sieve/serv_sieve.o \ + modules/managesieve/serv_managesieve.o \ ical_dezonify.o \ - serv_ldap.o \ - serv_autocompletion.o \ - serv_funambol.o \ + modules/ldap/serv_ldap.o \ + modules/autocompletion/serv_autocompletion.o \ + modules/funambol/serv_funambol.o \ modules/test/serv_test.o UTIL_TARGETS=aidepost msgform \ @@ -106,18 +109,42 @@ SOURCES=aidepost.c auth.c base64.c chkpwd.c chkpw.c citadel.c citadel_ipc.c \ domain.c serv_extensions.c file_ops.c genstamp.c getutline.c \ housekeeping.c html.c ical_dezonify.c imap_fetch.c imap_misc.c \ imap_search.c imap_store.c imap_tools.c internet_addressing.c \ - ipc_c_tcp.c locate_host.c md5.c messages.c serv_autocompletion.c \ + ipc_c_tcp.c locate_host.c md5.c messages.c \ + modules/autocompletion/serv_autocompletion.c \ mime_parser.c msgbase.c msgform.c parsedate.c policy.c \ room_ops.c rooms.c routines.c routines2.c euidindex.c \ - screen.c sendcommand.c serv_bio.c serv_calendar.c serv_chat.c \ - serv_crypto.c serv_expire.c serv_imap.c serv_inetcfg.c \ - serv_listsub.c serv_mrtg.c serv_netfilter.c serv_network.c \ - serv_newuser.c serv_pas2.c serv_pop3.c serv_rwho.c serv_smtp.c \ - serv_spam.c serv_mrtg.c serv_spam.c serv_upgrade.c \ - serv_vandelay.c serv_vcard.c serv_managesieve.c server_main.c \ - serv_sieve.c serv_funambol.c setup.c snprintf.c imap_acl.c \ + screen.c sendcommand.c \ + modules/bio/serv_bio.c \ + modules/calendar/serv_calendar.c \ + modules/chat/serv_chat.c \ + modules/crypto/serv_crypto.c \ + modules/expire/serv_expire.c \ + serv_imap.c \ + modules/inetcfg/serv_inetcfg.c \ + modules/listsub/serv_listsub.c \ + modules/mrtg/serv_mrtg.c \ + modules/netfilter/serv_netfilter.c \ + modules/network/serv_network.c \ + modules/ldap/serv_ldap.c \ + modules/newuser/serv_newuser.c \ + modules/pas2/serv_pas2.c \ + modules/pop3/serv_pop3.c \ + modules/rwho/serv_rwho.c \ + modules/smtp/serv_smtp.c \ + modules/spam/serv_spam.c \ + modules/upgrade/serv_upgrade.c \ + modules/vandelay/serv_vandelay.c \ + modules/vcard/serv_vcard.c \ + modules/managesieve/serv_managesieve.c \ + server_main.c \ + modules/sieve/serv_sieve.c \ + modules/funambol/serv_funambol.c \ + setup.c snprintf.c imap_acl.c \ stress.c support.c sysdep.c tools.c user_ops.c userlist.c \ - whobbs.c vcard.c serv_notes.c serv_fulltext.c ft_wordbreaker.c \ + whobbs.c vcard.c \ + modules/notes/serv_notes.c \ + modules/fulltext/serv_fulltext.c \ + modules/fulltext/ft_wordbreaker.c \ crc16.c journaling.c citadel_dirs.c imap_list.c imap_metadata.c \ modules/test/serv_test.c @@ -156,7 +183,7 @@ SERV_OBJS = server_main.o \ file_ops.o msgbase.o euidindex.o \ locate_host.o housekeeping.o mime_parser.o html.o \ internet_addressing.o journaling.o \ - serv_crypto.o parsedate.o genstamp.o \ + parsedate.o genstamp.o \ clientsocket.o modules_init.o $(AUTH) $(SERV_MODULES) citserver: $(SERV_OBJS) diff --git a/citadel/serv_autocompletion.c b/citadel/modules/autocompletion/serv_autocompletion.c similarity index 100% rename from citadel/serv_autocompletion.c rename to citadel/modules/autocompletion/serv_autocompletion.c diff --git a/citadel/serv_autocompletion.h b/citadel/modules/autocompletion/serv_autocompletion.h similarity index 100% rename from citadel/serv_autocompletion.h rename to citadel/modules/autocompletion/serv_autocompletion.h diff --git a/citadel/serv_bio.c b/citadel/modules/bio/serv_bio.c similarity index 100% rename from citadel/serv_bio.c rename to citadel/modules/bio/serv_bio.c diff --git a/citadel/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c similarity index 100% rename from citadel/serv_calendar.c rename to citadel/modules/calendar/serv_calendar.c diff --git a/citadel/serv_calendar.h b/citadel/modules/calendar/serv_calendar.h similarity index 100% rename from citadel/serv_calendar.h rename to citadel/modules/calendar/serv_calendar.h diff --git a/citadel/serv_chat.c b/citadel/modules/chat/serv_chat.c similarity index 100% rename from citadel/serv_chat.c rename to citadel/modules/chat/serv_chat.c diff --git a/citadel/serv_chat.h b/citadel/modules/chat/serv_chat.h similarity index 100% rename from citadel/serv_chat.h rename to citadel/modules/chat/serv_chat.h diff --git a/citadel/serv_crypto.c b/citadel/modules/crypto/serv_crypto.c similarity index 100% rename from citadel/serv_crypto.c rename to citadel/modules/crypto/serv_crypto.c diff --git a/citadel/serv_expire.c b/citadel/modules/expire/serv_expire.c similarity index 100% rename from citadel/serv_expire.c rename to citadel/modules/expire/serv_expire.c diff --git a/citadel/ft_wordbreaker.c b/citadel/modules/fulltext/ft_wordbreaker.c similarity index 100% rename from citadel/ft_wordbreaker.c rename to citadel/modules/fulltext/ft_wordbreaker.c diff --git a/citadel/ft_wordbreaker.h b/citadel/modules/fulltext/ft_wordbreaker.h similarity index 100% rename from citadel/ft_wordbreaker.h rename to citadel/modules/fulltext/ft_wordbreaker.h diff --git a/citadel/serv_fulltext.c b/citadel/modules/fulltext/serv_fulltext.c similarity index 100% rename from citadel/serv_fulltext.c rename to citadel/modules/fulltext/serv_fulltext.c diff --git a/citadel/serv_funambol.c b/citadel/modules/funambol/serv_funambol.c similarity index 100% rename from citadel/serv_funambol.c rename to citadel/modules/funambol/serv_funambol.c diff --git a/citadel/serv_funambol.h b/citadel/modules/funambol/serv_funambol.h similarity index 100% rename from citadel/serv_funambol.h rename to citadel/modules/funambol/serv_funambol.h diff --git a/citadel/serv_inetcfg.c b/citadel/modules/inetcfg/serv_inetcfg.c similarity index 100% rename from citadel/serv_inetcfg.c rename to citadel/modules/inetcfg/serv_inetcfg.c diff --git a/citadel/serv_ldap.c b/citadel/modules/ldap/serv_ldap.c similarity index 100% rename from citadel/serv_ldap.c rename to citadel/modules/ldap/serv_ldap.c diff --git a/citadel/serv_listsub.c b/citadel/modules/listsub/serv_listsub.c similarity index 100% rename from citadel/serv_listsub.c rename to citadel/modules/listsub/serv_listsub.c diff --git a/citadel/serv_managesieve.c b/citadel/modules/managesieve/serv_managesieve.c similarity index 100% rename from citadel/serv_managesieve.c rename to citadel/modules/managesieve/serv_managesieve.c diff --git a/citadel/serv_mrtg.c b/citadel/modules/mrtg/serv_mrtg.c similarity index 100% rename from citadel/serv_mrtg.c rename to citadel/modules/mrtg/serv_mrtg.c diff --git a/citadel/serv_netfilter.c b/citadel/modules/netfilter/serv_netfilter.c similarity index 100% rename from citadel/serv_netfilter.c rename to citadel/modules/netfilter/serv_netfilter.c diff --git a/citadel/serv_network.c b/citadel/modules/network/serv_network.c similarity index 100% rename from citadel/serv_network.c rename to citadel/modules/network/serv_network.c diff --git a/citadel/serv_newuser.c b/citadel/modules/newuser/serv_newuser.c similarity index 100% rename from citadel/serv_newuser.c rename to citadel/modules/newuser/serv_newuser.c diff --git a/citadel/serv_notes.c b/citadel/modules/notes/serv_notes.c similarity index 100% rename from citadel/serv_notes.c rename to citadel/modules/notes/serv_notes.c diff --git a/citadel/serv_pas2.c b/citadel/modules/pas2/serv_pas2.c similarity index 100% rename from citadel/serv_pas2.c rename to citadel/modules/pas2/serv_pas2.c diff --git a/citadel/serv_pop3.c b/citadel/modules/pop3/serv_pop3.c similarity index 100% rename from citadel/serv_pop3.c rename to citadel/modules/pop3/serv_pop3.c diff --git a/citadel/serv_pop3.h b/citadel/modules/pop3/serv_pop3.h similarity index 100% rename from citadel/serv_pop3.h rename to citadel/modules/pop3/serv_pop3.h diff --git a/citadel/serv_rwho.c b/citadel/modules/rwho/serv_rwho.c similarity index 100% rename from citadel/serv_rwho.c rename to citadel/modules/rwho/serv_rwho.c diff --git a/citadel/serv_sieve.c b/citadel/modules/sieve/serv_sieve.c similarity index 100% rename from citadel/serv_sieve.c rename to citadel/modules/sieve/serv_sieve.c diff --git a/citadel/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c similarity index 100% rename from citadel/serv_smtp.c rename to citadel/modules/smtp/serv_smtp.c diff --git a/citadel/serv_spam.c b/citadel/modules/spam/serv_spam.c similarity index 100% rename from citadel/serv_spam.c rename to citadel/modules/spam/serv_spam.c diff --git a/citadel/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c similarity index 100% rename from citadel/serv_upgrade.c rename to citadel/modules/upgrade/serv_upgrade.c diff --git a/citadel/serv_upgrade.h b/citadel/modules/upgrade/serv_upgrade.h similarity index 100% rename from citadel/serv_upgrade.h rename to citadel/modules/upgrade/serv_upgrade.h diff --git a/citadel/serv_vandelay.c b/citadel/modules/vandelay/serv_vandelay.c similarity index 100% rename from citadel/serv_vandelay.c rename to citadel/modules/vandelay/serv_vandelay.c diff --git a/citadel/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c similarity index 100% rename from citadel/serv_vcard.c rename to citadel/modules/vcard/serv_vcard.c -- 2.30.2