[LV-kern-commit] CVS: kernel-2.4/arch/sparc/boot Makefile,1.1.1.1,1.2 btfixupprep.c,1.1.1.1,1.2 piggyback.c,1.1.1.1,1.2

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/arch/sparc/boot
In directory usw-pr-cvs1:/tmp/cvs-serv31330/sparc/boot

Modified Files:
	Makefile btfixupprep.c piggyback.c 
Log Message:
synch 2.4.15 commit 45


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/boot/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: btfixupprep.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/boot/btfixupprep.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- btfixupprep.c	14 Jan 2001 19:24:37 -0000	1.1.1.1
+++ btfixupprep.c	10 Apr 2002 15:17:41 -0000	1.2
@@ -88,6 +88,16 @@
 	return array + last - 1;
 }
 
+void set_mode (char *buffer)
+{
+  	for (mode = 0;; mode++)
+		if (buffer[mode] < '0' || buffer[mode] > '9')
+			break;
+	if (mode != 8 && mode != 16)
+		fatal();
+}
+
+
 int main(int argc,char **argv)
 {
 	char *p, *q;
@@ -106,14 +116,6 @@
 			goto main0;
 	fatal();
 main0:
-	if (fgets (buffer, 1024, stdin) == NULL || buffer[0] < '0' || buffer[0] > '9')
-		fatal();
-	for (mode = 0;; mode++)
-		if (buffer[mode] < '0' || buffer[mode] > '9')
-			break;
-	if (mode != 8 && mode != 16)
-		fatal();
-	
 	rellen = strlen(relrec);
 	while (fgets (buffer, 1024, stdin) != NULL)
 		if (!strncmp (buffer, relrec, rellen))
@@ -132,6 +134,8 @@
 		int nbase;
 		if (!strncmp (buffer, relrec, rellen))
 			goto main1;
+		if (mode == 0)
+			set_mode (buffer);
 		p = strchr (buffer, '\n');
 		if (p) *p = 0;
 		if (strlen (buffer) < 22+mode)

Index: piggyback.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/boot/piggyback.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2