This commit was manufactured by cvs2svn to create tag 'cygwin-cygwin-1_7_19-release

1_7_19-release'.

Sprout from cygwin-64bit-premerge-branch 2013-04-22 17:11:23 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'cygwin-64bit-'
Cherrypick from master 2013-06-05 07:57:39 UTC Corinna Vinschen <corinna@vinschen.de> '	* faq-programming.xml: Convert url to refer to new flat faq.html file.':
    COPYING.NEWLIB
    ChangeLog
    config.guess
    config.sub
    config/ChangeLog
    config/bootstrap-asan.mk
    config/dfp.m4
    config/picflag.m4
    include/ChangeLog
    include/elf/ChangeLog
    include/elf/aarch64.h
    include/elf/common.h
    include/elf/mips.h
    include/elf/msp430.h
    include/opcode/ChangeLog
    include/opcode/avr.h
    include/opcode/mips.h
    include/opcode/msp430.h
    newlib/ChangeLog
    newlib/MAINTAINERS
    newlib/configure
    newlib/configure.host
    newlib/configure.in
    newlib/libc/configure
    newlib/libc/configure.in
    newlib/libc/ctype/ctype_.c
    newlib/libc/ctype/isalnum.c
    newlib/libc/ctype/isalpha.c
    newlib/libc/ctype/isblank.c
    newlib/libc/ctype/iscntrl.c
    newlib/libc/ctype/isdigit.c
    newlib/libc/ctype/islower.c
    newlib/libc/ctype/isprint.c
    newlib/libc/ctype/ispunct.c
    newlib/libc/ctype/isxdigit.c
    newlib/libc/include/machine/ieeefp.h
    newlib/libc/include/machine/setjmp.h
    newlib/libc/include/reent.h
    newlib/libc/include/sys/cdefs.h
    newlib/libc/include/sys/config.h
    newlib/libc/include/sys/features.h
    newlib/libc/include/sys/reent.h
    newlib/libc/include/sys/stat.h
    newlib/libc/libc.texinfo
    newlib/libc/machine/arm/Makefile.am
    newlib/libc/machine/arm/Makefile.in
    newlib/libc/machine/arm/memcpy-armv7a.S
    newlib/libc/machine/arm/memcpy-armv7m.S
    newlib/libc/machine/arm/memcpy-stub.c
    newlib/libc/machine/arm/memcpy.S
    newlib/libc/machine/arm/strcmp.S
    newlib/libc/machine/configure
    newlib/libc/machine/configure.in
    newlib/libc/machine/powerpc/Makefile.am
    newlib/libc/machine/powerpc/Makefile.in
    newlib/libc/reent/reent.c
    newlib/libc/stdio/fgetc.c
    newlib/libc/stdio/fgetwc.c
    newlib/libc/stdio/fgetws.c
    newlib/libc/stdio/findfp.c
    newlib/libc/stdio/fputc.c
    newlib/libc/stdio/fputwc.c
    newlib/libc/stdio/fputws.c
    newlib/libc/stdio/getc.c
    newlib/libc/stdio/getchar.c
    newlib/libc/stdio/local.h
    newlib/libc/stdio/putc.c
    newlib/libc/stdio/putchar.c
    newlib/libc/stdio/scanf.c
    newlib/libc/stdio/setvbuf.c
    newlib/libc/stdio/ungetwc.c
    newlib/libc/stdio/vfscanf.c
    newlib/libc/stdio/vfwscanf.c
    newlib/libc/stdio/viprintf.c
    newlib/libc/stdio/viscanf.c
    newlib/libc/stdio/vprintf.c
    newlib/libc/stdio/vscanf.c
    newlib/libc/stdio/vwprintf.c
    newlib/libc/stdio/vwscanf.c
    newlib/libc/stdio/wscanf.c
    newlib/libc/stdlib/Makefile.am
    newlib/libc/stdlib/Makefile.in
    newlib/libc/stdlib/__atexit.c
    newlib/libc/stdlib/__call_atexit.c
    newlib/libc/stdlib/ecvtbuf.c
    newlib/libc/stdlib/mblen.c
    newlib/libc/stdlib/mbrlen.c
    newlib/libc/stdlib/mbrtowc.c
    newlib/libc/stdlib/mbtowc.c
    newlib/libc/stdlib/nano-mallocr.c
    newlib/libc/stdlib/rand.c
    newlib/libc/stdlib/strtod.c
    newlib/libc/stdlib/wcrtomb.c
    newlib/libc/stdlib/wctob.c
    newlib/libc/stdlib/wctomb.c
    newlib/libc/string/strtok.c
    newlib/libc/time/asctime.c
    newlib/libc/time/gmtime.c
    newlib/libc/time/lcltime.c
    newlib/libm/libm.texinfo
    winsup/cygserver/ChangeLog
    winsup/cygserver/ChangeLog.64bit
    winsup/cygserver/Makefile.in
    winsup/cygserver/bsd_helper.cc
    winsup/cygserver/bsd_helper.h
    winsup/cygserver/bsd_log.cc
    winsup/cygserver/bsd_log.h
    winsup/cygserver/bsd_mutex.cc
    winsup/cygserver/client.cc
    winsup/cygserver/cygserver.cc
    winsup/cygserver/msg.cc
    winsup/cygserver/process.h
    winsup/cygserver/sem.cc
    winsup/cygserver/shm.cc
    winsup/cygserver/sysv_shm.cc
    winsup/cygserver/threaded_queue.h
    winsup/cygwin/ChangeLog
    winsup/cygwin/ChangeLog.64bit
    winsup/cygwin/Makefile.in
    winsup/cygwin/aclocal.m4
    winsup/cygwin/advapi32.cc
    winsup/cygwin/autoload.cc
    winsup/cygwin/automode.c
    winsup/cygwin/binmode.c
    winsup/cygwin/child_info.h
    winsup/cygwin/common.din
    winsup/cygwin/configure
    winsup/cygwin/configure.ac
    winsup/cygwin/cpuid.h
    winsup/cygwin/cygerrno.h
    winsup/cygwin/cygheap.cc
    winsup/cygwin/cygheap.h
    winsup/cygwin/cygmagic
    winsup/cygwin/cygmalloc.h
    winsup/cygwin/cygserver.h
    winsup/cygwin/cygserver_ipc.h
    winsup/cygwin/cygthread.cc
    winsup/cygwin/cygtls.cc
    winsup/cygwin/cygtls.h
    winsup/cygwin/cygwin.sc.in
    winsup/cygwin/dcrt0.cc
    winsup/cygwin/debug.h
    winsup/cygwin/devices.cc
    winsup/cygwin/devices.h
    winsup/cygwin/devices.in
    winsup/cygwin/dir.cc
    winsup/cygwin/dlfcn.cc
    winsup/cygwin/dll_init.cc
    winsup/cygwin/dll_init.h
    winsup/cygwin/dtable.cc
    winsup/cygwin/environ.cc
    winsup/cygwin/environ.h
    winsup/cygwin/errno.cc
    winsup/cygwin/exception.h
    winsup/cygwin/exceptions.cc
    winsup/cygwin/external.cc
    winsup/cygwin/fcntl.cc
    winsup/cygwin/fenv.cc
    winsup/cygwin/fhandler.cc
    winsup/cygwin/fhandler.h
    winsup/cygwin/fhandler_clipboard.cc
    winsup/cygwin/fhandler_console.cc
    winsup/cygwin/fhandler_dev.cc
    winsup/cygwin/fhandler_disk_file.cc
    winsup/cygwin/fhandler_dsp.cc
    winsup/cygwin/fhandler_fifo.cc
    winsup/cygwin/fhandler_floppy.cc
    winsup/cygwin/fhandler_mailslot.cc
    winsup/cygwin/fhandler_mem.cc
    winsup/cygwin/fhandler_netdrive.cc
    winsup/cygwin/fhandler_proc.cc
    winsup/cygwin/fhandler_process.cc
    winsup/cygwin/fhandler_procnet.cc
    winsup/cygwin/fhandler_procsys.cc
    winsup/cygwin/fhandler_procsysvipc.cc
    winsup/cygwin/fhandler_random.cc
    winsup/cygwin/fhandler_raw.cc
    winsup/cygwin/fhandler_registry.cc
    winsup/cygwin/fhandler_serial.cc
    winsup/cygwin/fhandler_socket.cc
    winsup/cygwin/fhandler_tape.cc
    winsup/cygwin/fhandler_termios.cc
    winsup/cygwin/fhandler_tty.cc
    winsup/cygwin/fhandler_virtual.cc
    winsup/cygwin/fhandler_virtual.h
    winsup/cygwin/fhandler_windows.cc
    winsup/cygwin/fhandler_zero.cc
    winsup/cygwin/flock.cc
    winsup/cygwin/fork.cc
    winsup/cygwin/gendef
    winsup/cygwin/gentls_offsets
    winsup/cygwin/glob.cc
    winsup/cygwin/globals.cc
    winsup/cygwin/grp.cc
    winsup/cygwin/heap.cc
    winsup/cygwin/hookapi.cc
    winsup/cygwin/i686.din
    winsup/cygwin/include/a.out.h
    winsup/cygwin/include/asm/byteorder.h
    winsup/cygwin/include/bits/wordsize.h
    winsup/cygwin/include/cygwin/acl.h
    winsup/cygwin/include/cygwin/config.h
    winsup/cygwin/include/cygwin/cygwin_dll.h
    winsup/cygwin/include/cygwin/grp.h
    winsup/cygwin/include/cygwin/if.h
    winsup/cygwin/include/cygwin/ipc.h
    winsup/cygwin/include/cygwin/msg.h
    winsup/cygwin/include/cygwin/sem.h
    winsup/cygwin/include/cygwin/shm.h
    winsup/cygwin/include/cygwin/signal.h
    winsup/cygwin/include/cygwin/socket.h
    winsup/cygwin/include/cygwin/stat.h
    winsup/cygwin/include/cygwin/stdlib.h
    winsup/cygwin/include/cygwin/sysproto.h
    winsup/cygwin/include/cygwin/time.h
    winsup/cygwin/include/cygwin/types.h
    winsup/cygwin/include/cygwin/version.h
    winsup/cygwin/include/fcntl.h
    winsup/cygwin/include/fts.h
    winsup/cygwin/include/ftw.h
    winsup/cygwin/include/glob.h
    winsup/cygwin/include/inttypes.h
    winsup/cygwin/include/io.h
    winsup/cygwin/include/limits.h
    winsup/cygwin/include/mntent.h
    winsup/cygwin/include/stdint.h
    winsup/cygwin/include/sys/cygwin.h
    winsup/cygwin/include/sys/dirent.h
    winsup/cygwin/include/sys/resource.h
    winsup/cygwin/include/sys/socket.h
    winsup/cygwin/include/sys/strace.h
    winsup/cygwin/init.cc
    winsup/cygwin/ioctl.cc
    winsup/cygwin/ipc.cc
    winsup/cygwin/kernel32.cc
    winsup/cygwin/lc_msg.h
    winsup/cygwin/lib/_cygwin_crt0_common.cc
    winsup/cygwin/lib/crt0.h
    winsup/cygwin/lib/cygwin_attach_dll.c
    winsup/cygwin/lib/premain0.c
    winsup/cygwin/lib/premain1.c
    winsup/cygwin/lib/premain2.c
    winsup/cygwin/lib/premain3.c
    winsup/cygwin/libc/arc4random.cc
    winsup/cygwin/libc/base64.c
    winsup/cygwin/libc/bsdlib.cc
    winsup/cygwin/libc/fts.c
    winsup/cygwin/libc/ftw.c
    winsup/cygwin/libc/inet_network.c
    winsup/cygwin/libc/minires-os-if.c
    winsup/cygwin/libc/minires.c
    winsup/cygwin/libc/nftw.c
    winsup/cygwin/libc/rcmd.cc
    winsup/cygwin/libc/rexec.cc
    winsup/cygwin/libstdcxx_wrapper.cc
    winsup/cygwin/localtime.cc
    winsup/cygwin/malloc_wrapper.cc
    winsup/cygwin/miscfuncs.cc
    winsup/cygwin/mkimport
    winsup/cygwin/mktemp.cc
    winsup/cygwin/mmap.cc
    winsup/cygwin/mount.cc
    winsup/cygwin/mount.h
    winsup/cygwin/msg.cc
    winsup/cygwin/mtinfo.h
    winsup/cygwin/net.cc
    winsup/cygwin/netdb.cc
    winsup/cygwin/nfs.h
    winsup/cygwin/nlsfuncs.cc
    winsup/cygwin/ntdll.h
    winsup/cygwin/ntea.cc
    winsup/cygwin/passwd.cc
    winsup/cygwin/path.cc
    winsup/cygwin/path.h
    winsup/cygwin/perprocess.h
    winsup/cygwin/pinfo.cc
    winsup/cygwin/pinfo.h
    winsup/cygwin/pipe.cc
    winsup/cygwin/poll.cc
    winsup/cygwin/posix.sgml
    winsup/cygwin/posix_ipc.cc
    winsup/cygwin/profil.c
    winsup/cygwin/profil.h
    winsup/cygwin/pseudo-reloc.cc
    winsup/cygwin/pwdgrp.h
    winsup/cygwin/regex/engine.c
    winsup/cygwin/regex/regcomp.c
    winsup/cygwin/registry.cc
    winsup/cygwin/regparm.h
    winsup/cygwin/release/1.7.19
    winsup/cygwin/resource.cc
    winsup/cygwin/sched.cc
    winsup/cygwin/sec_acl.cc
    winsup/cygwin/sec_auth.cc
    winsup/cygwin/sec_helper.cc
    winsup/cygwin/security.cc
    winsup/cygwin/security.h
    winsup/cygwin/select.cc
    winsup/cygwin/select.h
    winsup/cygwin/sem.cc
    winsup/cygwin/shared.cc
    winsup/cygwin/shared_info.h
    winsup/cygwin/shm.cc
    winsup/cygwin/signal.cc
    winsup/cygwin/sigproc.cc
    winsup/cygwin/sigproc.h
    winsup/cygwin/smallprint.cc
    winsup/cygwin/spawn.cc
    winsup/cygwin/speclib
    winsup/cygwin/spinlock.h
    winsup/cygwin/strace.cc
    winsup/cygwin/strfuncs.cc
    winsup/cygwin/strsig.cc
    winsup/cygwin/sync.cc
    winsup/cygwin/sync.h
    winsup/cygwin/syscalls.cc
    winsup/cygwin/sysconf.cc
    winsup/cygwin/syslog.cc
    winsup/cygwin/termios.cc
    winsup/cygwin/textmode.c
    winsup/cygwin/textreadmode.c
    winsup/cygwin/thread.cc
    winsup/cygwin/thread.h
    winsup/cygwin/timer.cc
    winsup/cygwin/times.cc
    winsup/cygwin/tlsoffsets.h
    winsup/cygwin/tlsoffsets64.h
    winsup/cygwin/tty.cc
    winsup/cygwin/tty.h
    winsup/cygwin/uinfo.cc
    winsup/cygwin/wait.cc
    winsup/cygwin/winbase.h
    winsup/cygwin/wincap.cc
    winsup/cygwin/wincap.h
    winsup/cygwin/window.cc
    winsup/cygwin/winlean.h
    winsup/cygwin/winsup.h
    winsup/cygwin/wow64.cc
    winsup/cygwin/wow64.h
    winsup/cygwin/x86_64.din
    winsup/doc/.cvsignore
    winsup/doc/ChangeLog
    winsup/doc/Makefile.in
    winsup/doc/Wishlist
    winsup/doc/bodysnatcher.pl
    winsup/doc/configure
    winsup/doc/configure.ac
    winsup/doc/cygserver.xml
    winsup/doc/cygwin-api.in.xml
    winsup/doc/cygwin-ug-net.xml
    winsup/doc/cygwin.xsl
    winsup/doc/cygwinenv.xml
    winsup/doc/dll.xml
    winsup/doc/effectively.xml
    winsup/doc/faq-api.xml
    winsup/doc/faq-copyright.xml
    winsup/doc/faq-programming.xml
    winsup/doc/faq-resources.xml
    winsup/doc/faq-setup.xml
    winsup/doc/faq-using.xml
    winsup/doc/faq-what.xml
    winsup/doc/faq.xml
    winsup/doc/filemodes.xml
    winsup/doc/gcc.xml
    winsup/doc/gdb.xml
    winsup/doc/highlights.xml
    winsup/doc/legal.xml
    winsup/doc/new-features.xml
    winsup/doc/ntsec.xml
    winsup/doc/ov-ex-unix.xml
    winsup/doc/ov-ex-win.xml
    winsup/doc/overview.xml
    winsup/doc/pathnames.xml
    winsup/doc/programming.xml
    winsup/doc/setup-env.xml
    winsup/doc/setup-files.xml
    winsup/doc/setup-locale.xml
    winsup/doc/setup-maxmem.xml
    winsup/doc/setup-net.xml
    winsup/doc/specialnames.xml
    winsup/doc/textbinary.xml
    winsup/doc/ug-info.xml
    winsup/doc/using.xml
    winsup/doc/windres.xml
    winsup/doc/xidepend
    winsup/lsaauth/ChangeLog
    winsup/lsaauth/ChangeLog.64bit
    winsup/lsaauth/Makefile.in
    winsup/lsaauth/configure
    winsup/lsaauth/configure.ac
    winsup/utils/ChangeLog
    winsup/utils/ChangeLog.64bit
    winsup/utils/Makefile.in
    winsup/utils/aclocal.m4
    winsup/utils/configure
    winsup/utils/cygcheck.cc
    winsup/utils/dumper.cc
    winsup/utils/dumper.h
    winsup/utils/kill.cc
    winsup/utils/ldd.cc
    winsup/utils/locale.cc
    winsup/utils/mkgroup.c
    winsup/utils/mkpasswd.c
    winsup/utils/module_info.cc
    winsup/utils/mount.cc
    winsup/utils/parse_pe.cc
    winsup/utils/passwd.c
    winsup/utils/path.cc
    winsup/utils/ps.cc
    winsup/utils/regtool.cc
    winsup/utils/ssp.c
    winsup/utils/strace.cc
    winsup/utils/tzset.c
    winsup/utils/utils.xml
