hinfo -> dtable

2 files changed, 18 insertions, 17 deletions

diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index 87043c41e..77bde530b 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -116,16 +116,17 @@ EXTRA_OFILES=$(bupdir1)/libiberty/random.o $(bupdir1)/libiberty/strsignal.o
 
 DLL_IMPORTS:=$(w32api_lib)/libkernel32.a
 
-DLL_OFILES:=assert.o dcrt0.o debug.o delqueue.o dir.o dlfcn.o dll_init.o \
-	dtable.o environ.o  errno.o exceptions.o exec.o external.o fcntl.o \
-	fhandler.o fhandler_console.o fhandler_floppy.o fhandler_random.o \
-	fhandler_raw.o fhandler_serial.o fhandler_tape.o fhandler_termios.o \
-	fhandler_tty.o fhandler_windows.o fhandler_zero.o fork.o glob.o grp.o \
-	heap.o init.o ioctl.o localtime.o malloc.o mmap.o net.o ntea.o passwd.o \
-	path.o pinfo.o pipe.o poll.o regexp.o regerror.o regsub.o registry.o \
-	resource.o scandir.o security.o select.o shared.o signal.o sigproc.o \
-	smallprint.o spawn.o strace.o strsep.o sync.o syscalls.o sysconf.o \
-	syslog.o termios.o times.o tty.o uinfo.o uname.o wait.o window.o \
+DLL_OFILES:=assert.o cygheap.o dcrt0.o debug.o delqueue.o dir.o dlfcn.o \
+	dll_init.o dtable.o environ.o  errno.o exceptions.o exec.o external.o \
+	fcntl.o fhandler.o fhandler_console.o fhandler_floppy.o \
+	fhandler_random.o fhandler_raw.o fhandler_serial.o fhandler_tape.o \
+	fhandler_termios.o fhandler_tty.o fhandler_windows.o fhandler_zero.o \
+	fork.o glob.o grp.o heap.o init.o ioctl.o localtime.o malloc.o mmap.o \
+	net.o ntea.o passwd.o path.o pinfo.o pipe.o poll.o regexp.o regerror.o \
+	regsub.o registry.o resource.o scandir.o security.o select.o shared.o \
+	signal.o sigproc.o smallprint.o spawn.o strace.o strsep.o sync.o \
+	syscalls.o sysconf.o syslog.o termios.o times.o tty.o uinfo.o uname.o \
+	wait.o window.o \
 	$(EXTRA_DLL_OFILES) $(EXTRA_OFILES) $(MT_SAFE_OBJECTS)
 
 GMON_OFILES:= gmon.o mcount.o profil.o
@@ -313,7 +314,7 @@ glob.o: include/glob.h
 gmon.o: profil.h gmon.h
 grp.o: $(WINSUP_H)
 heap.o: $(WINSUP_H)
-hinfo.o: $(WINSUP_H)
+dtable.o: $(WINSUP_H)
 init.o: $(WINSUP_H)
 ioctl.o: $(WINSUP_H)
 libccrt0.o: $(WINSUP_H)
diff --git a/winsup/cygwin/ROADMAP b/winsup/cygwin/ROADMAP
index c8ed7eb36..fd0387d59 100644
--- a/winsup/cygwin/ROADMAP
+++ b/winsup/cygwin/ROADMAP
@@ -25,8 +25,8 @@ itself.  Comments to dj@cygnus.com.
 
 - files and I/O
 .h	delqueue fhandler path select
-.cc	delqueue dir fhandler* hinfo path pipe select tty
-.sgml	hinfo path
+.cc	delqueue dir fhandler* dtable path pipe select tty
+.sgml	dtable path
 
 - common unix functions
 .h	dll_init tz_posixrules
@@ -96,17 +96,17 @@ init.cc - has dll_entry() which is called by the OS when the dll is
 An fhandler is a file type handler.  This is where the unix device
 emulation happens.
 
-hinfo.cc maps posix file descriptors to a table of file handlers (type
+dtable.cc maps posix file descriptors to a table of file handlers (type
 fhandler) in the dll.  It's mostly concerned with managing the table
 of descriptors (open, dup, fork, select).  Most of the posix I/O
-system calls (syscalls.cc) use the hinfo table to call the right
+system calls (syscalls.cc) use the fdtab table to call the right
 fhandler directly.
 
 fhandler.cc is the base class; specific types are derived as
-appropriate (see fhandler.h).  hinfo.cc is in charge of selecting and
+appropriate (see fhandler.h).  dtable.cc is in charge of selecting and
 creating a suitable fhandler when you open a file.  path.cc handles
 emulated files in /dev (like /dev/null) by returning an FH_* value
-from get_device_number (which hinfo.cc calls in hinfo::build_fhandler).
+from get_device_number (which dtable.cc calls in dtable::build_fhandler).
 
 Note: if you're looking for read() and write(), they call _read() and
 _write() in syscalls.cc.  The non-underscored ones are in