X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2Fghostutils.c;h=79e9514466509ac5a44ab78ba846e8403703c564;hb=20f6cc2a10ba26860e7a6d27c100deadb5497772;hp=3871456876506f64838b6247abc91bc6d7dd8357;hpb=a4e38786750d538b334b8a7a7cc9f5a3ff48bc33;p=platform%2Fupstream%2Fglib.git
diff --git a/glib/ghostutils.c b/glib/ghostutils.c
index 3871456..79e9514 100644
--- a/glib/ghostutils.c
+++ b/glib/ghostutils.c
@@ -14,32 +14,33 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see .
*/
#include "config.h"
-#include "glib.h"
-#include "glibintl.h"
-
#include
-#include "galias.h"
+#include "ghostutils.h"
+
+#include "garray.h"
+#include "gmem.h"
+#include "gstring.h"
+#include "gstrfuncs.h"
+#include "glibintl.h"
+
/**
* SECTION:ghostutils
* @short_description: Internet hostname utilities
- * @include: glib.h
*
* Functions for manipulating internet hostnames; in particular, for
* converting between Unicode and ASCII-encoded forms of
* Internationalized Domain Names (IDNs).
*
- * The Internationalized Domain
- * Names for Applications (IDNA) standards allow for the use
+ * The
+ * [Internationalized Domain Names for Applications (IDNA)](http://www.ietf.org/rfc/rfc3490.txt)
+ * standards allow for the use
* of Unicode domain names in applications, while providing
* backward-compatibility with the old ASCII-only DNS, by defining an
* ASCII-Compatible Encoding of any given Unicode name, which can be
@@ -300,7 +301,8 @@ idna_is_prohibited (gunichar ch)
/* RFC 3491 IDN cleanup algorithm. */
static gchar *
nameprep (const gchar *hostname,
- gint len)
+ gint len,
+ gboolean *is_unicode)
{
gchar *name, *tmp = NULL, *p;
@@ -333,12 +335,15 @@ nameprep (const gchar *hostname,
/* If there are no UTF8 characters, we're done. */
if (!contains_non_ascii (name, len))
{
+ *is_unicode = FALSE;
if (name == (gchar *)hostname)
return len == -1 ? g_strdup (hostname) : g_strndup (hostname, len);
else
return name;
}
+ *is_unicode = TRUE;
+
/* Normalize */
name = g_utf8_normalize (name, len, G_NORMALIZE_NFKC);
g_free (tmp);
@@ -380,6 +385,26 @@ nameprep (const gchar *hostname,
return name;
}
+/* RFC 3490, section 3.1 says '.', 0x3002, 0xFF0E, and 0xFF61 count as
+ * label-separating dots. @str must be '\0'-terminated.
+ */
+#define idna_is_dot(str) ( \
+ ((guchar)(str)[0] == '.') || \
+ ((guchar)(str)[0] == 0xE3 && (guchar)(str)[1] == 0x80 && (guchar)(str)[2] == 0x82) || \
+ ((guchar)(str)[0] == 0xEF && (guchar)(str)[1] == 0xBC && (guchar)(str)[2] == 0x8E) || \
+ ((guchar)(str)[0] == 0xEF && (guchar)(str)[1] == 0xBD && (guchar)(str)[2] == 0xA1) )
+
+static const gchar *
+idna_end_of_label (const gchar *str)
+{
+ for (; *str; str = g_utf8_next_char (str))
+ {
+ if (idna_is_dot (str))
+ return str;
+ }
+ return str;
+}
+
/**
* g_hostname_to_ascii:
* @hostname: a valid UTF-8 or ASCII hostname
@@ -388,7 +413,7 @@ nameprep (const gchar *hostname,
* string containing no uppercase letters and not ending with a
* trailing dot.
*
- * Return value: an ASCII hostname, which must be freed, or %NULL if
+ * Returns: an ASCII hostname, which must be freed, or %NULL if
* @hostname is in some way invalid.
*
* Since: 2.22
@@ -401,16 +426,16 @@ g_hostname_to_ascii (const gchar *hostname)
gssize llen, oldlen;
gboolean unicode;
- label = name = nameprep (hostname, -1);
- if (!name)
- return NULL;
+ label = name = nameprep (hostname, -1, &unicode);
+ if (!name || !unicode)
+ return name;
out = g_string_new (NULL);
do
{
unicode = FALSE;
- for (p = label; *p && *p != '.'; p++)
+ for (p = label; *p && !idna_is_dot (p); p++)
{
if ((guchar)*p > 0x80)
unicode = TRUE;
@@ -434,7 +459,9 @@ g_hostname_to_ascii (const gchar *hostname)
goto fail;
label += llen;
- if (*label && *++label)
+ if (*label)
+ label = g_utf8_next_char (label);
+ if (*label)
g_string_append_c (out, '.');
}
while (*label);
@@ -460,7 +487,7 @@ g_hostname_to_ascii (const gchar *hostname)
* segments, and so it is possible for g_hostname_is_non_ascii() and
* g_hostname_is_ascii_encoded() to both return %TRUE for a name.
*
- * Return value: %TRUE if @hostname contains any non-ASCII characters
+ * Returns: %TRUE if @hostname contains any non-ASCII characters
*
* Since: 2.22
**/
@@ -567,7 +594,7 @@ punycode_decode (const gchar *input,
* Of course if @hostname is not an internationalized hostname, then
* the canonical presentation form will be entirely ASCII.
*
- * Return value: a UTF-8 hostname, which must be freed, or %NULL if
+ * Returns: a UTF-8 hostname, which must be freed, or %NULL if
* @hostname is in some way invalid.
*
* Since: 2.22
@@ -582,7 +609,7 @@ g_hostname_to_unicode (const gchar *hostname)
do
{
- llen = strcspn (hostname, ".");
+ llen = idna_end_of_label (hostname) - hostname;
if (!g_ascii_strncasecmp (hostname, IDNA_ACE_PREFIX, IDNA_ACE_PREFIX_LEN))
{
hostname += IDNA_ACE_PREFIX_LEN;
@@ -595,7 +622,8 @@ g_hostname_to_unicode (const gchar *hostname)
}
else
{
- gchar *canonicalized = nameprep (hostname, llen);
+ gboolean unicode;
+ gchar *canonicalized = nameprep (hostname, llen, &unicode);
if (!canonicalized)
{
@@ -607,7 +635,9 @@ g_hostname_to_unicode (const gchar *hostname)
}
hostname += llen;
- if (*hostname && *++hostname)
+ if (*hostname)
+ hostname = g_utf8_next_char (hostname);
+ if (*hostname)
g_string_append_c (out, '.');
}
while (*hostname);
@@ -628,7 +658,7 @@ g_hostname_to_unicode (const gchar *hostname)
* segments, and so it is possible for g_hostname_is_non_ascii() and
* g_hostname_is_ascii_encoded() to both return %TRUE for a name.
*
- * Return value: %TRUE if @hostname contains any ASCII-encoded
+ * Returns: %TRUE if @hostname contains any ASCII-encoded
* segments.
*
* Since: 2.22
@@ -640,8 +670,10 @@ g_hostname_is_ascii_encoded (const gchar *hostname)
{
if (!g_ascii_strncasecmp (hostname, IDNA_ACE_PREFIX, IDNA_ACE_PREFIX_LEN))
return TRUE;
- hostname = strchr (hostname, '.');
- if (!hostname++)
+ hostname = idna_end_of_label (hostname);
+ if (*hostname)
+ hostname = g_utf8_next_char (hostname);
+ if (!*hostname)
return FALSE;
}
}
@@ -653,7 +685,7 @@ g_hostname_is_ascii_encoded (const gchar *hostname)
* Tests if @hostname is the string form of an IPv4 or IPv6 address.
* (Eg, "192.168.0.1".)
*
- * Return value: %TRUE if @hostname is an IP address
+ * Returns: %TRUE if @hostname is an IP address
*
* Since: 2.22
**/
@@ -764,6 +796,3 @@ g_hostname_is_ip_address (const gchar *hostname)
/* If there's nothing left to parse, then it's ok. */
return !*p;
}
-
-#define __G_HOST_UTILS_C__
-#include "galiasdef.c"