Delete:
    COPYING3
    COPYING3.LIB
    config.rpath
    configure.ac
    ltgcc.m4
    newlib/libc/machine/aarch64/Makefile.am
    newlib/libc/machine/aarch64/Makefile.in
    newlib/libc/machine/aarch64/aclocal.m4
    newlib/libc/machine/aarch64/configure
    newlib/libc/machine/aarch64/configure.in
    newlib/libc/machine/aarch64/memcmp-stub.c
    newlib/libc/machine/aarch64/memcmp.S
    newlib/libc/machine/aarch64/memcpy-stub.c
    newlib/libc/machine/aarch64/memcpy.S
    newlib/libc/machine/aarch64/memmove-stub.c
    newlib/libc/machine/aarch64/memmove.S
    newlib/libc/machine/aarch64/memset-stub.c
    newlib/libc/machine/aarch64/memset.S
    newlib/libc/machine/aarch64/setjmp.S
    newlib/libc/machine/aarch64/strcmp-stub.c
    newlib/libc/machine/aarch64/strcmp.S
    newlib/libc/machine/aarch64/strlen-stub.c
    newlib/libc/machine/aarch64/strlen.S
    newlib/libc/machine/aarch64/strncmp-stub.c
    newlib/libc/machine/aarch64/strncmp.S
    newlib/libc/machine/aarch64/strnlen-stub.c
    newlib/libc/machine/aarch64/strnlen.S
    newlib/libc/machine/epiphany/Makefile.am
    newlib/libc/machine/epiphany/Makefile.in
    newlib/libc/machine/epiphany/aclocal.m4
    newlib/libc/machine/epiphany/configure
    newlib/libc/machine/epiphany/configure.in
    newlib/libc/machine/epiphany/machine/stdlib.h
    newlib/libc/machine/epiphany/setjmp.S
    newlib/libc/machine/powerpc/times.c
    newlib/libc/sys/epiphany/Makefile.am
    newlib/libc/sys/epiphany/Makefile.in
    newlib/libc/sys/epiphany/aclocal.m4
    newlib/libc/sys/epiphany/configure
    newlib/libc/sys/epiphany/configure.in
    newlib/libc/sys/epiphany/e_printf.c
    newlib/libm/machine/aarch64/Makefile.am
    newlib/libm/machine/aarch64/Makefile.in
    newlib/libm/machine/aarch64/aclocal.m4
    newlib/libm/machine/aarch64/configure
    newlib/libm/machine/aarch64/configure.in
    newlib/libm/machine/aarch64/s_ceil.c
    newlib/libm/machine/aarch64/s_floor.c
    newlib/libm/machine/aarch64/s_fma.c
    newlib/libm/machine/aarch64/s_fmax.c
    newlib/libm/machine/aarch64/s_fmin.c
    newlib/libm/machine/aarch64/s_llrint.c
    newlib/libm/machine/aarch64/s_llround.c
    newlib/libm/machine/aarch64/s_lrint.c
    newlib/libm/machine/aarch64/s_lround.c
    newlib/libm/machine/aarch64/s_nearbyint.c
    newlib/libm/machine/aarch64/s_rint.c
    newlib/libm/machine/aarch64/s_round.c
    newlib/libm/machine/aarch64/s_trunc.c
    newlib/libm/machine/aarch64/sf_ceil.c
    newlib/libm/machine/aarch64/sf_floor.c
    newlib/libm/machine/aarch64/sf_fma.c
    newlib/libm/machine/aarch64/sf_fmax.c
    newlib/libm/machine/aarch64/sf_fmin.c
    newlib/libm/machine/aarch64/sf_llrint.c
    newlib/libm/machine/aarch64/sf_llround.c
    newlib/libm/machine/aarch64/sf_lrint.c
    newlib/libm/machine/aarch64/sf_lround.c
    newlib/libm/machine/aarch64/sf_nearbyint.c
    newlib/libm/machine/aarch64/sf_rint.c
    newlib/libm/machine/aarch64/sf_round.c
    newlib/libm/machine/aarch64/sf_trunc.c
    winsup/cygwin/cygwin.din
    winsup/cygwin/cygwin.sc
    winsup/doc/cygserver.sgml
    winsup/doc/cygwin-api.in.sgml
    winsup/doc/cygwin-ug-net.in.sgml
    winsup/doc/cygwin-ug.in.sgml
    winsup/doc/cygwin.dsl
    winsup/doc/cygwinenv.sgml
    winsup/doc/dll.sgml
    winsup/doc/effectively.sgml
    winsup/doc/faq-sections.xml
    winsup/doc/filemodes.sgml
    winsup/doc/gcc.sgml
    winsup/doc/gdb.sgml
    winsup/doc/legal.sgml
    winsup/doc/new-features.sgml
    winsup/doc/ntsec.sgml
    winsup/doc/overview.sgml
    winsup/doc/overview2.sgml
    winsup/doc/pathnames.sgml
    winsup/doc/programming.sgml
    winsup/doc/setup-net.sgml
    winsup/doc/setup.sgml
    winsup/doc/setup2.sgml
    winsup/doc/textbinary.sgml
    winsup/doc/using.sgml
    winsup/doc/windres.sgml
    winsup/utils/utils.sgml

