X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=actions.c;h=4e74aaa0bb4c9c4aacd318b0d5f8c8b865963833;hp=e86d613dd4b0993396ce9707838e172f2924a153;hb=07779df6ac1ec5dfa8a9d105b27cd26ad6a63c1f;hpb=b8a25c6ddb98b93e2fea939522025674bf573ab7 diff --git a/actions.c b/actions.c index e86d613d..4e74aaa0 100644 --- a/actions.c +++ b/actions.c @@ -1,4 +1,4 @@ -const char actions_rcs[] = "$Id: actions.c,v 1.14 2001/09/22 16:36:59 jongfoster Exp $"; +const char actions_rcs[] = "$Id: actions.c,v 1.19 2001/11/13 00:14:07 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/actions.c,v $ @@ -10,10 +10,10 @@ const char actions_rcs[] = "$Id: actions.c,v 1.14 2001/09/22 16:36:59 jongfoster * IJBSWA team. http://ijbswa.sourceforge.net * * Based on the Internet Junkbuster originally written - * by and Copyright (C) 1997 Anonymous Coders and + * by and Copyright (C) 1997 Anonymous Coders and * Junkbusters Corporation. http://www.junkbusters.com * - * This program is free software; you can redistribute it + * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General * Public License as published by the Free Software * Foundation; either version 2 of the License, or (at @@ -33,6 +33,34 @@ const char actions_rcs[] = "$Id: actions.c,v 1.14 2001/09/22 16:36:59 jongfoster * * Revisions : * $Log: actions.c,v $ + * Revision 1.19 2001/11/13 00:14:07 jongfoster + * Fixing stupid bug now I've figured out what || means. + * (It always returns 0 or 1, not one of it's paramaters.) + * + * Revision 1.18 2001/11/07 00:06:06 steudten + * Add line number in error output for lineparsing for + * actionsfile. + * + * Revision 1.17 2001/10/25 03:40:47 david__schmidt + * Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple + * threads to call select() simultaneously. So, it's time to do a real, live, + * native OS/2 port. See defines for __EMX__ (the porting layer) vs. __OS2__ + * (native). Both versions will work, but using __OS2__ offers multi-threading. + * + * Revision 1.16 2001/10/23 21:30:30 jongfoster + * Adding error-checking to selected functions. + * + * Revision 1.15 2001/10/14 21:58:22 jongfoster + * Adding support for the CGI-based editor: + * - Exported get_actions() + * - Added new function free_alias_list() + * - Added support for {{settings}} and {{description}} blocks + * in the actions file. They are currently ignored. + * - Added restriction to only one {{alias}} block which must appear + * first in the file, to simplify the editor's rewriting rules. + * - Note that load_actions_file() is no longer used by the CGI-based + * editor, but some of the other routines in this file are. + * * Revision 1.14 2001/09/22 16:36:59 jongfoster * Removing unused parameter fs from read_config_line() * @@ -91,6 +119,8 @@ const char actions_rcs[] = "$Id: actions.c,v 1.14 2001/09/22 16:36:59 jongfoster #include #include +#include +#include #include "project.h" #include "jcc.h" @@ -120,10 +150,10 @@ const char actions_h_rcs[] = ACTIONS_H_VERSION; #define AV_ADD_STRING 1 /* +stropt{string} */ #define AV_REM_STRING 2 /* -stropt */ #define AV_ADD_MULTI 3 /* +multiopt{string} +multiopt{string2} */ -#define AV_REM_MULTI 4 /* -multiopt{string} -multiopt{*} */ +#define AV_REM_MULTI 4 /* -multiopt{string} -multiopt */ /* - * We need a structure to hold the name, flag changes, + * We need a structure to hold the name, flag changes, * type, and string index. */ struct action_name @@ -179,13 +209,14 @@ static const struct action_name action_names[] = * 1 : cur_action = Current actions, to modify. * 2 : new_action = Action to add. * - * Returns : N/A + * Returns : JB_ERR_OK or JB_ERR_MEMORY * *********************************************************************/ -void merge_actions (struct action_spec *dest, - const struct action_spec *src) +jb_err merge_actions (struct action_spec *dest, + const struct action_spec *src) { int i; + jb_err err; dest->mask &= src->mask; dest->add &= src->mask; @@ -198,6 +229,10 @@ void merge_actions (struct action_spec *dest, { freez(dest->string[i]); dest->string[i] = strdup(str); + if (NULL == dest->string[i]) + { + return JB_ERR_MEMORY; + } } } @@ -209,7 +244,7 @@ void merge_actions (struct action_spec *dest, list_remove_all(dest->multi_remove[i]); dest->multi_remove_all[i] = 1; - list_duplicate(dest->multi_add[i], src->multi_add[i]); + err = list_duplicate(dest->multi_add[i], src->multi_add[i]); } else if (dest->multi_remove_all[i]) { @@ -218,16 +253,23 @@ void merge_actions (struct action_spec *dest, * about what we add. */ list_remove_list(dest->multi_add[i], src->multi_remove[i]); - list_append_list_unique(dest->multi_add[i], src->multi_add[i]); + err = list_append_list_unique(dest->multi_add[i], src->multi_add[i]); } else { /* No "remove all"s to worry about. */ list_remove_list(dest->multi_add[i], src->multi_remove[i]); - list_append_list_unique(dest->multi_remove[i], src->multi_remove[i]); - list_append_list_unique(dest->multi_add[i], src->multi_add[i]); + err = list_append_list_unique(dest->multi_remove[i], src->multi_remove[i]); + if (!err) err = list_append_list_unique(dest->multi_add[i], src->multi_add[i]); + } + + if (err) + { + return err; } } + + return JB_ERR_OK; } @@ -247,10 +289,11 @@ void merge_actions (struct action_spec *dest, * Returns : N/A * *********************************************************************/ -void copy_action (struct action_spec *dest, - const struct action_spec *src) +jb_err copy_action (struct action_spec *dest, + const struct action_spec *src) { int i; + jb_err err = JB_ERR_OK; memset(dest, '\0', sizeof(*dest)); @@ -260,15 +303,32 @@ void copy_action (struct action_spec *dest, for (i = 0; i < ACTION_STRING_COUNT; i++) { char * str = src->string[i]; - dest->string[i] = (str ? strdup(str) : NULL); + if (str) + { + str = strdup(str); + if (!str) + { + return JB_ERR_MEMORY; + } + dest->string[i] = str; + } } for (i = 0; i < ACTION_MULTI_COUNT; i++) { dest->multi_remove_all[i] = src->multi_remove_all[i]; - list_duplicate(dest->multi_remove[i], src->multi_remove[i]); - list_duplicate(dest->multi_add[i], src->multi_add[i]); + err = list_duplicate(dest->multi_remove[i], src->multi_remove[i]); + if (err) + { + return err; + } + err = list_duplicate(dest->multi_add[i], src->multi_add[i]); + if (err) + { + return err; + } } + return err; } @@ -325,14 +385,14 @@ void free_action (struct action_spec *src) * we found an action. * 2 : name = [out] Start of action name, null * terminated. NULL on EOL - * 3 : value = [out] Start of action value, null + * 3 : value = [out] Start of action value, null * terminated. NULL if none or EOL. * - * Returns : 0 => Ok - * nonzero => Mismatched {} (line was trashed anyway) + * Returns : JB_ERR_OK => Ok + * JB_ERR_PARSE => Mismatched {} (line was trashed anyway) * *********************************************************************/ -int get_action_token(char **line, char **name, char **value) +jb_err get_action_token(char **line, char **name, char **value) { char * str = *line; char ch; @@ -356,19 +416,19 @@ int get_action_token(char **line, char **name, char **value) if (*str == '{') { /* null name, just value is prohibited */ - return 1; + return JB_ERR_PARSE; } *name = str; /* parse option */ - while (((ch = *str) != '\0') && + while (((ch = *str) != '\0') && (ch != ' ') && (ch != '\t') && (ch != '{')) { if (ch == '}') { - /* error */ - return 1; + /* error, '}' without '{' */ + return JB_ERR_PARSE; } str++; } @@ -387,7 +447,7 @@ int get_action_token(char **line, char **name, char **value) /* More to parse next time. */ *line = str + 1; } - return 0; + return JB_ERR_OK; } str++; @@ -398,7 +458,7 @@ int get_action_token(char **line, char **name, char **value) { /* error */ *value = NULL; - return 1; + return JB_ERR_PARSE; } /* got value */ @@ -407,7 +467,7 @@ int get_action_token(char **line, char **name, char **value) chomp(*value); - return 0; + return JB_ERR_OK; } @@ -424,14 +484,16 @@ int get_action_token(char **line, char **name, char **value) * 3 : cur_action = Where to store the action. Caller * allocates memory. * - * Returns : 0 => Ok - * nonzero => Error (line was trashed anyway) + * Returns : JB_ERR_OK => Ok + * JB_ERR_PARSE => Parse error (line was trashed anyway) + * nonzero => Out of memory (line was trashed anyway) * *********************************************************************/ -int get_actions(char *line, - struct action_alias * alias_list, - struct action_spec *cur_action) +jb_err get_actions(char *line, + struct action_alias * alias_list, + struct action_spec *cur_action) { + jb_err err; init_action(cur_action); cur_action->mask = ACTION_MASK_ALL; @@ -440,15 +502,16 @@ int get_actions(char *line, char * option = NULL; char * value = NULL; - if (get_action_token(&line, &option, &value)) + err = get_action_token(&line, &option, &value); + if (err) { - return 1; + return err; } if (option) { /* handle option in 'option' */ - + /* Check for standard action name */ const struct action_name * action = action_names; @@ -474,11 +537,15 @@ int get_actions(char *line, if ((value == NULL) || (*value == '\0')) { - return 1; + return JB_ERR_PARSE; } /* FIXME: should validate option string here */ freez (cur_action->string[action->index]); cur_action->string[action->index] = strdup(value); + if (NULL == cur_action->string[action->index]) + { + return JB_ERR_MEMORY; + } break; } case AV_REM_STRING: @@ -497,11 +564,15 @@ int get_actions(char *line, if ((value == NULL) || (*value == '\0')) { - return 1; + return JB_ERR_PARSE; } list_remove_item(remove, value); - enlist_unique(add, value, 0); + err = enlist_unique(add, value, 0); + if (err) + { + return err; + } break; } case AV_REM_MULTI: @@ -530,7 +601,11 @@ int get_actions(char *line, if ( !cur_action->multi_remove_all[action->index] ) { /* there isn't a catch-all in the remove list already */ - enlist_unique(remove, value, 0); + err = enlist_unique(remove, value, 0); + if (err) + { + return err; + } } list_remove_item(add, value); } @@ -538,14 +613,15 @@ int get_actions(char *line, } default: /* Shouldn't get here unless there's memory corruption. */ - return 1; + assert(0); + return JB_ERR_PARSE; } } else { /* try user aliases. */ const struct action_alias * alias = alias_list; - + while ( (alias != NULL) && (0 != strcmpic(alias->name, option)) ) { alias = alias->next; @@ -558,13 +634,13 @@ int get_actions(char *line, else { /* Bad action name */ - return 1; + return JB_ERR_PARSE; } } } } - return 0; + return JB_ERR_OK; } @@ -580,6 +656,7 @@ int get_actions(char *line, * 2 : add = As from struct url_actions * * Returns : A string. Caller must free it. + * NULL on out-of-memory error. * *********************************************************************/ char * actions_to_text(struct action_spec *action) @@ -593,50 +670,50 @@ char * actions_to_text(struct action_spec *action) mask |= add; -#define DEFINE_ACTION_BOOL(__name, __bit) \ - if (!(mask & __bit)) \ - { \ - result = strsav(result, " -" __name); \ - } \ - else if (add & __bit) \ - { \ - result = strsav(result, " +" __name); \ +#define DEFINE_ACTION_BOOL(__name, __bit) \ + if (!(mask & __bit)) \ + { \ + string_append(&result, " -" __name); \ + } \ + else if (add & __bit) \ + { \ + string_append(&result, " +" __name); \ } -#define DEFINE_ACTION_STRING(__name, __bit, __index) \ - if (!(mask & __bit)) \ - { \ - result = strsav(result, " -" __name); \ - } \ - else if (add & __bit) \ - { \ - result = strsav(result, " +" __name "{"); \ - result = strsav(result, action->string[__index]); \ - result = strsav(result, "}"); \ +#define DEFINE_ACTION_STRING(__name, __bit, __index) \ + if (!(mask & __bit)) \ + { \ + string_append(&result, " -" __name); \ + } \ + else if (add & __bit) \ + { \ + string_append(&result, " +" __name "{"); \ + string_append(&result, action->string[__index]); \ + string_append(&result, "}"); \ } #define DEFINE_ACTION_MULTI(__name, __index) \ if (action->multi_remove_all[__index]) \ { \ - result = strsav(result, " -" __name "{*}"); \ + string_append(&result, " -" __name); \ } \ else \ { \ lst = action->multi_remove[__index]->first; \ while (lst) \ { \ - result = strsav(result, " -" __name "{"); \ - result = strsav(result, lst->str); \ - result = strsav(result, "}"); \ + string_append(&result, " -" __name "{"); \ + string_append(&result, lst->str); \ + string_append(&result, "}"); \ lst = lst->next; \ } \ } \ lst = action->multi_add[__index]->first; \ while (lst) \ { \ - result = strsav(result, " +" __name "{"); \ - result = strsav(result, lst->str); \ - result = strsav(result, "}"); \ + string_append(&result, " +" __name "{"); \ + string_append(&result, lst->str); \ + string_append(&result, "}"); \ lst = lst->next; \ } @@ -666,6 +743,7 @@ char * actions_to_text(struct action_spec *action) * 2 : add = As from struct url_actions * * Returns : A string. Caller must free it. + * NULL on out-of-memory error. * *********************************************************************/ char * actions_to_html(struct action_spec *action) @@ -680,55 +758,84 @@ char * actions_to_html(struct action_spec *action) mask |= add; -#define DEFINE_ACTION_BOOL(__name, __bit) \ - if (!(mask & __bit)) \ - { \ - result = strsav(result, "\n
-" __name); \ - } \ - else if (add & __bit) \ - { \ - result = strsav(result, "\n
+" __name); \ +#define DEFINE_ACTION_BOOL(__name, __bit) \ + if (!(mask & __bit)) \ + { \ + string_append(&result, "\n
-" __name); \ + } \ + else if (add & __bit) \ + { \ + string_append(&result, "\n
+" __name); \ } #define DEFINE_ACTION_STRING(__name, __bit, __index) \ if (!(mask & __bit)) \ { \ - result = strsav(result, "\n
-" __name); \ + string_append(&result, "\n
-" __name); \ } \ else if (add & __bit) \ { \ - result = strsav(result, "\n
+" __name "{"); \ + string_append(&result, "\n
+" __name "{"); \ + if (NULL == result) \ + { \ + return NULL; \ + } \ enc_str = html_encode(action->string[__index]);\ - result = strsav(result, enc_str); \ - freez(enc_str); \ - result = strsav(result, "}"); \ - } - -#define DEFINE_ACTION_MULTI(__name, __index) \ - if (action->multi_remove_all[__index]) \ - { \ - result = strsav(result, "\n
-" __name "{*}"); \ - } \ - else \ - { \ - lst = action->multi_remove[__index]->first; \ - while (lst) \ + if (NULL == enc_str) \ { \ - result = strsav(result, "\n
-" __name "{");\ - enc_str = html_encode(lst->str); \ - result = strsav(result, enc_str); \ - freez(enc_str); \ - result = strsav(result, "}"); \ - lst = lst->next; \ + free(result); \ + return NULL; \ } \ - } \ - lst = action->multi_add[__index]->first; \ - while (lst) \ - { \ - result = strsav(result, "\n
+" __name "{"); \ - result = strsav(result, lst->str); \ - result = strsav(result, "}"); \ - lst = lst->next; \ + string_append(&result, enc_str); \ + free(enc_str); \ + string_append(&result, "}"); \ + } + +#define DEFINE_ACTION_MULTI(__name, __index) \ + if (action->multi_remove_all[__index]) \ + { \ + string_append(&result, "\n
-" __name); \ + } \ + else \ + { \ + lst = action->multi_remove[__index]->first; \ + while (lst) \ + { \ + string_append(&result, "\n
-" __name "{");\ + if (NULL == result) \ + { \ + return NULL; \ + } \ + enc_str = html_encode(lst->str); \ + if (NULL == enc_str) \ + { \ + free(result); \ + return NULL; \ + } \ + string_append(&result, enc_str); \ + free(enc_str); \ + string_append(&result, "}"); \ + lst = lst->next; \ + } \ + } \ + lst = action->multi_add[__index]->first; \ + while (lst) \ + { \ + string_append(&result, "\n
+" __name "{"); \ + if (NULL == result) \ + { \ + return NULL; \ + } \ + enc_str = html_encode(lst->str); \ + if (NULL == enc_str) \ + { \ + free(result); \ + return NULL; \ + } \ + string_append(&result, enc_str); \ + free(enc_str); \ + string_append(&result, "}"); \ + lst = lst->next; \ } #define DEFINE_ACTION_ALIAS 0 /* No aliases for output */ @@ -763,51 +870,52 @@ char * actions_to_html(struct action_spec *action) * 1 : action = Action * * Returns : A string. Caller must free it. + * NULL on out-of-memory error. * *********************************************************************/ char * current_action_to_text(struct current_action_spec *action) { - unsigned flags = action->flags; + unsigned long flags = action->flags; char * result = strdup(""); struct list_entry * lst; -#define DEFINE_ACTION_BOOL(__name, __bit) \ - if (flags & __bit) \ - { \ - result = strsav(result, " +" __name); \ - } \ - else \ - { \ - result = strsav(result, " -" __name); \ +#define DEFINE_ACTION_BOOL(__name, __bit) \ + if (flags & __bit) \ + { \ + string_append(&result, " +" __name); \ + } \ + else \ + { \ + string_append(&result, " -" __name); \ } -#define DEFINE_ACTION_STRING(__name, __bit, __index) \ - if (flags & __bit) \ - { \ - result = strsav(result, " +" __name "{"); \ - result = strsav(result, action->string[__index]); \ - result = strsav(result, "}"); \ - } \ - else \ - { \ - result = strsav(result, " -" __name); \ +#define DEFINE_ACTION_STRING(__name, __bit, __index) \ + if (flags & __bit) \ + { \ + string_append(&result, " +" __name "{"); \ + string_append(&result, action->string[__index]); \ + string_append(&result, "}"); \ + } \ + else \ + { \ + string_append(&result, " -" __name); \ } -#define DEFINE_ACTION_MULTI(__name, __index) \ - lst = action->multi[__index]->first; \ - if (lst == NULL) \ - { \ - result = strsav(result, " -" __name); \ - } \ - else \ - { \ - while (lst) \ - { \ - result = strsav(result, " +" __name "{"); \ - result = strsav(result, lst->str); \ - result = strsav(result, "}"); \ - lst = lst->next; \ - } \ +#define DEFINE_ACTION_MULTI(__name, __index) \ + lst = action->multi[__index]->first; \ + if (lst == NULL) \ + { \ + string_append(&result, " -" __name); \ + } \ + else \ + { \ + while (lst) \ + { \ + string_append(&result, " +" __name "{"); \ + string_append(&result, lst->str); \ + string_append(&result, "}"); \ + lst = lst->next; \ + } \ } #define DEFINE_ACTION_ALIAS 0 /* No aliases for output */ @@ -879,13 +987,15 @@ void init_action (struct action_spec *dest) * 1 : dest = Current actions, to modify. * 2 : src = Action to add. * - * Returns : N/A + * Returns 0 : no error + * !=0 : error * *********************************************************************/ -void merge_current_action (struct current_action_spec *dest, - const struct action_spec *src) +jb_err merge_current_action (struct current_action_spec *dest, + const struct action_spec *src) { int i; + jb_err err = JB_ERR_OK; dest->flags &= src->mask; dest->flags |= src->add; @@ -895,8 +1005,13 @@ void merge_current_action (struct current_action_spec *dest, char * str = src->string[i]; if (str) { + str = strdup(str); + if (!str) + { + return JB_ERR_MEMORY; + } freez(dest->string[i]); - dest->string[i] = strdup(str); + dest->string[i] = str; } } @@ -905,14 +1020,23 @@ void merge_current_action (struct current_action_spec *dest, if (src->multi_remove_all[i]) { /* Remove everything from dest, then add src->multi_add */ - list_duplicate(dest->multi[i], src->multi_add[i]); + err = list_duplicate(dest->multi[i], src->multi_add[i]); + if (err) + { + return err; + } } else { list_remove_list(dest->multi[i], src->multi_remove[i]); - list_append_list_unique(dest->multi[i], src->multi_add[i]); + err = list_append_list_unique(dest->multi[i], src->multi_add[i]); + if (err) + { + return err; + } } } + return err; } @@ -994,7 +1118,7 @@ void free_alias_list(struct action_alias *alias_list) { struct action_alias * next = alias_list->next; alias_list->next = NULL; - freez((char *)alias_list->name); + freez(alias_list->name); free_action(alias_list->action); free(alias_list); alias_list = next; @@ -1040,6 +1164,7 @@ int load_actions_file(struct client_state *csp) struct action_spec * cur_action = NULL; int cur_action_used = 0; struct action_alias * alias_list = NULL; + unsigned long linenum = 0; if (!check_file_changed(current_actions_file, csp->config->actions_file, &fs)) { @@ -1072,7 +1197,7 @@ int load_actions_file(struct client_state *csp) return 1; /* never get here */ } - while (read_config_line(buf, sizeof(buf), fp) != NULL) + while (read_config_line(buf, sizeof(buf), fp, &linenum) != NULL) { if (*buf == '{') { @@ -1087,9 +1212,9 @@ int load_actions_file(struct client_state *csp) { /* too short */ fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load actions file '%s': invalid line: %s", - csp->config->actions_file, buf); + log_error(LOG_LEVEL_FATAL, + "can't load actions file '%s': invalid line (%lu): %s", + csp->config->actions_file, linenum, buf); return 1; /* never get here */ } @@ -1101,9 +1226,9 @@ int load_actions_file(struct client_state *csp) { /* too short */ fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load actions file '%s': invalid line: {{ }}", - csp->config->actions_file); + log_error(LOG_LEVEL_FATAL, + "can't load actions file '%s': invalid line (%lu): {{ }}", + csp->config->actions_file, linenum); return 1; /* never get here */ } @@ -1133,9 +1258,9 @@ int load_actions_file(struct client_state *csp) * appear once. */ fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load actions file '%s': {{settings}} must only appear once, and it must be before anything else.", - csp->config->actions_file); + log_error(LOG_LEVEL_FATAL, + "can't load actions file '%s': line %lu: {{settings}} must only appear once, and it must be before anything else.", + csp->config->actions_file, linenum); } mode = MODE_SETTINGS; } @@ -1147,9 +1272,9 @@ int load_actions_file(struct client_state *csp) /* {{description}} is a singleton and only {{settings}} may proceed it */ fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load actions file '%s': {{description}} must only appear once, and only a {{settings}} block may be above it.", - csp->config->actions_file); + log_error(LOG_LEVEL_FATAL, + "can't load actions file '%s': line %lu: {{description}} must only appear once, and only a {{settings}} block may be above it.", + csp->config->actions_file, linenum); } mode = MODE_DESCRIPTION; } @@ -1169,9 +1294,9 @@ int load_actions_file(struct client_state *csp) * completely rewriting the file becomes non-trivial) */ fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load actions file '%s': {{alias}} must only appear once, and it must be before all actions.", - csp->config->actions_file, start); + log_error(LOG_LEVEL_FATAL, + "can't load actions file '%s': line %lu: {{alias}} must only appear once, and it must be before all actions.", + csp->config->actions_file, linenum); } mode = MODE_ALIAS; } @@ -1179,9 +1304,9 @@ int load_actions_file(struct client_state *csp) { /* invalid {{something}} block */ fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load actions file '%s': invalid line: {{%s}}", - csp->config->actions_file, start); + log_error(LOG_LEVEL_FATAL, + "can't load actions file '%s': invalid line (%lu): {{%s}}", + csp->config->actions_file, linenum, start); return 1; /* never get here */ } } @@ -1210,7 +1335,7 @@ int load_actions_file(struct client_state *csp) if (cur_action == NULL) { fclose(fp); - log_error(LOG_LEVEL_FATAL, + log_error(LOG_LEVEL_FATAL, "can't load actions file '%s': out of memory", csp->config->actions_file); return 1; /* never get here */ @@ -1224,11 +1349,11 @@ int load_actions_file(struct client_state *csp) end = actions_buf + strlen(actions_buf) - 1; if (*end != '}') { - /* too short */ + /* No closing } */ fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load actions file '%s': invalid line: %s", - csp->config->actions_file, buf); + log_error(LOG_LEVEL_FATAL, + "can't load actions file '%s': invalid line (%lu): %s", + csp->config->actions_file, linenum, buf); return 1; /* never get here */ } *end = '\0'; @@ -1236,23 +1361,13 @@ int load_actions_file(struct client_state *csp) /* trim any whitespace immediately inside {} */ chomp(actions_buf); - if (*actions_buf == '\0') - { - /* too short */ - fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load actions file '%s': invalid line: %s", - csp->config->actions_file, buf); - return 1; /* never get here */ - } - if (get_actions(actions_buf, alias_list, cur_action)) { /* error */ fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load actions file '%s': invalid line: %s", - csp->config->actions_file, buf); + log_error(LOG_LEVEL_FATAL, + "can't load actions file '%s': invalid line (%lu): %s", + csp->config->actions_file, linenum, buf); return 1; /* never get here */ } } @@ -1285,9 +1400,9 @@ int load_actions_file(struct client_state *csp) if ((start == NULL) || (start == buf)) { - log_error(LOG_LEVEL_FATAL, - "can't load actions file '%s': invalid alias line: %s", - csp->config->actions_file, buf); + log_error(LOG_LEVEL_FATAL, + "can't load actions file '%s': invalid alias line (%lu): %s", + csp->config->actions_file, linenum, buf); return 1; /* never get here */ } @@ -1320,9 +1435,9 @@ int load_actions_file(struct client_state *csp) } if (*start == '\0') { - log_error(LOG_LEVEL_FATAL, - "can't load actions file '%s': invalid alias line: %s", - csp->config->actions_file, buf); + log_error(LOG_LEVEL_FATAL, + "can't load actions file '%s': invalid alias line (%lu): %s", + csp->config->actions_file, linenum, buf); return 1; /* never get here */ } @@ -1334,12 +1449,12 @@ int load_actions_file(struct client_state *csp) { /* error */ fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load actions file '%s': invalid alias line: %s = %s", - csp->config->actions_file, buf, start); + log_error(LOG_LEVEL_FATAL, + "can't load actions file '%s': invalid alias line (%lu): %s = %s", + csp->config->actions_file, linenum, buf, start); return 1; /* never get here */ } - + /* add to list */ new_alias->next = alias_list; alias_list = new_alias; @@ -1365,9 +1480,9 @@ int load_actions_file(struct client_state *csp) if (create_url_spec(perm->url, buf)) { fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load actions file '%s': cannot create URL pattern from: %s", - csp->config->actions_file, buf); + log_error(LOG_LEVEL_FATAL, + "can't load actions file '%s': line %lu: cannot create URL pattern from: %s", + csp->config->actions_file, linenum, buf); return 1; /* never get here */ } @@ -1379,16 +1494,16 @@ int load_actions_file(struct client_state *csp) { /* oops - please have a {} line as 1st line in file. */ fclose(fp); - log_error(LOG_LEVEL_FATAL, - "can't load actions file '%s': first line is invalid: %s", - csp->config->actions_file, buf); + log_error(LOG_LEVEL_FATAL, + "can't load actions file '%s': first needed line (%lu) is invalid: %s", + csp->config->actions_file, linenum, buf); return 1; /* never get here */ } else { /* How did we get here? This is impossible! */ fclose(fp); - log_error(LOG_LEVEL_FATAL, + log_error(LOG_LEVEL_FATAL, "can't load actions file '%s': INTERNAL ERROR - mode = %d", csp->config->actions_file, mode); return 1; /* never get here */ @@ -1396,7 +1511,7 @@ int load_actions_file(struct client_state *csp) } fclose(fp); - + free_action(cur_action); free_alias_list(alias_list);