c98d6b00d7
- Remove 4.x stuff - Change PORTREVISION?= to PORTREVISION=, this is not a master port - Remove gmake in BUILD_DEPENDS, we already have USE_GMAKE PR: 111264 [1] Submitted by: Radim Kolar SF.NET <hsn AT sendmail.cz> Approved by: Ulf Lilleengen <lulf AT stud.ntnu.no> (maintainer), clsung (mentor)
89 lines
3.4 KiB
C
89 lines
3.4 KiB
C
--- 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));
|
|
}
|
|
|
|
+/* RFC2396 spake:
|
|
+ * "Data must be escaped if it does not have a representation
|
|
+ * using an unreserved character".
|
|
+ */
|
|
+
|
|
+/* Lookup table: character classes from 2396. (This is overkill) */
|
|
+
|
|
+#define SP 0 /* space = <US-ASCII coded character 20 hexadecimal> */
|
|
+#define CO 0 /* control = <US-ASCII coded characters 00-1F and 7F hexadecimal> */
|
|
+#define DE 0 /* delims = "<" | ">" | "#" | "%" | <"> */
|
|
+#define UW 0 /* unwise = "{" | "}" | "|" | "\" | "^" | "[" | "]" | "`" */
|
|
+#define MA 1 /* mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")" */
|
|
+#define AN 2 /* alphanum = alpha | digit */
|
|
+#define RE 2 /* reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | "$" | "," */
|
|
+
|
|
+static const char uri_chars[128] = {
|
|
+/* +2 +4 +6 +8 +10 +12 +14 */
|
|
+/* 0 */ CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO,
|
|
+/* 16 */ CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO,
|
|
+/* 32 */ SP, MA, DE, DE, RE, DE, RE, MA, MA, MA, MA, RE, RE, MA, MA, RE,
|
|
+/* 48 */ AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, RE, RE, DE, RE, DE, RE,
|
|
+/* 64 */ RE, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN,
|
|
+/* 80 */ AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, UW, UW, UW, UW, MA,
|
|
+/* 96 */ UW, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN,
|
|
+/* 112 */ AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, UW, UW, UW, MA, CO
|
|
+};
|
|
+
|
|
+#define ESCAPE(ch) (((const signed char)(ch) < 0 || \
|
|
+ uri_chars[(unsigned int)(ch)] == 0))
|
|
+
|
|
+char *oldneon_ne_path_escape(const char *abs_path)
|
|
+{
|
|
+ const char *pnt;
|
|
+ char *ret, *retpos;
|
|
+ int count = 0;
|
|
+ for (pnt = abs_path; *pnt != '\0'; pnt++) {
|
|
+ if (ESCAPE(*pnt)) {
|
|
+ count++;
|
|
+ }
|
|
+ }
|
|
+ if (count == 0) {
|
|
+ return ne_strdup(abs_path);
|
|
+ }
|
|
+ /* An escaped character is "%xx", i.e., two MORE
|
|
+ * characters than the original string */
|
|
+ retpos = ret = ne_malloc(strlen(abs_path) + 2*count + 1);
|
|
+ for (pnt = abs_path; *pnt != '\0'; pnt++) {
|
|
+ if (ESCAPE(*pnt)) {
|
|
+ /* Escape it - %<hex><hex> */
|
|
+ sprintf(retpos, "%%%02x", (unsigned char) *pnt);
|
|
+ retpos += 3;
|
|
+ } else {
|
|
+ /* It's cool */
|
|
+ *retpos++ = *pnt;
|
|
+ }
|
|
+ }
|
|
+ *retpos = '\0';
|
|
+ return ret;
|
|
+}
|
|
+
|
|
/**
|
|
* \brief escape a location
|
|
*
|
|
@@ -528,7 +588,7 @@
|
|
t_uchar *
|
|
escape_location (t_uchar const *location)
|
|
{
|
|
- return ne_path_escape(location);
|
|
+ return oldneon_ne_path_escape(location);
|
|
}
|
|
|
|
/**
|