Index: trunk/minix/servers/inet/minix3/queryparam.c
===================================================================
--- trunk/minix/servers/inet/minix3/queryparam.c	(revision 9)
+++ 	(revision )
@@ -1,151 +1,0 @@
-/*	queryparam() - allow program parameters to be queried
- *							Author: Kees J. Bot
- *								21 Apr 1994
- */
-#define nil 0
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <minix3/queryparam.h>
-
-#if EXAMPLE
-struct stat st[2];
-
-struct export_param_list ex_st_list[]= {
-	QP_VARIABLE(st),
-	QP_ARRAY(st),
-	QP_FIELD(st_dev, struct stat),
-	QP_FIELD(st_ino, struct stat),
-	...
-	QP_END()
-};
-
-struct buf { block_t b_blocknr; ... } *buf;
-size_t nr_bufs;
-
-struct export_param_list ex_buf_list[]=
-	QP_VECTOR(buf, buf, nr_bufs),
-	QP_FIELD(b_blocknr),
-	...
-	QP_END()
-};
-
-struct export_params ex_st= { ex_st_list, 0 };
-struct export_params ex_buf= { ex_buf_list, 0 };
-#endif
-
-#define between(a, c, z)    ((unsigned) ((c) - (a)) <= (unsigned) ((z) - (a)))
-
-static int isvar(int c)
-{
-	return between('a', c, 'z') || between('A', c, 'Z')
-				|| between('0', c, '9') || c == '_';
-}
-
-static struct export_params *params;
-
-void qp_export(struct export_params *ex_params)
-{
-	/* Add a set of exported parameters. */
-
-	if (ex_params->next == nil) {
-		ex_params->next= params;
-		params= ex_params;
-	}
-}
-
-int queryparam(int qgetc(void), void **poffset, size_t *psize)
-{
-	char *prefix;
-	struct export_params *ep;
-	struct export_param_list *epl;
-	size_t offset= 0;
-	size_t size= -1;
-	size_t n;
-	static size_t retval;
-	int c, firstc;
-
-	firstc= c= (*qgetc)();
-	if (c == '&' || c == '$') c= (*qgetc)();
-	if (!isvar(c)) goto fail;
-
-	if ((ep= params) == nil) goto fail;
-	epl= ep->list;
-
-	while (c != 0 && c != ',') {
-		prefix= "x";
-		n= 0;
-
-		for (;;) {
-			while (epl->name == nil) {
-				if ((ep= ep->next) == nil) goto fail;
-				epl= ep->list;
-			}
-			if (strncmp(prefix, epl->name, n) == 0) {
-				prefix= epl->name;
-				while (prefix[n] != 0 && c == prefix[n]) {
-					n++;
-					c= (*qgetc)();
-				}
-			}
-			if (prefix[n] == 0 && (!isvar(c) || prefix[0] == '[')) {
-				/* Got a match. */
-				break;
-			}
-			epl++;
-		}
-
-		if (prefix[0] == '[') {
-			/* Array reference. */
-			size_t idx= 0, cnt= 1, max= size / epl->size;
-
-			while (between('0', c, '9')) {
-				idx= idx * 10 + (c - '0');
-				if (idx > max) goto fail;
-				c= (*qgetc)();
-			}
-			if (c == ':') {
-				cnt= 0;
-				while (between('0', (c= (*qgetc)()), '9')) {
-					cnt= cnt * 10 + (c - '0');
-				}
-			}
-			if (c != ']') goto fail;
-			if (idx + cnt > max) cnt= max - idx;
-			offset+= idx * epl->size;
-			size= cnt * epl->size;
-			c= (*qgetc)();
-		} else
-		if (epl->size == -1) {
-			/* Vector. */
-			offset= (size_t) * (void **) epl->offset;
-			size= (* (size_t *) epl[1].offset) * epl[1].size;
-		} else {
-			/* Variable or struct field. */
-			offset+= (size_t) epl->offset;
-			if ((size_t) epl->offset > size) goto fail;
-			size-= (size_t) epl->offset;
-			if (size < epl->size) goto fail;
-			size= epl->size;
-		}
-	}
-	if (firstc == '&' || firstc == '$') {
-		retval= firstc == '&' ? offset : size;
-		offset= (size_t) &retval;
-		size= sizeof(retval);
-	}
-	if (c != 0 && c != ',') goto fail;
-	*poffset= (void *) offset;
-	*psize= size;
-	return c != 0;
-fail:
-	while (c != 0 && c != ',') c= (*qgetc)();
-	*poffset= nil;
-	*psize= 0;
-	return c != 0;
-}
-
-/*
- * $PchId: queryparam.c,v 1.1 2005/06/28 14:30:56 philip Exp $
- */
Index: trunk/minix/servers/inet/minix3/queryparam.h
===================================================================
--- trunk/minix/servers/inet/minix3/queryparam.h	(revision 9)
+++ 	(revision )
@@ -1,45 +1,0 @@
-/*	queryparam.h - query program parameters		Author: Kees J. Bot
- *								22 Apr 1994
- */
-#ifndef _MINIX__QUERYPARAM_H
-#define _MINIX__QUERYPARAM_H
-
-#include <ansi.h>
-
-typedef size_t _mnx_size_t;
-
-struct export_param_list {
-	char	*name;		/* "variable", "[", ".field", or NULL. */
-	void	*offset;	/* Address of a variable or field offset. */
-	size_t	size;		/* Size of the resulting object. */
-};
-
-struct export_params {
-	struct export_param_list *list;	/* List of exported parameters. */
-	struct export_params	 *next;	/* Link several sets of parameters. */
-};
-
-#ifdef __STDC__
-#define qp_stringize(var)	#var
-#define qp_dotstringize(var)	"." #var
-#else
-#define qp_stringize(var)	"var"
-#define qp_dotstringize(var)	".var"
-#endif
-#define QP_VARIABLE(var)	{ qp_stringize(var), &(var), sizeof(var) }
-#define QP_ARRAY(var)		{ "[", 0, sizeof((var)[0]) }
-#define QP_VECTOR(var,ptr,len)	{ qp_stringize(var), &(ptr), -1 },\
-				{ "[", &(len), sizeof(*(ptr)) }
-#define QP_FIELD(field, type)	{ qp_dotstringize(field), \
-					(void *)offsetof(type, field), \
-					sizeof(((type *)0)->field) }
-#define QP_END()		{ 0, 0, 0 }
-
-void qp_export _ARGS((struct export_params *_ex_params));
-int queryparam _ARGS((int (*_qgetc) _ARGS((void)), void **_paddress,
-							_mnx_size_t *_psize));
-_mnx_size_t paramvalue _ARGS((char **_value, void *_address,
-							_mnx_size_t _size));
-#endif /* _MINIX__QUERYPARAM_H */
-
-/* $PchId: queryparam.h,v 1.1 2005/06/28 14:31:26 philip Exp $ */