Mercurial > hg > mlmmj

changeset 25:65d01831c0eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
log_error is it's own object now
author mmj
date Fri, 23 Apr 2004 01:38:55 +1000
parents 7654b513883f
children 035484b0da60
files include/log_error.h src/Makefile.am src/Makefile.in src/getlistaddr.c src/incindexfile.c src/init_sockfd.c src/listcontrol.c src/log_error.c src/mail-functions.c src/mlmmj-process.c src/mlmmj-recieve.c src/mlmmj-send.c src/mlmmj-subscribe.c src/mlmmj-unsubscribe.c src/send_help.c
diffstat 15 files changed, 58 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/include/log_error.h	Fri Apr 23 01:38:55 2004 +1000
@@ -0,0 +1,17 @@
+/* Copyright (C) 2004 Mads Martin Joergensen <mmj at mmj.dk>
+ *
+ * $Id$
+ *
+ * This file is redistributable under version 2 of the GNU General
+ * Public License as described at http://www.gnu.org/licenses/gpl.txt
+ */
+
+#ifndef LOG_ERROR_H
+#define LOG_ERROR_H
+
+#define log_error(msg) log_error_do(msg,__FILE__,__LINE__)
+
+void log_set_name(const char *name);
+void log_error_do(const char *msg, const char *file, int line);
+
+#endif /* LOG_ERROR_H */
--- a/src/Makefile.am	Fri Apr 23 01:38:37 2004 +1000
+++ b/src/Makefile.am	Fri Apr 23 01:38:55 2004 +1000
@@ -15,22 +15,24 @@
 mlmmj_send_SOURCES = mlmmj-send.c writen.c mail-functions.c itoa.c chomp.c \
                      incindexfile.c checkwait_smtpreply.c getlistaddr.c \
 		     mylocking.c init_sockfd.c strgen.c random-int.c \
-		     print-version.c
+		     print-version.c log_error.c
 
 mlmmj_recieve_SOURCES = mlmmj-recieve.c writen.c random-int.c header_token.c \
 			getlistaddr.c chomp.c strgen.c print-version.c \
-			mygetline.c
+			mygetline.c log_error.c
 
 mlmmj_process_SOURCES = mlmmj-process.c writen.c find_email_adr.c \
 			incindexfile.c itoa.c getlistaddr.c chomp.c \
 			mylocking.c listcontrol.c random-int.c strgen.c i\
 			header_token.c print-version.c send_help.c \
-			do_all_the_voodo_here.c mygetline.c gethdrline.c
+			do_all_the_voodo_here.c mygetline.c gethdrline.c \
+			log_error.c
 
 mlmmj_subscribe_SOURCES = mlmmj-subscribe.c writen.c mylocking.c \
 			getlistaddr.c chomp.c random-int.c strgen.c \
-			subscriberfuncs.c readln.c print-version.c
+			subscriberfuncs.c readln.c print-version.c \
+			log_error.c
 
 mlmmj_unsubscribe_SOURCES = mlmmj-unsubscribe.c writen.c readln.c mylocking.c\
 			getlistaddr.c chomp.c subscriberfuncs.c random-int.c \
-			strgen.c print-version.c
+			strgen.c print-version.c log_error.c
--- a/src/Makefile.in	Fri Apr 23 01:38:37 2004 +1000
+++ b/src/Makefile.in	Fri Apr 23 01:38:55 2004 +1000
@@ -60,13 +60,14 @@
 	listcontrol.$(OBJEXT) random-int.$(OBJEXT) strgen.$(OBJEXT) \
 	header_token.$(OBJEXT) print-version.$(OBJEXT) \
 	send_help.$(OBJEXT) do_all_the_voodo_here.$(OBJEXT) \
-	mygetline.$(OBJEXT) gethdrline.$(OBJEXT)
+	mygetline.$(OBJEXT) gethdrline.$(OBJEXT) log_error.$(OBJEXT)
 mlmmj_process_OBJECTS = $(am_mlmmj_process_OBJECTS)
 mlmmj_process_LDADD = $(LDADD)
 am_mlmmj_recieve_OBJECTS = mlmmj-recieve.$(OBJEXT) writen.$(OBJEXT) \
 	random-int.$(OBJEXT) header_token.$(OBJEXT) \
 	getlistaddr.$(OBJEXT) chomp.$(OBJEXT) strgen.$(OBJEXT) \
-	print-version.$(OBJEXT) mygetline.$(OBJEXT)
+	print-version.$(OBJEXT) mygetline.$(OBJEXT) \
+	log_error.$(OBJEXT)
 mlmmj_recieve_OBJECTS = $(am_mlmmj_recieve_OBJECTS)
 mlmmj_recieve_LDADD = $(LDADD)
 am_mlmmj_send_OBJECTS = mlmmj-send.$(OBJEXT) writen.$(OBJEXT) \
@@ -74,21 +75,21 @@
 	incindexfile.$(OBJEXT) checkwait_smtpreply.$(OBJEXT) \
 	getlistaddr.$(OBJEXT) mylocking.$(OBJEXT) \
 	init_sockfd.$(OBJEXT) strgen.$(OBJEXT) random-int.$(OBJEXT) \
