[hackers] [PATCH 14/17] Improve doglobal()

From: quinq <quinq_AT_fifth.space>
Date: Tue, 6 Mar 2018 12:58:06 +0100

From: "Roberto E. Vargas Caballero" <k0ga_AT_shike2.com>

Don't use directly the line numbers and call to getlst()
when a line is matched.

---
 ed.c | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/ed.c b/ed.c
index 13c41c6..1e814e9 100644
--- a/ed.c
+++ b/ed.c
_AT_@ -1318,7 +1318,7 @@ chkglobal(void)
 static void
 doglobal(void)
 {
-	int i, k;
+	int cnt, ln, k;
 
 	skipblank();
 	cmdline.siz = 0;
_AT_@ -1326,18 +1326,24 @@ doglobal(void)
 	if (uflag)
 		chkprint(0);
 
-	for (i = 1; i <= lastln; i++) {
-		k = getindex(i);
-		if (!zero[k].global)
-			continue;
-		curln = i;
-		nlines = 0;
-		if (uflag) {
-			line1 = line2 = i;
-			pflag = 0;
-			doprint();
+	ln = line1;
+	for (cnt = 0; cnt < lastln; cnt++) {
+		k = getindex(ln);
+		if (zero[k].global) {
+			zero[k].global = 0;
+			curln = ln;
+			nlines = 0;
+			if (uflag) {
+				line1 = line2 = ln;
+				pflag = 0;
+				doprint();
+			}
+			getlst();
+			docmd();
+		} else {
+			cnt++;
+			ln = nextln(ln);
 		}
-		docmd();
 	}
 	discard();   /* cover the case of not matching anything */
 }
-- 
2.14.2

Received on Tue Mar 06 2018 - 12:58:06 CET