X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fdir.c;h=8e22d2d7fb5ac09996f6d4b65b7505fc4494fea3;hb=52b6eb517aaf4497728afb27e025a1ab688c3d89;hp=82f3baa3f33b21dc62d97d6b84773566d8543115;hpb=1c01b8eab9e65d1e8856b9589413915e4cca8cac;p=bluesky.git

diff --git a/bluesky/dir.c b/bluesky/dir.c
index 82f3baa..8e22d2d 100644
--- a/bluesky/dir.c
+++ b/bluesky/dir.c
@@ -10,7 +10,7 @@
 #include <inttypes.h>
 #include <glib.h>
 
-#include "bluesky.h"
+#include "bluesky-private.h"
 
 /* Core filesystem: handling of directories. */
 
@@ -67,9 +67,26 @@ uint64_t bluesky_directory_ilookup(BlueSkyInode *inode, gchar *name)
         return d->inum;
 }
 
+/* Iterate through a directory listing.  This returns one directory entry at a
+ * time, finding the first entry with a directory cookie value larger than the
+ * supplied one.  Use a cookie of 0 to start reading from the start of a
+ * directory. */
+BlueSkyDirent *bluesky_directory_read(BlueSkyInode *dir, uint32_t cookie)
+{
+    BlueSkyDirent start = {NULL, NULL, cookie, 0};
+    GSequenceIter *i = g_sequence_search(dir->dirents, &start,
+                                         bluesky_dirent_compare, NULL);
+
+    if (g_sequence_iter_is_end(i))
+        return NULL;
+    else
+        return g_sequence_get(i);
+}
+
 /* 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)
+gboolean bluesky_directory_insert(BlueSkyInode *dir,
+                                  const gchar *name, uint64_t inum)
 {
     g_return_val_if_fail(dir->type == BLUESKY_DIRECTORY, FALSE);
 
@@ -115,13 +132,13 @@ gboolean bluesky_directory_insert(BlueSkyInode *dir, gchar *name, uint64_t inum)
     g_hash_table_insert(dir->dirhash_folded, d->name_folded, d);
 
     bluesky_inode_update_ctime(dir, 1);
-    bluesky_inode_flush(dir->fs, dir);
+    //bluesky_inode_do_sync(dir);     // TODO: Needed?
 
     return TRUE;
 }
 
-/* Remove an from a directory.  Should be called with the inode lock already
- * held. */
+/* Remove an entry from a directory.  Should be called with the inode lock
+ * already held. */
 gboolean bluesky_directory_remove(BlueSkyInode *dir, gchar *name)
 {
     g_return_val_if_fail(dir->type == BLUESKY_DIRECTORY, FALSE);
@@ -144,7 +161,48 @@ gboolean bluesky_directory_remove(BlueSkyInode *dir, gchar *name)
     g_sequence_remove(i);
 
     bluesky_inode_update_ctime(dir, 1);
-    bluesky_inode_flush(dir->fs, dir);
+
+    return TRUE;
+}
+
+/* Rename a file.  If desired (if overwrite is true) and if the target already
+ * exists, it will be unlinked first. */
+gboolean bluesky_rename(BlueSkyInode *dir1, gchar *name1,
+                        BlueSkyInode *dir2, gchar *name2,
+                        gboolean case_sensitive,
+                        gboolean overwrite)
+{
+    g_return_val_if_fail(dir1->type == BLUESKY_DIRECTORY, FALSE);
+    g_return_val_if_fail(dir2->type == BLUESKY_DIRECTORY, FALSE);
+
+    BlueSkyDirent *d1, *d2;
+
+    d1 = g_hash_table_lookup(case_sensitive ? dir1->dirhash
+                                            : dir1->dirhash_folded, name1);
+    d2 = g_hash_table_lookup(case_sensitive ? dir2->dirhash
+                                            : dir2->dirhash_folded, name2);
+
+    if (d1 == NULL)
+        return FALSE;
+
+    uint64_t inum = d1->inum;
+
+    /* Check that this rename does not cause a directory to be moved into one
+     * of its descendants, as that would create a loop of directories
+     * disconnected from the root. */
+    /* TODO */
+
+    if (d2 != NULL) {
+        if (!overwrite)
+            return FALSE;
+
+        bluesky_directory_remove(dir2, name2);
+
+        // TODO: Drop inode reference
+    }
+
+    bluesky_directory_remove(dir1, name1);
+    bluesky_directory_insert(dir2, name2, inum);
 
     return TRUE;
 }