-const char loaders_rcs[] = "$Id: loaders.c,v 1.73 2009/05/16 13:27:20 fabiankeil Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.79 2011/01/14 19:47:16 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
* the list of active loaders, and to automatically
* unload files that are no longer in use.
*
- * Copyright : Written by and Copyright (C) 2001-2009 the
+ * Copyright : Written by and Copyright (C) 2001-2010 the
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
unsigned int sweep(void)
{
struct file_list *fl, *nfl;
- struct client_state *csp, *last_active;
+ struct client_state *csp;
+ struct client_states *last_active, *client_list;
int i;
unsigned int active_threads = 0;
}
last_active = clients;
- csp = clients->next;
+ client_list = clients->next;
- while (NULL != csp)
+ while (NULL != client_list)
{
+ csp = &client_list->csp;
if (csp->flags & CSP_FLAG_ACTIVE)
{
/* Mark this client's files as active */
active_threads++;
- last_active = csp;
- csp = csp->next;
+ last_active = client_list;
+ client_list = client_list->next;
}
else
/*
* This client is not active. Free its resources.
*/
{
- last_active->next = csp->next;
+ last_active->next = client_list->next;
freez(csp->ip_addr_str);
freez(csp->iob->buf);
}
#endif /* def FEATURE_STATISTICS */
- freez(csp);
+ freez(client_list);
- csp = last_active->next;
+ client_list = last_active->next;
}
}
if (strlen(buf2) + 1U > buflen)
{
log_error(LOG_LEVEL_FATAL,
- "Max line limit reached. Linenumber: %u. Lenght: %u. Max lenght: %u.",
+ "Max line limit reached. Linenumber: %u. Length: %u. Max length: %u.",
*linenum, strlen(buf2), buflen-1);
}
strlcpy(buf, buf2, buflen);
if (!check_file_changed(current_trustfile, csp->config->trustfile, &fs))
{
/* No need to load */
- if (csp)
- {
- csp->tlist = current_trustfile;
- }
+ csp->tlist = current_trustfile;
return(0);
}
if (!fs)
{
goto load_trustfile_error;
}
+ log_error(LOG_LEVEL_INFO, "Loading trust file: %s", csp->config->trustfile);
tl = csp->config->trust_list;
goto load_re_filterfile_error;
}
+ log_error(LOG_LEVEL_INFO, "Loading filter file: %s", csp->config->re_filterfile[fileid]);
+
/*
* Read line by line
*/
}
+/*********************************************************************
+ *
+ * Function : file_has_been_modified
+ *
+ * Description : Helper function to check if a file has been changed
+ *
+ * Parameters :
+ * 1 : filename = The name of the file to check
+ * 2 : last_known_modification = The time of the last known
+ * modification
+ *
+ * Returns : TRUE if the file has been changed,
+ * FALSE otherwise.
+ *
+ *********************************************************************/
+static int file_has_been_modified(const char *filename, time_t last_know_modification)
+{
+ struct stat statbuf[1];
+
+ if (stat(filename, statbuf) < 0)
+ {
+ /* Error, probably file not found which counts as change. */
+ return 1;
+ }
+
+ return (last_know_modification != statbuf->st_mtime);
+}
+
+
+/*********************************************************************
+ *
+ * Function : any_loaded_file_changed
+ *
+ * Description : Helper function to check if any loaded file has been
+ * changed since the time it has been loaded.
+ *
+ * XXX: Should we cache the return value for x seconds?
+ *
+ * Parameters :
+ * 1 : files_to_check = List of files to check
+ *
+ * Returns : TRUE if any file has been changed,
+ * FALSE otherwise.
+ *
+ *********************************************************************/
+int any_loaded_file_changed(const struct file_list *files_to_check)
+{
+ const struct file_list *file_to_check = files_to_check;
+
+ while (file_to_check != NULL)
+ {
+ if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified))
+ {
+ log_error(LOG_LEVEL_INFO,
+ "File modification detected: %s", file_to_check->filename);
+ return TRUE;
+ }
+ file_to_check = file_to_check->next;
+ }
+ return FALSE;
+}
+
/*
Local Variables: