From 3d31240bfdaee03aff28103b530ff593e9ddbbc5 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Tue, 2 Jul 2013 06:39:17 +0200
Subject: libregexp: update from Plan 9

R=rsc
https://codereview.appspot.com/10690044
---
 src/libregexp/regsub.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/libregexp/regsub.c')

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)
-- 
cgit v1.2.3