===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sed/main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/sed/main.c	2008/10/16 16:34:32	1.15
--- src/usr.bin/sed/main.c	2009/08/07 03:30:56	1.16
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.15 2008/10/16 16:34:32 millert Exp $	*/
  
  /*-
   * Copyright (c) 1992 Diomidis Spinellis.
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.16 2009/08/07 03:30:56 djm Exp $	*/
  
  /*-
   * Copyright (c) 1992 Diomidis Spinellis.
***************
*** 38,44 ****
  "@(#) Copyright (c) 1992, 1993\n\
  	The Regents of the University of California.  All rights reserved.\n";
  /* from: static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 1/3/94"; */
! static const char rcsid[] = "$OpenBSD: main.c,v 1.15 2008/10/16 16:34:32 millert Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
--- 38,44 ----
  "@(#) Copyright (c) 1992, 1993\n\
  	The Regents of the University of California.  All rights reserved.\n";
  /* from: static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 1/3/94"; */
! static const char rcsid[] = "$OpenBSD: main.c,v 1.16 2009/08/07 03:30:56 djm Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
***************
*** 86,92 ****
   */
  static struct s_flist *files, **fl_nextp = &files;
  
! int aflag, eflag, nflag;
  
  /*
   * Current file and line number; line numbers restart across compilation
--- 86,92 ----
   */
  static struct s_flist *files, **fl_nextp = &files;
  
! int Eflag, aflag, eflag, nflag;
  
  /*
   * Current file and line number; line numbers restart across compilation
***************
*** 105,112 ****
  	int c, fflag;
  
  	fflag = 0;
! 	while ((c = getopt(argc, argv, "ae:f:nu")) != -1)
  		switch (c) {
  		case 'a':
  			aflag = 1;
  			break;
--- 105,116 ----
  	int c, fflag;
  
  	fflag = 0;
! 	while ((c = getopt(argc, argv, "Eae:f:nru")) != -1)
  		switch (c) {
+ 		case 'E':
+ 		case 'r':
+ 			Eflag = 1;
+ 			break;
  		case 'a':
  			aflag = 1;
  			break;
***************
*** 127,134 ****
  		default:
  		case '?':
  			(void)fprintf(stderr,
! 			    "usage: sed [-anu] command [file ...]\n"
! 			    "       sed [-anu] [-e command] [-f command_file] [file ...]\n");
  			exit(1);
  		}
  	argc -= optind;
--- 131,138 ----
  		default:
  		case '?':
  			(void)fprintf(stderr,
! 			    "usage: sed [-aEnru] command [file ...]\n"
! 			    "       sed [-aEnru] [-e command] [-f command_file] [file ...]\n");
  			exit(1);
  		}
  	argc -= optind;