From 71cc300013e74fdec78632fee5f0aa27f970b990 Mon Sep 17 00:00:00 2001
From: Michael Mikonos <127171689+mknos@users.noreply.github.com>
Date: Thu, 7 Nov 2024 23:20:19 +0800
Subject: [PATCH] ed: allow l,n,p to be combined

* Other versions of ed allow numbered output with binary escapes
* "p" is simply print
* "pl"/"lp" == "l" and "pn"/"np" == "n"
* "nl"/"ln" == number the lines and print the line in escaped mode
* To make this work edPrint() needs to selectively allow an argument (technically a "command suffix")
---
 bin/ed | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/bin/ed b/bin/ed
index b67961a4..faeaa153 100755
--- a/bin/ed
+++ b/bin/ed
@@ -326,9 +326,19 @@ sub edHelp {
 sub edPrint {
     my $mode = shift;
 
-    if (defined($args[0])) {
-        edWarn(E_ARGEXT);
-        return;
+    my $do_bin = $mode == $PRINT_BIN;
+    my $do_num = $mode == $PRINT_NUM;
+
+    if (defined $args[0]) {
+        if ($args[0] =~ s/\A([lnp]+)//) {
+            my $arg = $1;
+            $do_bin = 1 if $arg =~ m/l/;
+            $do_num = 1 if $arg =~ m/n/;
+        }
+        if (length $args[0]) {
+            edWarn(E_ARGEXT);
+            return;
+        }
     }
     unless ($isGlobal) {
         $adrs[0] = $CurrentLineNum unless (defined($adrs[0]));
@@ -342,21 +352,16 @@ sub edPrint {
         my $end = $adrs[1];
         @adrs = ($start .. $end);
     }
-
-    if ($mode == $PRINT_NUM) {
-        for my $i (@adrs) {
-            print $i, "\t", $lines[$i];
+    for my $i (@adrs) {
+        if ($do_num) {
+            print $i, "\t";
         }
-    } elsif ($mode == $PRINT_BIN) {
-        for my $i (@adrs) {
+        if ($do_bin) {
             print escape_line($i);
-        }
-    } else {
-        for my $i (@adrs) {
+        } else {
             print $lines[$i];
         }
     }
-
     $CurrentLineNum = $adrs[-1];
 }