From c10c8b2a6f585c8a5e24cab8ae223584bd9278bd Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Sun, 30 Oct 2011 15:49:12 +0000
Subject: add ziphome.exclude

git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5453 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 pttbbs/UPDATING                   | 3 +++
 pttbbs/mbbsd/mail.c               | 7 +++++--
 pttbbs/sample/etc/Makefile        | 2 +-
 pttbbs/sample/etc/ziphome.exclude | 4 ++++
 4 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 pttbbs/sample/etc/ziphome.exclude

diff --git a/pttbbs/UPDATING b/pttbbs/UPDATING
index 8b872d7f..f3557689 100644
--- a/pttbbs/UPDATING
+++ b/pttbbs/UPDATING
@@ -23,6 +23,9 @@ https://opensvn.csie.org/traccgi/pttbbs/changeset/2273
     make r4871_uflag
 
 -----------------------------------------------------------------------------
+r5453: [ziphome]
+ZipHome 增加了 exclude list (範例在 sample/etc/ziphome.exclude)。
+
 r4992: [ccw chat]
 此版後更新了交談(talk)與聊天室(chat)的核心，另外稅率也在之前的版本有改動。
 交談 (talk) 的 protocol 自此版後有所不同，所以昇級時要重開
diff --git a/pttbbs/mbbsd/mail.c b/pttbbs/mbbsd/mail.c
index 977fbf60..feabeff0 100644
--- a/pttbbs/mbbsd/mail.c
+++ b/pttbbs/mbbsd/mail.c
@@ -2228,7 +2228,8 @@ doforward(const char *direct, const fileheader_t * fh, int mode)
 	assert(!invalidaddr(address));
 #ifdef MUTT_PATH
 	snprintf(fname, sizeof(fname),
-		 TAR_PATH " cfz /tmp/home.%s.tgz home/%c/%s; "
+		 TAR_PATH " -X " BBSHOME "/etc/ziphome.exclude "
+                 "-cfz /tmp/home.%s.tgz home/%c/%s; "
 		 MUTT_PATH " -s 'home.%s.tgz' -a /tmp/home.%s.tgz -- '%s' </dev/null;"
 		 "rm /tmp/home.%s.tgz",
 		 cuser.userid, cuser.userid[0], cuser.userid,
@@ -2236,7 +2237,9 @@ doforward(const char *direct, const fileheader_t * fh, int mode)
 	system(fname);
 	return 0;
 #else
-	snprintf(fname, sizeof(fname), TAR_PATH " cfz - home/%c/%s | "
+	snprintf(fname, sizeof(fname),
+		 TAR_PATH " -X " BBSHOME "/etc/ziphome.exclude "
+                 "-cfz - home/%c/%s | "
 		"/usr/bin/uuencode %s.tgz > %s",
 		cuser.userid[0], cuser.userid, cuser.userid, direct);
 	system(fname);
diff --git a/pttbbs/sample/etc/Makefile b/pttbbs/sample/etc/Makefile
index 6b550c67..3cdb93f2 100644
--- a/pttbbs/sample/etc/Makefile
+++ b/pttbbs/sample/etc/Makefile
@@ -8,7 +8,7 @@ FILES=	@five		Welcome		Welcome_birth	Welcome_login	\
 	feast		sysop		\
 	ve.hlp		board.help	boardlist.help	\
 	editable	expire.conf	domain_name_query.cidr	\
-	banemail	whitemail	whitemail.notice
+	banemail	whitemail	whitemail.notice ziphome.exclude
 
 all:
 
diff --git a/pttbbs/sample/etc/ziphome.exclude b/pttbbs/sample/etc/ziphome.exclude
new file mode 100644
index 00000000..7666a598
--- /dev/null
+++ b/pttbbs/sample/etc/ziphome.exclude
@@ -0,0 +1,4 @@
+.DIR.old
+.timecap
+.secure
+buf.*
-- 
cgit v1.2.3