From 66f9c15fcf7229a1fcac3ac8a15c1a185d945f69 Mon Sep 17 00:00:00 2001 From: "Tim J. Robbins" Date: Mon, 27 May 2002 06:53:54 +0000 Subject: [PATCH] The XCU issue 5 requirement of accepting the file operand intermingled with options has been withdrawn in issue 6, to which nl(1) now conforms. --- usr.bin/nl/nl.1 | 6 +----- usr.bin/nl/nl.c | 7 ------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/usr.bin/nl/nl.1 b/usr.bin/nl/nl.1 index 8668a789bc3e..c67c12e55fb8 100644 --- a/usr.bin/nl/nl.1 +++ b/usr.bin/nl/nl.1 @@ -229,11 +229,7 @@ is 6. The .Nm utility conforms to -.St -xpg4.2 -with the exception of not supporting the intermingling of the -.Ar file -operand with the options, which the standard considers an obsolescent feature -to be removed from a further issue. +.St -p1003.1-2001 . .Sh HISTORY The .Nm diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c index 2acc65951683..5fcfb2a6d9be 100644 --- a/usr.bin/nl/nl.c +++ b/usr.bin/nl/nl.c @@ -150,13 +150,6 @@ main(argc, argv) (void)setlocale(LC_ALL, ""); - /* - * Note: this implementation strictly conforms to the XBD Utility - * Syntax Guidelines and does not permit the optional `file' operand - * to be intermingled with the options, which is defined in the - * XCU specification (Issue 5) but declared an obsolescent feature that - * will be removed from a future issue. It shouldn't matter, though. - */ while ((c = getopt(argc, argv, "pb:d:f:h:i:l:n:s:v:w:")) != -1) { switch (c) { case 'p':