fix Makefile clean target

remove references to Harvest

diff --git a/src/Makefile.in b/src/Makefile.in
index 4cc3afa726c8d0183d192f9f000e7e865f6a3ff6..999b83ad02d4b4f9742e43a2298951167d0364f6 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
 #
-#  Makefile for the Harvest Object Cache server
+#  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.19 1996/04/16 05:05:16 wessels Exp $
+#  $Id: Makefile.in,v 1.20 1996/04/16 16:35:25 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -31,16 +31,6 @@ XTRA_OBJS    = @XTRA_OBJS@
 SHELL          = /bin/sh
 
 
-## AIX users might need to use these values
-#
-#CC            = cc
-#XTRA_CFLAGS   = -D_HARVEST_HPUX_ -d_AIX -D_ALL_SOURCE
-#
-
-## LINUX users might need to use these values
-#
-#XTRA_CFLAGS   = -D_ALL_SOURCE
-
 INCLUDE                = -I. -I../include      # MUST use -I. first
 CFLAGS                 = $(STD_CFLAGS) $(XTRA_CFLAGS) $(INCLUDE) $(DEFINES)
 LDFLAGS         = $(STD_LDFLAGS)
@@ -131,7 +121,7 @@ install: all install-mkdirs
        fi
 
 clean: 
-       -rm -rf *.o *pure_* core $(PROGS) $(UTILS) $(CGIPROGS) squid.conf
+       -rm -rf *.o *pure_* core $(PROGS) $(UTILS) $(CGIPROGS)
 
 realclean:     clean
-       -rm -f Makefile
+       -rm -f Makefile squid.conf

diff --git a/src/cachemgr.cc b/src/cachemgr.cc
index cf4de62d2d9b303a41fcfac35c0a2f2214fd63ff..00bb22f9ddf66ae76486a67c45374f7c0739551c 100644 (file)
--- a/src/cachemgr.cc
+++ b/src/cachemgr.cc
@@ -1,4 +1,4 @@
-/* $Id: cachemgr.cc,v 1.6 1996/04/16 05:05:18 wessels Exp $ */
+/* $Id: cachemgr.cc,v 1.7 1996/04/16 16:35:26 wessels Exp $ */
 
 #include "squid.h"
 
