From: mmj <none@none>
Date: Thu, 13 Jan 2005 18:40:31 +0000 (+1100)
Subject: Now it at least compiles
X-Git-Tag: RELEASE_1_2_0~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c50a3eb7e62d9b0a096bcb0c19afe74de04e57e2;p=thirdparty%2Fmlmmj.git

Now it at least compiles
---

diff --git a/include/log_oper.h b/include/log_oper.h
index e99289a2..06778de9 100644
--- a/include/log_oper.h
+++ b/include/log_oper.h
@@ -24,6 +24,6 @@
 #ifndef LOG_OPER_H
 #define LOG_OPER_H
 
-void log_oper(const char *logfilename, const char *str);
+int log_oper(const char *logfilename, const char *str);
 
 #endif /* LOG_OPER_H */
diff --git a/include/mlmmj.h b/include/mlmmj.h
index 595c74cb..79050100 100644
--- a/include/mlmmj.h
+++ b/include/mlmmj.h
@@ -53,6 +53,7 @@
 			   * digest */
 #define DIGESTMIMETYPE "digest" /* Which sub-type of multipart to use when
 				 * sending digest mails */
+#define OPLOGFNAME "mlmmj.operation.log" /* logfile to log operations */
 
 struct strlist {
 	int count;
diff --git a/listtexts/Makefile.am b/listtexts/Makefile.am
index 8054e5f2..41e07e48 100644
--- a/listtexts/Makefile.am
+++ b/listtexts/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-
+textlibdir = $(pkgdatadir)/text.skel
 dist_textlib_DATA = access bounce-probe listhelp moderation notifysub \
 	notifysub-digest notifysub-nomail notifyunsub notifyunsub-digest \
 	notifyunsub-nomail notintocc sub-confirm sub-confirm-digest \
diff --git a/src/Makefile.am b/src/Makefile.am
index f4127af5..08e13ff9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,8 @@ mlmmj_send_SOURCES = mlmmj-send.c writen.c mail-functions.c itoa.c chomp.c \
 		     statctrl.c ctrlvalue.c
 
 mlmmj_recieve_SOURCES = mlmmj-recieve.c writen.c random-int.c strgen.c \
-			print-version.c log_error.c dumpfd2fd.c memory.c
+			print-version.c log_error.c dumpfd2fd.c memory.c \
+			log_oper.c mylocking.c
 
 mlmmj_process_SOURCES = mlmmj-process.c writen.c find_email_adr.c \
 			incindexfile.c itoa.c getlistaddr.c chomp.c \
diff --git a/src/log_oper.c b/src/log_oper.c
index 545f8dfd..a2a54ac6 100644
--- a/src/log_oper.c
+++ b/src/log_oper.c
@@ -28,13 +28,19 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <string.h>
 
 #include "mlmmj.h"
 #include "log_error.h"
 #include "log_oper.h"
+#include "strgen.h"
+#include "mylocking.h"
+#include "wrappers.h"
+#include "memory.h"
 
 int log_oper(const char *logfilename, const char *str)
 {
+	int fd;
 	char ct[26], *logstr;
 	struct stat st;
 	time_t t;
diff --git a/src/mlmmj-maintd.c b/src/mlmmj-maintd.c
index 07f2fe5a..f40b56f4 100644
--- a/src/mlmmj-maintd.c
+++ b/src/mlmmj-maintd.c
@@ -192,11 +192,12 @@ int discardmail(const char *old, const char *new, time_t age)
 	stat(old, &st);
 	t = time(NULL);
 
-	if(t - st.st_mtime > age)
+	if(t - st.st_mtime > age) {
 		if(rename(old, new) < 0)
 			ret = 0;
 		else
 			ret = 1;
+	}
 
 	myunlock(fd);
 	close(fd);
diff --git a/src/mlmmj-recieve.c b/src/mlmmj-recieve.c
index f1fdbbbf..dd5defcb 100644
--- a/src/mlmmj-recieve.c
+++ b/src/mlmmj-recieve.c
@@ -37,6 +37,7 @@
 #include "strgen.h"
 #include "log_error.h"
 #include "memory.h"
+#include "log_oper.h"
 
 extern char *optarg;
 
@@ -55,7 +56,7 @@ int main(int argc, char **argv)
 {
 	char *infilename = NULL, *listdir = NULL;
 	char *randomstr = random_str();
-	char *mlmmjprocess, *bindir;
+	char *mlmmjprocess, *bindir, *logstr;
 	int fd, opt, noprocess = 0, nofork = 0;
 	struct stat st;
 	uid_t uid;
@@ -140,9 +141,9 @@ int main(int argc, char **argv)
 
 	fsync(fd);
 
-#if 0
-	log_error(LOG_ARGS, "mlmmj-recieve: wrote %s\n", infilename);
-#endif
+	logstr = concatstr(2, "mlmmj-recieve: wrote ", infilename);
+	log_oper(OPLOGFNAME, logstr);
+	myfree(logstr);
 	close(fd);
 
 	if(noprocess) {
diff --git a/src/mylocking.c b/src/mylocking.c
index 2d25f9c9..9237d1f0 100644
--- a/src/mylocking.c
+++ b/src/mylocking.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Mads Martin Joergensen <mmj at mmj.dk>
+/* Copyright (C) 2002, 2003, 2005 Mads Martin Joergensen <mmj at mmj.dk>
  *
  * $Id$
  *
@@ -23,6 +23,8 @@
 
 #include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
+
 #include "mylocking.h"
 
 int myexcllock(int fd)
@@ -36,7 +38,7 @@ int myexcllock(int fd)
 	locktype.l_len = 0;
 	do {
 		mylock = fcntl(fd, F_SETLKW, &locktype);
-	while(mylock < 0 && errno == EINTR);
+	} while(mylock < 0 && errno == EINTR);
 
 	return mylock;
 }
@@ -49,7 +51,7 @@ int myunlock(int fd)
 	locktype.l_type = F_UNLCK;
 	do {
 		myunlock = fcntl(fd, F_SETLKW, &locktype);
-	while(myunlock < 0 && errno == EINTR)
+	} while(myunlock < 0 && errno == EINTR);
 
 	return myunlock;
 }