projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
White-space fix for redirect_url()
[privoxy.git]
/
cgiedit.c
diff --git
a/cgiedit.c
b/cgiedit.c
index
49d9ee0
..
345977e
100644
(file)
--- a/
cgiedit.c
+++ b/
cgiedit.c
@@
-1,4
+1,4
@@
-const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.6
5 2009/03/08 14:19:22
fabiankeil Exp $";
+const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.6
9 2011/04/19 13:00:47
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgiedit.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgiedit.c,v $
@@
-85,10
+85,10
@@
struct file_line
{
/** Next entry in the linked list */
struct file_line * next;
{
/** Next entry in the linked list */
struct file_line * next;
-
+
/** The raw data, to write out if this line is unmodified. */
char * raw;
/** The raw data, to write out if this line is unmodified. */
char * raw;
-
+
/** Comments and/or whitespace to put before this line if it's modified
and then written out. */
char * prefix;
/** Comments and/or whitespace to put before this line if it's modified
and then written out. */
char * prefix;
@@
-97,7
+97,7
@@
struct file_line
are performed on the data read from file before it's stored here, so
it will be a single line of data. */
char * unprocessed;
are performed on the data read from file before it's stored here, so
it will be a single line of data. */
char * unprocessed;
-
+
/** The type of data on this line. One of the FILE_LINE_xxx constants. */
int type;
/** The type of data on this line. One of the FILE_LINE_xxx constants. */
int type;
@@
-327,9
+327,9
@@
static jb_err map_copy_parameter_url(struct map *out,
const char *name);
#endif /* unused function */
const char *name);
#endif /* unused function */
-static jb_err get_file_name_param(struct client_state *csp,
- const struct map *parameters,
- const char *param_name,
+static jb_err get_file_name_param(struct client_state *csp,
+ const struct map *parameters,
+ const char *param_name,
const char **pfilename);
/* Internal convenience functions */
const char **pfilename);
/* Internal convenience functions */
@@
-707,7
+707,7
@@
jb_err cgi_edit_actions_remove_url_form(struct client_state *csp,
if (cur_line->type == FILE_LINE_ACTION)
{
section_start_line_number = line_number;
if (cur_line->type == FILE_LINE_ACTION)
{
section_start_line_number = line_number;
- }
+ }
cur_line = cur_line->next;
}
cur_line = cur_line->next;
}
@@
-1483,7
+1483,7
@@
jb_err edit_read_file_lines(FILE *fp, struct file_line ** pfile, int *newline)
if (rval)
{
/* Out of memory or empty file. */
if (rval)
{
/* Out of memory or empty file. */
- /* Note that empty file is not an error we prop
o
gate up */
+ /* Note that empty file is not an error we prop
a
gate up */
free(cur_line);
return ((rval == JB_ERR_FILE) ? JB_ERR_OK : rval);
}
free(cur_line);
return ((rval == JB_ERR_FILE) ? JB_ERR_OK : rval);
}
@@
-1588,7
+1588,7
@@
jb_err edit_read_file(struct client_state *csp,
* Probably an old-school URL like
* http://config.privoxy.org/edit-actions-list?f=default
*/
* Probably an old-school URL like
* http://config.privoxy.org/edit-actions-list?f=default
*/
-
err =
get_file_name_param(csp, parameters, "f", &filename);
+ get_file_name_param(csp, parameters, "f", &filename);
}
if (NULL == filename || stat(filename, statbuf) < 0)
}
if (NULL == filename || stat(filename, statbuf) < 0)
@@
-1734,7
+1734,7
@@
jb_err edit_read_actions_file(struct client_state *csp,
{
log_error(LOG_LEVEL_INFO,
"Timestamp mismatch limit reached, turning CGI editor off. "
{
log_error(LOG_LEVEL_INFO,
"Timestamp mismatch limit reached, turning CGI editor off. "
- "Reload the configuration file to reenable it.");
+ "Reload the configuration file to re
-
enable it.");
csp->config->feature_flags &= ~RUNTIME_FEATURE_CGI_EDIT_ACTIONS;
}
}
csp->config->feature_flags &= ~RUNTIME_FEATURE_CGI_EDIT_ACTIONS;
}
}
@@
-2873,7
+2873,7
@@
jb_err cgi_edit_actions_for_url(struct client_state *csp,
if (!err) err = actions_to_radio(exports, cur_line->data.action);
/*
if (!err) err = actions_to_radio(exports, cur_line->data.action);
/*
- * XXX: Some browsers (at least IE6 and IE7) have an artifical URL
+ * XXX: Some browsers (at least IE6 and IE7) have an artific
i
al URL
* length limitation and ignore clicks on the Submit buttons if
* the resulting GET URL would be longer than their limit.
*
* length limitation and ignore clicks on the Submit buttons if
* the resulting GET URL would be longer than their limit.
*
@@
-2882,7
+2882,7
@@
jb_err cgi_edit_actions_for_url(struct client_state *csp,
* browsers (BR #1570678).
*
* The config option split-large-forms works around this browser
* browsers (BR #1570678).
*
* The config option split-large-forms works around this browser
- * bug (HTTP has no URL leng
ht
limitation) by deviding the action
+ * bug (HTTP has no URL leng
th
limitation) by deviding the action
* list form into multiple smaller ones. It means the URLs are shorter
* and work in broken browsers as well, but the user can no longer change
* all actions with one submit.
* list form into multiple smaller ones. It means the URLs are shorter
* and work in broken browsers as well, but the user can no longer change
* all actions with one submit.
@@
-3415,7
+3415,7
@@
jb_err cgi_edit_actions_url(struct client_state *csp,
if (cur_line->type == FILE_LINE_ACTION)
{
section_start_line_number = line_number;
if (cur_line->type == FILE_LINE_ACTION)
{
section_start_line_number = line_number;
- }
+ }
cur_line = cur_line->next;
line_number++;
}
cur_line = cur_line->next;
line_number++;
}
@@
-4183,7
+4183,7
@@
jb_err cgi_edit_actions_section_swap(struct client_state *csp,
*
* Description : Converts a string into a form JavaScript will like.
*
*
* Description : Converts a string into a form JavaScript will like.
*
- * Netscape 4's JavaScript sucks - it doesn't use
+ * Netscape 4's JavaScript sucks - it doesn't use
* "id" parameters, so you have to set the "name"
* used to submit a form element to something JavaScript
* will like. (Or access the elements by index in an
* "id" parameters, so you have to set the "name"
* used to submit a form element to something JavaScript
* will like. (Or access the elements by index in an