-const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.72 2011/12/31 14:47:44 fabiankeil Exp $";
+const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.74 2012/03/09 16:24:36 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgiedit.c,v $
cur_line = cur_line->next;
}
- if ((cur_line == NULL)
+ if ( (cur_line == NULL)
|| (line_number != patternid)
|| (patternid < 1U)
|| (cur_line->type != FILE_LINE_URL))
cur_line = cur_line->next;
}
- if ((cur_line == NULL)
+ if ( (cur_line == NULL)
|| (line_number != patternid)
|| (patternid < 1U)
|| (cur_line->type != FILE_LINE_URL))
* empty (which is valid, but pointless).
*/
while ((cur_line != NULL)
- && (cur_line->unprocessed[0] == '\0'))
+ && (cur_line->unprocessed[0] == '\0'))
{
/* Blank line */
cur_line->type = FILE_LINE_BLANK;
}
if ((cur_line != NULL)
- && (cur_line->unprocessed[0] != '{'))
+ && (cur_line->unprocessed[0] != '{'))
{
/* File doesn't start with a header */
file->parse_error = cur_line;
}
if ((cur_line != NULL) && (0 ==
- match_actions_file_header_line(cur_line->unprocessed, "settings")) )
+ match_actions_file_header_line(cur_line->unprocessed, "settings")))
{
cur_line->type = FILE_LINE_SETTINGS_HEADER;
}
if ((cur_line != NULL) && (0 ==
- match_actions_file_header_line(cur_line->unprocessed, "description")) )
+ match_actions_file_header_line(cur_line->unprocessed, "description")))
{
cur_line->type = FILE_LINE_DESCRIPTION_HEADER;
}
if ((cur_line != NULL) && (0 ==
- match_actions_file_header_line(cur_line->unprocessed, "alias")) )
+ match_actions_file_header_line(cur_line->unprocessed, "alias")))
{
cur_line->type = FILE_LINE_ALIAS_HEADER;
}
while ((len > (size_t)0)
&& ((text[len - 1] == ' ')
- || (text[len - 1] == '\t')) )
+ || (text[len - 1] == '\t')))
{
len--;
}
s = param;
while ((ch = *s++) != '\0')
{
- if (((ch < 'A') || (ch > 'Z'))
+ if ( ((ch < 'A') || (ch > 'Z'))
&& ((ch < 'a') || (ch > 'z'))
&& ((ch < '0') || (ch > '9'))
&& (ch != '-')
* cur_line->next = /
* cur_line->next->next = {...actions...} or EOF
*/
- if ((cur_line != NULL)
+ if ( (cur_line != NULL)
&& (cur_line->type == FILE_LINE_ACTION)
&& (cur_line->next != NULL)
&& (cur_line->next->type == FILE_LINE_URL)
&& (0 == strcmp(cur_line->next->unprocessed, "/"))
- && ((cur_line->next->next == NULL)
+ && ( (cur_line->next->next == NULL)
|| (cur_line->next->next->type != FILE_LINE_URL)
- ) )
+ ) )
{
/*
* Generate string with buttons to set actions for "/" to
if (!err) err = map(section_exports, "s-next", 1, buf, 1);
if ((cur_line != NULL)
- && (cur_line->type == FILE_LINE_ACTION))
+ && (cur_line->type == FILE_LINE_ACTION))
{
/* Not last section */
if (!err) err = map_block_keep(section_exports, "s-next-exists");
cur_line = cur_line->next;
}
- if ((cur_line == NULL)
+ if ( (cur_line == NULL)
|| (line_number != sectionid)
|| (sectionid < 1)
|| (cur_line->type != FILE_LINE_ACTION))
* A better solution would be to switch to POST requests,
* but this will do for now.
*/
- if(!err && (csp->config->feature_flags & RUNTIME_FEATURE_SPLIT_LARGE_FORMS))
+ if (!err && (csp->config->feature_flags & RUNTIME_FEATURE_SPLIT_LARGE_FORMS))
{
/* Generate multiple smaller form by killing the big one. */
err = map_block_killer(exports, "one-form-only");
cur_line = cur_line->next;
}
- if ((cur_line == NULL)
+ if ( (cur_line == NULL)
|| (line_number != sectionid)
|| (sectionid < 1)
|| (cur_line->type != FILE_LINE_ACTION))
}
}
- if(err)
+ if (err)
{
/* Out of memory */
edit_free_file(file);
}
if ((cur_line == NULL)
- || (cur_line->type != FILE_LINE_URL))
+ || (cur_line->type != FILE_LINE_URL))
{
/* Invalid "patternid" parameter */
free(new_pattern);
}
if ((cur_line == NULL)
- || (cur_line->type != FILE_LINE_ACTION))
+ || (cur_line->type != FILE_LINE_ACTION))
{
/* Invalid "sectionid" parameter */
free(new_pattern);
line_number++;
}
- if ((cur_line == NULL)
+ if ( (cur_line == NULL)
|| (prev_line == NULL)
|| (cur_line->type != FILE_LINE_URL))
{
}
if ((cur_line == NULL)
- || (cur_line->type != FILE_LINE_ACTION))
+ || (cur_line->type != FILE_LINE_ACTION))
{
/* Invalid "sectionid" parameter */
edit_free_file(file);
}
if ((cur_line->next != NULL)
- && (cur_line->next->type == FILE_LINE_URL))
+ && (cur_line->next->type == FILE_LINE_URL))
{
/* Section not empty. */
edit_free_file(file);
}
if ((cur_line == NULL)
- || (cur_line->type != FILE_LINE_ACTION))
+ || (cur_line->type != FILE_LINE_ACTION))
{
/* Invalid "sectionid" parameter */
edit_free_file(file);
/* Skip through the section to find the last line in it. */
while ((cur_line->next != NULL)
- && (cur_line->next->type != FILE_LINE_ACTION))
+ && (cur_line->next->type != FILE_LINE_ACTION))
{
cur_line = cur_line->next;
line_number++;
}
if ((cur_line == NULL)
- || (cur_line->type != FILE_LINE_ACTION))
+ || (cur_line->type != FILE_LINE_ACTION))
{
/* Invalid "section1" parameter */
edit_free_file(file);
}
if ((cur_line == NULL)
- || (cur_line->type != FILE_LINE_ACTION))
+ || (cur_line->type != FILE_LINE_ACTION))
{
/* Invalid "section2" parameter */
edit_free_file(file);