Retire env.h

This was a MINIX3-specific header file placed outside of the minix/
header subdirectory, with its definitions duplicated in the more
standard minix/sysutil.h header.

Also make env_prefix(3) take constant pointers.

Change-Id: I243c38eb38e24eb98f0c0dddf7f340e7fec255f4

diff --git a/distrib/sets/lists/minix-comp/mi b/distrib/sets/lists/minix-comp/mi
index 16afb47d677837a7b273251f40a3076fd6afe9c4..33bdb11d611eda469f805f52f45edff4cabb2d0b 100644 (file)
--- a/distrib/sets/lists/minix-comp/mi
+++ b/distrib/sets/lists/minix-comp/mi
@@ -292,7 +292,7 @@
 ./usr/include/disktab.h                                 minix-comp
 ./usr/include/dlfcn.h                                   minix-comp
 ./usr/include/elf.h                                     minix-comp
-./usr/include/env.h                                     minix-comp
+./usr/include/env.h                                     minix-comp      obsolete
 ./usr/include/err.h                                     minix-comp
 ./usr/include/errno.h                                   minix-comp
 ./usr/include/eti.h                                     minix-comp

diff --git a/minix/include/Makefile b/minix/include/Makefile
index fbad7bc95c10ed67159df702998d7e15f2c1e07b..37ab0acc5e15f8ea83578fc6c18755b959d0bd4d 100644 (file)
--- a/minix/include/Makefile
+++ b/minix/include/Makefile
@@ -2,7 +2,7 @@
 
 NOOBJ=         # defined
 
-INCS+= env.h lib.h libutil.h varargs.h configfile.h
+INCS+= lib.h libutil.h varargs.h configfile.h
 
 .include <bsd.own.mk>
 

diff --git a/minix/include/env.h b/minix/include/env.h
deleted file mode 100644 (file)
index 2f60f42..0000000
--- a/minix/include/env.h
+++ /dev/null
@@ -1,4 +0,0 @@
-int env_parse(const char *env, const char *fmt, int field, long *param, long min,
-       long max);
-void __dead env_panic(const char *env);
-int env_prefix(char *env, char *prefix);

diff --git a/minix/include/minix/sysutil.h b/minix/include/minix/sysutil.h
index 7ac9fc113e3bf4b351b126598502c6e4fe5f9135..bd976f80950ca1ba9e27f90e0741bcd15c77b739 100644 (file)
--- a/minix/include/minix/sysutil.h
+++ b/minix/include/minix/sysutil.h
@@ -36,8 +36,8 @@ extern char **env_argv;
 
 void env_setargs(int argc, char *argv[]);
 int env_get_param(const char *key, char *value, int max_size);
-int env_prefix(char *env, char *prefix);
-void env_panic(const char *key);
+int env_prefix(const char *env, const char *prefix);
+void __dead env_panic(const char *key);
 int env_parse(const char *env, const char *fmt, int field,
        long *param, long min, long max);
 

diff --git a/minix/lib/libsys/env_panic.c b/minix/lib/libsys/env_panic.c
index 6e0c9357fbc3d401881dc126079a281f119e02e8..4ca0dcd42bca01d5db613061f5e909f921e121f1 100644 (file)
--- a/minix/lib/libsys/env_panic.c
+++ b/minix/lib/libsys/env_panic.c
@@ -1,6 +1,5 @@
 #include "sysutil.h"
 #include <string.h>
-#include <env.h>
 
 /*=========================================================================*
  *                             env_panic                                  *

diff --git a/minix/lib/libsys/env_parse.c b/minix/lib/libsys/env_parse.c
index 2cc0b16d91663d24e4766e44264cd8c20e252d47..075c1f16bffe07350ff3b5e64b0cf7f69fdf590e 100644 (file)
--- a/minix/lib/libsys/env_parse.c
+++ b/minix/lib/libsys/env_parse.c
@@ -1,6 +1,5 @@
 #include "sysutil.h"
 #include <stdlib.h>
-#include <env.h>
 #include <string.h>
 #include <minix/param.h>
 

diff --git a/minix/lib/libsys/env_prefix.c b/minix/lib/libsys/env_prefix.c
index 5ef297917bd28a5b08cfa8ffa44fd6e4c162a6b4..e1cf283f7278535a19f8cdb2e48ed3b7646f82f9 100644 (file)
--- a/minix/lib/libsys/env_prefix.c
+++ b/minix/lib/libsys/env_prefix.c
@@ -5,11 +5,11 @@
 /*=========================================================================*
  *                             env_prefix                                 *
  *=========================================================================*/
