svn commit: r206538 - stable/8/usr.bin/sed

[Warner Losh]

Author: imp
Date: Tue Apr 13 01:02:20 2010
New Revision: 206538
URL: http://svn.freebsd.org/changeset/base/206538

Log:
  MFC: 205992
  
    Make -r mean exactly the same thing as -E for increased compatibility
    with GNU sed.
  
    MFC after:	7 days

Modified:
  stable/8/usr.bin/sed/main.c
  stable/8/usr.bin/sed/sed.1
Directory Properties:
  stable/8/usr.bin/   (props changed)
  stable/8/usr.bin/awk/   (props changed)
  stable/8/usr.bin/calendar/   (props changed)
  stable/8/usr.bin/catman/   (props changed)
  stable/8/usr.bin/comm/   (props changed)
  stable/8/usr.bin/cpio/   (props changed)
  stable/8/usr.bin/csup/   (props changed)
  stable/8/usr.bin/fetch/   (props changed)
  stable/8/usr.bin/find/   (props changed)
  stable/8/usr.bin/finger/   (props changed)
  stable/8/usr.bin/fstat/   (props changed)
  stable/8/usr.bin/gcore/   (props changed)
  stable/8/usr.bin/gzip/   (props changed)
  stable/8/usr.bin/hexdump/   (props changed)
  stable/8/usr.bin/indent/   (props changed)
  stable/8/usr.bin/kdump/   (props changed)
  stable/8/usr.bin/locale/   (props changed)
  stable/8/usr.bin/look/   (props changed)
  stable/8/usr.bin/makewhatis/   (props changed)
  stable/8/usr.bin/netstat/   (props changed)
  stable/8/usr.bin/perror/   (props changed)
  stable/8/usr.bin/procstat/   (props changed)
  stable/8/usr.bin/script/   (props changed)
  stable/8/usr.bin/systat/   (props changed)
  stable/8/usr.bin/tftp/   (props changed)
  stable/8/usr.bin/touch/   (props changed)
  stable/8/usr.bin/truss/   (props changed)
  stable/8/usr.bin/unifdef/   (props changed)
  stable/8/usr.bin/uniq/   (props changed)
  stable/8/usr.bin/vmstat/   (props changed)
  stable/8/usr.bin/w/   (props changed)
  stable/8/usr.bin/whois/   (props changed)
  stable/8/usr.bin/xlint/   (props changed)

Modified: stable/8/usr.bin/sed/main.c
==============================================================================
--- stable/8/usr.bin/sed/main.c	Tue Apr 13 00:57:54 2010	(r206537)
+++ stable/8/usr.bin/sed/main.c	Tue Apr 13 01:02:20 2010	(r206538)
@@ -130,8 +130,9 @@ main(int argc, char *argv[])
 	fflag = 0;
 	inplace = NULL;
 
-	while ((c = getopt(argc, argv, "EI:ae:f:i:ln")) != -1)
+	while ((c = getopt(argc, argv, "EI:ae:f:i:lnr")) != -1)
 		switch (c) {
+		case 'r':		/* Gnu sed compat */
 		case 'E':
 			rflags = REG_EXTENDED;
 			break;

Modified: stable/8/usr.bin/sed/sed.1
==============================================================================
--- stable/8/usr.bin/sed/sed.1	Tue Apr 13 00:57:54 2010	(r206537)
+++ stable/8/usr.bin/sed/sed.1	Tue Apr 13 01:02:20 2010	(r206538)
@@ -39,11 +39,11 @@
 .Nd stream editor
 .Sh SYNOPSIS
 .Nm
-.Op Fl Ealn
+.Op Fl Ealnr
 .Ar command
 .Op Ar
 .Nm
-.Op Fl Ealn
+.Op Fl Ealnr
 .Op Fl e Ar command
 .Op Fl f Ar command_file
 .Op Fl I Ar extension
@@ -144,6 +144,10 @@ all of the commands have been applied to
 The
 .Fl n
 option suppresses this behavior.
+.It Fl r
+Same as
+.Fl E 
+for compatibility with GNU sed.
 .El
 .Pp
 The form of a