-	print-version.$(OBJEXT)
+	print-version.$(OBJEXT) log_error.$(OBJEXT)
 mlmmj_send_OBJECTS = $(am_mlmmj_send_OBJECTS)
 mlmmj_send_LDADD = $(LDADD)
 am_mlmmj_subscribe_OBJECTS = mlmmj-subscribe.$(OBJEXT) \
 	writen.$(OBJEXT) mylocking.$(OBJEXT) getlistaddr.$(OBJEXT) \
 	chomp.$(OBJEXT) random-int.$(OBJEXT) strgen.$(OBJEXT) \
 	subscriberfuncs.$(OBJEXT) readln.$(OBJEXT) \
-	print-version.$(OBJEXT)
+	print-version.$(OBJEXT) log_error.$(OBJEXT)
 mlmmj_subscribe_OBJECTS = $(am_mlmmj_subscribe_OBJECTS)
 mlmmj_subscribe_LDADD = $(LDADD)
 am_mlmmj_unsubscribe_OBJECTS = mlmmj-unsubscribe.$(OBJEXT) \
 	writen.$(OBJEXT) readln.$(OBJEXT) mylocking.$(OBJEXT) \
 	getlistaddr.$(OBJEXT) chomp.$(OBJEXT) \
 	subscriberfuncs.$(OBJEXT) random-int.$(OBJEXT) \
-	strgen.$(OBJEXT) print-version.$(OBJEXT)
+	strgen.$(OBJEXT) print-version.$(OBJEXT) log_error.$(OBJEXT)
 mlmmj_unsubscribe_OBJECTS = $(am_mlmmj_unsubscribe_OBJECTS)
 mlmmj_unsubscribe_LDADD = $(LDADD)
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
@@ -106,6 +107,7 @@
 @AMDEP_TRUE@	./$(DEPDIR)/incindexfile.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/init_sockfd.Po ./$(DEPDIR)/itoa.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/listcontrol.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/log_error.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/mail-functions.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/mlmmj-process.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/mlmmj-recieve.Po \
@@ -207,25 +209,27 @@
 mlmmj_send_SOURCES = mlmmj-send.c writen.c mail-functions.c itoa.c chomp.c \
                      incindexfile.c checkwait_smtpreply.c getlistaddr.c \
 		     mylocking.c init_sockfd.c strgen.c random-int.c \
-		     print-version.c
+		     print-version.c log_error.c
 
 mlmmj_recieve_SOURCES = mlmmj-recieve.c writen.c random-int.c header_token.c \
 			getlistaddr.c chomp.c strgen.c print-version.c \
-			mygetline.c
+			mygetline.c log_error.c
 
 mlmmj_process_SOURCES = mlmmj-process.c writen.c find_email_adr.c \
 			incindexfile.c itoa.c getlistaddr.c chomp.c \
 			mylocking.c listcontrol.c random-int.c strgen.c i\
 			header_token.c print-version.c send_help.c \
-			do_all_the_voodo_here.c mygetline.c gethdrline.c
+			do_all_the_voodo_here.c mygetline.c gethdrline.c \
+			log_error.c
 
 mlmmj_subscribe_SOURCES = mlmmj-subscribe.c writen.c mylocking.c \
 			getlistaddr.c chomp.c random-int.c strgen.c \
-			subscriberfuncs.c readln.c print-version.c
+			subscriberfuncs.c readln.c print-version.c \
+			log_error.c
 
 mlmmj_unsubscribe_SOURCES = mlmmj-unsubscribe.c writen.c readln.c mylocking.c\
 			getlistaddr.c chomp.c subscriberfuncs.c random-int.c \
-			strgen.c print-version.c
+			strgen.c print-version.c log_error.c
 
 all: all-am
 
@@ -335,6 +339,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init_sockfd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itoa.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listcontrol.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log_error.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail-functions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mlmmj-process.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mlmmj-recieve.Po@am__quote@
--- a/src/getlistaddr.c	Fri Apr 23 01:38:37 2004 +1000
+++ b/src/getlistaddr.c	Fri Apr 23 01:38:55 2004 +1000
@@ -12,8 +12,7 @@
 #include <errno.h>
 #include "getlistaddr.h"
 #include "chomp.h"
-
-#include "log_error.c"
+#include "log_error.h"
 
 #define MAXLISTNAMELEN 1024
 
--- a/src/incindexfile.c	Fri Apr 23 01:38:37 2004 +1000
+++ b/src/incindexfile.c	Fri Apr 23 01:38:55 2004 +1000
@@ -18,8 +18,7 @@
 #include "mylocking.h"
 #include "incindexfile.h"
 #include "itoa.h"
-
-#include "log_error.c"
+#include "log_error.h"
 
 #define INTBUF_SIZE 32
 
--- a/src/init_sockfd.c	Fri Apr 23 01:38:37 2004 +1000
+++ b/src/init_sockfd.c	Fri Apr 23 01:38:55 2004 +1000
@@ -12,8 +12,7 @@
 #include <arpa/inet.h>
 
 #include "init_sockfd.h"
