Skip to content

Commit

Permalink
rename a bunch of files
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.ic-s.nl/svn/dbmail/trunk/dbmail@2841 7b491191-dbf0-0310-aff6-d879d4d69008
  • Loading branch information
pjstevns committed Nov 17, 2007
1 parent ade6b23 commit 3543735
Showing 25 changed files with 84 additions and 75 deletions.
29 changes: 17 additions & 12 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -43,13 +43,13 @@ sbin_PROGRAMS = dbmail-smtp \
COMMON = dbmail-user.c \
dbmail-message.c \
dbmail-mailbox.c \
config.c \
debug.c \
dm_config.c \
dm_debug.c \
dm_list.c \
db.c \
acl.c \
misc.c \
pidfile.c \
dm_db.c \
dm_acl.c \
dm_misc.c \
dm_pidfile.c \
dm_md5.c \
dm_sha1.c \
dm_match.c \
@@ -59,17 +59,22 @@ COMMON = dbmail-user.c \
SERVER = server.c \
serverchild.c \
serverparent.c \
pool.c \
serverpool.c \
dm_cidr.c

DELIVER = pipe.c \
dsn.c \
DELIVER = dm_pipe.c \
dm_dsn.c \
sort.c

MODULES = dbmodule.c \
authmodule.c \
sortmodule.c

IMAPD = dm_quota.c \
dm_memblock.c \
imap4.c \
imapcommands.c \
dbmail-imapsession.c

AM_CFLAGS = @SIEVEINC@ @LDAPINC@

@@ -82,7 +87,7 @@ dbmail_smtp_LDADD = libdbmail.la
dbmail_pop3d_SOURCES = pop3.c pop3d.c
dbmail_pop3d_LDADD = libdbmail.la

dbmail_imapd_SOURCES = quota.c imap4.c imapcommands.c memblock.c imapd.c dbmail-imapsession.c
dbmail_imapd_SOURCES = $(IMAPD) imapd.c
dbmail_imapd_LDADD = libdbmail.la

dbmail_top_SOURCES = top.c
@@ -94,7 +99,7 @@ dbmail_util_LDADD = libdbmail.la
dbmail_users_SOURCES = user.c
dbmail_users_LDADD = libdbmail.la

dbmail_export_SOURCES = export.c memblock.c dbmail-imapsession.c
dbmail_export_SOURCES = export.c dm_memblock.c dbmail-imapsession.c
dbmail_export_LDADD = libdbmail.la

dbmail_lmtpd_SOURCES = lmtp.c lmtpd.c
@@ -191,7 +196,7 @@ check_dbmail_mailbox_SOURCES=check_dbmail_mailbox.c
check_dbmail_mailbox_LDADD=libdbmail.la @CHECK_LIBS@
check_dbmail_mailbox_INCLUDES=@CHECK_CFLAGS@

check_dbmail_imapd_SOURCES=quota.c imap4.c imapcommands.c memblock.c acl.c dbmail-imapsession.c check_dbmail_imapd.c
check_dbmail_imapd_SOURCES=$(IMAPD) check_dbmail_imapd.c
check_dbmail_imapd_LDADD=libdbmail.la @CHECK_LIBS@
check_dbmail_imapd_INCLUDES=@CHECK_CFLAGS@

14 changes: 14 additions & 0 deletions dbmail-imapsession.h
Original file line number Diff line number Diff line change
@@ -36,6 +36,20 @@ struct ImapSession {
gboolean error; // command result
};

/*
* cached raw message data
*/
typedef struct {
struct DbmailMessage *dmsg;
MEM *memdump;
MEM *tmpdump;
u64_t num;
u64_t dumpsize;
int file_dumped;
int msg_parsed;
} cache_t;