1 files changed, 67 insertions, 105 deletions

diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index ab4048b13..6c284a596 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -190,9 +190,9 @@ fhandler_base::set_flags (int flags, int supplied_bin)
 {
   int bin;
   int fmode;
-  debug_printf ("flags %p, supplied_bin %p", flags, supplied_bin);
+  debug_printf ("flags %y, supplied_bin %y", flags, supplied_bin);
   if ((bin = flags & (O_BINARY | O_TEXT)))
-    debug_printf ("O_TEXT/O_BINARY set in flags %p", bin);
+    debug_printf ("O_TEXT/O_BINARY set in flags %y", bin);
   else if (rbinset () && wbinset ())
     bin = rbinary () ? O_BINARY : O_TEXT;	// FIXME: Not quite right
   else if ((fmode = get_default_fmode (flags)) & O_BINARY)
@@ -216,35 +216,37 @@ fhandler_base::set_flags (int flags, int supplied_bin)
 
 /* Cover function to ReadFile to achieve (as much as possible) Posix style
    semantics and use of errno.  */
-void __stdcall
-fhandler_base::raw_read (void *ptr, size_t& ulen)
+void __reg3
+fhandler_base::raw_read (void *ptr, size_t& len)
 {
-#define bytes_read ulen
-
+  NTSTATUS status;
+  IO_STATUS_BLOCK io;
   int try_noreserve = 1;
-  DWORD len = ulen;
 
 retry:
-  ulen = (size_t) -1;
-  BOOL res = ReadFile (get_handle (), ptr, len, (DWORD *) &ulen, NULL);
-  if (!res)
+  status = NtReadFile (get_handle (), NULL, NULL, NULL, &io, ptr, len,
+		       NULL, NULL);
+  if (NT_SUCCESS (status))
+    len = io.Information;
+  else
     {
       /* Some errors are not really errors.  Detect such cases here.  */
-
-      DWORD  errcode = GetLastError ();
-      switch (errcode)
+      switch (status)
 	{
-	case ERROR_BROKEN_PIPE:
+	case STATUS_END_OF_FILE:
+	case STATUS_PIPE_BROKEN:
 	  /* This is really EOF.  */
-	  bytes_read = 0;
+	  len = 0;
 	  break;
-	case ERROR_MORE_DATA:
-	  /* `bytes_read' is supposedly valid.  */
+	case STATUS_MORE_ENTRIES:
+	case STATUS_BUFFER_OVERFLOW:
+	  /* `io.Information' is supposedly valid.  */
+	  len = io.Information;
 	  break;
-	case ERROR_NOACCESS:
+	case STATUS_ACCESS_VIOLATION:
 	  if (is_at_eof (get_handle ()))
 	    {
-	      bytes_read = 0;
+	      len = 0;
 	      break;
 	    }
 	  if (try_noreserve)
@@ -261,28 +263,26 @@ retry:
 		}
 	    }
 	  /*FALLTHRU*/
-	case ERROR_INVALID_FUNCTION:
-	case ERROR_INVALID_PARAMETER:
-	case ERROR_INVALID_HANDLE:
+	case STATUS_INVALID_DEVICE_REQUEST:
+	case STATUS_INVALID_PARAMETER:
+	case STATUS_INVALID_HANDLE:
 	  if (pc.isdir ())
 	    {
 	      set_errno (EISDIR);
-	      bytes_read = (size_t) -1;
+	      len = (size_t) -1;
 	      break;
 	    }
 	default:
-	  syscall_printf ("ReadFile %s(%p) failed, %E", get_name (), get_handle ());
-	  __seterrno_from_win_error (errcode);
-	  bytes_read = (size_t) -1;
+	  __seterrno_from_nt_status (status);
+	  len = (size_t) -1;
 	  break;
 	}
     }
