linux mods

3 files changed, 8 insertions, 89 deletions

diff --git a/lib/libsectok/ifdhandler.c b/lib/libsectok/ifdhandler.c
index 3f0680f411a..ca6c47dce26 100644
--- a/lib/libsectok/ifdhandler.c
+++ b/lib/libsectok/ifdhandler.c
@@ -1,4 +1,4 @@
-/* $Id: ifdhandler.c,v 1.5 2001/07/02 20:07:08 rees Exp $ */
+/* $Id: ifdhandler.c,v 1.6 2001/07/30 15:51:16 rees Exp $ */
 
 /*
 copyright 2000
@@ -41,7 +41,7 @@ such damages.
 #include <string.h>
 #include <string.h>
 
-#include "sc7816.h"
+#include "sectok.h"
 #include "todos_scrw.h"
 #include "ifdhandler.h"
 
diff --git a/lib/libsectok/readers.c b/lib/libsectok/readers.c
deleted file mode 100644
index 7eabedaf855..00000000000
--- a/lib/libsectok/readers.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* $Id: readers.c,v 1.3 2001/06/12 19:35:25 rees Exp $ */
-
-/*
-copyright 2001
-the regents of the university of michigan
-all rights reserved
-
-permission is granted to use, copy, create derivative works 
-and redistribute this software and such derivative works 
-for any purpose, so long as the name of the university of 
-michigan is not used in any advertising or publicity 
-pertaining to the use or distribution of this software 
-without specific, written prior authorization.  if the 
-above copyright notice or any other identification of the 
-university of michigan is included in any copy of any 
-portion of this software, then the disclaimer below must 
-also be included.
-
-this software is provided as is, without representation 
-from the university of michigan as to its fitness for any 
-purpose, and without warranty by the university of 
-michigan of any kind, either express or implied, including 
-without limitation the implied warranties of 
-merchantability and fitness for a particular purpose. the 
-regents of the university of michigan shall not be liable 
-for any damages, including special, indirect, incidental, or 
-consequential damages, with respect to any claim arising 
-out of or in connection with the use of the software, even 
-if it has been or is hereafter advised of the possibility of 
-such damages.
-*/
-
-/*
- * parse the reader.conf file
- *
- * Jim Rees
- * University of Michigan CITI, August 2000
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-int
-DBUpdateReaders(char *readerconf, int (callback) (int rn, unsigned long channelId, char *driverFile))
-{
-	FILE *f;
-	char buf[512], lv[64], rv[512], libpath[512];
-	long channelno;
-	int nr = 0;
-
-	f = fopen(readerconf, "r");
-	if (!f)
-		return -1;
-
-	libpath[0] = '\0';
-	channelno = -1;
-
-	while (fgets(buf, sizeof buf, f)) {
-		if (sscanf(buf, "%63s %511s", lv, rv) != 2)
-			continue;
-		if (rv[0] == '"') {
-			/* if rv starts with quote, read everything up to terminating quote */
-			sscanf(buf, "%*s \"%511[^\"]", rv);
-		}
-#ifdef DEBUG
-		printf("%s %s\n", lv, rv);
-#endif
-		if (!strcasecmp(lv, "libpath"))
-			strncpy(libpath, rv, sizeof libpath);
-		if (!strcasecmp(lv, "channelid"))
-			channelno = strtol(rv, NULL, 0);
-		if (libpath[0] && channelno != -1) {
-#ifdef DEBUG
-			printf("adding rn %d Id 0x%x path %s\n", nr, channelno, libpath);
-#endif
-			(*callback)(nr++, channelno, libpath);
-			libpath[0] = '\0';
-			channelno = -1;
-		}
-	}
-
-	fclose(f);
-	return 0;
-}
diff --git a/lib/libsectok/scio.c b/lib/libsectok/scio.c
index d681568c3c9..8e71551e868 100644
--- a/lib/libsectok/scio.c
+++ b/lib/libsectok/scio.c
@@ -1,4 +1,4 @@
-/* $Id: scio.c,v 1.8 2001/07/20 15:51:45 rees Exp $ */
+/* $Id: scio.c,v 1.9 2001/07/30 15:51:16 rees Exp $ */
 
 /*
 copyright 1997
@@ -56,6 +56,10 @@ such damages.
 #include "sc7816.h"
 #include "todos_scrw.h"
 
+#ifndef howmany
+#define howmany(x, y) (((x) + ((y) - 1)) / (y))
+#endif
+
 static int todos_scfdopen(int ttyn, int fd, int flags, int *ep);
 static int todos_sccts(int ttyn);
 
@@ -382,7 +386,7 @@ scgetc(int ttyn, unsigned char *cp, int ms)
 #ifdef BYTECOUNT
     num_getc++;
 #endif /* BYTECOUNT */
-    
+
     fdset = (fd_set *)calloc(howmany(fd + 1, NFDBITS), sizeof(fd_mask));
     if (fdset == NULL)
 	return SCENOMEM;