patches

linux终端仿真程序

!   sent.s_port is supposed to be returned by UCX in network byte order.
!   However, UCX 2.0 through 2.0C did not do this; 2.0D and later do it.
!   But there is no way of knowing which UCX version, so we have a user-settable
!   runtime variable.  Note: UCX 2.0 was only for the VAX.
  */
!     debug(F101,"UCX getservbyname port","",sent.s_port);
!     debug(F101,"UCX getservbyname ntohs(port)","",ntohs(sent.s_port));
!     if (ucx_port_bug) {
  	sent.s_port = htons(sent.s_port);
! 	debug(F100,"UCX-PORT-BUG ON: swapping bytes","",0);
! 	debug(F101,"UCX swapped port","",sent.s_port);
! 	debug(F101,"UCX swapped ntohs(port)","",ntohs(sent.s_port));
!     }
      return &sent;
  }
  #endif /* __DECC */
*** /w/pub/ftp/kermit/f/ckuus3.c	Sun Nov 24 19:20:50 1996
--- ./ckuus3.c	Wed Dec  4 16:58:49 1996
***************
*** 3031,3036 ****
--- 3031,3046 ----
        success = recvbuf(z);
        return(success);
  #endif /* SO_RCVBUF */
+ 
+ #ifdef VMS
+ #ifdef DEC_TCPIP
+     case XYTCP_UCX: {			/* UCX 2.0 port swabbing bug */
+ 	extern int ucx_port_bug;
+ 	return(success = seton(&ucx_port_bug));
+     }
+ #endif /* DEC_TCPIP */
+ #endif /* VMS */
+ 
     default:
        return(0);
     }
*** /w/pub/ftp/kermit/f/ckuusr.c	Sun Nov 24 19:20:51 1996
--- ./ckuusr.c	Wed Dec  4 17:12:50 1996
***************
*** 1098,1103 ****
--- 1098,1108 ----
  #ifdef SO_SNDBUF
     "sendbuf", XYTCP_SENDBUF, 0,
  #endif /* SO_SNDBUF */
+ #ifdef VMS
+ #ifdef DEC_TCPIP
+    "ucx-port-bug", XYTCP_UCX, 0,
+ #endif /* DEC_TCPIP */
+ #endif /* VMS */
     "",0,0
  };
  int ntcpopt = (sizeof(tcpopt) / sizeof(struct keytab));
*** /w/pub/ftp/kermit/f/ckuusr.h	Sun Nov 24 19:20:52 1996
--- ./ckuusr.h	Wed Dec  4 16:59:18 1996
***************
*** 803,808 ****
--- 803,809 ----
  #define  XYTCP_LINGER    3  /* Linger */
  #define  XYTCP_RECVBUF   4  /* Receive Buffer Size */
  #define  XYTCP_KEEPALIVE 5  /* Keep Alive packets */
+ #define  XYTCP_UCX       6  /* UCX 2.0 port swabbing bug */
  
  #define XYMSK  83       /* MS-DOS Kermit compatibility options */
  #define  MSK_COLOR 0    /*  Terminal color handling   */
____________________
X-Patch-Number: 0005
Date: Mon, 9 Dec 1996 17:00:56 EST
From: Frank da Cruz <[e-mail]>
Subject: C-Kermit Might Send Packets Outside Window

PROBLEM:

When sending a file with a window size greater than 1 under conditions of
packet loss, C-Kermit might send packets outside the current window.  This
should not cause file corruption, and in many cases (depending on the Kermit
implementation on the receiving end), it won't even cause a noticable problem,
but in other cases it might cause the transfer to stop unnecessarily.

CURE:

In the ckcfn2.c module, replace the nxtpkt() function with this new one:

/*  N X T P K T  --  Next Packet  */
/*
  Get packet number of next packet to send and allocate a buffer for it.
  Returns:
    0 on success, with global pktnum set to the packet number;
   -1 on failure to allocate buffer (fatal);
   -2 if resulting packet number is outside the current window. 
*/
int
nxtpkt() {				/* Called by file sender */
    int j, n, x;

    debug(F101,"nxtpkt pktnum","",pktnum);
    debug(F101,"nxtpkt winlo ","",winlo);
    n = (pktnum + 1) % 64;		/* Increment packet number mod 64 */
    debug(F101,"nxtpkt n","",n);
    x = chkwin(n,winlo,wslots);		/* Don't exceed window boundary */
    debug(F101,"nxtpkt chkwin","",x);
    if (x)
      return(-2);

    j = getsbuf(n);			/* Get a buffer for packet n */
    if (j < 0) {
	debug(F101,"nxtpkt getsbuf failure","",j);
	return(-1);
    }
    pktnum = n;	      
    return(0);
}