-#undef bytes_read
 }
 
 /* Cover function to WriteFile to provide Posix interface and semantics
    (as much as possible).  */
-ssize_t __stdcall
+ssize_t __reg3
 fhandler_base::raw_write (const void *ptr, size_t len)
 {
   NTSTATUS status;
@@ -388,7 +388,7 @@ fhandler_base::fhaccess (int flags, bool effective)
       return res;
     }
 
-  struct __stat64 st;
+  struct stat st;
   if (fstat (&st))
     goto done;
 
@@ -516,7 +516,7 @@ fhandler_base::open (int flags, mode_t mode)
   PFILE_FULL_EA_INFORMATION p = NULL;
   ULONG plen = 0;
 
-  syscall_printf ("(%S, %p)", pc.get_nt_native_path (), flags);
+  syscall_printf ("(%S, %y)", pc.get_nt_native_path (), flags);
 
   pc.get_object_attr (attr, *sec_none_cloexec (flags));
 
@@ -586,11 +586,10 @@ fhandler_base::open (int flags, mode_t mode)
 	    }
 	}
 
-      /* Starting with Windows 2000, when trying to overwrite an already
-	 existing file with FILE_ATTRIBUTE_HIDDEN and/or FILE_ATTRIBUTE_SYSTEM
-	 attribute set, CreateFile fails with ERROR_ACCESS_DENIED.
-	 Per MSDN you have to create the file with the same attributes as
-	 already specified for the file. */
+      /* Trying to overwrite an already existing file with FILE_ATTRIBUTE_HIDDEN
+	 and/or FILE_ATTRIBUTE_SYSTEM attribute set, NtCreateFile fails with
+	 STATUS_ACCESS_DENIED.  Per MSDN you have to create the file with the
+	 same attributes as already specified for the file. */
       if (((flags & O_CREAT) || create_disposition == FILE_OVERWRITE)
 	  && has_attribute (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM))
 	file_attributes |= pc.file_attributes ();
