Attachment #77239 for bug #111264

View | Details | Raw Unified | Return to bug 111264
Collapse All | Expand All

Lines 28-35 Link Here

(-)/home/hsn/hacked/bazaar/Makefile (-2 lines)
28	USE_PERL5_BUILD=yes	28	USE_PERL5_BUILD=yes
29	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
30		30
31	BROKEN= does not build with www/neon 0.26.x
32
33	MAN1= baz.1	31	MAN1= baz.1
34		32
35	MAJORVERSION= 1.4	33	MAJORVERSION= 1.4

Line 0 Link Here

(-)/home/hsn/hacked/bazaar/files/patch-pfs-sftp.c (+11 lines)
	1	--- src/baz/libarch/pfs-sftp.c.orig Mon Jun 20 23:59:37 2005
	2	+++ src/baz/libarch/pfs-sftp.c Thu Apr 5 09:16:19 2007
	3	@@ -1496,7 +1496,7 @@
	4	*/
	5	arch_uri_heuristics (&parsed_uri);
	6
	7	- *user = str_save (0, parsed_uri.authinfo);
	8	+ *user = str_save (0, parsed_uri.userinfo);
	9	*hostname = str_save (0, parsed_uri.host);
	10	if (parsed_uri.port)
	11	{




--- 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));
 }
 




--- 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);
 

Return to bug 111264

Lines 1-7 Link Here

(-)/home/hsn/hacked/bazaar/files/patch-pfs.c (-4 / +14 lines)
1	diff -uN -r src/baz/libarch/pfs.c src/baz/libarch/pfs.c	1	--- src/baz/libarch/pfs.c.orig Mon Jun 20 23:59:37 2005
2	--- src/baz/libarch/pfs.c 2005-06-20 23:59:37.000000000 +0200	2	+++ src/baz/libarch/pfs.c Thu Apr 5 09:23:25 2007
3	+++ src/baz/libarch/pfs.c 2006-01-14 17:12:24.000000000 +0100	3	@@ -513,13 +513,73 @@
4	@@ -520,6 +520,66 @@	4	char *at_pos = str_chr_index (parsed_uri->host, '@');
		5	if (!at_pos)
		6	return;
		7	- parsed_uri->authinfo = str_replace (parsed_uri->authinfo,
		8	- str_alloc_cat (0, parsed_uri->authinfo, "@"));
		9	- parsed_uri->authinfo = str_replace (parsed_uri->authinfo,
		10	- str_alloc_cat_n (0, parsed_uri->authinfo, parsed_uri->host, at_pos - parsed_uri->host));
		11	+ parsed_uri->userinfo = str_replace (parsed_uri->userinfo,
		12	+ str_alloc_cat (0, parsed_uri->userinfo, "@"));
		13	+ parsed_uri->userinfo = str_replace (parsed_uri->userinfo,
		14	+ str_alloc_cat_n (0, parsed_uri->userinfo, parsed_uri->host, at_pos - parsed_uri->host));
5	parsed_uri->host = str_replace (parsed_uri->host, str_save (0, at_pos + 1));	15	parsed_uri->host = str_replace (parsed_uri->host, str_save (0, at_pos + 1));
6	}	16	}
7		17

Line 0 Link Here

(-)/home/hsn/hacked/bazaar/files/patch-unit-sftp.c (+20 lines)
	1	--- src/baz/libarch/tests/unit-sftp.c.orig Mon Jun 20 23:59:37 2005
	2	+++ src/baz/libarch/tests/unit-sftp.c Thu Apr 5 09:58:45 2007
	3	@@ -35,7 +35,7 @@
	4	char *host;
	5	unsigned int port;
	6	char *path;
	7	- char *authinfo;
	8	+ char *userinfo;
	9	} ne_uri;
	10	*/
	11	invariant_int_cmp (ne_uri_parse ("sftp://user@email.com@host.phwoar/root/path", &parsed_uri), 0);
	12	@@ -44,7 +44,7 @@
	13	invariant_str_cmp (parsed_uri.host, "email.com@host.phwoar");
	14	arch_uri_heuristics (&parsed_uri);
	15	invariant_str_cmp (parsed_uri.host, "host.phwoar");
	16	- invariant_str_cmp (parsed_uri.authinfo, "user@email.com");
	17	+ invariant_str_cmp (parsed_uri.userinfo, "user@email.com");
	18	invariant_int_cmp (parsed_uri.port, 0);
	19	ne_uri_free(&parsed_uri);
	20