[Kazehakase-cvs] CVS update: kazehakase/src/utils

Zurück zum Archiv-Index

Hiroyuki Ikezoe ikezo****@users*****
Sat Dec 30 21:51:02 JST 2006


Index: kazehakase/src/utils/utils.c
diff -u kazehakase/src/utils/utils.c:1.65 kazehakase/src/utils/utils.c:1.66
--- kazehakase/src/utils/utils.c:1.65	Wed Dec  6 16:30:56 2006
+++ kazehakase/src/utils/utils.c	Sat Dec 30 21:51:02 2006
@@ -265,7 +265,7 @@
 
 	if (g_str_has_suffix(uri, "/"))
 	{
-		filename = g_strconcat(scheme, "/", pos, "_", NULL);
+		filename = g_strconcat(scheme, G_DIR_SEPARATOR_S, pos, "_", NULL);
 	}
 	else
 	{
@@ -274,9 +274,9 @@
 		{
 			gchar *string = g_strndup(pos, pos2 - pos);
 			filename = g_strconcat(scheme,
-					       "/",
+					       G_DIR_SEPARATOR_S,
 					       string, 
-					       "_/",
+					       "_"G_DIR_SEPARATOR_S,
 					       pos2 + 1,
 					       NULL);
 			g_free(string);
@@ -284,7 +284,7 @@
 		else
 		{
 			filename = g_strconcat(scheme,
-						"/",
+						G_DIR_SEPARATOR_S,
 						pos,
 						NULL);
 		}
@@ -304,20 +304,20 @@
 	gchar *scheme;
 	gchar *path;
 	
-	pos = strstr(filename, "/");
+	pos = strstr(filename, G_DIR_SEPARATOR_S);
 	
 	if (!pos)
 		return NULL;
 
 	scheme = g_strndup(filename, pos - filename);
 
-	if (g_str_has_suffix(filename, "/_"))
+	if (g_str_has_suffix(filename, G_DIR_SEPARATOR_S"_"))
 	{
 		path = g_strndup(pos + 1, strlen(pos) - 2); 
 	}
 	else
 	{
-		gchar *pos2 = g_strrstr(filename, "_/");
+		gchar *pos2 = g_strrstr(filename, "_"G_DIR_SEPARATOR_S);
 		if (pos2)
 		{
 			gchar *string = g_strndup(pos + 1, pos2 - pos - 1);


More information about the Kazehakase-cvs mailing list
Zurück zum Archiv-Index