changeset 607:db8ec0c0d035

Added support for default list text directory (Henne Vogelsang)
author mortenp
date Thu, 07 Dec 2006 03:34:52 +1100
parents 353118fefd6a
children 921ccfaf14f2
files ChangeLog src/Makefile.am src/prepstdreply.c
diffstat 3 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Dec 07 01:05:07 2006 +1100
+++ b/ChangeLog	Thu Dec 07 03:34:52 2006 +1100
@@ -1,3 +1,4 @@
+ o Added support for default list text directory (Henne Vogelsang)
  o Fixed a Bourne Shell issue in mlmmj-make-ml.sh (Magnus Naeslund)
  o Fixed hostnamestr() for hosts that can't find themselves using
    gethostbyname() (Benoit Dolez)
--- a/src/Makefile.am	Thu Dec 07 01:05:07 2006 +1100
+++ b/src/Makefile.am	Thu Dec 07 03:34:52 2006 +1100
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-AM_CFLAGS = -g -Wall -pedantic -Wsign-compare
+AM_CFLAGS = -g -Wall -pedantic -Wsign-compare -DDEFAULTTEXTDIR='"@textlibdir@"'
 INCLUDES = -I$(srcdir)/../include
 
 bin_PROGRAMS = mlmmj-send mlmmj-recieve mlmmj-process mlmmj-sub \
--- a/src/prepstdreply.c	Thu Dec 07 01:05:07 2006 +1100
+++ b/src/prepstdreply.c	Thu Dec 07 03:34:52 2006 +1100
@@ -163,9 +163,14 @@
 	infd = open(tmp, O_RDONLY);
 	myfree(tmp);
 	if(infd < 0) {
+		tmp = concatstr(2, DEFAULTTEXTDIR "/", filename);
+		infd = open(tmp, O_RDONLY);
+		myfree(tmp);
+		if(infd < 0) {
 		log_error(LOG_ARGS, "Could not open std mail %s", filename);
 		return NULL;
 	}
+	}
 
 	listaddr = getlistaddr(listdir);
 	listdelim = getlistdelim(listdir);