iov address internally through realloc(3). However, since the function parameter wasn't designed to allow the modified iov being passed back to the caller, we end up feeding iov with several corrupted entries(depends on how many arguments were pushed into iovec before set_charset()) to nmount(2). This commit fixes this regression introduced in rev1.31 such that mount_cd9660(8) with code page conversion option(-C) enabled works again. Reviewed by: rodrigc
268 lines
7.2 KiB
C
268 lines
7.2 KiB
C
/*
|
|
* Copyright (c) 1992, 1993, 1994
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley
|
|
* by Pace Willisson (pace@blitz.com). The Rock Ridge Extension
|
|
* Support code is derived from software contributed to Berkeley
|
|
* by Atsushi Murai (amurai@spec.co.jp).
|
|
*
|
|
* 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.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
|
|
*
|
|
* @(#)mount_cd9660.c 8.7 (Berkeley) 5/1/95
|
|
*/
|
|
|
|
#ifndef lint
|
|
static const char copyright[] =
|
|
"@(#) Copyright (c) 1992, 1993, 1994\n\
|
|
The Regents of the University of California. All rights reserved.\n";
|
|
#endif /* not lint */
|
|
|
|
#ifndef lint
|
|
/*
|
|
static char sccsid[] = "@(#)mount_cd9660.c 8.7 (Berkeley) 5/1/95";
|
|
*/
|
|
static const char rcsid[] =
|
|
"$FreeBSD$";
|
|
#endif /* not lint */
|
|
|
|
#include <sys/cdio.h>
|
|
#include <sys/file.h>
|
|
#include <sys/param.h>
|
|
#include <sys/mount.h>
|
|
#include <sys/module.h>
|
|
#include <sys/iconv.h>
|
|
#include <sys/linker.h>
|
|
|
|
#include <arpa/inet.h>
|
|
|
|
#include <err.h>
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <sysexits.h>
|
|
#include <unistd.h>
|
|
|
|
#include "mntopts.h"
|
|
|
|
struct mntopt mopts[] = {
|
|
MOPT_STDOPTS,
|
|
MOPT_UPDATE,
|
|
MOPT_END
|
|
};
|
|
|
|
static int get_ssector(const char *dev);
|
|
static int set_charset(struct iovec **, int *iovlen, const char *);
|
|
void usage(void);
|
|
|
|
int
|
|
main(int argc, char **argv)
|
|
{
|
|
struct iovec *iov;
|
|
int iovlen;
|
|
int ch, mntflags, opts;
|
|
char *dev, *dir, *p, *val, mntpath[MAXPATHLEN];
|
|
int verbose;
|
|
int ssector; /* starting sector, 0 for 1st session */
|
|
char fstype[] = "cd9660";
|
|
|
|
iov = NULL;
|
|
iovlen = 0;
|
|
mntflags = opts = verbose = 0;
|
|
ssector = -1;
|
|
|
|
while ((ch = getopt(argc, argv, "begjo:rs:vC:")) != -1)
|
|
switch (ch) {
|
|
case 'b':
|
|
build_iovec(&iov, &iovlen, "brokenjoliet", NULL, (size_t)-1);
|
|
break;
|
|
case 'e':
|
|
build_iovec(&iov, &iovlen, "extatt", NULL, (size_t)-1);
|
|
break;
|
|
case 'g':
|
|
build_iovec(&iov, &iovlen, "gens", NULL, (size_t)-1);
|
|
break;
|
|
case 'j':
|
|
build_iovec(&iov, &iovlen, "nojoliet", NULL, (size_t)-1);
|
|
break;
|
|
case 'o':
|
|
getmntopts(optarg, mopts, &mntflags, &opts);
|
|
p = strchr(optarg, '=');
|
|
val = NULL;
|
|
if (p != NULL) {
|
|
*p = '\0';
|
|
val = p + 1;
|
|
}
|
|
build_iovec(&iov, &iovlen, optarg, val, (size_t)-1);
|
|
break;
|
|
case 'r':
|
|
build_iovec(&iov, &iovlen, "norrip", NULL, (size_t)-1);
|
|
break;
|
|
case 's':
|
|
ssector = atoi(optarg);
|
|
break;
|
|
case 'v':
|
|
verbose++;
|
|
break;
|
|
case 'C':
|
|
if (set_charset(&iov, &iovlen, optarg) == -1)
|
|
err(EX_OSERR, "cd9660_iconv");
|
|
build_iovec(&iov, &iovlen, "kiconv", NULL, (size_t)-1);
|
|
break;
|
|
case '?':
|
|
default:
|
|
usage();
|
|
}
|
|
argc -= optind;
|
|
argv += optind;
|
|
|
|
if (argc != 2)
|
|
usage();
|
|
|
|
dev = argv[0];
|
|
dir = argv[1];
|
|
|
|
/*
|
|
* Resolve the mountpoint with realpath(3) and remove unnecessary
|
|
* slashes from the devicename if there are any.
|
|
*/
|
|
(void)checkpath(dir, mntpath);
|
|
(void)rmslashes(dev, dev);
|
|
|
|
if (ssector == -1) {
|
|
/*
|
|
* The start of the session has not been specified on
|
|
* the command line. If we can successfully read the
|
|
* TOC of a CD-ROM, use the last data track we find.
|
|
* Otherwise, just use 0, in order to mount the very
|
|
* first session. This is compatible with the
|
|
* historic behaviour of mount_cd9660(8). If the user
|
|
* has specified -s <ssector> above, we don't get here
|
|
* and leave the user's will.
|
|
*/
|
|
if ((ssector = get_ssector(dev)) == -1) {
|
|
if (verbose)
|
|
printf("could not determine starting sector, "
|
|
"using very first session\n");
|
|
ssector = 0;
|
|
} else if (verbose)
|
|
printf("using starting sector %d\n", ssector);
|
|
}
|
|
mntflags |= MNT_RDONLY;
|
|
build_iovec(&iov, &iovlen, "fstype", fstype, (size_t)-1);
|
|
build_iovec(&iov, &iovlen, "fspath", mntpath, (size_t)-1);
|
|
build_iovec(&iov, &iovlen, "from", dev, (size_t)-1);
|
|
build_iovec(&iov, &iovlen, "ssector", &ssector, sizeof ssector);
|
|
|
|
if (nmount(iov, iovlen, mntflags) < 0)
|
|
err(1, "%s", dev);
|
|
exit(0);
|
|
}
|
|
|
|
void
|
|
usage(void)
|
|
{
|
|
(void)fprintf(stderr,
|
|
"usage: mount_cd9660 [-begjrv] [-C charset] [-o options] [-s startsector]\n"
|
|
" special node\n");
|
|
exit(EX_USAGE);
|
|
}
|
|
|
|
static int
|
|
get_ssector(const char *dev)
|
|
{
|
|
struct ioc_toc_header h;
|
|
struct ioc_read_toc_entry t;
|
|
struct cd_toc_entry toc_buffer[100];
|
|
int fd, ntocentries, i;
|
|
|
|
if ((fd = open(dev, O_RDONLY)) == -1)
|
|
return -1;
|
|
if (ioctl(fd, CDIOREADTOCHEADER, &h) == -1) {
|
|
close(fd);
|
|
return -1;
|
|
}
|
|
|
|
ntocentries = h.ending_track - h.starting_track + 1;
|
|
if (ntocentries > 100) {
|
|
/* unreasonable, only 100 allowed */
|
|
close(fd);
|
|
return -1;
|
|
}
|
|
t.address_format = CD_LBA_FORMAT;
|
|
t.starting_track = 0;
|
|
t.data_len = ntocentries * sizeof(struct cd_toc_entry);
|
|
t.data = toc_buffer;
|
|
|
|
if (ioctl(fd, CDIOREADTOCENTRYS, (char *) &t) == -1) {
|
|
close(fd);
|
|
return -1;
|
|
}
|
|
close(fd);
|
|
|
|
for (i = ntocentries - 1; i >= 0; i--)
|
|
if ((toc_buffer[i].control & 4) != 0)
|
|
/* found a data track */
|
|
break;
|
|
if (i < 0)
|
|
return -1;
|
|
|
|
return ntohl(toc_buffer[i].addr.lba);
|
|
}
|
|
|
|
static int
|
|
set_charset(struct iovec **iov, int *iovlen, const char *localcs)
|
|
{
|
|
int error;
|
|
char *cs_disk; /* disk charset for Joliet cs conversion */
|
|
char *cs_local; /* local charset for Joliet cs conversion */
|
|
|
|
cs_disk = NULL;
|
|
cs_local = NULL;
|
|
|
|
if (modfind("cd9660_iconv") < 0)
|
|
if (kldload("cd9660_iconv") < 0 || modfind("cd9660_iconv") < 0) {
|
|
warnx( "cannot find or load \"cd9660_iconv\" kernel module");
|
|
return (-1);
|
|
}
|
|
|
|
if ((cs_disk = malloc(ICONV_CSNMAXLEN)) == NULL)
|
|
return (-1);
|
|
if ((cs_local = malloc(ICONV_CSNMAXLEN)) == NULL)
|
|
return (-1);
|
|
strncpy(cs_disk, ENCODING_UNICODE, ICONV_CSNMAXLEN);
|
|
strncpy(cs_local, kiconv_quirkcs(localcs, KICONV_VENDOR_MICSFT),
|
|
ICONV_CSNMAXLEN);
|
|
error = kiconv_add_xlat16_cspairs(cs_disk, cs_local);
|
|
if (error)
|
|
return (-1);
|
|
|
|
build_iovec(iov, iovlen, "cs_disk", cs_disk, (size_t)-1);
|
|
build_iovec(iov, iovlen, "cs_local", cs_local, (size_t)-1);
|
|
|
|
return (0);
|
|
}
|