luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-04 08:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Accept also forward slashes. (But still don't accept them in the other

Browse Source 
2001-09-20  Tor Lillqvist  <tml@iki.fi>

	* glib/gutils.c (g_path_is_absolute): (Win32:) Accept also forward
	slashes. (But still don't accept them in the other functions
	here. This is a thorny issue. Windows in fact does treat / like \
	on input (at least as local directory separators, dunno about
	server/share separators). But GLib only has the one
	G_DIR_SEPARATOR value, that apps should scan for, and use when
	building pathnames. To properly fix this would require totally
	abstracting pathnames, and don't having any path name scanning and
	building in applications at all. Fat chance.)
	(GLIB_LOCALE_DIR): Redefine only on "pure" Win32, not Cygwin. Use
	subdirectory "share\locale", as on Unix.

	* glib/gwin32.c: Don't need to define those langiage and
	sublanguage constants here, current mingw (w32api) headers have
	them.

	* glib/glib.def: Add a few missing entry points.

	* tests/testglib.c (main): Use same name for DLL as libtool does.
	Use G_DIR_SEPARATOR in g_path_get_basename tests.
This commit is contained in:
Tor Lillqvist
2001-09-20 05:41:52 +00:00
committed by Tor Lillqvist
parent 7b0afc5582
commit 58f3fdd748
12 changed files with 211 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/testglib.c
View File

@@ -401,14 +401,16 @@ main (int argc,
GError *error;
char *name_used;
#ifdef G_OS_WIN32
gchar *glib_dll = g_strdup_printf ("glib-%d.%d.dll",
gchar *glib_dll = g_strdup_printf ("libglib-%d.%d-%d.dll",
GLIB_MAJOR_VERSION,
GLIB_MINOR_VERSION);
GLIB_MINOR_VERSION,
GLIB_MICRO_VERSION - GLIB_BINARY_AGE);
#endif
#ifdef G_WITH_CYGWIN
gchar *glib_dll = g_strdup_printf ("cygglib-%d.%d.dll",
gchar *glib_dll = g_strdup_printf ("cygglib-%d.%d-%d.dll",
GLIB_MAJOR_VERSION,
GLIB_MINOR_VERSION);
GLIB_MINOR_VERSION,
GLIB_MICRO_VERSION - GLIB_BINARY_AGE);
#endif
g_print ("TestGLib v%u.%u.%u (i:%u b:%u)\n",
@@ -441,10 +443,10 @@ main (int argc,
g_print ("\n");
g_print ("checking g_path_get_basename()...");
string = g_path_get_basename ("/foo/dir/");
string = g_path_get_basename (G_DIR_SEPARATOR_S "foo" G_DIR_SEPARATOR_S "dir" G_DIR_SEPARATOR_S);
g_assert (strcmp (string, "dir") == 0);
g_free (string);
string = g_path_get_basename ("/foo/file");
string = g_path_get_basename (G_DIR_SEPARATOR_S "foo" G_DIR_SEPARATOR_S "file");
g_assert (strcmp (string, "file") == 0);
g_free (string);
g_print ("ok\n");
@@ -1175,6 +1177,7 @@ main (int argc,
#ifdef G_PLATFORM_WIN32
g_print ("current locale: %s\n", g_win32_getlocale ());
g_print ("GLib DLL name tested for: %s\n", glib_dll);
g_print ("GLib installation directory, from Registry entry for %s if available: %s\n",
GETTEXT_PACKAGE,
@@ -1184,7 +1187,7 @@ main (int argc,
g_print ("Ditto, only from GLib DLL name: %s\n",
g_win32_get_package_installation_directory (NULL, glib_dll));
g_print ("locale subdirectory of GLib installation directory: %s\n",
g_win32_get_package_installation_subdirectory (NULL, glib_dll, "locale"));
g_win32_get_package_installation_subdirectory (NULL, glib_dll, "share\\locale"));
g_print ("GTK+ 2.0 installation directory, if available: %s\n",
g_win32_get_package_installation_directory ("gtk20", NULL));