X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Ffile.c;h=09e4805547a229d5b4884b54e2de21951e578405;hb=0e3a9c0defb08f388fea2c2eb393dd39d9e95e45;hp=3be40f03e08a4b08d27a1acbd4db00892b450401;hpb=b34b242b34388a3eb26bad5135cdf629ab69b70a;p=bluesky.git

diff --git a/bluesky/file.c b/bluesky/file.c
index 3be40f0..09e4805 100644
--- a/bluesky/file.c
+++ b/bluesky/file.c
@@ -63,7 +63,23 @@ void bluesky_file_truncate(BlueSkyInode *inode, uint64_t size)
     if (blocks > inode->blocks->len) {
         /* Need to add new blocks to the end of a file.  New block structures
          * are automatically zeroed, which initializes them to be pointers to
-         * zero blocks so we don't need to do any more work. */
+         * zero blocks so we don't need to do any more work.  If the
+         * previously-last block in the file is smaller than
+         * BLUESKY_BLOCK_SIZE, extend it to full size. */
+        if (inode->blocks->len > 0) {
+            BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock,
+                                             inode->blocks->len - 1);
+
+            if (b->type != BLUESKY_BLOCK_ZERO
+                    && b->data->len < BLUESKY_BLOCK_SIZE) {
+                bluesky_block_touch(inode, inode->blocks->len - 1);
+                gsize old_size = b->data->len;
+                bluesky_string_resize(b->data, BLUESKY_BLOCK_SIZE);
+                memset(&b->data->data[old_size], 0,
+                       BLUESKY_BLOCK_SIZE - old_size);
+            }
+        }
+
         g_array_set_size(inode->blocks, blocks);
     } else if (blocks < inode->blocks->len) {
         /* Delete blocks from a file.  Must reclaim memory. */
@@ -75,8 +91,8 @@ void bluesky_file_truncate(BlueSkyInode *inode, uint64_t size)
         g_array_set_size(inode->blocks, blocks);
     }
 
-    /* Ensure the last block of the file is properly sized.  If the block is
-     * extended, newly-added bytes must be zeroed. */
+    /* Ensure the new last block of the file is properly sized.  If the block
+     * is extended, newly-added bytes must be zeroed. */
     if (blocks > 0) {
         BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock,
                                          blocks - 1);
@@ -190,7 +206,7 @@ void bluesky_block_flush(BlueSkyFS *fs, BlueSkyBlock *block,
     BlueSkyRCStr *data = block->data;
 
     GChecksum *csum = g_checksum_new(G_CHECKSUM_SHA256);
-    g_checksum_update(csum, data->data, data->len);
+    g_checksum_update(csum, (const guchar *)data->data, data->len);
     gchar *name = g_strdup(g_checksum_get_string(csum));
 
     /* Store the file data asynchronously, and don't bother waiting for a