summaryrefslogtreecommitdiff
path: root/utility.c
diff options
context:
space:
mode:
authorMark Whitley <markw@lineo.com>2000-07-12 23:35:21 +0000
committerMark Whitley <markw@lineo.com>2000-07-12 23:35:21 +0000
commitc41e8c840fd6faf802628036c7e5b2683d623c5d (patch)
treec4a47f2e1f1af68d3019f598bada0268f872c1b9 /utility.c
parent6f96e674b9176cafcc25de2a1d79d6f6d7f0e908 (diff)
downloadbusybox-w32-c41e8c840fd6faf802628036c7e5b2683d623c5d.tar.gz
busybox-w32-c41e8c840fd6faf802628036c7e5b2683d623c5d.tar.bz2
busybox-w32-c41e8c840fd6faf802628036c7e5b2683d623c5d.zip
Changed bb_regcomp to xregcomp and #if 0'ed out destroy_cmd_strs in sed.c
(maybe I'll remove it later).
Diffstat (limited to 'utility.c')
-rw-r--r--utility.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/utility.c b/utility.c
index 6d1e1d4bb..61f67618d 100644
--- a/utility.c
+++ b/utility.c
@@ -1722,18 +1722,15 @@ char *get_last_path_component(char *path)
1722#endif 1722#endif
1723 1723
1724#if defined BB_GREP || defined BB_SED 1724#if defined BB_GREP || defined BB_SED
1725int bb_regcomp(regex_t *preg, const char *regex, int cflags) 1725void xregcomp(regex_t *preg, const char *regex, int cflags)
1726{ 1726{
1727 int ret; 1727 int ret;
1728 if ((ret = regcomp(preg, regex, cflags)) != 0) { 1728 if ((ret = regcomp(preg, regex, cflags)) != 0) {
1729 int errmsgsz = regerror(ret, preg, NULL, 0); 1729 int errmsgsz = regerror(ret, preg, NULL, 0);
1730 char *errmsg = xmalloc(errmsgsz); 1730 char *errmsg = xmalloc(errmsgsz);
1731 regerror(ret, preg, errmsg, errmsgsz); 1731 regerror(ret, preg, errmsg, errmsgsz);
1732 errorMsg("bb_regcomp: %s\n", errmsg); 1732 fatalError("bb_regcomp: %s\n", errmsg);
1733 free(errmsg);
1734 regfree(preg);
1735 } 1733 }
1736 return ret;
1737} 1734}
1738#endif 1735#endif
1739 1736