File plp_1_7.dif of Package psion_lp

--- Makefile
+++ Makefile	2003/01/30 00:37:12
@@ -50,8 +50,9 @@
 	cd utils; $(MAKE)
 
 install:
-	cp bin/rfsv /usr/local/bin/rfsv
-	cp bin/ncp /usr/local/bin/ncp
+	cp bin/rfsv /usr/bin/rfsv
+	ln -sf /usr/bin/rfsv /usr/bin/psion
+	cp bin/ncp /usr/bin/ncp
 
 clean:
 	cd utils; $(MAKE) clean
--- defaults.h
+++ defaults.h	2003/01/30 00:37:12
@@ -19,7 +19,7 @@
 
 // This is the default device driver for the serial link
 // N.B. This was "/dev/cua1" in the previous release
-#define DEFAULT_SERIAL_DEVICE "/dev/ttyS1"
+#define DEFAULT_SERIAL_DEVICE "/dev/modem"
 
 // This is the default drive to use on the psion
 #define DEFAULT_DRIVE "C:\\"
--- ncp/mp_serial.c
+++ ncp/mp_serial.c	2003/01/30 00:37:12
@@ -37,7 +37,7 @@
 #ifdef sun
 # include <sys/ttold.h>	/* sun has TIOCEXCL there */
 #endif
-#if defined (__SVR4)
+#if defined (__SVR4) || defined (__linux__)
 #include <stdlib.h>
 #endif
 
@@ -72,7 +72,7 @@
 #ifdef hpux
   struct termiox tx;
 #endif
-  static struct baud { int speed, baud; } btable[] =
+  static struct baud_ { int speed, baud; } btable[] =
     {
       { 9600,	B9600},
 
--- rfsv/rfsv16.cc
+++ rfsv/rfsv16.cc	2003/01/30 00:37:12
@@ -251,7 +251,7 @@
   }
   unsigned char * buff = new unsigned char [RFSV_SENDLEN];
   while (ip &&!ip.eof()) {
-    ip.read(buff, RFSV_SENDLEN);
+    ip.read((char *)buff, RFSV_SENDLEN);
     bufferStore tmp(buff, ip.gcount());
     if (tmp.getLen() == 0) break;
     bufferStore a;
--- rfsv/rfsv32.cc
+++ rfsv/rfsv32.cc	2003/01/30 00:37:12
@@ -467,7 +467,7 @@
   }
   unsigned char * buff = new unsigned char [RFSV_SENDLEN];
   while (ip &&!ip.eof()) {
-    ip.read(buff, RFSV_SENDLEN);
+    ip.read((char *)buff, RFSV_SENDLEN);
     bufferStore tmp(buff, ip.gcount());
     if (tmp.getLen() == 0) break;
     bufferStore a;
--- rfsv/rfsv32.h
+++ rfsv/rfsv32.h	2003/01/30 00:37:12
@@ -3,6 +3,10 @@
 
 #include "rfsv.h"
 
+/* Defined in <math.h> */
+#undef OVERFLOW
+#undef UNDERFLOW
+
 class rfsv32 : public rfsv {
 public:
   rfsv32(ppsocket *skt);
--- utils/ppsocket.cc
+++ utils/ppsocket.cc	2003/01/30 00:37:12
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <iostream.h>
+#include <iomanip.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/time.h>
@@ -198,7 +199,7 @@
 
 ppsocket* ppsocket::accept(char* Peer, int MaxLen)
 { 
-  int len;
+  socklen_t len;
   ppsocket* accepted;
   char* peer;
 
@@ -421,7 +422,7 @@
 { 
   int i;
 
-  cout << hex << (int)c << endl;
+  cout << setbase(16) << (int)c << endl;
   
   i = writeTimeout(&c, 1, 0);