*/
#include <stdint.h>
+#include <inttypes.h>
#include <glib.h>
#include "bluesky.h"
{
BlueSkyDirent *dirent = (BlueSkyDirent *)data;
g_free(dirent->name);
+ g_free(dirent->name_folded);
g_free(dirent);
}
return d->inum;
}
+/* Case-insensitive lookup. */
+uint64_t bluesky_directory_ilookup(BlueSkyInode *inode, gchar *name)
+{
+ g_return_val_if_fail(inode->type == BLUESKY_DIRECTORY, 0);
+ g_return_val_if_fail(inode->dirhash_folded != NULL, 0);
+
+ name = bluesky_lowercase(name);
+ BlueSkyDirent *d = g_hash_table_lookup(inode->dirhash_folded, name);
+ g_free(name);
+
+ if (d == NULL)
+ return 0;
+ else
+ return d->inum;
+}
+
/* Insert a new entry into a directory. Should be called with the inode lock
* already held. */
gboolean bluesky_directory_insert(BlueSkyInode *dir, gchar *name, uint64_t inum)
BlueSkyDirent *d = g_new(BlueSkyDirent, 1);
d->name = g_strdup(name);
+ d->name_folded = bluesky_lowercase(name);
d->inum = inum;
GSequence *dirents = dir->dirents;
/* Add the directory entry to both indices. */
g_sequence_insert_sorted(dirents, d, bluesky_dirent_compare, NULL);
g_hash_table_insert(dir->dirhash, d->name, d);
+ g_hash_table_insert(dir->dirhash_folded, d->name_folded, d);
bluesky_inode_update_ctime(dir, 1);
bluesky_inode_flush(dir->fs, dir);
return FALSE;
}
- g_hash_table_remove(dir->dirhash, name);
+ g_hash_table_remove(dir->dirhash, d->name);
+ g_hash_table_remove(dir->dirhash_folded, d->name_folded);
GSequenceIter *i = g_sequence_search(dir->dirents, d,
bluesky_dirent_compare, NULL);
g_sequence_remove(i);
- bluesky_dirent_destroy(d);
-
bluesky_inode_update_ctime(dir, 1);
+ bluesky_inode_flush(dir->fs, dir);
return TRUE;
}
while (!g_sequence_iter_is_end(i)) {
BlueSkyDirent *d = g_sequence_get(i);
- g_print(" 0x%08x [inum=%lld] %s\n", d->cookie, d->inum, d->name);
+ g_print(" 0x%08x [inum=%"PRIu64"] %s\n",
+ d->cookie, d->inum, d->name);
i = g_sequence_iter_next(i);
}
}