commit 0e4068e8c46ae0b45616fe13ac01a449b68fbc06
from: rsc <devnull@localhost>
date: Tue Jul 26 10:19:23 2005 UTC

fixes from bengt for sun

commit - caf12d8c5b8a2069a394ab9a0968b1491a833c96
commit + 0e4068e8c46ae0b45616fe13ac01a449b68fbc06
blob - e9fb4440fb0c289928fb57185eae4eb61c64d8e7
blob + e1791542c4b2d9b1024731e6a27261c977375b44
--- src/cmd/rc/exec.c
+++ src/cmd/rc/exec.c
@@ -1,9 +1,9 @@
 #include <u.h>
 #include <signal.h>
-#include <sys/ioctl.h>
 #if defined(PLAN9PORT) && defined(__sun__)
 #	define BSD_COMP	/* sigh.  for TIOCNOTTY */
 #endif
+#include <sys/ioctl.h>
 #include "rc.h"
 #include "getflags.h"
 #include "exec.h"
@@ -115,7 +115,7 @@ main(int argc, char *argv[])
 	int i;
 	
 	/* needed for rcmain later */
-	setenv("PLAN9", unsharp("#9"), 1);
+	putenv("PLAN9", unsharp("#9"));
 
 	argc=getflags(argc, argv, "srdiIlxepvVc:1m:1[command]", 1);
 	if(argc==-1) usage("[file [arg ...]]");