1 files changed, 63 insertions, 14 deletions
diff --git a/mbone/speak_freely/files/patch-ac b/mbone/speak_freely/files/patch-ac
index 94ed40050744..999b8335bb16 100644
--- a/mbone/speak_freely/files/patch-ac
+++ b/mbone/speak_freely/files/patch-ac
@@ -1,20 +1,69 @@
---- mike.c.orig	Wed Mar  5 14:08:20 1997
-+++ mike.c	Tue Dec 15 22:21:32 1998
-@@ -8,6 +8,7 @@
- */
+--- mike.c.orig	Tue Sep 14 08:27:51 1999
++++ mike.c	Fri Dec 31 15:29:10 1999
+@@ -132,8 +132,8 @@
+ #endif /* UNIX420 */
  
- #include "speakfree.h"
-+#define	sendfile sf_sendfile
+ #ifdef UNIX5
+-#include <termio.h>
+-static struct termio old_term_params;
++#include <termios.h>
++static struct termios old_term_params;
+ #endif /* UNIX5 */
  
- /*  Destination host descriptor.  */
+ /* Set raw mode on terminal file.  Basically, get the terminal into a
+@@ -152,16 +152,16 @@
+ #endif /* UNIX420 */
  
-@@ -687,6 +688,9 @@
- 		    (sb->buffer.buffer_len > 16)) {
- 		    pktlen += sizeof(sb->sendinghost);
+ #ifdef UNIX5
+-   struct termio term_params;
++   struct termios term_params;
+ 
+-   ioctl(fileno(stdin), TCGETA, &old_term_params);
++   tcgetattr(fileno(stdin), &old_term_params);
+    term_params = old_term_params;
+    term_params.c_iflag &= ~(ICRNL|IXON|IXOFF);	/* no cr translation */
+    term_params.c_iflag &= ~(ISTRIP);   /* no stripping of high order bit */
+    term_params.c_oflag &= ~(OPOST);    /* no output processing */	
+    term_params.c_lflag &= ~(ISIG|ICANON|ECHO); /* raw mode */
+    term_params.c_cc[4] = 1;  /* satisfy read after 1 char */
+-   ioctl(fileno(stdin), TCSETAF, &term_params);
++   tcsetattr(fileno(stdin), TCSAFLUSH, &term_params);
+ #endif /* UNIX5 */
+ /*printf("\n(raw)\n");*/
+ }
+@@ -180,7 +180,7 @@
+ #endif /* UNIX420 */
+ 
+ #ifdef UNIX5
+-   ioctl(fileno(stdin), TCSETAF, &old_term_params);
++   tcsetattr(fileno(stdin), TCSAFLUSH, &old_term_params);
+ #endif /* UNIX5 */
+ /*printf("\n(cooked)\n");*/
+ }
+@@ -1144,7 +1144,7 @@
+ /*  SENDFILE  --  Send a file or, if the file name is NULL or a
+ 		  single period, send real-time sound input. */
+ 
+-static int sendfile(f)
++static int sfsendfile(f)
+   char *f;
+ { 
+     soundbuf netbuf;
+@@ -2306,7 +2306,7 @@
+ 		    return 1;
  		}
-+		/* must stay in network order for debugging output */
-+		sb->compression = htonl(sb->compression);
-+		sb->buffer.buffer_len = htonl(sb->buffer.buffer_len);
- 	    }
+ 	    } else {
+-		int ok = sendfile(op);
++		int ok = sfsendfile(op);
+ 		if (ok != 0)
+ 		    return ok;
+ 		sentfile++;
+@@ -2318,7 +2318,7 @@
+ 	usage();
+     } else {
+ 	if (sentfile == 0) {
+-	    return sendfile(NULL);
++	    return sfsendfile(NULL);
  	}
      }
+