fs: fat_write: fix short name creation.

[platform/kernel/u-boot.git] / fs / fat / fat_write.c

diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c
index 11b85d3..b16a39d 100644 (file)
--- a/fs/fat/fat_write.c
+++ b/fs/fat/fat_write.c
@@ -9,8 +9,11 @@
 #include <command.h>
 #include <config.h>
 #include <fat.h>
+#include <log.h>
+#include <malloc.h>
 #include <asm/byteorder.h>
 #include <part.h>
+#include <asm/cache.h>
 #include <linux/ctype.h>
 #include <div64.h>
 #include <linux/math64.h>
@@ -47,8 +50,11 @@ static int disk_write(__u32 block, __u32 nr_blocks, void *buf)
        return ret;
 }
 
-/*
- * Set short name in directory entry
+/**
+ * set_name() - set short name in directory entry
+ *
+ * @dirent:    directory entry
+ * @filename:  long file name
  */
 static void set_name(dir_entry *dirent, const char *filename)
 {
@@ -63,7 +69,8 @@ static void set_name(dir_entry *dirent, const char *filename)
        if (len == 0)
                return;
 
-       strcpy(s_name, filename);
+       strncpy(s_name, filename, VFAT_MAXLEN_BYTES - 1);
+       s_name[VFAT_MAXLEN_BYTES - 1] = '\0';
        uppercase(s_name, len);
 
        period = strchr(s_name, '.');
@@ -84,6 +91,11 @@ static void set_name(dir_entry *dirent, const char *filename)
                memcpy(dirent->name, s_name, period_location);
        } else {
                memcpy(dirent->name, s_name, 6);
+               /*
+                * TODO: Translating two long names with the same first six
+                *       characters to the same short name is utterly wrong.
+                *       Short names must be unique.
+                */
                dirent->name[6] = '~';
                dirent->name[7] = '1';
        }
@@ -209,7 +221,8 @@ name11_12:
        return 1;
 }
 
-static int flush_dir_table(fat_itr *itr);
+static int new_dir_table(fat_itr *itr);
+static int flush_dir(fat_itr *itr);
 
 /*
  * Fill dir_slot entries with appropriate name, id, and attr
@@ -242,19 +255,18 @@ fill_dir_slot(fat_itr *itr, const char *l_name)
                memcpy(itr->dent, slotptr, sizeof(dir_slot));
                slotptr--;
                counter--;
+
+               if (itr->remaining == 0)
+                       flush_dir(itr);
+
+               /* allocate a cluster for more entries */
                if (!fat_itr_next(itr))
-                       if (!itr->dent && !itr->is_root && flush_dir_table(itr))
+                       if (!itr->dent &&
+                           (!itr->is_root || itr->fsdata->fatsize == 32) &&
+                           new_dir_table(itr))
                                return -1;
        }
 
-       if (!itr->dent && !itr->is_root)
-               /*
-                * don't care return value here because we have already
-                * finished completing an entry with name, only ending up
-                * no more entry left
-                */
-               flush_dir_table(itr);
-
        return 0;
 }
 
@@ -621,18 +633,14 @@ static int find_empty_cluster(fsdata *mydata)
 }
 
 /*
- * Write directory entries in itr's buffer to block device
+ * Allocate a cluster for additional directory entries
  */
-static int flush_dir_table(fat_itr *itr)
+static int new_dir_table(fat_itr *itr)
 {
        fsdata *mydata = itr->fsdata;
        int dir_newclust = 0;
        unsigned int bytesperclust = mydata->clust_size * mydata->sect_size;
 
-       if (set_cluster(mydata, itr->clust, itr->block, bytesperclust) != 0) {
-               printf("error: writing directory entry\n");
-               return -1;
-       }
        dir_newclust = find_empty_cluster(mydata);
        set_fatent_value(mydata, itr->clust, dir_newclust);
        if (mydata->fatsize == 32)
@@ -798,6 +806,8 @@ set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer,
 
                        newclust = get_fatent(mydata, endclust);
 
+                       if (newclust != endclust + 1)
+                               break;
                        if (IS_LAST_CLUST(newclust, mydata->fatsize))
                                break;
                        if (CHECK_CLUST(newclust, mydata->fatsize)) {
@@ -815,7 +825,9 @@ set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer,
                        offset = 0;
                else
                        offset = pos - cur_pos;
-               wsize = min(cur_pos + actsize, filesize) - pos;
+               wsize = min_t(unsigned long long, actsize, filesize - cur_pos);
+               wsize -= offset;
+
                if (get_set_cluster(mydata, curclust, offset,
                                    buffer, wsize, &actsize)) {
                        printf("Error get-and-setting cluster\n");
@@ -828,8 +840,6 @@ set_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer,
                if (filesize <= cur_pos)
                        break;
 
-               /* CHECK: newclust = get_fatent(mydata, endclust); */
-
                if (IS_LAST_CLUST(newclust, mydata->fatsize))
                        /* no more clusters */
                        break;
@@ -987,7 +997,10 @@ static dir_entry *find_directory_entry(fat_itr *itr, char *filename)
                        return itr->dent;
        }
 
-       if (!itr->dent && !itr->is_root && flush_dir_table(itr))
+       /* allocate a cluster for more entries */
+       if (!itr->dent &&
+           (!itr->is_root || itr->fsdata->fatsize == 32) &&
+           new_dir_table(itr))
                /* indicate that allocating dent failed */
                itr->dent = NULL;
 
@@ -1164,14 +1177,16 @@ int file_fat_write_at(const char *filename, loff_t pos, void *buffer,
 
                memset(itr->dent, 0, sizeof(*itr->dent));
 
-               /* Set short name to set alias checksum field in dir_slot */
+               /* Calculate checksum for short name */
                set_name(itr->dent, filename);
+
+               /* Set long name entries */
                if (fill_dir_slot(itr, filename)) {
                        ret = -EIO;
                        goto exit;
                }
 
-               /* Set attribute as archive for regular file */
+               /* Set short name entry */
                fill_dentry(itr->fsdata, itr->dent, filename, 0, size, 0x20);
 
                retdent = itr->dent;