Mercurial > gftp.yaz

comparison lib/rfc959.c @ 895:4ab11f70a7f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-3-15 Brian Masney <masneyb@gftp.org> * lib/sshv2.c lib/gftp.h lib/rfc959.c lib/protocols.c lib/fsp.c lib/local.c lib/rfc2068.c src/uicommon/gftpui.c - removed fd argument to *_get_file(), *_put_file() and gftp_transfer_file().
author masneyb
date Fri, 16 Mar 2007 02:44:07 +0000
parents 331d6ad73a75
children 5b681cba67b2
comparison
equal deleted inserted replaced
894:14476a8a4d2b 895:4ab11f70a7f4
1222 return (0); 1222 return (0);
1223 } 1223 }
1224 1224
1225 1225
1226 static off_t 1226 static off_t
1227 rfc959_get_file (gftp_request * request, const char *filename, int fd, 1227 rfc959_get_file (gftp_request * request, const char *filename,
1228 off_t startsize) 1228 off_t startsize)
1229 { 1229 {
1230 rfc959_parms * parms;
1231 char *tempstr; 1230 char *tempstr;
1232 int ret; 1231 int ret;
1233 1232
1234 g_return_val_if_fail (request != NULL, GFTP_EFATAL); 1233 g_return_val_if_fail (request != NULL, GFTP_EFATAL);
1235 g_return_val_if_fail (filename != NULL, GFTP_EFATAL); 1234 g_return_val_if_fail (filename != NULL, GFTP_EFATAL);
1236 g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL); 1235 g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
1237
1238 parms = request->protocol_data;
1239 if (fd > 0)
1240 parms->data_connection = fd;
1241 1236
1242 ret = rfc959_setup_file_transfer (request, filename, startsize, "RETR"); 1237 ret = rfc959_setup_file_transfer (request, filename, startsize, "RETR");
1243 if (ret < 0) 1238 if (ret < 0)
1244 return (ret); 1239 return (ret);
1245 1240
1255 return (gftp_parse_file_size (tempstr) + startsize); 1250 return (gftp_parse_file_size (tempstr) + startsize);
1256 } 1251 }
1257 1252
1258 1253
1259 static int 1254 static int
1260 rfc959_put_file (gftp_request * request, const char *filename, int fd, 1255 rfc959_put_file (gftp_request * request, const char *filename,
1261 off_t startsize, off_t totalsize) 1256 off_t startsize, off_t totalsize)
1262 { 1257 {
1263 rfc959_parms * parms; 1258 rfc959_parms * parms;
1264 int ret; 1259 int ret;
1265 1260
1266 g_return_val_if_fail (request != NULL, GFTP_EFATAL); 1261 g_return_val_if_fail (request != NULL, GFTP_EFATAL);
1267 g_return_val_if_fail (filename != NULL, GFTP_EFATAL); 1262 g_return_val_if_fail (filename != NULL, GFTP_EFATAL);
1268 g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL); 1263 g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
1269 1264
1265 if ((ret = rfc959_set_data_type (request, filename)) < 0)
1266 return (ret);
1267
1270 parms = request->protocol_data; 1268 parms = request->protocol_data;
1271 if (fd > 0) /* FIXME */
1272 fd = parms->data_connection;
1273
1274 if ((ret = rfc959_set_data_type (request, filename)) < 0)
1275 return (ret);
1276
1277 if (parms->data_connection < 0 && 1269 if (parms->data_connection < 0 &&
1278 (ret = rfc959_data_connection_new (request, 0)) < 0) 1270 (ret = rfc959_data_connection_new (request, 0)) < 0)
1279 return (ret); 1271 return (ret);
1280 1272
1281 return (rfc959_setup_file_transfer (request, filename, startsize, "STOR")); 1273 return (rfc959_setup_file_transfer (request, filename, startsize, "STOR"));