X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Ffile.c;h=5fb19479149db76ed4100e90b6520554644edfef;hb=8ff0fd08d6e1cc97cdb7e94b7cd97dc28c29e674;hp=e0c62555639708a27caf652712235515ddbf740c;hpb=11daa4a2d17850ff5ceb1c30d463d699635cfbc6;p=bluesky.git

diff --git a/bluesky/file.c b/bluesky/file.c
index e0c6255..5fb1947 100644
--- a/bluesky/file.c
+++ b/bluesky/file.c
@@ -3,7 +3,29 @@
  * Copyright (C) 2009  The Regents of the University of California
  * Written by Michael Vrable <mvrable@cs.ucsd.edu>
  *
- * TODO: Licensing
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
 #include <stdint.h>
@@ -100,7 +122,11 @@ void bluesky_file_truncate(BlueSkyInode *inode, uint64_t size)
                     && lastblock_old < BLUESKY_BLOCK_SIZE) {
                 bluesky_block_touch(inode, inode->blocks->len - 1, TRUE);
                 gsize old_size = b->dirty->len;
-                g_warn_if_fail(lastblock_old != old_size);
+                if (lastblock_old != old_size) {
+                    fprintf(stderr,
+                            "Warning: last block size = %zd, expected %d\n",
+                            old_size, lastblock_old);
+                }
                 bluesky_string_resize(b->dirty, BLUESKY_BLOCK_SIZE);
                 memset(&b->dirty->data[old_size], 0,
                        BLUESKY_BLOCK_SIZE - old_size);
@@ -159,16 +185,17 @@ void bluesky_file_write(BlueSkyInode *inode, uint64_t offset,
     if (len == 0)
         return;
 
-    // TODO: Optimization: If we are entirely overwriting a block we don't need
-    // to fetch it frm storage first.  We don't yet handle the case where the
-    // partial last block of a file is entirely overwritten.
     while (len > 0) {
         uint64_t block_num = offset / BLUESKY_BLOCK_SIZE;
         gint block_offset = offset % BLUESKY_BLOCK_SIZE;
         gint bytes = MIN(BLUESKY_BLOCK_SIZE - block_offset, len);
 
         gboolean preserve = TRUE;
-        if (block_offset == 0 && bytes == BLUESKY_BLOCK_SIZE) {
+        gsize block_size = BLUESKY_BLOCK_SIZE;
+        if (block_num == inode->blocks->len - 1) {
+            block_size = inode->size - block_num * BLUESKY_BLOCK_SIZE;
+        }
+        if (block_offset == 0 && bytes == block_size) {
             preserve = FALSE;
         }
         bluesky_block_touch(inode, block_num, preserve);