[njbfs-commits] CVS: njbfs proc.c,1.3,1.4

[J?rg P. <jp...@us...>]

Update of /cvsroot/njbfs/njbfs
In directory usw-pr-cvs1:/tmp/cvs-serv23353

Modified Files:
	proc.c 
Log Message:
'sscanf' missing symbol compatibility hack

Index: proc.c
===================================================================
RCS file: /cvsroot/njbfs/njbfs/proc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** proc.c	2001/12/04 21:09:31	1.3
--- proc.c	2001/12/14 23:16:23	1.4
***************
*** 947,950 ****
--- 947,1171 ----
  }
  
+ /*
+  *  2.4.10- kernel compatibility hack for missing 'sscanf' symbol
+  *  The following lines are copied from 2.4.10+ Linux kernel lib/vsprintf.c
+  *  They can be removed if people get used to kernel 2.4.10+
+  */
+ 
+ 
+ static int skip_atoi(const char **s)
+ {
+ 	int i=0;
+ 
+ 	while (isdigit(**s))
+ 		i = i*10 + *((*s)++) - '0';
+ 	return i;
+ }
+ 
+ /**
+  *
+  * vsscanf - Unformat a buffer into a list of arguments
+  * @buf:	input buffer
+  * @fmt:	format of buffer
+  * @args:	arguments
+  */
+ int vsscanf(const char * buf, const char * fmt, va_list args)
+ {
+ 	const char *str = buf;
+ 	char *next;
+ 	int num = 0;
+ 	int qualifier;
+ 	int base;
+ 	int field_width = -1;
+ 	int is_sign = 0;
+ 
+ 	while(*fmt && *str) {
+ 		/* skip any white space in format */
+ 		/* white space in format matchs any amount of
+ 		 * white space, including none, in the input.
+ 		 */
+ 		if (isspace(*fmt)) {
+ 			while (isspace(*fmt))
+ 				++fmt;
+ 			while (isspace(*str))
+ 				++str;
+ 		}
+ 
+ 		/* anything that is not a conversion must match exactly */
+ 		if (*fmt != '%' && *fmt) {
+ 			if (*fmt++ != *str++)
+ 				break;
+ 			continue;
+ 		}
+ 
+ 		if (!*fmt)
+ 			break;
+ 		++fmt;
+ 
+ 		/* skip this conversion.
+ 		 * advance both strings to next white space
+ 		 */
+ 		if (*fmt == '*') {
+ 			while (!isspace(*fmt) && *fmt)
+ 				fmt++;
+ 			while (!isspace(*str) && *str)
+ 				str++;
+ 			continue;
+ 		}
+ 
+ 		/* get field width */
+ 		if (isdigit(*fmt))
+ 			field_width = skip_atoi(&fmt);
+ 
+ 		/* get conversion qualifier */
+ 		qualifier = -1;
+ 		if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'Z') {
+ 			qualifier = *fmt;
+ 			fmt++;
+ 		}
+ 		base = 10;
+ 		is_sign = 0;
+ 
+ 		if (!*fmt || !*str)
+ 			break;
+ 
+ 		switch(*fmt++) {
+ 		case 'c':
+ 		{
+ 			char *s = (char *) va_arg(args,char*);
+ 			if (field_width == -1)
+ 				field_width = 1;
+ 			do {
+ 				*s++ = *str++;
+ 			} while(field_width-- > 0 && *str);
+ 			num++;
+ 		}
+ 		continue;
+ 		case 's':
+ 		{
+ 			char *s = (char *) va_arg(args, char *);
+ 			if(field_width == -1)
+ 				field_width = INT_MAX;
+ 			/* first, skip leading white space in buffer */
+ 			while (isspace(*str))
+ 				str++;
+ 
+ 			/* now copy until next white space */
+ 			while (*str && !isspace(*str) && field_width--) {
+ 				*s++ = *str++;
+ 			}
+ 			*s = '\0';
+ 			num++;
+ 		}
+ 		continue;
+ 		case 'n':
+ 			/* return number of characters read so far */
+ 		{
+ 			int *i = (int *)va_arg(args,int*);
+ 			*i = str - buf;
+ 		}
+ 		continue;
+ 		case 'o':
+ 			base = 8;
+ 			break;
+ 		case 'x':
+ 		case 'X':
+ 			base = 16;
+ 			break;
+ 		case 'd':
+ 		case 'i':
+ 			is_sign = 1;
+ 		case 'u':
+ 			break;
+ 		case '%':
+ 			/* looking for '%' in str */
+ 			if (*str++ != '%')
+ 				return num;
+ 			continue;
+ 		default:
+ 			/* invalid format; stop here */
+ 			return num;
+ 		}
+ 
+ 		/* have some sort of integer conversion.
+ 		 * first, skip white space in buffer.
+ 		 */
+ 		while (isspace(*str))
+ 			str++;
+ 
+ 		if (!*str || !isdigit(*str))
+ 			break;
+ 
+ 		switch(qualifier) {
+ 		case 'h':
+ 			if (is_sign) {
+ 				short *s = (short *) va_arg(args,short *);
+ 				*s = (short) simple_strtol(str,&next,base);
+ 			} else {
+ 				unsigned short *s = (unsigned short *) va_arg(args, unsigned short *);
+ 				*s = (unsigned short) simple_strtoul(str, &next, base);
+ 			}
+ 			break;
+ 		case 'l':
+ 			if (is_sign) {
+ 				long *l = (long *) va_arg(args,long *);
+ 				*l = simple_strtol(str,&next,base);
+ 			} else {
+ 				unsigned long *l = (unsigned long*) va_arg(args,unsigned long*);
+ 				*l = simple_strtoul(str,&next,base);
+ 			}
+ 			break;
+ 		case 'L':
+ 			if (is_sign) {
+ 				long long *l = (long long*) va_arg(args,long long *);
+ 				*l = simple_strtoll(str,&next,base);
+ 			} else {
+ 				unsigned long long *l = (unsigned long long*) va_arg(args,unsigned long long*);
+ 				*l = simple_strtoull(str,&next,base);
+ 			}
+ 			break;
+ 		case 'Z':
+ 		{
+ 			size_t *s = (size_t*) va_arg(args,size_t*);
+ 			*s = (size_t) simple_strtoul(str,&next,base);
+ 		}
+ 		break;
+ 		default:
+ 			if (is_sign) {
+ 				int *i = (int *) va_arg(args, int*);
+ 				*i = (int) simple_strtol(str,&next,base);
+ 			} else {
+ 				unsigned int *i = (unsigned int*) va_arg(args, unsigned int*);
+ 				*i = (unsigned int) simple_strtoul(str,&next,base);
+ 			}
+ 			break;
+ 		}
+ 		num++;
+ 
+ 		if (!next)
+ 			break;
+ 		str = next;
+ 	}
+ 	return num;
+ }
+ 
+ /**
+  * sscanf - Unformat a buffer into a list of arguments
+  * @buf:	input buffer
+  * @fmt:	formatting of buffer
+  * @...:	resulting arguments
+  */
+ int sscanf(const char * buf, const char * fmt, ...)
+ {
+ 	va_list args;
+ 	int i;
+ 
+ 	va_start(args,fmt);
+ 	i = vsscanf(buf,fmt,args);
+ 	va_end(args);
+ 	return i;
+ }
+ 
+ /* end of 'sscanf' kernel compatibility hack */
  
  EXPORT_SYMBOL(njbfs_open);