mirror of
https://github.com/sheumann/hush.git
synced 2024-12-22 14:30:31 +00:00
Mention the opengroup sed reference, add a check which is disabled at present.
This commit is contained in:
parent
505bd0f15a
commit
d5eadea970
@ -41,6 +41,8 @@
|
|||||||
- no pattern space hold space storing / swapping (x, etc.)
|
- no pattern space hold space storing / swapping (x, etc.)
|
||||||
- no labels / branching (: label, b, t, and friends)
|
- no labels / branching (: label, b, t, and friends)
|
||||||
- and lots, lots more.
|
- and lots, lots more.
|
||||||
|
|
||||||
|
Reference http://www.opengroup.org/onlinepubs/007904975/utilities/sed.html
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
@ -419,9 +421,20 @@ static char *parse_cmd_str(struct sed_cmd * const sed_cmd, const char *const cmd
|
|||||||
sed_cmd->invert = 1;
|
sed_cmd->invert = 1;
|
||||||
idx++;
|
idx++;
|
||||||
|
|
||||||
|
#ifdef SED_FEATURE_STRICT_CHECKING
|
||||||
|
/* According to the spec
|
||||||
|
* It is unspecified whether <blank>s can follow a '!' character,
|
||||||
|
* and conforming applications shall not follow a '!' character
|
||||||
|
* with <blank>s.
|
||||||
|
*/
|
||||||
|
if (isblank(cmdstr[idx]) {
|
||||||
|
error_msg_and_die("blank follows '!'");
|
||||||
|
}
|
||||||
|
#else
|
||||||
/* skip whitespace before the command */
|
/* skip whitespace before the command */
|
||||||
while (isspace(cmdstr[idx]))
|
while (isspace(cmdstr[idx]))
|
||||||
idx++;
|
idx++;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* last part (mandatory) will be a command */
|
/* last part (mandatory) will be a command */
|
||||||
@ -429,28 +442,35 @@ static char *parse_cmd_str(struct sed_cmd * const sed_cmd, const char *const cmd
|
|||||||
error_msg_and_die("missing command");
|
error_msg_and_die("missing command");
|
||||||
sed_cmd->cmd = cmdstr[idx];
|
sed_cmd->cmd = cmdstr[idx];
|
||||||
|
|
||||||
|
switch (sed_cmd->cmd) {
|
||||||
/* if it was a single-letter command that takes no arguments (such as 'p'
|
/* if it was a single-letter command that takes no arguments (such as 'p'
|
||||||
* or 'd') all we need to do is increment the index past that command */
|
* or 'd') all we need to do is increment the index past that command */
|
||||||
if (strchr("pd=", sed_cmd->cmd)) {
|
case 'p':
|
||||||
|
case 'd':
|
||||||
|
case '=':
|
||||||
idx++;
|
idx++;
|
||||||
}
|
break;
|
||||||
/* handle (s)ubstitution command */
|
/* handle (s)ubstitution command */
|
||||||
else if (sed_cmd->cmd == 's') {
|
case 's':
|
||||||
idx += parse_subst_cmd(sed_cmd, &cmdstr[idx]);
|
idx += parse_subst_cmd(sed_cmd, &cmdstr[idx]);
|
||||||
}
|
break;
|
||||||
/* handle edit cmds: (a)ppend, (i)nsert, and (c)hange */
|
/* handle edit cmds: (a)ppend, (i)nsert, and (c)hange */
|
||||||
else if (strchr("aic", sed_cmd->cmd)) {
|
case 'a':
|
||||||
if ((sed_cmd->end_line || sed_cmd->end_match) && sed_cmd->cmd != 'c')
|
case 'i':
|
||||||
|
case 'c':
|
||||||
|
if ((sed_cmd->end_line || sed_cmd->end_match) && sed_cmd->cmd != 'c') {
|
||||||
error_msg_and_die("only a beginning address can be specified for edit commands");
|
error_msg_and_die("only a beginning address can be specified for edit commands");
|
||||||
|
}
|
||||||
idx += parse_edit_cmd(sed_cmd, &cmdstr[idx]);
|
idx += parse_edit_cmd(sed_cmd, &cmdstr[idx]);
|
||||||
}
|
break;
|
||||||
/* handle file cmds: (r)ead */
|
/* handle file cmds: (r)ead */
|
||||||
else if (sed_cmd->cmd == 'r') {
|
case 'r':
|
||||||
if (sed_cmd->end_line || sed_cmd->end_match)
|
if (sed_cmd->end_line || sed_cmd->end_match) {
|
||||||
error_msg_and_die("Command only uses one address");
|
error_msg_and_die("Command only uses one address");
|
||||||
idx += parse_file_cmd(sed_cmd, &cmdstr[idx]);
|
|
||||||
}
|
}
|
||||||
else {
|
idx += parse_file_cmd(sed_cmd, &cmdstr[idx]);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
error_msg_and_die("Unsupported command %c", sed_cmd->cmd);
|
error_msg_and_die("Unsupported command %c", sed_cmd->cmd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user