@@ -705,12 +704,12 @@ fhandler_base::open (int flags, mode_t mode)
   res = 1;
   set_open_status ();
 done:
-  debug_printf ("%x = NtCreateFile "
-		"(%p, %x, %S, io, NULL, %x, %x, %x, %x, NULL, 0)",
+  debug_printf ("%y = NtCreateFile "
+		"(%p, %y, %S, io, NULL, %y, %y, %y, %y, NULL, 0)",
 		status, fh, access, pc.get_nt_native_path (), file_attributes,
 		shared, create_disposition, options);
 
-  syscall_printf ("%d = fhandler_base::open(%S, %p)",
+  syscall_printf ("%d = fhandler_base::open(%S, %y)",
 		  res, pc.get_nt_native_path (), flags);
   return res;
 }
@@ -723,32 +722,19 @@ done:
    an \n.  If last char is an \r, look ahead one more char, if \n then
    modify \r, if not, remember char.
 */
-void __stdcall
+void __reg3
 fhandler_base::read (void *in_ptr, size_t& len)
 {
   char *ptr = (char *) in_ptr;
   ssize_t copied_chars = get_readahead_into_buffer (ptr, len);
 
-  if (copied_chars)
+  if (copied_chars || !len)
     {
       len = (size_t) copied_chars;
       goto out;
     }
 
-  len -= copied_chars;
-  if (!len)
-    {
-      len = (size_t) copied_chars;
-      goto out;
-    }
-
-  raw_read (ptr + copied_chars, len);
-  if (!copied_chars)
-    /* nothing */;
-  else if ((ssize_t) len > 0)
-    len += copied_chars;
-  else
-    len = copied_chars;
+  raw_read (ptr, len);
 
   if (rbinary () || (ssize_t) len <= 0)
     goto out;
@@ -791,24 +777,6 @@ fhandler_base::read (void *in_ptr, size_t& len)
 
   len = dst - (char *) ptr;
 
-#ifndef NOSTRACE
-  if (strace.active ())
-    {
-      char buf[16 * 6 + 1];
-      char *p = buf;
-
-      for (int i = 0; i < copied_chars && i < 16; ++i)
-	{
-	  unsigned char c = ((unsigned char *) ptr)[i];
-	  __small_sprintf (p, " %c", c);
-	  p += strlen (p);
-	}
-      *p = '\0';
-      debug_printf ("read %d bytes (%s%s)", copied_chars, buf,
-		    copied_chars > 16 ? " ..." : "");
-    }
-#endif
-
 out:
   debug_printf ("returning %d, %s mode", len, rbinary () ? "binary" : "text");
 }
@@ -846,7 +814,7 @@ fhandler_base::write (const void *ptr, size_t len)
 	  if (NT_SUCCESS (status))
 	    pc.file_attributes (pc.file_attributes ()
 				| FILE_ATTRIBUTE_SPARSE_FILE);
-	  debug_printf ("%p = NtFsControlFile(%S, FSCTL_SET_SPARSE)",
+	  debug_printf ("%y = NtFsControlFile(%S, FSCTL_SET_SPARSE)",
 			status, pc.get_nt_native_path ());
 	}
     }