____________________
X-Patch-Number: 0006
Date: Wed, 11 Dec 1996 12:26:00 EST
From: Frank da Cruz <[e-mail]>
Subject: MOVE from SEND-LIST does not delete original files

If you build up a list of files to be sent using ADD SEND-LIST and then
give a SEND command with no operands, it sends the files in the send list.
If you give a MOVE command with no operands, it does the same thing.  But
unlike SEND, MOVE should delete each original after sending it successfully;
in C-Kermit 6.0.192, it does not.

Here's the patch:

*** /w/pub/ftp/kermit/f/ckuusr.c	Sun Nov 24 19:20:51 1996
--- ckuusr.c	Wed Dec 11 12:39:01 1996
***************
*** 2863,2868 ****
--- 2863,2870 ----
  		    sndsrc = nfils;	/* Like MSEND */
  		    addlist = 1;	/* But using a different list... */
  		    filenext = filehead;
+ 		    if (cx == XXMOVE)
+ 		      moving = 1;
  		    sstate = 's';
  		    goto sendend;
  		} else {		/* Oops, no list. */

____________________
X-Patch-Number: 0007
Date: Thu, 12 Dec 1996 21:11:47 -0500
From: "Richard L. Hamilton" <[e-mail]>
Subject: Higher serial speeds on Solaris 2.5

Here's how I hacked up C-Kermit 6.0 for more of the speeds that
Solaris >= 2.5 supports.

This was with the following make command, to get rid of references
to unsupported speeds as well as to help get some of the additional
speeds.  POSIX is a must, 'cause setting speeds > 38400 without
the cfsetospeed() and similar functions is a pain.  The #ifndef VANILLA
was just so I could turn off all my hacks real easily, and it and the
corresponding #endif should probably be removed.

make solaris2xg KFLAGS="-DCK_DSYSINI -DCK_INI_B -DCK_WREFRESH -DPOSIX
-DNOB_3600 -DNOB_7200 -DBPS_134 -DBPS_1800 -DBPS_57K -DBPS_76K
-DBPS_115K -DBPS_230K"

diff ckutio.c.orig ckutio.c
4605c4605,4616
< 
---
> #ifndef VANILLA
> #ifdef SOLARIS
> #ifdef POSIX
> #ifdef BPS_76K
>       case 7680: s = B76800; break;
> #endif /* BPS_76K */
> #ifdef BPS_230K
>       case 23040: s = B230400; break;
> #endif /* BPS_230K */
> #endif /* POSIX */
> #endif /* SOLARIS */
> #endif /* VANILLA */
4951a4963,4974
> #ifndef VANILLA
> #ifdef SOLARIS
> #ifdef POSIX
> #ifdef BPS_76K
>       case B76800: ss = 76800L; break;
> #endif /* BPS_76K */
> #ifdef BPS_230K
>       case B230400: ss = 230400L; break;
> #endif /* BPS_230K */
> #endif /* POSIX */
> #endif /* SOLARIS */
> #endif /* VANILLA */
diff ckuus3.c.orig ckuus3.c
328a329,331
> #ifdef BPS_1800
>   "1800", 180, 0,
> #endif /* BPS_1800 */

____________________
X-Patch-Number: 0008
Date: Wed, 18 Dec 1996 11:42:00 EST
From: Frank da Cruz <[e-mail]>
Subject: C-Kermit application file name can't contain spaces

When the first command-line argument to C-Kermit is a filename, C-Kermit 
should execute the commands from the file, e.g.

  kermit filename

But if the filename contains spaces, this doesn't work in version 6.0, even
if the filename is properly quoted to the shell:

  kermit "this is a file name"

Here is the patch:

*** /w/pub/ftp/kermit/f/ckuus4.c	Sun Nov 24 19:20:50 1996
--- ckuus4.c	Wed Dec 18 11:40:46 1996
***************
*** 636,642 ****
  */
  	    cmdini();			/* Allocate command buffers etc */
  	    cmini(0);			/* Initialize them */
! 	    strcpy(cmdbuf,yargv[1]);	/* Stuff filename into command buf */
  	    strcat(cmdbuf,"\r\r");	/* And some carriage returns */
  	    if ((y = cmifip("","",&s,&x,0,takepath,xxstring)) < 0)
  	      doexit(BAD_EXIT,xitsta);
--- 636,642 ----
  */
  	    cmdini();			/* Allocate command buffers etc */
  	    cmini(0);			/* Initialize them */
! 	    sprintf(cmdbuf,"{%s}",yargv[1]); /* Put filename in command buf */
  	    strcat(cmdbuf,"\r\r");	/* And some carriage returns */
  	    if ((y = cmifip("","",&s,&x,0,takepath,xxstring)) < 0)
  	      doexit(BAD_EXIT,xitsta);

__________________________________
(End of C-Kermit 6.0 PATCHES file)