~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

TOMOYO Linux Cross Reference
Linux/fs/isofs/joliet.c

Version: ~ [ linux-6.11.5 ] ~ [ linux-6.10.14 ] ~ [ linux-6.9.12 ] ~ [ linux-6.8.12 ] ~ [ linux-6.7.12 ] ~ [ linux-6.6.58 ] ~ [ linux-6.5.13 ] ~ [ linux-6.4.16 ] ~ [ linux-6.3.13 ] ~ [ linux-6.2.16 ] ~ [ linux-6.1.114 ] ~ [ linux-6.0.19 ] ~ [ linux-5.19.17 ] ~ [ linux-5.18.19 ] ~ [ linux-5.17.15 ] ~ [ linux-5.16.20 ] ~ [ linux-5.15.169 ] ~ [ linux-5.14.21 ] ~ [ linux-5.13.19 ] ~ [ linux-5.12.19 ] ~ [ linux-5.11.22 ] ~ [ linux-5.10.228 ] ~ [ linux-5.9.16 ] ~ [ linux-5.8.18 ] ~ [ linux-5.7.19 ] ~ [ linux-5.6.19 ] ~ [ linux-5.5.19 ] ~ [ linux-5.4.284 ] ~ [ linux-5.3.18 ] ~ [ linux-5.2.21 ] ~ [ linux-5.1.21 ] ~ [ linux-5.0.21 ] ~ [ linux-4.20.17 ] ~ [ linux-4.19.322 ] ~ [ linux-4.18.20 ] ~ [ linux-4.17.19 ] ~ [ linux-4.16.18 ] ~ [ linux-4.15.18 ] ~ [ linux-4.14.336 ] ~ [ linux-4.13.16 ] ~ [ linux-4.12.14 ] ~ [ linux-4.11.12 ] ~ [ linux-4.10.17 ] ~ [ linux-4.9.337 ] ~ [ linux-4.4.302 ] ~ [ linux-3.10.108 ] ~ [ linux-2.6.32.71 ] ~ [ linux-2.6.0 ] ~ [ linux-2.4.37.11 ] ~ [ unix-v6-master ] ~ [ ccs-tools-1.8.9 ] ~ [ policy-sample ] ~
Architecture: ~ [ i386 ] ~ [ alpha ] ~ [ m68k ] ~ [ mips ] ~ [ ppc ] ~ [ sparc ] ~ [ sparc64 ] ~

Diff markup

Differences between /fs/isofs/joliet.c (Version linux-6.11.5) and /fs/isofs/joliet.c (Version linux-4.17.19)


  1 // SPDX-License-Identifier: GPL-2.0                 1 // SPDX-License-Identifier: GPL-2.0
  2 /*                                                  2 /*
  3  *  linux/fs/isofs/joliet.c                         3  *  linux/fs/isofs/joliet.c
  4  *                                                  4  *
  5  *  (C) 1996 Gordon Chaffee                         5  *  (C) 1996 Gordon Chaffee
  6  *                                                  6  *
  7  *  Joliet: Microsoft's Unicode extensions to       7  *  Joliet: Microsoft's Unicode extensions to iso9660
  8  */                                                 8  */
  9                                                     9 
 10 #include <linux/types.h>                           10 #include <linux/types.h>
 11 #include <linux/nls.h>                             11 #include <linux/nls.h>
 12 #include "isofs.h"                                 12 #include "isofs.h"
 13                                                    13 
 14 /*                                                 14 /*
 15  * Convert Unicode 16 to UTF-8 or ASCII.           15  * Convert Unicode 16 to UTF-8 or ASCII.
 16  */                                                16  */
 17 static int                                         17 static int
 18 uni16_to_x8(unsigned char *ascii, __be16 *uni,     18 uni16_to_x8(unsigned char *ascii, __be16 *uni, int len, struct nls_table *nls)
 19 {                                                  19 {
 20         __be16 *ip, ch;                            20         __be16 *ip, ch;
 21         unsigned char *op;                         21         unsigned char *op;
 22                                                    22 
 23         ip = uni;                                  23         ip = uni;
 24         op = ascii;                                24         op = ascii;
 25                                                    25 
 26         while ((ch = get_unaligned(ip)) && len     26         while ((ch = get_unaligned(ip)) && len) {
 27                 int llen;                          27                 int llen;
 28                 llen = nls->uni2char(be16_to_c     28                 llen = nls->uni2char(be16_to_cpu(ch), op, NLS_MAX_CHARSET_SIZE);
 29                 if (llen > 0)                      29                 if (llen > 0)
 30                         op += llen;                30                         op += llen;
 31                 else                               31                 else
 32                         *op++ = '?';               32                         *op++ = '?';
 33                 ip++;                              33                 ip++;
 34                                                    34 
 35                 len--;                             35                 len--;
 36         }                                          36         }
 37         *op = 0;                                   37         *op = 0;
 38         return (op - ascii);                       38         return (op - ascii);
 39 }                                                  39 }
 40                                                    40 
 41 int                                                41 int
 42 get_joliet_filename(struct iso_directory_recor     42 get_joliet_filename(struct iso_directory_record * de, unsigned char *outname, struct inode * inode)
 43 {                                                  43 {
                                                   >>  44         unsigned char utf8;
 44         struct nls_table *nls;                     45         struct nls_table *nls;
 45         unsigned char len = 0;                     46         unsigned char len = 0;
 46                                                    47 
                                                   >>  48         utf8 = ISOFS_SB(inode->i_sb)->s_utf8;
 47         nls = ISOFS_SB(inode->i_sb)->s_nls_ioc     49         nls = ISOFS_SB(inode->i_sb)->s_nls_iocharset;
 48                                                    50 
 49         if (!nls) {                            !!  51         if (utf8) {
 50                 len = utf16s_to_utf8s((const w     52                 len = utf16s_to_utf8s((const wchar_t *) de->name,
 51                                 de->name_len[0     53                                 de->name_len[0] >> 1, UTF16_BIG_ENDIAN,
 52                                 outname, PAGE_     54                                 outname, PAGE_SIZE);
 53         } else {                                   55         } else {
 54                 len = uni16_to_x8(outname, (__     56                 len = uni16_to_x8(outname, (__be16 *) de->name,
 55                                 de->name_len[0     57                                 de->name_len[0] >> 1, nls);
 56         }                                          58         }
 57         if ((len > 2) && (outname[len-2] == ';     59         if ((len > 2) && (outname[len-2] == ';') && (outname[len-1] == '1'))
 58                 len -= 2;                          60                 len -= 2;
 59                                                    61 
 60         /*                                         62         /*
 61          * Windows doesn't like periods at the     63          * Windows doesn't like periods at the end of a name,
 62          * so neither do we                        64          * so neither do we
 63          */                                        65          */
 64         while (len >= 2 && (outname[len-1] ==      66         while (len >= 2 && (outname[len-1] == '.'))
 65                 len--;                             67                 len--;
 66                                                    68 
 67         return len;                                69         return len;
 68 }                                                  70 }
 69                                                    71 

~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

kernel.org | git.kernel.org | LWN.net | Project Home | SVN repository | Mail admin

Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.

sflogo.php