-int env_prefix(env, prefix)
-char *env;             /* environment variable to inspect */
-char *prefix;          /* prefix to test for */
+int env_prefix(const char *env, const char *prefix)
 {
 /* An environment setting may be prefixed by a word, usually "pci".  
+ * - env: environment variable to inspect
+ * - prefix: prefix to test for
  * Return TRUE if a given prefix is used.
  */
   char value[EP_BUF_SIZE];

diff --git a/minix/servers/pm/main.c b/minix/servers/pm/main.c
index bee852f1d7d4f24a9e14b4532f781707704b2f16..825c8abbaf3eacc371152c969882b41dc2220555 100644 (file)
--- a/minix/servers/pm/main.c
+++ b/minix/servers/pm/main.c
@@ -25,7 +25,6 @@
 #include <sys/utsname.h>
 #include <sys/wait.h>
 #include <machine/archtypes.h>
-#include <env.h>
 #include <assert.h>
 #include "mproc.h"
 

diff --git a/minix/servers/vm/break.c b/minix/servers/vm/break.c
index 92c0eee7d5e6a671ebf236425a9bb2198a1b897d..57478f62f4bc149ca754ef4018a9766339f0be43 100644 (file)
--- a/minix/servers/vm/break.c
+++ b/minix/servers/vm/break.c
@@ -29,7 +29,6 @@
 #include <minix/bitmap.h>
 
 #include <errno.h>
-#include <env.h>
 
 #include "glo.h"
 #include "vm.h"

diff --git a/minix/servers/vm/exit.c b/minix/servers/vm/exit.c
index dd0ee6d630408bb9060fceb6f05ec383692ddb8c..58c3c25761e77a21e1ce5b56085a4d3008ac441b 100644 (file)
--- a/minix/servers/vm/exit.c
+++ b/minix/servers/vm/exit.c
@@ -16,7 +16,6 @@
 
 #include <errno.h>
 #include <assert.h>
-#include <env.h>
 
 #include "glo.h"
 #include "proto.h"

diff --git a/minix/servers/vm/fork.c b/minix/servers/vm/fork.c
index 806fe38a96c0c1ab33b7baba98e657ed7f66fa28..3b399932cf3114b2bcf14c1874883bd415c22066 100644 (file)
--- a/minix/servers/vm/fork.c
+++ b/minix/servers/vm/fork.c
@@ -17,7 +17,6 @@
 
 #include <string.h>
 #include <errno.h>
-#include <env.h>
 #include <assert.h>
 
 #include "glo.h"

diff --git a/minix/servers/vm/main.c b/minix/servers/vm/main.c
index d6f5d7b555c84eb25ba9672daaedbfe7f547d470..7cd817d0266d951a3f3e03a0d1f12273bb8d74ff 100644 (file)
--- a/minix/servers/vm/main.c
+++ b/minix/servers/vm/main.c
@@ -23,7 +23,6 @@
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
-#include <env.h>
 #include <stdio.h>
 #include <assert.h>
 

diff --git a/minix/servers/vm/mmap.c b/minix/servers/vm/mmap.c
index 8c472a141b4321edf8075216cce6358f216eac3a..b1394a29e5b6d016a286ba98bd644f6f2fd24ccd 100644 (file)
--- a/minix/servers/vm/mmap.c
+++ b/minix/servers/vm/mmap.c
@@ -24,7 +24,6 @@
 #include <errno.h>
 #include <assert.h>
 #include <string.h>
-#include <env.h>
 #include <stdio.h>
 #include <fcntl.h>
 

diff --git a/minix/servers/vm/pagefaults.c b/minix/servers/vm/pagefaults.c
index 23e122f4fcb33b1e47555e7f2c51b9f7146fb2bf..e851683d7cb735cb09d92e784d460b6dfd1f6a36 100644 (file)
--- a/minix/servers/vm/pagefaults.c
+++ b/minix/servers/vm/pagefaults.c
@@ -20,7 +20,6 @@
 
 #include <errno.h>
 #include <string.h>
-#include <env.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <signal.h>

diff --git a/minix/servers/vm/pagetable.c b/minix/servers/vm/pagetable.c
index 695656cb2376685c24b6d53fd1155d55ecf8af13..f7f6101b256b183e8b26c8077d3d828fcbbd0139 100644 (file)
--- a/minix/servers/vm/pagetable.c
+++ b/minix/servers/vm/pagetable.c
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
-#include <env.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <stdlib.h>

diff --git a/minix/servers/vm/rs.c b/minix/servers/vm/rs.c
index 9f7298cb58e147e1ffa2308c3347ad15e8be3954..9801a39e7eb696bcd09fe128274457e287e00d96 100644 (file)
--- a/minix/servers/vm/rs.c
+++ b/minix/servers/vm/rs.c
@@ -20,7 +20,6 @@
 
 #include <errno.h>
 #include <string.h>
-#include <env.h>
 #include <stdio.h>
 #include <assert.h>
 

diff --git a/minix/servers/vm/slaballoc.c b/minix/servers/vm/slaballoc.c
index a208548c1597214f2791fc0b3d6190cb55e66336..0466856fc1e55e4570fab2d3fb706300ed686b3c 100644 (file)
--- a/minix/servers/vm/slaballoc.c
+++ b/minix/servers/vm/slaballoc.c
@@ -18,7 +18,6 @@
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
-#include <env.h>
 
 #include <sys/param.h>
 

diff --git a/minix/servers/vm/utility.c b/minix/servers/vm/utility.c
index 4a106889120af3bc7f16c629a29c5211a1e8eceb..189c3554981c2205c15c9ee7bcb7d05bd2be1948 100644 (file)
--- a/minix/servers/vm/utility.c
+++ b/minix/servers/vm/utility.c
@@ -19,7 +19,6 @@
 #include <minix/rs.h>
 #include <string.h>
 #include <errno.h>
-#include <env.h>
 #include <unistd.h>
 #include <assert.h>
 #include <sys/cdefs.h>

diff --git a/minix/servers/vm/vfs.c b/minix/servers/vm/vfs.c
index c7ab5e7cf1801fda7212763ae57b4b8211e88abd..98488f9330f5715f721309bd8b7807b9ab6a08df 100644 (file)
--- a/minix/servers/vm/vfs.c
+++ b/minix/servers/vm/vfs.c
@@ -18,7 +18,6 @@
 #include <minix/bitmap.h>
 #include <string.h>
 #include <errno.h>
-#include <env.h>
 #include <unistd.h>
 #include <assert.h>
 #include <sys/param.h>