Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 103 insertions, 0 deletions

diff --git a/fs/isofs/joliet.c b/fs/isofs/joliet.c
new file mode 100644
index 000000000000..86c50e22fc87
--- /dev/null
+++ b/fs/isofs/joliet.c
@@ -0,0 +1,103 @@
+/*
+ *  linux/fs/isofs/joliet.c
+ *
+ *  (C) 1996 Gordon Chaffee
+ *
+ *  Joliet: Microsoft's Unicode extensions to iso9660
+ */
+
+#include <linux/string.h>
+#include <linux/nls.h>
+#include <linux/mm.h>
+#include <linux/iso_fs.h>
+#include <asm/unaligned.h>
+
+/*
+ * Convert Unicode 16 to UTF8 or ASCII.
+ */
+static int
+uni16_to_x8(unsigned char *ascii, u16 *uni, int len, struct nls_table *nls)
+{
+        wchar_t *ip, ch;
+        unsigned char *op;
+
+        ip = uni;
+        op = ascii;
+
+        while ((ch = get_unaligned(ip)) && len) {
+                int llen;
+                ch = be16_to_cpu(ch);
+                if ((llen = nls->uni2char(ch, op, NLS_MAX_CHARSET_SIZE)) > 0)
+                        op += llen;
+                else
+                        *op++ = '?';
+                ip++;
+
+                len--;
+        }
+        *op = 0;
+        return (op - ascii);
+}
+
+/* Convert big endian wide character string to utf8 */
+static int
+wcsntombs_be(__u8 *s, const __u8 *pwcs, int inlen, int maxlen)
+{
+        const __u8 *ip;
+        __u8 *op;
+        int size;
+        __u16 c;
+
+        op = s;
+        ip = pwcs;
+        while ((*ip || ip[1]) && (maxlen > 0) && (inlen > 0)) {
+                c = (*ip << 8) | ip[1];
+                if (c > 0x7f) {
+                        size = utf8_wctomb(op, c, maxlen);
+                        if (size == -1) {
+                                /* Ignore character and move on */
+                                maxlen--;
+                        } else {
+                                op += size;
+                                maxlen -= size;
+                        }
+                } else {
+                        *op++ = (__u8) c;
+                }
+                ip += 2;
+                inlen--;
+        }
+        return (op - s);
+}
+
+int
+get_joliet_filename(struct iso_directory_record * de, unsigned char *outname, struct inode * inode)
+{
+        unsigned char utf8;
+        struct nls_table *nls;
+        unsigned char len = 0;
+
+        utf8 = ISOFS_SB(inode->i_sb)->s_utf8;
+        nls = ISOFS_SB(inode->i_sb)->s_nls_iocharset;
+
+        if (utf8) {
+                len = wcsntombs_be(outname, de->name,
+                                   de->name_len[0] >> 1, PAGE_SIZE);
+        } else {
+                len = uni16_to_x8(outname, (u16 *) de->name,
+                                  de->name_len[0] >> 1, nls);
+        }
+        if ((len > 2) && (outname[len-2] == ';') && (outname[len-1] == '1')) {
+                len -= 2;
+        }
+
+        /*
+         * Windows doesn't like periods at the end of a name,
+         * so neither do we
+         */
+        while (len >= 2 && (outname[len-1] == '.')) {
+                len--;
+        }
+
+        return len;
+}