[BusyBox-cvs] busybox/shell msh.c,1.10,1.11

Erik Andersen andersen at codepoet.org
Wed Dec 11 07:42:49 UTC 2002


Update of /var/cvs/busybox/shell
In directory winder:/tmp/cvs-serv12611/shell

Modified Files:
	msh.c 
Log Message:
Fixup all the horrible broken function prototypes
 -Erik


Index: msh.c
===================================================================
RCS file: /var/cvs/busybox/shell/msh.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- msh.c	26 Apr 2002 23:39:48 -0000	1.10
+++ msh.c	11 Dec 2002 07:42:46 -0000	1.11
@@ -52,6 +52,7 @@
 #define	LINELIM	2100
 #define	NPUSH	8	/* limit to input nesting */
 
+#undef NOFILE
 #define	NOFILE	20	/* Number of open files */
 #define	NUFILE	10	/* Number of user-accessible files */
 #define	FDBASE	10	/* First file usable by Shell */
@@ -213,7 +214,8 @@
 /*
  * other functions
  */
[...219 lines suppressed...]
 	if (argp->afid != AFID_NOBUF)
 	  e.iop->argp = argp;
@@ -4315,7 +4307,7 @@
 	e.iop->nlcount = 0;
 	if (fn == filechar || fn == linechar)
 		e.iop->task = XIO;
-	else if (fn == gravechar || fn == qgravechar)
+	else if (fn == (int(*)(struct ioarg *))gravechar || fn == (int(*)(struct ioarg *))qgravechar)
 		e.iop->task = XGRAVE;
 	else
 		e.iop->task = XOTHER;
@@ -4719,7 +4711,7 @@
 	if (newenv(setjmp(errpt = ev)) != 0)
 		unlink(tname);
 	else {
-		pushio(e.iop->argp, e.iop->iofn);
+		pushio(e.iop->argp, (int(*)(struct ioarg *))e.iop->iofn);
 		e.iobase = e.iop;
 		for (;;) {
 		    if (interactive && e.iop <= iostack) {




More information about the busybox-cvs mailing list