Changeset 902 in MondoRescue for branches/stable/mindi-busybox/editors/sed.c

Timestamp:

Oct 25, 2006, 12:41:23 AM (17 years ago)

Author:

Bruno Cornec

Message:

mindi-busybox now uses busybox 1.2.2 (Thanks Rob for that last update and good lucck for your future projects).

File:

• branches/stable/mindi-busybox/editors/sed.c (modified) (16 diffs)

branches/stable/mindi-busybox/editors/sed.c

@@ -59 +59 @@
 */
 
-#include <stdio.h>
-#include <unistd.h>     /* for getopt() */
-#include <errno.h>
-#include <ctype.h>      /* for isspace() */
-#include <stdlib.h>
-#include <string.h>
 #include "busybox.h"
 #include "xregex.h"
@@ -95 +89 @@
 } sed_cmd_t;
 
-static const char bad_format_in_subst[] =
-    "bad format in substitution expression";
 static const char *const semicolon_whitespace = "; \n\r\t\v";
 
@@ -176 +168 @@
 /* strdup, replacing "\n" with '\n', and "\delimiter" with 'delimiter' */
 
-static void parse_escapes(char *dest, const char *string, int len, char from, char to)
+static void parse_escapes(char *dest, char *string, int len, char from, char to)
 {
     int i=0;
@@ -193 +185 @@
 }
 
-static char *copy_parsing_escapes(const char *string, int len)
+static char *copy_parsing_escapes(char *string, int len)
 {
     char *dest=xmalloc(len+1);
@@ -206 +198 @@
  * beginning at a specified index and returns the index of the next regular
  * expression delimiter (typically a forward * slash ('/')) not preceded by
- * a backslash ('\').
+ * a backslash ('\').  A negative delimiter disables square bracket checking.
  */
-static int index_of_next_unescaped_regexp_delim(const char delimiter,
-    const char *str)
+static int index_of_next_unescaped_regexp_delim(int delimiter, char *str)
 {
     int bracket = -1;
@@ -216 +207 @@
     char ch;
 
+    if (delimiter < 0) {
+        bracket--;
+        delimiter *= -1;
+    }
+
     for (; (ch = str[idx]); idx++) {
-        if (bracket != -1) {
+        if (bracket >= 0) {
             if (ch == ']' && !(bracket == idx - 1 || (bracket == idx - 2
                     && str[idx - 1] == '^')))
@@ -225 +221 @@
         else if (ch == '\\')
             escaped = 1;
-        else if (ch == '[')
+        else if (bracket == -1 && ch == '[')
             bracket = idx;
         else if (ch == delimiter)
@@ -232 +228 @@
 
     /* if we make it to here, we've hit the end of the string */
-    return -1;
+    bb_error_msg_and_die("unmatched '%c'",delimiter);
 }
 
@@ -238 +234 @@
  *  Returns the index of the third delimiter
  */
-static int parse_regex_delim(const char *cmdstr, char **match, char **replace)
-{
-    const char *cmdstr_ptr = cmdstr;
+static int parse_regex_delim(char *cmdstr, char **match, char **replace)
+{
+    char *cmdstr_ptr = cmdstr;
     char delimiter;
     int idx = 0;
@@ -246 +242 @@
     /* verify that the 's' or 'y' is followed by something.  That something
      * (typically a 'slash') is now our regexp delimiter... */
-    if (*cmdstr == '\0') bb_error_msg_and_die(bad_format_in_subst);
+    if (*cmdstr == '\0')
+        bb_error_msg_and_die("bad format in substitution expression");
     delimiter = *(cmdstr_ptr++);
 
     /* save the match string */
     idx = index_of_next_unescaped_regexp_delim(delimiter, cmdstr_ptr);
-    if (idx == -1) {
-        bb_error_msg_and_die(bad_format_in_subst);
-    }
     *match = copy_parsing_escapes(cmdstr_ptr, idx);
 
     /* save the replacement string */
     cmdstr_ptr += idx + 1;
-    idx = index_of_next_unescaped_regexp_delim(delimiter, cmdstr_ptr);
-    if (idx == -1) {
-        bb_error_msg_and_die(bad_format_in_subst);
-    }
+    idx = index_of_next_unescaped_regexp_delim(-delimiter, cmdstr_ptr);
     *replace = copy_parsing_escapes(cmdstr_ptr, idx);
 
@@ -288 +279 @@
         else delimiter = '/';
         next = index_of_next_unescaped_regexp_delim(delimiter, ++pos);
-        if (next == -1)
-            bb_error_msg_and_die("unterminated match expression");
-
-        temp=copy_parsing_escapes(pos,next);
+        temp = copy_parsing_escapes(pos,next);
         *regex = (regex_t *) xmalloc(sizeof(regex_t));
         xregcomp(*regex, temp, bbg.regex_type|REG_NEWLINE);
         free(temp);
         /* Move position to next character after last delimiter */
-        pos+=(next+1);
+        pos += (next+1);
     }
     return pos - my_str;
@@ -302 +290 @@
 
 /* Grab a filename.  Whitespace at start is skipped, then goes to EOL. */
-static int parse_file_cmd(sed_cmd_t *sed_cmd, const char *filecmdstr, char **retval)
+static int parse_file_cmd(sed_cmd_t *sed_cmd, char *filecmdstr, char **retval)
 {
     int start = 0, idx, hack=0;
@@ -319 +307 @@
 }
 
-static int parse_subst_cmd(sed_cmd_t *const sed_cmd, char *substr)
+static int parse_subst_cmd(sed_cmd_t *sed_cmd, char *substr)
 {
     int cflags = bbg.regex_type;
@@ -570 +558 @@
 }
 
-static void do_subst_w_backrefs(const char *line, const char *replace)
+static void do_subst_w_backrefs(char *line, char *replace)
 {
     int i,j;
@@ -640 +628 @@
         if(sed_cmd->which_match && sed_cmd->which_match!=match_count) {
             for(i=0;i<bbg.regmatch[0].rm_eo;i++)
-                pipe_putc(oldline[i]);
+                pipe_putc(*(oldline++));
             continue;
         }
@@ -670 +658 @@
 
 /* Set command pointer to point to this label.  (Does not handle null label.) */
-static sed_cmd_t *branch_to(const char *label)
+static sed_cmd_t *branch_to(char *label)
 {
     sed_cmd_t *sed_cmd;