From: mmj <none@none>
Date: Sun, 2 Oct 2005 14:54:33 +0000 (+1000)
Subject: free() -> myfree()
X-Git-Tag: RELEASE_1_2_12_RC1~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a817b0e815df9dd2b01dcf9dbf01b990edb8cfa0;p=thirdparty%2Fmlmmj.git

free() -> myfree()
---

diff --git a/src/mlmmj-make-ml.sh.in b/src/mlmmj-make-ml.sh.in
index 7220ba36..00e8d464 100755
--- a/src/mlmmj-make-ml.sh.in
+++ b/src/mlmmj-make-ml.sh.in
@@ -5,6 +5,7 @@
 
 VERSION="0.1"
 DEFAULTDIR="/var/spool/mlmmj"
+ALIASFILE=/etc/aliases
 
 USAGE="mlmmj-make-ml "$VERSION"
 "$0" [OPTIONS]
@@ -12,7 +13,7 @@ USAGE="mlmmj-make-ml "$VERSION"
 -h	display this help text
 -L	the name of the mailinglist
 -s	your spool directory if not "$DEFAULTDIR"
--a	create the needed entrys in your /etc/aliases file
+-a	create the needed entrys in your $ALIASFILE file
 -z	nuffn for now
 -c	chown the spool dir"
 
@@ -123,14 +124,14 @@ ALIAS="$LISTNAME:  \"|$MLMMJRECIEVE -L $SPOOLDIR/$LISTNAME/\""
 CRONENTRY="0 */2 * * * \"$MLMMJMAINTD -F -L $SPOOLDIR/$LISTNAME/\""
 
 if [ -n "$A_CREATE" ]; then
-	echo "I want to add the following to your /etc/aliases file:"
+	echo "I want to add the following to your $ALIASFILE file:"
 	echo "$ALIAS"
 
 	echo -n "is this ok? [y/N] : "
 	read OKIDOKI
 	case $OKIDOKI in
 		y|Y)
-		echo "$ALIAS" >> /etc/aliases
+		echo "$ALIAS" >> $ALIASFILE
 		;;
 		n|N)
 		exit 0
@@ -140,7 +141,7 @@ if [ -n "$A_CREATE" ]; then
 	esac
 else
 	echo
-	echo "Don't forget to add this to /etc/aliases:"
+	echo "Don't forget to add this to $ALIASFILE:"
 	echo "$ALIAS"
 fi
 
diff --git a/src/prepstdreply.c b/src/prepstdreply.c
index c438fa0d..0c472471 100644
--- a/src/prepstdreply.c
+++ b/src/prepstdreply.c
@@ -38,6 +38,7 @@
 #include "wrappers.h"
 #include "memory.h"
 #include "getlistaddr.h"
+#include "mlmmj.h"
 
 char *substitute(const char *line, const char *listaddr, size_t datacount,
 		 char **data)
@@ -181,7 +182,7 @@ char *prepstdreply(const char *listdir, const char *filename, const char *from,
 	if(replyto) {
 		myreplyto = substitute(replyto, listaddr, tokencount, data);
 		tmp = concatstr(3, "Reply-To: ", myreplyto, "\n");
-		free(myreplyto);
+		myfree(myreplyto);
 		myreplyto = tmp;
 	} else
 		myreplyto = NULL;