-const char loaders_rcs[] = "$Id: loaders.c,v 1.77 2010/12/26 15:30:28 fabiankeil Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.81 2011/03/03 14:38:36 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
p = buf;
/*
- * Character codes. If you have a wierd compiler and the following are
+ * Character codes. If you have a weird compiler and the following are
* incorrect, you also need to fix NEWLINE() in loaders.h
*/
#define CHAR_CR '\r' /* ASCII 13 */
* and respects escaping of newline and comment char.
*
* Parameters :
- * 1 : buf = Buffer to use.
- * 2 : buflen = Size of buffer in bytes.
- * 3 : fp = File to read from
- * 4 : linenum = linenumber in file
+ * 1 : fp = File to read from
+ * 2 : linenum = linenumber in file
+ * 3 : buf = Pointer to a pointer to set to the data buffer.
*
* Returns : NULL on EOF or error
* Otherwise, returns buf.
*
*********************************************************************/
-char *read_config_line(char *buf, size_t buflen, FILE *fp, unsigned long *linenum)
+char *read_config_line(FILE *fp, unsigned long *linenum, char **buf)
{
jb_err err;
- char *buf2 = NULL;
- err = edit_read_line(fp, NULL, NULL, &buf2, NULL, linenum);
+ err = edit_read_line(fp, NULL, NULL, buf, NULL, linenum);
if (err)
{
if (err == JB_ERR_MEMORY)
{
log_error(LOG_LEVEL_FATAL, "Out of memory loading a config file");
}
- return NULL;
- }
- else
- {
- assert(buf2);
- if (strlen(buf2) + 1U > buflen)
- {
- log_error(LOG_LEVEL_FATAL,
- "Max line limit reached. Linenumber: %u. Lenght: %u. Max lenght: %u.",
- *linenum, strlen(buf2), buflen-1);
- }
- strlcpy(buf, buf2, buflen);
- free(buf2);
- return buf;
+ *buf = NULL;
}
+ return *buf;
}
struct block_spec *b, *bl;
struct url_spec **tl;
- char buf[BUFFER_SIZE], *p, *q;
+ char *buf = NULL;
int reject, trusted;
struct file_list *fs;
unsigned long linenum = 0;
tl = csp->config->trust_list;
- while (read_config_line(buf, sizeof(buf), fp, &linenum) != NULL)
+ while (read_config_line(fp, &linenum, &buf) != NULL)
{
trusted = 0;
reject = 1;
if (*buf == '~')
{
+ char *p;
+ char *q;
+
reject = 0;
p = buf;
q = p+1;
/* skip blank lines */
if (*buf == '\0')
{
+ freez(buf);
continue;
}
*tl++ = b->url;
}
}
+ freez(buf);
}
if(trusted_referrers >= MAX_TRUSTED_REFERRERS)
{
csp->tlist = fs;
}
-
return(0);
load_trustfile_error:
log_error(LOG_LEVEL_FATAL, "can't load trustfile '%s': %E",
- csp->config->trustfile);
+ csp->config->trustfile);
+ freez(buf);
return(-1);
}
struct re_filterfile_spec *new_bl, *bl = NULL;
struct file_list *fs;
- char buf[BUFFER_SIZE];
+ char *buf = NULL;
int error;
unsigned long linenum = 0;
pcrs_job *dummy, *lastjob = NULL;
/*
* Read line by line
*/
- while (read_config_line(buf, sizeof(buf), fp, &linenum) != NULL)
+ while (read_config_line(fp, &linenum, &buf) != NULL)
{
int new_filter = NO_NEW_FILTER;
log_error(LOG_LEVEL_RE_FILTER, "Reading in filter \"%s\" (\"%s\")", bl->name, bl->description);
+ freez(buf);
continue;
}
bl->dynamic = 1;
log_error(LOG_LEVEL_RE_FILTER,
"Adding dynamic re_filter job \'%s\' to filter %s succeeded.", buf, bl->name);
+ freez(buf);
continue;
}
else if (bl->dynamic)
*/
log_error(LOG_LEVEL_RE_FILTER,
"Adding static re_filter job \'%s\' to dynamic filter %s succeeded.", buf, bl->name);
+ freez(buf);
continue;
}
{
log_error(LOG_LEVEL_ERROR,
"Adding re_filter job \'%s\' to filter %s failed with error %d.", buf, bl->name, error);
+ freez(buf);
continue;
}
else
log_error(LOG_LEVEL_ERROR, "Ignoring job %s outside filter block in %s, line %d",
buf, csp->config->re_filterfile[fileid], linenum);
}
+ freez(buf);
}
fclose(fp);
{
if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified))
{
- log_error(LOG_LEVEL_INFO, "%s has been changed", file_to_check->filename);
+ log_error(LOG_LEVEL_INFO,
+ "File modification detected: %s", file_to_check->filename);
return TRUE;
}
file_to_check = file_to_check->next;