Re: No unlink_program option?

- Just noticed that there's no unlink_program option - it's hardwired to
- the DEFAULT_UNLINKD. Should be it definable?

        I noticed that myself, as I need to be able to shift where squid's
ancillary programs are when I am upgrading from one version to another.
The only missing code was in the reading of the squid.conf file.

        While adding this I noticed that parseFtpProgramLine() was redundant
as parsePathname() did the same function and was more general, so I changed
references to parseFtpProgramLine() to parsePathname() and deleted
parseFtpProgramLine().

        During testing I noticed that squid doesn't report when there is no
program at the designated place and will run without it. If I get time
I will add checking for existance of a program file into parsePathname()
with an error report to the cache.log if nothing is found.

*** src/cache_cf.c Sat Mar 29 07:28:11 1997
--- src/cache_cf.c Wed Apr 16 18:10:26 1997
***************
*** 242,246 ****
  static void parseErrHtmlLine _PARAMS((void));
  static void parseFtpOptionsLine _PARAMS((void));
- static void parseFtpProgramLine _PARAMS((void));
  static void parseFtpUserLine _PARAMS((void));
  static void parseWordlist _PARAMS((wordlist **));
--- 244,247 ----
***************
*** 719,733 ****
  
  static void
- parseFtpProgramLine(void)
- {
- char *token;
- token = strtok(NULL, w_space);
- if (token == NULL)
- self_destruct();
- safe_free(Config.Program.ftpget);
- Config.Program.ftpget = xstrdup(token);
- }
-
- static void
  parseFtpOptionsLine(void)
  {
--- 724,727 ----
***************
*** 1229,1235 ****
  
          else if (!strcmp(token, "cache_ftp_program"))
! parseFtpProgramLine();
          else if (!strcmp(token, "ftpget_program"))
! parseFtpProgramLine();
  
          else if (!strcmp(token, "cache_ftp_options"))
--- 1231,1237 ----
  
          else if (!strcmp(token, "cache_ftp_program"))
! parsePathname(&Config.Program.ftpget);
          else if (!strcmp(token, "ftpget_program"))
! parsePathname(&Config.Program.ftpget);
  
          else if (!strcmp(token, "cache_ftp_options"))
***************
*** 1246,1249 ****
--- 1248,1254 ----
              parseOnOff(&Config.Options.res_defnames);
  
+ else if (!strcmp(token, "unlinkd_program"))
+ parsePathname(&Config.Program.unlinkd);
+
          else if (!strcmp(token, "redirect_program"))
              parsePathname(&Config.Program.redirect);
*** src/Makefile.in Fri Mar 28 09:19:12 1997
--- src/Makefile.in Mon Apr 21 11:36:57 1997
***************
*** 36,39 ****
--- 36,40 ----
  DEFAULT_FTPGET = $(libexecdir)/ftpget
  DEFAULT_DNSSERVER = $(libexecdir)/dnsserver
+ DEFAULT_UNLINKD = $(libexecdir)/unlinkd
  DEFAULT_CACHE_LOG = $(localstatedir)/logs/cache.log
  DEFAULT_ACCESS_LOG = $(localstatedir)/logs/access.log
***************
*** 127,130 ****
--- 129,133 ----
          -DDEFAULT_FTPGET=\"$(DEFAULT_FTPGET)\" \
          -DDEFAULT_DNSSERVER=\"$(DEFAULT_DNSSERVER)\" \
+ -DDEFAULT_UNLINKD=\"$(DEFAULT_UNLINKD)\" \
          -DDEFAULT_CACHE_LOG=\"$(DEFAULT_CACHE_LOG)\" \
          -DDEFAULT_ACCESS_LOG=\"$(DEFAULT_ACCESS_LOG)\" \
***************
*** 168,171 ****
--- 171,175 ----
          s%@DEFAULT_FTPGET@%$(DEFAULT_FTPGET)%g;\
          s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\
+ s%@DEFAULT_UNLINKD@%$(DEFAULT_UNLINKD)%g;\
          s%@DEFAULT_CACHE_LOG@%$(DEFAULT_CACHE_LOG)%g;\
          s%@DEFAULT_ACCESS_LOG@%$(DEFAULT_ACCESS_LOG)%g;\
*** src/squid.conf.pre.in Sat Mar 29 07:29:07 1997
--- src/squid.conf.pre.in Mon Apr 21 11:32:35 1997
***************
*** 562,565 ****
--- 562,570 ----
  #dns_defnames off
  
+ # TAG: unlinkd_program
+ # Specify the location of the executable for file deletion process.
+ #
+ #unlinkd_program @DEFAULT_UNLINKD@
+
  # TAG: redirect_program
  # Specify the location of the executable for the URL redirector.

-- 
Neil Murray                              Email:  Neil.Murray@aone.com.au
Access One Pty. Ltd.                     http://www.aone.net.au/
41 Malcolm Rd., Braeside                 Phone:  +61 3 9239 1444
Victoria, Australia  3195                Fax:    +61 3 9587 3954