diff options
| author | Li-Wen Hsu <lwhsu@FreeBSD.org> | 2007-04-13 16:08:44 +0000 |
|---|---|---|
| committer | Li-Wen Hsu <lwhsu@FreeBSD.org> | 2007-04-13 16:08:44 +0000 |
| commit | c98d6b00d7e71a25b326e0a246a6635b2ac300fe (patch) | |
| tree | 43490f562af35dcca6a581b129e9f6f192377e56 /devel/baz/files | |
| parent | 6c8961ae11fa4aaeaa5e296abf9764f5fb2dee33 (diff) | |
| download | ports-c98d6b00d7e71a25b326e0a246a6635b2ac300fe.tar.gz ports-c98d6b00d7e71a25b326e0a246a6635b2ac300fe.zip | |
Notes
Diffstat (limited to 'devel/baz/files')
| -rw-r--r-- | devel/baz/files/patch-pfs-sftp.c | 11 | ||||
| -rw-r--r-- | devel/baz/files/patch-pfs.c | 18 | ||||
| -rw-r--r-- | devel/baz/files/patch-unit-sftp.c | 20 |
3 files changed, 45 insertions, 4 deletions
diff --git a/devel/baz/files/patch-pfs-sftp.c b/devel/baz/files/patch-pfs-sftp.c new file mode 100644 index 000000000000..be725a45a68f --- /dev/null +++ b/devel/baz/files/patch-pfs-sftp.c @@ -0,0 +1,11 @@ +--- src/baz/libarch/pfs-sftp.c.orig Mon Jun 20 23:59:37 2005 ++++ src/baz/libarch/pfs-sftp.c Thu Apr 5 09:16:19 2007 +@@ -1496,7 +1496,7 @@ + */ + arch_uri_heuristics (&parsed_uri); + +- *user = str_save (0, parsed_uri.authinfo); ++ *user = str_save (0, parsed_uri.userinfo); + *hostname = str_save (0, parsed_uri.host); + if (parsed_uri.port) + { diff --git a/devel/baz/files/patch-pfs.c b/devel/baz/files/patch-pfs.c index be346bfac9fe..22399f9c314d 100644 --- a/devel/baz/files/patch-pfs.c +++ b/devel/baz/files/patch-pfs.c @@ -1,7 +1,17 @@ -diff -uN -r src/baz/libarch/pfs.c src/baz/libarch/pfs.c ---- src/baz/libarch/pfs.c 2005-06-20 23:59:37.000000000 +0200 -+++ src/baz/libarch/pfs.c 2006-01-14 17:12:24.000000000 +0100 -@@ -520,6 +520,66 @@ +--- src/baz/libarch/pfs.c.orig Mon Jun 20 23:59:37 2005 ++++ src/baz/libarch/pfs.c Thu Apr 5 09:23:25 2007 +@@ -513,13 +513,73 @@ + char *at_pos = str_chr_index (parsed_uri->host, '@'); + if (!at_pos) + return; +- parsed_uri->authinfo = str_replace (parsed_uri->authinfo, +- str_alloc_cat (0, parsed_uri->authinfo, "@")); +- parsed_uri->authinfo = str_replace (parsed_uri->authinfo, +- str_alloc_cat_n (0, parsed_uri->authinfo, parsed_uri->host, at_pos - parsed_uri->host)); ++ parsed_uri->userinfo = str_replace (parsed_uri->userinfo, ++ str_alloc_cat (0, parsed_uri->userinfo, "@")); ++ parsed_uri->userinfo = str_replace (parsed_uri->userinfo, ++ str_alloc_cat_n (0, parsed_uri->userinfo, parsed_uri->host, at_pos - parsed_uri->host)); parsed_uri->host = str_replace (parsed_uri->host, str_save (0, at_pos + 1)); } diff --git a/devel/baz/files/patch-unit-sftp.c b/devel/baz/files/patch-unit-sftp.c new file mode 100644 index 000000000000..f0a049289de8 --- /dev/null +++ b/devel/baz/files/patch-unit-sftp.c @@ -0,0 +1,20 @@ +--- src/baz/libarch/tests/unit-sftp.c.orig Mon Jun 20 23:59:37 2005 ++++ src/baz/libarch/tests/unit-sftp.c Thu Apr 5 09:58:45 2007 +@@ -35,7 +35,7 @@ + char *host; + unsigned int port; + char *path; +- char *authinfo; ++ char *userinfo; + } ne_uri; + */ + invariant_int_cmp (ne_uri_parse ("sftp://user@email.com@host.phwoar/root/path", &parsed_uri), 0); +@@ -44,7 +44,7 @@ + invariant_str_cmp (parsed_uri.host, "email.com@host.phwoar"); + arch_uri_heuristics (&parsed_uri); + invariant_str_cmp (parsed_uri.host, "host.phwoar"); +- invariant_str_cmp (parsed_uri.authinfo, "user@email.com"); ++ invariant_str_cmp (parsed_uri.userinfo, "user@email.com"); + invariant_int_cmp (parsed_uri.port, 0); + ne_uri_free(&parsed_uri); + |