diff options
author | jhb <jhb@FreeBSD.org> | 2008-05-05 19:38:25 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2008-05-05 19:38:25 +0000 |
commit | 08bec89ccb234ee911d0c6ac90665cda82aa1969 (patch) | |
tree | a0c6983a50f3d62ddbfb31683eef84f8c4fbfc89 /lib/libftpio/ftpio.c | |
parent | 4fb93663e6a44fb3530d1bfd400bf14fbd144028 (diff) | |
download | FreeBSD-src-08bec89ccb234ee911d0c6ac90665cda82aa1969.zip FreeBSD-src-08bec89ccb234ee911d0c6ac90665cda82aa1969.tar.gz |
Revert back to accessing FILE internals directly.
(Sorry, forgot to commit this earlier.)
Diffstat (limited to 'lib/libftpio/ftpio.c')
-rw-r--r-- | lib/libftpio/ftpio.c | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/lib/libftpio/ftpio.c b/lib/libftpio/ftpio.c index 547df40..f990d4d 100644 --- a/lib/libftpio/ftpio.c +++ b/lib/libftpio/ftpio.c @@ -87,6 +87,14 @@ int FtpTimedOut; /* FTP unhappy status codes */ #define FTP_TIMED_OUT 421 +/* + * XXX + * gross! evil! bad! We really need an access primitive for cookie in stdio itself. + * it's too convenient a hook to bury and it's already exported through funopen as it is, so... + * XXX + */ +#define fcookie(fp) ((fp)->_cookie) + /* Placeholder in case we want to do any pre-init stuff at some point */ int networkInit() @@ -118,7 +126,7 @@ check_code(FTP_t ftp, int var, int preferred) int ftpAscii(FILE *fp) { - FTP_t ftp = __fgetcookie(fp); + FTP_t ftp = fcookie(fp); int i; if (!ftp->is_binary) @@ -133,7 +141,7 @@ ftpAscii(FILE *fp) int ftpBinary(FILE *fp) { - FTP_t ftp = __fgetcookie(fp); + FTP_t ftp = fcookie(fp); int i; if (ftp->is_binary) @@ -147,7 +155,7 @@ ftpBinary(FILE *fp) void ftpVerbose(FILE *fp, int status) { - FTP_t ftp = __fgetcookie(fp); + FTP_t ftp = fcookie(fp); ftp->is_verbose = status; } @@ -155,7 +163,7 @@ int ftpChdir(FILE *fp, char *dir) { int i; - FTP_t ftp = __fgetcookie(fp); + FTP_t ftp = fcookie(fp); i = cmd(ftp, "CWD %s", dir); if (i < 0 || check_code(ftp, i, FTP_CHDIR_HAPPY)) @@ -166,7 +174,7 @@ ftpChdir(FILE *fp, char *dir) int ftpErrno(FILE *fp) { - FTP_t ftp = __fgetcookie(fp); + FTP_t ftp = fcookie(fp); return ftp->error; } @@ -191,7 +199,7 @@ ftpGetSize(FILE *fp, char *name) { int i; char p[BUFSIZ], *cp, *ep; - FTP_t ftp = __fgetcookie(fp); + FTP_t ftp = fcookie(fp); off_t size; check_passive(fp); @@ -217,7 +225,7 @@ ftpGetModtime(FILE *fp, char *name) char p[BUFSIZ], *cp; struct tm t; time_t t0 = time (0); - FTP_t ftp = __fgetcookie(fp); + FTP_t ftp = fcookie(fp); int i; check_passive(fp); @@ -247,7 +255,7 @@ FILE * ftpGet(FILE *fp, char *file, off_t *seekto) { FILE *fp2; - FTP_t ftp = __fgetcookie(fp); + FTP_t ftp = fcookie(fp); check_passive(fp); if (ftpBinary(fp) != SUCCESS) @@ -284,7 +292,7 @@ ftpLoginAf(char *host, int af, char *user, char *passwd, int port, int verbose, fp = NULL; if (n && ftp_login_session(n, host, af, user, passwd, port, verbose) == SUCCESS) { fp = funopen(n, ftp_read_method, ftp_write_method, NULL, ftp_close_method); /* BSD 4.4 function! */ - __fsetfileno(fp, n->fd_ctrl); + fp->_file = n->fd_ctrl; } if (retcode) { if (!n) @@ -311,7 +319,7 @@ FILE * ftpPut(FILE *fp, char *file) { FILE *fp2; - FTP_t ftp = __fgetcookie(fp); + FTP_t ftp = fcookie(fp); check_passive(fp); if (ftp_file_op(ftp, "STOR", file, &fp2, "w", NULL) == SUCCESS) @@ -322,7 +330,7 @@ ftpPut(FILE *fp, char *file) int ftpPassive(FILE *fp, int st) { - FTP_t ftp = __fgetcookie(fp); + FTP_t ftp = fcookie(fp); ftp->is_passive = !!st; /* normalize "st" to zero or one */ return SUCCESS; |