mirrors/busybox
0
0
Fork 0
mirror of https://git.busybox.net/busybox.git synced 2024-11-24 06:03:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

New commands, 'G' and 'H'

Browse Source
This commit is contained in:
Glenn L McGrath 2003-04-26 07:40:07 +00:00
parent 69f28e7c0c
commit 91e1978ff0
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
editors/sed.c
View File

@ -483,7 +483,7 @@ static char *parse_cmd_str(sed_cmd_t * sed_cmd, char *cmdstr)
/* if it wasnt a single-letter command that takes no arguments /* if it wasnt a single-letter command that takes no arguments
* then it must be an invalid command. * then it must be an invalid command.
*/ */
else if (strchr("dghnNpPqx={}", sed_cmd->cmd) == 0) { else if (strchr("dgGhHnNpPqx={}", sed_cmd->cmd) == 0) {
bb_error_msg_and_die("Unsupported command %c", sed_cmd->cmd); bb_error_msg_and_die("Unsupported command %c", sed_cmd->cmd);
} }
@ -1034,10 +1034,30 @@ static void process_file(FILE * file)
free(pattern_space); free(pattern_space);
pattern_space = strdup(hold_space); pattern_space = strdup(hold_space);
break; break;
case 'G': { /* Append newline and hold space to pattern space */
int pattern_space_size = 0;
if (pattern_space) {
pattern_space_size = strlen(pattern_space);
}
pattern_space = xrealloc(pattern_space, pattern_space_size + strlen(hold_space) + 2);
strcat(pattern_space, "\n");
strcat(pattern_space, hold_space);
break;
}
case 'h': /* Replace hold space with pattern space */ case 'h': /* Replace hold space with pattern space */
free(hold_space); free(hold_space);
hold_space = strdup(pattern_space); hold_space = strdup(pattern_space);
break; break;
case 'H': { /* Append newline and pattern space to hold space */
int hold_space_size = 0;
if (hold_space) {
hold_space_size = strlen(hold_space);
}
hold_space = xrealloc(hold_space, hold_space_size + strlen(pattern_space) + 2);
strcat(hold_space, "\n");
strcat(hold_space, pattern_space);
break;
}
case 'x':{ case 'x':{
/* Swap hold and pattern space */ /* Swap hold and pattern space */
char *tmp = pattern_space; char *tmp = pattern_space;