*** ./conversd.c	Fri Jun 16 10:48:14 1995
--- ../convers/conversd.c	Fri Jun 16 20:29:52 1995
***************
*** 2680,2686 ****
  #if defined(__OS2__)
            psock_errno("recv:");
  #endif
! 	  logit ("link failure with %s", cp->name);
  	  bye_command2(cp, "link failure");
  	} else {
  	  cp->received += size;
--- 2680,2686 ----
  #if defined(__OS2__)
            psock_errno("recv:");
  #endif
! 	  logit (LEV_LINKS, "link failure with %s", cp->name);
  	  bye_command2(cp, "link failure");
  	} else {
  	  cp->received += size;
***************
*** 2725,2731 ****
  #if defined(__OS2__)
            psock_errno("send:");
  #endif
! 	  logit ("link failure with %s", cp->name);
  	  bye_command2(cp, "link failure");
  	} else {
  	  cp->xmitted += size;
--- 2725,2731 ----
  #if defined(__OS2__)
            psock_errno("send:");
  #endif
! 	  logit (LEV_LINKS, "link failure with %s", cp->name);
  	  bye_command2(cp, "link failure");
  	} else {
  	  cp->xmitted += size;
diff -cr ./glob/tilde.c ../convers/glob/tilde.c
*** ./glob/tilde.c	Sat Aug 28 18:53:39 1993
--- ../convers/glob/tilde.c	Fri Jun 16 20:24:43 1995
***************
*** 30,35 ****
--- 30,36 ----
  #include <pwd.h>
  
  #ifndef savestring
+ char *xmalloc (int bytes);
  #define savestring(x) (char *)strcpy (xmalloc (1 + strlen (x)), (x))
  #endif
  
diff -cr ./readline/Makefile ../convers/readline/Makefile
*** ./readline/Makefile	Sat Jun  3 00:18:00 1995
--- ../convers/readline/Makefile	Fri Jun 16 20:15:00 1995
***************
*** 107,113 ****
  keymaps.o:	keymaps.c emacs_keymap.c vi_keymap.c keymaps.h chardefs.h
  
  documentation: force
! 	(cd doc; make)
  force:
  
  readline.tar:	$(THINGS_TO_TAR)
--- 107,114 ----
  keymaps.o:	keymaps.c emacs_keymap.c vi_keymap.c keymaps.h chardefs.h
  
  documentation: force
! #	(cd doc; make)
! 
  force:
  
  readline.tar:	$(THINGS_TO_TAR)
***************
*** 130,136 ****
  	$(CP) readline.h keymaps.h chardefs.h $(INCDIR)/readline/
  clean:
  	rm -f $(OBJECTS) *.a
! 	(cd doc; make clean)
  
  $(DESTDIR)/libreadline.a: libreadline.a
  	-mv $(DESTDIR)/libreadline.a $(DESTDIR)/libreadline.old
--- 131,137 ----
  	$(CP) readline.h keymaps.h chardefs.h $(INCDIR)/readline/
  clean:
  	rm -f $(OBJECTS) *.a
! #	(cd doc; make clean)
  
  $(DESTDIR)/libreadline.a: libreadline.a
  	-mv $(DESTDIR)/libreadline.a $(DESTDIR)/libreadline.old
diff -cr ./readline/readline.c ../convers/readline/readline.c
*** ./readline/readline.c	Mon Nov  8 09:46:11 1993
--- ../convers/readline/readline.c	Fri Jun 16 20:20:15 1995
***************
*** 600,621 ****
  
  rl_set_signals ()
  {
!   old_int = (SigHandler *)signal (SIGINT, rl_signal_handler);
    if (old_int == (SigHandler *)SIG_IGN)
      signal (SIGINT, SIG_IGN);
  
!   old_alrm = (SigHandler *)signal (SIGALRM, rl_signal_handler);
    if (old_alrm == (SigHandler *)SIG_IGN)
      signal (SIGALRM, SIG_IGN);
  
  #if defined (SIGTSTP)
!   old_tstp = (SigHandler *)signal (SIGTSTP, rl_signal_handler);
    if (old_tstp == (SigHandler *)SIG_IGN)
      signal (SIGTSTP, SIG_IGN);
  #endif
  #if defined (SIGTTOU)
!   old_ttou = (SigHandler *)signal (SIGTTOU, rl_signal_handler);
!   old_ttin = (SigHandler *)signal (SIGTTIN, rl_signal_handler);
  
    if (old_tstp == (SigHandler *)SIG_IGN)
      {
--- 600,621 ----
  
  rl_set_signals ()
  {
!   old_int = (SigHandler *)signal (SIGINT, (void (*)(int))rl_signal_handler);
    if (old_int == (SigHandler *)SIG_IGN)
      signal (SIGINT, SIG_IGN);
  
!   old_alrm = (SigHandler *)signal (SIGALRM, (void (*)(int))rl_signal_handler);
    if (old_alrm == (SigHandler *)SIG_IGN)
      signal (SIGALRM, SIG_IGN);
  
  #if defined (SIGTSTP)
!   old_tstp = (SigHandler *)signal (SIGTSTP, (void (*)(int))rl_signal_handler);
    if (old_tstp == (SigHandler *)SIG_IGN)
      signal (SIGTSTP, SIG_IGN);
  #endif
  #if defined (SIGTTOU)
!   old_ttou = (SigHandler *)signal (SIGTTOU, (void (*)(int))rl_signal_handler);
!   old_ttin = (SigHandler *)signal (SIGTTIN, (void (*)(int))rl_signal_handler);
  
    if (old_tstp == (SigHandler *)SIG_IGN)
      {
***************
*** 625,650 ****
  #endif
  
  #if defined (SIGWINCH)
!   old_sigwinch = (SigHandler *)signal (SIGWINCH, rl_handle_sigwinch);
  #endif
  }
  
  rl_clear_signals ()
  {
!   signal (SIGINT, old_int);
!   signal (SIGALRM, old_alrm);
  
  #if defined (SIGTSTP)
!   signal (SIGTSTP, old_tstp);
  #endif
  
  #if defined (SIGTTOU)
!   signal (SIGTTOU, old_ttou);
!   signal (SIGTTIN, old_ttin);
  #endif
  
  #if defined (SIGWINCH)
!       signal (SIGWINCH, old_sigwinch);
  #endif
  }
  #endif  /* HANDLE_SIGNALS */
--- 625,650 ----
  #endif
  
  #if defined (SIGWINCH)
!   old_sigwinch = (SigHandler *)signal (SIGWINCH, (void (*)(int))rl_handle_sigwinch);
  #endif
  }
  
  rl_clear_signals ()
  {
!   signal (SIGINT, (void (*)(int))old_int);
!   signal (SIGALRM, (void (*)(int))old_alrm);
  
  #if defined (SIGTSTP)
!   signal (SIGTSTP, (void (*)(int))old_tstp);
  #endif
  
  #if defined (SIGTTOU)
!   signal (SIGTTOU, (void (*)(int))old_ttou);
!   signal (SIGTTIN, (void (*)(int))old_ttin);
  #endif
  
  #if defined (SIGWINCH)
!       signal (SIGWINCH, (void (*)(int))old_sigwinch);
  #endif
  }
  #endif  /* HANDLE_SIGNALS */