@@ -1018,8 +986,8 @@ fhandler_base::writev (const struct iovec *const iov, const int iovcnt,
   return ret;
 }
 
-_off64_t
-fhandler_base::lseek (_off64_t offset, int whence)
+off_t
+fhandler_base::lseek (off_t offset, int whence)
 {
   NTSTATUS status;
   IO_STATUS_BLOCK io;
@@ -1071,7 +1039,7 @@ fhandler_base::lseek (_off64_t offset, int whence)
       __seterrno_from_nt_status (status);
       return -1;
     }
-  _off64_t res = fpi.CurrentByteOffset.QuadPart;
+  off_t res = fpi.CurrentByteOffset.QuadPart;
 
   /* When next we write(), we will check to see if *this* seek went beyond
      the end of the file and if so, potentially sparsify the file. */
@@ -1087,15 +1055,15 @@ fhandler_base::lseek (_off64_t offset, int whence)
   return res;
 }
 
-ssize_t __stdcall
-fhandler_base::pread (void *, size_t, _off64_t)
+ssize_t __reg3
+fhandler_base::pread (void *, size_t, off_t)
 {
   set_errno (ESPIPE);
   return -1;
 }
 
-ssize_t __stdcall
-fhandler_base::pwrite (void *, size_t, _off64_t)
+ssize_t __reg3
+fhandler_base::pwrite (void *, size_t, off_t)
 {
   set_errno (ESPIPE);
   return -1;
@@ -1262,15 +1230,8 @@ fhandler_base::ioctl (unsigned int cmd, void *buf)
   return res;
 }
 