typedef struct {
gboolean silent;
int action;
37 changes: 0 additions & 37 deletions dbmail-message.h
Original file line number Diff line number Diff line change
@@ -42,43 +42,6 @@
*/



enum DBMAIL_MESSAGE_CLASS {
DBMAIL_MESSAGE,
DBMAIL_MESSAGE_PART
};

typedef enum DBMAIL_MESSAGE_FILTER_TYPES {
DBMAIL_MESSAGE_FILTER_FULL = 1,
DBMAIL_MESSAGE_FILTER_HEAD,
DBMAIL_MESSAGE_FILTER_BODY
} message_filter_t;

typedef enum DBMAIL_STREAM_TYPE {
DBMAIL_STREAM_PIPE = 1,
DBMAIL_STREAM_LMTP,
DBMAIL_STREAM_RAW
} dbmail_stream_t;

struct DbmailMessage {
u64_t id;
u64_t physid;
time_t internal_date;
int *internal_date_gmtoff;
GString *envelope_recipient;
enum DBMAIL_MESSAGE_CLASS klass;
GByteArray *raw;
GMimeObject *content;
GRelation *headers;
GHashTable *header_dict;
GTree *header_name;
GTree *header_value;
gchar *charset;
int part_key;
int part_depth;
int part_order;
};

/*
* initializers
*/
27 changes: 15 additions & 12 deletions dbmail.h.in
Original file line number Diff line number Diff line change
@@ -78,29 +78,31 @@
#include <ldap.h>
#endif

#include "dm_list.h"
#include "memblock.h"
#include "dbmailtypes.h"
#include "debug.h"
#include "dsn.h"
#include "acl.h"
#include "misc.h"
#include "pipe.h"
#include "db.h"
#include "auth.h"
#include "sort.h"
#include "dm_list.h"
#include "dm_memblock.h"
#include "dm_debug.h"
#include "dm_dsn.h"
#include "dm_acl.h"
#include "dm_misc.h"
#include "dm_pipe.h"
#include "imap4.h"
#include "imapcommands.h"
#include "server.h"
#include "serverchild.h"
#include "serverparent.h"
#include "pool.h"
#include "serverpool.h"
#include "pop3.h"
#include "quota.h"
#include "dm_quota.h"
#include "lmtp.h"

#include "dm_db.h"
#include "dbmodule.h"

#include "auth.h"
#include "authmodule.h"

#include "sort.h"
#include "sortmodule.h"

#include "dm_md5.h"
@@ -131,6 +133,7 @@
#include "dbmail-mailbox.h"
#include "dbmail-imapsession.h"


#define GETCONFIGVALUE(key, sect, var) \
config_get_value(key, sect, var); \
if (strlen(var) > 0) \
52 changes: 38 additions & 14 deletions dbmailtypes.h
Original file line number Diff line number Diff line change
@@ -156,6 +156,44 @@ typedef struct {
int (*ClientHandler) (clientinfo_t *);
} serverConfig_t;

/* dbmail-message */

enum DBMAIL_MESSAGE_CLASS {
DBMAIL_MESSAGE,
DBMAIL_MESSAGE_PART
};

typedef enum DBMAIL_MESSAGE_FILTER_TYPES {
DBMAIL_MESSAGE_FILTER_FULL = 1,
DBMAIL_MESSAGE_FILTER_HEAD,
DBMAIL_MESSAGE_FILTER_BODY
} message_filter_t;

typedef enum DBMAIL_STREAM_TYPE {
DBMAIL_STREAM_PIPE = 1,
DBMAIL_STREAM_LMTP,
DBMAIL_STREAM_RAW
} dbmail_stream_t;

struct DbmailMessage {
u64_t id;
u64_t physid;
time_t internal_date;
int *internal_date_gmtoff;
GString *envelope_recipient;
enum DBMAIL_MESSAGE_CLASS klass;
GByteArray *raw;
GMimeObject *content;
GRelation *headers;
GHashTable *header_dict;
GTree *header_name;
GTree *header_value;
gchar *charset;
int part_key;
int part_depth;
int part_order;
};



/**********************************************************************
@@ -386,20 +424,6 @@ typedef struct {
/************************************************************************
* simple cache mechanism
***********************************************************************/

/*
* cached raw message data
*/
typedef struct {
struct DbmailMessage *dmsg;
MEM *memdump;
MEM *tmpdump;
u64_t num;
u64_t dumpsize;
int file_dumped;
int msg_parsed;
} cache_t;

/*
* cached mailbox info
*/
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 3543735

Please sign in to comment.