summaryrefslogtreecommitdiff
path: root/regexp.c
diff options
context:
space:
mode:
authorEric Andersen1999-10-29 23:09:13 +0000
committerEric Andersen1999-10-29 23:09:13 +0000
commit7f1acfdb8928de69bf02db6cf217f0f3b4af45ea (patch)
tree752654d9a3ef967d5409600962e31bea5cae14fc /regexp.c
parent24d8e7d787aa1940030a1beaabdd4388588ca512 (diff)
downloadbusybox-7f1acfdb8928de69bf02db6cf217f0f3b4af45ea.zip
busybox-7f1acfdb8928de69bf02db6cf217f0f3b4af45ea.tar.gz
More stuf. sed works.
Diffstat (limited to 'regexp.c')
-rw-r--r--regexp.c40
1 files changed, 26 insertions, 14 deletions
diff --git a/regexp.c b/regexp.c
index deee238..164f880 100644
--- a/regexp.c
+++ b/regexp.c
@@ -7,7 +7,7 @@
#include <ctype.h>
-#if ( defined BB_GREP || defined BB_FIND )
+#if ( defined BB_GREP || defined BB_FIND || defined BB_SED)
/* This also tries to find a needle in a haystack, but uses
* real regular expressions.... The fake regular expression
@@ -25,27 +25,39 @@ extern int find_match(char *haystack, char *needle, int ignoreCase)
return( status);
}
+#if defined BB_SED
/* This performs substitutions after a regexp match has been found.
* The new string is returned. It is malloc'ed, and do must be freed. */
-extern char* replace_match(char *haystack, char *needle, char *newNeedle, int ignoreCase)
+extern int replace_match(char *haystack, char *needle, char *newNeedle, int ignoreCase)
{
int status;
- char* newHaystack;
struct regexp* re;
- newHaystack = (char *)malloc((unsigned)(strlen(haystack) -
- strlen(needle) + strlen(newNeedle));
+ char *s, buf[BUF_SIZE], *d = buf;
+
re = regcomp( needle);
status = regexec(re, haystack, FALSE, ignoreCase);
-
- return( newHaystack)
-}
-
-
-extern void regsub(regexp* re, char* src, char* dst)
-
+ if (status==TRUE) {
+ s=haystack;
+
+ do {
+ /* copy stuff from before the match */
+ while (s < re->startp[0])
+ *d++ = *s++;
+ /* substitute for the matched part */
+ regsub(re, newNeedle, d);
+ s = re->endp[0];
+ d += strlen(d);
+ } while (regexec(re, s, FALSE, ignoreCase) == TRUE);
+ /* copy stuff from after the match */
+ while ( (*d++ = *s++) ) {}
+ d[-1] = '\n';
+ d[0] = '\0';
+ strcpy(haystack, buf);
+ }
free( re);
return( status);
}
+#endif
/* code swiped from elvis-tiny 1.4 (a clone of vi) and adjusted to
@@ -695,7 +707,7 @@ extern int regexec(struct regexp* re, char* str, int bol, int ignoreCase)
-
+#if defined BB_SED
/* This performs substitutions after a regexp match has been found. */
extern void regsub(regexp* re, char* src, char* dst)
{
@@ -841,7 +853,7 @@ extern void regsub(regexp* re, char* src, char* dst)
if (previous1)
strcpy(previous1, start);
}
-
+#endif
#endif /* BB_REGEXP */