X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loaders.c;h=ae4f9c0c5630dc6569556c75f63c0e0e783ba7e7;hp=0e67da24f7e0b9e63d3eac71f5dff1e3ebe8d92e;hb=ed2423c402fdaada57ae8c397a794f66009f0762;hpb=e4e794d8b8965c902489f8784a6a02859aa3658d diff --git a/loaders.c b/loaders.c index 0e67da24..ae4f9c0c 100644 --- a/loaders.c +++ b/loaders.c @@ -1,4 +1,4 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.92 2012/07/23 12:43:56 fabiankeil Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 1.93 2012/10/21 12:53:33 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ @@ -1446,18 +1446,40 @@ static int file_has_been_modified(const char *filename, time_t last_know_modific * FALSE otherwise. * *********************************************************************/ -int any_loaded_file_changed(const struct file_list *files_to_check) +int any_loaded_file_changed(const struct client_state *csp) { - const struct file_list *file_to_check = files_to_check; + const struct file_list *file_to_check = csp->config->config_file_list; + int i; + + if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified)) + { + return TRUE; + } + + for (i = 0; i < MAX_AF_FILES; i++) + { + if (csp->actions_list[i]) + { + file_to_check = csp->actions_list[i]; + if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified)) + { + return TRUE; + } + } + } - while (file_to_check != NULL) + for (i = 0; i < MAX_AF_FILES; i++) { - if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified)) + if (csp->rlist[i]) { - return TRUE; + file_to_check = csp->rlist[i]; + if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified)) + { + return TRUE; + } } - file_to_check = file_to_check->next; } + return FALSE; }