 cc17b27a2b
			
		
	
	
		cc17b27a2b
		
	
	
	
	
		
			
			3 sets of libraries are built now: . ack: all libraries that ack can compile (/usr/lib/i386/) . clang+elf: all libraries with minix headers (/usr/lib/) . clang+elf: all libraries with netbsd headers (/usr/netbsd/) Once everything can be compiled with netbsd libraries and headers, the /usr/netbsd hierarchy will be obsolete and its libraries compiled with netbsd headers will be installed in /usr/lib, and its headers in /usr/include. (i.e. minix libc and current minix headers set will be gone.) To use the NetBSD libc system (libraries + headers) before it is the default libc, see: http://wiki.minix3.org/en/DevelopersGuide/UsingNetBSDCode This wiki page also documents the maintenance of the patch files of minix-specific changes to imported NetBSD code. Changes in this commit: . libsys: Add NBSD compilation and create a safe NBSD-based libc. . Port rest of libraries (except libddekit) to new header system. . Enable compilation of libddekit with new headers. . Enable kernel compilation with new headers. . Enable drivers compilation with new headers. . Port legacy commands to new headers and libc. . Port servers to new headers. . Add <sys/sigcontext.h> in compat library. . Remove dependency file in tree. . Enable compilation of common/lib/libc/atomic in libsys . Do not generate RCSID strings in libc. . Temporarily disable zoneinfo as they are incompatible with NetBSD format . obj-nbsd for .gitignore . Procfs: use only integer arithmetic. (Antoine Leca) . Increase ramdisk size to create NBSD-based images. . Remove INCSYMLINKS handling hack. . Add nbsd_include/sys/exec_elf.h . Enable ELF compilation with NBSD libc. . Add 'make nbsdsrc' in tools to download reference NetBSD sources. . Automate minix-port.patch creation. . Avoid using fstavfs() as it is *extremely* slow and unneeded. . Set err() as PRIVATE to avoid name clash with libc. . [NBSD] servers/vm: remove compilation warnings. . u32 is not a long in NBSD headers. . UPDATING info on netbsd hierarchy . commands fixes for netbsd libc
		
			
				
	
	
		
			225 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			225 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| 
 | |
| #include <stdarg.h>
 | |
| #include <stddef.h>
 | |
| #include <ctype.h>
 | |
| #include <limits.h>
 | |
| 
 | |
| /* vprintf() uses kputc() to print characters. */
 | |
| void kputc(int c);
 | |
| 
 | |
| #ifdef __NBSD_LIBC
 | |
| #define count_kputc(c) do { charcount++; putf((c), farg); } while(0)
 | |
| 
 | |
| int __fvprintf(void (*putf)(int, void *), const char *fmt, va_list argp, void *farg)
 | |
| #else /* !NBSD_LIBC */
 | |
| #define count_kputc(c) do { charcount++; kputc(c); } while(0)
 | |
| 
 | |
| int vprintf(const char *fmt, va_list argp)
 | |
| #endif /* NBSD_LIBC */
 | |
