suckless
/
sbase
mirror of git://git.suckless.org/sbase
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ensure commands are followed by a blank 

POSIX.1-2017 demands in Shell & Utilities under 'Commands in ed':
The e, E, f, r, and w commands shall take an optional file parameter,
separated from the command letter by one or more <blank> characters.

Ensure at least one <blank> character (as defined for the POSIX locale)
is present or error out.

Signed-off-by: Rene Kita <mail@rkta.de>
This commit is contained in:
Rene Kita 2023-09-26 08:17:00 +02:00 committed by k0ga
parent 67a00c86f9
commit 95b9603975
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ed.c
View File

@ -474,6 +474,24 @@ skipblank(void)
back(c);
}
static void
ensureblank(void)
{
char c;
switch ((c = input())) {
case ' ':
case '\t':
skipblank();
case '\n':
back(c);
case EOF:
break;
default:
error("unknown command");
}
}
static int
getnum(void)
{
@ -1145,10 +1163,12 @@ repeat:
case 'w':
trunc = 1;
case 'W':
ensureblank();
deflines(nextln(0), lastln);
dowrite(getfname(cmd), trunc);
break;
case 'r':
ensureblank();
if (nlines > 1)
goto bad_address;
deflines(lastln, lastln);
@ -1260,6 +1280,7 @@ repeat:
quit();
break;
case 'f':
ensureblank();
if (nlines > 0)
goto unexpected;
if (back(input()) != '\n')
@ -1271,6 +1292,7 @@ repeat:
case 'E':
modflag = 0;
case 'e':
ensureblank();
if (nlines > 0)
goto unexpected;
if (modflag)