Mercurial > gftp.yaz
comparison lib/rfc959.c @ 858:10e2ce91e26c
2006-11-30 Brian Masney <masneyb@gftp.org>
* lib/rfc959.c lib/sshv2.c src/uicommon/gftpui.c - don't abort the
entire file transfer if there is a permission denied at some point
during the file transfer. Give the user an error at the very end if
there were any errors. (closes #328550)
| author | masneyb |
|---|---|
| date | Fri, 01 Dec 2006 00:57:50 +0000 |
| parents | 14858879916f |
| children | 1fae947d4418 |
comparison
equal
deleted
inserted
replaced
| 857:5ba7622df358 | 858:10e2ce91e26c |
|---|---|
| 1205 if (ret < 0) | 1205 if (ret < 0) |
| 1206 return (ret); | 1206 return (ret); |
| 1207 else if (ret != '1') | 1207 else if (ret != '1') |
| 1208 { | 1208 { |
| 1209 rfc959_close_data_connection (request); | 1209 rfc959_close_data_connection (request); |
| 1210 return (GFTP_ERETRYABLE); | 1210 |
| 1211 if (ret == '5') | |
| 1212 return (GFTP_EFATAL); | |
| 1213 else | |
| 1214 return (GFTP_ERETRYABLE); | |
| 1211 } | 1215 } |
| 1212 | 1216 |
| 1213 gftp_lookup_request_option (request, "passive_transfer", &passive_transfer); | 1217 gftp_lookup_request_option (request, "passive_transfer", &passive_transfer); |
| 1214 if (!passive_transfer && | 1218 if (!passive_transfer && |
| 1215 (ret = rfc959_accept_active_connection (request)) < 0) | 1219 (ret = rfc959_accept_active_connection (request)) < 0) |
| 1274 if (ret < 0) | 1278 if (ret < 0) |
| 1275 return (ret); | 1279 return (ret); |
| 1276 else if (ret != '1') | 1280 else if (ret != '1') |
| 1277 { | 1281 { |
| 1278 rfc959_close_data_connection (request); | 1282 rfc959_close_data_connection (request); |
| 1279 return (GFTP_ERETRYABLE); | 1283 |
| 1284 if (ret == '5') | |
| 1285 return (GFTP_EFATAL); | |
| 1286 else | |
| 1287 return (GFTP_ERETRYABLE); | |
| 1280 } | 1288 } |
| 1281 | 1289 |
| 1282 gftp_lookup_request_option (request, "passive_transfer", &passive_transfer); | 1290 gftp_lookup_request_option (request, "passive_transfer", &passive_transfer); |
| 1283 if (!passive_transfer && | 1291 if (!passive_transfer && |
| 1284 (ret = rfc959_accept_active_connection (request)) < 0) | 1292 (ret = rfc959_accept_active_connection (request)) < 0) |