* 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 <http://www.gnu.org/licenses/>.
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
-#include <config.h>
+#include "config.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
#include <errno.h>
#include <fcntl.h>
-#include <unistd.h>
#include <stdlib.h>
#include "gdummyfile.h"
+#include "gfile.h"
-#include "gioalias.h"
-static void g_dummy_file_file_iface_init (GFileIface *iface);
+static void g_dummy_file_file_iface_init (GFileIface *iface);
typedef struct {
char *scheme;
char *text_uri;
};
+#define g_dummy_file_get_type _g_dummy_file_get_type
G_DEFINE_TYPE_WITH_CODE (GDummyFile, g_dummy_file, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (G_TYPE_FILE,
g_dummy_file_file_iface_init))
const gchar *escaped_string_end,
const gchar *illegal_characters);
-static void g_string_append_encoded (GString *string, const char *encoded,
+static void g_string_append_encoded (GString *string,
+ const char *encoded,
const char *reserved_chars_allowed);
static void
_g_decoded_uri_free (dummy->decoded_uri);
g_free (dummy->text_uri);
-
- if (G_OBJECT_CLASS (g_dummy_file_parent_class)->finalize)
- (*G_OBJECT_CLASS (g_dummy_file_parent_class)->finalize) (object);
+
+ G_OBJECT_CLASS (g_dummy_file_parent_class)->finalize (object);
}
static void
{
}
-/**
- * g_dummy_file_new:
- * @uri: Universal Resource Identifier for the dummy file object.
- *
- * Returns: a new #GFile.
- **/
GFile *
-g_dummy_file_new (const char *uri)
+_g_dummy_file_new (const char *uri)
{
GDummyFile *dummy;
static char *
g_dummy_file_get_path (GFile *file)
{
- GDummyFile *dummy = G_DUMMY_FILE (file);
-
- if (dummy->decoded_uri)
- return g_strdup (dummy->decoded_uri->path);
return NULL;
}
char *uri;
GDecodedUri new_decoded_uri;
- if (dummy->decoded_uri == NULL)
+ if (dummy->decoded_uri == NULL ||
+ g_strcmp0 (dummy->decoded_uri->path, "/") == 0)
return NULL;
dirname = g_path_get_dirname (dummy->decoded_uri->path);
uri = _g_encode_uri (&new_decoded_uri);
g_free (dirname);
- parent = g_dummy_file_new (uri);
+ parent = _g_dummy_file_new (uri);
g_free (uri);
return parent;
{
GDummyFile *dummy = G_DUMMY_FILE (file);
- return g_dummy_file_new (dummy->text_uri);
+ return _g_dummy_file_new (dummy->text_uri);
}
static guint
}
static int
-safe_strcmp (const char *a, const char *b)
+safe_strcmp (const char *a,
+ const char *b)
{
if (a == NULL)
a = "";
}
static const char *
-match_prefix (const char *path, const char *prefix)
+match_prefix (const char *path,
+ const char *prefix)
{
int prefix_len;
}
static gboolean
-g_dummy_file_contains_file (GFile *parent,
- GFile *descendant)
+g_dummy_file_prefix_matches (GFile *parent, GFile *descendant)
{
GDummyFile *parent_dummy = G_DUMMY_FILE (parent);
GDummyFile *descendant_dummy = G_DUMMY_FILE (descendant);
descendant_dummy->decoded_uri != NULL)
{
if (uri_same_except_path (parent_dummy->decoded_uri,
- descendant_dummy->decoded_uri)) {
- remainder = match_prefix (descendant_dummy->decoded_uri->path,
- parent_dummy->decoded_uri->path);
- if (remainder != NULL && *remainder == '/')
- {
- while (*remainder == '/')
- remainder++;
- if (*remainder != 0)
- return TRUE;
- }
- }
+ descendant_dummy->decoded_uri))
+ {
+ remainder = match_prefix (descendant_dummy->decoded_uri->path,
+ parent_dummy->decoded_uri->path);
+ if (remainder != NULL && *remainder == '/')
+ {
+ while (*remainder == '/')
+ remainder++;
+ if (*remainder != 0)
+ return TRUE;
+ }
+ }
}
else
{
descendant_dummy->decoded_uri != NULL)
{
if (uri_same_except_path (parent_dummy->decoded_uri,
- descendant_dummy->decoded_uri)) {
- remainder = match_prefix (descendant_dummy->decoded_uri->path,
- parent_dummy->decoded_uri->path);
- if (remainder != NULL && *remainder == '/')
- {
- while (*remainder == '/')
- remainder++;
- if (*remainder != 0)
- return g_strdup (remainder);
- }
- }
+ descendant_dummy->decoded_uri))
+ {
+ remainder = match_prefix (descendant_dummy->decoded_uri->path,
+ parent_dummy->decoded_uri->path);
+ if (remainder != NULL && *remainder == '/')
+ {
+ while (*remainder == '/')
+ remainder++;
+ if (*remainder != 0)
+ return g_strdup (remainder);
+ }
+ }
}
else
{
static GFile *
-g_dummy_file_resolve_relative_path (GFile *file,
+g_dummy_file_resolve_relative_path (GFile *file,
const char *relative_path)
{
GDummyFile *dummy = G_DUMMY_FILE (file);
str = g_string_new (dummy->text_uri);
g_string_append (str, "/");
g_string_append_encoded (str, relative_path, SUB_DELIM_CHARS ":@/");
- child = g_dummy_file_new (str->str);
+ child = _g_dummy_file_new (str->str);
g_string_free (str, TRUE);
}
else
uri = _g_encode_uri (&new_decoded_uri);
g_free (new_decoded_uri.path);
- child = g_dummy_file_new (uri);
+ child = _g_dummy_file_new (uri);
g_free (uri);
}
iface->get_uri = g_dummy_file_get_uri;
iface->get_parse_name = g_dummy_file_get_parse_name;
iface->get_parent = g_dummy_file_get_parent;
- iface->contains_file = g_dummy_file_contains_file;
+ iface->prefix_matches = g_dummy_file_prefix_matches;
iface->get_relative_path = g_dummy_file_get_relative_path;
iface->resolve_relative_path = g_dummy_file_resolve_relative_path;
iface->get_child_for_display_name = g_dummy_file_get_child_for_display_name;
+
+ iface->supports_thread_contexts = TRUE;
}
/* Uri handling helper functions: */
result = g_malloc (escaped_string_end - escaped_string + 1);
out = result;
- for (in = escaped_string; in < escaped_string_end; in++) {
- character = *in;
- if (*in == '%') {
- in++;
- if (escaped_string_end - in < 2)
- {
- g_free (result);
- return NULL;
- }
+ for (in = escaped_string; in < escaped_string_end; in++)
+ {
+ character = *in;
+ if (*in == '%')
+ {
+ in++;
+ if (escaped_string_end - in < 2)
+ {
+ g_free (result);
+ return NULL;
+ }
- character = unescape_character (in);
+ character = unescape_character (in);
- /* Check for an illegal character. We consider '\0' illegal here. */
- if (character <= 0 ||
- (illegal_characters != NULL &&
- strchr (illegal_characters, (char)character) != NULL))
- {
- g_free (result);
- return NULL;
- }
- in++; /* The other char will be eaten in the loop header */
+ /* Check for an illegal character. We consider '\0' illegal here. */
+ if (character <= 0 ||
+ (illegal_characters != NULL &&
+ strchr (illegal_characters, (char)character) != NULL))
+ {
+ g_free (result);
+ return NULL;
+ }
+ in++; /* The other char will be eaten in the loop header */
+ }
+ *out++ = (char)character;
}
- *out++ = (char)character;
- }
*out = '\0';
- g_assert (out - result <= strlen (escaped_string));
+ g_warn_if_fail (out - result <= strlen (escaped_string));
return result;
}
}
static void
-g_string_append_encoded (GString *string, const char *encoded,
+g_string_append_encoded (GString *string,
+ const char *encoded,
const char *reserved_chars_allowed)
{
unsigned char c;
- const char *end;
static const gchar hex[16] = "0123456789ABCDEF";
- end = encoded + strlen (encoded);
-
while ((c = *encoded) != 0)
{
if (is_valid (c, reserved_chars_allowed))
projects / platform / upstream / glib.git / blobdiff