X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgfileinfo.c;h=b9f3f563a206fec4dc61c7c11e075c07a4b0d6a2;hb=01f63b19f9f0ddfff3ccfbb1a15ba6e3d68d9c67;hp=6e00b1d76403d22fbefe5c43f04e03c7990f040f;hpb=09471fec46619a62fbe9b6e7a7b67c9a421f919e;p=platform%2Fupstream%2Fglib.git diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c index 6e00b1d..b9f3f56 100644 --- a/gio/gfileinfo.c +++ b/gio/gfileinfo.c @@ -1,5 +1,5 @@ /* GIO - GLib Input, Output and Streaming Library - * + * * Copyright (C) 2006-2007 Red Hat, Inc. * * This library is free software; you can redistribute it and/or @@ -23,26 +23,45 @@ /** * SECTION:gfileinfo * @short_description: File Information and Attributes - * @see_also: #GFile - * + * @include: gio/gio.h + * @see_also: #GFile, GFileAttribute + * * Functionality for manipulating basic metadata for files. #GFileInfo - * implements methods for getting information that all files should - * contain, and allows for manipulation of extended attributes. - * #GFileAttributeMatcher allows for searching through a #GFileInfo for + * implements methods for getting information that all files should + * contain, and allows for manipulation of extended attributes. + * + * See GFileAttribute for more + * information on how GIO handles file attributes. + * + * To obtain a #GFileInfo for a #GFile, use g_file_query_info() (or its + * async variant). To obtain a #GFileInfo for a file input or output + * stream, use g_file_input_stream_query_info() or + * g_file_output_stream_query_info() (or their async variants). + * + * To change the actual attributes of a file, you should then set the + * attribute in the #GFileInfo and call g_file_set_attributes_from_info() + * or g_file_set_attributes_async() on a GFile. + * + * However, not all attributes can be changed in the file. For instance, + * the actual size of a file cannot be changed via g_file_info_set_size(). + * You may call g_file_query_settable_attributes() and + * g_file_query_writable_namespaces() to discover the settable attributes + * of a particular file at runtime. + * + * #GFileAttributeMatcher allows for searching through a #GFileInfo for * attributes. - * - * - * **/ -#include +#include "config.h" #include #include "gfileinfo.h" +#include "gfileinfo-priv.h" +#include "gfileattribute-priv.h" +#include "gicon.h" #include "glibintl.h" -#include "gioalias.h" /* We use this nasty thing, because NULL is a valid attribute matcher (matches nothing) */ #define NO_ATTRIBUTE_MASK ((GFileAttributeMatcher *)1) @@ -65,8 +84,6 @@ struct _GFileInfoClass GObjectClass parent_class; }; -static gboolean g_file_attribute_matcher_matches_id (GFileAttributeMatcher *matcher, - guint32 id); G_DEFINE_TYPE (GFileInfo, g_file_info, G_TYPE_OBJECT); @@ -83,8 +100,8 @@ static char ***attributes = NULL; /* Attribute ids are 32bit, we split it up like this: * |------------|--------------------| - * 12 bit 20 bit - * namespace attribute id + * 12 bit 20 bit + * namespace attribute id * * This way the attributes gets sorted in namespace order */ @@ -107,7 +124,7 @@ static NSInfo * _lookup_namespace (const char *namespace) { NSInfo *ns_info; - + ns_info = g_hash_table_lookup (ns_hash, namespace); if (ns_info == NULL) { @@ -121,24 +138,147 @@ _lookup_namespace (const char *namespace) } static guint32 +_lookup_attribute (const char *attribute) +{ + guint32 attr_id, id; + char *ns; + const char *colon; + NSInfo *ns_info; + + attr_id = GPOINTER_TO_UINT (g_hash_table_lookup (attribute_hash, attribute)); + + if (attr_id != 0) + return attr_id; + + colon = strstr (attribute, "::"); + if (colon) + ns = g_strndup (attribute, colon - attribute); + else + ns = g_strdup (""); + + ns_info = _lookup_namespace (ns); + g_free (ns); + + id = ++ns_info->attribute_id_counter; + attributes[ns_info->id] = g_realloc (attributes[ns_info->id], (id + 1) * sizeof (char *)); + attributes[ns_info->id][id] = g_strdup (attribute); + + attr_id = MAKE_ATTR_ID (ns_info->id, id); + + g_hash_table_insert (attribute_hash, attributes[ns_info->id][id], GUINT_TO_POINTER (attr_id)); + + return attr_id; +} + +static void +ensure_attribute_hash (void) +{ + if (attribute_hash != NULL) + return; + + ns_hash = g_hash_table_new (g_str_hash, g_str_equal); + attribute_hash = g_hash_table_new (g_str_hash, g_str_equal); + +#define REGISTER_ATTRIBUTE(name) G_STMT_START{\ + guint _u = _lookup_attribute (G_FILE_ATTRIBUTE_ ## name); \ + /* use for generating the ID: g_print ("#define G_FILE_ATTRIBUTE_ID_%s (%u + %u)\n", #name + 17, _u & ~ID_MASK, _u & ID_MASK); */ \ + g_assert (_u == G_FILE_ATTRIBUTE_ID_ ## name); \ +}G_STMT_END + + REGISTER_ATTRIBUTE (STANDARD_TYPE); + REGISTER_ATTRIBUTE (STANDARD_IS_HIDDEN); + REGISTER_ATTRIBUTE (STANDARD_IS_BACKUP); + REGISTER_ATTRIBUTE (STANDARD_IS_SYMLINK); + REGISTER_ATTRIBUTE (STANDARD_IS_VIRTUAL); + REGISTER_ATTRIBUTE (STANDARD_NAME); + REGISTER_ATTRIBUTE (STANDARD_DISPLAY_NAME); + REGISTER_ATTRIBUTE (STANDARD_EDIT_NAME); + REGISTER_ATTRIBUTE (STANDARD_COPY_NAME); + REGISTER_ATTRIBUTE (STANDARD_DESCRIPTION); + REGISTER_ATTRIBUTE (STANDARD_ICON); + REGISTER_ATTRIBUTE (STANDARD_CONTENT_TYPE); + REGISTER_ATTRIBUTE (STANDARD_FAST_CONTENT_TYPE); + REGISTER_ATTRIBUTE (STANDARD_SIZE); + REGISTER_ATTRIBUTE (STANDARD_ALLOCATED_SIZE); + REGISTER_ATTRIBUTE (STANDARD_SYMLINK_TARGET); + REGISTER_ATTRIBUTE (STANDARD_TARGET_URI); + REGISTER_ATTRIBUTE (STANDARD_SORT_ORDER); + REGISTER_ATTRIBUTE (ETAG_VALUE); + REGISTER_ATTRIBUTE (ID_FILE); + REGISTER_ATTRIBUTE (ID_FILESYSTEM); + REGISTER_ATTRIBUTE (ACCESS_CAN_READ); + REGISTER_ATTRIBUTE (ACCESS_CAN_WRITE); + REGISTER_ATTRIBUTE (ACCESS_CAN_EXECUTE); + REGISTER_ATTRIBUTE (ACCESS_CAN_DELETE); + REGISTER_ATTRIBUTE (ACCESS_CAN_TRASH); + REGISTER_ATTRIBUTE (ACCESS_CAN_RENAME); + REGISTER_ATTRIBUTE (MOUNTABLE_CAN_MOUNT); + REGISTER_ATTRIBUTE (MOUNTABLE_CAN_UNMOUNT); + REGISTER_ATTRIBUTE (MOUNTABLE_CAN_EJECT); + REGISTER_ATTRIBUTE (MOUNTABLE_UNIX_DEVICE); + REGISTER_ATTRIBUTE (MOUNTABLE_UNIX_DEVICE_FILE); + REGISTER_ATTRIBUTE (MOUNTABLE_HAL_UDI); + REGISTER_ATTRIBUTE (MOUNTABLE_CAN_START); + REGISTER_ATTRIBUTE (MOUNTABLE_CAN_START_DEGRADED); + REGISTER_ATTRIBUTE (MOUNTABLE_CAN_STOP); + REGISTER_ATTRIBUTE (MOUNTABLE_START_STOP_TYPE); + REGISTER_ATTRIBUTE (MOUNTABLE_CAN_POLL); + REGISTER_ATTRIBUTE (MOUNTABLE_IS_MEDIA_CHECK_AUTOMATIC); + REGISTER_ATTRIBUTE (TIME_MODIFIED); + REGISTER_ATTRIBUTE (TIME_MODIFIED_USEC); + REGISTER_ATTRIBUTE (TIME_ACCESS); + REGISTER_ATTRIBUTE (TIME_ACCESS_USEC); + REGISTER_ATTRIBUTE (TIME_CHANGED); + REGISTER_ATTRIBUTE (TIME_CHANGED_USEC); + REGISTER_ATTRIBUTE (TIME_CREATED); + REGISTER_ATTRIBUTE (TIME_CREATED_USEC); + REGISTER_ATTRIBUTE (UNIX_DEVICE); + REGISTER_ATTRIBUTE (UNIX_INODE); + REGISTER_ATTRIBUTE (UNIX_MODE); + REGISTER_ATTRIBUTE (UNIX_NLINK); + REGISTER_ATTRIBUTE (UNIX_UID); + REGISTER_ATTRIBUTE (UNIX_GID); + REGISTER_ATTRIBUTE (UNIX_RDEV); + REGISTER_ATTRIBUTE (UNIX_BLOCK_SIZE); + REGISTER_ATTRIBUTE (UNIX_BLOCKS); + REGISTER_ATTRIBUTE (UNIX_IS_MOUNTPOINT); + REGISTER_ATTRIBUTE (DOS_IS_ARCHIVE); + REGISTER_ATTRIBUTE (DOS_IS_SYSTEM); + REGISTER_ATTRIBUTE (OWNER_USER); + REGISTER_ATTRIBUTE (OWNER_USER_REAL); + REGISTER_ATTRIBUTE (OWNER_GROUP); + REGISTER_ATTRIBUTE (THUMBNAIL_PATH); + REGISTER_ATTRIBUTE (THUMBNAILING_FAILED); + REGISTER_ATTRIBUTE (PREVIEW_ICON); + REGISTER_ATTRIBUTE (FILESYSTEM_SIZE); + REGISTER_ATTRIBUTE (FILESYSTEM_FREE); + REGISTER_ATTRIBUTE (FILESYSTEM_TYPE); + REGISTER_ATTRIBUTE (FILESYSTEM_READONLY); + REGISTER_ATTRIBUTE (FILESYSTEM_USE_PREVIEW); + REGISTER_ATTRIBUTE (GVFS_BACKEND); + REGISTER_ATTRIBUTE (SELINUX_CONTEXT); + REGISTER_ATTRIBUTE (TRASH_ITEM_COUNT); + REGISTER_ATTRIBUTE (TRASH_ORIG_PATH); + REGISTER_ATTRIBUTE (TRASH_DELETION_DATE); + +#undef REGISTER_ATTRIBUTE +} + +static guint32 lookup_namespace (const char *namespace) { NSInfo *ns_info; guint32 id; - + G_LOCK (attribute_hash); - - if (attribute_hash == NULL) - { - ns_hash = g_hash_table_new (g_str_hash, g_str_equal); - attribute_hash = g_hash_table_new (g_str_hash, g_str_equal); - } + + ensure_attribute_hash (); ns_info = _lookup_namespace (namespace); id = 0; if (ns_info) id = ns_info->id; - + G_UNLOCK (attribute_hash); return id; @@ -157,45 +297,15 @@ get_attribute_for_id (int attribute) static guint32 lookup_attribute (const char *attribute) { - guint32 attr_id, id; - char *ns; - const char *colon; - NSInfo *ns_info; - - G_LOCK (attribute_hash); - if (attribute_hash == NULL) - { - ns_hash = g_hash_table_new (g_str_hash, g_str_equal); - attribute_hash = g_hash_table_new (g_str_hash, g_str_equal); - } - - attr_id = GPOINTER_TO_UINT (g_hash_table_lookup (attribute_hash, attribute)); - - if (attr_id != 0) - { - G_UNLOCK (attribute_hash); - return attr_id; - } - - colon = strchr (attribute, ':'); - if (colon) - ns = g_strndup (attribute, colon - attribute); - else - ns = g_strdup (""); + guint32 attr_id; - ns_info = _lookup_namespace (ns); - g_free (ns); + G_LOCK (attribute_hash); + ensure_attribute_hash (); - id = ++ns_info->attribute_id_counter; - attributes[ns_info->id] = g_realloc (attributes[ns_info->id], (id + 1) * sizeof (char *)); - attributes[ns_info->id][id] = g_strdup (attribute); - - attr_id = MAKE_ATTR_ID (ns_info->id, id); + attr_id = _lookup_attribute (attribute); - g_hash_table_insert (attribute_hash, attributes[ns_info->id][id], GUINT_TO_POINTER (attr_id)); - G_UNLOCK (attribute_hash); - + return attr_id; } @@ -210,21 +320,20 @@ g_file_info_finalize (GObject *object) attrs = (GFileAttribute *)info->attributes->data; for (i = 0; i < info->attributes->len; i++) - g_file_attribute_value_clear (&attrs[i].value); - g_array_free (info->attributes, TRUE); + _g_file_attribute_value_clear (&attrs[i].value); + g_array_free (info->attributes, TRUE); if (info->mask != NO_ATTRIBUTE_MASK) g_file_attribute_matcher_unref (info->mask); - - if (G_OBJECT_CLASS (g_file_info_parent_class)->finalize) - (*G_OBJECT_CLASS (g_file_info_parent_class)->finalize) (object); + + G_OBJECT_CLASS (g_file_info_parent_class)->finalize (object); } static void g_file_info_class_init (GFileInfoClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - + gobject_class->finalize = g_file_info_finalize; } @@ -238,9 +347,9 @@ g_file_info_init (GFileInfo *info) /** * g_file_info_new: - * + * * Creates a new file info structure. - * + * * Returns: a #GFileInfo. **/ GFileInfo * @@ -253,11 +362,11 @@ g_file_info_new (void) * g_file_info_copy_into: * @src_info: source to copy attributes from. * @dest_info: destination to copy attributes to. - * + * * Copies all of the #GFileAttributes from @src_info to @dest_info. **/ void -g_file_info_copy_into (GFileInfo *src_info, +g_file_info_copy_into (GFileInfo *src_info, GFileInfo *dest_info) { GFileAttribute *source, *dest; @@ -268,21 +377,24 @@ g_file_info_copy_into (GFileInfo *src_info, dest = (GFileAttribute *)dest_info->attributes->data; for (i = 0; i < dest_info->attributes->len; i++) - g_file_attribute_value_clear (&dest[i].value); - + _g_file_attribute_value_clear (&dest[i].value); + g_array_set_size (dest_info->attributes, src_info->attributes->len); source = (GFileAttribute *)src_info->attributes->data; dest = (GFileAttribute *)dest_info->attributes->data; - + for (i = 0; i < src_info->attributes->len; i++) { dest[i].attribute = source[i].attribute; dest[i].value.type = G_FILE_ATTRIBUTE_TYPE_INVALID; - g_file_attribute_value_set (&dest[i].value, &source[i].value); + _g_file_attribute_value_set (&dest[i].value, &source[i].value); } + if (dest_info->mask != NO_ATTRIBUTE_MASK) + g_file_attribute_matcher_unref (dest_info->mask); + if (src_info->mask == NO_ATTRIBUTE_MASK) dest_info->mask = NO_ATTRIBUTE_MASK; else @@ -292,18 +404,18 @@ g_file_info_copy_into (GFileInfo *src_info, /** * g_file_info_dup: * @other: a #GFileInfo. - * + * * Duplicates a file info structure. - * - * Returns: a duplicate #GFileInfo of @other. + * + * Returns: (transfer full): a duplicate #GFileInfo of @other. **/ GFileInfo * g_file_info_dup (GFileInfo *other) { GFileInfo *new; - + g_return_val_if_fail (G_IS_FILE_INFO (other), NULL); - + new = g_file_info_new (); g_file_info_copy_into (other, new); return new; @@ -322,10 +434,9 @@ g_file_info_set_attribute_mask (GFileInfo *info, { GFileAttribute *attr; int i; - + g_return_if_fail (G_IS_FILE_INFO (info)); - g_return_if_fail (mask != NULL); - + if (mask != info->mask) { if (info->mask != NO_ATTRIBUTE_MASK) @@ -336,10 +447,10 @@ g_file_info_set_attribute_mask (GFileInfo *info, for (i = 0; i < info->attributes->len; i++) { attr = &g_array_index (info->attributes, GFileAttribute, i); - if (!g_file_attribute_matcher_matches_id (mask, + if (!_g_file_attribute_matcher_matches_id (mask, attr->attribute)) { - g_file_attribute_value_clear (&attr->value); + _g_file_attribute_value_clear (&attr->value); g_array_remove_index (info->attributes, i); i--; } @@ -350,7 +461,7 @@ g_file_info_set_attribute_mask (GFileInfo *info, /** * g_file_info_unset_attribute_mask: * @info: #GFileInfo. - * + * * Unsets a mask set by g_file_info_set_attribute_mask(), if one * is set. **/ @@ -375,7 +486,7 @@ g_file_info_clear_status (GFileInfo *info) { GFileAttribute *attrs; int i; - + g_return_if_fail (G_IS_FILE_INFO (info)); attrs = (GFileAttribute *)info->attributes->data; @@ -389,7 +500,7 @@ g_file_info_find_place (GFileInfo *info, { int min, max, med; GFileAttribute *attrs; - /* Binary search for the place where attribute would be, if its + /* Binary search for the place where attribute would be, if it's in the array */ min = 0; @@ -426,7 +537,7 @@ g_file_info_find_value (GFileInfo *info, if (i < info->attributes->len && attrs[i].attribute == attr_id) return &attrs[i].value; - + return NULL; } @@ -444,11 +555,11 @@ g_file_info_find_value_by_name (GFileInfo *info, * g_file_info_has_attribute: * @info: a #GFileInfo. * @attribute: a file attribute key. - * + * * Checks if a file info structure has an attribute named @attribute. - * - * Returns: %TRUE if @GFileInfo has an attribute named @attribute, - * %FALSE otherwise. + * + * Returns: %TRUE if @Ginfo has an attribute named @attribute, + * %FALSE otherwise. **/ gboolean g_file_info_has_attribute (GFileInfo *info, @@ -464,14 +575,50 @@ g_file_info_has_attribute (GFileInfo *info, } /** + * g_file_info_has_namespace: + * @info: a #GFileInfo. + * @name_space: a file attribute namespace. + * + * Checks if a file info structure has an attribute in the + * specified @name_space. + * + * Returns: %TRUE if @Ginfo has an attribute in @name_space, + * %FALSE otherwise. + * + * Since: 2.22 + **/ +gboolean +g_file_info_has_namespace (GFileInfo *info, + const char *name_space) +{ + GFileAttribute *attrs; + guint32 ns_id; + int i; + + g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); + g_return_val_if_fail (name_space != NULL, FALSE); + + ns_id = lookup_namespace (name_space); + + attrs = (GFileAttribute *)info->attributes->data; + for (i = 0; i < info->attributes->len; i++) + { + if (GET_NS (attrs[i].attribute) == ns_id) + return TRUE; + } + + return FALSE; +} + +/** * g_file_info_list_attributes: * @info: a #GFileInfo. * @name_space: a file attribute key's namespace. - * + * * Lists the file info structure's attributes. - * - * Returns: a null-terminated array of strings of all of the - * possible attribute types for the given @name_space, or + * + * Returns: (array zero-terminated=1) (transfer full): a null-terminated array of strings of all of the + * possible attribute types for the given @name_space, or * %NULL on error. **/ char ** @@ -483,7 +630,7 @@ g_file_info_list_attributes (GFileInfo *info, guint32 attribute; guint32 ns_id = (name_space) ? lookup_namespace (name_space) : 0; int i; - + g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); names = g_ptr_array_new (); @@ -497,7 +644,7 @@ g_file_info_list_attributes (GFileInfo *info, /* NULL terminate */ g_ptr_array_add (names, NULL); - + return (char **)g_ptr_array_free (names, FALSE); } @@ -505,18 +652,18 @@ g_file_info_list_attributes (GFileInfo *info, * g_file_info_get_attribute_type: * @info: a #GFileInfo. * @attribute: a file attribute key. - * + * * Gets the attribute type for an attribute key. - * - * Returns: a #GFileAttributeType for the given @attribute, or - * %G_FILE_ATTRIBUTE_TYPE_INVALID if the key is invalid. + * + * Returns: a #GFileAttributeType for the given @attribute, or + * %G_FILE_ATTRIBUTE_TYPE_INVALID if the key is not set. **/ GFileAttributeType g_file_info_get_attribute_type (GFileInfo *info, const char *attribute) { GFileAttributeValue *value; - + g_return_val_if_fail (G_IS_FILE_INFO (info), G_FILE_ATTRIBUTE_TYPE_INVALID); g_return_val_if_fail (attribute != NULL && *attribute != '\0', G_FILE_ATTRIBUTE_TYPE_INVALID); @@ -531,9 +678,8 @@ g_file_info_get_attribute_type (GFileInfo *info, * g_file_info_remove_attribute: * @info: a #GFileInfo. * @attribute: a file attribute key. - * - * Removes all cases of @attribute from @info if it exists. * + * Removes all cases of @attribute from @info if it exists. **/ void g_file_info_remove_attribute (GFileInfo *info, @@ -547,31 +693,123 @@ g_file_info_remove_attribute (GFileInfo *info, g_return_if_fail (attribute != NULL && *attribute != '\0'); attr_id = lookup_attribute (attribute); - + i = g_file_info_find_place (info, attr_id); attrs = (GFileAttribute *)info->attributes->data; if (i < info->attributes->len && attrs[i].attribute == attr_id) { - g_file_attribute_value_clear (&attrs[i].value); + _g_file_attribute_value_clear (&attrs[i].value); g_array_remove_index (info->attributes, i); } } /** - * g_file_info_get_attribute: - * @info: a #GFileInfo. - * @attribute: a file attribute key. - * - * Gets an attribute value from a file info structure. - * - * Returns: a #GFileAttributeValue for the given @attribute, or - * %NULL otherwise. - **/ + * g_file_info_get_attribute_data: + * @info: a #GFileInfo + * @attribute: a file attribute key + * @type: (out) (allow-none): return location for the attribute type, or %NULL + * @value_pp: (out) (allow-none): return location for the attribute value, or %NULL + * @status: (out) (allow-none): return location for the attribute status, or %NULL + * + * Gets the attribute type, value and status for an attribute key. + * + * Returns: (transfer none): %TRUE if @info has an attribute named @attribute, + * %FALSE otherwise. + */ +gboolean +g_file_info_get_attribute_data (GFileInfo *info, + const char *attribute, + GFileAttributeType *type, + gpointer *value_pp, + GFileAttributeStatus *status) +{ + GFileAttributeValue *value; + + value = g_file_info_find_value_by_name (info, attribute); + if (value == NULL) + return FALSE; + + if (status) + *status = value->status; + + if (type) + *type = value->type; + + if (value_pp) + *value_pp = _g_file_attribute_value_peek_as_pointer (value); + + return TRUE; +} + +/** + * g_file_info_get_attribute_status: + * @info: a #GFileInfo + * @attribute: a file attribute key + * + * Gets the attribute status for an attribute key. + * + * Returns: a #GFileAttributeStatus for the given @attribute, or + * %G_FILE_ATTRIBUTE_STATUS_UNSET if the key is invalid. + * + */ +GFileAttributeStatus +g_file_info_get_attribute_status (GFileInfo *info, + const char *attribute) +{ + GFileAttributeValue *val; + + g_return_val_if_fail (G_IS_FILE_INFO (info), 0); + g_return_val_if_fail (attribute != NULL && *attribute != '\0', 0); + + val = g_file_info_find_value_by_name (info, attribute); + if (val) + return val->status; + + return G_FILE_ATTRIBUTE_STATUS_UNSET; +} + +/** + * g_file_info_set_attribute_status: + * @info: a #GFileInfo + * @attribute: a file attribute key + * @status: a #GFileAttributeStatus + * + * Sets the attribute status for an attribute key. This is only + * needed by external code that implement g_file_set_attributes_from_info() + * or similar functions. + * + * The attribute must exist in @info for this to work. Otherwise %FALSE + * is returned and @info is unchanged. + * + * Returns: %TRUE if the status was changed, %FALSE if the key was not set. + * + * Since: 2.22 + */ +gboolean +g_file_info_set_attribute_status (GFileInfo *info, + const char *attribute, + GFileAttributeStatus status) +{ + GFileAttributeValue *val; + + g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); + g_return_val_if_fail (attribute != NULL && *attribute != '\0', FALSE); + + val = g_file_info_find_value_by_name (info, attribute); + if (val) + { + val->status = status; + return TRUE; + } + + return FALSE; +} + GFileAttributeValue * -g_file_info_get_attribute (GFileInfo *info, - const char *attribute) - +_g_file_info_get_attribute_value (GFileInfo *info, + const char *attribute) + { g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); g_return_val_if_fail (attribute != NULL && *attribute != '\0', NULL); @@ -580,14 +818,38 @@ g_file_info_get_attribute (GFileInfo *info, } /** + * g_file_info_get_attribute_as_string: + * @info: a #GFileInfo. + * @attribute: a file attribute key. + * + * Gets the value of a attribute, formated as a string. + * This escapes things as needed to make the string valid + * utf8. + * + * Returns: a UTF-8 string associated with the given @attribute. + * When you're done with the string it must be freed with g_free(). + **/ +char * +g_file_info_get_attribute_as_string (GFileInfo *info, + const char *attribute) +{ + GFileAttributeValue *val; + val = _g_file_info_get_attribute_value (info, attribute); + if (val) + return _g_file_attribute_value_as_string (val); + return NULL; +} + + +/** * g_file_info_get_attribute_object: * @info: a #GFileInfo. * @attribute: a file attribute key. - * - * Gets the value of a #GObject attribute. If the attribute does + * + * Gets the value of a #GObject attribute. If the attribute does * not contain a #GObject, %NULL will be returned. - * - * Returns: a #GObject associated with the given @attribute, or + * + * Returns: (transfer none): a #GObject associated with the given @attribute, or * %NULL otherwise. **/ GObject * @@ -595,23 +857,23 @@ g_file_info_get_attribute_object (GFileInfo *info, const char *attribute) { GFileAttributeValue *value; - + g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); g_return_val_if_fail (attribute != NULL && *attribute != '\0', NULL); value = g_file_info_find_value_by_name (info, attribute); - return g_file_attribute_value_get_object (value); + return _g_file_attribute_value_get_object (value); } /** * g_file_info_get_attribute_string: * @info: a #GFileInfo. * @attribute: a file attribute key. - * - * Gets the value of a string attribute. If the attribute does + * + * Gets the value of a string attribute. If the attribute does * not contain a string, %NULL will be returned. - * - * Returns: the contents of the @attribute value as a string, or + * + * Returns: the contents of the @attribute value as a UTF-8 string, or * %NULL otherwise. **/ const char * @@ -619,23 +881,23 @@ g_file_info_get_attribute_string (GFileInfo *info, const char *attribute) { GFileAttributeValue *value; - + g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); g_return_val_if_fail (attribute != NULL && *attribute != '\0', NULL); value = g_file_info_find_value_by_name (info, attribute); - return g_file_attribute_value_get_string (value); + return _g_file_attribute_value_get_string (value); } /** * g_file_info_get_attribute_byte_string: * @info: a #GFileInfo. * @attribute: a file attribute key. - * - * Gets the value of a byte string attribute. If the attribute does + * + * Gets the value of a byte string attribute. If the attribute does * not contain a byte string, %NULL will be returned. - * - * Returns: the contents of the @attribute value as a byte string, or + * + * Returns: the contents of the @attribute value as a byte string, or * %NULL otherwise. **/ const char * @@ -643,70 +905,96 @@ g_file_info_get_attribute_byte_string (GFileInfo *info, const char *attribute) { GFileAttributeValue *value; - + + g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); + g_return_val_if_fail (attribute != NULL && *attribute != '\0', NULL); + + value = g_file_info_find_value_by_name (info, attribute); + return _g_file_attribute_value_get_byte_string (value); +} + +/** + * g_file_info_get_attribute_stringv: + * @info: a #GFileInfo. + * @attribute: a file attribute key. + * + * Gets the value of a stringv attribute. If the attribute does + * not contain a stringv, %NULL will be returned. + * + * Returns: (transfer none): the contents of the @attribute value as a stringv, or + * %NULL otherwise. Do not free. These returned strings are UTF-8. + * + * Since: 2.22 + **/ +char ** +g_file_info_get_attribute_stringv (GFileInfo *info, + const char *attribute) +{ + GFileAttributeValue *value; + g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); g_return_val_if_fail (attribute != NULL && *attribute != '\0', NULL); value = g_file_info_find_value_by_name (info, attribute); - return g_file_attribute_value_get_byte_string (value); + return _g_file_attribute_value_get_stringv (value); } /** * g_file_info_get_attribute_boolean: * @info: a #GFileInfo. * @attribute: a file attribute key. - * + * * Gets the value of a boolean attribute. If the attribute does not * contain a boolean value, %FALSE will be returned. - * - * Returns: the boolean value contained within the attribute. + * + * Returns: the boolean value contained within the attribute. **/ gboolean g_file_info_get_attribute_boolean (GFileInfo *info, const char *attribute) { GFileAttributeValue *value; - + g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); g_return_val_if_fail (attribute != NULL && *attribute != '\0', FALSE); value = g_file_info_find_value_by_name (info, attribute); - return g_file_attribute_value_get_boolean (value); + return _g_file_attribute_value_get_boolean (value); } /** * g_file_info_get_attribute_uint32: * @info: a #GFileInfo. * @attribute: a file attribute key. - * - * Gets an unsigned 32-bit integer contained within the attribute. If the - * attribute does not contain an unsigned 32-bit integer, or is invalid, + * + * Gets an unsigned 32-bit integer contained within the attribute. If the + * attribute does not contain an unsigned 32-bit integer, or is invalid, * 0 will be returned. - * - * Returns: an unsigned 32-bit integer from the attribute. + * + * Returns: an unsigned 32-bit integer from the attribute. **/ guint32 g_file_info_get_attribute_uint32 (GFileInfo *info, const char *attribute) { GFileAttributeValue *value; - + g_return_val_if_fail (G_IS_FILE_INFO (info), 0); g_return_val_if_fail (attribute != NULL && *attribute != '\0', 0); value = g_file_info_find_value_by_name (info, attribute); - return g_file_attribute_value_get_uint32 (value); + return _g_file_attribute_value_get_uint32 (value); } /** * g_file_info_get_attribute_int32: * @info: a #GFileInfo. * @attribute: a file attribute key. - * - * Gets a signed 32-bit integer contained within the attribute. If the - * attribute does not contain a signed 32-bit integer, or is invalid, + * + * Gets a signed 32-bit integer contained within the attribute. If the + * attribute does not contain a signed 32-bit integer, or is invalid, * 0 will be returned. - * + * * Returns: a signed 32-bit integer from the attribute. **/ gint32 @@ -719,19 +1007,19 @@ g_file_info_get_attribute_int32 (GFileInfo *info, g_return_val_if_fail (attribute != NULL && *attribute != '\0', 0); value = g_file_info_find_value_by_name (info, attribute); - return g_file_attribute_value_get_int32 (value); + return _g_file_attribute_value_get_int32 (value); } /** * g_file_info_get_attribute_uint64: * @info: a #GFileInfo. * @attribute: a file attribute key. - * - * Gets a unsigned 64-bit integer contained within the attribute. If the - * attribute does not contain an unsigned 64-bit integer, or is invalid, + * + * Gets a unsigned 64-bit integer contained within the attribute. If the + * attribute does not contain an unsigned 64-bit integer, or is invalid, * 0 will be returned. - * - * Returns: a unsigned 64-bit integer from the attribute. + * + * Returns: a unsigned 64-bit integer from the attribute. **/ guint64 g_file_info_get_attribute_uint64 (GFileInfo *info, @@ -743,19 +1031,19 @@ g_file_info_get_attribute_uint64 (GFileInfo *info, g_return_val_if_fail (attribute != NULL && *attribute != '\0', 0); value = g_file_info_find_value_by_name (info, attribute); - return g_file_attribute_value_get_uint64 (value); + return _g_file_attribute_value_get_uint64 (value); } /** * g_file_info_get_attribute_int64: * @info: a #GFileInfo. * @attribute: a file attribute key. - * - * Gets a signed 64-bit integer contained within the attribute. If the - * attribute does not contain an signed 64-bit integer, or is invalid, + * + * Gets a signed 64-bit integer contained within the attribute. If the + * attribute does not contain an signed 64-bit integer, or is invalid, * 0 will be returned. - * - * Returns: a signed 64-bit integer from the attribute. + * + * Returns: a signed 64-bit integer from the attribute. **/ gint64 g_file_info_get_attribute_int64 (GFileInfo *info, @@ -767,7 +1055,7 @@ g_file_info_get_attribute_int64 (GFileInfo *info, g_return_val_if_fail (attribute != NULL && *attribute != '\0', 0); value = g_file_info_find_value_by_name (info, attribute); - return g_file_attribute_value_get_int64 (value); + return _g_file_attribute_value_get_int64 (value); } static GFileAttributeValue * @@ -775,23 +1063,22 @@ g_file_info_create_value (GFileInfo *info, guint32 attr_id) { GFileAttribute *attrs; - GFileAttribute attr; int i; if (info->mask != NO_ATTRIBUTE_MASK && - !g_file_attribute_matcher_matches_id (info->mask, attr_id)) + !_g_file_attribute_matcher_matches_id (info->mask, attr_id)) return NULL; - + i = g_file_info_find_place (info, attr_id); - + attrs = (GFileAttribute *)info->attributes->data; if (i < info->attributes->len && attrs[i].attribute == attr_id) return &attrs[i].value; else { + GFileAttribute attr = { 0 }; attr.attribute = attr_id; - attr.value.type = G_FILE_ATTRIBUTE_TYPE_INVALID; g_array_insert_val (info->attributes, i, attr); attrs = (GFileAttribute *)info->attributes->data; @@ -799,40 +1086,51 @@ g_file_info_create_value (GFileInfo *info, } } -static GFileAttributeValue * -g_file_info_create_value_by_name (GFileInfo *info, - const char *attribute) +void +_g_file_info_set_attribute_by_id (GFileInfo *info, + guint32 attribute, + GFileAttributeType type, + gpointer value_p) { - guint32 attr_id; + GFileAttributeValue *value; - attr_id = lookup_attribute (attribute); + value = g_file_info_create_value (info, attribute); - return g_file_info_create_value (info, attr_id); + if (value) + _g_file_attribute_value_set_from_pointer (value, type, value_p, TRUE); } /** * g_file_info_set_attribute: * @info: a #GFileInfo. * @attribute: a file attribute key. - * @attr_value: a #GFileAttributeValue. - * - * Sets the @attribute to contain the given @attr_value, - * if possible. + * @type: a #GFileAttributeType + * @value_p: pointer to the value + * + * Sets the @attribute to contain the given value, if possible. **/ void g_file_info_set_attribute (GFileInfo *info, const char *attribute, - const GFileAttributeValue *attr_value) + GFileAttributeType type, + gpointer value_p) { - GFileAttributeValue *value; - g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (attribute != NULL && *attribute != '\0'); - g_return_if_fail (attr_value != NULL); - value = g_file_info_create_value_by_name (info, attribute); + _g_file_info_set_attribute_by_id (info, lookup_attribute (attribute), type, value_p); +} + +void +_g_file_info_set_attribute_object_by_id (GFileInfo *info, + guint32 attribute, + GObject *attr_value) +{ + GFileAttributeValue *value; + + value = g_file_info_create_value (info, attribute); if (value) - g_file_attribute_value_set (value, attr_value); + _g_file_attribute_value_set_object (value, attr_value); } /** @@ -840,8 +1138,8 @@ g_file_info_set_attribute (GFileInfo *info, * @info: a #GFileInfo. * @attribute: a file attribute key. * @attr_value: a #GObject. - * - * Sets the @attribute to contain the given @attr_value, + * + * Sets the @attribute to contain the given @attr_value, * if possible. **/ void @@ -849,24 +1147,71 @@ g_file_info_set_attribute_object (GFileInfo *info, const char *attribute, GObject *attr_value) { + g_return_if_fail (G_IS_FILE_INFO (info)); + g_return_if_fail (attribute != NULL && *attribute != '\0'); + g_return_if_fail (G_IS_OBJECT (attr_value)); + + _g_file_info_set_attribute_object_by_id (info, + lookup_attribute (attribute), + attr_value); +} + +void +_g_file_info_set_attribute_stringv_by_id (GFileInfo *info, + guint32 attribute, + char **attr_value) +{ GFileAttributeValue *value; + value = g_file_info_create_value (info, attribute); + if (value) + _g_file_attribute_value_set_stringv (value, attr_value); +} + +/** + * g_file_info_set_attribute_stringv: + * @info: a #GFileInfo. + * @attribute: a file attribute key + * @attr_value: a %NULL terminated array of UTF-8 strings. + * + * Sets the @attribute to contain the given @attr_value, + * if possible. + * + * Sinze: 2.22 + **/ +void +g_file_info_set_attribute_stringv (GFileInfo *info, + const char *attribute, + char **attr_value) +{ g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (attribute != NULL && *attribute != '\0'); - g_return_if_fail (G_IS_OBJECT (attr_value)); + g_return_if_fail (attr_value != NULL); + + _g_file_info_set_attribute_stringv_by_id (info, + lookup_attribute (attribute), + attr_value); +} + +void +_g_file_info_set_attribute_string_by_id (GFileInfo *info, + guint32 attribute, + const char *attr_value) +{ + GFileAttributeValue *value; - value = g_file_info_create_value_by_name (info, attribute); + value = g_file_info_create_value (info, attribute); if (value) - g_file_attribute_value_set_object (value, attr_value); + _g_file_attribute_value_set_string (value, attr_value); } /** * g_file_info_set_attribute_string: * @info: a #GFileInfo. * @attribute: a file attribute key. - * @attr_value: a string. - * - * Sets the @attribute to contain the given @attr_value, + * @attr_value: a UTF-8 string. + * + * Sets the @attribute to contain the given @attr_value, * if possible. **/ void @@ -874,15 +1219,25 @@ g_file_info_set_attribute_string (GFileInfo *info, const char *attribute, const char *attr_value) { - GFileAttributeValue *value; - g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (attribute != NULL && *attribute != '\0'); g_return_if_fail (attr_value != NULL); - value = g_file_info_create_value_by_name (info, attribute); + _g_file_info_set_attribute_string_by_id (info, + lookup_attribute (attribute), + attr_value); +} + +void +_g_file_info_set_attribute_byte_string_by_id (GFileInfo *info, + guint32 attribute, + const char *attr_value) +{ + GFileAttributeValue *value; + + value = g_file_info_create_value (info, attribute); if (value) - g_file_attribute_value_set_string (value, attr_value); + _g_file_attribute_value_set_byte_string (value, attr_value); } /** @@ -890,8 +1245,8 @@ g_file_info_set_attribute_string (GFileInfo *info, * @info: a #GFileInfo. * @attribute: a file attribute key. * @attr_value: a byte string. - * - * Sets the @attribute to contain the given @attr_value, + * + * Sets the @attribute to contain the given @attr_value, * if possible. **/ void @@ -899,15 +1254,25 @@ g_file_info_set_attribute_byte_string (GFileInfo *info, const char *attribute, const char *attr_value) { - GFileAttributeValue *value; - g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (attribute != NULL && *attribute != '\0'); g_return_if_fail (attr_value != NULL); - value = g_file_info_create_value_by_name (info, attribute); + _g_file_info_set_attribute_byte_string_by_id (info, + lookup_attribute (attribute), + attr_value); +} + +void +_g_file_info_set_attribute_boolean_by_id (GFileInfo *info, + guint32 attribute, + gboolean attr_value) +{ + GFileAttributeValue *value; + + value = g_file_info_create_value (info, attribute); if (value) - g_file_attribute_value_set_byte_string (value, attr_value); + _g_file_attribute_value_set_boolean (value, attr_value); } /** @@ -915,8 +1280,8 @@ g_file_info_set_attribute_byte_string (GFileInfo *info, * @info: a #GFileInfo. * @attribute: a file attribute key. * @attr_value: a boolean value. - * - * Sets the @attribute to contain the given @attr_value, + * + * Sets the @attribute to contain the given @attr_value, * if possible. **/ void @@ -924,14 +1289,24 @@ g_file_info_set_attribute_boolean (GFileInfo *info, const char *attribute, gboolean attr_value) { - GFileAttributeValue *value; - g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (attribute != NULL && *attribute != '\0'); - value = g_file_info_create_value_by_name (info, attribute); + _g_file_info_set_attribute_boolean_by_id (info, + lookup_attribute (attribute), + attr_value); +} + +void +_g_file_info_set_attribute_uint32_by_id (GFileInfo *info, + guint32 attribute, + guint32 attr_value) +{ + GFileAttributeValue *value; + + value = g_file_info_create_value (info, attribute); if (value) - g_file_attribute_value_set_boolean (value, attr_value); + _g_file_attribute_value_set_uint32 (value, attr_value); } /** @@ -939,8 +1314,8 @@ g_file_info_set_attribute_boolean (GFileInfo *info, * @info: a #GFileInfo. * @attribute: a file attribute key. * @attr_value: an unsigned 32-bit integer. - * - * Sets the @attribute to contain the given @attr_value, + * + * Sets the @attribute to contain the given @attr_value, * if possible. **/ void @@ -948,24 +1323,33 @@ g_file_info_set_attribute_uint32 (GFileInfo *info, const char *attribute, guint32 attr_value) { - GFileAttributeValue *value; - g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (attribute != NULL && *attribute != '\0'); - value = g_file_info_create_value_by_name (info, attribute); - if (value) - g_file_attribute_value_set_uint32 (value, attr_value); + _g_file_info_set_attribute_uint32_by_id (info, + lookup_attribute (attribute), + attr_value); } +void +_g_file_info_set_attribute_int32_by_id (GFileInfo *info, + guint32 attribute, + gint32 attr_value) +{ + GFileAttributeValue *value; + + value = g_file_info_create_value (info, attribute); + if (value) + _g_file_attribute_value_set_int32 (value, attr_value); +} /** * g_file_info_set_attribute_int32: * @info: a #GFileInfo. * @attribute: a file attribute key. * @attr_value: a signed 32-bit integer - * - * Sets the @attribute to contain the given @attr_value, + * + * Sets the @attribute to contain the given @attr_value, * if possible. **/ void @@ -973,14 +1357,24 @@ g_file_info_set_attribute_int32 (GFileInfo *info, const char *attribute, gint32 attr_value) { - GFileAttributeValue *value; - g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (attribute != NULL && *attribute != '\0'); - value = g_file_info_create_value_by_name (info, attribute); + _g_file_info_set_attribute_int32_by_id (info, + lookup_attribute (attribute), + attr_value); +} + +void +_g_file_info_set_attribute_uint64_by_id (GFileInfo *info, + guint32 attribute, + guint64 attr_value) +{ + GFileAttributeValue *value; + + value = g_file_info_create_value (info, attribute); if (value) - g_file_attribute_value_set_int32 (value, attr_value); + _g_file_attribute_value_set_uint64 (value, attr_value); } /** @@ -988,8 +1382,8 @@ g_file_info_set_attribute_int32 (GFileInfo *info, * @info: a #GFileInfo. * @attribute: a file attribute key. * @attr_value: an unsigned 64-bit integer. - * - * Sets the @attribute to contain the given @attr_value, + * + * Sets the @attribute to contain the given @attr_value, * if possible. **/ void @@ -997,14 +1391,24 @@ g_file_info_set_attribute_uint64 (GFileInfo *info, const char *attribute, guint64 attr_value) { - GFileAttributeValue *value; - g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (attribute != NULL && *attribute != '\0'); - value = g_file_info_create_value_by_name (info, attribute); + _g_file_info_set_attribute_uint64_by_id (info, + lookup_attribute (attribute), + attr_value); +} + +void +_g_file_info_set_attribute_int64_by_id (GFileInfo *info, + guint32 attribute, + gint64 attr_value) +{ + GFileAttributeValue *value; + + value = g_file_info_create_value (info, attribute); if (value) - g_file_attribute_value_set_uint64 (value, attr_value); + _g_file_attribute_value_set_int64 (value, attr_value); } /** @@ -1012,34 +1416,32 @@ g_file_info_set_attribute_uint64 (GFileInfo *info, * @info: a #GFileInfo. * @attribute: attribute name to set. * @attr_value: int64 value to set attribute to. - * - * Sets the @attribute to contain the given @attr_value, + * + * Sets the @attribute to contain the given @attr_value, * if possible. - * + * **/ void g_file_info_set_attribute_int64 (GFileInfo *info, const char *attribute, gint64 attr_value) { - GFileAttributeValue *value; - g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (attribute != NULL && *attribute != '\0'); - value = g_file_info_create_value_by_name (info, attribute); - if (value) - g_file_attribute_value_set_int64 (value, attr_value); + _g_file_info_set_attribute_int64_by_id (info, + lookup_attribute (attribute), + attr_value); } /* Helper getters */ /** * g_file_info_get_file_type: * @info: a #GFileInfo. - * - * Gets a file's type (whether it is a regular file, symlink, etc). + * + * Gets a file's type (whether it is a regular file, symlink, etc). * This is different from the file's content type, see g_file_info_get_content_type(). - * + * * Returns: a #GFileType for the given file. **/ GFileType @@ -1049,20 +1451,20 @@ g_file_info_get_file_type (GFileInfo *info) GFileAttributeValue *value; g_return_val_if_fail (G_IS_FILE_INFO (info), G_FILE_TYPE_UNKNOWN); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_TYPE); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_TYPE); + value = g_file_info_find_value (info, attr); - return (GFileType)g_file_attribute_value_get_uint32 (value); + return (GFileType)_g_file_attribute_value_get_uint32 (value); } /** * g_file_info_get_is_hidden: * @info: a #GFileInfo. - * + * * Checks if a file is hidden. - * + * * Returns: %TRUE if the file is a hidden file, %FALSE otherwise. **/ gboolean @@ -1070,22 +1472,22 @@ g_file_info_get_is_hidden (GFileInfo *info) { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_IS_HIDDEN); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN); + value = g_file_info_find_value (info, attr); - return (GFileType)g_file_attribute_value_get_boolean (value); + return (GFileType)_g_file_attribute_value_get_boolean (value); } /** * g_file_info_get_is_backup: * @info: a #GFileInfo. - * + * * Checks if a file is a backup file. - * + * * Returns: %TRUE if file is a backup file, %FALSE otherwise. **/ gboolean @@ -1093,22 +1495,22 @@ g_file_info_get_is_backup (GFileInfo *info) { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_IS_BACKUP); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP); + value = g_file_info_find_value (info, attr); - return (GFileType)g_file_attribute_value_get_boolean (value); + return (GFileType)_g_file_attribute_value_get_boolean (value); } /** * g_file_info_get_is_symlink: * @info: a #GFileInfo. - * + * * Checks if a file is a symlink. - * + * * Returns: %TRUE if the given @info is a symlink. **/ gboolean @@ -1116,22 +1518,22 @@ g_file_info_get_is_symlink (GFileInfo *info) { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_IS_SYMLINK); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK); + value = g_file_info_find_value (info, attr); - return (GFileType)g_file_attribute_value_get_boolean (value); + return (GFileType)_g_file_attribute_value_get_boolean (value); } /** * g_file_info_get_name: * @info: a #GFileInfo. - * + * * Gets the name for a file. - * + * * Returns: a string containing the file name. **/ const char * @@ -1139,22 +1541,22 @@ g_file_info_get_name (GFileInfo *info) { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_NAME); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_NAME); + value = g_file_info_find_value (info, attr); - return g_file_attribute_value_get_byte_string (value); + return _g_file_attribute_value_get_byte_string (value); } /** * g_file_info_get_display_name: * @info: a #GFileInfo. - * + * * Gets a display name for a file. - * + * * Returns: a string containing the display name. **/ const char * @@ -1162,22 +1564,22 @@ g_file_info_get_display_name (GFileInfo *info) { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_DISPLAY_NAME); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME); + value = g_file_info_find_value (info, attr); - return g_file_attribute_value_get_string (value); + return _g_file_attribute_value_get_string (value); } /** * g_file_info_get_edit_name: * @info: a #GFileInfo. - * + * * Gets the edit name for a file. - * + * * Returns: a string containing the edit name. **/ const char * @@ -1185,23 +1587,23 @@ g_file_info_get_edit_name (GFileInfo *info) { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_EDIT_NAME); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME); + value = g_file_info_find_value (info, attr); - return g_file_attribute_value_get_string (value); + return _g_file_attribute_value_get_string (value); } /** * g_file_info_get_icon: * @info: a #GFileInfo. - * + * * Gets the icon for a file. - * - * Returns: #GIcon for the given @info. + * + * Returns: (transfer none): #GIcon for the given @info. **/ GIcon * g_file_info_get_icon (GFileInfo *info) @@ -1209,15 +1611,15 @@ g_file_info_get_icon (GFileInfo *info) static guint32 attr = 0; GFileAttributeValue *value; GObject *obj; - + g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_ICON); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_ICON); + value = g_file_info_find_value (info, attr); - obj = g_file_attribute_value_get_object (value); - if (obj != NULL && G_IS_ICON (obj)) + obj = _g_file_attribute_value_get_object (value); + if (G_IS_ICON (obj)) return G_ICON (obj); return NULL; } @@ -1225,54 +1627,54 @@ g_file_info_get_icon (GFileInfo *info) /** * g_file_info_get_content_type: * @info: a #GFileInfo. - * + * * Gets the file's content type. - * - * Returns: a string containing the file's content type.s + * + * Returns: a string containing the file's content type. **/ const char * g_file_info_get_content_type (GFileInfo *info) { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_CONTENT_TYPE); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE); + value = g_file_info_find_value (info, attr); - return g_file_attribute_value_get_string (value); + return _g_file_attribute_value_get_string (value); } /** * g_file_info_get_size: * @info: a #GFileInfo. - * + * * Gets the file's size. - * - * Returns: a #goffset containing the file's size. + * + * Returns: a #goffset containing the file's size. **/ goffset g_file_info_get_size (GFileInfo *info) { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_val_if_fail (G_IS_FILE_INFO (info), (goffset) 0); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_SIZE); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_SIZE); + value = g_file_info_find_value (info, attr); - return (goffset) g_file_attribute_value_get_uint64 (value); + return (goffset) _g_file_attribute_value_get_uint64 (value); } /** * g_file_info_get_modification_time: * @info: a #GFileInfo. * @result: a #GTimeVal. - * + * * Gets the modification time of the current @info and sets it * in @result. **/ @@ -1285,25 +1687,25 @@ g_file_info_get_modification_time (GFileInfo *info, g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (result != NULL); - + if (attr_mtime == 0) { attr_mtime = lookup_attribute (G_FILE_ATTRIBUTE_TIME_MODIFIED); attr_mtime_usec = lookup_attribute (G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC); } - + value = g_file_info_find_value (info, attr_mtime); - result->tv_sec = g_file_attribute_value_get_uint64 (value); + result->tv_sec = _g_file_attribute_value_get_uint64 (value); value = g_file_info_find_value (info, attr_mtime_usec); - result->tv_usec = g_file_attribute_value_get_uint32 (value); + result->tv_usec = _g_file_attribute_value_get_uint32 (value); } /** * g_file_info_get_symlink_target: * @info: a #GFileInfo. - * + * * Gets the symlink target for a given #GFileInfo. - * + * * Returns: a string containing the symlink target. **/ const char * @@ -1311,23 +1713,23 @@ g_file_info_get_symlink_target (GFileInfo *info) { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_SYMLINK_TARGET); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET); + value = g_file_info_find_value (info, attr); - return g_file_attribute_value_get_byte_string (value); + return _g_file_attribute_value_get_byte_string (value); } /** * g_file_info_get_etag: * @info: a #GFileInfo. - * - * Gets the entity tag for a given #GFileInfo. - * See %G_FILE_ATTRIBUTE_ETAG_VALUE. - * + * + * Gets the entity tag for a given + * #GFileInfo. See %G_FILE_ATTRIBUTE_ETAG_VALUE. + * * Returns: a string containing the value of the "etag:value" attribute. **/ const char * @@ -1335,38 +1737,38 @@ g_file_info_get_etag (GFileInfo *info) { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_val_if_fail (G_IS_FILE_INFO (info), NULL); - + if (attr == 0) attr = lookup_attribute (G_FILE_ATTRIBUTE_ETAG_VALUE); - + value = g_file_info_find_value (info, attr); - return g_file_attribute_value_get_string (value); + return _g_file_attribute_value_get_string (value); } /** * g_file_info_get_sort_order: * @info: a #GFileInfo. - * + * * Gets the value of the sort_order attribute from the #GFileInfo. - * See %G_FILE_ATTRIBUTE_STD_SORT_ORDER. - * - * Returns: a #gint32 containing the value of the "std:sort_order" attribute. + * See %G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER. + * + * Returns: a #gint32 containing the value of the "standard::sort_order" attribute. **/ gint32 g_file_info_get_sort_order (GFileInfo *info) { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_val_if_fail (G_IS_FILE_INFO (info), 0); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_SORT_ORDER); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER); + value = g_file_info_find_value (info, attr); - return g_file_attribute_value_get_int32 (value); + return _g_file_attribute_value_get_int32 (value); } /* Helper setters: */ @@ -1374,9 +1776,9 @@ g_file_info_get_sort_order (GFileInfo *info) * g_file_info_set_file_type: * @info: a #GFileInfo. * @type: a #GFileType. - * + * * Sets the file type in a #GFileInfo to @type. - * See %G_FILE_ATTRIBUTE_STD_TYPE. + * See %G_FILE_ATTRIBUTE_STANDARD_TYPE. **/ void g_file_info_set_file_type (GFileInfo *info, @@ -1384,24 +1786,24 @@ g_file_info_set_file_type (GFileInfo *info, { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_if_fail (G_IS_FILE_INFO (info)); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_TYPE); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_TYPE); + value = g_file_info_create_value (info, attr); if (value) - g_file_attribute_value_set_uint32 (value, type); + _g_file_attribute_value_set_uint32 (value, type); } /** * g_file_info_set_is_hidden: * @info: a #GFileInfo. * @is_hidden: a #gboolean. - * + * * Sets the "is_hidden" attribute in a #GFileInfo according to @is_symlink. - * See %G_FILE_ATTRIBUTE_STD_IS_HIDDEN. + * See %G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN. **/ void g_file_info_set_is_hidden (GFileInfo *info, @@ -1409,24 +1811,24 @@ g_file_info_set_is_hidden (GFileInfo *info, { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_if_fail (G_IS_FILE_INFO (info)); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_IS_HIDDEN); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN); + value = g_file_info_create_value (info, attr); if (value) - g_file_attribute_value_set_boolean (value, is_hidden); + _g_file_attribute_value_set_boolean (value, is_hidden); } /** * g_file_info_set_is_symlink: * @info: a #GFileInfo. * @is_symlink: a #gboolean. - * + * * Sets the "is_symlink" attribute in a #GFileInfo according to @is_symlink. - * See %G_FILE_ATTRIBUTE_STD_IS_SYMLINK. + * See %G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK. **/ void g_file_info_set_is_symlink (GFileInfo *info, @@ -1434,24 +1836,24 @@ g_file_info_set_is_symlink (GFileInfo *info, { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_if_fail (G_IS_FILE_INFO (info)); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_IS_SYMLINK); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK); + value = g_file_info_create_value (info, attr); if (value) - g_file_attribute_value_set_boolean (value, is_symlink); + _g_file_attribute_value_set_boolean (value, is_symlink); } /** * g_file_info_set_name: * @info: a #GFileInfo. * @name: a string containing a name. - * - * Sets the name attribute for the current #GFileInfo. - * See %G_FILE_ATTRIBUTE_STD_NAME. + * + * Sets the name attribute for the current #GFileInfo. + * See %G_FILE_ATTRIBUTE_STANDARD_NAME. **/ void g_file_info_set_name (GFileInfo *info, @@ -1459,25 +1861,25 @@ g_file_info_set_name (GFileInfo *info, { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (name != NULL); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_NAME); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_NAME); + value = g_file_info_create_value (info, attr); if (value) - g_file_attribute_value_set_byte_string (value, name); + _g_file_attribute_value_set_byte_string (value, name); } /** * g_file_info_set_display_name: * @info: a #GFileInfo. * @display_name: a string containing a display name. - * + * * Sets the display name for the current #GFileInfo. - * See %G_FILE_ATTRIBUTE_STD_DISPLAY_NAME. + * See %G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME. **/ void g_file_info_set_display_name (GFileInfo *info, @@ -1485,25 +1887,25 @@ g_file_info_set_display_name (GFileInfo *info, { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (display_name != NULL); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_DISPLAY_NAME); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME); + value = g_file_info_create_value (info, attr); if (value) - g_file_attribute_value_set_string (value, display_name); + _g_file_attribute_value_set_string (value, display_name); } /** * g_file_info_set_edit_name: * @info: a #GFileInfo. * @edit_name: a string containing an edit name. - * + * * Sets the edit name for the current file. - * See %G_FILE_ATTRIBUTE_STD_EDIT_NAME. + * See %G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME. **/ void g_file_info_set_edit_name (GFileInfo *info, @@ -1511,25 +1913,25 @@ g_file_info_set_edit_name (GFileInfo *info, { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (edit_name != NULL); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_EDIT_NAME); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME); + value = g_file_info_create_value (info, attr); if (value) - g_file_attribute_value_set_string (value, edit_name); + _g_file_attribute_value_set_string (value, edit_name); } /** * g_file_info_set_icon: * @info: a #GFileInfo. * @icon: a #GIcon. - * - * Sets the icon for a given #GFileInfo. - * See %G_FILE_ATTRIBUTE_STD_ICON. + * + * Sets the icon for a given #GFileInfo. + * See %G_FILE_ATTRIBUTE_STANDARD_ICON. **/ void g_file_info_set_icon (GFileInfo *info, @@ -1537,25 +1939,25 @@ g_file_info_set_icon (GFileInfo *info, { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (G_IS_ICON (icon)); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_ICON); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_ICON); + value = g_file_info_create_value (info, attr); if (value) - g_file_attribute_value_set_object (value, G_OBJECT (icon)); + _g_file_attribute_value_set_object (value, G_OBJECT (icon)); } /** * g_file_info_set_content_type: * @info: a #GFileInfo. - * @content_type: a content type. See #GContentType. - * + * @content_type: a content type. See GContentType. + * * Sets the content type attribute for a given #GFileInfo. - * See %G_FILE_ATTRIBUTE_STD_CONTENT_TYPE. + * See %G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE. **/ void g_file_info_set_content_type (GFileInfo *info, @@ -1563,24 +1965,24 @@ g_file_info_set_content_type (GFileInfo *info, { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (content_type != NULL); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_CONTENT_TYPE); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE); + value = g_file_info_create_value (info, attr); if (value) - g_file_attribute_value_set_string (value, content_type); + _g_file_attribute_value_set_string (value, content_type); } /** * g_file_info_set_size: * @info: a #GFileInfo. * @size: a #goffset containing the file's size. - * - * Sets the %G_FILE_ATTRIBUTE_STD_SIZE attribute in the file info + * + * Sets the %G_FILE_ATTRIBUTE_STANDARD_SIZE attribute in the file info * to the given size. **/ void @@ -1589,22 +1991,22 @@ g_file_info_set_size (GFileInfo *info, { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_if_fail (G_IS_FILE_INFO (info)); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_SIZE); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_SIZE); + value = g_file_info_create_value (info, attr); if (value) - g_file_attribute_value_set_uint64 (value, size); + _g_file_attribute_value_set_uint64 (value, size); } /** * g_file_info_set_modification_time * @info: a #GFileInfo. * @mtime: a #GTimeVal. - * + * * Sets the %G_FILE_ATTRIBUTE_TIME_MODIFIED attribute in the file * info to the given time value. **/ @@ -1614,30 +2016,30 @@ g_file_info_set_modification_time (GFileInfo *info, { static guint32 attr_mtime = 0, attr_mtime_usec; GFileAttributeValue *value; - + g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (mtime != NULL); - + if (attr_mtime == 0) { attr_mtime = lookup_attribute (G_FILE_ATTRIBUTE_TIME_MODIFIED); attr_mtime_usec = lookup_attribute (G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC); } - + value = g_file_info_create_value (info, attr_mtime); if (value) - g_file_attribute_value_set_uint64 (value, mtime->tv_sec); + _g_file_attribute_value_set_uint64 (value, mtime->tv_sec); value = g_file_info_create_value (info, attr_mtime_usec); if (value) - g_file_attribute_value_set_uint32 (value, mtime->tv_usec); + _g_file_attribute_value_set_uint32 (value, mtime->tv_usec); } /** * g_file_info_set_symlink_target: * @info: a #GFileInfo. * @symlink_target: a static string containing a path to a symlink target. - * - * Sets the %G_FILE_ATTRIBUTE_STD_SYMLINK_TARGET attribute in the file info + * + * Sets the %G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET attribute in the file info * to the given symlink target. **/ void @@ -1646,25 +2048,25 @@ g_file_info_set_symlink_target (GFileInfo *info, { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_if_fail (G_IS_FILE_INFO (info)); g_return_if_fail (symlink_target != NULL); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_SYMLINK_TARGET); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET); + value = g_file_info_create_value (info, attr); if (value) - g_file_attribute_value_set_byte_string (value, symlink_target); + _g_file_attribute_value_set_byte_string (value, symlink_target); } /** * g_file_info_set_sort_order: * @info: a #GFileInfo. * @sort_order: a sort order integer. - * - * Sets the sort order attribute in the file info structure. See - * %G_FILE_ATTRIBUTE_STD_SORT_ORDER. + * + * Sets the sort order attribute in the file info structure. See + * %G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER. **/ void g_file_info_set_sort_order (GFileInfo *info, @@ -1672,15 +2074,15 @@ g_file_info_set_sort_order (GFileInfo *info, { static guint32 attr = 0; GFileAttributeValue *value; - + g_return_if_fail (G_IS_FILE_INFO (info)); - + if (attr == 0) - attr = lookup_attribute (G_FILE_ATTRIBUTE_STD_SORT_ORDER); - + attr = lookup_attribute (G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER); + value = g_file_info_create_value (info, attr); if (value) - g_file_attribute_value_set_int32 (value, sort_order); + _g_file_attribute_value_set_int32 (value, sort_order); } @@ -1694,12 +2096,13 @@ typedef struct { struct _GFileAttributeMatcher { gboolean all; SubMatcher sub_matchers[ON_STACK_MATCHERS]; + gint ref; + GArray *more_sub_matchers; /* Interator */ guint32 iterator_ns; - int iterator_pos; - int ref; + gint iterator_pos; }; static void @@ -1720,7 +2123,7 @@ matcher_add (GFileAttributeMatcher *matcher, matcher->sub_matchers[i].mask = mask; return; } - + /* Already added */ if (matcher->sub_matchers[i].id == id && matcher->sub_matchers[i].mask == mask) @@ -1729,7 +2132,7 @@ matcher_add (GFileAttributeMatcher *matcher, if (matcher->more_sub_matchers == NULL) matcher->more_sub_matchers = g_array_new (FALSE, FALSE, sizeof (SubMatcher)); - + sub_matchers = (SubMatcher *)matcher->more_sub_matchers->data; for (i = 0; i < matcher->more_sub_matchers->len; i++) { @@ -1741,25 +2144,30 @@ matcher_add (GFileAttributeMatcher *matcher, s.id = id; s.mask = mask; - + g_array_append_val (matcher->more_sub_matchers, s); } +G_DEFINE_BOXED_TYPE (GFileAttributeMatcher, g_file_attribute_matcher, + g_file_attribute_matcher_ref, + g_file_attribute_matcher_unref) + /** * g_file_attribute_matcher_new: * @attributes: an attribute string to match. - * - * Creates a new file attribute matcher, which matches attributes against - * a given string. #GFileAttributeMatchers are reference counted structures, - * and are created with a reference count of 1. If the number of references - * falls to 0, the #GFileAttributeMatcher is automatically destroyed. - * + * + * Creates a new file attribute matcher, which matches attributes + * against a given string. #GFileAttributeMatchers are reference + * counted structures, and are created with a reference count of 1. If + * the number of references falls to 0, the #GFileAttributeMatcher is + * automatically destroyed. + * * The @attribute string should be formatted with specific keys separated - * from namespaces with a colon. Several "namespace:key" strings may be - * concatenated with a single comma (e.g. "std:type,std:is_hidden"). - * The wildcard "*" may be used to match all keys and namespaces, or "namespace:*" will - * match all keys in a given namespace. - * + * from namespaces with a double colon. Several "namespace::key" strings may be + * concatenated with a single comma (e.g. "standard::type,standard::is-hidden"). + * The wildcard "*" may be used to match all keys and namespaces, or + * "namespace::*" will match all keys in a given namespace. + * * Examples of strings to use: * * File Attribute Matcher strings and results @@ -1767,12 +2175,12 @@ matcher_add (GFileAttributeMatcher *matcher, * Matcher String Matches * * "*"matches all attributes. - * "std:is_hidden"matches only the key is_hidden in the std namespace. - * "std:type,unix:*"matches the type key in the std namespace and all keys in the unix - * namespace. + * "standard::is-hidden"matches only the key is-hidden in the standard namespace. + * "standard::type,unix::*"matches the type key in the standard namespace and + * all keys in the unix namespace. * *
- * + * * Returns: a #GFileAttributeMatcher. **/ GFileAttributeMatcher * @@ -1798,12 +2206,12 @@ g_file_attribute_matcher_new (const char *attributes) else { guint32 id, mask; - - colon = strchr (split[i], ':'); + + colon = strstr (split[i], "::"); if (colon != NULL && - !(colon[1] == 0 || - (colon[1] == '*' && - colon[2] == 0))) + !(colon[2] == 0 || + (colon[2] == '*' && + colon[3] == 0))) { id = lookup_attribute (split[i]); mask = 0xffffffff; @@ -1816,7 +2224,7 @@ g_file_attribute_matcher_new (const char *attributes) id = lookup_namespace (split[i]) << NS_POS; mask = NS_MASK << NS_POS; } - + matcher_add (matcher, id, mask); } } @@ -1829,42 +2237,44 @@ g_file_attribute_matcher_new (const char *attributes) /** * g_file_attribute_matcher_ref: * @matcher: a #GFileAttributeMatcher. - * + * * References a file attribute matcher. - * + * * Returns: a #GFileAttributeMatcher. **/ GFileAttributeMatcher * g_file_attribute_matcher_ref (GFileAttributeMatcher *matcher) { - g_return_val_if_fail (matcher != NULL, NULL); - g_return_val_if_fail (matcher->ref > 0, NULL); - - g_atomic_int_inc (&matcher->ref); - + if (matcher) + { + g_return_val_if_fail (matcher->ref > 0, NULL); + g_atomic_int_inc (&matcher->ref); + } return matcher; } /** * g_file_attribute_matcher_unref: * @matcher: a #GFileAttributeMatcher. - * - * Unreferences @matcher. If the reference count falls below 1, + * + * Unreferences @matcher. If the reference count falls below 1, * the @matcher is automatically freed. - * + * **/ void g_file_attribute_matcher_unref (GFileAttributeMatcher *matcher) { - g_return_if_fail (matcher != NULL); - g_return_if_fail (matcher->ref > 0); - - if (g_atomic_int_dec_and_test (&matcher->ref)) + if (matcher) { - if (matcher->more_sub_matchers) - g_array_free (matcher->more_sub_matchers, TRUE); - - g_free (matcher); + g_return_if_fail (matcher->ref > 0); + + if (g_atomic_int_dec_and_test (&matcher->ref)) + { + if (matcher->more_sub_matchers) + g_array_free (matcher->more_sub_matchers, TRUE); + + g_free (matcher); + } } } @@ -1872,10 +2282,10 @@ g_file_attribute_matcher_unref (GFileAttributeMatcher *matcher) * g_file_attribute_matcher_matches_only: * @matcher: a #GFileAttributeMatcher. * @attribute: a file attribute key. - * + * * Checks if a attribute matcher only matches a given attribute. Always * returns %FALSE if "*" was used when creating the matcher. - * + * * Returns: %TRUE if the matcher only matches @attribute. %FALSE otherwise. **/ gboolean @@ -1884,12 +2294,12 @@ g_file_attribute_matcher_matches_only (GFileAttributeMatcher *matcher, { guint32 id; - g_return_val_if_fail (matcher != NULL, FALSE); g_return_val_if_fail (attribute != NULL && *attribute != '\0', FALSE); - if (matcher->all) + if (matcher == NULL || + matcher->all) return FALSE; - + id = lookup_attribute (attribute); if (matcher->sub_matchers[0].id != 0 && @@ -1897,7 +2307,7 @@ g_file_attribute_matcher_matches_only (GFileAttributeMatcher *matcher, matcher->sub_matchers[0].mask == 0xffffffff && matcher->sub_matchers[0].id == id) return TRUE; - + return FALSE; } @@ -1907,12 +2317,12 @@ matcher_matches_id (GFileAttributeMatcher *matcher, { SubMatcher *sub_matchers; int i; - + for (i = 0; i < ON_STACK_MATCHERS; i++) { if (matcher->sub_matchers[i].id == 0) return FALSE; - + if (matcher->sub_matchers[i].id == (id & matcher->sub_matchers[i].mask)) return TRUE; } @@ -1926,19 +2336,21 @@ matcher_matches_id (GFileAttributeMatcher *matcher, return TRUE; } } - + return FALSE; } -static gboolean -g_file_attribute_matcher_matches_id (GFileAttributeMatcher *matcher, - guint32 id) +gboolean +_g_file_attribute_matcher_matches_id (GFileAttributeMatcher *matcher, + guint32 id) { - g_return_val_if_fail (matcher != NULL, FALSE); - + /* We return a NULL matcher for an empty match string, so handle this */ + if (matcher == NULL) + return FALSE; + if (matcher->all) return TRUE; - + return matcher_matches_id (matcher, id); } @@ -1947,22 +2359,25 @@ g_file_attribute_matcher_matches_id (GFileAttributeMatcher *matcher, * @matcher: a #GFileAttributeMatcher. * @attribute: a file attribute key. * - * Checks if an attribute will be matched by an attribute matcher. If + * Checks if an attribute will be matched by an attribute matcher. If * the matcher was created with the "*" matching string, this function * will always return %TRUE. - * + * * Returns: %TRUE if @attribute matches @matcher. %FALSE otherwise. **/ gboolean g_file_attribute_matcher_matches (GFileAttributeMatcher *matcher, const char *attribute) { - g_return_val_if_fail (matcher != NULL, FALSE); g_return_val_if_fail (attribute != NULL && *attribute != '\0', FALSE); + /* We return a NULL matcher for an empty match string, so handle this */ + if (matcher == NULL) + return FALSE; + if (matcher->all) return TRUE; - + return matcher_matches_id (matcher, lookup_attribute (attribute)); } @@ -1971,14 +2386,14 @@ g_file_attribute_matcher_matches (GFileAttributeMatcher *matcher, * g_file_attribute_matcher_enumerate_namespace: * @matcher: a #GFileAttributeMatcher. * @ns: a string containing a file attribute namespace. - * + * * Checks if the matcher will match all of the keys in a given namespace. - * This will always return %TRUE if a wildcard character is in use (e.g. if - * matcher was created with "std:*" and @ns is "std", or if matcher was created - * using "*" and namespace is anything.) - * + * This will always return %TRUE if a wildcard character is in use (e.g. if + * matcher was created with "standard::*" and @ns is "standard", or if matcher was created + * using "*" and namespace is anything.) + * * TODO: this is awkwardly worded. - * + * * Returns: %TRUE if the matcher matches all of the entries * in the given @ns, %FALSE otherwise. **/ @@ -1989,10 +2404,13 @@ g_file_attribute_matcher_enumerate_namespace (GFileAttributeMatcher *matcher, SubMatcher *sub_matchers; int ns_id; int i; - - g_return_val_if_fail (matcher != NULL, FALSE); + g_return_val_if_fail (ns != NULL && *ns != '\0', FALSE); - + + /* We return a NULL matcher for an empty match string, so handle this */ + if (matcher == NULL) + return FALSE; + if (matcher->all) return TRUE; @@ -2016,17 +2434,17 @@ g_file_attribute_matcher_enumerate_namespace (GFileAttributeMatcher *matcher, matcher->iterator_ns = ns_id; matcher->iterator_pos = 0; - + return FALSE; } /** * g_file_attribute_matcher_enumerate_next: * @matcher: a #GFileAttributeMatcher. - * + * * Gets the next matched attribute from a #GFileAttributeMatcher. - * - * Returns: a string containing the next attribute or %NULL if + * + * Returns: a string containing the next attribute or %NULL if * no more attribute exist. **/ const char * @@ -2034,8 +2452,10 @@ g_file_attribute_matcher_enumerate_next (GFileAttributeMatcher *matcher) { int i; SubMatcher *sub_matcher; - - g_return_val_if_fail (matcher != NULL, NULL); + + /* We return a NULL matcher for an empty match string, so handle this */ + if (matcher == NULL) + return NULL; while (1) { @@ -2052,7 +2472,7 @@ g_file_attribute_matcher_enumerate_next (GFileAttributeMatcher *matcher) { if (matcher->more_sub_matchers == NULL) return NULL; - + i -= ON_STACK_MATCHERS; if (i < matcher->more_sub_matchers->len) sub_matcher = &g_array_index (matcher->more_sub_matchers, SubMatcher, i); @@ -2065,6 +2485,3 @@ g_file_attribute_matcher_enumerate_next (GFileAttributeMatcher *matcher) return get_attribute_for_id (sub_matcher->id); } } - -#define __G_FILE_INFO_C__ -#include "gioaliasdef.c"