Deleted Added
full compact
common.h (68551) common.h (75891)
1/*-
2 * Copyright (c) 1998 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

--- 11 unchanged lines hidden (view full) ---

20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
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 *
1/*-
2 * Copyright (c) 1998 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

--- 11 unchanged lines hidden (view full) ---

20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
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 * $FreeBSD: head/lib/libfetch/common.h 68551 2000-11-10 08:43:40Z des $
28 * $FreeBSD: head/lib/libfetch/common.h 75891 2001-04-24 00:06:21Z archie $
29 */
30
31#ifndef _COMMON_H_INCLUDED
32#define _COMMON_H_INCLUDED
33
34#define FTP_DEFAULT_PORT 21
35#define HTTP_DEFAULT_PORT 80
36#define FTP_DEFAULT_PROXY_PORT 21
37#define HTTP_DEFAULT_PROXY_PORT 3128
38
39/* Structure used for error message lists */
40struct fetcherr {
41 const int num, cat;
42 const char *string;
43};
44
45void _fetch_seterr(struct fetcherr *p, int e);
46void _fetch_syserr(void);
29 */
30
31#ifndef _COMMON_H_INCLUDED
32#define _COMMON_H_INCLUDED
33
34#define FTP_DEFAULT_PORT 21
35#define HTTP_DEFAULT_PORT 80
36#define FTP_DEFAULT_PROXY_PORT 21
37#define HTTP_DEFAULT_PROXY_PORT 3128
38
39/* Structure used for error message lists */
40struct fetcherr {
41 const int num, cat;
42 const char *string;
43};
44
45void _fetch_seterr(struct fetcherr *p, int e);
46void _fetch_syserr(void);
47void _fetch_info(char *fmt, ...);
48int _fetch_default_port(char *);
49int _fetch_default_proxy_port(char *);
50int _fetch_connect(char *host, int port, int af, int verbose);
47void _fetch_info(const char *fmt, ...);
48int _fetch_default_port(const char *);
49int _fetch_default_proxy_port(const char *);
50int _fetch_connect(const char *host, int port, int af, int verbose);
51int _fetch_getln(int fd, char **buf, size_t *size, size_t *len);
51int _fetch_getln(int fd, char **buf, size_t *size, size_t *len);
52int _fetch_putln(int fd, char *str, size_t len);
52int _fetch_putln(int fd, const char *str, size_t len);
53int _fetch_add_entry(struct url_ent **p, int *size, int *len,
53int _fetch_add_entry(struct url_ent **p, int *size, int *len,
54 char *name, struct url_stat *stat);
54 const char *name, struct url_stat *stat);
55
56#define _ftp_seterr(n) _fetch_seterr(_ftp_errlist, n)
57#define _http_seterr(n) _fetch_seterr(_http_errlist, n)
58#define _netdb_seterr(n) _fetch_seterr(_netdb_errlist, n)
59#define _url_seterr(n) _fetch_seterr(_url_errlist, n)
60
61#ifndef NDEBUG
62#define DEBUG(x) do x; while (0)

--- 4 unchanged lines hidden (view full) ---

67/*
68 * I don't really like exporting _http_request() from http.c, but ftp.c
69 * occasionally needs to use an HTTP proxy, and this saves me from adding
70 * a lot of special-case code to http.c to handle those cases.
71 *
72 * Note that _http_request() frees purl, which is way ugly but saves us a
73 * whole lot of trouble.
74 */
55
56#define _ftp_seterr(n) _fetch_seterr(_ftp_errlist, n)
57#define _http_seterr(n) _fetch_seterr(_http_errlist, n)
58#define _netdb_seterr(n) _fetch_seterr(_netdb_errlist, n)
59#define _url_seterr(n) _fetch_seterr(_url_errlist, n)
60
61#ifndef NDEBUG
62#define DEBUG(x) do x; while (0)

--- 4 unchanged lines hidden (view full) ---

67/*
68 * I don't really like exporting _http_request() from http.c, but ftp.c
69 * occasionally needs to use an HTTP proxy, and this saves me from adding
70 * a lot of special-case code to http.c to handle those cases.
71 *
72 * Note that _http_request() frees purl, which is way ugly but saves us a
73 * whole lot of trouble.
74 */
75FILE *_http_request(struct url *URL, char *op, struct url_stat *us,
76 struct url *purl, char *flags);
75FILE *_http_request(struct url *URL, const char *op,
76 struct url_stat *us, struct url *purl,
77 const char *flags);
77
78/*
79 * Check whether a particular flag is set
80 */
81#define CHECK_FLAG(x) (flags && strchr(flags, (x)))
82
83#endif
78
79/*
80 * Check whether a particular flag is set
81 */
82#define CHECK_FLAG(x) (flags && strchr(flags, (x)))
83
84#endif