Renamed src/lib/utils to src/lib/sysutil --- because of new src/lib/util

diff --git a/drivers/at_wini/Makefile b/drivers/at_wini/Makefile
index d1390d9782114b5fc40834b75240843734b729b6..98cac29a9a46c38868786e50e87aa7ddc792691a 100644 (file)
--- a/drivers/at_wini/Makefile
+++ b/drivers/at_wini/Makefile
@@ -14,7 +14,7 @@ MAKE = exec make
 CC =   exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils -ltimers
+LIBS = -lsys -lsysutil -ltimers
 
 OBJ = at_wini.o 
 LIBDRIVER = $d/libdriver/driver.o $d/libdriver/drvlib.o

diff --git a/drivers/at_wini/at_wini.c b/drivers/at_wini/at_wini.c
index 78d077229efd32935709ecb5fad8643ae29012f8..0af648bad82438bc43a292161da5c8ba4007cd5e 100644 (file)
--- a/drivers/at_wini/at_wini.c
+++ b/drivers/at_wini/at_wini.c
@@ -14,7 +14,7 @@
  */
 
 #include "at_wini.h"
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 #include <minix/keymap.h>
 #include <sys/ioc_disk.h>
 

diff --git a/drivers/dpeth/Makefile b/drivers/dpeth/Makefile
index 09053aa2aa8f064ca8ef3486dc574a3b82c75915..8bc1107c7fe007ba4420250f8b9705b37e228132 100644 (file)
--- a/drivers/dpeth/Makefile
+++ b/drivers/dpeth/Makefile
@@ -2,6 +2,9 @@
 ##  Makefile for ISA ethernet drivers  May  02, 2000
 ##
 ##  $Log$
+##  Revision 1.3  2005/07/19 13:21:48  jnherder
+##  Renamed src/lib/utils to src/lib/sysutil --- because of new src/lib/util
+##
 ##  Revision 1.2  2005/07/19 12:12:47  jnherder
 ##  Changed Makefiles: drivers are now installed in /usr/sbin.
 ##  TTY now gets SYS_EVENT message with sigset (e.g., SIGKMESS, SIGKSTOP).
@@ -28,7 +31,7 @@ LDFLAGS       = -i -o $@
 
 SRCS   = 3c501.c 3c509.c 3c503.c ne.c wd.c 8390.c devio.c netbuff.c dp.c
 OBJS   = 3c501.o 3c509.o 3c503.o ne.o wd.o 8390.o devio.o netbuff.o dp.o
-LIBS   = -lutils -lsys # -ltimers
+LIBS   = -lsysutil -lsys # -ltimers
 
 ##  Build rules
 all build:     $(DRIVER)

diff --git a/drivers/drivers.h b/drivers/drivers.h
index 69eb79b953e25641a5550b0100e5f9932a67e2ea..a5812b12cb7cd704fd66f06d9d70e56ca0a204b4 100644 (file)
--- a/drivers/drivers.h
+++ b/drivers/drivers.h
@@ -15,7 +15,7 @@
 #include <minix/const.h>
 #include <minix/devio.h>
 #include <minix/syslib.h>
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 #include <minix/bitmap.h>
 
 #include <ibm/interrupt.h>     /* IRQ vectors and miscellaneous ports */

diff --git a/drivers/floppy/Makefile b/drivers/floppy/Makefile
index 5110219db7b9d162fe3bd5c3a6d6c26c0994745b..55f0fdcc5e4ee4f91adfc5cc94b45cc28bbd3f4a 100644 (file)
--- a/drivers/floppy/Makefile
+++ b/drivers/floppy/Makefile
@@ -14,7 +14,7 @@ MAKE = exec make
 CC =   exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils -ltimers
+LIBS = -lsys -lsysutil -ltimers
 
 OBJ = floppy.o 
 LIBDRIVER = $d/libdriver/driver.o $d/libdriver/drvlib.o

