From 65ff9f98b70203b08ed8238c6ed389f21c61f289 Mon Sep 17 00:00:00 2001
From: ptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Mon, 15 Apr 2002 17:07:11 +0000
Subject: *** empty log message ***

git-svn-id: http://opensvn.csie.org/pttbbs/pttbbs/trunk/pttbbs@105 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/cache.c | 13 +++++++++----
 mbbsd/more.c  |  7 ++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/mbbsd/cache.c b/mbbsd/cache.c
index 8fceef65..054bd16b 100644
--- a/mbbsd/cache.c
+++ b/mbbsd/cache.c
@@ -1,4 +1,4 @@
-/* $Id: cache.c,v 1.9 2002/04/15 12:05:52 in2 Exp $ */
+/* $Id: cache.c,v 1.10 2002/04/15 17:07:11 ptt Exp $ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -1026,9 +1026,8 @@ int hbflcheck(int bid, int uid)
 }
 
 #ifdef MDCACHE
-char *cachepath(const char *fpath)
+int cachepath(char *cpath, const char *fpath)
 {
-    static  char    cpath[128];
     char    *ptr;
     snprintf(cpath, sizeof(cpath), "cache/%s", fpath);
     for( ptr = &cpath[6] ; *ptr != 0 ; ++ptr )
@@ -1045,7 +1044,13 @@ int updatemdcache(const char *CPATH, const char *fpath)
     */
     int     len, sourcefd, targetfd;
     char    buf[1024], *cpath;
-    cpath = (CPATH == NULL) ? cachepath(fpath) : CPATH;
+    if(CPATH==NULL)
+         {
+             cpath=buf;
+             cachepath(buf, fpath);
+         }
+    else
+         cpath =  CPATH;
     if( (sourcefd = open(fpath, O_RDONLY)) < 0 )
 	return -1;
     if( (targetfd = open(cpath, O_RDWR | O_CREAT, 0600)) < 0 )
diff --git a/mbbsd/more.c b/mbbsd/more.c
index a65c1ee5..4265d75f 100644
--- a/mbbsd/more.c
+++ b/mbbsd/more.c
@@ -1,4 +1,4 @@
-/* $Id: more.c,v 1.2 2002/04/15 12:05:52 in2 Exp $ */
+/* $Id: more.c,v 1.3 2002/04/15 17:07:11 ptt Exp $ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -233,9 +233,10 @@ int more(char *fpath, int promptend) {
     *search_str = 0;
 
 #ifdef MDCACHE
-    if( strncmp(fpath, "boards/", 7) == 0 || strncmp(fpath, "etc/", 4) == 0 ){
+    if(!promptend){
 	/* we only cache boards/ and etc/ */
-	char    *cpath = cachepath(fpath);
+	char    cpath[256];
+        cachepath(cpath,fpath);
 	++GLOBE[0];
 	if( (fd = open(cpath, O_RDONLY)) < 0 ){
 	    if( (fd = updatemdcache(cpath, fpath)) < 0 )
-- 
cgit v1.2.3