copied mono-api-diff.cs from mono-2-2 branch so new patch can be applied and history...

[mono.git] / eglib / src / gstr.c

diff --git a/eglib/src/gstr.c b/eglib/src/gstr.c
index a02cebee5355dfe77151a5be109a705eb2fd85f1..305f9480e26867fb19f6bcbcef8b34cb25e15df9 100644 (file)
--- a/eglib/src/gstr.c
+++ b/eglib/src/gstr.c
@@ -40,7 +40,7 @@ g_strndup (const gchar *str, gsize n)
        return strndup (str, n);
 #else
        if (str) {
-               char *retval = malloc(n+1);
+               char *retval = g_malloc(n+1);
                if (retval) {
                        strncpy(retval, str, n)[n] = 0;
                }
@@ -212,7 +212,7 @@ g_strsplit (const gchar *string, const gchar *delimiter, gint max_tokens)
                        }
 
                        if (*string) {
-                               int toklen = (string - c);
+                               gsize toklen = (string - c);
                                token = g_strndup (c, toklen);
 
                                /* Need to leave a trailing empty
@@ -283,7 +283,7 @@ g_strsplit_set (const gchar *string, const gchar *delimiter, gint max_tokens)
        c = string;
        while (*string && !(max_tokens > 0 && size >= max_tokens)) {
                if (charcmp (*string, delimiter)) {
-                       int toklen = (string - c);
+                       gsize toklen = (string - c);
                        if (toklen == 0) {
                                token = g_strdup ("");
                        } else {
@@ -527,29 +527,46 @@ g_filename_to_uri (const gchar *filename, const gchar *hostname, GError **error)
        size_t n;
        char *ret, *rp;
        const char *p;
+#ifdef G_OS_WIN32
+       const char *uriPrefix = "file:///";
+#else
+       const char *uriPrefix = "file://";
+#endif
        
        g_return_val_if_fail (filename != NULL, NULL);
 
        if (hostname != NULL)
                g_warning ("%s", "eglib: g_filename_to_uri: hostname not handled");
 
-       if (*filename != '/'){
+       if (!g_path_is_absolute (filename)){
                if (error != NULL)
                        *error = g_error_new (NULL, 2, "Not an absolute filename");
                
                return NULL;
        }
        
-       n = strlen ("file://") + 1;
+       n = strlen (uriPrefix) + 1;
        for (p = filename; *p; p++){
+#ifdef G_OS_WIN32
+               if (*p == '\\') {
+                       n++;
+                       continue;
+               }
+#endif
                if (char_needs_encoding (*p))
                        n += 3;
                else
                        n++;
        }
        ret = g_malloc (n);
-       strcpy (ret, "file://");
+       strcpy (ret, uriPrefix);
        for (p = filename, rp = ret + strlen (ret); *p; p++){
+#ifdef G_OS_WIN32
+               if (*p == '\\') {
+                       *rp++ = '/';
+                       continue;
+               }
+#endif
                if (char_needs_encoding (*p)){
                        *rp++ = '%';
                        *rp++ = hx [((unsigned char)(*p)) >> 4];
@@ -604,13 +621,21 @@ g_filename_from_uri (const gchar *uri, gchar **hostname, GError **error)
                } 
                flen++;
        }
+#ifndef G_OS_WIN32
        flen++;
-       
+#endif
+
        result = g_malloc (flen + 1);
-       *result = '/';
        result [flen] = 0;
 
-       for (p = uri + 8, r = result + 1; *p; p++){
+#ifndef G_OS_WIN32
+       *result = '/';
+       r = result + 1;
+#else
+       r = result;
+#endif
+
+       for (p = uri + 8; *p; p++){
                if (*p == '%'){
                        *r++ = (char)((decode (p [1]) << 4) | decode (p [2]));
                        p += 2;
@@ -666,8 +691,8 @@ g_ascii_strncasecmp (const gchar *s1, const gchar *s2, gsize n)
        g_return_val_if_fail (s2 != NULL, 0);
 
        for (i = 0; i < n; i++){
-               gchar c1 = *s1++;
-               gchar c2 = *s2++;
+               gchar c1 = g_ascii_tolower (*s1++);
+               gchar c2 = g_ascii_tolower (*s2++);
                
                if (c1 == c2)
                        continue;
@@ -792,15 +817,6 @@ g_strescape (const gchar *source, const gchar *exceptions)
        return result;
 }
 
-gchar *
-g_strdup (const gchar *str)
-{
-       if (str == NULL)
-               return NULL;
-
-       return strdup (str);
-}
-
 gint
 g_ascii_xdigit_value (gchar c)
 {
@@ -810,5 +826,12 @@ g_ascii_xdigit_value (gchar c)
                  (c - 'A' + 10))));
 }
 
+gchar *
+g_strnfill (gsize length, gchar fill_char)
+{
+       gchar *ret = g_new (gchar, length + 1);
 
-
+       memset (ret, fill_char, length);
+       ret [length] = 0;
+       return ret;
+}