ed: prevent trailing '/' when setting filename (briandfoy#845)

mknos · web-flow · commit 5f9377d8b67f · 2024-11-30T06:34:57.000-05:00
* The usage "f abc/" is technically invalid because it would point to a directory
* Subsequent "e" or "w" commands fail because ed does not operate on directories
* GNU ed 1.20 added validation to prevent this usage; add it here because it would flag bad user input slightly earlier
diff --git a/bin/ed b/bin/ed
@@ -579,9 +579,8 @@ sub edFilename {
         return E_ADDREXT;
     }
     if (defined($args[0])) {
-        if ($args[0] =~ m/\A\!/) {
-            return E_FNAME;
-        }
+        return E_FNAME if $args[0] =~ m/\A\!/;
+        return E_FNAME if $args[0] =~ m/\/\Z/;
         $RememberedFilename = $args[0];
     }
     if (defined($RememberedFilename)) {

Original file line number	Diff line number	Diff line change
`@@ -579,9 +579,8 @@ sub edFilename {`
`579`	`579`	`return E_ADDREXT;`
`580`	`580`	`}`
`581`	`581`	`if (defined($args[0])) {`
`582`		`- if ($args[0] =~ m/\A\!/) {`
`583`		`- return E_FNAME;`
`584`		`- }`
	`582`	`+ return E_FNAME if $args[0] =~ m/\A\!/;`
	`583`	`+ return E_FNAME if $args[0] =~ m/\/\Z/;`
`585`	`584`	`$RememberedFilename = $args[0];`
`586`	`585`	`}`
`587`	`586`	`if (defined($RememberedFilename)) {`