Author: eadler
Date: Mon Dec 16 01:20:18 2013
New Revision: 259443
URL: http://svnweb.freebsd.org/changeset/base/259443
Log:
MFC r259132,r259133,r259143:
Per the resolution of POSIX bug 0000779 (note 0002050) add support for
using 'i'
as a case insensitive flag.
Add regression test for recently added 'i' flag in r259132.
the i modifier was added in r259132 since POSIX recently agreed to add
it. Switch uses of /I to /i.
PR: standards/184641
Added:
stable/10/tools/regression/usr.bin/sed/regress.icase4.out
- copied unchanged from r259133,
head/tools/regression/usr.bin/sed/regress.icase4.out
Modified:
stable/10/tools/regression/usr.bin/sed/regress.sh
stable/10/usr.bin/sed/compile.c
stable/10/usr.bin/sed/sed.1
stable/10/usr.sbin/bsdinstall/scripts/services
Directory Properties:
stable/10/ (props changed)
Copied: stable/10/tools/regression/usr.bin/sed/regress.icase4.out (from
r259133, head/tools/regression/usr.bin/sed/regress.icase4.out)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/10/tools/regression/usr.bin/sed/regress.icase4.out Mon Dec 16
01:20:18 2013 (r259443, copy of r259133,
head/tools/regression/usr.bin/sed/regress.icase4.out)
@@ -0,0 +1,4 @@
+input
+data
+for validation
+of Foo(1)
Modified: stable/10/tools/regression/usr.bin/sed/regress.sh
==============================================================================
--- stable/10/tools/regression/usr.bin/sed/regress.sh Mon Dec 16 00:59:05
2013 (r259442)
+++ stable/10/tools/regression/usr.bin/sed/regress.sh Mon Dec 16 01:20:18
2013 (r259443)
@@ -66,6 +66,7 @@ REGRESSION_TEST_FREEFORM(`inplace5', `in
REGRESSION_TEST(`icase1', `sed /SED/Id < regress.in')
REGRESSION_TEST(`icase2', `sed s/SED/Foo/I < regress.in')
REGRESSION_TEST(`icase3', `sed s/SED/Foo/ < regress.in')
+REGRESSION_TEST(`icase4', `sed s/SED/Foo/i < regress.in')
REGRESSION_TEST(`hanoi', `echo ":abcd: : :" | sed -f hanoi.sed')
REGRESSION_TEST(`math', `echo "4+7*3+2^7/3" | sed -f math.sed')
Modified: stable/10/usr.bin/sed/compile.c
==============================================================================
--- stable/10/usr.bin/sed/compile.c Mon Dec 16 00:59:05 2013
(r259442)
+++ stable/10/usr.bin/sed/compile.c Mon Dec 16 01:20:18 2013
(r259443)
@@ -582,6 +582,7 @@ compile_flags(char *p, struct s_subst *s
case 'p':
s->p = 1;
break;
+ case 'i':
case 'I':
s->icase = 1;
break;
Modified: stable/10/usr.bin/sed/sed.1
==============================================================================
--- stable/10/usr.bin/sed/sed.1 Mon Dec 16 00:59:05 2013 (r259442)
+++ stable/10/usr.bin/sed/sed.1 Mon Dec 16 01:20:18 2013 (r259443)
@@ -31,7 +31,7 @@
.\" @(#)sed.1 8.2 (Berkeley) 12/30/93
.\" $FreeBSD$
.\"
-.Dd May 24, 2009
+.Dd December 9, 2013
.Dt SED 1
.Os
.Sh NAME
@@ -196,7 +196,7 @@ option was specified);
a context address
that consists of a regular expression preceded and followed by a
delimiter. The closing delimiter can also optionally be followed by the
-.Dq I
+.Dq i
character, to indicate that the regular expression is to be matched
in a case-insensitive way.
.El
@@ -507,7 +507,7 @@ Append the pattern space to
if a replacement was made.
If the replacement string is identical to that which it replaces, it
is still considered to have been a replacement.
-.It I
+.It i or I
Match the regular expression in a case-insensitive way.
.El
.Pp
Modified: stable/10/usr.sbin/bsdinstall/scripts/services
==============================================================================
--- stable/10/usr.sbin/bsdinstall/scripts/services Mon Dec 16 00:59:05
2013 (r259442)
+++ stable/10/usr.sbin/bsdinstall/scripts/services Mon Dec 16 01:20:18
2013 (r259443)
@@ -29,7 +29,7 @@
: ${DIALOG_OK=0}
if [ -f $BSDINSTALL_TMPETC/rc.conf.services ]; then
- eval `sed -e s/YES/on/I -e s/NO/off/I
$BSDINSTALL_TMPETC/rc.conf.services`
+ eval `sed -e s/YES/on/i -e s/NO/off/i
$BSDINSTALL_TMPETC/rc.conf.services`
else
# Default service states. Everything is off if not enabled.
sshd_enable="on"
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