-int
-fhandler_base::lock (int, struct __flock64 *)
-{
-  set_errno (EINVAL);
-  return -1;
-}
-
 int __reg2
-fhandler_base::fstat (struct __stat64 *buf)
+fhandler_base::fstat (struct stat *buf)
 {
   if (is_fs_special ())
     return fstat_fs (buf);
@@ -1310,7 +1271,7 @@ fhandler_base::fstat (struct __stat64 *buf)
   return 0;
 }
 
-int __stdcall
+int __reg2
 fhandler_base::fstatvfs (struct statvfs *sfs)
 {
   /* If we hit this base implementation, it's some device in /dev.
@@ -1351,7 +1312,7 @@ fhandler_base::dup (fhandler_base *child, int)
 			    GetCurrentProcess (), &nh,
 			    0, TRUE, DUPLICATE_SAME_ACCESS))
 	{
-	  debug_printf ("dup(%s) failed, handle %x, %E",
+	  debug_printf ("dup(%s) failed, handle %p, %E",
 			get_name (), get_handle ());
 	  __seterrno ();
 	  return -1;
@@ -1371,7 +1332,7 @@ fhandler_base_overlapped::dup (fhandler_base *child, int flags)
   return res;
 }
 
-int fhandler_base::fcntl (int cmd, void *arg)
+int fhandler_base::fcntl (int cmd, intptr_t arg)
 {
   int res;
 
@@ -1381,12 +1342,12 @@ int fhandler_base::fcntl (int cmd, void *arg)
       res = close_on_exec () ? FD_CLOEXEC : 0;
       break;
     case F_SETFD:
-      set_close_on_exec (((int) arg & FD_CLOEXEC) ? 1 : 0);
+      set_close_on_exec ((arg & FD_CLOEXEC) ? 1 : 0);
       res = 0;
       break;
     case F_GETFL:
       res = get_flags ();
-      debug_printf ("GETFL: %p", res);
+      debug_printf ("GETFL: %y", res);
       break;
     case F_SETFL:
       {
@@ -1395,7 +1356,7 @@ int fhandler_base::fcntl (int cmd, void *arg)
 	   Since O_ASYNC isn't defined in fcntl.h it's currently
 	   ignored as well.  */
 	const int allowed_flags = O_APPEND | O_NONBLOCK_MASK;
-	int new_flags = (int) arg & allowed_flags;
+	int new_flags = arg & allowed_flags;
 	/* Carefully test for the O_NONBLOCK or deprecated OLD_O_NDELAY flag.
 	   Set only the flag that has been passed in.  If both are set, just
 	   record O_NONBLOCK.   */
@@ -1585,6 +1546,7 @@ fhandler_base::fixup_after_exec ()
   debug_printf ("here for '%s'", get_name ());
   if (unique_id && close_on_exec ())
     del_my_locks (after_exec);
+  mandatory_locking (false);
 }
 void
 fhandler_base_overlapped::fixup_after_exec ()
