diff options
| author | fjoe <fjoe@FreeBSD.org> | 2003-12-08 08:32:20 +0000 |
|---|---|---|
| committer | fjoe <fjoe@FreeBSD.org> | 2003-12-08 08:32:20 +0000 |
| commit | ab0bce9d34117f8a7b96ec8a3c86ed0e86d58ef8 (patch) | |
| tree | 6ebbe6155fc751cdfa161e601e91e193cd383576 /sbin | |
| parent | 8a088743dbd2835567a01e9f13b69c3dc4b0d8a9 (diff) | |
| download | FreeBSD-src-ab0bce9d34117f8a7b96ec8a3c86ed0e86d58ef8.zip FreeBSD-src-ab0bce9d34117f8a7b96ec8a3c86ed0e86d58ef8.tar.gz | |
Make msdosfs long filenames matching case insensitive again.
PR: 59765
Submitted by: Ryuichiro Imura <imura@ryu16.org>
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/mount_cd9660/mount_cd9660.c | 5 | ||||
| -rw-r--r-- | sbin/mount_msdosfs/mount_msdosfs.c | 10 | ||||
| -rw-r--r-- | sbin/mount_ntfs/mount_ntfs.c | 5 | ||||
| -rw-r--r-- | sbin/mount_udf/mount_udf.c | 7 |
4 files changed, 5 insertions, 22 deletions
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c index 5fe7279..4ac6586 100644 --- a/sbin/mount_cd9660/mount_cd9660.c +++ b/sbin/mount_cd9660/mount_cd9660.c @@ -255,10 +255,7 @@ set_charset(struct iso_args *args, const char *localcs) strncpy(args->cs_disk, ENCODING_UNICODE, ICONV_CSNMAXLEN); strncpy(args->cs_local, kiconv_quirkcs(localcs, KICONV_VENDOR_MICSFT), ICONV_CSNMAXLEN); - error = kiconv_add_xlat16_cspair(args->cs_local, args->cs_disk, 0); - if (error) - return (-1); - error = kiconv_add_xlat16_cspair(args->cs_disk, args->cs_local, 0); + error = kiconv_add_xlat16_cspairs(args->cs_disk, args->cs_local); if (error) return (-1); diff --git a/sbin/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c index dcf0b29..29a1f11 100644 --- a/sbin/mount_msdosfs/mount_msdosfs.c +++ b/sbin/mount_msdosfs/mount_msdosfs.c @@ -339,17 +339,11 @@ set_charset(struct msdosfs_args *args) if ((args->cs_win = malloc(ICONV_CSNMAXLEN)) == NULL) return (-1); strncpy(args->cs_win, ENCODING_UNICODE, ICONV_CSNMAXLEN); - error = kiconv_add_xlat16_cspair(args->cs_win, args->cs_local, 0); - if (error) - return (-1); - error = kiconv_add_xlat16_cspair(args->cs_local, args->cs_win, 0); + error = kiconv_add_xlat16_cspairs(args->cs_win, args->cs_local); if (error) return (-1); if (args->cs_dos) { - error = kiconv_add_xlat16_cspair(args->cs_dos, args->cs_local, KICONV_FROM_UPPER); - if (error) - return (-1); - error = kiconv_add_xlat16_cspair(args->cs_local, args->cs_dos, KICONV_LOWER); + error = kiconv_add_xlat16_cspairs(args->cs_dos, args->cs_local); if (error) return (-1); } else { diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c index bf5adf3..5cabb09 100644 --- a/sbin/mount_ntfs/mount_ntfs.c +++ b/sbin/mount_ntfs/mount_ntfs.c @@ -275,10 +275,7 @@ set_charset(struct ntfs_args *pargs) if ((pargs->cs_ntfs = malloc(ICONV_CSNMAXLEN)) == NULL) return (-1); strncpy(pargs->cs_ntfs, ENCODING_UNICODE, ICONV_CSNMAXLEN); - error = kiconv_add_xlat16_cspair(pargs->cs_local, pargs->cs_ntfs, 0); - if (error) - return (-1); - error = kiconv_add_xlat16_cspair(pargs->cs_ntfs, pargs->cs_local, 0); + error = kiconv_add_xlat16_cspairs(pargs->cs_ntfs, pargs->cs_local); if (error) return (-1); diff --git a/sbin/mount_udf/mount_udf.c b/sbin/mount_udf/mount_udf.c index 8a4692d..264c24c 100644 --- a/sbin/mount_udf/mount_udf.c +++ b/sbin/mount_udf/mount_udf.c @@ -172,14 +172,9 @@ set_charset(char **cs_disk, char **cs_local, const char *localcs) return (-1); strncpy(*cs_disk, ENCODING_UNICODE, ICONV_CSNMAXLEN); strncpy(*cs_local, localcs, ICONV_CSNMAXLEN); - error = kiconv_add_xlat16_cspair(*cs_local, *cs_disk, 0); + error = kiconv_add_xlat16_cspairs(*cs_disk, *cs_local); if (error) return (-1); -#if 0 - error = kiconv_add_xlat16_cspair(*cs_disk, *cs_local, 0); - if (error) - return (-1); -#endif return (0); } |
