Date: Tue, 05 Jun 2012 12:46:15 +0000 From: oleksandr@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r237135 - soc2012/oleksandr/udf-head/sys/fs/udf2 Message-ID: <20120605124615.AA0A41065673@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: oleksandr Date: Tue Jun 5 12:46:15 2012 New Revision: 237135 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237135 Log: Delete some unused files Added: soc2012/oleksandr/udf-head/sys/fs/udf2/udf_filenames.c soc2012/oleksandr/udf-head/sys/fs/udf2/udf_iconv.c Deleted: soc2012/oleksandr/udf-head/sys/fs/udf2/files.udf soc2012/oleksandr/udf-head/sys/fs/udf2/udf_bswap.h soc2012/oleksandr/udf-head/sys/fs/udf2/udf_strat_bootstrap.c soc2012/oleksandr/udf-head/sys/fs/udf2/udf_strat_direct.c soc2012/oleksandr/udf-head/sys/fs/udf2/udf_strat_rmw.c soc2012/oleksandr/udf-head/sys/fs/udf2/udf_strat_sequential.c Added: soc2012/oleksandr/udf-head/sys/fs/udf2/udf_filenames.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/oleksandr/udf-head/sys/fs/udf2/udf_filenames.c Tue Jun 5 12:46:15 2012 (r237135) @@ -0,0 +1,201 @@ +/*- + * Copyright (c) 2012 Will DeVries + * All rights reserved. + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 <sys/param.h> +#include <sys/malloc.h> +#include <sys/iconv.h> +#include <sys/systm.h> /* printf */ + +#include "ecma167-udf.h" +#include "udf.h" +#include "udf_subr.h" +#include "udf_mount.h" + +extern struct iconv_functions *udf2_iconv; + +static int +udf_to_utf8(char **result, size_t *rrem, uint32_t ch) +{ + int n = 0; + char *rp = *result; + + if ((ch & 0xFFFFFF80) == 0) { + if (*rrem < 1) + return 0; + + n = 1; + rp[0] = ch & 0x7F; + } else if ((ch & 0xFFFFF800) == 0) { + if (*rrem < 2) + return 0; + + n = 2; + rp[0] = 0xC0 | (ch >> 6); + rp[1] = 0x80 | (0x3F & ch); + } else if ((ch & 0xFFFF0000) == 0) { + if (*rrem < 3) + return 0; + + n = 3; + rp[0] = 0xE0 | (ch >> 12); + rp[1] = 0x80 | (0x3F & (ch >> 6)); + rp[2] = 0x80 | (0x3F & ch); + } else if ((ch & 0xFFE00000) == 0) { + if (*rrem < 4) + return 0; + + n = 4; + rp[0] = 0xF0 | (ch >> 18); + rp[1] = 0x80 | (0x3F & (ch >> 12)); + rp[2] = 0x80 | (0x3F & (ch >> 6)); + rp[3] = 0x80 | (0x3F & ch); + } else { + /* do not convert points above 21 bits. */ + return 0; + } + + *rrem -= n; + *result += n; + return n; +} + +static void +udf_convert_str(struct udf_mount *ump, char *result, size_t result_len, int *extloc, + int eightbit, char *id, int id_len) +{ + size_t rrem, chrem; + int i, endi, needsCRC, invalid; + uint32_t uch; + char *rp, ch[2]; + const char *chp; + uint16_t *index; + + index = malloc(id_len * sizeof(uint16_t), M_UDFTEMP, M_WAITOK); + + if (eightbit) + endi = id_len; + else + endi = (id_len - 1 > 0) ? id_len - 1 : 0; + + invalid = 0; + rp = result; + rrem = (size_t)result_len - 1; /* for the null */ + for (i = 0; i < endi;) { + if (eightbit) + uch = id[i]; + else + uch = id[i] << 8 | id[i+1]; + + index[i] = result_len - rrem; + + if (rrem == 0) { + /* no more space, we need to truncate it. */ + needsCRC = 1; + } else if (uch == 0 || uch == 0x2F) { + /* do not allow nulls or slashes */ + invalid++; + } else if (ump->flags & UDFMNT_KICONV && udf2_iconv) { + /* it might be a valid character */ + chrem = 2; + chp = ch; + ch[0] = uch >> 8; + ch[1] = uch & 0x00FF; + udf2_iconv->convchr(ump->iconv_d2l, &chp, &chrem, &rp, &rrem); + if (chrem > 0) { + /* not printable or doesn't fit */ + invalid++; + needsCRC = 1; + } else + invalid = 0; + } else { + /* utf8 output */ + /* it is a valid character */ + if (udf_to_utf8(&rp, &rrem, uch) == 0) { + /* doesn't fit or too large */ + invalid++; + needsCRC = 1; + } else + invalid = 0; + } + + if (uch == 0x002E && i != 1) { + /* record locations of periods where they occur within + 5 char of the end, but not at the end or start */ + if (eightbit && id_len - 6 > i && i + 1 != endi) { + *extloc = i; + } else if (!eightbit && id_len - 11 > i && i + 2 != endi) { + *extloc = i; + } + } + + if (rrem > 0 && invalid == 1) { + uch = 0x5F; + + /* if the result doesn't have space this may not fit */ + if (ump->flags & UDFMNT_KICONV && udf2_iconv) { + chrem = 2; + chp = ch; + ch[0] = uch >> 8; + ch[1] = uch & 0x0F; + udf2_iconv->convchr(ump->iconv_d2l, &chp, &chrem, &rp, &rrem); + } else { + /* utf8 output */ + udf_to_utf8(&rp, &rrem, uch); + } + invalid++; + } + + if (eightbit) + i++; + else + i += 2; + } + + *rp = '\0'; + + free(index, M_UDFTEMP); +} + +void +udf_to_unix_name(struct udf_mount *ump, char *result, int result_len, char *id, int id_len) { + int extloc, eightbit; + + if (id[0] != 8 && id[0] != 16) { + /* this is either invalid or an empty string */ + result_len = 0; + return; + } + + if (id[0] == 8) { + eightbit = 1; + } else { + eightbit = 0; + } + + udf_convert_str(ump, result, result_len, &extloc, eightbit, id+1, id_len-1); + + return; +} Added: soc2012/oleksandr/udf-head/sys/fs/udf2/udf_iconv.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2012/oleksandr/udf-head/sys/fs/udf2/udf_iconv.c Tue Jun 5 12:46:15 2012 (r237135) @@ -0,0 +1,36 @@ +/*- + * Copyright (c) 2003 Ryuichiro Imura + * All rights reserved. + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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 <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/fs/udf/udf_iconv.c,v 1.1 2003/11/05 06:56:08 scottl Exp $"); + +#include <sys/param.h> +#include <sys/iconv.h> +#include <sys/kernel.h> +#include <sys/module.h> +#include <sys/mount.h> + +VFS_DECLARE_ICONV(udf2);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120605124615.AA0A41065673>