From a217e08a2d59d90bac3bf83d39de33d5221ef107 Mon Sep 17 00:00:00 2001 From: Dave West Date: Sat, 24 Oct 2009 15:35:16 +0000 Subject: [PATCH] Moved some files around into sub dirs to clean up the base dir a litle. --- citadel/Makefile.in | 146 ++++++++++++-------- citadel/{ => include}/citadel_dirs.h | 0 citadel/{ => include}/citadel_ipc.h | 0 citadel/{ => include}/commands.h | 0 citadel/ipc_c_tcp.c | 72 ---------- citadel/server_main.c | 2 +- citadel/{ => textclient}/citadel.c | 0 citadel/{ => textclient}/client_chat.c | 0 citadel/{ => textclient}/client_chat.h | 0 citadel/{ => textclient}/client_passwords.c | 0 citadel/{ => textclient}/client_passwords.h | 0 citadel/{ => textclient}/commands.c | 0 citadel/{ => textclient}/messages.c | 0 citadel/{ => textclient}/messages.h | 0 citadel/{ => textclient}/rooms.c | 0 citadel/{ => textclient}/rooms.h | 0 citadel/{ => textclient}/routines.c | 0 citadel/{ => textclient}/routines.h | 0 citadel/{ => textclient}/routines2.c | 0 citadel/{ => textclient}/routines2.h | 0 citadel/{ => textclient}/screen.c | 0 citadel/{ => textclient}/screen.h | 0 citadel/{ => textclient}/tuiconfig.c | 0 citadel/{ => textclient}/tuiconfig.h | 0 citadel/{ => utillib}/citadel_dirs.c | 0 citadel/{ => utillib}/citadel_ipc.c | 0 citadel/{ => utils}/aidepost.c | 0 citadel/{ => utils}/base64.c | 0 citadel/{ => utils}/chkpw.c | 0 citadel/{ => utils}/chkpwd.c | 0 citadel/{ => utils}/citmail.c | 0 citadel/{ => utils}/ctdlmigrate.c | 0 citadel/{ => utils}/getmail.c | 0 citadel/{ => utils}/msgform.c | 0 citadel/{ => utils}/sendcommand.c | 0 citadel/{ => utils}/setup.c | 0 citadel/{ => utils}/stress.c | 0 citadel/{ => utils}/userlist.c | 0 citadel/{ => utils}/whobbs.c | 0 39 files changed, 90 insertions(+), 130 deletions(-) rename citadel/{ => include}/citadel_dirs.h (100%) rename citadel/{ => include}/citadel_ipc.h (100%) rename citadel/{ => include}/commands.h (100%) delete mode 100644 citadel/ipc_c_tcp.c rename citadel/{ => textclient}/citadel.c (100%) rename citadel/{ => textclient}/client_chat.c (100%) rename citadel/{ => textclient}/client_chat.h (100%) rename citadel/{ => textclient}/client_passwords.c (100%) rename citadel/{ => textclient}/client_passwords.h (100%) rename citadel/{ => textclient}/commands.c (100%) rename citadel/{ => textclient}/messages.c (100%) rename citadel/{ => textclient}/messages.h (100%) rename citadel/{ => textclient}/rooms.c (100%) rename citadel/{ => textclient}/rooms.h (100%) rename citadel/{ => textclient}/routines.c (100%) rename citadel/{ => textclient}/routines.h (100%) rename citadel/{ => textclient}/routines2.c (100%) rename citadel/{ => textclient}/routines2.h (100%) rename citadel/{ => textclient}/screen.c (100%) rename citadel/{ => textclient}/screen.h (100%) rename citadel/{ => textclient}/tuiconfig.c (100%) rename citadel/{ => textclient}/tuiconfig.h (100%) rename citadel/{ => utillib}/citadel_dirs.c (100%) rename citadel/{ => utillib}/citadel_ipc.c (100%) rename citadel/{ => utils}/aidepost.c (100%) rename citadel/{ => utils}/base64.c (100%) rename citadel/{ => utils}/chkpw.c (100%) rename citadel/{ => utils}/chkpwd.c (100%) rename citadel/{ => utils}/citmail.c (100%) rename citadel/{ => utils}/ctdlmigrate.c (100%) rename citadel/{ => utils}/getmail.c (100%) rename citadel/{ => utils}/msgform.c (100%) rename citadel/{ => utils}/sendcommand.c (100%) rename citadel/{ => utils}/setup.c (100%) rename citadel/{ => utils}/stress.c (100%) rename citadel/{ => utils}/userlist.c (100%) rename citadel/{ => utils}/whobbs.c (100%) diff --git a/citadel/Makefile.in b/citadel/Makefile.in index 0d7c57fb8..4c9d7e6a7 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -72,18 +72,21 @@ YACC=@YACC@ # End configuration section -SOURCES=aidepost.c auth.c base64.c chkpwd.c chkpw.c citadel.c citadel_ipc.c \ - citmail.c citserver.c client_chat.c client_passwords.c \ - clientsocket.c commands.c config.c control.c $(DATABASE) \ +SOURCES=utils/aidepost.c utils/stress.c utils/whobbs.c utils/citmail.c \ + utils/setup.c utils/msgform.c utils/chkpw.c \ + utils/sendcommand.c utils/getmail.c utils/userlist.c \ + utils/ctdlmigrate.c utils/base64.c utils/chkpwd.c \ + utillib/citadel_ipc.c utillib/citadel_dirs.c utillib/ipc_c_tcp.c \ + textclient/client_chat.c textclient/client_passwords.c \ + textclient/commands.c textclient/messages.c textclient/rooms.c \ + textclient/routines.c textclient/routines2.c textclient/tuiconfig.c \ + textclient/citadel.c textclient/screen.c \ + citserver.c clientsocket.c config.c control.c $(DATABASE) \ domain.c serv_extensions.c file_ops.c genstamp.c getutline.c \ housekeeping.c ical_dezonify.c internet_addressing.c ecrash.c \ - ipc_c_tcp.c locate_host.c md5.c messages.c \ - msgbase.c msgform.c parsedate.c policy.c \ - room_ops.c rooms.c routines.c routines2.c tuiconfig.c euidindex.c \ - screen.c sendcommand.c getmail.c \ - server_main.c setup.c snprintf.c ldap.c \ - stress.c support.c sysdep.c user_ops.c userlist.c \ - whobbs.c journaling.c citadel_dirs.c threads.c ctdlmigrate.c + locate_host.c md5.c auth.c msgbase.c parsedate.c policy.c \ + room_ops.c euidindex.c server_main.c snprintf.c ldap.c \ + support.c sysdep.c user_ops.c journaling.c threads.c include Make_sources @@ -108,13 +111,19 @@ server: $(SERVER_TARGETS) $(SERV_MODULES) utils: $(UTIL_TARGETS) $(UTILBIN_TARGETS) -citadel$(EXEEXT): citadel.o citadel_ipc.o client_chat.o client_passwords.o \ - commands.o ipc_c_tcp.o md5.o messages.o rooms.o routines.o \ - routines2.o tuiconfig.o screen.o citadel_dirs.o ecrash.o $(LIBOBJS) - $(CC) citadel.o citadel_ipc.o client_chat.o client_passwords.o \ - commands.o ipc_c_tcp.o md5.o messages.o rooms.o routines.o \ - routines2.o tuiconfig.o screen.o citadel_dirs.o ecrash.o $(LIBOBJS) \ - $(LDFLAGS) -o citadel $(LIBS) +citadel$(EXEEXT): textclient/citadel.o utillib/citadel_ipc.o \ + textclient/client_chat.o textclient/client_passwords.o \ + textclient/commands.o utillib/ipc_c_tcp.o md5.o \ + textclient/messages.o textclient/rooms.o textclient/routines.o \ + textclient/routines2.o textclient/tuiconfig.o \ + textclient/screen.o utillib/citadel_dirs.o ecrash.o $(LIBOBJS) + $(CC) textclient/citadel.o utillib/citadel_ipc.o \ + textclient/client_chat.o textclient/client_passwords.o \ + textclient/commands.o utillib/ipc_c_tcp.o md5.o \ + textclient/messages.o textclient/rooms.o textclient/routines.o \ + textclient/routines2.o textclient/tuiconfig.o \ + textclient/screen.o utillib/citadel_dirs.o ecrash.o $(LIBOBJS) \ + $(LDFLAGS) -o citadel $(LIBS) .y.c: $(YACC) $(YFLAGS) $< @@ -131,7 +140,7 @@ Make_modules: modules_init.c modules_upgrade.c: modules_init.c -SERV_OBJS = server_main.o \ +SERV_OBJS = server_main.o utillib/citadel_dirs.o\ user_ops.o citserver.o sysdep.o serv_extensions.o \ $(DATABASE:.c=.o) domain.o \ control.o policy.o config.o support.o room_ops.o \ @@ -148,48 +157,65 @@ citserver$(EXEEXT): $(SERV_OBJS) .c.o: $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@ -aidepost$(EXEEXT): aidepost.o config.o - $(CC) aidepost.o config.o citadel_dirs.o $(LDFLAGS) -o aidepost$(EXEEXT) $(LIBS) +aidepost$(EXEEXT): utils/aidepost.o config.o + $(CC) utils/aidepost.o config.o utillib/citadel_dirs.o \ + $(LDFLAGS) -o aidepost$(EXEEXT) $(LIBS) -citmail$(EXEEXT): citmail.o citadel_dirs.o - $(CC) citmail.o citadel_dirs.o $(LDFLAGS) -o citmail$(EXEEXT) $(LIBS) +citmail$(EXEEXT): utils/citmail.o utillib/citadel_dirs.o + $(CC) utils/citmail.o utillib/citadel_dirs.o \ + $(LDFLAGS) -o citmail$(EXEEXT) $(LIBS) # setup does need LIBS defined, because it uses network functions which are in -lsocket -lnsl on Solaris. -setup$(EXEEXT): setup.o citadel_dirs.o - $(CC) setup.o citadel_dirs.o $(LDFLAGS) -o setup$(EXEEXT) $(LIBS) $(SETUP_LIBS) - -ctdlmigrate$(EXEEXT): ctdlmigrate.o citadel_dirs.o - $(CC) ctdlmigrate.o citadel_dirs.o $(LDFLAGS) -o ctdlmigrate$(EXEEXT) $(LIBS) - -chkpwd$(EXEEXT): chkpwd.o auth.o - $(CC) chkpwd.o auth.o $(LDFLAGS) -o chkpwd$(EXEEXT) $(chkpwd_LIBS) - -chkpw$(EXEEXT): chkpw.o auth.o citadel_dirs.o - $(CC) chkpw.o auth.o citadel_dirs.o $(LDFLAGS) -o chkpw$(EXEEXT) $(chkpwd_LIBS) - -whobbs$(EXEEXT): whobbs.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS) - $(CC) whobbs.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o whobbs$(EXEEXT) $(LIBS) - -stress$(EXEEXT): stress.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS) - $(CC) stress.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o stress$(EXEEXT) $(LIBS) - -sendcommand$(EXEEXT): sendcommand.o ipc_c_tcp.o citadel_ipc.o config.o $(LIBOBJS) - $(CC) sendcommand.o ipc_c_tcp.o citadel_ipc.o config.o \ - citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o sendcommand$(EXEEXT) $(LIBS) - -getmail$(EXEEXT): getmail.o ipc_c_tcp.o citadel_ipc.o config.o $(LIBOBJS) - $(CC) getmail.o ipc_c_tcp.o citadel_ipc.o config.o \ - citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o getmail$(EXEEXT) $(LIBS) - -base64$(EXEEXT): base64.o - $(CC) base64.o $(LDFLAGS) -o base64$(EXEEXT) - -userlist$(EXEEXT): userlist.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS) - $(CC) userlist.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o \ - $(LIBOBJS) $(LDFLAGS) -o userlist$(EXEEXT) $(LIBS) - -msgform$(EXEEXT): msgform.o - $(CC) msgform.o $(LDFLAGS) -o msgform$(EXEEXT) +setup$(EXEEXT): utils/setup.o utillib/citadel_dirs.o + $(CC) utils/setup.o utillib/citadel_dirs.o \ + $(LDFLAGS) -o setup$(EXEEXT) $(LIBS) $(SETUP_LIBS) + +ctdlmigrate$(EXEEXT): utils/ctdlmigrate.o utillib/citadel_dirs.o + $(CC) utils/ctdlmigrate.o utillib/citadel_dirs.o \ + $(LDFLAGS) -o ctdlmigrate$(EXEEXT) $(LIBS) + +chkpwd$(EXEEXT): utils/chkpwd.o auth.o + $(CC) utils/chkpwd.o auth.o $(LDFLAGS) -o chkpwd$(EXEEXT) $(chkpwd_LIBS) + +chkpw$(EXEEXT): utils/chkpw.o auth.o utillib/citadel_dirs.o + $(CC) utils/chkpw.o auth.o utillib/citadel_dirs.o \ + $(LDFLAGS) -o chkpw$(EXEEXT) $(chkpwd_LIBS) + +whobbs$(EXEEXT): utils/whobbs.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \ + utillib/citadel_dirs.o $(LIBOBJS) + $(CC) utils/whobbs.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \ + utillib/citadel_dirs.o $(LIBOBJS) \ + $(LDFLAGS) -o whobbs$(EXEEXT) $(LIBS) + +stress$(EXEEXT): utils/stress.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \ + utillib/citadel_dirs.o $(LIBOBJS) + $(CC) utils/stress.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \ + utillib/citadel_dirs.o $(LIBOBJS) \ + $(LDFLAGS) -o stress$(EXEEXT) $(LIBS) + +sendcommand$(EXEEXT): utils/sendcommand.o utillib/ipc_c_tcp.o \ + utillib/citadel_ipc.o config.o $(LIBOBJS) + $(CC) utils/sendcommand.o utillib/ipc_c_tcp.o \ + utillib/citadel_ipc.o config.o utillib/citadel_dirs.o \ + $(LIBOBJS) $(LDFLAGS) -o sendcommand$(EXEEXT) $(LIBS) + +getmail$(EXEEXT): utils/getmail.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \ + config.o $(LIBOBJS) + $(CC) utils/getmail.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \ + config.o utillib/citadel_dirs.o \ + $(LIBOBJS) $(LDFLAGS) -o getmail$(EXEEXT) $(LIBS) + +base64$(EXEEXT): utils/base64.o + $(CC) utils/base64.o $(LDFLAGS) -o base64$(EXEEXT) + +userlist$(EXEEXT): utils/userlist.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \ + utillib/citadel_dirs.o $(LIBOBJS) + $(CC) utils/userlist.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \ + utillib/citadel_dirs.o \ + $(LIBOBJS) $(LDFLAGS) -o userlist$(EXEEXT) $(LIBS) + +msgform$(EXEEXT): utils/msgform.o + $(CC) utils/msgform.o $(LDFLAGS) -o msgform$(EXEEXT) .PHONY: install-data install-doc install-exec clean cleaner distclean @@ -351,6 +377,9 @@ install-exec-new: all clean: rm -f *.o + rm -f utils/*.o ;\ + rm -f utillib/*.o ;\ + rm -f textclient/*.o ;\ for i in $(srcdir)/modules/* ; do \ rm -f $$i/*.o ;\ done @@ -369,6 +398,9 @@ cleaner: clean distclean: cleaner find . -name '*~' -o -name '.#*' | xargs rm -f rm -f Makefile sysdep.h config.cache config.log config.status *.d + rm -f utils/*.d ; + rm -f utillib/*.d ; + rm -f textclient/*.d ; for i in $(srcdir)/modules/* ; do \ rm -f $$i/*.d ;\ done diff --git a/citadel/citadel_dirs.h b/citadel/include/citadel_dirs.h similarity index 100% rename from citadel/citadel_dirs.h rename to citadel/include/citadel_dirs.h diff --git a/citadel/citadel_ipc.h b/citadel/include/citadel_ipc.h similarity index 100% rename from citadel/citadel_ipc.h rename to citadel/include/citadel_ipc.h diff --git a/citadel/commands.h b/citadel/include/commands.h similarity index 100% rename from citadel/commands.h rename to citadel/include/commands.h diff --git a/citadel/ipc_c_tcp.c b/citadel/ipc_c_tcp.c deleted file mode 100644 index 9958fd3d3..000000000 --- a/citadel/ipc_c_tcp.c +++ /dev/null @@ -1,72 +0,0 @@ -/* - * $Id$ - * - * Client-side IPC functions - * - */ - - -#include "sysdep.h" -#undef NDEBUG -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "citadel.h" -#include "citadel_ipc.h" -#include "citadel_decls.h" -#ifndef HAVE_SNPRINTF -#include "snprintf.h" -#endif -#include "commands.h" - -/* Note that some of these functions may not work with multiple instances. */ - -static void (*deathHook)(void) = NULL; -int (*error_printf)(char *s, ...) = (int (*)(char *, ...))printf; - -void setIPCDeathHook(void (*hook)(void)) { - deathHook = hook; -} - -void setIPCErrorPrintf(int (*func)(char *s, ...)) { - error_printf = func; -} - -void connection_died(CtdlIPC* ipc, int using_ssl) { - if (deathHook != NULL) { - deathHook(); - } - - stty_ctdl(SB_RESTORE); - fprintf(stderr, "\r\n\n\n"); - fprintf(stderr, "Your connection to %s is broken.\n", ipc->ServInfo.humannode); - -#ifdef HAVE_OPENSSL - if (using_ssl) { - fprintf(stderr, "Last error: %s\n", ERR_reason_error_string(ERR_get_error())); - SSL_free(ipc->ssl); - ipc->ssl = NULL; - } else -#endif - fprintf(stderr, "Last error: %s\n", strerror(errno)); - - fprintf(stderr, "Please re-connect and log in again.\n"); - fflush(stderr); - fflush(stdout); - shutdown(ipc->sock, 2); - ipc->sock = -1; - exit(1); -} diff --git a/citadel/server_main.c b/citadel/server_main.c index b3d110cd8..d57fdcf5f 100644 --- a/citadel/server_main.c +++ b/citadel/server_main.c @@ -55,7 +55,7 @@ #include "user_ops.h" #include "housekeeping.h" #include "svn_revision.h" -#include "citadel_dirs.c" +#include "citadel_dirs.h" #include "modules_init.h" #include "ecrash.h" diff --git a/citadel/citadel.c b/citadel/textclient/citadel.c similarity index 100% rename from citadel/citadel.c rename to citadel/textclient/citadel.c diff --git a/citadel/client_chat.c b/citadel/textclient/client_chat.c similarity index 100% rename from citadel/client_chat.c rename to citadel/textclient/client_chat.c diff --git a/citadel/client_chat.h b/citadel/textclient/client_chat.h similarity index 100% rename from citadel/client_chat.h rename to citadel/textclient/client_chat.h diff --git a/citadel/client_passwords.c b/citadel/textclient/client_passwords.c similarity index 100% rename from citadel/client_passwords.c rename to citadel/textclient/client_passwords.c diff --git a/citadel/client_passwords.h b/citadel/textclient/client_passwords.h similarity index 100% rename from citadel/client_passwords.h rename to citadel/textclient/client_passwords.h diff --git a/citadel/commands.c b/citadel/textclient/commands.c similarity index 100% rename from citadel/commands.c rename to citadel/textclient/commands.c diff --git a/citadel/messages.c b/citadel/textclient/messages.c similarity index 100% rename from citadel/messages.c rename to citadel/textclient/messages.c diff --git a/citadel/messages.h b/citadel/textclient/messages.h similarity index 100% rename from citadel/messages.h rename to citadel/textclient/messages.h diff --git a/citadel/rooms.c b/citadel/textclient/rooms.c similarity index 100% rename from citadel/rooms.c rename to citadel/textclient/rooms.c diff --git a/citadel/rooms.h b/citadel/textclient/rooms.h similarity index 100% rename from citadel/rooms.h rename to citadel/textclient/rooms.h diff --git a/citadel/routines.c b/citadel/textclient/routines.c similarity index 100% rename from citadel/routines.c rename to citadel/textclient/routines.c diff --git a/citadel/routines.h b/citadel/textclient/routines.h similarity index 100% rename from citadel/routines.h rename to citadel/textclient/routines.h diff --git a/citadel/routines2.c b/citadel/textclient/routines2.c similarity index 100% rename from citadel/routines2.c rename to citadel/textclient/routines2.c diff --git a/citadel/routines2.h b/citadel/textclient/routines2.h similarity index 100% rename from citadel/routines2.h rename to citadel/textclient/routines2.h diff --git a/citadel/screen.c b/citadel/textclient/screen.c similarity index 100% rename from citadel/screen.c rename to citadel/textclient/screen.c diff --git a/citadel/screen.h b/citadel/textclient/screen.h similarity index 100% rename from citadel/screen.h rename to citadel/textclient/screen.h diff --git a/citadel/tuiconfig.c b/citadel/textclient/tuiconfig.c similarity index 100% rename from citadel/tuiconfig.c rename to citadel/textclient/tuiconfig.c diff --git a/citadel/tuiconfig.h b/citadel/textclient/tuiconfig.h similarity index 100% rename from citadel/tuiconfig.h rename to citadel/textclient/tuiconfig.h diff --git a/citadel/citadel_dirs.c b/citadel/utillib/citadel_dirs.c similarity index 100% rename from citadel/citadel_dirs.c rename to citadel/utillib/citadel_dirs.c diff --git a/citadel/citadel_ipc.c b/citadel/utillib/citadel_ipc.c similarity index 100% rename from citadel/citadel_ipc.c rename to citadel/utillib/citadel_ipc.c diff --git a/citadel/aidepost.c b/citadel/utils/aidepost.c similarity index 100% rename from citadel/aidepost.c rename to citadel/utils/aidepost.c diff --git a/citadel/base64.c b/citadel/utils/base64.c similarity index 100% rename from citadel/base64.c rename to citadel/utils/base64.c diff --git a/citadel/chkpw.c b/citadel/utils/chkpw.c similarity index 100% rename from citadel/chkpw.c rename to citadel/utils/chkpw.c diff --git a/citadel/chkpwd.c b/citadel/utils/chkpwd.c similarity index 100% rename from citadel/chkpwd.c rename to citadel/utils/chkpwd.c diff --git a/citadel/citmail.c b/citadel/utils/citmail.c similarity index 100% rename from citadel/citmail.c rename to citadel/utils/citmail.c diff --git a/citadel/ctdlmigrate.c b/citadel/utils/ctdlmigrate.c similarity index 100% rename from citadel/ctdlmigrate.c rename to citadel/utils/ctdlmigrate.c diff --git a/citadel/getmail.c b/citadel/utils/getmail.c similarity index 100% rename from citadel/getmail.c rename to citadel/utils/getmail.c diff --git a/citadel/msgform.c b/citadel/utils/msgform.c similarity index 100% rename from citadel/msgform.c rename to citadel/utils/msgform.c diff --git a/citadel/sendcommand.c b/citadel/utils/sendcommand.c similarity index 100% rename from citadel/sendcommand.c rename to citadel/utils/sendcommand.c diff --git a/citadel/setup.c b/citadel/utils/setup.c similarity index 100% rename from citadel/setup.c rename to citadel/utils/setup.c diff --git a/citadel/stress.c b/citadel/utils/stress.c similarity index 100% rename from citadel/stress.c rename to citadel/utils/stress.c diff --git a/citadel/userlist.c b/citadel/utils/userlist.c similarity index 100% rename from citadel/userlist.c rename to citadel/utils/userlist.c diff --git a/citadel/whobbs.c b/citadel/utils/whobbs.c similarity index 100% rename from citadel/whobbs.c rename to citadel/utils/whobbs.c -- 2.30.2