diff options
| author | Denis Vlasenko | 2007-01-29 23:44:38 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2007-01-29 23:44:38 +0000 |
| commit | 9356b5022cf151df878a65002e9359ac8074576d (patch) | |
| tree | fd26dfda4720cb3c8158d531c01c91fe276b9145 /editors | |
| parent | 322661d025626d7a92482fec232d29f4450dd4b0 (diff) | |
| download | busybox-9356b5022cf151df878a65002e9359ac8074576d.zip busybox-9356b5022cf151df878a65002e9359ac8074576d.tar.gz | |
preparatory patch for -Wwrite-strings #7: sed
remaining: shell (rather scary mess in msh.c)
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/sed.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/editors/sed.c b/editors/sed.c index 70b3609..c0ad3c4 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -235,9 +235,9 @@ static int index_of_next_unescaped_regexp_delim(int delimiter, const char *str) /* * Returns the index of the third delimiter */ -static int parse_regex_delim(char *cmdstr, char **match, char **replace) +static int parse_regex_delim(const char *cmdstr, char **match, char **replace) { - char *cmdstr_ptr = cmdstr; + const char *cmdstr_ptr = cmdstr; char delimiter; int idx = 0; @@ -291,26 +291,30 @@ static int get_address(const char *my_str, int *linenum, regex_t ** regex) } /* Grab a filename. Whitespace at start is skipped, then goes to EOL. */ -static int parse_file_cmd(sed_cmd_t *sed_cmd, char *filecmdstr, char **retval) +static int parse_file_cmd(sed_cmd_t *sed_cmd, const char *filecmdstr, char **retval) { int start = 0, idx, hack = 0; /* Skip whitespace, then grab filename to end of line */ - while (isspace(filecmdstr[start])) start++; + while (isspace(filecmdstr[start])) + start++; idx = start; - while (filecmdstr[idx] && filecmdstr[idx] != '\n') idx++; + while (filecmdstr[idx] && filecmdstr[idx] != '\n') + idx++; /* If lines glued together, put backslash back. */ - if (filecmdstr[idx] == '\n') hack = 1; + if (filecmdstr[idx] == '\n') + hack = 1; if (idx == start) bb_error_msg_and_die("empty filename"); *retval = xstrndup(filecmdstr+start, idx-start+hack+1); - if (hack) (*retval)[idx] = '\\'; + if (hack) + (*retval)[idx] = '\\'; return idx; } -static int parse_subst_cmd(sed_cmd_t *sed_cmd, char *substr) +static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr) { int cflags = bbg.regex_type; char *match; @@ -337,9 +341,9 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, char *substr) if (isdigit(substr[idx])) { if (match[0] != '^') { /* Match 0 treated as all, multiple matches we take the last one. */ - char *pos = substr + idx; - /* FIXME: error check? */ - sed_cmd->which_match = (unsigned short)strtol(substr+idx, &pos, 10); + const char *pos = substr + idx; +/* FIXME: error check? */ + sed_cmd->which_match = (unsigned short)strtol(substr+idx, (char**) &pos, 10); idx = pos - substr; } continue; @@ -361,7 +365,6 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, char *substr) { char *temp; idx += parse_file_cmd(sed_cmd, substr+idx, &temp); - break; } /* Ignore case (gnu exension) */ @@ -395,7 +398,7 @@ out: /* * Process the commands arguments */ -static char *parse_cmd_args(sed_cmd_t *sed_cmd, char *cmdstr) +static const char *parse_cmd_args(sed_cmd_t *sed_cmd, const char *cmdstr) { /* handle (s)ubstitution command */ if (sed_cmd->cmd == 's') |