Index: trunk/minix/lib/stdio/Makedepend-ack =================================================================== --- trunk/minix/lib/stdio/Makedepend-ack (revision 9) +++ (revision ) @@ -1,54 +1,0 @@ -depend-ack: - rm .depend-ack - touch .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' clearerr.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' data.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' doprnt.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' doscan.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' ecvt.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' fclose.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' feof.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' ferror.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' fflush.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' fgetc.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' fgetpos.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' fgets.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' fileno.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' fillbuf.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' flushbuf.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' fopen.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' fprintf.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' fputc.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' fputs.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' fread.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' freopen.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' fscanf.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' fseek.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' fsetpos.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' ftell.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' fwrite.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' getc.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' getchar.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' gets.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' icompute.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' mktemp.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' perror.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' printf.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' putc.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' putchar.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' puts.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' remove.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' rewind.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' scanf.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' setbuf.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' setvbuf.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' sprintf.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' sscanf.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' tmpfile.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' tmpnam.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' ungetc.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' vfprintf.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' vprintf.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' vscanf.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' vsprintf.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' vsscanf.c | sed -e 's:^\(.\):../obj-ack//./stdio/\1:' >> .depend-ack Index: trunk/minix/lib/stdio/Makedepend-gnu =================================================================== --- trunk/minix/lib/stdio/Makedepend-gnu (revision 9) +++ (revision ) @@ -1,54 +1,0 @@ -depend-gnu: - rm .depend-gnu - touch .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' clearerr.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' data.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' doprnt.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' doscan.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' ecvt.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' fclose.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' feof.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' ferror.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' fflush.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' fgetc.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' fgetpos.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' fgets.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' fileno.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' fillbuf.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' flushbuf.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' fopen.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' fprintf.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' fputc.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' fputs.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' fread.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' freopen.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' fscanf.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' fseek.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' fsetpos.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' ftell.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' fwrite.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' getc.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' getchar.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' gets.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' icompute.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' mktemp.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' perror.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' printf.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' putc.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' putchar.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' puts.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' remove.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' rewind.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' scanf.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' setbuf.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' setvbuf.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' sprintf.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' sscanf.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' tmpfile.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' tmpnam.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' ungetc.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' vfprintf.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' vprintf.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' vscanf.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' vsprintf.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' vsscanf.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./stdio/\1:' >> .depend-gnu Index: trunk/minix/lib/stdio/Makefile =================================================================== --- trunk/minix/lib/stdio/Makefile (revision 9) +++ (revision ) @@ -1,402 +1,0 @@ -#Generated from ./stdio/Makefile.in -all: all-ack - -all-ack: -all-gnu: - -makefiles: Makefile -Makedepend-ack Makedepend-gnu: - sh ../generate.sh ./stdio ../obj-ack/ ../obj-gnu - -Makefile: Makefile.in Makedepend-ack Makedepend-gnu - sh ../generate.sh ./stdio ../obj-ack/ ../obj-gnu - @echo - @echo *Attention* - @echo Makefile is regenerated... rerun command to see changes - @echo *Attention* - @echo - -depend: depend-ack -all-ack: ../obj-ack//libc.a - -../obj-ack//libc.a: ../obj-ack//libc.a(clearerr.o) -../obj-ack//libc.a: ../obj-ack//libc.a(data.o) -../obj-ack//libc.a: ../obj-ack//libc.a(doprnt.o) -../obj-ack//libc.a: ../obj-ack//libc.a(doscan.o) -../obj-ack//libc.a: ../obj-ack//libc.a(ecvt.o) -../obj-ack//libc.a: ../obj-ack//libc.a(fclose.o) -../obj-ack//libc.a: ../obj-ack//libc.a(feof.o) -../obj-ack//libc.a: ../obj-ack//libc.a(ferror.o) -../obj-ack//libc.a: ../obj-ack//libc.a(fflush.o) -../obj-ack//libc.a: ../obj-ack//libc.a(fgetc.o) -../obj-ack//libc.a: ../obj-ack//libc.a(fgetpos.o) -../obj-ack//libc.a: ../obj-ack//libc.a(fgets.o) -../obj-ack//libc.a: ../obj-ack//libc.a(fileno.o) -../obj-ack//libc.a: ../obj-ack//libc.a(fillbuf.o) -../obj-ack//libc.a: ../obj-ack//libc.a(flushbuf.o) -../obj-ack//libc.a: ../obj-ack//libc.a(fopen.o) -../obj-ack//libc.a: ../obj-ack//libc.a(fprintf.o) -../obj-ack//libc.a: ../obj-ack//libc.a(fputc.o) -../obj-ack//libc.a: ../obj-ack//libc.a(fputs.o) -../obj-ack//libc.a: ../obj-ack//libc.a(fread.o) -../obj-ack//libc.a: ../obj-ack//libc.a(freopen.o) -../obj-ack//libc.a: ../obj-ack//libc.a(fscanf.o) -../obj-ack//libc.a: ../obj-ack//libc.a(fseek.o) -../obj-ack//libc.a: ../obj-ack//libc.a(fsetpos.o) -../obj-ack//libc.a: ../obj-ack//libc.a(ftell.o) -../obj-ack//libc.a: ../obj-ack//libc.a(fwrite.o) -../obj-ack//libc.a: ../obj-ack//libc.a(getc.o) -../obj-ack//libc.a: ../obj-ack//libc.a(getchar.o) -../obj-ack//libc.a: ../obj-ack//libc.a(gets.o) -../obj-ack//libc.a: ../obj-ack//libc.a(icompute.o) -../obj-ack//libc.a: ../obj-ack//libc.a(mktemp.o) -../obj-ack//libc.a: ../obj-ack//libc.a(perror.o) -../obj-ack//libc.a: ../obj-ack//libc.a(printf.o) -../obj-ack//libc.a: ../obj-ack//libc.a(putc.o) -../obj-ack//libc.a: ../obj-ack//libc.a(putchar.o) -../obj-ack//libc.a: ../obj-ack//libc.a(puts.o) -../obj-ack//libc.a: ../obj-ack//libc.a(remove.o) -../obj-ack//libc.a: ../obj-ack//libc.a(rewind.o) -../obj-ack//libc.a: ../obj-ack//libc.a(scanf.o) -../obj-ack//libc.a: ../obj-ack//libc.a(setbuf.o) -../obj-ack//libc.a: ../obj-ack//libc.a(setvbuf.o) -../obj-ack//libc.a: ../obj-ack//libc.a(sprintf.o) -../obj-ack//libc.a: ../obj-ack//libc.a(sscanf.o) -../obj-ack//libc.a: ../obj-ack//libc.a(tmpfile.o) -../obj-ack//libc.a: ../obj-ack//libc.a(tmpnam.o) -../obj-ack//libc.a: ../obj-ack//libc.a(ungetc.o) -../obj-ack//libc.a: ../obj-ack//libc.a(vfprintf.o) -../obj-ack//libc.a: ../obj-ack//libc.a(vprintf.o) -../obj-ack//libc.a: ../obj-ack//libc.a(vscanf.o) -../obj-ack//libc.a: ../obj-ack//libc.a(vsprintf.o) -../obj-ack//libc.a: ../obj-ack//libc.a(vsscanf.o) - -../obj-ack//libc.a: - ar cr ../obj-ack//libc.a ../obj-ack//./stdio/*.o - rm ../obj-ack//./stdio/*.o - -../obj-ack//libc.a(clearerr.o): clearerr.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/clearerr.o clearerr.c -../obj-ack//libc.a(data.o): data.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/data.o data.c -../obj-ack//libc.a(doprnt.o): doprnt.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/doprnt.o doprnt.c -../obj-ack//libc.a(doscan.o): doscan.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/doscan.o doscan.c -../obj-ack//libc.a(ecvt.o): ecvt.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/ecvt.o ecvt.c -../obj-ack//libc.a(fclose.o): fclose.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/fclose.o fclose.c -../obj-ack//libc.a(feof.o): feof.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/feof.o feof.c -../obj-ack//libc.a(ferror.o): ferror.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/ferror.o ferror.c -../obj-ack//libc.a(fflush.o): fflush.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/fflush.o fflush.c -../obj-ack//libc.a(fgetc.o): fgetc.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/fgetc.o fgetc.c -../obj-ack//libc.a(fgetpos.o): fgetpos.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/fgetpos.o fgetpos.c -../obj-ack//libc.a(fgets.o): fgets.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/fgets.o fgets.c -../obj-ack//libc.a(fileno.o): fileno.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/fileno.o fileno.c -../obj-ack//libc.a(fillbuf.o): fillbuf.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/fillbuf.o fillbuf.c -../obj-ack//libc.a(flushbuf.o): flushbuf.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/flushbuf.o flushbuf.c -../obj-ack//libc.a(fopen.o): fopen.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/fopen.o fopen.c -../obj-ack//libc.a(fprintf.o): fprintf.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/fprintf.o fprintf.c -../obj-ack//libc.a(fputc.o): fputc.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/fputc.o fputc.c -../obj-ack//libc.a(fputs.o): fputs.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/fputs.o fputs.c -../obj-ack//libc.a(fread.o): fread.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/fread.o fread.c -../obj-ack//libc.a(freopen.o): freopen.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/freopen.o freopen.c -../obj-ack//libc.a(fscanf.o): fscanf.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/fscanf.o fscanf.c -../obj-ack//libc.a(fseek.o): fseek.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/fseek.o fseek.c -../obj-ack//libc.a(fsetpos.o): fsetpos.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/fsetpos.o fsetpos.c -../obj-ack//libc.a(ftell.o): ftell.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/ftell.o ftell.c -../obj-ack//libc.a(fwrite.o): fwrite.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/fwrite.o fwrite.c -../obj-ack//libc.a(getc.o): getc.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/getc.o getc.c -../obj-ack//libc.a(getchar.o): getchar.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/getchar.o getchar.c -../obj-ack//libc.a(gets.o): gets.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/gets.o gets.c -../obj-ack//libc.a(icompute.o): icompute.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/icompute.o icompute.c -../obj-ack//libc.a(mktemp.o): mktemp.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/mktemp.o mktemp.c -../obj-ack//libc.a(perror.o): perror.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/perror.o perror.c -../obj-ack//libc.a(printf.o): printf.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/printf.o printf.c -../obj-ack//libc.a(putc.o): putc.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/putc.o putc.c -../obj-ack//libc.a(putchar.o): putchar.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/putchar.o putchar.c -../obj-ack//libc.a(puts.o): puts.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/puts.o puts.c -../obj-ack//libc.a(remove.o): remove.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/remove.o remove.c -../obj-ack//libc.a(rewind.o): rewind.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/rewind.o rewind.c -../obj-ack//libc.a(scanf.o): scanf.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/scanf.o scanf.c -../obj-ack//libc.a(setbuf.o): setbuf.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/setbuf.o setbuf.c -../obj-ack//libc.a(setvbuf.o): setvbuf.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/setvbuf.o setvbuf.c -../obj-ack//libc.a(sprintf.o): sprintf.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/sprintf.o sprintf.c -../obj-ack//libc.a(sscanf.o): sscanf.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/sscanf.o sscanf.c -../obj-ack//libc.a(tmpfile.o): tmpfile.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/tmpfile.o tmpfile.c -../obj-ack//libc.a(tmpnam.o): tmpnam.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/tmpnam.o tmpnam.c -../obj-ack//libc.a(ungetc.o): ungetc.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/ungetc.o ungetc.c -../obj-ack//libc.a(vfprintf.o): vfprintf.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/vfprintf.o vfprintf.c -../obj-ack//libc.a(vprintf.o): vprintf.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/vprintf.o vprintf.c -../obj-ack//libc.a(vscanf.o): vscanf.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/vscanf.o vscanf.c -../obj-ack//libc.a(vsprintf.o): vsprintf.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/vsprintf.o vsprintf.c -../obj-ack//libc.a(vsscanf.o): vsscanf.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./stdio/vsscanf.o vsscanf.c - -all-gnu: ../obj-gnu/libc.a - -../obj-gnu/libc.a: ../obj-gnu/./stdio/clearerr.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/data.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/doprnt.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/doscan.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/ecvt.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/fclose.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/feof.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/ferror.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/fflush.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/fgetc.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/fgetpos.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/fgets.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/fileno.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/fillbuf.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/flushbuf.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/fopen.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/fprintf.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/fputc.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/fputs.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/fread.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/freopen.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/fscanf.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/fseek.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/fsetpos.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/ftell.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/fwrite.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/getc.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/getchar.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/gets.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/icompute.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/mktemp.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/perror.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/printf.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/putc.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/putchar.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/puts.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/remove.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/rewind.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/scanf.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/setbuf.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/setvbuf.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/sprintf.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/sscanf.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/tmpfile.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/tmpnam.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/ungetc.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/vfprintf.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/vprintf.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/vscanf.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/vsprintf.o -../obj-gnu/libc.a: ../obj-gnu/./stdio/vsscanf.o - -../obj-gnu/libc.a: - gar cr ../obj-gnu/libc.a $? - -../obj-gnu/./stdio/clearerr.o: clearerr.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/clearerr.o clearerr.c - -../obj-gnu/./stdio/data.o: data.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/data.o data.c - -../obj-gnu/./stdio/doprnt.o: doprnt.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/doprnt.o doprnt.c - -../obj-gnu/./stdio/doscan.o: doscan.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/doscan.o doscan.c - -../obj-gnu/./stdio/ecvt.o: ecvt.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/ecvt.o ecvt.c - -../obj-gnu/./stdio/fclose.o: fclose.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/fclose.o fclose.c - -../obj-gnu/./stdio/feof.o: feof.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/feof.o feof.c - -../obj-gnu/./stdio/ferror.o: ferror.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/ferror.o ferror.c - -../obj-gnu/./stdio/fflush.o: fflush.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/fflush.o fflush.c - -../obj-gnu/./stdio/fgetc.o: fgetc.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/fgetc.o fgetc.c - -../obj-gnu/./stdio/fgetpos.o: fgetpos.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/fgetpos.o fgetpos.c - -../obj-gnu/./stdio/fgets.o: fgets.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/fgets.o fgets.c - -../obj-gnu/./stdio/fileno.o: fileno.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/fileno.o fileno.c - -../obj-gnu/./stdio/fillbuf.o: fillbuf.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/fillbuf.o fillbuf.c - -../obj-gnu/./stdio/flushbuf.o: flushbuf.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/flushbuf.o flushbuf.c - -../obj-gnu/./stdio/fopen.o: fopen.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/fopen.o fopen.c - -../obj-gnu/./stdio/fprintf.o: fprintf.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/fprintf.o fprintf.c - -../obj-gnu/./stdio/fputc.o: fputc.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/fputc.o fputc.c - -../obj-gnu/./stdio/fputs.o: fputs.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/fputs.o fputs.c - -../obj-gnu/./stdio/fread.o: fread.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/fread.o fread.c - -../obj-gnu/./stdio/freopen.o: freopen.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/freopen.o freopen.c - -../obj-gnu/./stdio/fscanf.o: fscanf.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/fscanf.o fscanf.c - -../obj-gnu/./stdio/fseek.o: fseek.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/fseek.o fseek.c - -../obj-gnu/./stdio/fsetpos.o: fsetpos.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/fsetpos.o fsetpos.c - -../obj-gnu/./stdio/ftell.o: ftell.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/ftell.o ftell.c - -../obj-gnu/./stdio/fwrite.o: fwrite.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/fwrite.o fwrite.c - -../obj-gnu/./stdio/getc.o: getc.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/getc.o getc.c - -../obj-gnu/./stdio/getchar.o: getchar.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/getchar.o getchar.c - -../obj-gnu/./stdio/gets.o: gets.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/gets.o gets.c - -../obj-gnu/./stdio/icompute.o: icompute.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/icompute.o icompute.c - -../obj-gnu/./stdio/mktemp.o: mktemp.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/mktemp.o mktemp.c - -../obj-gnu/./stdio/perror.o: perror.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/perror.o perror.c - -../obj-gnu/./stdio/printf.o: printf.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/printf.o printf.c - -../obj-gnu/./stdio/putc.o: putc.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/putc.o putc.c - -../obj-gnu/./stdio/putchar.o: putchar.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/putchar.o putchar.c - -../obj-gnu/./stdio/puts.o: puts.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/puts.o puts.c - -../obj-gnu/./stdio/remove.o: remove.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/remove.o remove.c - -../obj-gnu/./stdio/rewind.o: rewind.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/rewind.o rewind.c - -../obj-gnu/./stdio/scanf.o: scanf.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/scanf.o scanf.c - -../obj-gnu/./stdio/setbuf.o: setbuf.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/setbuf.o setbuf.c - -../obj-gnu/./stdio/setvbuf.o: setvbuf.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/setvbuf.o setvbuf.c - -../obj-gnu/./stdio/sprintf.o: sprintf.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/sprintf.o sprintf.c - -../obj-gnu/./stdio/sscanf.o: sscanf.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/sscanf.o sscanf.c - -../obj-gnu/./stdio/tmpfile.o: tmpfile.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/tmpfile.o tmpfile.c - -../obj-gnu/./stdio/tmpnam.o: tmpnam.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/tmpnam.o tmpnam.c - -../obj-gnu/./stdio/ungetc.o: ungetc.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/ungetc.o ungetc.c - -../obj-gnu/./stdio/vfprintf.o: vfprintf.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/vfprintf.o vfprintf.c - -../obj-gnu/./stdio/vprintf.o: vprintf.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/vprintf.o vprintf.c - -../obj-gnu/./stdio/vscanf.o: vscanf.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/vscanf.o vscanf.c - -../obj-gnu/./stdio/vsprintf.o: vsprintf.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/vsprintf.o vsprintf.c - -../obj-gnu/./stdio/vsscanf.o: vsscanf.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./stdio/vsscanf.o vsscanf.c - - - - -clean:: - rm -f ../obj-ack//./stdio/* - rm -f ../obj-gnu/./stdio/* - -include Makedepend-ack -include .depend-ack - -include Makedepend-gnu -include .depend-gnu Index: trunk/minix/lib/stdio/Makefile.in =================================================================== --- trunk/minix/lib/stdio/Makefile.in (revision 9) +++ (revision ) @@ -1,60 +1,0 @@ -# Makefile for lib/stdio. - -CFLAGS="-O -D_MINIX -D_POSIX_SOURCE" - -LIBRARIES=libc - -libc_FILES=" \ - clearerr.c \ - data.c \ - doprnt.c \ - doscan.c \ - ecvt.c \ - fclose.c \ - feof.c \ - ferror.c \ - fflush.c \ - fgetc.c \ - fgetpos.c \ - fgets.c \ - fileno.c \ - fillbuf.c \ - flushbuf.c \ - fopen.c \ - fprintf.c \ - fputc.c \ - fputs.c \ - fread.c \ - freopen.c \ - fscanf.c \ - fseek.c \ - fsetpos.c \ - ftell.c \ - fwrite.c \ - getc.c \ - getchar.c \ - gets.c \ - icompute.c \ - mktemp.c \ - perror.c \ - printf.c \ - putc.c \ - putchar.c \ - puts.c \ - remove.c \ - rewind.c \ - scanf.c \ - setbuf.c \ - setvbuf.c \ - sprintf.c \ - sscanf.c \ - tmpfile.c \ - tmpnam.c \ - ungetc.c \ - vfprintf.c \ - vprintf.c \ - vscanf.c \ - vsprintf.c \ - vsscanf.c" - -TYPE=both Index: trunk/minix/lib/stdio/clearerr.c =================================================================== --- trunk/minix/lib/stdio/clearerr.c (revision 9) +++ (revision ) @@ -1,12 +1,0 @@ -/* - * clearerr.c - clear error and end-of-file indicators of a stream - */ -/* $Header: /cvsup/minix/src/lib/stdio/clearerr.c,v 1.1.1.1 2005/04/21 14:56:34 beng Exp $ */ - -#include - -void -(clearerr)(FILE *stream) -{ - clearerr(stream); -} Index: trunk/minix/lib/stdio/data.c =================================================================== --- trunk/minix/lib/stdio/data.c (revision 9) +++ (revision ) @@ -1,28 +1,0 @@ -/* - * data.c - this is the initialization for the standard streams - */ -/* $Header: /cvsup/minix/src/lib/stdio/data.c,v 1.1.1.1 2005/04/21 14:56:34 beng Exp $ */ - -#include - -struct __iobuf __stdin = { - 0, 0, _IOREAD, 0, - (unsigned char *)NULL, (unsigned char *)NULL, -}; - -struct __iobuf __stdout = { - 0, 1, _IOWRITE, 0, - (unsigned char *)NULL, (unsigned char *)NULL, -}; - -struct __iobuf __stderr = { - 0, 2, _IOWRITE | _IOLBF, 0, - (unsigned char *)NULL, (unsigned char *)NULL, -}; - -FILE *__iotab[FOPEN_MAX] = { - &__stdin, - &__stdout, - &__stderr, - 0 -}; Index: trunk/minix/lib/stdio/doprnt.c =================================================================== --- trunk/minix/lib/stdio/doprnt.c (revision 9) +++ (revision ) @@ -1,310 +1,0 @@ -/* - * doprnt.c - print formatted output - */ -/* $Header: /cvsup/minix/src/lib/stdio/doprnt.c,v 1.1.1.1 2005/04/21 14:56:34 beng Exp $ */ - -#include -#include -#include -#include -#include "loc_incl.h" - -/* gnum() is used to get the width and precision fields of a format. */ -static const char * -gnum(register const char *f, int *ip, va_list *app) -{ - register int i, c; - - if (*f == '*') { - *ip = va_arg((*app), int); - f++; - } else { - i = 0; - while ((c = *f - '0') >= 0 && c <= 9) { - i = i*10 + c; - f++; - } - *ip = i; - } - return f; -} - -#if _EM_WSIZE == _EM_PSIZE -#define set_pointer(flags) /* nothing */ -#elif _EM_LSIZE == _EM_PSIZE -#define set_pointer(flags) (flags |= FL_LONG) -#else -#error garbage pointer size -#define set_pointer(flags) /* compilation might continue */ -#endif - -/* print an ordinal number */ -static char * -o_print(va_list *ap, int flags, char *s, char c, int precision, int is_signed) -{ - long signed_val; - unsigned long unsigned_val; - char *old_s = s; - int base; - - switch (flags & (FL_SHORT | FL_LONG)) { - case FL_SHORT: - if (is_signed) { - signed_val = (short) va_arg(*ap, int); - } else { - unsigned_val = (unsigned short) va_arg(*ap, unsigned); - } - break; - case FL_LONG: - if (is_signed) { - signed_val = va_arg(*ap, long); - } else { - unsigned_val = va_arg(*ap, unsigned long); - } - break; - default: - if (is_signed) { - signed_val = va_arg(*ap, int); - } else { - unsigned_val = va_arg(*ap, unsigned int); - } - break; - } - - if (is_signed) { - if (signed_val < 0) { - *s++ = '-'; - signed_val = -signed_val; - } else if (flags & FL_SIGN) *s++ = '+'; - else if (flags & FL_SPACE) *s++ = ' '; - unsigned_val = signed_val; - } - if ((flags & FL_ALT) && (c == 'o')) *s++ = '0'; - if (!unsigned_val) { - if (!precision) - return s; - } else if (((flags & FL_ALT) && (c == 'x' || c == 'X')) - || c == 'p') { - *s++ = '0'; - *s++ = (c == 'X' ? 'X' : 'x'); - } - - switch (c) { - case 'b': base = 2; break; - case 'o': base = 8; break; - case 'd': - case 'i': - case 'u': base = 10; break; - case 'x': - case 'X': - case 'p': base = 16; break; - } - - s = _i_compute(unsigned_val, base, s, precision); - - if (c == 'X') - while (old_s != s) { - *old_s = toupper(*old_s); - old_s++; - } - - return s; -} - -int -_doprnt(register const char *fmt, va_list ap, FILE *stream) -{ - register char *s; - register int j; - int i, c, width, precision, zfill, flags, between_fill; - int nrchars=0; - const char *oldfmt; - char *s1, buf[1025]; - - while (c = *fmt++) { - if (c != '%') { -#ifdef CPM - if (c == '\n') { - if (putc('\r', stream) == EOF) - return nrchars ? -nrchars : -1; - nrchars++; - } -#endif - if (putc(c, stream) == EOF) - return nrchars ? -nrchars : -1; - nrchars++; - continue; - } - flags = 0; - do { - switch(*fmt) { - case '-': flags |= FL_LJUST; break; - case '+': flags |= FL_SIGN; break; - case ' ': flags |= FL_SPACE; break; - case '#': flags |= FL_ALT; break; - case '0': flags |= FL_ZEROFILL; break; - default: flags |= FL_NOMORE; continue; - } - fmt++; - } while(!(flags & FL_NOMORE)); - - oldfmt = fmt; - fmt = gnum(fmt, &width, &ap); - if (fmt != oldfmt) flags |= FL_WIDTHSPEC; - - if (*fmt == '.') { - fmt++; oldfmt = fmt; - fmt = gnum(fmt, &precision, &ap); - if (precision >= 0) flags |= FL_PRECSPEC; - } - - if ((flags & FL_WIDTHSPEC) && width < 0) { - width = -width; - flags |= FL_LJUST; - } - if (!(flags & FL_WIDTHSPEC)) width = 0; - - if (flags & FL_SIGN) flags &= ~FL_SPACE; - - if (flags & FL_LJUST) flags &= ~FL_ZEROFILL; - - - s = s1 = buf; - - switch (*fmt) { - case 'h': flags |= FL_SHORT; fmt++; break; - case 'l': flags |= FL_LONG; fmt++; break; - case 'L': flags |= FL_LONGDOUBLE; fmt++; break; - } - - switch (c = *fmt++) { - default: -#ifdef CPM - if (c == '\n') { - if (putc('\r', stream) == EOF) - return nrchars ? -nrchars : -1; - nrchars++; - } -#endif - if (putc(c, stream) == EOF) - return nrchars ? -nrchars : -1; - nrchars++; - continue; - case 'n': - if (flags & FL_SHORT) - *va_arg(ap, short *) = (short) nrchars; - else if (flags & FL_LONG) - *va_arg(ap, long *) = (long) nrchars; - else - *va_arg(ap, int *) = (int) nrchars; - continue; - case 's': - s1 = va_arg(ap, char *); - if (s1 == NULL) - s1 = "(null)"; - s = s1; - while (precision || !(flags & FL_PRECSPEC)) { - if (*s == '\0') - break; - s++; - precision--; - } - break; - case 'p': - set_pointer(flags); - /* fallthrough */ - case 'b': - case 'o': - case 'u': - case 'x': - case 'X': - if (!(flags & FL_PRECSPEC)) precision = 1; - else if (c != 'p') flags &= ~FL_ZEROFILL; - s = o_print(&ap, flags, s, c, precision, 0); - break; - case 'd': - case 'i': - flags |= FL_SIGNEDCONV; - if (!(flags & FL_PRECSPEC)) precision = 1; - else flags &= ~FL_ZEROFILL; - s = o_print(&ap, flags, s, c, precision, 1); - break; - case 'c': - *s++ = va_arg(ap, int); - break; -#ifndef NOFLOAT - case 'G': - case 'g': - if ((flags & FL_PRECSPEC) && (precision == 0)) - precision = 1; - case 'f': - case 'E': - case 'e': - if (!(flags & FL_PRECSPEC)) - precision = 6; - - if (precision >= sizeof(buf)) - precision = sizeof(buf) - 1; - - flags |= FL_SIGNEDCONV; - s = _f_print(&ap, flags, s, c, precision); - break; -#endif /* NOFLOAT */ - case 'r': - ap = va_arg(ap, va_list); - fmt = va_arg(ap, char *); - continue; - } - zfill = ' '; - if (flags & FL_ZEROFILL) zfill = '0'; - j = s - s1; - - /* between_fill is true under the following conditions: - * 1- the fill character is '0' - * and - * 2a- the number is of the form 0x... or 0X... - * or - * 2b- the number contains a sign or space - */ - between_fill = 0; - if ((flags & FL_ZEROFILL) - && (((c == 'x' || c == 'X') && (flags & FL_ALT)) - || (c == 'p') - || ((flags & FL_SIGNEDCONV) - && ( *s1 == '+' || *s1 == '-' || *s1 == ' ')))) - between_fill++; - - if ((i = width - j) > 0) - if (!(flags & FL_LJUST)) { /* right justify */ - nrchars += i; - if (between_fill) { - if (flags & FL_SIGNEDCONV) { - j--; nrchars++; - if (putc(*s1++, stream) == EOF) - return nrchars ? -nrchars : -1; - } else { - j -= 2; nrchars += 2; - if ((putc(*s1++, stream) == EOF) - || (putc(*s1++, stream) == EOF)) - return nrchars ? -nrchars : -1; - } - } - do { - if (putc(zfill, stream) == EOF) - return nrchars ? -nrchars : -1; - } while (--i); - } - - nrchars += j; - while (--j >= 0) { - if (putc(*s1++, stream) == EOF) - return nrchars ? -nrchars : -1; - } - - if (i > 0) nrchars += i; - while (--i >= 0) - if (putc(zfill, stream) == EOF) - return nrchars ? -nrchars : -1; - } - return nrchars; -} Index: trunk/minix/lib/stdio/doscan.c =================================================================== --- trunk/minix/lib/stdio/doscan.c (revision 9) +++ (revision ) @@ -1,449 +1,0 @@ -/* - * doscan.c - scan formatted input - */ -/* $Header: /cvsup/minix/src/lib/stdio/doscan.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include -#include -#include -#include -#include "loc_incl.h" - -#if _EM_WSIZE == _EM_PSIZE -#define set_pointer(flags) /* nothing */ -#elif _EM_LSIZE == _EM_PSIZE -#define set_pointer(flags) (flags |= FL_LONG) -#else -#error garbage pointer size -#define set_pointer(flags) /* compilation might continue */ -#endif - -#define NUMLEN 512 -#define NR_CHARS 256 - -static char Xtable[NR_CHARS]; -static char inp_buf[NUMLEN]; - -/* Collect a number of characters which constitite an ordinal number. - * When the type is 'i', the base can be 8, 10, or 16, depending on the - * first 1 or 2 characters. This means that the base must be adjusted - * according to the format of the number. At the end of the function, base - * is then set to 0, so strtol() will get the right argument. - */ -static char * -o_collect(register int c, register FILE *stream, char type, - unsigned int width, int *basep) -{ - register char *bufp = inp_buf; - register int base; - - switch (type) { - case 'i': /* i means octal, decimal or hexadecimal */ - case 'p': - case 'x': - case 'X': base = 16; break; - case 'd': - case 'u': base = 10; break; - case 'o': base = 8; break; - case 'b': base = 2; break; - } - - if (c == '-' || c == '+') { - *bufp++ = c; - if (--width) - c = getc(stream); - } - - if (width && c == '0' && base == 16) { - *bufp++ = c; - if (--width) - c = getc(stream); - if (c != 'x' && c != 'X') { - if (type == 'i') base = 8; - } - else if (width) { - *bufp++ = c; - if (--width) - c = getc(stream); - } - } - else if (type == 'i') base = 10; - - while (width) { - if (((base == 10) && isdigit(c)) - || ((base == 16) && isxdigit(c)) - || ((base == 8) && isdigit(c) && (c < '8')) - || ((base == 2) && isdigit(c) && (c < '2'))) { - *bufp++ = c; - if (--width) - c = getc(stream); - } - else break; - } - - if (width && c != EOF) ungetc(c, stream); - if (type == 'i') base = 0; - *basep = base; - *bufp = '\0'; - return bufp - 1; -} - -#ifndef NOFLOAT -/* The function f_collect() reads a string that has the format of a - * floating-point number. The function returns as soon as a format-error - * is encountered, leaving the offending character in the input. This means - * that 1.el leaves the 'l' in the input queue. Since all detection of - * format errors is done here, _doscan() doesn't call strtod() when it's - * not necessary, although the use of the width field can cause incomplete - * numbers to be passed to strtod(). (e.g. 1.3e+) - */ -static char * -f_collect(register int c, register FILE *stream, register unsigned int width) -{ - register char *bufp = inp_buf; - int digit_seen = 0; - - if (c == '-' || c == '+') { - *bufp++ = c; - if (--width) - c = getc(stream); - } - - while (width && isdigit(c)) { - digit_seen++; - *bufp++ = c; - if (--width) - c = getc(stream); - } - if (width && c == '.') { - *bufp++ = c; - if(--width) - c = getc(stream); - while (width && isdigit(c)) { - digit_seen++; - *bufp++ = c; - if (--width) - c = getc(stream); - } - } - - if (!digit_seen) { - if (width && c != EOF) ungetc(c, stream); - return inp_buf - 1; - } - else digit_seen = 0; - - if (width && (c == 'e' || c == 'E')) { - *bufp++ = c; - if (--width) - c = getc(stream); - if (width && (c == '+' || c == '-')) { - *bufp++ = c; - if (--width) - c = getc(stream); - } - while (width && isdigit(c)) { - digit_seen++; - *bufp++ = c; - if (--width) - c = getc(stream); - } - if (!digit_seen) { - if (width && c != EOF) ungetc(c,stream); - return inp_buf - 1; - } - } - - if (width && c != EOF) ungetc(c, stream); - *bufp = '\0'; - return bufp - 1; -} -#endif /* NOFLOAT */ - - -/* - * the routine that does the scanning - */ - -int -_doscan(register FILE *stream, const char *format, va_list ap) -{ - int done = 0; /* number of items done */ - int nrchars = 0; /* number of characters read */ - int conv = 0; /* # of conversions */ - int base; /* conversion base */ - unsigned long val; /* an integer value */ - register char *str; /* temporary pointer */ - char *tmp_string; /* ditto */ - unsigned width = 0; /* width of field */ - int flags; /* some flags */ - int reverse; /* reverse the checking in [...] */ - int kind; - register int ic = EOF; /* the input character */ -#ifndef NOFLOAT - long double ld_val; -#endif - - if (!*format) return 0; - - while (1) { - if (isspace(*format)) { - while (isspace(*format)) - format++; /* skip whitespace */ - ic = getc(stream); - nrchars++; - while (isspace (ic)) { - ic = getc(stream); - nrchars++; - } - if (ic != EOF) ungetc(ic,stream); - nrchars--; - } - if (!*format) break; /* end of format */ - - if (*format != '%') { - ic = getc(stream); - nrchars++; - if (ic != *format++) break; /* error */ - continue; - } - format++; - if (*format == '%') { - ic = getc(stream); - nrchars++; - if (ic == '%') { - format++; - continue; - } - else break; - } - flags = 0; - if (*format == '*') { - format++; - flags |= FL_NOASSIGN; - } - if (isdigit (*format)) { - flags |= FL_WIDTHSPEC; - for (width = 0; isdigit (*format);) - width = width * 10 + *format++ - '0'; - } - - switch (*format) { - case 'h': flags |= FL_SHORT; format++; break; - case 'l': flags |= FL_LONG; format++; break; - case 'L': flags |= FL_LONGDOUBLE; format++; break; - } - kind = *format; - if ((kind != 'c') && (kind != '[') && (kind != 'n')) { - do { - ic = getc(stream); - nrchars++; - } while (isspace(ic)); - if (ic == EOF) break; /* outer while */ - } else if (kind != 'n') { /* %c or %[ */ - ic = getc(stream); - if (ic == EOF) break; /* outer while */ - nrchars++; - } - switch (kind) { - default: - /* not recognized, like %q */ - return conv || (ic != EOF) ? done : EOF; - break; - case 'n': - if (!(flags & FL_NOASSIGN)) { /* silly, though */ - if (flags & FL_SHORT) - *va_arg(ap, short *) = (short) nrchars; - else if (flags & FL_LONG) - *va_arg(ap, long *) = (long) nrchars; - else - *va_arg(ap, int *) = (int) nrchars; - } - break; - case 'p': /* pointer */ - set_pointer(flags); - /* fallthrough */ - case 'b': /* binary */ - case 'd': /* decimal */ - case 'i': /* general integer */ - case 'o': /* octal */ - case 'u': /* unsigned */ - case 'x': /* hexadecimal */ - case 'X': /* ditto */ - if (!(flags & FL_WIDTHSPEC) || width > NUMLEN) - width = NUMLEN; - if (!width) return done; - - str = o_collect(ic, stream, kind, width, &base); - if (str < inp_buf - || (str == inp_buf - && (*str == '-' - || *str == '+'))) return done; - - /* - * Although the length of the number is str-inp_buf+1 - * we don't add the 1 since we counted it already - */ - nrchars += str - inp_buf; - - if (!(flags & FL_NOASSIGN)) { - if (kind == 'd' || kind == 'i') - val = strtol(inp_buf, &tmp_string, base); - else - val = strtoul(inp_buf, &tmp_string, base); - if (flags & FL_LONG) - *va_arg(ap, unsigned long *) = (unsigned long) val; - else if (flags & FL_SHORT) - *va_arg(ap, unsigned short *) = (unsigned short) val; - else - *va_arg(ap, unsigned *) = (unsigned) val; - } - break; - case 'c': - if (!(flags & FL_WIDTHSPEC)) - width = 1; - if (!(flags & FL_NOASSIGN)) - str = va_arg(ap, char *); - if (!width) return done; - - while (width && ic != EOF) { - if (!(flags & FL_NOASSIGN)) - *str++ = (char) ic; - if (--width) { - ic = getc(stream); - nrchars++; - } - } - - if (width) { - if (ic != EOF) ungetc(ic,stream); - nrchars--; - } - break; - case 's': - if (!(flags & FL_WIDTHSPEC)) - width = 0xffff; - if (!(flags & FL_NOASSIGN)) - str = va_arg(ap, char *); - if (!width) return done; - - while (width && ic != EOF && !isspace(ic)) { - if (!(flags & FL_NOASSIGN)) - *str++ = (char) ic; - if (--width) { - ic = getc(stream); - nrchars++; - } - } - /* terminate the string */ - if (!(flags & FL_NOASSIGN)) - *str = '\0'; - if (width) { - if (ic != EOF) ungetc(ic,stream); - nrchars--; - } - break; - case '[': - if (!(flags & FL_WIDTHSPEC)) - width = 0xffff; - if (!width) return done; - - if ( *++format == '^' ) { - reverse = 1; - format++; - } else - reverse = 0; - - for (str = Xtable; str < &Xtable[NR_CHARS] - ; str++) - *str = 0; - - if (*format == ']') Xtable[*format++] = 1; - - while (*format && *format != ']') { - Xtable[*format++] = 1; - if (*format == '-') { - format++; - if (*format - && *format != ']' - && *(format) >= *(format -2)) { - int c; - - for( c = *(format -2) + 1 - ; c <= *format ; c++) - Xtable[c] = 1; - format++; - } - else Xtable['-'] = 1; - } - } - if (!*format) return done; - - if (!(Xtable[ic] ^ reverse)) { - /* MAT 8/9/96 no match must return character */ - ungetc(ic, stream); - return done; - } - - if (!(flags & FL_NOASSIGN)) - str = va_arg(ap, char *); - - do { - if (!(flags & FL_NOASSIGN)) - *str++ = (char) ic; - if (--width) { - ic = getc(stream); - nrchars++; - } - } while (width && ic != EOF && (Xtable[ic] ^ reverse)); - - if (width) { - if (ic != EOF) ungetc(ic, stream); - nrchars--; - } - if (!(flags & FL_NOASSIGN)) { /* terminate string */ - *str = '\0'; - } - break; -#ifndef NOFLOAT - case 'e': - case 'E': - case 'f': - case 'g': - case 'G': - if (!(flags & FL_WIDTHSPEC) || width > NUMLEN) - width = NUMLEN; - - if (!width) return done; - str = f_collect(ic, stream, width); - - if (str < inp_buf - || (str == inp_buf - && (*str == '-' - || *str == '+'))) return done; - - /* - * Although the length of the number is str-inp_buf+1 - * we don't add the 1 since we counted it already - */ - nrchars += str - inp_buf; - - if (!(flags & FL_NOASSIGN)) { - ld_val = strtod(inp_buf, &tmp_string); - if (flags & FL_LONGDOUBLE) - *va_arg(ap, long double *) = (long double) ld_val; - else - if (flags & FL_LONG) - *va_arg(ap, double *) = (double) ld_val; - else - *va_arg(ap, float *) = (float) ld_val; - } - break; -#endif - } /* end switch */ - conv++; - if (!(flags & FL_NOASSIGN) && kind != 'n') done++; - format++; - } - return conv || (ic != EOF) ? done : EOF; -} Index: trunk/minix/lib/stdio/ecvt.c =================================================================== --- trunk/minix/lib/stdio/ecvt.c (revision 9) +++ (revision ) @@ -1,31 +1,0 @@ -/* $Header: /cvsup/minix/src/lib/stdio/ecvt.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#ifndef NOFLOAT - -#include "../ansi/ext_fmt.h" -void _dbl_ext_cvt(double value, struct EXTEND *e); -char *_ext_str_cvt(struct EXTEND *e, int ndigit, int *decpt, int * sign, int ecvtflag); - -static char * -cvt(long double value, int ndigit, int *decpt, int *sign, int ecvtflag) -{ - struct EXTEND e; - - _dbl_ext_cvt(value, &e); - return _ext_str_cvt(&e, ndigit, decpt, sign, ecvtflag); -} - -char * -_ecvt(long double value, int ndigit, int *decpt, int *sign) -{ - - return cvt(value, ndigit, decpt, sign, 1); -} - -char * -_fcvt(long double value, int ndigit, int *decpt, int *sign) -{ - return cvt(value, ndigit, decpt, sign, 0); -} - -#endif /* NOFLOAT */ Index: trunk/minix/lib/stdio/fclose.c =================================================================== --- trunk/minix/lib/stdio/fclose.c (revision 9) +++ (revision ) @@ -1,31 +1,0 @@ -/* - * fclose.c - flush a stream and close the file - */ -/* $Header: /cvsup/minix/src/lib/stdio/fclose.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include -#include -#include "loc_incl.h" - -int _close(int d); - -int -fclose(FILE *fp) -{ - register int i, retval = 0; - - for (i=0; i= FOPEN_MAX) - return EOF; - if (fflush(fp)) retval = EOF; - if (_close(fileno(fp))) retval = EOF; - if ( io_testflag(fp,_IOMYBUF) && fp->_buf ) - free((void *)fp->_buf); - if (fp != stdin && fp != stdout && fp != stderr) - free((void *)fp); - return retval; -} Index: trunk/minix/lib/stdio/feof.c =================================================================== --- trunk/minix/lib/stdio/feof.c (revision 9) +++ (revision ) @@ -1,12 +1,0 @@ -/* - * feof.c - test if eof on a stream occurred - */ -/* $Header: /cvsup/minix/src/lib/stdio/feof.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include - -int -(feof)(FILE *stream) -{ - return feof(stream); -} Index: trunk/minix/lib/stdio/ferror.c =================================================================== --- trunk/minix/lib/stdio/ferror.c (revision 9) +++ (revision ) @@ -1,12 +1,0 @@ -/* - * ferror .c - test if an error on a stream occurred - */ -/* $Header: /cvsup/minix/src/lib/stdio/ferror.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include - -int -(ferror)(FILE *stream) -{ - return ferror(stream); -} Index: trunk/minix/lib/stdio/fflush.c =================================================================== --- trunk/minix/lib/stdio/fflush.c (revision 9) +++ (revision ) @@ -1,86 +1,0 @@ -/* - * fflush.c - flush stream(s) - */ -/* $Header: /cvsup/minix/src/lib/stdio/fflush.c,v 1.3 2006/02/02 16:59:07 beng Exp $ */ - -#include -#include -#include -#include "loc_incl.h" - -ssize_t _write(int d, const char *buf, size_t nbytes); -off_t _lseek(int fildes, off_t offset, int whence); - -int -fflush(FILE *stream) -{ - int count, c1, i, retval = 0; - - if (!stream) { - for(i= 0; i < FOPEN_MAX; i++) - if (__iotab[i] && fflush(__iotab[i])) - retval = EOF; - return retval; - } - - if (!stream->_buf - || (!io_testflag(stream, _IOREADING) - && !io_testflag(stream, _IOWRITING))) - return 0; - if (io_testflag(stream, _IOREADING)) { - /* (void) fseek(stream, 0L, SEEK_CUR); */ - int adjust = 0; - if (io_testflag(stream, _IOFIFO)) { - /* Can't seek in a pipe. */ - return 0; - } - if (stream->_buf && !io_testflag(stream,_IONBF)) - adjust = -stream->_count; - stream->_count = 0; - if (_lseek(fileno(stream), (off_t) adjust, SEEK_CUR) == -1 && - errno != ESPIPE) { - stream->_flags |= _IOERR; - return EOF; - } - errno = 0; - if (io_testflag(stream, _IOWRITE)) - stream->_flags &= ~(_IOREADING | _IOWRITING); - stream->_ptr = stream->_buf; - return 0; - } else if (io_testflag(stream, _IONBF)) return 0; - - if (io_testflag(stream, _IOREAD)) /* "a" or "+" mode */ - stream->_flags &= ~_IOWRITING; - - count = stream->_ptr - stream->_buf; - stream->_ptr = stream->_buf; - - if ( count <= 0 ) - return 0; - - if (io_testflag(stream, _IOAPPEND)) { - if (_lseek(fileno(stream), 0L, SEEK_END) == -1) { - stream->_flags |= _IOERR; - return EOF; - } - } - c1 = _write(stream->_fd, (char *)stream->_buf, count); - - stream->_count = 0; - - if ( count == c1 ) - return 0; - - stream->_flags |= _IOERR; - return EOF; -} - -void -__cleanup(void) -{ - register int i; - - for(i= 0; i < FOPEN_MAX; i++) - if (__iotab[i] && io_testflag(__iotab[i], _IOWRITING)) - (void) fflush(__iotab[i]); -} Index: trunk/minix/lib/stdio/fgetc.c =================================================================== --- trunk/minix/lib/stdio/fgetc.c (revision 9) +++ (revision ) @@ -1,12 +1,0 @@ -/* - * fgetc - get an unsigned character and return it as an int - */ -/* $Header: /cvsup/minix/src/lib/stdio/fgetc.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include - -int -fgetc(FILE *stream) -{ - return getc(stream); -} Index: trunk/minix/lib/stdio/fgetpos.c =================================================================== --- trunk/minix/lib/stdio/fgetpos.c (revision 9) +++ (revision ) @@ -1,14 +1,0 @@ -/* - * fgetpos.c - get the position in the file - */ -/* $Header: /cvsup/minix/src/lib/stdio/fgetpos.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include - -int -fgetpos(FILE *stream, fpos_t *pos) -{ - *pos = ftell(stream); - if (*pos == -1) return -1; - return 0; -} Index: trunk/minix/lib/stdio/fgets.c =================================================================== --- trunk/minix/lib/stdio/fgets.c (revision 9) +++ (revision ) @@ -1,27 +1,0 @@ -/* - * fgets.c - get a string from a file - */ -/* $Header: /cvsup/minix/src/lib/stdio/fgets.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include - -char * -fgets(char *s, register int n, register FILE *stream) -{ - register int ch; - register char *ptr; - - ptr = s; - while (--n > 0 && (ch = getc(stream)) != EOF) { - *ptr++ = ch; - if ( ch == '\n') - break; - } - if (ch == EOF) { - if (feof(stream)) { - if (ptr == s) return NULL; - } else return NULL; - } - *ptr = '\0'; - return s; -} Index: trunk/minix/lib/stdio/fileno.c =================================================================== --- trunk/minix/lib/stdio/fileno.c (revision 9) +++ (revision ) @@ -1,12 +1,0 @@ -/* - * fileno .c - map a stream to a file descriptor - */ -/* $Header: /cvsup/minix/src/lib/stdio/fileno.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include - -int -(fileno)(FILE *stream) -{ - return stream->_fd; -} Index: trunk/minix/lib/stdio/fillbuf.c =================================================================== --- trunk/minix/lib/stdio/fillbuf.c (revision 9) +++ (revision ) @@ -1,69 +1,0 @@ -/* - * fillbuf.c - fill a buffer - */ -/* $Header: /cvsup/minix/src/lib/stdio/fillbuf.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#if defined(_POSIX_SOURCE) -#include -#endif -#include -#include -#include "loc_incl.h" - -ssize_t _read(ssize_t d, char *buf, size_t nbytes); - -int -__fillbuf(register FILE *stream) -{ - static unsigned char ch[FOPEN_MAX]; - register int i; - - stream->_count = 0; - if (fileno(stream) < 0) return EOF; - if (io_testflag(stream, (_IOEOF | _IOERR ))) return EOF; - if (!io_testflag(stream, _IOREAD)) - { stream->_flags |= _IOERR; return EOF; } - if (io_testflag(stream, _IOWRITING)) - { stream->_flags |= _IOERR; return EOF; } - - if (!io_testflag(stream, _IOREADING)) - stream->_flags |= _IOREADING; - - if (!io_testflag(stream, _IONBF) && !stream->_buf) { - stream->_buf = (unsigned char *) malloc(BUFSIZ); - if (!stream->_buf) { - stream->_flags |= _IONBF; - } - else { - stream->_flags |= _IOMYBUF; - stream->_bufsiz = BUFSIZ; - } - } - - /* flush line-buffered output when filling an input buffer */ - for (i = 0; i < FOPEN_MAX; i++) { - if (__iotab[i] && io_testflag(__iotab[i], _IOLBF)) - if (io_testflag(__iotab[i], _IOWRITING)) - (void) fflush(__iotab[i]); - } - - if (!stream->_buf) { - stream->_buf = &ch[fileno(stream)]; - stream->_bufsiz = 1; - } - stream->_ptr = stream->_buf; - stream->_count = _read(stream->_fd, (char *)stream->_buf, stream->_bufsiz); - - if (stream->_count <= 0){ - if (stream->_count == 0) { - stream->_flags |= _IOEOF; - } - else - stream->_flags |= _IOERR; - - return EOF; - } - stream->_count--; - - return *stream->_ptr++; -} Index: trunk/minix/lib/stdio/flushbuf.c =================================================================== --- trunk/minix/lib/stdio/flushbuf.c (revision 9) +++ (revision ) @@ -1,127 +1,0 @@ -/* - * flushbuf.c - flush a buffer - */ -/* $Id: flushbuf.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include -#include -#include "loc_incl.h" - -#include - -off_t _lseek(int fildes, off_t offset, int whence); -ssize_t _write(int d, const char *buf, int nbytes); -int _isatty(int d); -extern void (*_clean)(void); - -static int -do_write(int d, char *buf, int nbytes) -{ - int c; - - /* POSIX actually allows write() to return a positive value less - than nbytes, so loop ... - */ - while ((c = _write(d, buf, nbytes)) > 0 && c < nbytes) { - nbytes -= c; - buf += c; - } - return c > 0; -} - -int -__flushbuf(int c, FILE * stream) -{ - _clean = __cleanup; - if (fileno(stream) < 0) return (unsigned char) c; - if (!io_testflag(stream, _IOWRITE)) return EOF; - if (io_testflag(stream, _IOREADING) && !feof(stream)) return EOF; - - stream->_flags &= ~_IOREADING; - stream->_flags |= _IOWRITING; - if (!io_testflag(stream, _IONBF)) { - if (!stream->_buf) { - if (stream == stdout && _isatty(fileno(stdout))) { - if (!(stream->_buf = - (unsigned char *) malloc(BUFSIZ))) { - stream->_flags |= _IONBF; - } else { - stream->_flags |= _IOLBF|_IOMYBUF; - stream->_bufsiz = BUFSIZ; - stream->_count = -1; - } - } else { - if (!(stream->_buf = - (unsigned char *) malloc(BUFSIZ))) { - stream->_flags |= _IONBF; - } else { - stream->_flags |= _IOMYBUF; - stream->_bufsiz = BUFSIZ; - if (!io_testflag(stream, _IOLBF)) - stream->_count = BUFSIZ - 1; - else stream->_count = -1; - } - } - stream->_ptr = stream->_buf; - } - } - - if (io_testflag(stream, _IONBF)) { - char c1 = c; - - stream->_count = 0; - if (io_testflag(stream, _IOAPPEND)) { - if (_lseek(fileno(stream), 0L, SEEK_END) == -1) { - stream->_flags |= _IOERR; - return EOF; - } - } - if (_write(fileno(stream), &c1, 1) != 1) { - stream->_flags |= _IOERR; - return EOF; - } - return (unsigned char) c; - } else if (io_testflag(stream, _IOLBF)) { - *stream->_ptr++ = c; - /* stream->_count has been updated in putc macro. */ - if (c == '\n' || stream->_count == -stream->_bufsiz) { - int count = -stream->_count; - - stream->_ptr = stream->_buf; - stream->_count = 0; - - if (io_testflag(stream, _IOAPPEND)) { - if (_lseek(fileno(stream), 0L, SEEK_END) == -1) { - stream->_flags |= _IOERR; - return EOF; - } - } - if (! do_write(fileno(stream), (char *)stream->_buf, - count)) { - stream->_flags |= _IOERR; - return EOF; - } - } - } else { - int count = stream->_ptr - stream->_buf; - - stream->_count = stream->_bufsiz - 1; - stream->_ptr = stream->_buf + 1; - - if (count > 0) { - if (io_testflag(stream, _IOAPPEND)) { - if (_lseek(fileno(stream), 0L, SEEK_END) == -1) { - stream->_flags |= _IOERR; - return EOF; - } - } - if (! do_write(fileno(stream), (char *)stream->_buf, count)) { - *(stream->_buf) = c; - stream->_flags |= _IOERR; - return EOF; - } - } - *(stream->_buf) = c; - } - return (unsigned char) c; -} Index: trunk/minix/lib/stdio/fopen.c =================================================================== --- trunk/minix/lib/stdio/fopen.c (revision 9) +++ (revision ) @@ -1,129 +1,0 @@ -/* - * fopen.c - open a stream - */ -/* $Header: /cvsup/minix/src/lib/stdio/fopen.c,v 1.4 2006/02/02 16:59:07 beng Exp $ */ - -#if defined(_POSIX_SOURCE) -#include -#endif -#include -#include -#include "loc_incl.h" -#include - -#define PMODE 0666 - -/* The next 3 defines are true in all UNIX systems known to me. - */ -#define O_RDONLY 0 -#define O_WRONLY 1 -#define O_RDWR 2 - -/* Since the O_CREAT flag is not available on all systems, we can't get it - * from the standard library. Furthermore, even if we know that - * contains such a flag, it's not sure whether it can be used, since we - * might be cross-compiling for another system, which may use an entirely - * different value for O_CREAT (or not support such a mode). The safest - * thing is to just use the Version 7 semantics for open, and use creat() - * whenever necessary. - * - * Another problem is O_APPEND, for which the same holds. When "a" - * open-mode is used, an lseek() to the end is done before every write() - * system-call. - * - * The O_CREAT, O_TRUNC and O_APPEND given here, are only for convenience. - * They are not passed to open(), so the values don't have to match a value - * from the real world. It is enough when they are unique. - */ -#define O_CREAT 0x010 -#define O_TRUNC 0x020 -#define O_APPEND 0x040 - -int _open(const char *path, int flags); -int _creat(const char *path, _mnx_Mode_t mode); -int _close(int d); - -FILE * -fopen(const char *name, const char *mode) -{ - register int i; - int rwmode = 0, rwflags = 0; - FILE *stream; - struct stat st; - int fd, flags = 0; - - for (i = 0; __iotab[i] != 0 ; i++) - if ( i >= FOPEN_MAX-1 ) - return (FILE *)NULL; - - switch(*mode++) { - case 'r': - flags |= _IOREAD | _IOREADING; - rwmode = O_RDONLY; - break; - case 'w': - flags |= _IOWRITE | _IOWRITING; - rwmode = O_WRONLY; - rwflags = O_CREAT | O_TRUNC; - break; - case 'a': - flags |= _IOWRITE | _IOWRITING | _IOAPPEND; - rwmode = O_WRONLY; - rwflags |= O_APPEND | O_CREAT; - break; - default: - return (FILE *)NULL; - } - - while (*mode) { - switch(*mode++) { - case 'b': - continue; - case '+': - rwmode = O_RDWR; - flags |= _IOREAD | _IOWRITE; - continue; - /* The sequence may be followed by additional characters */ - default: - break; - } - break; - } - - /* Perform a creat() when the file should be truncated or when - * the file is opened for writing and the open() failed. - */ - if ((rwflags & O_TRUNC) - || (((fd = _open(name, rwmode)) < 0) - && (rwflags & O_CREAT))) { - if (((fd = _creat(name, PMODE)) > 0) && flags | _IOREAD) { - (void) _close(fd); - fd = _open(name, rwmode); - } - - } - - if (fd < 0) return (FILE *)NULL; - - if ( fstat( fd, &st ) < 0 ) { - _close(fd); - return (FILE *)NULL; - } - - if ( S_ISFIFO(st.st_mode) ) flags |= _IOFIFO; - - if (( stream = (FILE *) malloc(sizeof(FILE))) == NULL ) { - _close(fd); - return (FILE *)NULL; - } - - if ((flags & (_IOREAD | _IOWRITE)) == (_IOREAD | _IOWRITE)) - flags &= ~(_IOREADING | _IOWRITING); - - stream->_count = 0; - stream->_fd = fd; - stream->_flags = flags; - stream->_buf = NULL; - __iotab[i] = stream; - return stream; -} Index: trunk/minix/lib/stdio/fprintf.c =================================================================== --- trunk/minix/lib/stdio/fprintf.c (revision 9) +++ (revision ) @@ -1,23 +1,0 @@ -/* - * fprintf - write output on a stream - */ -/* $Header: /cvsup/minix/src/lib/stdio/fprintf.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include -#include -#include "loc_incl.h" - -int -fprintf(FILE *stream, const char *format, ...) -{ - va_list ap; - int retval; - - va_start(ap, format); - - retval = _doprnt (format, ap, stream); - - va_end(ap); - - return retval; -} Index: trunk/minix/lib/stdio/fputc.c =================================================================== --- trunk/minix/lib/stdio/fputc.c (revision 9) +++ (revision ) @@ -1,12 +1,0 @@ -/* - * fputc.c - print an unsigned character - */ -/* $Header: /cvsup/minix/src/lib/stdio/fputc.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include - -int -fputc(int c, FILE *stream) -{ - return putc(c, stream); -} Index: trunk/minix/lib/stdio/fputs.c =================================================================== --- trunk/minix/lib/stdio/fputs.c (revision 9) +++ (revision ) @@ -1,18 +1,0 @@ -/* - * fputs - print a string - */ -/* $Header: /cvsup/minix/src/lib/stdio/fputs.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include - -int -fputs(register const char *s, register FILE *stream) -{ - register int i = 0; - - while (*s) - if (putc(*s++, stream) == EOF) return EOF; - else i++; - - return i; -} Index: trunk/minix/lib/stdio/fread.c =================================================================== --- trunk/minix/lib/stdio/fread.c (revision 9) +++ (revision ) @@ -1,29 +1,0 @@ -/* - * fread.c - read a number of members into an array - */ -/* $Header: /cvsup/minix/src/lib/stdio/fread.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include - -size_t -fread(void *ptr, size_t size, size_t nmemb, register FILE *stream) -{ - register char *cp = ptr; - register int c; - size_t ndone = 0; - register size_t s; - - if (size) - while ( ndone < nmemb ) { - s = size; - do { - if ((c = getc(stream)) != EOF) - *cp++ = c; - else - return ndone; - } while (--s); - ndone++; - } - - return ndone; -} Index: trunk/minix/lib/stdio/freopen.c =================================================================== --- trunk/minix/lib/stdio/freopen.c (revision 9) +++ (revision ) @@ -1,110 +1,0 @@ -/* - * freopen.c - open a file and associate a stream with it - */ -/* $Header: /cvsup/minix/src/lib/stdio/freopen.c,v 1.4 2006/02/02 16:59:07 beng Exp $ */ - -#if defined(_POSIX_SOURCE) -#include -#endif -#include -#include -#include "loc_incl.h" -#include - -#define PMODE 0666 - -/* Do not "optimize" this file to use the open with O_CREAT if the file - * does not exist. The reason is given in fopen.c. - */ -#define O_RDONLY 0 -#define O_WRONLY 1 -#define O_RDWR 2 - -#define O_CREAT 0x010 -#define O_TRUNC 0x020 -#define O_APPEND 0x040 - -int _open(const char *path, int flags); -int _creat(const char *path, _mnx_Mode_t mode); -int _close(int d); - -FILE * -freopen(const char *name, const char *mode, FILE *stream) -{ - register int i; - struct stat st; - int rwmode = 0, rwflags = 0; - int fd, flags = stream->_flags & (_IONBF | _IOFBF | _IOLBF | _IOMYBUF); - - (void) fflush(stream); /* ignore errors */ - (void) _close(fileno(stream)); - - switch(*mode++) { - case 'r': - flags |= _IOREAD; - rwmode = O_RDONLY; - break; - case 'w': - flags |= _IOWRITE; - rwmode = O_WRONLY; - rwflags = O_CREAT | O_TRUNC; - break; - case 'a': - flags |= _IOWRITE | _IOAPPEND; - rwmode = O_WRONLY; - rwflags |= O_APPEND | O_CREAT; - break; - default: - goto loser; - } - - while (*mode) { - switch(*mode++) { - case 'b': - continue; - case '+': - rwmode = O_RDWR; - flags |= _IOREAD | _IOWRITE; - continue; - /* The sequence may be followed by aditional characters */ - default: - break; - } - break; - } - - if ((rwflags & O_TRUNC) - || (((fd = _open(name, rwmode)) < 0) - && (rwflags & O_CREAT))) { - if (((fd = _creat(name, PMODE)) < 0) && flags | _IOREAD) { - (void) _close(fd); - fd = _open(name, rwmode); - } - } - - if (fd < 0) { - goto loser; - } - - if ( fstat( fd, &st ) == 0 ) { - if ( S_ISFIFO(st.st_mode) ) flags |= _IOFIFO; - } else { - goto loser; - } - - stream->_count = 0; - stream->_fd = fd; - stream->_flags = flags; - return stream; - -loser: - for( i = 0; i < FOPEN_MAX; i++) { - if (stream == __iotab[i]) { - __iotab[i] = 0; - break; - } - } - if (stream != stdin && stream != stdout && stream != stderr) - free((void *)stream); - return (FILE *)NULL; -} Index: trunk/minix/lib/stdio/fscanf.c =================================================================== --- trunk/minix/lib/stdio/fscanf.c (revision 9) +++ (revision ) @@ -1,23 +1,0 @@ -/* - * fscanf.c - read formatted input from stream - */ -/* $Header: /cvsup/minix/src/lib/stdio/fscanf.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include -#include -#include "loc_incl.h" - -int -fscanf(FILE *stream, const char *format, ...) -{ - va_list ap; - int retval; - - va_start(ap, format); - - retval = _doscan(stream, format, ap); - - va_end(ap); - - return retval; -} Index: trunk/minix/lib/stdio/fseek.c =================================================================== --- trunk/minix/lib/stdio/fseek.c (revision 9) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * fseek.c - perform an fseek - */ -/* $Header: /cvsup/minix/src/lib/stdio/fseek.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include - -#if (SEEK_CUR != 1) || (SEEK_END != 2) || (SEEK_SET != 0) -#error SEEK_* values are wrong -#endif - -#include "loc_incl.h" - -#include - -off_t _lseek(int fildes, off_t offset, int whence); - -int -fseek(FILE *stream, long int offset, int whence) -{ - int adjust = 0; - long pos; - - stream->_flags &= ~(_IOEOF | _IOERR); - /* Clear both the end of file and error flags */ - - if (io_testflag(stream, _IOREADING)) { - if (whence == SEEK_CUR - && stream->_buf - && !io_testflag(stream,_IONBF)) - adjust = stream->_count; - stream->_count = 0; - } else if (io_testflag(stream,_IOWRITING)) { - fflush(stream); - } else /* neither reading nor writing. The buffer must be empty */ - /* EMPTY */ ; - - pos = _lseek(fileno(stream), offset - adjust, whence); - if (io_testflag(stream, _IOREAD) && io_testflag(stream, _IOWRITE)) - stream->_flags &= ~(_IOREADING | _IOWRITING); - - stream->_ptr = stream->_buf; - return ((pos == -1) ? -1 : 0); -} Index: trunk/minix/lib/stdio/fsetpos.c =================================================================== --- trunk/minix/lib/stdio/fsetpos.c (revision 9) +++ (revision ) @@ -1,12 +1,0 @@ -/* - * fsetpos.c - set the position in the file - */ -/* $Header: /cvsup/minix/src/lib/stdio/fsetpos.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include - -int -fsetpos(FILE *stream, fpos_t *pos) -{ - return fseek(stream, *pos, SEEK_SET); -} Index: trunk/minix/lib/stdio/ftell.c =================================================================== --- trunk/minix/lib/stdio/ftell.c (revision 9) +++ (revision ) @@ -1,38 +1,0 @@ -/* - * ftell.c - obtain the value of the file-position indicator of a stream - */ -/* $Header: /cvsup/minix/src/lib/stdio/ftell.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include - -#if (SEEK_CUR != 1) || (SEEK_SET != 0) || (SEEK_END != 2) -#error SEEK_* values are wrong -#endif - -#include "loc_incl.h" - -#include - -off_t _lseek(int fildes, off_t offset, int whence); - -long ftell(FILE *stream) -{ - long result; - int adjust = 0; - - if (io_testflag(stream,_IOREADING)) - adjust = -stream->_count; - else if (io_testflag(stream,_IOWRITING) - && stream->_buf - && !io_testflag(stream,_IONBF)) - adjust = stream->_ptr - stream->_buf; - else adjust = 0; - - result = _lseek(fileno(stream), (off_t)0, SEEK_CUR); - - if ( result == -1 ) - return result; - - result += (long) adjust; - return result; -} Index: trunk/minix/lib/stdio/fwrite.c =================================================================== --- trunk/minix/lib/stdio/fwrite.c (revision 9) +++ (revision ) @@ -1,29 +1,0 @@ -/* - * fwrite.c - write a number of array elements on a file - */ -/* $Header: /cvsup/minix/src/lib/stdio/fwrite.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include - -size_t -fwrite(const void *ptr, size_t size, size_t nmemb, - register FILE *stream) -{ - register const unsigned char *cp = ptr; - register size_t s; - size_t ndone = 0; - - if (size) - while ( ndone < nmemb ) { - s = size; - do { - if (putc((int)*cp, stream) - == EOF) - return ndone; - cp++; - } - while (--s); - ndone++; - } - return ndone; -} Index: trunk/minix/lib/stdio/getc.c =================================================================== --- trunk/minix/lib/stdio/getc.c (revision 9) +++ (revision ) @@ -1,12 +1,0 @@ -/* - * getc.c - read an unsigned character - */ -/* $Header: /cvsup/minix/src/lib/stdio/getc.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include - -int -(getc)(FILE *stream) -{ - return getc(stream); -} Index: trunk/minix/lib/stdio/getchar.c =================================================================== --- trunk/minix/lib/stdio/getchar.c (revision 9) +++ (revision ) @@ -1,12 +1,0 @@ -/* - * getchar.c - read a character from the standard input stream - */ -/* $Header: /cvsup/minix/src/lib/stdio/getchar.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include - -int -(getchar)(void) -{ - return getchar(); -} Index: trunk/minix/lib/stdio/gets.c =================================================================== --- trunk/minix/lib/stdio/gets.c (revision 9) +++ (revision ) @@ -1,27 +1,0 @@ -/* - * gets.c - read a line from a stream - */ -/* $Header: /cvsup/minix/src/lib/stdio/gets.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include - -char * -gets(char *s) -{ - register FILE *stream = stdin; - register int ch; - register char *ptr; - - ptr = s; - while ((ch = getc(stream)) != EOF && ch != '\n') - *ptr++ = ch; - - if (ch == EOF) { - if (feof(stream)) { - if (ptr == s) return NULL; - } else return NULL; - } - - *ptr = '\0'; - return s; -} Index: trunk/minix/lib/stdio/icompute.c =================================================================== --- trunk/minix/lib/stdio/icompute.c (revision 9) +++ (revision ) @@ -1,21 +1,0 @@ -/* - * icompute.c - compute an integer - */ -/* $Header: /cvsup/minix/src/lib/stdio/icompute.c,v 1.1.1.1 2005/04/21 14:56:35 beng Exp $ */ - -#include "loc_incl.h" - -/* This routine is used in doprnt.c as well as in tmpfile.c and tmpnam.c. */ - -char * -_i_compute(unsigned long val, int base, char *s, int nrdigits) -{ - int c; - - c= val % base ; - val /= base ; - if (val || nrdigits > 1) - s = _i_compute(val, base, s, nrdigits - 1); - *s++ = (c>9 ? c-10+'a' : c+'0'); - return s; -} Index: trunk/minix/lib/stdio/loc_incl.h =================================================================== --- trunk/minix/lib/stdio/loc_incl.h (revision 9) +++ (revision ) @@ -1,40 +1,0 @@ -/* - * loc_incl.h - local include file for stdio library - */ -/* $Header: /cvsup/minix/src/lib/stdio/loc_incl.h,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#include - -#define io_testflag(p,x) ((p)->_flags & (x)) - -#include - -#ifdef _ANSI -int _doprnt(const char *format, va_list ap, FILE *stream); -int _doscan(FILE * stream, const char *format, va_list ap); -char *_i_compute(unsigned long val, int base, char *s, int nrdigits); -char *_f_print(va_list *ap, int flags, char *s, char c, int precision); -void __cleanup(void); - -FILE *popen(const char *command, const char *type); -FILE *fdopen(int fd, const char *mode); - -#ifndef NOFLOAT -char *_ecvt(long double value, int ndigit, int *decpt, int *sign); -char *_fcvt(long double value, int ndigit, int *decpt, int *sign); -#endif /* NOFLOAT */ -#endif - -#define FL_LJUST 0x0001 /* left-justify field */ -#define FL_SIGN 0x0002 /* sign in signed conversions */ -#define FL_SPACE 0x0004 /* space in signed conversions */ -#define FL_ALT 0x0008 /* alternate form */ -#define FL_ZEROFILL 0x0010 /* fill with zero's */ -#define FL_SHORT 0x0020 /* optional h */ -#define FL_LONG 0x0040 /* optional l */ -#define FL_LONGDOUBLE 0x0080 /* optional L */ -#define FL_WIDTHSPEC 0x0100 /* field width is specified */ -#define FL_PRECSPEC 0x0200 /* precision is specified */ -#define FL_SIGNEDCONV 0x0400 /* may contain a sign */ -#define FL_NOASSIGN 0x0800 /* do not assign (in scanf) */ -#define FL_NOMORE 0x1000 /* all flags collected */ Index: trunk/minix/lib/stdio/mktemp.c =================================================================== --- trunk/minix/lib/stdio/mktemp.c (revision 9) +++ (revision ) @@ -1,132 +1,0 @@ -/* - * Copyright (c) 1987, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)mktemp.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ - -#include -#include -#include -#include -#include -#include -#include -#include - -static int _gettemp(char*,int*); - -mkstemp(path) - char *path; -{ - int fd; - - return (_gettemp(path, &fd) ? fd : -1); -} - -char * -mktemp(path) - char *path; -{ - return(_gettemp(path, (int *)NULL) ? path : (char *)NULL); -} - -static -_gettemp(path, doopen) - char *path; - register int *doopen; -{ - extern int errno; - register char *start, *trv; - struct stat sbuf; - u_int pid; - - pid = getpid(); - for (trv = path; *trv; ++trv); /* extra X's get set to 0's */ - while (*--trv == 'X') { - *trv = (pid % 10) + '0'; - pid /= 10; - } - - /* - * check the target directory; if you have six X's and it - * doesn't exist this runs for a *very* long time. - */ - for (start = trv + 1;; --trv) { - if (trv <= path) - break; - if (*trv == '/') { - *trv = '\0'; - if (stat(path, &sbuf)) - return(0); - if (!S_ISDIR(sbuf.st_mode)) { - errno = ENOTDIR; - return(0); - } - *trv = '/'; - break; - } - } - - for (;;) { - if (doopen) { - if ((*doopen = - open(path, O_CREAT|O_EXCL|O_RDWR, 0600)) >= 0) - return(1); - if (errno != EEXIST) - return(0); - } - else if (stat(path, &sbuf)) - return(errno == ENOENT ? 1 : 0); - - /* tricky little algorithm for backward compatibility */ - for (trv = start;;) { - if (!*trv) - return(0); - if (*trv == 'z') - *trv++ = 'a'; - else { - if (isdigit(*trv)) - *trv = 'a'; - else - ++*trv; - break; - } - } - } - /*NOTREACHED*/ -} - -/* - * $PchId: mktemp.c,v 1.3 1995/11/20 19:10:39 philip Exp $ - */ Index: trunk/minix/lib/stdio/perror.c =================================================================== --- trunk/minix/lib/stdio/perror.c (revision 9) +++ (revision ) @@ -1,33 +1,0 @@ -/* - * perror.c - print an error message on the standard error output - */ -/* $Header: /cvsup/minix/src/lib/stdio/perror.c,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#if defined(_POSIX_SOURCE) -#include -#endif -#include -#include -#include -#include -#include "loc_incl.h" - -ssize_t _write(int d, const char *buf, size_t nbytes); - -void -perror(const char *s) -{ - char *p; - int fd; - - p = strerror(errno); - fd = fileno(stderr); - fflush(stdout); - fflush(stderr); - if (s && *s) { - _write(fd, s, strlen(s)); - _write(fd, ": ", 2); - } - _write(fd, p, strlen(p)); - _write(fd, "\n", 1); -} Index: trunk/minix/lib/stdio/printf.c =================================================================== --- trunk/minix/lib/stdio/printf.c (revision 9) +++ (revision ) @@ -1,23 +1,0 @@ -/* - * printf - write on the standard output stream - */ -/* $Header: /cvsup/minix/src/lib/stdio/printf.c,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#include -#include -#include "loc_incl.h" - -int -printf(const char *format, ...) -{ - va_list ap; - int retval; - - va_start(ap, format); - - retval = _doprnt(format, ap, stdout); - - va_end(ap); - - return retval; -} Index: trunk/minix/lib/stdio/putc.c =================================================================== --- trunk/minix/lib/stdio/putc.c (revision 9) +++ (revision ) @@ -1,12 +1,0 @@ -/* - * putc.c - print (or buffer) one character - */ -/* $Header: /cvsup/minix/src/lib/stdio/putc.c,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#include - -int -(putc)(int c, FILE *stream) -{ - return putc(c, stream); -} Index: trunk/minix/lib/stdio/putchar.c =================================================================== --- trunk/minix/lib/stdio/putchar.c (revision 9) +++ (revision ) @@ -1,12 +1,0 @@ -/* - * putchar.c - print (or buffer) a character on the standard output stream - */ -/* $Header: /cvsup/minix/src/lib/stdio/putchar.c,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#include - -int -(putchar)(int c) -{ - return putchar(c); -} Index: trunk/minix/lib/stdio/puts.c =================================================================== --- trunk/minix/lib/stdio/puts.c (revision 9) +++ (revision ) @@ -1,20 +1,0 @@ -/* - * puts.c - print a string onto the standard output stream - */ -/* $Header: /cvsup/minix/src/lib/stdio/puts.c,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#include - -int -puts(register const char *s) -{ - register FILE *file = stdout; - register int i = 0; - - while (*s) { - if (putc(*s++, file) == EOF) return EOF; - else i++; - } - if (putc('\n', file) == EOF) return EOF; - return i + 1; -} Index: trunk/minix/lib/stdio/remove.c =================================================================== --- trunk/minix/lib/stdio/remove.c (revision 9) +++ (revision ) @@ -1,13 +1,0 @@ -/* - * remove.c - remove a file - */ -/* $Header: /cvsup/minix/src/lib/stdio/remove.c,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#include - -int _unlink(const char *path); - -int -remove(const char *filename) { - return _unlink(filename); -} Index: trunk/minix/lib/stdio/rewind.c =================================================================== --- trunk/minix/lib/stdio/rewind.c (revision 9) +++ (revision ) @@ -1,14 +1,0 @@ -/* - * rewind.c - set the file position indicator of a stream to the start - */ -/* $Header: /cvsup/minix/src/lib/stdio/rewind.c,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#include -#include "loc_incl.h" - -void -rewind(FILE *stream) -{ - (void) fseek(stream, 0L, SEEK_SET); - clearerr(stream); -} Index: trunk/minix/lib/stdio/scanf.c =================================================================== --- trunk/minix/lib/stdio/scanf.c (revision 9) +++ (revision ) @@ -1,25 +1,0 @@ -/* - * scanf.c - read formatted input from the standard input stream - */ -/* $Header: /cvsup/minix/src/lib/stdio/scanf.c,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#include -#include -#include "loc_incl.h" - -int -scanf(const char *format, ...) -{ - va_list ap; - int retval; - - va_start(ap, format); - - retval = _doscan(stdin, format, ap); - - va_end(ap); - - return retval; -} - - Index: trunk/minix/lib/stdio/setbuf.c =================================================================== --- trunk/minix/lib/stdio/setbuf.c (revision 9) +++ (revision ) @@ -1,13 +1,0 @@ -/* - * setbuf.c - control buffering of a stream - */ -/* $Header: /cvsup/minix/src/lib/stdio/setbuf.c,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#include -#include "loc_incl.h" - -void -setbuf(register FILE *stream, char *buf) -{ - (void) setvbuf(stream, buf, (buf ? _IOFBF : _IONBF), (size_t) BUFSIZ); -} Index: trunk/minix/lib/stdio/setvbuf.c =================================================================== --- trunk/minix/lib/stdio/setvbuf.c (revision 9) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * setbuf.c - control buffering of a stream - */ -/* $Id: setvbuf.c,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#include -#include -#include "loc_incl.h" - -extern void (*_clean)(void); - -int -setvbuf(register FILE *stream, char *buf, int mode, size_t size) -{ - int retval = 0; - - _clean = __cleanup; - if (mode != _IOFBF && mode != _IOLBF && mode != _IONBF) - return EOF; - - if (stream->_buf && io_testflag(stream,_IOMYBUF) ) - free((void *)stream->_buf); - - stream->_flags &= ~(_IOMYBUF | _IONBF | _IOLBF); - - if (buf && size <= 0) retval = EOF; - if (!buf && (mode != _IONBF)) { - if (size <= 0 || (buf = (char *) malloc(size)) == NULL) { - retval = EOF; - } else { - stream->_flags |= _IOMYBUF; - } - } - - stream->_buf = (unsigned char *) buf; - - stream->_count = 0; - stream->_flags |= mode; - stream->_ptr = stream->_buf; - - if (!buf) { - stream->_bufsiz = 1; - } else { - stream->_bufsiz = size; - } - - return retval; -} Index: trunk/minix/lib/stdio/sprintf.c =================================================================== --- trunk/minix/lib/stdio/sprintf.c (revision 9) +++ (revision ) @@ -1,39 +1,0 @@ -/* - * sprintf - print formatted output on an array - */ -/* $Header: /cvsup/minix/src/lib/stdio/sprintf.c,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#include -#include -#include -#include "loc_incl.h" - -int -sprintf(char *s, const char *format, ...) -{ - va_list ap; - int retval; - - va_start(ap, format); - - retval = vsnprintf(s, INT_MAX, format, ap); - - va_end(ap); - - return retval; -} - -int -snprintf(char *s, size_t n, const char *format, ...) -{ - va_list ap; - int retval; - - va_start(ap, format); - - retval = vsnprintf(s, n, format, ap); - - va_end(ap); - - return retval; -} Index: trunk/minix/lib/stdio/sscanf.c =================================================================== --- trunk/minix/lib/stdio/sscanf.c (revision 9) +++ (revision ) @@ -1,30 +1,0 @@ -/* - * sscanf - read formatted output from a string - */ -/* $Header: /cvsup/minix/src/lib/stdio/sscanf.c,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#include -#include -#include -#include "loc_incl.h" - -int sscanf(const char *s, const char *format, ...) -{ - va_list ap; - int retval; - FILE tmp_stream; - - va_start(ap, format); - - tmp_stream._fd = -1; - tmp_stream._flags = _IOREAD + _IONBF + _IOREADING; - tmp_stream._buf = (unsigned char *) s; - tmp_stream._ptr = (unsigned char *) s; - tmp_stream._count = strlen(s); - - retval = _doscan(&tmp_stream, format, ap); - - va_end(ap); - - return retval; -} Index: trunk/minix/lib/stdio/tmpfile.c =================================================================== --- trunk/minix/lib/stdio/tmpfile.c (revision 9) +++ (revision ) @@ -1,31 +1,0 @@ -/* - * tmpfile.c - create and open a temporary file - */ -/* $Header: /cvsup/minix/src/lib/stdio/tmpfile.c,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#if defined(_POSIX_SOURCE) -#include -#endif -#include -#include -#include "loc_incl.h" - -pid_t _getpid(void); - -FILE * -tmpfile(void) { - static char name_buffer[L_tmpnam] = "/tmp/tmp." ; - static char *name = NULL; - FILE *file; - - if (!name) { - name = name_buffer + strlen(name_buffer); - name = _i_compute(_getpid(), 10, name, 5); - *name = '\0'; - } - - file = fopen(name_buffer,"wb+"); - if (!file) return (FILE *)NULL; - (void) remove(name_buffer); - return file; -} Index: trunk/minix/lib/stdio/tmpnam.c =================================================================== --- trunk/minix/lib/stdio/tmpnam.c (revision 9) +++ (revision ) @@ -1,31 +1,0 @@ -/* - * tmpnam.c - create a unique filename - */ -/* $Header: /cvsup/minix/src/lib/stdio/tmpnam.c,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#if defined(_POSIX_SOURCE) -#include -#endif -#include -#include -#include "loc_incl.h" - -pid_t _getpid(void); - -char * -tmpnam(char *s) { - static char name_buffer[L_tmpnam] = "/tmp/tmp."; - static unsigned long count = 0; - static char *name = NULL; - - if (!name) { - name = name_buffer + strlen(name_buffer); - name = _i_compute((unsigned long)_getpid(), 10, name, 5); - *name++ = '.'; - *name = '\0'; - } - if (++count > TMP_MAX) count = 1; /* wrap-around */ - *_i_compute(count, 10, name, 3) = '\0'; - if (s) return strcpy(s, name_buffer); - else return name_buffer; -} Index: trunk/minix/lib/stdio/ungetc.c =================================================================== --- trunk/minix/lib/stdio/ungetc.c (revision 9) +++ (revision ) @@ -1,26 +1,0 @@ -/* - * ungetc.c - push a character back onto an input stream - */ -/* $Header: /cvsup/minix/src/lib/stdio/ungetc.c,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#include -#include "loc_incl.h" - -int -ungetc(int ch, FILE *stream) -{ - unsigned char *p; - - if (ch == EOF || !io_testflag(stream,_IOREADING)) - return EOF; - if (stream->_ptr == stream->_buf) { - if (stream->_count != 0) return EOF; - stream->_ptr++; - } - stream->_count++; - p = --(stream->_ptr); /* ??? Bloody vax assembler !!! */ - /* ungetc() in sscanf() shouldn't write in rom */ - if (*p != (unsigned char) ch) - *p = (unsigned char) ch; - return ch; -} Index: trunk/minix/lib/stdio/vfprintf.c =================================================================== --- trunk/minix/lib/stdio/vfprintf.c (revision 9) +++ (revision ) @@ -1,14 +1,0 @@ -/* - * vfprintf - formatted output without ellipsis - */ -/* $Header: /cvsup/minix/src/lib/stdio/vfprintf.c,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#include -#include -#include "loc_incl.h" - -int -vfprintf(FILE *stream, const char *format, va_list arg) -{ - return _doprnt (format, arg, stream); -} Index: trunk/minix/lib/stdio/vprintf.c =================================================================== --- trunk/minix/lib/stdio/vprintf.c (revision 9) +++ (revision ) @@ -1,14 +1,0 @@ -/* - * vprintf - formatted output without ellipsis to the standard output stream - */ -/* $Header: /cvsup/minix/src/lib/stdio/vprintf.c,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#include -#include -#include "loc_incl.h" - -int -vprintf(const char *format, va_list arg) -{ - return _doprnt(format, arg, stdout); -} Index: trunk/minix/lib/stdio/vscanf.c =================================================================== --- trunk/minix/lib/stdio/vscanf.c (revision 9) +++ (revision ) @@ -1,13 +1,0 @@ -/* - * vscanf.c - read formatted input from the standard input stream - */ - -#include -#include -#include "loc_incl.h" - -int -vscanf(const char *format, va_list ap) -{ - return _doscan(stdin, format, ap); -} Index: trunk/minix/lib/stdio/vsprintf.c =================================================================== --- trunk/minix/lib/stdio/vsprintf.c (revision 9) +++ (revision ) @@ -1,34 +1,0 @@ -/* - * vsprintf - print formatted output without ellipsis on an array - */ -/* $Header: /cvsup/minix/src/lib/stdio/vsprintf.c,v 1.1.1.1 2005/04/21 14:56:36 beng Exp $ */ - -#include -#include -#include -#include "loc_incl.h" - -int -vsnprintf(char *s, size_t n, const char *format, va_list arg) -{ - int retval; - FILE tmp_stream; - - tmp_stream._fd = -1; - tmp_stream._flags = _IOWRITE + _IONBF + _IOWRITING; - tmp_stream._buf = (unsigned char *) s; - tmp_stream._ptr = (unsigned char *) s; - tmp_stream._count = n-1; - - retval = _doprnt(format, arg, &tmp_stream); - tmp_stream._count = 1; - putc('\0',&tmp_stream); - - return retval; -} - -int -vsprintf(char *s, const char *format, va_list arg) -{ - return vsnprintf(s, INT_MAX, format, arg); -} Index: trunk/minix/lib/stdio/vsscanf.c =================================================================== --- trunk/minix/lib/stdio/vsscanf.c (revision 9) +++ (revision ) @@ -1,21 +1,0 @@ -/* - * vsscanf - read formatted output from a string - */ - -#include -#include -#include -#include "loc_incl.h" - -int vsscanf(const char *s, const char *format, va_list ap) -{ - FILE tmp_stream; - - tmp_stream._fd = -1; - tmp_stream._flags = _IOREAD + _IONBF + _IOREADING; - tmp_stream._buf = (unsigned char *) s; - tmp_stream._ptr = (unsigned char *) s; - tmp_stream._count = strlen(s); - - return _doscan(&tmp_stream, format, ap); -}