===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/env/env.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/env/env.c	1996/06/26 05:32:40	1.3
--- src/usr.bin/env/env.c	1997/06/20 04:54:59	1.4
***************
*** 1,4 ****
! /*	$OpenBSD: env.c,v 1.3 1996/06/26 05:32:40 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1988, 1993, 1994
--- 1,4 ----
! /*	$OpenBSD: env.c,v 1.4 1997/06/20 04:54:59 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1988, 1993, 1994
***************
*** 41,47 ****
  
  #ifndef lint
  /*static char sccsid[] = "@(#)env.c	8.3 (Berkeley) 4/2/94";*/
! static char rcsid[] = "$OpenBSD: env.c,v 1.3 1996/06/26 05:32:40 deraadt Exp $";
  #endif /* not lint */
  
  #include <err.h>
--- 41,47 ----
  
  #ifndef lint
  /*static char sccsid[] = "@(#)env.c	8.3 (Berkeley) 4/2/94";*/
! static char rcsid[] = "$OpenBSD: env.c,v 1.4 1997/06/20 04:54:59 deraadt Exp $";
  #endif /* not lint */
  
  #include <err.h>
***************
*** 62,68 ****
  	extern char **environ;
  	extern int optind;
  	char **ep, *p;
- 	char *cleanenv[1];
  	int ch;
  
  	setlocale(LC_ALL, "");
--- 62,67 ----
***************
*** 71,78 ****
  		switch((char)ch) {
  		case '-':			/* obsolete */
  		case 'i':
! 			environ = cleanenv;
! 			cleanenv[0] = NULL;
  			break;
  		case '?':
  		default:
--- 70,77 ----
  		switch((char)ch) {
  		case '-':			/* obsolete */
  		case 'i':
! 			if ((environ = (char **)calloc(1, sizeof(char *))) == NULL)
! 				err(1, "calloc");
  			break;
  		case '?':
  		default: