Move stdio into (mostly) sys.

lang/cem/libcc.ansi/build.lua

@@ -45,6 +45,7 @@ for _, plat in ipairs(vars.plats) do
 			"./core/misc/*.c",
 			"./sys/malloc/*.c",
 			"./sys/exit/*.c",
+			"./sys/stdio/*.c",
 			"./assert/*.c",
 			"./stdio/*.c",
 			"./stdlib/*.c",
@@ -60,7 +61,7 @@ for _, plat in ipairs(vars.plats) do
 			"./sys/malloc/malloc.h",
 			"./core/math/localmath.h",
 			"./core/stdlib/ext_fmt.h",
-			"./stdio/loc_incl.h",
+			"./sys/stdio/loc_incl.h",
 			"./time/loc_time.h",
 		},
 		vars = { plat = plat }

lang/cem/libcc.ansi/core/stdio/rewind.c

@@ -4,7 +4,6 @@
 /* $Id$ */
 
 #include <stdio.h>
-#include "loc_incl.h"
 
 void rewind(FILE* stream)
 {

lang/cem/libcc.ansi/headers/ack/config.h

@@ -34,4 +34,8 @@
 #define ACKCONF_WANT_MALLOC 1
 #endif
 
+#ifndef ACKCONF_WANT_STDIO
+#define ACKCONF_WANT_STDIO 1
+#endif
+
 #endif

lang/cem/libcc.ansi/headers/stddef.h

@@ -9,6 +9,7 @@
 #ifndef _STDDEF_H
 #define	_STDDEF_H
 
+#include <ack/config.h>
 #include <stdint.h>
 
 #define	NULL 0

lang/cem/libcc.ansi/stdio/LIST

@@ -1,52 +0,0 @@
-loc_incl.h
-tmpfile.c
-tmpnam.c
-rename.c
-remove.c
-fopen.c
-freopen.c
-setbuf.c
-setvbuf.c
-perror.c
-fprintf.c
-printf.c
-sprintf.c
-vfprintf.c
-vprintf.c
-vsprintf.c
-doprnt.c
-icompute.c
-fscanf.c
-scanf.c
-sscanf.c
-doscan.c
-fgetc.c
-fgets.c
-getc.c
-getchar.c
-gets.c
-putc.c
-putchar.c
-fputc.c
-puts.c
-fputs.c
-ungetc.c
-fread.c
-fwrite.c
-fgetpos.c
-fsetpos.c
-rewind.c
-fseek.c
-ftell.c
-clearerr.c
-feof.c
-ferror.c
-fileno.c
-fltpr.c
-ecvt.c
-fillbuf.c
-fclose.c
-flushbuf.c
-fflush.c
-isatty.c
-data.c

lang/cem/libcc.ansi/stdio/Makefile

@@ -1,10 +0,0 @@
-clean:
-	rm -f tmpfile.o tmpnam.o rename.o remove.o fopen.o freopen.o \
-		setbuf.o setvbuf.o perror.o fprintf.o printf.o sprintf.o \
-		vfprintf.o vprintf.o vsprintf.o doprnt.o icompute.o \
-		fscanf.o scanf.o sscanf.o doscan.o fgetc.o fgets.o getc.o \
-		getchar.o gets.o putc.o putchar.o fputc.o puts.o fputs.o \
-		ungetc.o fread.o fwrite.o fgetpos.o fsetpos.o rewind.o \
-		fseek.o ftell.o clearerr.o feof.o ferror.o fileno.o \
-		fltpr.o ecvt.o gcvt.o fillbuf.o fclose.o flushbuf.o \
-		fflush.o isatty.o data.o OLIST

lang/cem/libcc.ansi/sys/stdio/clearerr.c

@@ -5,7 +5,11 @@
 
 #include <stdio.h>
 
+#if ACKCONF_WANT_STDIO
+
 void(clearerr)(FILE* stream)
 {
 	clearerr(stream);
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/data.c

@@ -5,6 +5,8 @@
 
 #include <stdio.h>
 
+#if ACKCONF_WANT_STDIO
+
 struct __iobuf __stdin = {
 	0, 0, _IOREAD, 0,
 	(unsigned char*)NULL, (unsigned char*)NULL,
@@ -26,3 +28,5 @@ FILE* __iotab[FOPEN_MAX] = {
 	&__stderr,
 	0
 };
+
+#endif

lang/cem/libcc.ansi/sys/stdio/doprnt.c

@@ -9,6 +9,8 @@
 #include <string.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 /* 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)
@@ -393,3 +395,5 @@ int _doprnt(register const char* fmt, va_list ap, FILE* stream)
 	}
 	return nrchars;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/doscan.c

@@ -9,6 +9,8 @@
 #include <stdarg.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 #if _EM_WSIZE == _EM_PSIZE
 #define set_pointer(flags) /* nothing */
 #elif _EM_LSIZE == _EM_PSIZE
@@ -540,3 +542,5 @@ int _doscan(register FILE* stream, const char* format, va_list ap)
 	}
 	return conv || (ic != EOF) ? done : EOF;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/fclose.c

@@ -8,6 +8,8 @@
 #include <unistd.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 int fclose(FILE* fp)
 {
 	register int i, retval = 0;
@@ -30,3 +32,5 @@ int fclose(FILE* fp)
 		free((void*)fp);
 	return retval;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/fdopen.c

@@ -7,6 +7,8 @@
 #include <stdlib.h>
 #include "../stdio/loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 FILE* fdopen(int fd, const char* mode)
 {
 	register int i;
@@ -63,3 +65,5 @@ FILE* fdopen(int fd, const char* mode)
 	__iotab[i] = stream;
 	return stream;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/feof.c

@@ -5,7 +5,11 @@
 
 #include <stdio.h>
 
+#if ACKCONF_WANT_STDIO
+
 int(feof)(FILE* stream)
 {
 	return feof(stream);
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/ferror.c

@@ -5,7 +5,11 @@
 
 #include <stdio.h>
 
+#if ACKCONF_WANT_STDIO
+
 int(ferror)(FILE* stream)
 {
 	return ferror(stream);
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/fflush.c

@@ -8,6 +8,8 @@
 #include <unistd.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 int fflush(FILE* stream)
 {
 	int count, c1, i, retval = 0;
@@ -86,3 +88,5 @@ void __register_stdio_cleanup(void)
 		atexit(cleanup);
 	}
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/fgetc.c

@@ -5,7 +5,11 @@
 
 #include <stdio.h>
 
+#if ACKCONF_WANT_STDIO
+
 int fgetc(FILE* stream)
 {
 	return getc(stream);
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/fgets.c

@@ -5,6 +5,8 @@
 
 #include <stdio.h>
 
+#if ACKCONF_WANT_STDIO
+
 char* fgets(char* s, register int n, register FILE* stream)
 {
 	register int ch;
@@ -30,3 +32,5 @@ char* fgets(char* s, register int n, register FILE* stream)
 	*ptr = '\0';
 	return s;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/fileno.c

@@ -5,7 +5,11 @@
 
 #include <stdio.h>
 
+#if ACKCONF_WANT_STDIO
+
 int(fileno)(FILE* stream)
 {
 	return stream->_fd;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/fillbuf.c

@@ -8,6 +8,8 @@
 #include <unistd.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 int __fillbuf(register FILE* stream)
 {
 	static unsigned char ch[FOPEN_MAX];
@@ -77,3 +79,5 @@ int __fillbuf(register FILE* stream)
 
 	return *stream->_ptr++;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/fltpr.c

@@ -7,7 +7,7 @@
 #include <stdarg.h>
 #include "loc_incl.h"
 
-#if ACKCONF_WANT_STDIO_FLOAT
+#if ACKCONF_WANT_STDIO && ACKCONF_WANT_STDIO_FLOAT
 
 static char*
 _pfloat(long double r, register char* s, int n, int flags)

lang/cem/libcc.ansi/sys/stdio/flushbuf.c

@@ -8,6 +8,8 @@
 #include <unistd.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 static int
 do_write(int d, char* buf, int nbytes)
 {
@@ -148,3 +150,5 @@ int __flushbuf(int c, FILE* stream)
 	}
 	return (unsigned char)c;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/fopen.c

@@ -10,6 +10,8 @@
 #include <unistd.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 #define PMODE 0666
 
 /* Since the O_CREAT flag is not available on all systems, we can't get it
@@ -112,3 +114,5 @@ FILE* fopen(const char* name, const char* mode)
 	__iotab[i] = stream;
 	return stream;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/fprintf.c

@@ -7,6 +7,8 @@
 #include <stdarg.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 int fprintf(FILE* stream, const char* format, ...)
 {
 	va_list ap;
@@ -20,3 +22,5 @@ int fprintf(FILE* stream, const char* format, ...)
 
 	return retval;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/fputc.c

@@ -5,7 +5,11 @@
 
 #include <stdio.h>
 
+#if ACKCONF_WANT_STDIO
+
 int fputc(int c, FILE* stream)
 {
 	return putc(c, stream);
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/fputs.c

@@ -5,6 +5,8 @@
 
 #include <stdio.h>
 
+#if ACKCONF_WANT_STDIO
+
 int fputs(register const char* s, register FILE* stream)
 {
 	register int i = 0;
@@ -17,3 +19,5 @@ int fputs(register const char* s, register FILE* stream)
 
 	return i;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/fread.c

@@ -5,6 +5,8 @@
 
 #include <stdio.h>
 
+#if ACKCONF_WANT_STDIO
+
 size_t
 fread(void* ptr, size_t size, size_t nmemb, register FILE* stream)
 {
@@ -29,3 +31,5 @@ fread(void* ptr, size_t size, size_t nmemb, register FILE* stream)
 
 	return ndone;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/freopen.c

@@ -9,6 +9,8 @@
 #include <unistd.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 #define PMODE 0666
 
 /* Do not "optimize" this file to use the open with O_CREAT if the file
@@ -92,3 +94,5 @@ FILE* freopen(const char* name, const char* mode, FILE* stream)
 	stream->_flags = flags;
 	return stream;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/fscanf.c

@@ -7,6 +7,8 @@
 #include <stdarg.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 int fscanf(FILE* stream, const char* format, ...)
 {
 	va_list ap;
@@ -20,3 +22,5 @@ int fscanf(FILE* stream, const char* format, ...)
 
 	return retval;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/fseek.c

@@ -8,6 +8,8 @@
 #include <unistd.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 int fseek(FILE* stream, long int offset, int whence)
 {
 	int adjust = 0;
@@ -38,3 +40,5 @@ int fseek(FILE* stream, long int offset, int whence)
 	stream->_ptr = stream->_buf;
 	return ((pos == -1) ? -1 : 0);
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/ftell.c

@@ -8,6 +8,8 @@
 #include <unistd.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 long ftell(FILE* stream)
 {
 	long result;
@@ -30,3 +32,5 @@ long ftell(FILE* stream)
 	result += (long)adjust;
 	return result;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/fwrite.c

@@ -5,6 +5,8 @@
 
 #include <stdio.h>
 
+#if ACKCONF_WANT_STDIO
+
 size_t
 fwrite(const void* ptr, size_t size, size_t nmemb,
     register FILE* stream)
@@ -28,3 +30,5 @@ fwrite(const void* ptr, size_t size, size_t nmemb,
 		}
 	return ndone;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/getc.c

@@ -5,7 +5,11 @@
 
 #include <stdio.h>
 
+#if ACKCONF_WANT_STDIO
+
 int(getc)(FILE* stream)
 {
 	return getc(stream);
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/getchar.c

@@ -5,7 +5,11 @@
 
 #include <stdio.h>
 
+#if ACKCONF_WANT_STDIO
+
 int(getchar)(void)
 {
 	return getchar();
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/icompute.c

@@ -5,6 +5,8 @@
 
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 /* 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)
@@ -18,3 +20,5 @@ char* _i_compute(unsigned long val, int base, char* s, int nrdigits)
 	*s++ = (c > 9 ? c - 10 + 'a' : c + '0');
 	return s;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/printf.c

@@ -7,6 +7,8 @@
 #include <stdarg.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 int printf(const char* format, ...)
 {
 	va_list ap;
@@ -20,3 +22,5 @@ int printf(const char* format, ...)
 
 	return retval;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/putc.c

@@ -5,7 +5,11 @@
 
 #include <stdio.h>
 
+#if ACKCONF_WANT_STDIO
+
 int(putc)(int c, FILE* stream)
 {
 	return putc(c, stream);
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/putchar.c

@@ -5,7 +5,11 @@
 
 #include <stdio.h>
 
+#if ACKCONF_WANT_STDIO
+
 int(putchar)(int c)
 {
 	return putchar(c);
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/puts.c

@@ -5,6 +5,8 @@
 
 #include <stdio.h>
 
+#if ACKCONF_WANT_STDIO
+
 int puts(register const char* s)
 {
 	register FILE* file = stdout;
@@ -21,3 +23,5 @@ int puts(register const char* s)
 		return EOF;
 	return i + 1;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/scanf.c

@@ -7,6 +7,8 @@
 #include <stdarg.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 int scanf(const char* format, ...)
 {
 	va_list ap;
@@ -20,3 +22,5 @@ int scanf(const char* format, ...)
 
 	return retval;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/setbuf.c

@@ -6,7 +6,11 @@
 #include <stdio.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 void setbuf(register FILE* stream, char* buf)
 {
 	(void)setvbuf(stream, buf, (buf ? _IOFBF : _IONBF), (size_t)BUFSIZ);
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/setvbuf.c

@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include "loc_incl.h"
 
-extern void (*_clean)(void);
+#if ACKCONF_WANT_STDIO
 
 int setvbuf(register FILE* stream, char* buf, int mode, size_t size)
 {
@@ -53,3 +53,5 @@ int setvbuf(register FILE* stream, char* buf, int mode, size_t size)
 
 	return retval;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/snprintf.c

@@ -7,6 +7,8 @@
 #include <stdarg.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 int snprintf(char* s, size_t len, const char* format, ...)
 {
 	va_list ap;
@@ -28,3 +30,5 @@ int snprintf(char* s, size_t len, const char* format, ...)
 
 	return retval;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/sprintf.c

@@ -7,6 +7,8 @@
 #include <stdarg.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 int sprintf(char* s, const char* format, ...)
 {
 	va_list ap;
@@ -28,3 +30,5 @@ int sprintf(char* s, const char* format, ...)
 
 	return retval;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/sscanf.c

@@ -8,6 +8,8 @@
 #include <string.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 int sscanf(const char* s, const char* format, ...)
 {
 	va_list ap;
@@ -28,3 +30,5 @@ int sscanf(const char* s, const char* format, ...)
 
 	return retval;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/tmpfile.c

@@ -9,6 +9,8 @@
 #include <string.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 FILE* tmpfile(void)
 {
 	static char name_buffer[L_tmpnam] = "/tmp/tmp.";
@@ -28,3 +30,5 @@ FILE* tmpfile(void)
 	(void)remove(name_buffer);
 	return file;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/tmpnam.c

@@ -9,6 +9,8 @@
 #include <unistd.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 char* tmpnam(char* s)
 {
 	static char name_buffer[L_tmpnam] = "/tmp/tmp.";
@@ -30,3 +32,5 @@ char* tmpnam(char* s)
 	else
 		return name_buffer;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/ungetc.c

@@ -6,6 +6,8 @@
 #include <stdio.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 int ungetc(int ch, FILE* stream)
 {
 	unsigned char* p;
@@ -25,3 +27,5 @@ int ungetc(int ch, FILE* stream)
 		*p = (unsigned char)ch;
 	return ch;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/vfprintf.c

@@ -7,7 +7,11 @@
 #include <stdarg.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 int vfprintf(FILE* stream, const char* format, va_list arg)
 {
 	return _doprnt(format, arg, stream);
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/vprintf.c

@@ -7,7 +7,11 @@
 #include <stdarg.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 int vprintf(const char* format, va_list arg)
 {
 	return _doprnt(format, arg, stdout);
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/vsnprintf.c

@@ -7,6 +7,8 @@
 #include <stdarg.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 int vsnprintf(char* s, size_t len, const char* format, va_list arg)
 {
 	int retval;
@@ -23,3 +25,5 @@ int vsnprintf(char* s, size_t len, const char* format, va_list arg)
 
 	return retval;
 }
+
+#endif

lang/cem/libcc.ansi/sys/stdio/vsprintf.c

@@ -7,6 +7,8 @@
 #include <stdarg.h>
 #include "loc_incl.h"
 
+#if ACKCONF_WANT_STDIO
+
 int vsprintf(char* s, const char* format, va_list arg)
 {
 	int retval;
@@ -23,3 +25,5 @@ int vsprintf(char* s, const char* format, va_list arg)
 
 	return retval;
 }
+
+#endif