| fetch.c (164152) | fetch.c (181962) |
|---|---|
| 1/*- 2 * Copyright (c) 2000-2004 Dag-Erling Co�dan Sm�rgrav 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 13 unchanged lines hidden (view full) --- 22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 */ 28 29#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2000-2004 Dag-Erling Co�dan Sm�rgrav 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 13 unchanged lines hidden (view full) --- 22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 */ 28 29#include <sys/cdefs.h> |
| 30__FBSDID("$FreeBSD: head/usr.bin/fetch/fetch.c 164152 2006-11-10 22:05:41Z des $"); | 30__FBSDID("$FreeBSD: head/usr.bin/fetch/fetch.c 181962 2008-08-21 14:12:34Z obrien $"); |
| 31 32#include <sys/param.h> 33#include <sys/socket.h> 34#include <sys/stat.h> 35#include <sys/time.h> 36 37#include <ctype.h> 38#include <err.h> --- 320 unchanged lines hidden (view full) --- 359 strcat(flags, "4"); 360 break; 361 case PF_INET6: 362 strcat(flags, "6"); 363 break; 364 } 365 366 /* FTP specific flags */ | 31 32#include <sys/param.h> 33#include <sys/socket.h> 34#include <sys/stat.h> 35#include <sys/time.h> 36 37#include <ctype.h> 38#include <err.h> --- 320 unchanged lines hidden (view full) --- 359 strcat(flags, "4"); 360 break; 361 case PF_INET6: 362 strcat(flags, "6"); 363 break; 364 } 365 366 /* FTP specific flags */ |
| 367 if (strcmp(url->scheme, "ftp") == 0) { | 367 if (strcmp(url->scheme, SCHEME_FTP) == 0) { |
| 368 if (p_flag) 369 strcat(flags, "p"); 370 if (d_flag) 371 strcat(flags, "d"); 372 if (U_flag) 373 strcat(flags, "l"); 374 timeout = T_secs ? T_secs : ftp_timeout; 375 } 376 377 /* HTTP specific flags */ | 368 if (p_flag) 369 strcat(flags, "p"); 370 if (d_flag) 371 strcat(flags, "d"); 372 if (U_flag) 373 strcat(flags, "l"); 374 timeout = T_secs ? T_secs : ftp_timeout; 375 } 376 377 /* HTTP specific flags */ |
| 378 if (strcmp(url->scheme, "http") == 0) { | 378 if (strcmp(url->scheme, SCHEME_HTTP) == 0) { |
| 379 if (d_flag) 380 strcat(flags, "d"); 381 if (A_flag) 382 strcat(flags, "A"); 383 timeout = T_secs ? T_secs : http_timeout; 384 } 385 386 /* set the protocol timeout. */ --- 599 unchanged lines hidden --- | 379 if (d_flag) 380 strcat(flags, "d"); 381 if (A_flag) 382 strcat(flags, "A"); 383 timeout = T_secs ? T_secs : http_timeout; 384 } 385 386 /* set the protocol timeout. */ --- 599 unchanged lines hidden --- |