| {
 | |
| 	int c, charcount = 0;
 | |
| 	enum { LEFT, RIGHT } adjust;
 | |
| 	enum { LONG, INT } intsize;
 | |
| 	int fill;
 | |
| 	int width, max, len, base;
 | |
| 	static char X2C_tab[]= "0123456789ABCDEF";
 | |
| 	static char x2c_tab[]= "0123456789abcdef";
 | |
| 	char *x2c;
 | |
| 	char *p;
 | |
| 	long i;
 | |
| 	unsigned long u;
 | |
| 	char temp[8 * sizeof(long) / 3 + 2];
 | |
| 
 | |
| 	while ((c= *fmt++) != 0) {
 | |
| 		if (c != '%') {
 | |
| 			/* Ordinary character. */
 | |
| 			count_kputc(c);
 | |
| 			continue;
 | |
| 		}
 | |
| 
 | |
| 		/* Format specifier of the form:
 | |
| 		 *	%[adjust][fill][width][.max]keys
 | |
| 		 */
 | |
| 		c= *fmt++;
 | |
| 
 | |
| 		adjust= RIGHT;
 | |
| 		if (c == '-') {
 | |
| 			adjust= LEFT;
 | |
| 			c= *fmt++;
 | |
| 		}
 | |
| 
 | |
| 		fill= ' ';
 | |
| 		if (c == '0') {
 | |
| 			fill= '0';
 | |
| 			c= *fmt++;
 | |
| 		}
 | |
| 
 | |
| 		width= 0;
 | |
| 		if (c == '*') {
 | |
| 			/* Width is specified as an argument, e.g. %*d. */
 | |
| 			width= va_arg(argp, int);
 | |
| 			c= *fmt++;
 | |
| 		} else
 | |
| 		if (isdigit(c)) {
 | |
| 			/* A number tells the width, e.g. %10d. */
 | |
| 			do {
 | |
| 				width= width * 10 + (c - '0');
 | |
| 			} while (isdigit(c= *fmt++));
 | |
| 		}
 | |
| 
 | |
| 		max= INT_MAX;
 | |
| 		if (c == '.') {
 | |
| 			/* Max field length coming up. */
 | |
| 			if ((c= *fmt++) == '*') {
 | |
| 				max= va_arg(argp, int);
 | |
| 				c= *fmt++;
 | |
| 			} else
 | |
| 			if (isdigit(c)) {
 | |
| 				max= 0;
 | |
| 				do {
 | |
| 					max= max * 10 + (c - '0');
 | |
| 				} while (isdigit(c= *fmt++));
 | |
| 			}
 | |
| 		}
 | |
| 
 | |
| 		/* Set a few flags to the default. */
 | |
| 		x2c= x2c_tab;
 | |
| 		i= 0;
 | |
| 		base= 10;
 | |
| 		intsize= INT;
 | |
| 		if (c == 'l' || c == 'L') {
 | |
| 			/* "Long" key, e.g. %ld. */
 | |
| 			intsize= LONG;
 | |
| 			c= *fmt++;
 | |
| 		}
 | |
| 		if (c == 0) break;
 | |
| 
 | |
| 		switch (c) {
 | |
| 			/* Decimal. */
 | |
| 		case 'd':
 | |
| 			i= intsize == LONG ? va_arg(argp, long)
 | |
| 						: va_arg(argp, int);
 | |
| 			u= i < 0 ? -i : i;
 | |
| 			goto int2ascii;
 | |
| 
 | |
| 			/* Octal. */
 | |
| 		case 'o':
 | |
| 			base= 010;
 | |
| 			goto getint;
 | |
| 
 | |
| 			/* Pointer, interpret as %X or %lX. */
 | |
| 		case 'p':
 | |
| 			if (sizeof(char *) > sizeof(int)) intsize= LONG;
 | |
| 
 | |
| 			/* Hexadecimal.  %X prints upper case A-F, not %lx. */
 | |
| 		case 'X':
 | |
| 			x2c= X2C_tab;
 | |
| 		case 'x':
 | |
| 			base= 0x10;
 | |
| 			goto getint;
 | |
| 
 | |
| 			/* Unsigned decimal. */
 | |
| 		case 'u':
 | |
| 		getint:
 | |
| 			u= intsize == LONG ? va_arg(argp, unsigned long)
 | |
| 						: va_arg(argp, unsigned int);
 | |
| 		int2ascii:
 | |
| 			p= temp + sizeof(temp)-1;
 | |
| 			*p= 0;
 | |
| 			do {
 | |
| 				*--p= x2c[(ptrdiff_t) (u % base)];
 | |
| 			} while ((u /= base) > 0);
 | |
| 			goto string_length;
 | |
| 
 | |
| 			/* A character. */
 | |
| 		case 'c':
 | |
| 			p= temp;
 | |
| 			*p= va_arg(argp, int);
 | |
| 			len= 1;
 | |
| 			goto string_print;
 | |
| 
 | |
| 			/* Simply a percent. */
 | |
| 		case '%':
 | |
| 			p= temp;
 | |
| 			*p= '%';
 | |
| 			len= 1;
 | |
| 			goto string_print;
 | |
| 
 | |
| 			/* A string.  The other cases will join in here. */
 | |
| 		case 's':
 | |
| 			p= va_arg(argp, char *);
 | |
| 			if (!p) p = "(null)";
 | |
| 
 | |
| 		string_length:
 | |
| 			for (len= 0; p[len] != 0 && len < max; len++) {}
 | |
| 
 | |
| 		string_print:
 | |
| 			width -= len;
 | |
| 			if (i < 0) width--;
 | |
| 			if (fill == '0' && i < 0) count_kputc('-');
 | |
| 			if (adjust == RIGHT) {
 | |
| 				while (width > 0) { count_kputc(fill); width--; }
 | |
| 			}
 | |
| 			if (fill == ' ' && i < 0) count_kputc('-');
 | |
| 			while (len > 0) { count_kputc((unsigned char) *p++); len--; }
 | |
| 			while (width > 0) { count_kputc(fill); width--; }
 | |
| 			break;
 | |
| 
 | |
| 			/* Unrecognized format key, echo it back. */
 | |
| 		default:
 | |
| 			count_kputc('%');
 | |
| 			count_kputc(c);
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	/* Mark the end with a null (should be something else, like -1). */
 | |
| #ifdef __NBDS_LIBC
 | |
| 	putf(0, farg);
 | |
| #else
 | |
| 	kputc(0);
 | |
| #endif
 | |
| 	return charcount;
 | |
| }
 | |
| 
 | |
| #ifdef __NBSD_LIBC
 | |
| #include <sys/cdefs.h>
 | |
| #include <assert.h>
 | |
| #include <unistd.h>
 | |
| #include <stdio.h>
 | |
| 
 | |
| __weak_alias(vprintf, _vprintf)
 | |
| __weak_alias(vfprintf, _vfprintf)
 | |
| __strong_alias(__vfprintf_unlocked, _vfprintf)
 | |
| 
 | |
| static void
 | |
| __xfputc(int c, void *arg)
 | |
| {
 | |
| 	FILE *fp = (FILE *)arg;
 | |
| 	if (fp->_flags & __SSTR) {
 | |
| 		/* Write to a string. */
 | |
| 		if (fp->_w == 0)
 | |
| 			return;
 | |
| 		memset(fp->_p++, c, 1);
 | |
| 		fp->_w -= 1;
 | |
| 		return;
 | |
| 	}
 | |
| 
 | |
| 	/* Not a string. Print it. */
 | |
| 	kputc(c);
 | |
| }
 | |
| 
 | |
| int _vprintf(const char *fmt, va_list argp)
 | |
| {
 | |
| 	__fvprintf(__xfputc, fmt, argp, stdout);
 | |
| }
 | |
| 
 | |
| int _vfprintf(FILE *fp, const char *fmt, va_list argp)
 | |
| {
 | |
| 	__fvprintf(__xfputc, fmt, argp, fp);
 | |
| }
 | |
| #endif
 | |
| 
 | |
| /*
 | |
|  * $PchId: kprintf.c,v 1.5 1996/04/11 06:59:05 philip Exp $
 | |
|  */
 |