From: wessels <>
Date: Mon, 2 Dec 1996 10:32:03 +0000 (+0000)
Subject: From:    Bernd Ernesti <bernd@arresum.inka.de>
X-Git-Tag: SQUID_3_0_PRE1~5363
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18cb1950fc20949a36e11352097fb3b730f3f55d;p=thirdparty%2Fsquid.git

From:    Bernd Ernesti <bernd@arresum.inka.de>
store.c needs another diff to remove:
- swaplog_file and not only 'log'
- all 256 swap_level1_dirs
---

diff --git a/src/store.cc b/src/store.cc
index af5b4b9f3e..2b982cad3f 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.172 1996/12/01 07:33:43 wessels Exp $
+ * $Id: store.cc,v 1.173 1996/12/02 03:32:03 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -2323,7 +2323,8 @@ storeVerifySwapDirs(int clean)
 	if (clean && opt_unlink_on_reload) {
 	    debug(20, 1, "storeVerifySwapDirs: Zapping all objects on disk storage.\n");
 	    cmdbuf = xcalloc(1, BUFSIZ);
-	    sprintf(cmdbuf, "cd %s; /bin/rm -rf log 0[0-9A-F]", path);
+	    sprintf(cmdbuf, "cd %s; /bin/rm -rf %s [0-9A-F][0-9A-F]",
+		path, swaplog_file);
 	    debug(20, 1, "storeVerifySwapDirs: Running '%s'\n", cmdbuf);
 	    system(cmdbuf);	/* XXX should avoid system(3) */
 	    xfree(cmdbuf);