summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-06-25 11:52:43 +0800
committerptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-06-25 11:52:43 +0800
commit9ec5a63caa8084a8923114f57ee408b8a5508340 (patch)
tree69a823f8b6265f2f4eb202216e2b720709f09bc7
parente5fa0dde534a1bf16c7c4cf0d619eb693d985bd6 (diff)
downloadpttbbs-9ec5a63caa8084a8923114f57ee408b8a5508340.tar
pttbbs-9ec5a63caa8084a8923114f57ee408b8a5508340.tar.gz
pttbbs-9ec5a63caa8084a8923114f57ee408b8a5508340.tar.bz2
pttbbs-9ec5a63caa8084a8923114f57ee408b8a5508340.tar.lz
pttbbs-9ec5a63caa8084a8923114f57ee408b8a5508340.tar.xz
pttbbs-9ec5a63caa8084a8923114f57ee408b8a5508340.tar.zst
pttbbs-9ec5a63caa8084a8923114f57ee408b8a5508340.zip
fix bug
git-svn-id: http://opensvn.csie.org/pttbbs/branches/Ptt.merge@2086 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--mbbsd/admin.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mbbsd/admin.c b/mbbsd/admin.c
index 92c4addd..d9211c74 100644
--- a/mbbsd/admin.c
+++ b/mbbsd/admin.c
@@ -304,7 +304,7 @@ void merge_dir(char *dir1, char *dir2)
fh[i-1].recommend =0;
fh[i-1].filemode |= 1;
append_record(dir1, &fh[i-1], sizeof(fileheader_t));
- strcpy(p1, fh[i].filename);
+ strcpy(p1, fh[i-1].filename);
if(!dashd(file1))
{
strcpy(p2, fh[i-1].filename);