2001-08-26 23:39:47 +02:00
|
|
|
/* GLIB - Library of useful routines for C programming
|
|
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Modified by the GLib Team and others 1997-2000. See the AUTHORS
|
|
|
|
* file for a list of people on the GLib Team. See the ChangeLog
|
|
|
|
* files for a list of changes. These files are distributed with
|
|
|
|
* GLib at ftp://ftp.gtk.org/pub/gtk/.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#undef G_DISABLE_ASSERT
|
|
|
|
#undef G_LOG_DOMAIN
|
|
|
|
|
|
|
|
#include <glib.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
char *filename;
|
|
|
|
char *hostname;
|
|
|
|
char *expected_result;
|
|
|
|
GConvertError expected_error; /* If failed */
|
|
|
|
} ToUriTest;
|
|
|
|
|
|
|
|
ToUriTest
|
|
|
|
to_uri_tests[] = {
|
|
|
|
{ "/etc", NULL, "file:///etc"},
|
|
|
|
{ "/etc", "", "file:///etc"},
|
2001-08-27 20:01:08 +02:00
|
|
|
{ "/etc", "otherhost", "file://otherhost/etc"},
|
2001-08-26 23:39:47 +02:00
|
|
|
#ifdef G_OS_WIN32
|
Not used on Windows, don't even compile it then.
2002-01-23 Tor Lillqvist <tml@iki.fi>
* glib/gconvert.c: (strdup_len): Not used on Windows, don't even
compile it then.
(acceptable): Improve comments for the _acceptable_ table: put
each ASCII char above the hex number for it.
(g_escape_file_uri): On Windows, turn backslashes in the file name
into plain ("forward") slashes.
(g_filename_from_uri): On Windows, don't return the hostname
"localhost", because we can not be 100% sure it will be recognized
in all cases anyway, so simpler to turn it into a null
hostname.
Change slashes in the filename into backslashes, as that is the
more canonical separator.
Recognize drive letters (either followed by a colon or a vertical
bar, as used by some browsers), and if the filename part starts
with a such, don't include any (back)slash.
Don't drop any extra leading slash in the filename on Unix.
(g_filename_to_uri): On Windows, if the hostname is "localhost",
don't use it, for consistency with g_filename_from_uri().
tests/uri-test.c: Change accordingly, so that all tests pass on
Windows. Unix, too, I hope, though I couldn't check that now.
(main): Unset the G_BROKEN_FILENAMES environment variable on Unix,
as some tests require that filenames are in UTF-8. Is unsetenv()
portable?
These changes should fix bugs #59387, #59652, #59657 and #59658.
2002-01-23 01:05:30 +01:00
|
|
|
{ "/etc", "localhost", "file:///etc"},
|
|
|
|
{ "c:\\windows", NULL, "file:///c:/windows"},
|
|
|
|
{ "c:\\windows", "localhost", "file:///c:/windows"},
|
|
|
|
{ "c:\\windows", "otherhost", "file://otherhost/c:/windows"},
|
|
|
|
{ "\\\\server\\share\\dir", NULL, "file:////server/share/dir"},
|
|
|
|
{ "\\\\server\\share\\dir", "localhost", "file:////server/share/dir"},
|
2001-08-27 20:01:08 +02:00
|
|
|
#else
|
Not used on Windows, don't even compile it then.
2002-01-23 Tor Lillqvist <tml@iki.fi>
* glib/gconvert.c: (strdup_len): Not used on Windows, don't even
compile it then.
(acceptable): Improve comments for the _acceptable_ table: put
each ASCII char above the hex number for it.
(g_escape_file_uri): On Windows, turn backslashes in the file name
into plain ("forward") slashes.
(g_filename_from_uri): On Windows, don't return the hostname
"localhost", because we can not be 100% sure it will be recognized
in all cases anyway, so simpler to turn it into a null
hostname.
Change slashes in the filename into backslashes, as that is the
more canonical separator.
Recognize drive letters (either followed by a colon or a vertical
bar, as used by some browsers), and if the filename part starts
with a such, don't include any (back)slash.
Don't drop any extra leading slash in the filename on Unix.
(g_filename_to_uri): On Windows, if the hostname is "localhost",
don't use it, for consistency with g_filename_from_uri().
tests/uri-test.c: Change accordingly, so that all tests pass on
Windows. Unix, too, I hope, though I couldn't check that now.
(main): Unset the G_BROKEN_FILENAMES environment variable on Unix,
as some tests require that filenames are in UTF-8. Is unsetenv()
portable?
These changes should fix bugs #59387, #59652, #59657 and #59658.
2002-01-23 01:05:30 +01:00
|
|
|
{ "/etc", "localhost", "file://localhost/etc"},
|
2001-08-27 20:01:08 +02:00
|
|
|
{ "c:\\windows", NULL, NULL, G_CONVERT_ERROR_NOT_ABSOLUTE_PATH}, /* it's important to get this error on Unix */
|
|
|
|
{ "c:\\windows", "localhost", NULL, G_CONVERT_ERROR_NOT_ABSOLUTE_PATH},
|
|
|
|
{ "c:\\windows", "otherhost", NULL, G_CONVERT_ERROR_NOT_ABSOLUTE_PATH},
|
2001-08-26 23:39:47 +02:00
|
|
|
#endif
|
|
|
|
{ "etc", "localhost", NULL, G_CONVERT_ERROR_NOT_ABSOLUTE_PATH},
|
Not used on Windows, don't even compile it then.
2002-01-23 Tor Lillqvist <tml@iki.fi>
* glib/gconvert.c: (strdup_len): Not used on Windows, don't even
compile it then.
(acceptable): Improve comments for the _acceptable_ table: put
each ASCII char above the hex number for it.
(g_escape_file_uri): On Windows, turn backslashes in the file name
into plain ("forward") slashes.
(g_filename_from_uri): On Windows, don't return the hostname
"localhost", because we can not be 100% sure it will be recognized
in all cases anyway, so simpler to turn it into a null
hostname.
Change slashes in the filename into backslashes, as that is the
more canonical separator.
Recognize drive letters (either followed by a colon or a vertical
bar, as used by some browsers), and if the filename part starts
with a such, don't include any (back)slash.
Don't drop any extra leading slash in the filename on Unix.
(g_filename_to_uri): On Windows, if the hostname is "localhost",
don't use it, for consistency with g_filename_from_uri().
tests/uri-test.c: Change accordingly, so that all tests pass on
Windows. Unix, too, I hope, though I couldn't check that now.
(main): Unset the G_BROKEN_FILENAMES environment variable on Unix,
as some tests require that filenames are in UTF-8. Is unsetenv()
portable?
These changes should fix bugs #59387, #59652, #59657 and #59658.
2002-01-23 01:05:30 +01:00
|
|
|
#ifndef G_OS_WIN32
|
|
|
|
/* g_filename_to_utf8 uses current code page on Win32, these tests assume that
|
|
|
|
* local filenames *are* in UTF-8.
|
|
|
|
*/
|
2002-02-08 20:57:35 +01:00
|
|
|
{ "/etc/\xE5\xE4\xF6", NULL, NULL, G_CONVERT_ERROR_ILLEGAL_SEQUENCE},
|
|
|
|
{ "/etc/\xC3\xB6\xC3\xA4\xC3\xA5", NULL, "file:///etc/%C3%B6%C3%A4%C3%A5"},
|
Not used on Windows, don't even compile it then.
2002-01-23 Tor Lillqvist <tml@iki.fi>
* glib/gconvert.c: (strdup_len): Not used on Windows, don't even
compile it then.
(acceptable): Improve comments for the _acceptable_ table: put
each ASCII char above the hex number for it.
(g_escape_file_uri): On Windows, turn backslashes in the file name
into plain ("forward") slashes.
(g_filename_from_uri): On Windows, don't return the hostname
"localhost", because we can not be 100% sure it will be recognized
in all cases anyway, so simpler to turn it into a null
hostname.
Change slashes in the filename into backslashes, as that is the
more canonical separator.
Recognize drive letters (either followed by a colon or a vertical
bar, as used by some browsers), and if the filename part starts
with a such, don't include any (back)slash.
Don't drop any extra leading slash in the filename on Unix.
(g_filename_to_uri): On Windows, if the hostname is "localhost",
don't use it, for consistency with g_filename_from_uri().
tests/uri-test.c: Change accordingly, so that all tests pass on
Windows. Unix, too, I hope, though I couldn't check that now.
(main): Unset the G_BROKEN_FILENAMES environment variable on Unix,
as some tests require that filenames are in UTF-8. Is unsetenv()
portable?
These changes should fix bugs #59387, #59652, #59657 and #59658.
2002-01-23 01:05:30 +01:00
|
|
|
#endif
|
2002-02-08 20:57:35 +01:00
|
|
|
{ "/etc", "\xC3\xB6\xC3\xA4\xC3\xA5", "file://%C3%B6%C3%A4%C3%A5/etc"},
|
|
|
|
{ "/etc", "\xE5\xE4\xF6", NULL, G_CONVERT_ERROR_ILLEGAL_SEQUENCE},
|
2001-08-26 23:39:47 +02:00
|
|
|
{ "/etc/file with #%", NULL, "file:///etc/file%20with%20%23%25"},
|
2001-08-27 20:01:08 +02:00
|
|
|
{ "", NULL, NULL, G_CONVERT_ERROR_NOT_ABSOLUTE_PATH},
|
|
|
|
{ "", "", NULL, G_CONVERT_ERROR_NOT_ABSOLUTE_PATH},
|
|
|
|
{ "", "localhost", NULL, G_CONVERT_ERROR_NOT_ABSOLUTE_PATH},
|
|
|
|
{ "", "otherhost", NULL, G_CONVERT_ERROR_NOT_ABSOLUTE_PATH},
|
|
|
|
{ "/0123456789", NULL, "file:///0123456789"},
|
|
|
|
{ "/ABCDEFGHIJKLMNOPQRSTUVWXYZ", NULL, "file:///ABCDEFGHIJKLMNOPQRSTUVWXYZ"},
|
|
|
|
{ "/abcdefghijklmnopqrstuvwxyz", NULL, "file:///abcdefghijklmnopqrstuvwxyz"},
|
|
|
|
{ "/-_.!~*'()", NULL, "file:///-_.!~*'()"},
|
Not used on Windows, don't even compile it then.
2002-01-23 Tor Lillqvist <tml@iki.fi>
* glib/gconvert.c: (strdup_len): Not used on Windows, don't even
compile it then.
(acceptable): Improve comments for the _acceptable_ table: put
each ASCII char above the hex number for it.
(g_escape_file_uri): On Windows, turn backslashes in the file name
into plain ("forward") slashes.
(g_filename_from_uri): On Windows, don't return the hostname
"localhost", because we can not be 100% sure it will be recognized
in all cases anyway, so simpler to turn it into a null
hostname.
Change slashes in the filename into backslashes, as that is the
more canonical separator.
Recognize drive letters (either followed by a colon or a vertical
bar, as used by some browsers), and if the filename part starts
with a such, don't include any (back)slash.
Don't drop any extra leading slash in the filename on Unix.
(g_filename_to_uri): On Windows, if the hostname is "localhost",
don't use it, for consistency with g_filename_from_uri().
tests/uri-test.c: Change accordingly, so that all tests pass on
Windows. Unix, too, I hope, though I couldn't check that now.
(main): Unset the G_BROKEN_FILENAMES environment variable on Unix,
as some tests require that filenames are in UTF-8. Is unsetenv()
portable?
These changes should fix bugs #59387, #59652, #59657 and #59658.
2002-01-23 01:05:30 +01:00
|
|
|
#ifdef G_OS_WIN32
|
|
|
|
/* As '\\' is a path separator on Win32, it gets turned into '/' in the URI */
|
|
|
|
{ "/\"#%<>[\\]^`{|}\x7F", NULL, "file:///%22%23%25%3C%3E%5B/%5D%5E%60%7B%7C%7D%7F"},
|
|
|
|
#else
|
|
|
|
/* On Unix, '\\' is a normal character in the file name */
|
2001-08-27 20:01:08 +02:00
|
|
|
{ "/\"#%<>[\\]^`{|}\x7F", NULL, "file:///%22%23%25%3C%3E%5B%5C%5D%5E%60%7B%7C%7D%7F"},
|
Not used on Windows, don't even compile it then.
2002-01-23 Tor Lillqvist <tml@iki.fi>
* glib/gconvert.c: (strdup_len): Not used on Windows, don't even
compile it then.
(acceptable): Improve comments for the _acceptable_ table: put
each ASCII char above the hex number for it.
(g_escape_file_uri): On Windows, turn backslashes in the file name
into plain ("forward") slashes.
(g_filename_from_uri): On Windows, don't return the hostname
"localhost", because we can not be 100% sure it will be recognized
in all cases anyway, so simpler to turn it into a null
hostname.
Change slashes in the filename into backslashes, as that is the
more canonical separator.
Recognize drive letters (either followed by a colon or a vertical
bar, as used by some browsers), and if the filename part starts
with a such, don't include any (back)slash.
Don't drop any extra leading slash in the filename on Unix.
(g_filename_to_uri): On Windows, if the hostname is "localhost",
don't use it, for consistency with g_filename_from_uri().
tests/uri-test.c: Change accordingly, so that all tests pass on
Windows. Unix, too, I hope, though I couldn't check that now.
(main): Unset the G_BROKEN_FILENAMES environment variable on Unix,
as some tests require that filenames are in UTF-8. Is unsetenv()
portable?
These changes should fix bugs #59387, #59652, #59657 and #59658.
2002-01-23 01:05:30 +01:00
|
|
|
#endif
|
2001-08-27 20:01:08 +02:00
|
|
|
{ "/;@+$,", NULL, "file:///%3B%40%2B%24%2C"},
|
Not used on Windows, don't even compile it then.
2002-01-23 Tor Lillqvist <tml@iki.fi>
* glib/gconvert.c: (strdup_len): Not used on Windows, don't even
compile it then.
(acceptable): Improve comments for the _acceptable_ table: put
each ASCII char above the hex number for it.
(g_escape_file_uri): On Windows, turn backslashes in the file name
into plain ("forward") slashes.
(g_filename_from_uri): On Windows, don't return the hostname
"localhost", because we can not be 100% sure it will be recognized
in all cases anyway, so simpler to turn it into a null
hostname.
Change slashes in the filename into backslashes, as that is the
more canonical separator.
Recognize drive letters (either followed by a colon or a vertical
bar, as used by some browsers), and if the filename part starts
with a such, don't include any (back)slash.
Don't drop any extra leading slash in the filename on Unix.
(g_filename_to_uri): On Windows, if the hostname is "localhost",
don't use it, for consistency with g_filename_from_uri().
tests/uri-test.c: Change accordingly, so that all tests pass on
Windows. Unix, too, I hope, though I couldn't check that now.
(main): Unset the G_BROKEN_FILENAMES environment variable on Unix,
as some tests require that filenames are in UTF-8. Is unsetenv()
portable?
These changes should fix bugs #59387, #59652, #59657 and #59658.
2002-01-23 01:05:30 +01:00
|
|
|
/* This and some of the following are of course as such illegal file names on Windows,
|
|
|
|
* and would not occur in real life.
|
|
|
|
*/
|
|
|
|
{ "/:", NULL, "file:///:"},
|
2001-08-27 20:01:08 +02:00
|
|
|
{ "/?&=", NULL, "file:///?&="}, /* these are not escaped and other reserved characters are -- is that really what we want? */
|
2002-02-08 20:57:35 +01:00
|
|
|
{ "/", "0123456789-", NULL, G_CONVERT_ERROR_ILLEGAL_SEQUENCE},
|
2001-08-27 20:01:08 +02:00
|
|
|
{ "/", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "file://ABCDEFGHIJKLMNOPQRSTUVWXYZ/"},
|
|
|
|
{ "/", "abcdefghijklmnopqrstuvwxyz", "file://abcdefghijklmnopqrstuvwxyz/"},
|
2002-02-08 20:57:35 +01:00
|
|
|
{ "/", "_.!~*'()", NULL, G_CONVERT_ERROR_ILLEGAL_SEQUENCE},
|
|
|
|
{ "/", "\"#%<>[\\]^`{|}\x7F", NULL, G_CONVERT_ERROR_ILLEGAL_SEQUENCE},
|
|
|
|
{ "/", ";?&=+$,", NULL, G_CONVERT_ERROR_ILLEGAL_SEQUENCE},
|
|
|
|
{ "/", "/", NULL, G_CONVERT_ERROR_ILLEGAL_SEQUENCE},
|
|
|
|
{ "/", "@:", NULL, G_CONVERT_ERROR_ILLEGAL_SEQUENCE},
|
2001-08-27 20:01:08 +02:00
|
|
|
{ "/", "\x80\xFF", NULL, G_CONVERT_ERROR_ILLEGAL_SEQUENCE},
|
|
|
|
{ "/", "\xC3\x80\xC3\xBF", "file://%C3%80%C3%BF/"},
|
2001-08-26 23:39:47 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
char *uri;
|
|
|
|
char *expected_filename;
|
|
|
|
char *expected_hostname;
|
|
|
|
GConvertError expected_error; /* If failed */
|
|
|
|
} FromUriTest;
|
|
|
|
|
|
|
|
FromUriTest
|
|
|
|
from_uri_tests[] = {
|
2001-08-27 20:01:08 +02:00
|
|
|
{ "file:///etc", "/etc"},
|
|
|
|
{ "file:/etc", "/etc"},
|
Not used on Windows, don't even compile it then.
2002-01-23 Tor Lillqvist <tml@iki.fi>
* glib/gconvert.c: (strdup_len): Not used on Windows, don't even
compile it then.
(acceptable): Improve comments for the _acceptable_ table: put
each ASCII char above the hex number for it.
(g_escape_file_uri): On Windows, turn backslashes in the file name
into plain ("forward") slashes.
(g_filename_from_uri): On Windows, don't return the hostname
"localhost", because we can not be 100% sure it will be recognized
in all cases anyway, so simpler to turn it into a null
hostname.
Change slashes in the filename into backslashes, as that is the
more canonical separator.
Recognize drive letters (either followed by a colon or a vertical
bar, as used by some browsers), and if the filename part starts
with a such, don't include any (back)slash.
Don't drop any extra leading slash in the filename on Unix.
(g_filename_to_uri): On Windows, if the hostname is "localhost",
don't use it, for consistency with g_filename_from_uri().
tests/uri-test.c: Change accordingly, so that all tests pass on
Windows. Unix, too, I hope, though I couldn't check that now.
(main): Unset the G_BROKEN_FILENAMES environment variable on Unix,
as some tests require that filenames are in UTF-8. Is unsetenv()
portable?
These changes should fix bugs #59387, #59652, #59657 and #59658.
2002-01-23 01:05:30 +01:00
|
|
|
#ifdef G_OS_WIN32
|
|
|
|
/* On Win32 we don't return "localhost" hostames, just in case
|
|
|
|
* it isn't recognized anyway.
|
|
|
|
*/
|
|
|
|
{ "file://localhost/etc", "/etc", NULL},
|
|
|
|
{ "file://localhost/etc/%23%25%20file", "/etc/#% file", NULL},
|
|
|
|
#else
|
2001-08-27 20:01:08 +02:00
|
|
|
{ "file://localhost/etc", "/etc", "localhost"},
|
|
|
|
{ "file://localhost/etc/%23%25%20file", "/etc/#% file", "localhost"},
|
Not used on Windows, don't even compile it then.
2002-01-23 Tor Lillqvist <tml@iki.fi>
* glib/gconvert.c: (strdup_len): Not used on Windows, don't even
compile it then.
(acceptable): Improve comments for the _acceptable_ table: put
each ASCII char above the hex number for it.
(g_escape_file_uri): On Windows, turn backslashes in the file name
into plain ("forward") slashes.
(g_filename_from_uri): On Windows, don't return the hostname
"localhost", because we can not be 100% sure it will be recognized
in all cases anyway, so simpler to turn it into a null
hostname.
Change slashes in the filename into backslashes, as that is the
more canonical separator.
Recognize drive letters (either followed by a colon or a vertical
bar, as used by some browsers), and if the filename part starts
with a such, don't include any (back)slash.
Don't drop any extra leading slash in the filename on Unix.
(g_filename_to_uri): On Windows, if the hostname is "localhost",
don't use it, for consistency with g_filename_from_uri().
tests/uri-test.c: Change accordingly, so that all tests pass on
Windows. Unix, too, I hope, though I couldn't check that now.
(main): Unset the G_BROKEN_FILENAMES environment variable on Unix,
as some tests require that filenames are in UTF-8. Is unsetenv()
portable?
These changes should fix bugs #59387, #59652, #59657 and #59658.
2002-01-23 01:05:30 +01:00
|
|
|
#endif
|
2001-08-27 20:01:08 +02:00
|
|
|
{ "file://otherhost/etc", "/etc", "otherhost"},
|
|
|
|
{ "file://otherhost/etc/%23%25%20file", "/etc/#% file", "otherhost"},
|
2002-02-08 20:57:35 +01:00
|
|
|
{ "file://%C3%B6%C3%A4%C3%A5/etc", "/etc", "\xC3\xB6\xC3\xA4\xC3\xA5"},
|
2001-10-01 22:40:05 +02:00
|
|
|
{ "file:////etc/%C3%B6%C3%C3%C3%A5", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
2002-02-08 20:57:35 +01:00
|
|
|
{ "file://localhost/\xE5\xE4\xF6", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
|
|
|
{ "file://\xE5\xE4\xF6/etc", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
|
|
|
{ "file://localhost/%E5%E4%F6", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
|
|
|
{ "file://%E5%E4%F6/etc", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
2001-10-01 22:40:05 +02:00
|
|
|
{ "file:///some/file#bad", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
|
|
|
{ "file://some", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
|
|
|
{ "", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
|
|
|
{ "file:test", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
|
|
|
{ "http://www.yahoo.com/", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
Not used on Windows, don't even compile it then.
2002-01-23 Tor Lillqvist <tml@iki.fi>
* glib/gconvert.c: (strdup_len): Not used on Windows, don't even
compile it then.
(acceptable): Improve comments for the _acceptable_ table: put
each ASCII char above the hex number for it.
(g_escape_file_uri): On Windows, turn backslashes in the file name
into plain ("forward") slashes.
(g_filename_from_uri): On Windows, don't return the hostname
"localhost", because we can not be 100% sure it will be recognized
in all cases anyway, so simpler to turn it into a null
hostname.
Change slashes in the filename into backslashes, as that is the
more canonical separator.
Recognize drive letters (either followed by a colon or a vertical
bar, as used by some browsers), and if the filename part starts
with a such, don't include any (back)slash.
Don't drop any extra leading slash in the filename on Unix.
(g_filename_to_uri): On Windows, if the hostname is "localhost",
don't use it, for consistency with g_filename_from_uri().
tests/uri-test.c: Change accordingly, so that all tests pass on
Windows. Unix, too, I hope, though I couldn't check that now.
(main): Unset the G_BROKEN_FILENAMES environment variable on Unix,
as some tests require that filenames are in UTF-8. Is unsetenv()
portable?
These changes should fix bugs #59387, #59652, #59657 and #59658.
2002-01-23 01:05:30 +01:00
|
|
|
{ "file:////etc", "//etc"},
|
|
|
|
{ "file://///etc", "///etc"},
|
|
|
|
#ifdef G_OS_WIN32
|
|
|
|
/* URIs with backslashes come from some nonstandard application, but accept them anyhow */
|
|
|
|
{ "file:///c:\\foo", "c:\\foo"},
|
|
|
|
{ "file:///c:/foo\\bar", "c:\\foo\\bar"},
|
|
|
|
/* Accept also the old Netscape drive-letter-and-vertical bar convention */
|
|
|
|
{ "file:///c|/foo", "c:\\foo"},
|
|
|
|
{ "file:////server/share/dir", "\\\\server\\share\\dir"},
|
|
|
|
{ "file://localhost//server/share/foo", "\\\\server\\share\\foo"},
|
|
|
|
{ "file://otherhost//server/share/foo", "\\\\server\\share\\foo", "otherhost"},
|
|
|
|
#else
|
|
|
|
{ "file:///c:\\foo", "/c:\\foo"},
|
|
|
|
{ "file:///c:/foo", "/c:/foo"},
|
|
|
|
{ "file:////c:/foo", "//c:/foo"},
|
|
|
|
#endif
|
2002-02-08 20:57:35 +01:00
|
|
|
{ "file://0123456789/", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
2001-08-27 20:01:08 +02:00
|
|
|
{ "file://ABCDEFGHIJKLMNOPQRSTUVWXYZ/", "/", "ABCDEFGHIJKLMNOPQRSTUVWXYZ"},
|
|
|
|
{ "file://abcdefghijklmnopqrstuvwxyz/", "/", "abcdefghijklmnopqrstuvwxyz"},
|
2002-02-08 20:57:35 +01:00
|
|
|
{ "file://-_.!~*'()/", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
|
|
|
{ "file://\"<>[\\]^`{|}\x7F/", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
|
|
|
{ "file://;?&=+$,/", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
2001-08-27 20:01:08 +02:00
|
|
|
{ "file://%C3%80%C3%BF/", "/", "\xC3\x80\xC3\xBF"},
|
2002-02-08 20:57:35 +01:00
|
|
|
{ "file://@/", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
|
|
|
{ "file://:/", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
2001-10-01 22:40:05 +02:00
|
|
|
{ "file://#/", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
2002-02-08 20:57:35 +01:00
|
|
|
{ "file://%23/", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
|
|
|
{ "file://%2F/", NULL, NULL, G_CONVERT_ERROR_BAD_URI},
|
2001-08-26 23:39:47 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static gboolean any_failed = FALSE;
|
|
|
|
|
|
|
|
static void
|
|
|
|
run_to_uri_tests (void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
gchar *res;
|
|
|
|
GError *error;
|
|
|
|
|
|
|
|
for (i = 0; i < G_N_ELEMENTS (to_uri_tests); i++)
|
|
|
|
{
|
|
|
|
error = NULL;
|
|
|
|
res = g_filename_to_uri (to_uri_tests[i].filename,
|
|
|
|
to_uri_tests[i].hostname,
|
|
|
|
&error);
|
|
|
|
|
|
|
|
if (to_uri_tests[i].expected_result == NULL)
|
|
|
|
{
|
|
|
|
if (res != NULL)
|
|
|
|
{
|
|
|
|
g_print ("\ng_filename_to_uri() test %d failed, expected to return NULL, actual result: %s\n", i, res);
|
|
|
|
any_failed = TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (error == NULL)
|
|
|
|
{
|
|
|
|
g_print ("\ng_filename_to_uri() test %d failed, returned NULL, but didn't set error\n", i);
|
|
|
|
any_failed = TRUE;
|
|
|
|
}
|
|
|
|
else if (error->domain != G_CONVERT_ERROR)
|
|
|
|
{
|
|
|
|
g_print ("\ng_filename_to_uri() test %d failed, returned NULL, set non G_CONVERT_ERROR error\n", i);
|
|
|
|
any_failed = TRUE;
|
|
|
|
}
|
|
|
|
else if (error->code != to_uri_tests[i].expected_error)
|
|
|
|
{
|
|
|
|
g_print ("\ng_filename_to_uri() test %d failed as expected, but set wrong errorcode %d instead of expected %d \n",
|
|
|
|
i, error->code, to_uri_tests[i].expected_error);
|
|
|
|
any_failed = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (res == NULL || strcmp (res, to_uri_tests[i].expected_result) != 0)
|
|
|
|
{
|
|
|
|
g_print ("\ng_filename_to_uri() test %d failed, expected result: %s, actual result: %s\n",
|
|
|
|
i, to_uri_tests[i].expected_result, (res) ? res : "NULL");
|
|
|
|
if (error)
|
|
|
|
g_print ("Error message: %s\n", error->message);
|
|
|
|
any_failed = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Give some output */
|
|
|
|
g_print (".");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
run_from_uri_tests (void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
gchar *res;
|
|
|
|
gchar *hostname;
|
|
|
|
GError *error;
|
|
|
|
|
|
|
|
for (i = 0; i < G_N_ELEMENTS (from_uri_tests); i++)
|
|
|
|
{
|
|
|
|
error = NULL;
|
|
|
|
res = g_filename_from_uri (from_uri_tests[i].uri,
|
|
|
|
&hostname,
|
|
|
|
&error);
|
|
|
|
|
|
|
|
if (from_uri_tests[i].expected_filename == NULL)
|
|
|
|
{
|
|
|
|
if (res != NULL)
|
|
|
|
{
|
|
|
|
g_print ("\ng_filename_from_uri() test %d failed, expected to return NULL, actual result: %s\n", i, res);
|
|
|
|
any_failed = TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (error == NULL)
|
|
|
|
{
|
|
|
|
g_print ("\ng_filename_from_uri() test %d failed, returned NULL, but didn't set error\n", i);
|
|
|
|
any_failed = TRUE;
|
|
|
|
}
|
|
|
|
else if (error->domain != G_CONVERT_ERROR)
|
|
|
|
{
|
|
|
|
g_print ("\ng_filename_from_uri() test %d failed, returned NULL, set non G_CONVERT_ERROR error\n", i);
|
|
|
|
any_failed = TRUE;
|
|
|
|
}
|
|
|
|
else if (error->code != from_uri_tests[i].expected_error)
|
|
|
|
{
|
|
|
|
g_print ("\ng_filename_from_uri() test %d failed as expected, but set wrong errorcode %d instead of expected %d \n",
|
|
|
|
i, error->code, from_uri_tests[i].expected_error);
|
|
|
|
any_failed = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
Not used on Windows, don't even compile it then.
2002-01-23 Tor Lillqvist <tml@iki.fi>
* glib/gconvert.c: (strdup_len): Not used on Windows, don't even
compile it then.
(acceptable): Improve comments for the _acceptable_ table: put
each ASCII char above the hex number for it.
(g_escape_file_uri): On Windows, turn backslashes in the file name
into plain ("forward") slashes.
(g_filename_from_uri): On Windows, don't return the hostname
"localhost", because we can not be 100% sure it will be recognized
in all cases anyway, so simpler to turn it into a null
hostname.
Change slashes in the filename into backslashes, as that is the
more canonical separator.
Recognize drive letters (either followed by a colon or a vertical
bar, as used by some browsers), and if the filename part starts
with a such, don't include any (back)slash.
Don't drop any extra leading slash in the filename on Unix.
(g_filename_to_uri): On Windows, if the hostname is "localhost",
don't use it, for consistency with g_filename_from_uri().
tests/uri-test.c: Change accordingly, so that all tests pass on
Windows. Unix, too, I hope, though I couldn't check that now.
(main): Unset the G_BROKEN_FILENAMES environment variable on Unix,
as some tests require that filenames are in UTF-8. Is unsetenv()
portable?
These changes should fix bugs #59387, #59652, #59657 and #59658.
2002-01-23 01:05:30 +01:00
|
|
|
#ifdef G_OS_WIN32
|
|
|
|
gchar *slash, *p;
|
|
|
|
|
|
|
|
p = from_uri_tests[i].expected_filename = g_strdup (from_uri_tests[i].expected_filename);
|
|
|
|
while ((slash = strchr (p, '/')) != NULL)
|
|
|
|
{
|
|
|
|
*slash = '\\';
|
|
|
|
p = slash + 1;
|
|
|
|
}
|
|
|
|
#endif
|
2001-08-26 23:39:47 +02:00
|
|
|
if (res == NULL || strcmp (res, from_uri_tests[i].expected_filename) != 0)
|
|
|
|
{
|
|
|
|
g_print ("\ng_filename_from_uri() test %d failed, expected result: %s, actual result: %s\n",
|
|
|
|
i, from_uri_tests[i].expected_filename, (res) ? res : "NULL");
|
|
|
|
any_failed = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (from_uri_tests[i].expected_hostname == NULL)
|
|
|
|
{
|
|
|
|
if (hostname != NULL)
|
|
|
|
{
|
|
|
|
g_print ("\ng_filename_from_uri() test %d failed, expected no hostname, got: %s\n",
|
|
|
|
i, hostname);
|
|
|
|
any_failed = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (hostname == NULL ||
|
|
|
|
strcmp (hostname, from_uri_tests[i].expected_hostname) != 0)
|
|
|
|
{
|
|
|
|
g_print ("\ng_filename_from_uri() test %d failed, expected hostname: %s, actual result: %s\n",
|
|
|
|
i, from_uri_tests[i].expected_hostname, (hostname) ? hostname : "NULL");
|
|
|
|
any_failed = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Give some output */
|
|
|
|
g_print (".");
|
|
|
|
}
|
|
|
|
g_print ("\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
main (int argc,
|
|
|
|
char *argv[])
|
|
|
|
{
|
Not used on Windows, don't even compile it then.
2002-01-23 Tor Lillqvist <tml@iki.fi>
* glib/gconvert.c: (strdup_len): Not used on Windows, don't even
compile it then.
(acceptable): Improve comments for the _acceptable_ table: put
each ASCII char above the hex number for it.
(g_escape_file_uri): On Windows, turn backslashes in the file name
into plain ("forward") slashes.
(g_filename_from_uri): On Windows, don't return the hostname
"localhost", because we can not be 100% sure it will be recognized
in all cases anyway, so simpler to turn it into a null
hostname.
Change slashes in the filename into backslashes, as that is the
more canonical separator.
Recognize drive letters (either followed by a colon or a vertical
bar, as used by some browsers), and if the filename part starts
with a such, don't include any (back)slash.
Don't drop any extra leading slash in the filename on Unix.
(g_filename_to_uri): On Windows, if the hostname is "localhost",
don't use it, for consistency with g_filename_from_uri().
tests/uri-test.c: Change accordingly, so that all tests pass on
Windows. Unix, too, I hope, though I couldn't check that now.
(main): Unset the G_BROKEN_FILENAMES environment variable on Unix,
as some tests require that filenames are in UTF-8. Is unsetenv()
portable?
These changes should fix bugs #59387, #59652, #59657 and #59658.
2002-01-23 01:05:30 +01:00
|
|
|
#ifdef G_OS_UNIX
|
|
|
|
unsetenv ("G_BROKEN_FILENAMES");
|
|
|
|
#endif
|
|
|
|
|
2001-08-26 23:39:47 +02:00
|
|
|
run_to_uri_tests ();
|
|
|
|
run_from_uri_tests ();
|
|
|
|
|
|
|
|
return any_failed ? 1 : 0;
|
|
|
|
}
|