@@ -1679,7 +1641,7 @@ fhandler_base::fchmod (mode_t mode)
 }
 
 int
-fhandler_base::fchown (__uid32_t uid, __gid32_t gid)
+fhandler_base::fchown (uid_t uid, gid_t gid)
 {
   if (pc.is_fs_special ())
     return ((fhandler_disk_file *) this)->fhandler_disk_file::fchown (uid, gid);
@@ -1688,7 +1650,7 @@ fhandler_base::fchown (__uid32_t uid, __gid32_t gid)
 }
 
 int
-fhandler_base::facl (int cmd, int nentries, __aclent32_t *aclbufp)
+fhandler_base::facl (int cmd, int nentries, aclent_t *aclbufp)
 {
   int res = -1;
   switch (cmd)
@@ -1745,14 +1707,14 @@ fhandler_base::fsetxattr (const char *name, const void *value, size_t size,
 }
 
 int
-fhandler_base::fadvise (_off64_t offset, _off64_t length, int advice)
+fhandler_base::fadvise (off_t offset, off_t length, int advice)
 {
   set_errno (EINVAL);
   return -1;
 }
 
 int
-fhandler_base::ftruncate (_off64_t length, bool allow_truncate)
+fhandler_base::ftruncate (off_t length, bool allow_truncate)
 {
   set_errno (EINVAL);
   return -1;
@@ -1966,7 +1928,7 @@ fhandler_base_overlapped::wait_overlapped (bool inres, bool writing, DWORD *byte
 	  wores = GetOverlappedResult (h, get_overlapped (), bytes, false);
 	  err = GetLastError ();
 	  ResetEvent (get_overlapped ()->hEvent);	/* Probably not needed but CYA */
-	  debug_printf ("wfres %d, wores %d, bytes %u", wfres, wores, *bytes);
+	  debug_printf ("wfres %u, wores %d, bytes %u", wfres, wores, *bytes);
 	  if (wores)
 	    res = overlapped_success;	/* operation succeeded */
 	  else if (wfres == WAIT_OBJECT_0 + 1)
@@ -1981,7 +1943,7 @@ fhandler_base_overlapped::wait_overlapped (bool inres, bool writing, DWORD *byte
 	    res = overlapped_nonblocking_no_data;	/* more handling below */
 	  else
 	    {
-	      debug_printf ("GetOverLappedResult failed, h %p, bytes %u, %E", h, *bytes);
+	      debug_printf ("GetOverlappedResult failed, h %p, bytes %u, %E", h, *bytes);
 	      res = overlapped_error;
 	    }
 	}
@@ -2041,7 +2003,7 @@ fhandler_base_overlapped::raw_read (void *ptr, size_t& len)
 	}
     }
   while (keep_looping);
-  len = (size_t) nbytes;
+  len = (nbytes == (DWORD) -1) ? (size_t) -1 : (size_t) nbytes;
 }
 
 ssize_t __reg3
@@ -2051,13 +2013,13 @@ fhandler_base_overlapped::raw_write (const void *ptr, size_t len)
   if (has_ongoing_io ())
     {
       set_errno (EAGAIN);
-      nbytes = (DWORD) -1;
+      nbytes = (size_t) -1;
     }
   else
     {
       size_t chunk;
       if (!max_atomic_write || len < max_atomic_write)
-	chunk = len;
+	chunk = MIN (len, INT_MAX);
       else if (is_nonblocking ())
 	chunk = len = max_atomic_write;
       else
@@ -2065,7 +2027,7 @@ fhandler_base_overlapped::raw_write (const void *ptr, size_t len)
 
       nbytes = 0;
       DWORD nbytes_now = 0;
-      /* Write to fd in smaller chunks, accumlating a total.
+      /* Write to fd in smaller chunks, accumulating a total.
 	 If there's an error, just return the accumulated total
 	 unless the first write fails, in which case return value
 	 from wait_overlapped(). */
@@ -2095,7 +2057,7 @@ fhandler_base_overlapped::raw_write (const void *ptr, size_t len)
 	    }
 	}
       if (!nbytes)
-	nbytes = nbytes_now;
+	nbytes = (nbytes_now == (DWORD) -1) ? (size_t) -1 : nbytes_now;
     }
   return nbytes;
 }