-const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.73 2012/03/09 16:23:50 fabiankeil Exp $";
+const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.75 2012/03/09 17:55:49 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))
/* Allocate new memory for string */
len = strlen(cur_line->unprocessed) + (size_t)numhash;
- if (NULL == (str = malloc(len + 1)))
- {
- /* Uh oh, just trashed file! */
- fclose(fp);
- return JB_ERR_MEMORY;
- }
+ str = malloc_or_die(len + 1);
/* Copy string but quote hashes */
src = cur_line->unprocessed;
}
name_len = (size_t)(name_end - line) + 1; /* Length excluding \0 */
- if (NULL == (*pname = (char *) malloc(name_len + 1)))
- {
- return JB_ERR_MEMORY;
- }
+ *pname = malloc_or_die(name_len + 1);
strncpy(*pname, line, name_len);
(*pname)[name_len] = '\0';
* 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--;
}
cur_line->type = FILE_LINE_ACTION;
/* Remove {} and make copy */
- if (NULL == (value = (char *) malloc(len + 1)))
- {
- /* Out of memory */
- free_alias_list(alias_list);
- return JB_ERR_MEMORY;
- }
+ value = malloc_or_die(len + 1);
strncpy(value, text, len);
value[len] = '\0';
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 != '-')
/* Append extension */
name_size = len + strlen(suffix) + 1;
- name = malloc(name_size);
- if (name == NULL)
- {
- return JB_ERR_MEMORY;
- }
+ name = malloc_or_die(name_size);
strlcpy(name, param, name_size);
strlcat(name, suffix, name_size);
assert(optionname);
assert(values);
- buf = malloc(buf_size);
- if (buf == NULL)
- {
- return JB_ERR_MEMORY;
- }
+ buf = malloc_or_die(buf_size);
strlcpy(buf, optionname, buf_size);
* 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))
cur_line = cur_line->next;
}
- if ((cur_line == NULL)
+ if ( (cur_line == NULL)
|| (line_number != sectionid)
|| (sectionid < 1)
|| (cur_line->type != FILE_LINE_ACTION))
}
newtext_size = len + 2;
- if (NULL == (newtext = malloc(newtext_size)))
- {
- /* Out of memory */
- free(actiontext);
- edit_free_file(file);
- return JB_ERR_MEMORY;
- }
+ newtext = malloc_or_die(newtext_size);
strlcpy(newtext, actiontext, newtext_size);
free(actiontext);
newtext[0] = '{';
}
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);