d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct an ancient bogon which involved trying to read() from a

Browse Source 
nuked file descriptor.  This is probably why sysinstall's ftp xfer
occasionally SEGV'd if you left things alone for a long time and
the timeout code got called.  Whoops!
This commit is contained in:
Jordan K. Hubbard 1997-10-01 07:21:41 +00:00
parent 5848fd5f35
commit dcb69d91c2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=30030
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/libftpio/ftpio.c
View File

@ -14,7 +14,7 @@
* Turned inside out. Now returns xfers as new file ids, not as a special
* `state' of FTP_t
*
* $Id: ftpio.c,v 1.25 1997/02/22 15:06:50 peter Exp $
* $Id: ftpio.c,v 1.26 1997/09/18 14:01:15 phk Exp $
*
*/
@ -607,8 +607,9 @@ get_a_number(FTP_t ftp, char **q)
static int
ftp_close(FTP_t ftp)
{
int i;
int i, rcode;
rcode = FAILURE;
if (ftp->con_state == isopen) {
ftp->con_state = quit;
/* If last operation timed out, don't try to quit - just close */
@ -616,17 +617,14 @@ ftp_close(FTP_t ftp)
i = cmd(ftp, "QUIT");
else
i = FTP_QUIT_HAPPY;
if (!check_code(ftp, i, FTP_QUIT_HAPPY))
rcode = SUCCESS;
close(ftp->fd_ctrl);
ftp->fd_ctrl = -1;
if (check_code(ftp, i, FTP_QUIT_HAPPY)) {
ftp->errno = i;
return FAILURE;
}
/* Debug("ftp_pkg: ftp_close() - proper shutdown"); */
return SUCCESS;
}
/* Debug("ftp_pkg: ftp_close() - improper shutdown"); */
return FAILURE;
else if (ftp->con_state == quit)
rcode = SUCCESS;
return rcode;
}
static int