@@ -29,7 +29,7 @@ typedef struct {
 
 int hasTables = FALSE;
 
-char *script_name = "/Harvest/cgi-bin/cachemgr.cgi";
+char *script_name = "/cgi-bin/cachemgr.cgi";
 char *progname = NULL;
 
 #define LF 10
@@ -54,13 +54,11 @@ void print_trailer()
 void noargs_html()
 {
     printf("\r\n\r\n");
-    printf("<TITLE>Harvest Cache Manager Interface</TITLE>\n");
+    printf("<TITLE>Cache Manager Interface</TITLE>\n");
     printf("<H1>Cache Manager Interface</H1>\n");
     printf("<P>\n");
     printf("This is a WWW interface to the instrumentation interface ");
-    printf("for the\n");
-    printf("<A HREF=\"http://harvest.cs.colorado.edu/\">\n");
-    printf("\tHarvest object cache</A>.\n");
+    printf("for the Squid object cache.\n");
     printf("<HR>\n");
     printf("<P>\n");
     printf("<FORM METHOD=\"POST\" ACTION=\"%s\">\n", script_name);

diff --git a/src/gopher.cc b/src/gopher.cc
index c21af254dc93539ca5e4f56f507b74cf7d7636bc..f1a1b530a09da6eef71eb5d4d73f922ce8869162 100644 (file)
--- a/src/gopher.cc
+++ b/src/gopher.cc
@@ -1,4 +1,4 @@
-/* $Id: gopher.cc,v 1.26 1996/04/16 05:05:22 wessels Exp $ */
+/* $Id: gopher.cc,v 1.27 1996/04/16 16:35:27 wessels Exp $ */
 
 /*
  * DEBUG: Section 10          gopher: GOPHER
@@ -137,7 +137,7 @@ void gopherMimeCreate(data)
 
     sprintf(tempMIME, "\
 HTTP/1.0 200 OK Gatewaying\r\n\
-Server: HarvestCache/%s\r\n\
+Server: Squid/%s\r\n\
 MIME-version: 1.0\r\n", version_string);
 
     switch (data->type_id) {

diff --git a/src/http.cc b/src/http.cc
index c028ea30c04b8c12d15433326750c706210667ec..9676926d3b8237b9281dbec75a742b3dfbb713fa 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,4 +1,4 @@
-/* $Id: http.cc,v 1.50 1996/04/16 05:13:34 wessels Exp $ */
+/* $Id: http.cc,v 1.51 1996/04/16 16:35:28 wessels Exp $ */
 
 /*
  * DEBUG: Section 11          http: HTTP
@@ -386,7 +386,7 @@ static void httpSendRequest(fd, data)
     char *t = NULL;
     char *post_buf = NULL;
     static char *crlf = "\r\n";
-    static char *HARVEST_PROXY_TEXT = "via Harvest Cache version";
+    static char *VIA_PROXY_TEXT = "via Sqiud Cache version";
     int len = 0;
     int buflen;
     int cfd = -1;
@@ -422,7 +422,7 @@ static void httpSendRequest(fd, data)
            if (strncasecmp(t, "User-Agent:", 11) == 0) {
                ybuf = (char *) get_free_4k_page();
                memset(ybuf, '\0', SM_PAGE_SIZE);
-               sprintf(ybuf, "%s %s %s", t, HARVEST_PROXY_TEXT, version_string);
+               sprintf(ybuf, "%s %s %s", t, VIA_PROXY_TEXT, version_string);
                t = ybuf;
            }
            if (len + (int) strlen(t) > buflen - 10)

diff --git a/src/main.cc b/src/main.cc
index 40eb471de1b545698e9d235cd01e9bb9e3b364af..4fd8469d8e4d86deac2500cd7c4b483ac60f0e8c 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,4 +1,4 @@
-/* $Id: main.cc,v 1.36 1996/04/16 05:48:58 wessels Exp $ */
+/* $Id: main.cc,v 1.37 1996/04/16 16:35:29 wessels Exp $ */
 
 /* DEBUG: Section 1             main: startup and main loop */
 
@@ -55,7 +55,7 @@ static void mainParseOptions(argc, argv)
     while ((c = getopt(argc, argv, "vCDRVbsif:a:p:u:m:zh?")) != -1) {
        switch (c) {
        case 'v':
-           printf("Harvest Cache: Version %s\n", version_string);
+           printf("Squid Cache: Version %s\n", version_string);
            exit(0);
            /* NOTREACHED */
        case 'b':
@@ -168,7 +168,7 @@ void serverConnectionsClose()
 
 static void mainReinitialize()
 {
-    debug(1, 0, "Retarting Harvest Cache (version %s)...\n", version_string);
+    debug(1, 0, "Retarting Squid Cache (version %s)...\n", version_string);
     /* Already called serverConnectionsClose and ipcacheShutdownServers() */
     neighborsDestroy();
 
@@ -204,7 +204,7 @@ static void mainInitialize()
     fdstat_open(fileno(debug_log), LOG);
     fd_note(fileno(debug_log), getCacheLogFile());
 
-    debug(1, 0, "Starting Harvest Cache (version %s)...\n", version_string);
+    debug(1, 0, "Starting Squid Cache (version %s)...\n", version_string);
 
     ipcache_init();
     neighbors_init();

diff --git a/src/recv-announce.cc b/src/recv-announce.cc
index 824d57ff182442178827d8e45feb91b71143f7a5..879ef13656fcda5000aa5881842ce1ff7e4f674e 100644 (file)
--- a/src/recv-announce.cc
+++ b/src/recv-announce.cc
@@ -1,4 +1,4 @@
-/* $Id: recv-announce.cc,v 1.3 1996/04/16 05:05:28 wessels Exp $ */
+/* $Id: recv-announce.cc,v 1.4 1996/04/16 16:35:29 wessels Exp $ */
 
 #include <stdio.h>
 #include <fcntl.h>
@@ -15,7 +15,7 @@
  * This program must be run from inetd.  First add something like this
  * to /etc/services:
  * 
- * cached_announce 3131/udp             # harvest cache announcements
+ * cached_announce 3131/udp             # cache announcements
  * 
  * And then add something like this to /etc/inetd/conf:
  * 

diff --git a/src/send-announce.cc b/src/send-announce.cc
index 7e5fe586cde575014db107b8e2d6bbd79e5b53f3..bf27860eb07d6dc189ccf1813472e9fcd37af6cc 100644 (file)
--- a/src/send-announce.cc
+++ b/src/send-announce.cc
@@ -1,4 +1,4 @@
-/* $Id: send-announce.cc,v 1.9 1996/04/16 05:05:29 wessels Exp $ */
+/* $Id: send-announce.cc,v 1.10 1996/04/16 16:35:30 wessels Exp $ */
 
 /*
  * DEBUG: Section 27          send-announce
@@ -22,7 +22,7 @@ void send_announce()
 
     sndbuf[0] = '\0';
 
-    sprintf(tbuf, "cache_version HARVEST/%s\n", version_string);
+    sprintf(tbuf, "cache_version SQUID/%s\n", version_string);
     strcat(sndbuf, tbuf);
     sprintf(tbuf, "Running on %s %d %d\n",
        getMyHostname(),

diff --git a/src/stat.cc b/src/stat.cc
index e85801360f270bfc4f93bebba5f11cd351e17c14..7fa90f223d61f997b5eb00ffa9b2ca42995ca136 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,4 +1,4 @@
-/* $Id: stat.cc,v 1.26 1996/04/16 05:05:30 wessels Exp $ */
+/* $Id: stat.cc,v 1.27 1996/04/16 16:35:31 wessels Exp $ */
 
 /*
  * DEBUG: Section 18          stat
@@ -408,7 +408,7 @@ void info_get(obj, sentry)
 
     storeAppend(sentry, open_bracket, (int) strlen(open_bracket));
 
-    sprintf(line, "{Harvest Object Cache: Version %s}\n", version_string);
+    sprintf(line, "{Squid Object Cache: Version %s}\n", version_string);
     storeAppend(sentry, line, strlen(line));
 
     tod = mkrfc850(&squid_starttime);

diff --git a/src/tools.cc b/src/tools.cc
index f8aaa4dbce6483e4c86ac00ec000ae35adb9986c..09712a893a5c55aaf29f8aaac0fe8b7ff98e3951 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,5 +1,5 @@
 
-/* $Id: tools.cc,v 1.35 1996/04/16 05:13:06 wessels Exp $ */
+/* $Id: tools.cc,v 1.36 1996/04/16 16:35:31 wessels Exp $ */
 
 /*
  * DEBUG: Section 21          tools
@@ -14,12 +14,12 @@ struct timeval current_time;
 extern void serverConnectionsClose _PARAMS((void));
 
 #define DEAD_MSG "\
-The Harvest Cache (version %s) died.\n\
+The Squid Cache (version %s) died.\n\
 \n\
-You've encountered a fatal error in the Harvest Cache version %s.\n\
+You've encountered a fatal error in the Squid Cache version %s.\n\
 If a core file was created (possibly in the swap directory),\n\
 please execute 'gdb squid core' or 'dbx squid core', then type 'where',\n\
-and report the trace back to harvest-dvl@cs.colorado.edu.\n\
+and report the trace back to squid@nlanr.net.\n\
 \n\
 Thanks!\n"
 
@@ -158,7 +158,7 @@ void normal_shutdown()
        safeunlink(getPidFilename(), 0);
     storeWriteCleanLog();
     PrintRusage(NULL, debug_log);
-    debug(21, 0, "Harvest Cache (Version %s): Exiting normally.\n",
+    debug(21, 0, "Squid Cache (Version %s): Exiting normally.\n",
        version_string);
     exit(0);
 }
@@ -187,7 +187,7 @@ void fatal_common(message)
        syslog(LOG_ALERT, message);
 #endif
     fprintf(debug_log, "FATAL: %s\n", message);
-    fprintf(debug_log, "Harvest Cache (Version %s): Terminated abnormally.\n",
+    fprintf(debug_log, "Squid Cache (Version %s): Terminated abnormally.\n",
        version_string);
     fflush(debug_log);
     PrintRusage(NULL, debug_log);