diff --git a/drivers/floppy/floppy.c b/drivers/floppy/floppy.c
index 8801881cd9e05d425783bece16b03ad254521743..8bf01098c50dc4d1537db13cb6cd7f1234d11088 100644 (file)
--- a/drivers/floppy/floppy.c
+++ b/drivers/floppy/floppy.c
@@ -24,7 +24,7 @@
 #include "floppy.h"
 #include <timers.h>
 #include <ibm/diskparm.h>
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 #include <minix/syslib.h>
 
 /* I/O Ports used by floppy disk task. */

diff --git a/drivers/fxp/Makefile b/drivers/fxp/Makefile
index d53aa934ba4c2c717865c2b0583f0dfeca28e635..317e62481d390be6a096f30cf5ea47d490a50930 100644 (file)
--- a/drivers/fxp/Makefile
+++ b/drivers/fxp/Makefile
@@ -13,7 +13,7 @@ d = ..
 CC =   exec cc
 CFLAGS = -I$i
 LDFLAGS = -i 
-LIBS = -lsys -lutils -ltimers
+LIBS = -lsys -lsysutil -ltimers
 
 OBJ = fxp.o mii.o
 LIBPCI = $d/libpci/pci.o $d/libpci/pci_table.o

diff --git a/drivers/libdriver/Makefile b/drivers/libdriver/Makefile
index eda7c743433b4edd944055942b9fa6a2450233c0..c17be2d6597d3bcdae96bd1276ef5dc646535dfb 100644 (file)
--- a/drivers/libdriver/Makefile
+++ b/drivers/libdriver/Makefile
@@ -11,7 +11,7 @@ m = $i/minix
 CC = exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils
+LIBS = -lsys -lsysutil
 
 OBJECTS = driver.o drvlib.o
 

diff --git a/drivers/libdriver/driver.h b/drivers/libdriver/driver.h
index 777581663f5bcfdee52e77d77fc19fa542df4025..9bb1ff816f4001224555f356ebf3d77342cea3f5 100644 (file)
--- a/drivers/libdriver/driver.h
+++ b/drivers/libdriver/driver.h
@@ -15,7 +15,7 @@
 #include <sys/types.h>
 #include <minix/const.h>
 #include <minix/syslib.h>
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 
 #include <string.h>
 #include <limits.h>

diff --git a/drivers/libpci/Makefile b/drivers/libpci/Makefile
index d8f262830f23a92ab41f00b3612d493870707b37..96acf0bb14ddeeeae8555e52293259bbda6c1bf3 100644 (file)
--- a/drivers/libpci/Makefile
+++ b/drivers/libpci/Makefile
@@ -11,7 +11,7 @@ m = $i/minix
 CC =   exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils
+LIBS = -lsys -lsysutil
 
 OBJECTS = pci.o pci_table.o 
 

diff --git a/drivers/libpci/pci.c b/drivers/libpci/pci.c
index 8b57c3fe605d6fc3bff52156a4f39c67a6671b64..ba04f257bf445e0b742ac4dcdd8e2334433df851 100644 (file)
--- a/drivers/libpci/pci.c
+++ b/drivers/libpci/pci.c
@@ -32,7 +32,7 @@ Created:      Jan 2000 by Philip Homburg <philip@cs.vu.nl>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 
 #define NR_PCIBUS       2
 #define NR_PCIDEV      40

diff --git a/drivers/log/Makefile b/drivers/log/Makefile
index 0f4855784df2673317e22c2a47e12db33c67c872..d62267d9ce125a735271eac55925e518b78a93fe 100644 (file)
--- a/drivers/log/Makefile
+++ b/drivers/log/Makefile
@@ -13,7 +13,7 @@ MAKE = exec make
 CC =   exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils
+LIBS = -lsys -lsysutil
 
 OBJ = log.o 
 LIBDRIVER = $d/libdriver/driver.o