-
-#include "log_error.c"
+#include "log_error.h"
 
 void init_sockfd(int *sockfd, const char *relayhost)
 {
--- a/src/listcontrol.c	Fri Apr 23 01:38:37 2004 +1000
+++ b/src/listcontrol.c	Fri Apr 23 01:38:55 2004 +1000
@@ -18,8 +18,7 @@
 #include "find_email_adr.h"
 #include "strgen.h"
 #include "send_help.h"
-
-#include "log_error.c"
+#include "log_error.h"
 
 int listcontrol(const char *mailfilename, const char *listdir,
 		const char *controladdr)
--- a/src/log_error.c	Fri Apr 23 01:38:37 2004 +1000
+++ b/src/log_error.c	Fri Apr 23 01:38:55 2004 +1000
@@ -3,32 +3,28 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <stdlib.h>
 
-#include "config.h"
+#include "log_error.h"
+#include "../config.h"
 
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>
 #endif
 
-
-static char *log_name = NULL;
+char *log_name = NULL;
 
-
-static void log_set_name(const char* name)
+void log_set_name(const char* name)
 {
 	if (log_name) free(log_name);
 	log_name = strdup(name);
 }
 
-
-#define log_error(msg) log_error_do(msg,__FILE__,__LINE__)
-
-static void log_error_do(const char *msg, const char *file, unsigned int line)
+void log_error_do(const char *msg, const char *file, int line)
 {
+	static int syslog_is_open = 0;
 	if (!log_name) log_name = "mlmmj-UNKNOWN";
-
 #ifdef HAVE_SYSLOG
-	static int syslog_is_open = 0;
 	if(!syslog_is_open) {
 		openlog(log_name, LOG_PID|LOG_CONS, LOG_MAIL);
 		syslog_is_open = 1;
--- a/src/mail-functions.c	Fri Apr 23 01:38:37 2004 +1000
+++ b/src/mail-functions.c	Fri Apr 23 01:38:55 2004 +1000
@@ -20,7 +20,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "log_error.c"
+#include "log_error.h"
 
 /* "HELO \r\n " has length 7 */
 #define EXTRA_HELO_LEN 8
--- a/src/mlmmj-process.c	Fri Apr 23 01:38:37 2004 +1000
+++ b/src/mlmmj-process.c	Fri Apr 23 01:38:55 2004 +1000
@@ -23,8 +23,7 @@
 #include "listcontrol.h"
 #include "strgen.h"
 #include "do_all_the_voodo_here.h"
-
-#include "log_error.c"
+#include "log_error.h"
 
 static void print_help(const char *prg)
 {
--- a/src/mlmmj-recieve.c	Fri Apr 23 01:38:37 2004 +1000
+++ b/src/mlmmj-recieve.c	Fri Apr 23 01:38:55 2004 +1000
@@ -19,8 +19,7 @@
 #include "wrappers.h"
 #include "mygetline.h"
 #include "strgen.h"
-
-#include "log_error.c"
+#include "log_error.h"
 
 extern char *optarg;
 
--- a/src/mlmmj-send.c	Fri Apr 23 01:38:37 2004 +1000
+++ b/src/mlmmj-send.c	Fri Apr 23 01:38:55 2004 +1000
@@ -25,8 +25,7 @@
 #include "getlistaddr.h"
 #include "init_sockfd.h"
 #include "strgen.h"
-
-#include "log_error.c"
+#include "log_error.h"
 
 
 static void print_help(const char *prg)
--- a/src/mlmmj-subscribe.c	Fri Apr 23 01:38:37 2004 +1000
+++ b/src/mlmmj-subscribe.c	Fri Apr 23 01:38:55 2004 +1000
@@ -23,8 +23,7 @@
 #include "getlistaddr.h"
 #include "strgen.h"
 #include "subscriberfuncs.h"
-
-#include "log_error.c"
+#include "log_error.h"
 
 void confirm_sub(const char *listdir, const char *listaddr, const char *subaddr)
 {
--- a/src/mlmmj-unsubscribe.c	Fri Apr 23 01:38:37 2004 +1000
+++ b/src/mlmmj-unsubscribe.c	Fri Apr 23 01:38:55 2004 +1000
@@ -24,8 +24,7 @@
 #include "getlistaddr.h"
 #include "subscriberfuncs.h"
 #include "strgen.h"
-
-#include "log_error.c"
+#include "log_error.h"
 
 void confirm_unsub(const char *listdir, const char *listaddr, const char *subaddr)
 {
--- a/src/send_help.c	Fri Apr 23 01:38:37 2004 +1000
+++ b/src/send_help.c	Fri Apr 23 01:38:55 2004 +1000
@@ -10,14 +10,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
+#include <unistd.h>
 
 #include "mlmmj.h"
 #include "send_help.h"
 #include "strgen.h"
 #include "find_email_adr.h"
 #include "getlistaddr.h"
-
-#include "log_error.c"
+#include "log_error.h"
 
 void send_help(const char *listdir, const char *emailaddr)
 {