Mercurial > gftp.yaz

comparison lib/rfc2068.c @ 415:1ffdbc487a70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2004-3-1 Brian Masney <masneyb@gftp.org> * lib/ftps.c - set the protocol number to GFTP_FTPS_NUM * lib/https.c - set the protocol number to GFTP_HTTPS_NUM * lib/rfc959.c lib/rfc2068.c - remove references to checking for GFTP_FTP_NUM and GFTP_HTTP_NUM
author masneyb
date Tue, 02 Mar 2004 02:29:10 +0000
parents 44b792841e3f
children 3a83011227bc
comparison
equal deleted inserted replaced
414:e55f3cd03048 415:1ffdbc487a70
56 rfc2068_params * params; 56 rfc2068_params * params;
57 intptr_t proxy_port; 57 intptr_t proxy_port;
58 int ret; 58 int ret;
59 59
60 g_return_val_if_fail (request != NULL, GFTP_EFATAL); 60 g_return_val_if_fail (request != NULL, GFTP_EFATAL);
61 g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
62 g_return_val_if_fail (request->hostname != NULL, GFTP_EFATAL); 61 g_return_val_if_fail (request->hostname != NULL, GFTP_EFATAL);
63 62
64 params = request->protocol_data; 63 params = request->protocol_data;
65 64
66 if (request->datafd > 0) 65 if (request->datafd > 0)
185 intptr_t proxy_port; 184 intptr_t proxy_port;
186 int conn_ret; 185 int conn_ret;
187 ssize_t ret; 186 ssize_t ret;
188 187
189 g_return_val_if_fail (request != NULL, GFTP_EFATAL); 188 g_return_val_if_fail (request != NULL, GFTP_EFATAL);
190 g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
191 g_return_val_if_fail (command != NULL, GFTP_EFATAL); 189 g_return_val_if_fail (command != NULL, GFTP_EFATAL);
192 190
193 if (request->datafd < 0 && (conn_ret = rfc2068_connect (request)) != 0) 191 if (request->datafd < 0 && (conn_ret = rfc2068_connect (request)) != 0)
194 return (conn_ret); 192 return (conn_ret);
195 193
250 248
251 static void 249 static void
252 rfc2068_disconnect (gftp_request * request) 250 rfc2068_disconnect (gftp_request * request)
253 { 251 {
254 g_return_if_fail (request != NULL); 252 g_return_if_fail (request != NULL);
255 g_return_if_fail (request->protonum == GFTP_HTTP_NUM);
256 253
257 if (request->datafd > 0) 254 if (request->datafd > 0)
258 { 255 {
259 request->logging_function (gftp_logging_misc, request, 256 request->logging_function (gftp_logging_misc, request,
260 _("Disconnecting from site %s\n"), 257 _("Disconnecting from site %s\n"),
279 intptr_t use_http11; 276 intptr_t use_http11;
280 rfc2068_params * params; 277 rfc2068_params * params;
281 off_t size; 278 off_t size;
282 279
283 g_return_val_if_fail (request != NULL, GFTP_EFATAL); 280 g_return_val_if_fail (request != NULL, GFTP_EFATAL);
284 g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
285 g_return_val_if_fail (filename != NULL, GFTP_EFATAL); 281 g_return_val_if_fail (filename != NULL, GFTP_EFATAL);
286 282
287 params = request->protocol_data; 283 params = request->protocol_data;
288 284
289 gftp_lookup_request_option (request, "use_http11", &use_http11); 285 gftp_lookup_request_option (request, "use_http11", &use_http11);
352 { 348 {
353 rfc2068_params * params; 349 rfc2068_params * params;
354 size_t len; 350 size_t len;
355 351
356 g_return_val_if_fail (request != NULL, GFTP_EFATAL); 352 g_return_val_if_fail (request != NULL, GFTP_EFATAL);
357 g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
358 353
359 params = request->protocol_data; 354 params = request->protocol_data;
360 if (params->rbuf != NULL && params->rbuf->curpos != NULL) 355 if (params->rbuf != NULL && params->rbuf->curpos != NULL)
361 { 356 {
362 len = params->rbuf->cur_bufsize > size ? size : params->rbuf->cur_bufsize; 357 len = params->rbuf->cur_bufsize > size ? size : params->rbuf->cur_bufsize;
381 rfc2068_end_transfer (gftp_request * request) 376 rfc2068_end_transfer (gftp_request * request)
382 { 377 {
383 rfc2068_params * params; 378 rfc2068_params * params;
384 379
385 g_return_val_if_fail (request != NULL, GFTP_EFATAL); 380 g_return_val_if_fail (request != NULL, GFTP_EFATAL);
386 g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
387 381
388 if (request->datafd < 0) 382 if (request->datafd < 0)
389 return (GFTP_EFATAL); 383 return (GFTP_EFATAL);
390 384
391 gftp_disconnect (request); 385 gftp_disconnect (request);
407 char *tempstr, *hd; 401 char *tempstr, *hd;
408 intptr_t use_http11; 402 intptr_t use_http11;
409 off_t ret; 403 off_t ret;
410 404
411 g_return_val_if_fail (request != NULL, GFTP_EFATAL); 405 g_return_val_if_fail (request != NULL, GFTP_EFATAL);
412 g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
413 406
414 params = request->protocol_data; 407 params = request->protocol_data;
415 gftp_lookup_request_option (request, "use_http11", &use_http11); 408 gftp_lookup_request_option (request, "use_http11", &use_http11);
416 409
417 if (strncmp (request->directory, "/", strlen (request->directory)) == 0) 410 if (strncmp (request->directory, "/", strlen (request->directory)) == 0)
456 char *tempstr, *hf; 449 char *tempstr, *hf;
457 intptr_t use_http11; 450 intptr_t use_http11;
458 off_t size; 451 off_t size;
459 452
460 g_return_val_if_fail (request != NULL, GFTP_EFATAL); 453 g_return_val_if_fail (request != NULL, GFTP_EFATAL);
461 g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
462 g_return_val_if_fail (filename != NULL, GFTP_EFATAL); 454 g_return_val_if_fail (filename != NULL, GFTP_EFATAL);
463 455
464 params = request->protocol_data; 456 params = request->protocol_data;
465 gftp_lookup_request_option (request, "use_http11", &use_http11); 457 gftp_lookup_request_option (request, "use_http11", &use_http11);
466 458
620 char tempstr[8192]; 612 char tempstr[8192];
621 ssize_t len; 613 ssize_t len;
622 int ret; 614 int ret;
623 615
624 g_return_val_if_fail (request != NULL, GFTP_EFATAL); 616 g_return_val_if_fail (request != NULL, GFTP_EFATAL);
625 g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
626 g_return_val_if_fail (fle != NULL, GFTP_EFATAL); 617 g_return_val_if_fail (fle != NULL, GFTP_EFATAL);
627 618
628 params = request->protocol_data; 619 params = request->protocol_data;
629 if (request->last_dir_entry) 620 if (request->last_dir_entry)
630 { 621 {
667 rfc2068_chdir (gftp_request * request, const char *directory) 658 rfc2068_chdir (gftp_request * request, const char *directory)
668 { 659 {
669 char *tempstr, *olddir; 660 char *tempstr, *olddir;
670 661
671 g_return_val_if_fail (request != NULL, GFTP_EFATAL); 662 g_return_val_if_fail (request != NULL, GFTP_EFATAL);
672 g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
673 g_return_val_if_fail (directory != NULL, GFTP_EFATAL); 663 g_return_val_if_fail (directory != NULL, GFTP_EFATAL);
674 664
675 if (request->directory != directory) 665 if (request->directory != directory)
676 { 666 {
677 olddir = request->directory; 667 olddir = request->directory;