diff --git a/drivers/log/log.c b/drivers/log/log.c
index 3277bf29b3f062f34387cab966b92ba929a58e43..54cf75c43d5221be3f2cd789e8d7643049fac7bb 100644 (file)
--- a/drivers/log/log.c
+++ b/drivers/log/log.c
@@ -53,6 +53,7 @@ FORWARD _PROTOTYPE( int log_other, (struct driver *dp, message *m_ptr) );
 FORWARD _PROTOTYPE( void log_geometry, (struct partition *entry) );
 FORWARD _PROTOTYPE( void log_reply, (int code, int replyee, int proc, int status) );
 FORWARD _PROTOTYPE( void log_notify, (int code, int replyee, int line, int ops) );
+FORWARD _PROTOTYPE( int subread, (struct logdevice *log, int count, int proc_nr, vir_bytes user_vir) );
 
 /* Entry points to this driver. */
 PRIVATE struct driver log_dtab = {

diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile
index b696edba7e2d30620b79c9c8e59c01d3e87e6ebe..c9576a12744478ea3f6e54214d3409ddf20d6c55 100644 (file)
--- a/drivers/memory/Makefile
+++ b/drivers/memory/Makefile
@@ -14,7 +14,7 @@ MAKE = exec make
 CC =   exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils
+LIBS = -lsys -lsysutil
 
 OBJ = memory.o random.o sha2.o aes/rijndael_api.o aes/rijndael_alg.o
 LIBDRIVER = $d/libdriver/driver.o

diff --git a/drivers/printer/Makefile b/drivers/printer/Makefile
index 09f4757702e54708747a697eca4855276fc65e81..14e88093e9e22079899fc10e410b91960aa83867 100644 (file)
--- a/drivers/printer/Makefile
+++ b/drivers/printer/Makefile
@@ -13,7 +13,7 @@ d = ..
 CC =   exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils
+LIBS = -lsys -lsysutil
 
 OBJ = printer.o
 

diff --git a/drivers/rtl8139/Makefile b/drivers/rtl8139/Makefile
index 24b6c4ec03c7a2daa3b0ebb5ac51ba4697a89f10..83be7bd15c12bdf9f524d6e2647c43ca91949e18 100644 (file)
--- a/drivers/rtl8139/Makefile
+++ b/drivers/rtl8139/Makefile
@@ -14,7 +14,7 @@ MAKE = exec make
 CC =   exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils -ltimers
+LIBS = -lsys -lsysutil -ltimers
 
 OBJ = rtl8139.o 
 LIBPCI = $d/libpci/pci.o $d/libpci/pci_table.o

diff --git a/drivers/rtl8139/rtl8139.c b/drivers/rtl8139/rtl8139.c
index b075b68feae909413592079d0842ff8f1975d898..9e86b7104b52904a4ff90b88efe7b669ec338e77 100755 (executable)
--- a/drivers/rtl8139/rtl8139.c
+++ b/drivers/rtl8139/rtl8139.c
@@ -56,7 +56,7 @@
 #include <minix/keymap.h>
 #include <minix/syslib.h>
 #include <minix/type.h>
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 #include <timers.h>
 #include <ibm/portio.h>
 #include <net/hton.h>

diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index 0229b2191a167240b5944408f6a6d8c960e6c67d..06790e6edbc394eccd29e8cf09bc97608d63ad14 100644 (file)
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -14,7 +14,7 @@ MAKE = exec make
 CC =   exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils -ltimers
+LIBS = -lsys -lsysutil -ltimers
 
 OBJ = tty.o console.o vidcopy.o keyboard.o pty.o rs232.o 
 

diff --git a/include/minix/utils.h b/include/minix/sysutil.h
similarity index 100%
rename from include/minix/utils.h
rename to include/minix/sysutil.h

diff --git a/lib/Makefile b/lib/Makefile
index 25eb72dac9138b2d40ad9b8697d1907cb46e1d44..55fd6812a85651f7c38972f821094aa23a3cfaca 100755 (executable)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -33,7 +33,7 @@ all:
        cd socket && $(MAKE)
        cd syscall && $(MAKE)
        cd syslib && $(MAKE)
-       cd utils && $(MAKE)
+       cd sysutil && $(MAKE)
        cd timers && $(MAKE)
        cd $(ZLIB) && $(MAKE)
        cd `arch` && $(MAKE)
@@ -59,7 +59,7 @@ install_i86:  \
        $(LIB)/end.a \
        $(LIB)/libsys.a \
        $(LIB)/libtimers.a \
-       $(LIB)/utils.a \
+       $(LIB)/sysutil.a \
        $(LIB)/libcurses.a \
        $(LIB)/libedit.a \
        $(LIB)/liby.a \
@@ -103,7 +103,7 @@ $(LIB)/libsys.a:    libsys.a
 $(LIB)/libtimers.a:    libtimers.a
        install -c -o bin $? $@
 
-$(LIB)/libutils.a:     libutils.a
+$(LIB)/libsysutil.a:   libsysutil.a
        install -c -o bin $? $@
 
 $(LIB)/libcurses.a:    libcurses.a
@@ -134,7 +134,7 @@ install_i386:       \
        $(LIB386)/end.a \
        $(LIB386)/libsys.a \
        $(LIB386)/libtimers.a \
-       $(LIB386)/libutils.a \
+       $(LIB386)/libsysutil.a \
        $(LIB386)/libcurses.a \
        $(LIB386)/libedit.a \
        $(LIB386)/liby.a \
@@ -181,7 +181,7 @@ $(LIB386)/libsys.a: libsys.a
 $(LIB386)/libtimers.a: libtimers.a
        install -c -o bin $? $@
 
-$(LIB386)/libutils.a:  libutils.a
+$(LIB386)/libsysutil.a:        libsysutil.a
        install -c -o bin $? $@
 
 $(LIB386)/libcurses.a: libcurses.a

diff --git a/lib/utils/Makefile b/lib/sysutil/Makefile
similarity index 97%
rename from lib/utils/Makefile
rename to lib/sysutil/Makefile
index 46e702e5b36695bb661e1621b3328beee744cfd7..61189679a49c4e616f15c0f19d06f34a871c22f7 100644 (file)
--- a/lib/utils/Makefile
+++ b/lib/sysutil/Makefile
@@ -3,7 +3,7 @@
 CFLAGS = -O -D_MINIX -D_POSIX_SOURCE
 CC1    = $(CC) $(CFLAGS) -c
 
-LIBUTILS       = ../libutils.a
+LIBUTILS       = ../libsysutil.a
 all:   $(LIBUTILS)
 
 OBJECTS        = \

diff --git a/lib/utils/env_panic.c b/lib/sysutil/env_panic.c
similarity index 96%
rename from lib/utils/env_panic.c
rename to lib/sysutil/env_panic.c
index f458860e4e90284fe24c4707d4783c270dc5e757..76d5037148d4b3cf161a00ea1fe3a8be341708d6 100644 (file)
--- a/lib/utils/env_panic.c
+++ b/lib/sysutil/env_panic.c
@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "sysutil.h"
 #include <string.h>
 
 /*=========================================================================*

diff --git a/lib/utils/env_parse.c b/lib/sysutil/env_parse.c
similarity index 99%
rename from lib/utils/env_parse.c
rename to lib/sysutil/env_parse.c
index a29ecd3ee4a82321c4b8f3be812cbd2ec5bb3287..8979957a58ddb0f771d0026bd1ab9e48987f30fc 100644 (file)
--- a/lib/utils/env_parse.c
+++ b/lib/sysutil/env_parse.c
@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "sysutil.h"
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/lib/utils/env_prefix.c b/lib/sysutil/env_prefix.c
similarity index 97%
rename from lib/utils/env_prefix.c
rename to lib/sysutil/env_prefix.c
index 6adfe8b1889f1b81431b58f3aab24a6345747a03..791854ff2d3e4d8ddf893d15c47fd57a7526ea26 100644 (file)
--- a/lib/utils/env_prefix.c
+++ b/lib/sysutil/env_prefix.c
@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "sysutil.h"
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/lib/utils/fkey_ctl.c b/lib/sysutil/fkey_ctl.c
similarity index 97%
rename from lib/utils/fkey_ctl.c
rename to lib/sysutil/fkey_ctl.c
index 79207fd689da7c4bcb37d5e088a52f4cd09f5283..0de98f90f01ea3ba1df73e9681d89667321daf36 100644 (file)
--- a/lib/utils/fkey_ctl.c
+++ b/lib/sysutil/fkey_ctl.c
@@ -1,4 +1,4 @@
-#include "utils.h" 
+#include "sysutil.h" 
 
 /*===========================================================================*
  *                             fkey_ctl                                     *

diff --git a/lib/utils/get_mon_prm.c b/lib/sysutil/get_mon_prm.c
similarity index 98%
rename from lib/utils/get_mon_prm.c
rename to lib/sysutil/get_mon_prm.c
index 93c49ba15064775eb95be46e8b544a709d8fc52b..4f0489cc6a12f99c74d6659267abf26921a3aab0 100644 (file)
--- a/lib/utils/get_mon_prm.c
+++ b/lib/sysutil/get_mon_prm.c
@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "sysutil.h"
 #include <minix/config.h>
 #include <string.h>
 

diff --git a/lib/utils/getuptime.c b/lib/sysutil/getuptime.c
similarity index 96%
rename from lib/utils/getuptime.c
rename to lib/sysutil/getuptime.c
index 06f94179a42f4f32489d193ebbd11d4611589fee..c304b93d3712a50c6a2cbe78c07cbfdf35d87a88 100644 (file)
--- a/lib/utils/getuptime.c
+++ b/lib/sysutil/getuptime.c
@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "sysutil.h"
 
 /*===========================================================================*
  *                               getuptime                                  *

diff --git a/lib/utils/kmalloc.c b/lib/sysutil/kmalloc.c
similarity index 100%
rename from lib/utils/kmalloc.c
rename to lib/sysutil/kmalloc.c

diff --git a/lib/utils/kprintf.c b/lib/sysutil/kprintf.c
similarity index 100%
rename from lib/utils/kprintf.c
rename to lib/sysutil/kprintf.c

diff --git a/lib/utils/kputc.c b/lib/sysutil/kputc.c
similarity index 98%
rename from lib/utils/kputc.c
rename to lib/sysutil/kputc.c
index 76827f4d2c6aa5f7b3e6a0c3400548bee5a34a08..242a4b22b20e458b262243c5217ce9445d0e4713 100644 (file)
--- a/lib/utils/kputc.c
+++ b/lib/sysutil/kputc.c
@@ -10,7 +10,7 @@
  * to pollute the kernel message buffer with its debug dumps. 
  */
 
-#include "utils.h"
+#include "sysutil.h"
 
 /*===========================================================================*
  *                             kputc                                        *

diff --git a/lib/utils/panic.c b/lib/sysutil/panic.c
similarity index 97%
rename from lib/utils/panic.c
rename to lib/sysutil/panic.c
index 00cc891867d72835b51b5cce590ae640f74b9655..6fa0bcf63e6feae9c43fb9fd8e812dfd6db83966 100644 (file)
--- a/lib/utils/panic.c
+++ b/lib/sysutil/panic.c
@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "sysutil.h"
 
 /*===========================================================================*
  *                             panic                                        *
@@ -13,7 +13,6 @@ int num;                      /* number to go with format string */
  * value of a defined constant.
  */
   message m;
-
   if (NULL != who && NULL != mess) {
       if (num != NO_NUM) {
           printf("Panic in %s: %s: %d\n", who, mess, num); 

diff --git a/lib/utils/report.c b/lib/sysutil/report.c
similarity index 95%
rename from lib/utils/report.c
rename to lib/sysutil/report.c
index 541cdca69e9e606fed2a66fde7b2bf8da7bf60d1..e4f9d5ef1cc050562757b382d4150d8bc016aa3c 100644 (file)
--- a/lib/utils/report.c
+++ b/lib/sysutil/report.c
@@ -1,4 +1,4 @@
-#include "utils.h" 
+#include "sysutil.h" 
 
 /*===========================================================================*
  *                                 report                                           *

diff --git a/lib/utils/utils.h b/lib/sysutil/sysutil.h
similarity index 64%
rename from lib/utils/utils.h
rename to lib/sysutil/sysutil.h
index 14578d3bf8542ac781536372d8e5de08a72e323e..306abfe4f8141de525e2a329963ecc661f3fd96d 100644 (file)
--- a/lib/utils/utils.h
+++ b/lib/sysutil/sysutil.h
@@ -1,8 +1,8 @@
-/*     utils.h - System library utilities.     */
+/*     sysutil.h - System library utilities.   */
 
 #define _SYSTEM
 
 #include <lib.h>               /* common to all libraries */
 #include <minix/com.h>         /* need task numbers + message types */
 #include <minix/syslib.h>      /* need sendrec, _taskcall, etc */
-#include <minix/utils.h>       /* prototypes in this library */
+#include <minix/sysutil.h>     /* prototypes in this library */

diff --git a/lib/utils/taskcall.c b/lib/sysutil/taskcall.c
similarity index 100%
rename from lib/utils/taskcall.c
rename to lib/sysutil/taskcall.c

diff --git a/lib/utils/tickdelay.c b/lib/sysutil/tickdelay.c
similarity index 98%
rename from lib/utils/tickdelay.c
rename to lib/sysutil/tickdelay.c
index f407fea9bfcfa5a41c5b0f10bda64ce8d4272dc4..6ec28bdf7dfcec6bb371f00ae8bd3df53495d22a 100644 (file)
--- a/lib/utils/tickdelay.c
+++ b/lib/sysutil/tickdelay.c
@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "sysutil.h"
 
 /*===========================================================================*
  *                               tickdelay                                  *

diff --git a/servers/fs/Makefile b/servers/fs/Makefile
index 6a914f4f03bc29766d80231450fea5c6a5ae7d73..9b94b1c846ff94f383bcfedbf6cf3ac56d9ab97e 100644 (file)
--- a/servers/fs/Makefile
+++ b/servers/fs/Makefile
@@ -11,7 +11,7 @@ h = $i/minix
 CC =   exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils -ltimers
+LIBS = -lsys -lsysutil -ltimers
 
 OBJ =  main.o open.o read.o write.o pipe.o dmap.o \
        device.o path.o mount.o link.o super.o inode.o \

diff --git a/servers/fs/cmostime.c b/servers/fs/cmostime.c
index cce3cb587194e2eb0e87c1d8575d0457afe0746d..06e5e9012f752c2607c106000018be8df7929456 100644 (file)
--- a/servers/fs/cmostime.c
+++ b/servers/fs/cmostime.c
@@ -1,7 +1,6 @@
 #include "fs.h"
 #include <minix/com.h>
 #include <minix/callnr.h>
-#include <minix/utils.h>
 #include <time.h>
 #include <ibm/cmos.h>
 #include <ibm/bios.h>

diff --git a/servers/fs/dmap.c b/servers/fs/dmap.c
index 542ff3a0c20aaba7cf9b0d54eb41d8eeba72a73f..5fa611088868de1eb7110cb92ce2835a6841c3c4 100644 (file)
--- a/servers/fs/dmap.c
+++ b/servers/fs/dmap.c
@@ -9,7 +9,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <minix/com.h>
-#include <minix/utils.h>
 
 /* Some devices may or may not be there in the next table. */
 #define DT(enable, opcl, io, driver, flags) \

diff --git a/servers/fs/fs.h b/servers/fs/fs.h
index 3ebc92ed78dcdb1b5ea9fb45b076ce6471d6c47b..a47663f35464d3a77fb8864bd09264aafa3d2da6 100644 (file)
--- a/servers/fs/fs.h
+++ b/servers/fs/fs.h
@@ -16,7 +16,7 @@
 #include <errno.h>
 
 #include <minix/syslib.h>
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 
 #include "const.h"
 #include "type.h"

diff --git a/servers/fs/main.c b/servers/fs/main.c
index 97f34c01378d255c75a12ed622ab295c26f41cef..c10692238efc5bec3acb9fefb823b8b40a66be5f 100644 (file)
--- a/servers/fs/main.c
+++ b/servers/fs/main.c
@@ -18,7 +18,6 @@ struct super_block;           /* proto.h needs to know this */
 #include <stdlib.h>
 #include <sys/ioc_memory.h>
 #include <sys/svrctl.h>
-#include <minix/utils.h>
 #include <minix/callnr.h>
 #include <minix/com.h>
 #include <minix/keymap.h>

diff --git a/servers/inet/Makefile b/servers/inet/Makefile
index 8038feb24b49c4005cd3420cbc9c14a3980c661f..a2cc1d5eef65a176e8568a429454bb70cd798e24 100644 (file)
--- a/servers/inet/Makefile
+++ b/servers/inet/Makefile
@@ -8,7 +8,7 @@ CC =            cc
 CPPFLAGS =     -I. -D_MINIX
 CFLAGS =       $(OPT) $(CPPFLAGS)
 LDFLAGS =
-LIBS =         -lsys -lutils
+LIBS =         -lsys -lsysutil
 
 .c.o:
        $(CC) $(CFLAGS) -o $@ -c $<

diff --git a/servers/inet/inet.h b/servers/inet/inet.h
index 3d99d7c0896325aa543b203388495d1858e56675..61a8f6c39a143fdc1d7533989307428a25df2486 100644 (file)
--- a/servers/inet/inet.h
+++ b/servers/inet/inet.h
@@ -30,7 +30,6 @@ Copyright 1995 Philip Homburg
 #include <sys/time.h>
 #include <minix/config.h>
 #include <minix/type.h>
-#include <minix/utils.h>
 
 #define _NORETURN      /* Should be non empty for GCC */
 
@@ -41,6 +40,7 @@ typedef int ioreq_t;
 #include <minix/const.h>
 #include <minix/com.h>
 #include <minix/syslib.h>
+#include <minix/sysutil.h>
 #include <net/hton.h>
 #include <net/gen/ether.h>
 #include <net/gen/eth_hdr.h>

diff --git a/servers/inet/inet_config.c b/servers/inet/inet_config.c
index a8f873732ced058057f0684160def14235774b76..9937dc8b51c4f73feab1052cbb387f7b56807ab8 100644 (file)
--- a/servers/inet/inet_config.c
+++ b/servers/inet/inet_config.c
@@ -20,7 +20,7 @@ Copyright 1995 Philip Homburg
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <minix/type.h>
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 #include <minix/syslib.h>
 #include "inet_config.h"
 

diff --git a/servers/init/Makefile b/servers/init/Makefile
index 4070c12de1513d45683cc05dc519dbdcf4479027..ce4593ef2e779f977f4c81489c263b78a260ea8a 100644 (file)
--- a/servers/init/Makefile
+++ b/servers/init/Makefile
@@ -18,7 +18,7 @@ OBJ =         init.o
 # build local binary
 all build:     $(SERVER)
 $(SERVER):     $(OBJ)
-       $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJ) -lutils
+       $(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJ) -lsysutil
        install -S 192w $@
 
 # install with other servers

diff --git a/servers/is/Makefile b/servers/is/Makefile
index 57031af65de4062e8468db4f4048e4c47ffeeced..ce485bfa5bbc32adc1ddfbc8aab4f26def58c30a 100644 (file)
--- a/servers/is/Makefile
+++ b/servers/is/Makefile
@@ -15,7 +15,7 @@ f = $u/src/servers/fs
 CC =   exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lutils 
+LIBS = -lsys -lsysutil 
 
 OBJ = main.o dmp.o dmp_kernel.o dmp_pm.o dmp_fs.o diag.o kputc.o
 

diff --git a/servers/is/is.h b/servers/is/is.h
index 311520043de2c8a3b2732ec942dbfefa8782373b..88db7e9ec7042ed68adabd5ac0ec9a9b0acd1393 100644 (file)
--- a/servers/is/is.h
+++ b/servers/is/is.h
@@ -18,7 +18,7 @@
 #include <minix/const.h>
 #include <minix/com.h>
 #include <minix/syslib.h>
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 #include <minix/keymap.h>
 #include <minix/bitmap.h>
 

diff --git a/servers/pm/Makefile b/servers/pm/Makefile
index af0a0397446ded07a3e7525fdec64ab322c8ae52..f671ff4fc37b188c29b8077e5c5ea588783a9e49 100644 (file)
--- a/servers/pm/Makefile
+++ b/servers/pm/Makefile
@@ -19,7 +19,7 @@ OBJ =         main.o forkexit.o break.o exec.o time.o timers.o \
 # build local binary
 all build:     $(SERVER)
 $(SERVER):     $(OBJ)
-       $(CC) -o $@ $(LDFLAGS) $(OBJ) -lsys -lutils -ltimers
+       $(CC) -o $@ $(LDFLAGS) $(OBJ) -lsys -lsysutil -ltimers
        install -S 256w $@
 
 # install with other servers

diff --git a/servers/pm/forkexit.c b/servers/pm/forkexit.c
index 0a66b737e2ebe2ec8642b143d3a419dc363b56c2..43976542e7f9b8c04dae00f6323a7dd83ef2dc53 100644 (file)
--- a/servers/pm/forkexit.c
+++ b/servers/pm/forkexit.c
@@ -18,7 +18,6 @@
 #include <sys/wait.h>
 #include <minix/callnr.h>
 #include <minix/com.h>
-#include <minix/utils.h>
 #include <signal.h>
 #include "mproc.h"
 #include "param.h"

diff --git a/servers/pm/main.c b/servers/pm/main.c
index 5200ff65d4e651f1d3a184384461d92675ac874d..17696a668e1d4bf326be77f610cd9aeb0500e566 100644 (file)
--- a/servers/pm/main.c
+++ b/servers/pm/main.c
@@ -10,7 +10,6 @@
  */
 
 #include "pm.h"
-#include <minix/utils.h>
 #include <minix/keymap.h>
 #include <minix/callnr.h>
 #include <minix/com.h>

diff --git a/servers/pm/misc.c b/servers/pm/misc.c
index 49d3469e65fc1083d2ded9a92c7f8a0c0aa92974..636bd815064972e53751192c98031de2c78832eb 100644 (file)
--- a/servers/pm/misc.c
+++ b/servers/pm/misc.c
@@ -16,7 +16,6 @@
 #include <sys/svrctl.h>
 #include <sys/resource.h>
 #include <minix/com.h>
-#include <minix/utils.h>
 #include <string.h>
 #include "mproc.h"
 #include "param.h"

diff --git a/servers/pm/pm.h b/servers/pm/pm.h
index b582c5a163574a1e900e31b26752a4a25d086897..0d610454ef4c6b4d6e928f3278e4df920796ae8f 100644 (file)
--- a/servers/pm/pm.h
+++ b/servers/pm/pm.h
@@ -15,7 +15,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <minix/syslib.h>
-#include <minix/utils.h>
+#include <minix/sysutil.h>
 
 #include <limits.h>
 #include <errno.h>

diff --git a/servers/pm/signal.c b/servers/pm/signal.c
index 1cc1e8f69be571f562a516d6651bc1fb2c371830..e1b874c708fc21f88b98ec91eea4fc6b6c913a93 100644 (file)
--- a/servers/pm/signal.c
+++ b/servers/pm/signal.c
@@ -21,7 +21,6 @@
  */
 
 #include "pm.h"
-#include <minix/utils.h>
 #include <sys/stat.h>
 #include <minix/callnr.h>
 #include <minix/com.h>