Module Name:	src
Committed By:	thorpej
Date:		Sat Jan 18 11:30:01 UTC 2003

Modified Files:
	src/lib/libc/stdio: Makefile.inc asprintf.c fclose.3 fclose.c fdopen.c
	    ferror.3 fflush.3 fflush.c fgetln.3 fgetln.c fgets.3 fgets.c
	    fgetwc.c fileext.h findfp.c flags.c fopen.3 fopen.c fparseln.3
	    fparseln.c fprintf.c fpurge.c fputs.3 fputs.c fputwc.c fread.3
	    fread.c freopen.c fscanf.c fseek.3 fseek.c fseeko.c ftell.c
	    ftello.c funopen.3 funopen.c fvwrite.c fvwrite.h fwalk.c fwide.3
	    fwide.c fwrite.c getc.3 gettemp.c getwc.3 getwc.c getwchar.c
	    local.h makebuf.c mkdtemp.c mkstemp.c mktemp.3 mktemp.c perror.3
	    printf.3 printf.c putc.3 putwc.3 putwc.c putwchar.c refill.c
	    remove.3 rget.c scanf.3 scanf.c setbuf.3 setbuf.c setvbuf.c
	    snprintf.c sprintf.c sscanf.c stdio.3 stdio.c tempnam.c tmpfile.c
	    tmpnam.3 tmpnam.c ungetc.3 ungetc.c ungetwc.3 ungetwc.c vasprintf.c
	    vfprintf.c vfscanf.c vscanf.c vsnprintf.c vsprintf.c vsscanf.c
	    wbuf.c wcio.h wsetup.c
Added Files:
	src/lib/libc/stdio: flockfile.c

Log Message:
Merge the nathanw_sa branch.


To generate a diff of this commit:
cvs rdiff -r1.22 -r1.23 src/lib/libc/stdio/Makefile.inc
cvs rdiff -r1.11 -r1.12 src/lib/libc/stdio/asprintf.c \
    src/lib/libc/stdio/fpurge.c src/lib/libc/stdio/fputs.c \
    src/lib/libc/stdio/funopen.3 src/lib/libc/stdio/local.h \
    src/lib/libc/stdio/refill.c src/lib/libc/stdio/sprintf.c \
    src/lib/libc/stdio/stdio.c src/lib/libc/stdio/tmpnam.3 \
    src/lib/libc/stdio/vsprintf.c src/lib/libc/stdio/vsscanf.c \
    src/lib/libc/stdio/wbuf.c
cvs rdiff -r1.6 -r1.7 src/lib/libc/stdio/fclose.3 \
    src/lib/libc/stdio/mkdtemp.c src/lib/libc/stdio/ungetc.3
cvs rdiff -r1.14 -r1.15 src/lib/libc/stdio/fclose.c \
    src/lib/libc/stdio/fgets.3 src/lib/libc/stdio/fgets.c \
    src/lib/libc/stdio/fread.c
cvs rdiff -r1.12 -r1.13 src/lib/libc/stdio/fdopen.c \
    src/lib/libc/stdio/flags.c src/lib/libc/stdio/freopen.c \
    src/lib/libc/stdio/makebuf.c src/lib/libc/stdio/tmpnam.c \
    src/lib/libc/stdio/ungetc.c
cvs rdiff -r1.8 -r1.9 src/lib/libc/stdio/ferror.3 src/lib/libc/stdio/fgetln.3 \
    src/lib/libc/stdio/fputs.3 src/lib/libc/stdio/getc.3 \
    src/lib/libc/stdio/gettemp.c src/lib/libc/stdio/putc.3 \
    src/lib/libc/stdio/vasprintf.c
cvs rdiff -r1.9 -r1.10 src/lib/libc/stdio/fflush.3 \
    src/lib/libc/stdio/fprintf.c src/lib/libc/stdio/fread.3 \
    src/lib/libc/stdio/fwalk.c src/lib/libc/stdio/printf.c \
    src/lib/libc/stdio/remove.3 src/lib/libc/stdio/tmpfile.c \
    src/lib/libc/stdio/wsetup.c
cvs rdiff -r1.13 -r1.14 src/lib/libc/stdio/fflush.c \
    src/lib/libc/stdio/ftell.c src/lib/libc/stdio/fvwrite.c \
    src/lib/libc/stdio/fwrite.c src/lib/libc/stdio/sscanf.c
cvs rdiff -r1.10 -r1.11 src/lib/libc/stdio/fgetln.c \
    src/lib/libc/stdio/fopen.c src/lib/libc/stdio/fscanf.c \
    src/lib/libc/stdio/rget.c src/lib/libc/stdio/scanf.c \
    src/lib/libc/stdio/setbuf.3 src/lib/libc/stdio/vscanf.c
cvs rdiff -r1.1 -r1.2 src/lib/libc/stdio/fgetwc.c \
    src/lib/libc/stdio/fileext.h src/lib/libc/stdio/fparseln.3 \
    src/lib/libc/stdio/fparseln.c src/lib/libc/stdio/fputwc.c \
    src/lib/libc/stdio/fwide.c src/lib/libc/stdio/getwc.c \
    src/lib/libc/stdio/getwchar.c src/lib/libc/stdio/ungetwc.c
cvs rdiff -r1.15 -r1.16 src/lib/libc/stdio/findfp.c \
    src/lib/libc/stdio/scanf.3 src/lib/libc/stdio/setvbuf.c \
    src/lib/libc/stdio/stdio.3 src/lib/libc/stdio/tempnam.c
cvs rdiff -r0 -r1.2 src/lib/libc/stdio/flockfile.c
cvs rdiff -r1.18 -r1.19 src/lib/libc/stdio/fopen.3 src/lib/libc/stdio/fseek.c
cvs rdiff -r1.21 -r1.22 src/lib/libc/stdio/fseek.3
cvs rdiff -r1.2 -r1.3 src/lib/libc/stdio/fseeko.c src/lib/libc/stdio/ftello.c \
    src/lib/libc/stdio/putwc.c src/lib/libc/stdio/putwchar.c \
    src/lib/libc/stdio/wcio.h
cvs rdiff -r1.7 -r1.8 src/lib/libc/stdio/funopen.c \
    src/lib/libc/stdio/perror.3 src/lib/libc/stdio/setbuf.c
cvs rdiff -r1.5 -r1.6 src/lib/libc/stdio/fvwrite.h \
    src/lib/libc/stdio/mkstemp.c
cvs rdiff -r1.3 -r1.4 src/lib/libc/stdio/fwide.3 src/lib/libc/stdio/getwc.3 \
    src/lib/libc/stdio/putwc.3 src/lib/libc/stdio/ungetwc.3
cvs rdiff -r1.17 -r1.18 src/lib/libc/stdio/mktemp.3 \
    src/lib/libc/stdio/mktemp.c src/lib/libc/stdio/snprintf.c \
    src/lib/libc/stdio/vsnprintf.c
cvs rdiff -r1.29 -r1.30 src/lib/libc/stdio/printf.3
cvs rdiff -r1.43 -r1.44 src/lib/libc/stdio/vfprintf.c
cvs rdiff -r1.32 -r1.33 src/lib/libc/stdio/vfscanf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.