CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src Committed By: abhinav Date: Tue May 31 16:26:48 UTC 2016 Modified Files: src/external/bsd/fetch/dist/libfetch: fetch.3 Log Message: Add the missing parameter "const char *pattern" to the fetchList* functions. >From Julian Fagir in PR lib/45579 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/fetch/dist/libfetch/fetch.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/fetch/dist/libfetch/fetch.3 diff -u src/external/bsd/fetch/dist/libfetch/fetch.3:1.3 src/external/bsd/fetch/dist/libfetch/fetch.3:1.4 --- src/external/bsd/fetch/dist/libfetch/fetch.3:1.3 Tue Mar 18 18:20:36 2014 +++ src/external/bsd/fetch/dist/libfetch/fetch.3 Tue May 31 16:26:47 2016 @@ -25,7 +25,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: fetch.3,v 1.64 2007/12/18 11:03:26 des Exp $ -.\" $NetBSD: fetch.3,v 1.3 2014/03/18 18:20:36 riastradh Exp $ +.\" $NetBSD: fetch.3,v 1.4 2016/05/31 16:26:47 abhinav Exp $ .\" .Dd January 22, 2010 .Dt FETCH 3 @@ -91,7 +91,7 @@ .Ft int .Fn fetchStatURL "const char *URL" "struct url_stat *us" "const char *flags" .Ft int -.Fn fetchListURL "struct url_list *list" "const char *URL" "const char *flags" +.Fn fetchListURL "struct url_list *list" "const char *URL" "const char *pattern" "const char *flags" .Ft fetchIO * .Fn fetchXGet "struct url *u" "struct url_stat *us" "const char *flags" .Ft fetchIO * @@ -101,7 +101,7 @@ .Ft int .Fn fetchStat "struct url *u" "struct url_stat *us" "const char *flags" .Ft int -.Fn fetchList "struct url_list *list" "struct url *u" "const char *flags" +.Fn fetchList "struct url_list *list" "struct url *u" "const char *pattern" "const char *flags" .Ft fetchIO * .Fn fetchXGetFile "struct url *u" "struct url_stat *us" "const char *flags" .Ft fetchIO * @@ -111,7 +111,7 @@ .Ft int .Fn fetchStatFile "struct url *u" "struct url_stat *us" "const char *flags" .Ft int -.Fn fetchListFile "struct url_list *list" "struct url *u" "const char *flags" +.Fn fetchListFile "struct url_list *list" "struct url *u" "const char *pattern" "const char *flags" .Ft fetchIO * .Fn fetchXGetHTTP "struct url *u" "struct url_stat *us" "const char *flags" .Ft fetchIO * @@ -121,7 +121,7 @@ .Ft int .Fn fetchStatHTTP "struct url *u" "struct url_stat *us" "const char *flags" .Ft int -.Fn fetchListHTTP "struct url_list *list" "struct url *u" "const char *flags" +.Fn fetchListHTTP "struct url_list *list" "struct url *u" "const char *pattern" "const char *flags" .Ft fetchIO * .Fn fetchXGetFTP "struct url *u" "struct url_stat *us" "const char *flags" .Ft fetchIO * @@ -131,7 +131,7 @@ .Ft int .Fn fetchStatFTP "struct url *u" "struct url_stat *us" "const char *flags" .Ft int -.Fn fetchListFTP "struct url_list *list" "struct url *u" "const char *flags" +.Fn fetchListFTP "struct url_list *list" "struct url *u" "const char *pattern" "const char *flags" .Ft void .Fn fetchInitURLList "struct url_list *ul" .Ft int @@ -158,7 +158,7 @@ its components function according to the detailed in RFC 1738. A regular expression which produces this syntax is: .Bd -literal -offset indent -\*[Lt]scheme\*[Gt]:(//(\*[Lt]user\*[Gt](:\*[Lt]pwd\*[Gt])?@)?\*[Lt]host\*[Gt](:\*[Lt]port\*[Gt])?)?/(\*[Lt]document\*[Gt])? +\*[Lt]scheme\*[Gt]:(//(\*[Lt]user\*[Gt](:\*[Lt]pwd\*[Gt])?@)?\*[Lt]host\*[Gt](:\*[Lt]port\*[Gt])?)?/(\*[Lt]doc\*[Gt])? .Ed .Pp If the URL does not seem to begin with a scheme name, it is assumed to be a local path. @@ -169,7 +169,7 @@ all URL schemes. For instance, the file scheme only needs the .Aq scheme and -.Aq document +.Aq doc components. .Fn fetchParseURL quotes any unsafe character in the URL automatically.
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src
Committed By: joerg
Date: Tue Jan 7 02:13:00 UTC 2014
Modified Files:
src/external/bsd/fetch/dist/libfetch: common.h ftp.c http.c
Log Message:
Annotate format strings. Add a bunch of int casts for size limits.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/fetch/dist/libfetch/common.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/fetch/dist/libfetch/ftp.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/fetch/dist/libfetch/http.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/fetch/dist/libfetch/common.h
diff -u src/external/bsd/fetch/dist/libfetch/common.h:1.1.1.7 src/external/bsd/fetch/dist/libfetch/common.h:1.2
--- src/external/bsd/fetch/dist/libfetch/common.h:1.1.1.7 Wed Mar 24 20:51:42 2010
+++ src/external/bsd/fetch/dist/libfetch/common.h Tue Jan 7 02:13:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: common.h,v 1.1.1.7 2010/03/24 20:51:42 joerg Exp $ */
+/* $NetBSD: common.h,v 1.2 2014/01/07 02:13:00 joerg Exp $ */
/*-
* Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
* All rights reserved.
@@ -90,7 +90,7 @@ struct fetcherr {
void fetch_seterr(struct fetcherr *, int);
void fetch_syserr(void);
-void fetch_info(const char *, ...);
+void fetch_info(const char *, ...) __printflike(1, 2);
int fetch_default_port(const char *);
int fetch_default_proxy_port(const char *);
int fetch_bind(int, int, const char *);
Index: src/external/bsd/fetch/dist/libfetch/ftp.c
diff -u src/external/bsd/fetch/dist/libfetch/ftp.c:1.6 src/external/bsd/fetch/dist/libfetch/ftp.c:1.7
--- src/external/bsd/fetch/dist/libfetch/ftp.c:1.6 Sat Oct 19 22:58:40 2013
+++ src/external/bsd/fetch/dist/libfetch/ftp.c Tue Jan 7 02:13:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.6 2013/10/19 22:58:40 mrg Exp $ */
+/* $NetBSD: ftp.c,v 1.7 2014/01/07 02:13:00 joerg Exp $ */
/*-
* Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
* Copyright (c) 2008, 2009, 2010 Joerg Sonnenberger jo...@netbsd.org
@@ -198,6 +198,7 @@ ftp_chkerr(conn_t *conn)
/*
* Send a command and check reply
*/
+__printflike(2, 3)
static int
ftp_cmd(conn_t *conn, const char *fmt, ...)
{
@@ -391,7 +392,7 @@ ftp_cwd(conn_t *conn, const char *path,
++beg, ++i;
for (++i; dst + i end dst[i] != '/'; ++i)
/* nothing */ ;
- e = ftp_cmd(conn, CWD %.*s\r\n, dst + i - beg, beg);
+ e = ftp_cmd(conn, CWD %.*s\r\n, (int)(dst + i - beg), beg);
if (e != FTP_FILE_ACTION_OK) {
free(dst);
ftp_seterr(e);
@@ -489,7 +490,7 @@ ftp_stat(conn_t *conn, const char *file,
return (-1);
}
- e = ftp_cmd(conn, SIZE %.*s\r\n, filenamelen, filename);
+ e = ftp_cmd(conn, SIZE %.*s\r\n, (int)filenamelen, filename);
if (e != FTP_FILE_STATUS) {
ftp_seterr(e);
return (-1);
@@ -506,7 +507,7 @@ ftp_stat(conn_t *conn, const char *file,
if (us-size == 0)
us-size = -1;
- e = ftp_cmd(conn, MDTM %.*s\r\n, filenamelen, filename);
+ e = ftp_cmd(conn, MDTM %.*s\r\n, (int)filenamelen, filename);
if (e != FTP_FILE_STATUS) {
ftp_seterr(e);
return (-1);
@@ -851,7 +852,7 @@ retry_mode:
e = ftp_cmd(conn, %s%s%s\r\n, oper, *op_arg ? : , op_arg);
else
e = ftp_cmd(conn, %s %.*s\r\n, oper,
- filenamelen, filename);
+ (int)filenamelen, filename);
if (e != FTP_CONNECTION_ALREADY_OPEN e != FTP_OPEN_DATA_CONNECTION)
goto ouch;
@@ -948,7 +949,7 @@ retry_mode:
e = ftp_cmd(conn, %s%s%s\r\n, oper, *op_arg ? : , op_arg);
else
e = ftp_cmd(conn, %s %.*s\r\n, oper,
- filenamelen, filename);
+ (int)filenamelen, filename);
if (e != FTP_CONNECTION_ALREADY_OPEN e != FTP_OPEN_DATA_CONNECTION)
goto ouch;
Index: src/external/bsd/fetch/dist/libfetch/http.c
diff -u src/external/bsd/fetch/dist/libfetch/http.c:1.2 src/external/bsd/fetch/dist/libfetch/http.c:1.3
--- src/external/bsd/fetch/dist/libfetch/http.c:1.2 Sat Jun 25 20:27:01 2011
+++ src/external/bsd/fetch/dist/libfetch/http.c Tue Jan 7 02:13:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: http.c,v 1.2 2011/06/25 20:27:01 christos Exp $ */
+/* $NetBSD: http.c,v 1.3 2014/01/07 02:13:00 joerg Exp $ */
/*-
* Copyright (c) 2000-2004 Dag-Erling Coïdan Smørgrav
* Copyright (c) 2003 Thomas Klausner w...@netbsd.org
@@ -404,6 +404,7 @@ static struct {
/*
* Send a formatted line; optionally echo to terminal
*/
+__printflike(2, 3)
static int
http_cmd(conn_t *conn, const char *fmt, ...)
{
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src
Committed By: mrg
Date: Sat Oct 19 22:58:40 UTC 2013
Modified Files:
src/external/bsd/fetch/dist/libfetch: ftp.c
Log Message:
avoid a strict aliasing problem copying the mapped v4 address out of
a ipv6 address.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/fetch/dist/libfetch/ftp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/fetch/dist/libfetch/ftp.c
diff -u src/external/bsd/fetch/dist/libfetch/ftp.c:1.5 src/external/bsd/fetch/dist/libfetch/ftp.c:1.6
--- src/external/bsd/fetch/dist/libfetch/ftp.c:1.5 Wed Aug 17 09:19:38 2011
+++ src/external/bsd/fetch/dist/libfetch/ftp.c Sat Oct 19 22:58:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.5 2011/08/17 09:19:38 christos Exp $ */
+/* $NetBSD: ftp.c,v 1.6 2013/10/19 22:58:40 mrg Exp $ */
/*-
* Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
* Copyright (c) 2008, 2009, 2010 Joerg Sonnenberger jo...@netbsd.org
@@ -138,6 +138,7 @@ static void
unmappedaddr(struct sockaddr_in6 *sin6, socklen_t *len)
{
struct sockaddr_in *sin4;
+ void *addrp;
uint32_t addr;
int port;
@@ -145,7 +146,8 @@ unmappedaddr(struct sockaddr_in6 *sin6,
!IN6_IS_ADDR_V4MAPPED(sin6-sin6_addr))
return;
sin4 = (struct sockaddr_in *)(void *)sin6;
- addr = *(uint32_t *)(void *)sin6-sin6_addr.s6_addr[12];
+ addrp = sin6-sin6_addr.s6_addr[12];
+ addr = *(uint32_t *)addrp;
port = sin6-sin6_port;
memset(sin4, 0, sizeof(struct sockaddr_in));
sin4-sin_addr.s_addr = addr;
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src
Committed By: christos
Date: Wed Aug 17 09:19:38 UTC 2011
Modified Files:
src/external/bsd/fetch/dist/libfetch: ftp.c
Log Message:
fix gcc array out of bounds confusion.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/fetch/dist/libfetch/ftp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/fetch/dist/libfetch/ftp.c
diff -u src/external/bsd/fetch/dist/libfetch/ftp.c:1.4 src/external/bsd/fetch/dist/libfetch/ftp.c:1.5
--- src/external/bsd/fetch/dist/libfetch/ftp.c:1.4 Sat Jun 25 16:27:01 2011
+++ src/external/bsd/fetch/dist/libfetch/ftp.c Wed Aug 17 05:19:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.4 2011/06/25 20:27:01 christos Exp $ */
+/* $NetBSD: ftp.c,v 1.5 2011/08/17 09:19:38 christos Exp $ */
/*-
* Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
* Copyright (c) 2008, 2009, 2010 Joerg Sonnenberger jo...@netbsd.org
@@ -860,7 +860,6 @@
int arg;
#endif
int d;
- char *ap;
char hname[INET6_ADDRSTRLEN];
switch (u.ss.ss_family) {
@@ -903,7 +902,6 @@
((unsigned int)p 8) 0xff, p 0xff);
break;
case AF_INET6:
-#define UC(b) (((int)b)0xff)
e = -1;
u.sin6.sin6_scope_id = 0;
if (getnameinfo(u.sa, l,
@@ -915,17 +913,18 @@
goto ouch;
}
if (e != FTP_OK) {
-ap = (char *)(void *)u.sin6.sin6_addr;
+uint8_t aa[sizeof(u.sin6.sin6_addr)];
+memcpy(aa, u.sin6.sin6_addr, sizeof(aa));
+p = ntohs(u.sin6.sin6_port);
e = ftp_cmd(conn,
LPRT %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\r\n,
6, 16,
-UC(ap[0]), UC(ap[1]), UC(ap[2]), UC(ap[3]),
-UC(ap[4]), UC(ap[5]), UC(ap[6]), UC(ap[7]),
-UC(ap[8]), UC(ap[9]), UC(ap[10]), UC(ap[11]),
-UC(ap[12]), UC(ap[13]), UC(ap[14]), UC(ap[15]),
+aa[ 0], aa[ 1], aa[ 2], aa[ 3],
+aa[ 4], aa[ 5], aa[ 6], aa[ 7],
+aa[ 8], aa[ 9], aa[10], aa[11],
+aa[12], aa[13], aa[14], aa[15],
2,
-((unsigned int)ntohs(u.sin6.sin6_port) 8) 0xff,
-ntohs(u.sin6.sin6_port) 0xff);
+((unsigned int)p 8) 0xff, p 0xff);
}
break;
default:
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src
Committed By: christos
Date: Sat Jun 25 17:13:35 UTC 2011
Modified Files:
src/external/bsd/fetch/dist/libfetch: ftp.c
Log Message:
It is a lot nicer to getenv() what you need once and makes the code a lot
more readable.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.11 -r1.2 src/external/bsd/fetch/dist/libfetch/ftp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/fetch/dist/libfetch/ftp.c
diff -u src/external/bsd/fetch/dist/libfetch/ftp.c:1.1.1.11 src/external/bsd/fetch/dist/libfetch/ftp.c:1.2
--- src/external/bsd/fetch/dist/libfetch/ftp.c:1.1.1.11 Wed Mar 24 16:51:44 2010
+++ src/external/bsd/fetch/dist/libfetch/ftp.c Sat Jun 25 13:13:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.1.1.11 2010/03/24 20:51:44 joerg Exp $ */
+/* $NetBSD: ftp.c,v 1.2 2011/06/25 17:13:34 christos Exp $ */
/*-
* Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
* Copyright (c) 2008, 2009, 2010 Joerg Sonnenberger jo...@netbsd.org
@@ -1097,17 +1097,22 @@
ftp_get_proxy(struct url * url, const char *flags)
{
struct url *purl;
- char *p;
+ char *p, *fp, *FP, *hp, *HP;
if (flags != NULL strchr(flags, 'd') != NULL)
- return (NULL);
+ return NULL;
if (fetch_no_proxy_match(url-host))
- return (NULL);
- if (((p = getenv(FTP_PROXY)) || (p = getenv(ftp_proxy)) ||
- (p = getenv(HTTP_PROXY)) || (p = getenv(http_proxy)))
+ return NULL;
+
+ FP = getenv(FTP_PROXY);
+ fp = getenv(ftp_proxy);
+ HP = getenv(HTTP_PROXY);
+ hp = getenv(http_proxy);
+
+ if (((p = FP) || (p = fp) || (p = HP) || (p = hp)))
*p (purl = fetchParseURL(p)) != NULL) {
if (!*purl-scheme) {
- if (getenv(FTP_PROXY) || getenv(ftp_proxy))
+ if (fp || FP)
strcpy(purl-scheme, SCHEME_FTP);
else
strcpy(purl-scheme, SCHEME_HTTP);
@@ -1116,10 +1121,10 @@
purl-port = fetch_default_proxy_port(purl-scheme);
if (strcasecmp(purl-scheme, SCHEME_FTP) == 0 ||
strcasecmp(purl-scheme, SCHEME_HTTP) == 0)
- return (purl);
+ return purl;
fetchFreeURL(purl);
}
- return (NULL);
+ return NULL;
}
/*
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src
Committed By: christos
Date: Sat Jun 25 20:13:03 UTC 2011
Modified Files:
src/external/bsd/fetch/dist/libfetch: ftp.c
Log Message:
add missing paren
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/fetch/dist/libfetch/ftp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/fetch/dist/libfetch/ftp.c
diff -u src/external/bsd/fetch/dist/libfetch/ftp.c:1.2 src/external/bsd/fetch/dist/libfetch/ftp.c:1.3
--- src/external/bsd/fetch/dist/libfetch/ftp.c:1.2 Sat Jun 25 13:13:34 2011
+++ src/external/bsd/fetch/dist/libfetch/ftp.c Sat Jun 25 16:13:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.2 2011/06/25 17:13:34 christos Exp $ */
+/* $NetBSD: ftp.c,v 1.3 2011/06/25 20:13:03 christos Exp $ */
/*-
* Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
* Copyright (c) 2008, 2009, 2010 Joerg Sonnenberger jo...@netbsd.org
@@ -144,8 +144,8 @@
if (sin6-sin6_family != AF_INET6 ||
!IN6_IS_ADDR_V4MAPPED(sin6-sin6_addr))
return;
- sin4 = (struct sockaddr_in *)sin6;
- addr = *(uint32_t *)sin6-sin6_addr.s6_addr[12];
+ sin4 = (struct sockaddr_in *)(void *)sin6;
+ addr = *(uint32_t *)(void *)sin6-sin6_addr.s6_addr[12];
port = sin6-sin6_port;
memset(sin4, 0, sizeof(struct sockaddr_in));
sin4-sin_addr.s_addr = addr;
@@ -1109,7 +1109,7 @@
HP = getenv(HTTP_PROXY);
hp = getenv(http_proxy);
- if (((p = FP) || (p = fp) || (p = HP) || (p = hp)))
+ if p = FP) || (p = fp) || (p = HP) || (p = hp)))
*p (purl = fetchParseURL(p)) != NULL) {
if (!*purl-scheme) {
if (fp || FP)
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src
Committed By: christos
Date: Sat Jun 25 20:27:02 UTC 2011
Modified Files:
src/external/bsd/fetch/dist/libfetch: common.c file.c ftp.c http.c
Log Message:
delint
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/fetch/dist/libfetch/common.c
cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/fetch/dist/libfetch/file.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/fetch/dist/libfetch/ftp.c
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/fetch/dist/libfetch/http.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/fetch/dist/libfetch/common.c
diff -u src/external/bsd/fetch/dist/libfetch/common.c:1.1.1.9 src/external/bsd/fetch/dist/libfetch/common.c:1.2
--- src/external/bsd/fetch/dist/libfetch/common.c:1.1.1.9 Wed Mar 24 16:51:41 2010
+++ src/external/bsd/fetch/dist/libfetch/common.c Sat Jun 25 16:27:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: common.c,v 1.1.1.9 2010/03/24 20:51:41 joerg Exp $ */
+/* $NetBSD: common.c,v 1.2 2011/06/25 20:27:01 christos Exp $ */
/*-
* Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
* Copyright (c) 2008, 2010 Joerg Sonnenberger jo...@netbsd.org
@@ -539,7 +539,7 @@
}
#ifdef WITH_SSL
if (conn-ssl != NULL)
- rlen = SSL_read(conn-ssl, buf, len);
+ rlen = SSL_read(conn-ssl, buf, (int)len);
else
#endif
rlen = read(conn-sd, buf, len);
@@ -588,7 +588,7 @@
return (-1);
if (len == 0)
break;
- next = memchr(conn-buf + conn-buflen, '\n', len);
+ next = memchr(conn-buf + conn-buflen, '\n', (size_t)len);
conn-buflen += len;
if (conn-buflen == conn-bufsize next == NULL) {
tmp = conn-buf;
@@ -674,7 +674,7 @@
errno = 0;
#ifdef WITH_SSL
if (conn-ssl != NULL)
- wlen = SSL_write(conn-ssl, buf, len);
+ wlen = SSL_write(conn-ssl, buf, (int)len);
else
#endif
#ifndef MSG_NOSIGNAL
Index: src/external/bsd/fetch/dist/libfetch/file.c
diff -u src/external/bsd/fetch/dist/libfetch/file.c:1.1.1.6 src/external/bsd/fetch/dist/libfetch/file.c:1.2
--- src/external/bsd/fetch/dist/libfetch/file.c:1.1.1.6 Thu Oct 15 08:59:59 2009
+++ src/external/bsd/fetch/dist/libfetch/file.c Sat Jun 25 16:27:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: file.c,v 1.1.1.6 2009/10/15 12:59:59 joerg Exp $ */
+/* $NetBSD: file.c,v 1.2 2011/06/25 20:27:01 christos Exp $ */
/*-
* Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
* Copyright (c) 2008, 2009 Joerg Sonnenberger jo...@netbsd.org
@@ -204,7 +204,8 @@
}
int
-fetchStatFile(struct url *u, struct url_stat *us, const char *flags)
+/*ARGSUSED*/
+fetchStatFile(struct url *u, struct url_stat *us, const char *flags __unused)
{
char *path;
int fd, rv;
@@ -229,7 +230,9 @@
}
int
-fetchListFile(struct url_list *ue, struct url *u, const char *pattern, const char *flags)
+/*ARGSUSED*/
+fetchListFile(struct url_list *ue, struct url *u, const char *pattern,
+const char *flags __unused)
{
char *path;
struct dirent *de;
Index: src/external/bsd/fetch/dist/libfetch/ftp.c
diff -u src/external/bsd/fetch/dist/libfetch/ftp.c:1.3 src/external/bsd/fetch/dist/libfetch/ftp.c:1.4
--- src/external/bsd/fetch/dist/libfetch/ftp.c:1.3 Sat Jun 25 16:13:03 2011
+++ src/external/bsd/fetch/dist/libfetch/ftp.c Sat Jun 25 16:27:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.3 2011/06/25 20:13:03 christos Exp $ */
+/* $NetBSD: ftp.c,v 1.4 2011/06/25 20:27:01 christos Exp $ */
/*-
* Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
* Copyright (c) 2008, 2009, 2010 Joerg Sonnenberger jo...@netbsd.org
@@ -202,7 +202,7 @@
va_list ap;
size_t len;
char *msg;
- int r;
+ ssize_t r;
va_start(ap, fmt);
len = vasprintf(msg, fmt, ap);
@@ -229,7 +229,7 @@
* Return a pointer to the filename part of a path
*/
static const char *
-ftp_filename(const char *file, int *len, int *type, int subdir)
+ftp_filename(const char *file, size_t *len, int *type, int subdir)
{
const char *s;
@@ -256,6 +256,7 @@
{
char *src, *dst, *end;
int q;
+ size_t len;
if (conn-err != FTP_WORKING_DIRECTORY
conn-err != FTP_FILE_ACTION_OK)
@@ -264,7 +265,8 @@
src = conn-buf + 4;
if (src = end || *src++ != '')
return (FTP_PROTOCOL_ERROR);
- *pwd = malloc(end - src + 1);
+ len = end - src + 1;
+ *pwd = malloc(len);
if (*pwd == NULL)
return (FTP_PROTOCOL_ERROR);
for (q = 0, dst = *pwd; src end; ++src) {
@@ -295,7 +297,8 @@
{
const char *beg, *end;
char *pwd, *dst;
- int e, i, len;
+ int e;
+ size_t i, len;
if (*path != '/') {
ftp_seterr(501);
@@ -342,7 +345,7 @@
len = strlen(pwd);
/* Look for a common prefix between PWD and dir to fetch. */
- for (i = 0; i = len i = end - dst; ++i)
+ for (i = 0; i = len i = (size_t)(end - dst); ++i)
if (pwd[i] != dst[i])
break;
/* Keep going up a dir until we have a matching prefix. */
@@ -409,6 +412,7 @@
case 0:
case 's':
mode = 'S';
+ /*FALLTHROUGH*/
case 'S':
break;
default:
@@
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src Committed By: joerg Date: Wed Mar 24 20:52:39 UTC 2010 Removed Files: src/external/bsd/fetch/dist/libfetch: fetch.cat3 Log Message: Merge To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r0 src/external/bsd/fetch/dist/libfetch/fetch.cat3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src Committed By: joerg Date: Sat Jan 30 21:26:14 UTC 2010 Update of /cvsroot/src/external/bsd/fetch/dist/libfetch In directory ivanova.netbsd.org:/tmp/cvs-serv19449 Log Message: libfetch-2.30: - Revamped connection cache, allowing more than one active session - HTTP keep-alive support Status: Vendor Tag: PKGSRC Release Tags: libfetch-2-30 U src/external/bsd/fetch/dist/libfetch/common.c U src/external/bsd/fetch/dist/libfetch/common.h U src/external/bsd/fetch/dist/libfetch/errlist.sh U src/external/bsd/fetch/dist/libfetch/fetch.3 U src/external/bsd/fetch/dist/libfetch/fetch.c U src/external/bsd/fetch/dist/libfetch/fetch.cat3 U src/external/bsd/fetch/dist/libfetch/fetch.h U src/external/bsd/fetch/dist/libfetch/file.c U src/external/bsd/fetch/dist/libfetch/ftp.c U src/external/bsd/fetch/dist/libfetch/ftp.errors U src/external/bsd/fetch/dist/libfetch/http.c U src/external/bsd/fetch/dist/libfetch/http.errors No conflicts created by this import
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src Committed By: joerg Date: Mon Jan 11 19:40:02 UTC 2010 Update of /cvsroot/src/external/bsd/fetch/dist/libfetch In directory ivanova.netbsd.org:/tmp/cvs-serv19846 Log Message: libfetch-2.27: Fix a bug in the connection caching for FTP. Status: Vendor Tag: PKGSRC Release Tags: libfetch-2-27 U src/external/bsd/fetch/dist/libfetch/errlist.sh U src/external/bsd/fetch/dist/libfetch/common.c U src/external/bsd/fetch/dist/libfetch/common.h U src/external/bsd/fetch/dist/libfetch/fetch.cat3 U src/external/bsd/fetch/dist/libfetch/fetch.3 U src/external/bsd/fetch/dist/libfetch/fetch.c U src/external/bsd/fetch/dist/libfetch/ftp.errors U src/external/bsd/fetch/dist/libfetch/fetch.h U src/external/bsd/fetch/dist/libfetch/file.c U src/external/bsd/fetch/dist/libfetch/ftp.c U src/external/bsd/fetch/dist/libfetch/http.errors U src/external/bsd/fetch/dist/libfetch/http.c No conflicts created by this import
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src Committed By: joerg Date: Thu Oct 15 13:00:00 UTC 2009 Update of /cvsroot/src/external/bsd/fetch/dist/libfetch In directory ivanova.netbsd.org:/tmp/cvs-serv26882 Log Message: libfetch-2.26: - Add support to aggressively cache directory listenings, useful for HTTP - Avoid leaking memory in error cases. From Xavier from Arch Linux. Status: Vendor Tag: PKGSRC Release Tags: libfetch-2-26 U src/external/bsd/fetch/dist/libfetch/errlist.sh U src/external/bsd/fetch/dist/libfetch/common.c U src/external/bsd/fetch/dist/libfetch/common.h U src/external/bsd/fetch/dist/libfetch/fetch.cat3 U src/external/bsd/fetch/dist/libfetch/fetch.3 U src/external/bsd/fetch/dist/libfetch/fetch.c U src/external/bsd/fetch/dist/libfetch/ftp.errors U src/external/bsd/fetch/dist/libfetch/fetch.h U src/external/bsd/fetch/dist/libfetch/file.c U src/external/bsd/fetch/dist/libfetch/ftp.c U src/external/bsd/fetch/dist/libfetch/http.errors U src/external/bsd/fetch/dist/libfetch/http.c No conflicts created by this import
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src Committed By: joerg Date: Fri Aug 21 15:12:55 UTC 2009 Update of /cvsroot/src/external/bsd/fetch/dist/libfetch In directory ivanova.netbsd.org:/tmp/cvs-serv692 Log Message: Import libfetch-2.25: - address a number of lint warnings - fix strict-alignment issues for GCC 4.4 - fix a bug in the line reading optimisation - do not reuse a FTP connection if there is an active transfer on it Status: Vendor Tag: PKGSRC Release Tags: libfetch-2-25 U src/external/bsd/fetch/dist/libfetch/common.c U src/external/bsd/fetch/dist/libfetch/common.h U src/external/bsd/fetch/dist/libfetch/errlist.sh U src/external/bsd/fetch/dist/libfetch/fetch.3 U src/external/bsd/fetch/dist/libfetch/fetch.c U src/external/bsd/fetch/dist/libfetch/fetch.cat3 U src/external/bsd/fetch/dist/libfetch/fetch.h U src/external/bsd/fetch/dist/libfetch/file.c U src/external/bsd/fetch/dist/libfetch/ftp.c U src/external/bsd/fetch/dist/libfetch/ftp.errors U src/external/bsd/fetch/dist/libfetch/http.c U src/external/bsd/fetch/dist/libfetch/http.errors No conflicts created by this import
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src Committed By: joerg Date: Sat Apr 4 23:26:06 UTC 2009 Update of /cvsroot/src/external/bsd/fetch/dist/libfetch In directory ivanova.netbsd.org:/tmp/cvs-serv23341 Log Message: Reimport libfetch-2.23 from pkgsrc, at least one change was lost. Status: Vendor Tag: PKGSRC Release Tags: libfetch-2-23 U src/external/bsd/fetch/dist/libfetch/common.c U src/external/bsd/fetch/dist/libfetch/common.h U src/external/bsd/fetch/dist/libfetch/errlist.sh U src/external/bsd/fetch/dist/libfetch/fetch.3 U src/external/bsd/fetch/dist/libfetch/fetch.c U src/external/bsd/fetch/dist/libfetch/fetch.cat3 U src/external/bsd/fetch/dist/libfetch/fetch.h U src/external/bsd/fetch/dist/libfetch/file.c U src/external/bsd/fetch/dist/libfetch/ftp.c U src/external/bsd/fetch/dist/libfetch/ftp.errors U src/external/bsd/fetch/dist/libfetch/http.c U src/external/bsd/fetch/dist/libfetch/http.errors No conflicts created by this import
