aboutsummaryrefslogtreecommitdiff
path: root/src/libregexp/regsub.c
diff options
context:
space:
mode:
authorDavid du Colombier <0intro@gmail.com>2013-07-02 06:39:17 +0200
committerDavid du Colombier <0intro@gmail.com>2013-07-02 06:39:17 +0200
commit3d31240bfdaee03aff28103b530ff593e9ddbbc5 (patch)
tree84155050457d6dbff1575ec2e1a9655a0671ed5e /src/libregexp/regsub.c
parentda3ed55e4e4d2d3052b03df3dd0a40d19f99ea70 (diff)
downloadplan9port-3d31240bfdaee03aff28103b530ff593e9ddbbc5.tar.gz
plan9port-3d31240bfdaee03aff28103b530ff593e9ddbbc5.tar.bz2
plan9port-3d31240bfdaee03aff28103b530ff593e9ddbbc5.zip
libregexp: update from Plan 9
R=rsc https://codereview.appspot.com/10690044
Diffstat (limited to 'src/libregexp/regsub.c')
-rw-r--r--src/libregexp/regsub.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libregexp/regsub.c b/src/libregexp/regsub.c
index ab5ad99d..579d1243 100644
--- a/src/libregexp/regsub.c
+++ b/src/libregexp/regsub.c
@@ -27,7 +27,7 @@ regsub(char *sp, /* source string */
case '8':
case '9':
i = *sp-'0';
- if(mp[i].s.sp != 0 && mp!=0 && ms>i)
+ if(mp!=0 && mp[i].s.sp != 0 && ms>i)
for(ssp = mp[i].s.sp;
ssp < mp[i].e.ep;
ssp++)
@@ -46,9 +46,8 @@ regsub(char *sp, /* source string */
*dp++ = *sp;
break;
}
- }else if(*sp == '&'){
- if(mp[0].s.sp != 0 && mp!=0 && ms>0)
- if(mp[0].s.sp != 0)
+ }else if(*sp == '&'){
+ if(mp!=0 && mp[0].s.sp != 0 && ms>0)
for(ssp = mp[0].s.sp;
ssp < mp[0].e.ep; ssp++)
if(dp < ep)