Added the \CregexpC syntax as an alternative for /regexp/ (like GNU sed)
[oweals/busybox.git] / editors / sed.c
index 1342a66433554a7bf9dce8fb02cfaee22ac2427f..5fc3a14a5f9ae6bd35756fcdf102692b17ebf571 100644 (file)
@@ -1,8 +1,9 @@
 /*
  * sed.c - very minimalist version of sed
  *
- * Copyright (C) 1999,2000,2001 by Lineo, inc.
- * Written by Mark Whitley <markw@lineo.com>, <markw@codepoet.org>
+ * Copyright (C) 1999,2000,2001 by Lineo, inc. and Mark Whitley
+ * Copyright (C) 1999,2000,2001 by Mark Whitley <markw@codepoet.org>
+ * Copyright (C) 2002  Matt Kraai
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +28,7 @@
         - address matching: num|/matchstr/[,num|/matchstr/|$]command
         - commands: (p)rint, (d)elete, (s)ubstitue (with g & I flags)
         - edit commands: (a)ppend, (i)nsert, (c)hange
+        - file commands: (r)ead
         - backreferences in substitution expressions (\1, \2...\9)
         
         (Note: Specifying an address (range) to match is *optional*; commands
@@ -60,36 +62,43 @@ static int be_quiet = 0;
 
 
 struct sed_cmd {
-
-
-       /* GENERAL FIELDS */
-       char delimiter;     /* The delimiter used to separate regexps */
+       /* Order by alignment requirements */
 
        /* address storage */
-       int beg_line; /* 'sed 1p'   0 == no begining line, apply commands to all lines */
-       int end_line; /* 'sed 1,3p' 0 == no end line, use only beginning. -1 == $ */
        regex_t *beg_match; /* sed -e '/match/cmd' */
        regex_t *end_match; /* sed -e '/match/,/end_match/cmd' */
 
-       /* the command */
-       char cmd; /* p,d,s (add more at your leisure :-) */
-
-
        /* SUBSTITUTION COMMAND SPECIFIC FIELDS */
 
        /* sed -e 's/sub_match/replace/' */
        regex_t *sub_match;
        char *replace;
+
+       /* EDIT COMMAND (a,i,c) SPECIFIC FIELDS */
+       char *editline;
+
+       /* FILE COMMAND (r) SPECIFIC FIELDS */
+       char *filename;
+
+       /* address storage */
+       int beg_line; /* 'sed 1p'   0 == no begining line, apply commands to all lines */
+       int end_line; /* 'sed 1,3p' 0 == no end line, use only beginning. -1 == $ */
+       /* SUBSTITUTION COMMAND SPECIFIC FIELDS */
+
        unsigned int num_backrefs:4; /* how many back references (\1..\9) */
                        /* Note:  GNU/POSIX sed does not save more than nine backrefs, so
                         * we only use 4 bits to hold the number */
        unsigned int sub_g:1; /* sed -e 's/foo/bar/g' (global) */
        unsigned int sub_p:2; /* sed -e 's/foo/bar/p' (print substitution) */
 
+       /* GENERAL FIELDS */
+       char delimiter;     /* The delimiter used to separate regexps */
 
-       /* EDIT COMMAND (a,i,c) SPEICIFIC FIELDS */
+       /* the command */
+       char cmd; /* p,d,s (add more at your leisure :-) */
 
-       char *editline;
+       /* inversion flag */
+       int invert;         /* the '!' after the address */ 
 };
 
 /* globals */
@@ -98,8 +107,10 @@ static int ncmds = 0; /* number of sed commands */
 
 /*static char *cur_file = NULL;*/ /* file currently being processed XXX: do I need this? */
 
-#ifdef BB_FEATURE_CLEAN_UP
-static void destroy_cmd_strs()
+const char * const semicolon_whitespace = "; \n\r\t\v\0";
+
+#ifdef CONFIG_FEATURE_CLEAN_UP
+static void destroy_cmd_strs(void)
 {
        if (sed_cmds == NULL)
                return;
@@ -136,10 +147,24 @@ static void destroy_cmd_strs()
  * expression delimiter (typically a forward * slash ('/')) not preceeded by 
  * a backslash ('\').
  */
-static int index_of_next_unescaped_regexp_delim(struct sed_cmd *sed_cmd, const char *str, int idx)
+static int index_of_next_unescaped_regexp_delim(const struct sed_cmd * const sed_cmd, const char *str, int idx)
 {
-       for ( ; str[idx]; idx++) {
-               if (str[idx] == sed_cmd->delimiter && str[idx-1] != '\\')
+       int bracket = -1;
+       int escaped = 0;
+       char ch;
+
+       for ( ; (ch = str[idx]); idx++) {
+               if (bracket != -1) {
+                       if (ch == ']' && !(bracket == idx - 1 ||
+                                                                        (bracket == idx - 2 && str[idx-1] == '^')))
+                               bracket = -1;
+               } else if (escaped)
+                       escaped = 0;
+               else if (ch == '\\')
+                       escaped = 1;
+               else if (ch == '[')
+                       bracket = idx;
+               else if (ch == sed_cmd->delimiter)
                        return idx;
        }
 
@@ -150,9 +175,9 @@ static int index_of_next_unescaped_regexp_delim(struct sed_cmd *sed_cmd, const c
 /*
  * returns the index in the string just past where the address ends.
  */
-static int get_address(struct sed_cmd *sed_cmd, const char *str, int *line, regex_t **regex)
+static int get_address(struct sed_cmd *sed_cmd, const char *str, int *linenum, regex_t **regex)
 {
-       char *my_str = strdup(str);
+       char *my_str = xstrdup(str);
        int idx = 0;
        char olddelimiter;
        olddelimiter = sed_cmd->delimiter;
@@ -163,19 +188,23 @@ static int get_address(struct sed_cmd *sed_cmd, const char *str, int *line, rege
                        idx++;
                } while (isdigit(my_str[idx]));
                my_str[idx] = 0;
-               *line = atoi(my_str);
+               *linenum = atoi(my_str);
        }
        else if (my_str[idx] == '$') {
-               *line = -1;
+               *linenum = -1;
                idx++;
        }
-       else if (my_str[idx] == '/') {
+       else if (my_str[idx] == '/' || my_str[idx] == '\\') {
+               if (my_str[idx] == '\\') {
+                       my_str[idx] = 0;
+                       sed_cmd-> delimiter = my_str[++idx];
+               }
                idx = index_of_next_unescaped_regexp_delim(sed_cmd, my_str, ++idx);
                if (idx == -1)
                        error_msg_and_die("unterminated match expression");
                my_str[idx] = '\0';
                *regex = (regex_t *)xmalloc(sizeof(regex_t));
-               xregcomp(*regex, my_str+1, 0);
+               xregcomp(*regex, my_str+1, REG_NEWLINE);
                idx++; /* so it points to the next character after the last '/' */
        }
        else {
@@ -189,16 +218,7 @@ static int get_address(struct sed_cmd *sed_cmd, const char *str, int *line, rege
        return idx;
 }
 
-static char *strdup_substr(const char *str, int start, int end)
-{
-       int size = end - start + 1;
-       char *newstr = xmalloc(size);
-       memcpy(newstr, str+start, size-1);
-       newstr[size-1] = '\0';
-       return newstr;
-}
-
-static int parse_subst_cmd(struct sed_cmd *sed_cmd, const char *substr)
+static int parse_subst_cmd(struct sed_cmd * const sed_cmd, const char *substr)
 {
        int oldidx, cflags = REG_NEWLINE;
        char *match;
@@ -226,7 +246,7 @@ static int parse_subst_cmd(struct sed_cmd *sed_cmd, const char *substr)
        idx = index_of_next_unescaped_regexp_delim(sed_cmd, substr, ++idx);
        if (idx == -1)
                error_msg_and_die("bad format in substitution expression");
-       match = strdup_substr(substr, oldidx, idx);
+       match = xstrndup(substr + oldidx, idx - oldidx);
 
        /* determine the number of back references in the match string */
        /* Note: we compute this here rather than in the do_subst_command()
@@ -245,7 +265,7 @@ static int parse_subst_cmd(struct sed_cmd *sed_cmd, const char *substr)
        idx = index_of_next_unescaped_regexp_delim(sed_cmd, substr, ++idx);
        if (idx == -1)
                error_msg_and_die("bad format in substitution expression");
-       sed_cmd->replace = strdup_substr(substr, oldidx, idx);
+       sed_cmd->replace = xstrndup(substr + oldidx, idx - oldidx);
 
        /* process the flags */
        while (substr[++idx]) {
@@ -261,7 +281,7 @@ static int parse_subst_cmd(struct sed_cmd *sed_cmd, const char *substr)
                                break;
                        default:
                                /* any whitespace or semicolon trailing after a s/// is ok */
-                               if (strchr("; \t\v\n\r", substr[idx]))
+                               if (strchr(semicolon_whitespace, substr[idx]))
                                        goto out;
                                /* else */
                                error_msg_and_die("bad option in substitution expression");
@@ -277,11 +297,14 @@ out:
        return idx;
 }
 
+static void move_back(char *str, int offset)
+{
+       memmove(str, str + offset, strlen(str + offset) + 1);
+}
+
 static int parse_edit_cmd(struct sed_cmd *sed_cmd, const char *editstr)
 {
-       int idx = 0;
-       int slashes_eaten = 0;
-       char *ptr; /* shorthand */
+       int i, j;
 
        /*
         * the string that gets passed to this function should look like this:
@@ -305,53 +328,69 @@ static int parse_edit_cmd(struct sed_cmd *sed_cmd, const char *editstr)
         *
         */
 
-       if (editstr[1] != '\\' && (editstr[2] != '\n' || editstr[2] != '\r'))
+       if (editstr[1] != '\\' || (editstr[2] != '\n' && editstr[2] != '\r'))
                error_msg_and_die("bad format in edit expression");
 
        /* store the edit line text */
-       /* make editline big enough to accomodate the extra '\n' we will tack on
-        * to the end */
        sed_cmd->editline = xmalloc(strlen(&editstr[3]) + 2);
-       strcpy(sed_cmd->editline, &editstr[3]);
-       ptr = sed_cmd->editline;
-
-       /* now we need to go through * and: s/\\[\r\n]$/\n/g on the edit line */
-       while (ptr[idx]) {
-               while (ptr[idx] != '\\' || (ptr[idx+1] != '\n' && ptr[idx+1] != '\r')) {
-                       idx++;
-                       if (!ptr[idx]) {
-                               goto out;
-                       }
-               }
-               /* move the newline over the '\' before it (effectively eats the '\') */
-               memmove(&ptr[idx], &ptr[idx+1], strlen(&ptr[idx+1]));
-               ptr[strlen(ptr)-1] = 0;
-               slashes_eaten++;
-               /* substitue \r for \n if needed */
-               if (ptr[idx] == '\r')
-                       ptr[idx] = '\n';
+       for (i = 3, j = 0; editstr[i] != '\0' && strchr("\r\n", editstr[i]) == NULL;
+                       i++, j++) {
+               if (editstr[i] == '\\' && strchr("\n\r", editstr[i+1]) != NULL) {
+                       sed_cmd->editline[j] = '\n';
+                       i++;
+               } else
+                       sed_cmd->editline[j] = editstr[i];
        }
 
-out:
-       /* this accounts for discrepancies between the modified string and the
-        * original string passed in to this function */
-       idx += slashes_eaten;
-
        /* figure out if we need to add a newline */
-       if (ptr[idx-1] != '\n') {
-               ptr[idx] = '\n';
-               idx++;
-       }
+       if (sed_cmd->editline[j-1] != '\n')
+               sed_cmd->editline[j++] = '\n';
 
        /* terminate string */
-       ptr[idx]= 0;
-       /* adjust for opening 2 chars [aic]\ */
-       idx += 2;
+       sed_cmd->editline[j] = '\0';
 
-       return idx;
+       return i;
 }
 
-static char *parse_cmd_str(struct sed_cmd *sed_cmd, const char *cmdstr)
+
+static int parse_file_cmd(struct sed_cmd *sed_cmd, const char *filecmdstr)
+{
+       int idx = 0;
+       int filenamelen = 0;
+
+       /*
+        * the string that gets passed to this function should look like this:
+        *    '[ ]filename'
+        *      |  |
+        *      |  a filename
+        *      |
+        *     optional whitespace
+
+        *   re: the file to be read, the GNU manual says the following: "Note that
+        *   if filename cannot be read, it is treated as if it were an empty file,
+        *   without any error indication." Thus, all of the following commands are
+        *   perfectly leagal:
+        *
+        *   sed -e '1r noexist'
+        *   sed -e '1r ;'
+        *   sed -e '1r'
+        */
+
+       /* the file command may be followed by whitespace; move past it. */
+       while (isspace(filecmdstr[++idx]))
+               { ; }
+               
+       /* the first non-whitespace we get is a filename. the filename ends when we
+        * hit a normal sed command terminator or end of string */
+       filenamelen = strcspn(&filecmdstr[idx], semicolon_whitespace);
+       sed_cmd->filename = xmalloc(filenamelen + 1);
+       safe_strncpy(sed_cmd->filename, &filecmdstr[idx], filenamelen + 1);
+
+       return idx + filenamelen;
+}
+
+
+static char *parse_cmd_str(struct sed_cmd * const sed_cmd, const char *const cmdstr)
 {
        int idx = 0;
 
@@ -361,56 +400,80 @@ static char *parse_cmd_str(struct sed_cmd *sed_cmd, const char *cmdstr)
         *            part1 part2  part3
         */
 
-
        /* first part (if present) is an address: either a number or a /regex/ */
        if (isdigit(cmdstr[idx]) || cmdstr[idx] == '/')
                idx = get_address(sed_cmd, cmdstr, &sed_cmd->beg_line, &sed_cmd->beg_match);
 
        /* second part (if present) will begin with a comma */
-       if (cmdstr[idx] == ',')
-               idx += get_address(sed_cmd, &cmdstr[++idx], &sed_cmd->end_line, &sed_cmd->end_match);
+       if (cmdstr[idx] == ',') {
+               idx++;
+               idx += get_address(sed_cmd, &cmdstr[idx], &sed_cmd->end_line, &sed_cmd->end_match);
+       }
+
+       /* skip whitespace before the command */
+       while (isspace(cmdstr[idx]))
+               idx++;
+
+       /* there my be the inversion flag between part2 and part3 */
+       sed_cmd->invert = 0;
+       if (cmdstr[idx] == '!') {
+               sed_cmd->invert = 1;
+               idx++;
+
+               /* skip whitespace before the command */
+               while (isspace(cmdstr[idx]))
+                       idx++;
+       }
 
        /* last part (mandatory) will be a command */
        if (cmdstr[idx] == '\0')
                error_msg_and_die("missing command");
-       if (!strchr("pdsaic", cmdstr[idx])) /* <-- XXX add new commands here */
-               error_msg_and_die("invalid command");
        sed_cmd->cmd = cmdstr[idx];
 
-       /* special-case handling for (s)ubstitution */
-       if (sed_cmd->cmd == 's') {
+       /* 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 */
+       if (strchr("pd", sed_cmd->cmd)) {
+               idx++;
+       }
+       /* handle (s)ubstitution command */
+       else if (sed_cmd->cmd == 's') {
                idx += parse_subst_cmd(sed_cmd, &cmdstr[idx]);
        }
-       /* special-case handling for (a)ppend, (i)nsert, and (c)hange */
-       else if (strchr("aic", cmdstr[idx])) {
-               if (sed_cmd->end_line || sed_cmd->end_match)
+       /* handle edit cmds: (a)ppend, (i)nsert, and (c)hange */
+       else if (strchr("aic", sed_cmd->cmd)) {
+               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");
                idx += parse_edit_cmd(sed_cmd, &cmdstr[idx]);
        }
-       /* if it was a single-letter command (such as 'p' or 'd') we need to
-        * increment the index past that command */
-       else
-               idx++;
+       /* handle file cmds: (r)ead */
+       else if (sed_cmd->cmd == 'r') {
+               if (sed_cmd->end_line || sed_cmd->end_match)
+                       error_msg_and_die("Command only uses one address");
+               idx += parse_file_cmd(sed_cmd, &cmdstr[idx]);
+       }
+       else {
+               error_msg_and_die("invalid command");
+       }
 
        /* give back whatever's left over */
        return (char *)&cmdstr[idx];
 }
 
-static void add_cmd_str(const char *cmdstr)
+static void add_cmd_str(const char * const cmdstr)
 {
        char *mystr = (char *)cmdstr;
 
        do {
 
                /* trim leading whitespace and semicolons */
-               memmove(mystr, &mystr[strspn(mystr, "; \n\r\t\v")], strlen(mystr));
+               move_back(mystr, strspn(mystr, semicolon_whitespace));
                /* if we ate the whole thing, that means there was just trailing
                 * whitespace or a final / no-op semicolon. either way, get out */
                if (strlen(mystr) == 0)
                        return;
                /* if this is a comment, jump past it and keep going */
                if (mystr[0] == '#') {
-                       mystr = strpbrk(mystr, ";\n\r");
+                       mystr = strpbrk(mystr, "\n\r");
                        continue;
                }
                /* grow the array */
@@ -448,7 +511,40 @@ static void load_cmd_file(char *filename)
        }
 }
 
-static void print_subst_w_backrefs(const char *line, const char *replace, regmatch_t *regmatch)
+struct pipeline {
+       char *buf;
+       int idx;
+       int len;
+};
+
+#define PIPE_MAGIC 0x7f
+#define PIPE_GROW 64  
+
+void pipe_putc(struct pipeline *const pipeline, char c)
+{
+       if (pipeline->buf[pipeline->idx] == PIPE_MAGIC) {
+               pipeline->buf =
+                       xrealloc(pipeline->buf, pipeline->len + PIPE_GROW);
+               memset(pipeline->buf + pipeline->len, 0, PIPE_GROW);
+               pipeline->len += PIPE_GROW;
+               pipeline->buf[pipeline->len - 1] = PIPE_MAGIC;
+       }
+       pipeline->buf[pipeline->idx++] = (c);
+}
+
+#define pipeputc(c)    pipe_putc(pipeline, c)
+
+#if 0
+{ if (pipeline[pipeline_idx] == PIPE_MAGIC) { \
+       pipeline = xrealloc(pipeline, pipeline_len+PIPE_GROW); \
+       memset(pipeline+pipeline_len, 0, PIPE_GROW); \
+       pipeline_len += PIPE_GROW; \
+       pipeline[pipeline_len-1] = PIPE_MAGIC; } \
+       pipeline[pipeline_idx++] = (c); }
+#endif
+
+static void print_subst_w_backrefs(const char *line, const char *replace, 
+       regmatch_t *regmatch, struct pipeline *const pipeline, int matches)
 {
        int i;
 
@@ -464,14 +560,15 @@ static void print_subst_w_backrefs(const char *line, const char *replace, regmat
                        tmpstr[1] = 0;
                        backref = atoi(tmpstr);
                        /* print out the text held in regmatch[backref] */
-                       for (j = regmatch[backref].rm_so; j < regmatch[backref].rm_eo; j++)
-                               fputc(line[j], stdout);
+                       if (backref <= matches && regmatch[backref].rm_so != -1)
+                               for (j = regmatch[backref].rm_so; j < regmatch[backref].rm_eo; j++)
+                                       pipeputc(line[j]);
                }
 
                /* if we find a backslash escaped character, print the character */
                else if (replace[i] == '\\') {
                        ++i;
-                       fputc(replace[i], stdout);
+                       pipeputc(replace[i]);
                }
 
                /* if we find an unescaped '&' print out the whole matched text.
@@ -481,39 +578,49 @@ static void print_subst_w_backrefs(const char *line, const char *replace, regmat
                else if (replace[i] == '&' && replace[i-1] != '\\') {
                        int j;
                        for (j = regmatch[0].rm_so; j < regmatch[0].rm_eo; j++)
-                               fputc(line[j], stdout);
+                               pipeputc(line[j]);
                }
                /* nothing special, just print this char of the replacement string to stdout */
                else
-                       fputc(replace[i], stdout);
+                       pipeputc(replace[i]);
        }
 }
 
-static int do_subst_command(const struct sed_cmd *sed_cmd, const char *line)
+static int do_subst_command(const struct sed_cmd *sed_cmd, char **line)
 {
-       char *hackline = (char *)line;
+       char *hackline = *line;
+       struct pipeline thepipe = { NULL, 0 , 0};
+       struct pipeline *const pipeline = &thepipe;
        int altered = 0;
        regmatch_t *regmatch = NULL;
 
        /* we only proceed if the substitution 'search' expression matches */
-       if (regexec(sed_cmd->sub_match, line, 0, NULL, 0) == REG_NOMATCH)
+       if (regexec(sed_cmd->sub_match, hackline, 0, NULL, 0) == REG_NOMATCH)
                return 0;
 
        /* whaddaya know, it matched. get the number of back references */
        regmatch = xmalloc(sizeof(regmatch_t) * (sed_cmd->num_backrefs+1));
 
+       /* allocate more PIPE_GROW bytes
+          if replaced string is larger than original */
+       thepipe.len = strlen(hackline)+PIPE_GROW;
+       thepipe.buf = xcalloc(1, thepipe.len);
+       /* buffer magic */
+       thepipe.buf[thepipe.len-1] = PIPE_MAGIC;
+
        /* and now, as long as we've got a line to try matching and if we can match
         * the search string, we make substitutions */
-       while (*hackline && (regexec(sed_cmd->sub_match, hackline,
-                                       sed_cmd->num_backrefs+1, regmatch, 0) == 0) ) {
+       while ((*hackline || !altered) && (regexec(sed_cmd->sub_match, hackline,
+                                       sed_cmd->num_backrefs+1, regmatch, 0) != REG_NOMATCH) ) {
                int i;
 
                /* print everything before the match */
                for (i = 0; i < regmatch[0].rm_so; i++)
-                       fputc(hackline[i], stdout);
+                       pipeputc(hackline[i]);
 
                /* then print the substitution string */
-               print_subst_w_backrefs(hackline, sed_cmd->replace, regmatch);
+               print_subst_w_backrefs(hackline, sed_cmd->replace, regmatch, 
+                               pipeline, sed_cmd->num_backrefs);
 
                /* advance past the match */
                hackline += regmatch[0].rm_eo;
@@ -525,142 +632,182 @@ static int do_subst_command(const struct sed_cmd *sed_cmd, const char *line)
                        break;
        }
 
-       /* if there's anything left of the line, print it */
-       if (*hackline)
-               fputs(hackline, stdout);
+       for (; *hackline; hackline++) pipeputc(*hackline);
+       if (thepipe.buf[thepipe.idx] == PIPE_MAGIC) thepipe.buf[thepipe.idx] = 0;
 
        /* cleanup */
        free(regmatch);
 
+       free(*line);
+       *line = thepipe.buf;
        return altered;
 }
 
-static int do_sed_command(const struct sed_cmd *sed_cmd, const char *line) 
-{
-       int altered = 0;
-
-       switch (sed_cmd->cmd) {
-
-               case 'p':
-                       fputs(line, stdout);
-                       break;
-
-               case 'd':
-                       altered++;
-                       break;
-
-               case 's':
-
-                       /*
-                        * Some special cases for 's' printing to make it compliant with
-                        * GNU sed printing behavior (aka "The -n | s///p Matrix"):
-                        *
-                        *    -n ONLY = never print anything regardless of any successful
-                        *    substitution
-                        *
-                        *    s///p ONLY = always print successful substitutions, even if
-                        *    the line is going to be printed anyway (line will be printed
-                        *    twice).
-                        *
-                        *    -n AND s///p = print ONLY a successful substitution ONE TIME;
-                        *    no other lines are printed - this is the reason why the 'p'
-                        *    flag exists in the first place.
-                        */
-
-                       /* if the user specified that they didn't want anything printed (i.e. a -n
-                        * flag and no 'p' flag after the s///), then there's really no point doing
-                        * anything here. */
-                       if (be_quiet && !sed_cmd->sub_p)
-                               break;
-
-                       /* we print the line once, unless we were told to be quiet */
-                       if (!be_quiet)
-                               altered = do_subst_command(sed_cmd, line);
-
-                       /* we also print the line if we were given the 'p' flag
-                        * (this is quite possibly the second printing) */
-                       if (sed_cmd->sub_p)
-                               altered = do_subst_command(sed_cmd, line);
-
-                       break;
-
-               case 'a':
-                       fputs(line, stdout);
-                       fputs(sed_cmd->editline, stdout);
-                       altered++;
-                       break;
-
-               case 'i':
-                       fputs(sed_cmd->editline, stdout);
-                       break;
-
-               case 'c':
-                       fputs(sed_cmd->editline, stdout);
-                       altered++;
-                       break;
-       }
-
-       return altered;
-}
 
 static void process_file(FILE *file)
 {
        char *line = NULL;
        static int linenum = 0; /* GNU sed does not restart counting lines at EOF */
        unsigned int still_in_range = 0;
-       int line_altered;
+       int altered;
        int i;
 
        /* go through every line in the file */
        while ((line = get_line_from_file(file)) != NULL) {
 
+               chomp(line);
                linenum++;
-               line_altered = 0;
+               altered = 0;
 
                /* for every line, go through all the commands */
                for (i = 0; i < ncmds; i++) {
+                       struct sed_cmd *sed_cmd = &sed_cmds[i];
+                       int deleted = 0;
 
-                       /* are we acting on a range of matched lines? */
-                       if (sed_cmds[i].beg_match && sed_cmds[i].end_match) {
-                               if (still_in_range || regexec(sed_cmds[i].beg_match, line, 0, NULL, 0) == 0) {
-                                       line_altered += do_sed_command(&sed_cmds[i], line);
-                                       if (still_in_range && regexec(sed_cmds[i].end_match, line, 0, NULL, 0) == 0)
-                                               still_in_range = 0;
-                                       else
-                                               still_in_range = 1;
+                       /*
+                        * entry point into sedding...
+                        */
+                       int matched = (
+                                       /* no range necessary */
+                                       (sed_cmd->beg_line == 0 && sed_cmd->end_line == 0 &&
+                                        sed_cmd->beg_match == NULL &&
+                                        sed_cmd->end_match == NULL) ||
+                                       /* this line number is the first address we're looking for */
+                                       (sed_cmd->beg_line && (sed_cmd->beg_line == linenum)) ||
+                                       /* this line matches our first address regex */
+                                       (sed_cmd->beg_match && (regexec(sed_cmd->beg_match, line, 0, NULL, 0) == 0)) ||
+                                       /* we are currently within the beginning & ending address range */
+                                       still_in_range
+                          );
+
+                       if (sed_cmd->invert ^ matched) {
+
+                               /*
+                                * actual sedding
+                                */
+                               switch (sed_cmd->cmd) {
+
+                                       case 'p':
+                                               puts(line);
+                                               break;
+
+                                       case 'd':
+                                               altered++;
+                                               deleted = 1;
+                                               break;
+
+                                       case 's':
+
+                                               /*
+                                                * Some special cases for 's' printing to make it compliant with
+                                                * GNU sed printing behavior (aka "The -n | s///p Matrix"):
+                                                *
+                                                *    -n ONLY = never print anything regardless of any successful
+                                                *    substitution
+                                                *
+                                                *    s///p ONLY = always print successful substitutions, even if
+                                                *    the line is going to be printed anyway (line will be printed
+                                                *    twice).
+                                                *
+                                                *    -n AND s///p = print ONLY a successful substitution ONE TIME;
+                                                *    no other lines are printed - this is the reason why the 'p'
+                                                *    flag exists in the first place.
+                                                */
+
+                                               /* if the user specified that they didn't want anything printed (i.e., a -n
+                                                * flag and no 'p' flag after the s///), then there's really no point doing
+                                                * anything here. */
+                                               if (be_quiet && !sed_cmd->sub_p)
+                                                       break;
+
+                                               /* we print the line once, unless we were told to be quiet */
+                                               if (!be_quiet)
+                                                       altered |= do_subst_command(sed_cmd, &line);
+
+                                               /* we also print the line if we were given the 'p' flag
+                                                * (this is quite possibly the second printing) */
+                                               if (sed_cmd->sub_p)
+                                                       altered |= do_subst_command(sed_cmd, &line);
+                                               if (altered && (i+1 >= ncmds || sed_cmds[i+1].cmd != 's'))
+                                                       puts(line);
+
+                                               break;
+
+                                       case 'a':
+                                               puts(line);
+                                               fputs(sed_cmd->editline, stdout);
+                                               altered++;
+                                               break;
+
+                                       case 'i':
+                                               fputs(sed_cmd->editline, stdout);
+                                               break;
+
+                                       case 'c':
+                                               /* single-address case */
+                                               if ((sed_cmd->end_match == NULL && sed_cmd->end_line == 0)
+                                               /* multi-address case */
+                                               /* - matching text */
+                                               || (sed_cmd->end_match && (regexec(sed_cmd->end_match, line, 0, NULL, 0) == 0))
+                                               /* - matching line numbers */
+                                               || (sed_cmd->end_line > 0 && sed_cmd->end_line == linenum))
+                                               {
+                                                       fputs(sed_cmd->editline, stdout);
+                                               }
+                                               altered++;
+
+                                               break;
+
+                                       case 'r': {
+                                                                 FILE *outfile;
+                                                                 puts(line);
+                                                                 outfile = fopen(sed_cmd->filename, "r");
+                                                                 if (outfile)
+                                                                         print_file(outfile);
+                                                                 /* else if we couldn't open the output file,
+                                                                  * no biggie, just don't print anything */
+                                                                 altered++;
+                                                 }
+                                                         break;
                                }
                        }
 
-                       /* are we trying to match a single line? */
-                       else if (sed_cmds[i].beg_match) {
-                               if (regexec(sed_cmds[i].beg_match, line, 0, NULL, 0) == 0)
-                                       line_altered += do_sed_command(&sed_cmds[i], line);
-                       }
-
-                       /* are we acting on a range of line numbers? */
-                       else if (sed_cmds[i].beg_line > 0 && sed_cmds[i].end_line != 0) {
-                               if (linenum >= sed_cmds[i].beg_line &&
-                                               (sed_cmds[i].end_line == -1 || linenum <= sed_cmds[i].end_line))
-                                       line_altered += do_sed_command(&sed_cmds[i], line);
-                       }
+                       /*
+                        * exit point from sedding...
+                        */
+                       if (matched) {
+                               if (
+                                       /* this is a single-address command or... */
+                                       (sed_cmd->end_line == 0 && sed_cmd->end_match == NULL) || (
+                                               /* we were in the middle of our address range (this
+                                                * isn't the first time through) and.. */
+                                               (still_in_range == 1) && (
+                                                       /* this line number is the last address we're looking for or... */
+                                                       (sed_cmd->end_line && (sed_cmd->end_line == linenum)) ||
+                                                       /* this line matches our last address regex */
+                                                       (sed_cmd->end_match && (regexec(sed_cmd->end_match, line, 0, NULL, 0) == 0))
+                                               )
+                                       )
+                               ) {
+                                       /* we're out of our address range */
+                                       still_in_range = 0;
+                               }
 
-                       /* are we acting on a specified line number */
-                       else if (sed_cmds[i].beg_line > 0) {
-                               if (linenum == sed_cmds[i].beg_line)
-                                       line_altered += do_sed_command(&sed_cmds[i], line);
+                               /* didn't hit the exit? then we're still in the middle of an address range */
+                               else {
+                                       still_in_range = 1;
+                               }
                        }
 
-                       /* not acting on matches or line numbers. act on every line */
-                       else 
-                               line_altered += do_sed_command(&sed_cmds[i], line);
-
+                       if (deleted)
+                               break;
                }
 
                /* we will print the line unless we were told to be quiet or if the
                 * line was altered (via a 'd'elete or 's'ubstitution), in which case
                 * the altered line was already printed */
-               if (!be_quiet && !line_altered)
-                       fputs(line, stdout);
+               if (!be_quiet && !altered)
+                       puts(line);
 
                free(line);
        }
@@ -668,9 +815,9 @@ static void process_file(FILE *file)
 
 extern int sed_main(int argc, char **argv)
 {
-       int opt;
+       int opt, status = EXIT_SUCCESS;
 
-#ifdef BB_FEATURE_CLEAN_UP
+#ifdef CONFIG_FEATURE_CLEAN_UP
        /* destroy command strings on exit */
        if (atexit(destroy_cmd_strs) == -1)
                perror_msg_and_die("atexit");
@@ -715,15 +862,14 @@ extern int sed_main(int argc, char **argv)
                int i;
                FILE *file;
                for (i = optind; i < argc; i++) {
-                       file = fopen(argv[i], "r");
-                       if (file == NULL) {
-                               perror_msg("%s", argv[i]);
-                       } else {
+                       file = wfopen(argv[i], "r");
+                       if (file) {
                                process_file(file);
                                fclose(file);
-                       }
+                       } else
+                               status = EXIT_FAILURE;
                }
        }
        
-       return 0;
+       return status;
 }