mirror of
https://github.com/opnsense/src.git
synced 2026-05-28 04:12:45 -04:00
Go back to using MSDOSFS instead of Robert Nordier's stand-alone DOS
library. I have to include MSDOSFS on the boot floppy anyway (so I can read DOS floppies in a few other contexts) and since both -stable and -current MSDOSFS handle long filenames, I'm OK on that now. Should save about 10K of space.
This commit is contained in:
Jordan K. Hubbard
parent
aa75b0b778
commit
dac9272725
4 changed files with 72 additions and 799 deletions
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last attempt in the `sysinstall' line, the next
|
||||
* generation being slated to essentially a complete rewrite.
|
||||
*
|
||||
* $Id$
|
||||
* $Id: dos.c,v 1.18 1997/02/22 14:11:39 peter Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -44,52 +44,57 @@
|
|||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <grp.h>
|
||||
#include "dosio.h"
|
||||
#define MSDOSFS
|
||||
#include <sys/mount.h>
|
||||
#include <msdosfs/msdosfsmount.h>
|
||||
#undef MSDOSFS
|
||||
|
||||
static DOS_FS DOSFS;
|
||||
static Boolean DOSMounted;
|
||||
|
||||
Boolean
|
||||
mediaInitDOS(Device *dev)
|
||||
{
|
||||
struct msdosfs_args args;
|
||||
|
||||
if (!RunningAsInit || DOSMounted)
|
||||
return TRUE;
|
||||
|
||||
if (DITEM_STATUS(Mkdir("/dist")) != DITEM_SUCCESS)
|
||||
return FALSE;
|
||||
|
||||
if (dos_mount(&DOSFS, dev->devname)) {
|
||||
msgConfirm("Error mounting DOS partition %s : %s (%u)", dev->devname, strerror(errno), errno);
|
||||
memset(&args, 0, sizeof(args));
|
||||
args.fspec = dev->devname;
|
||||
args.uid = args.gid = 0;
|
||||
args.mask = 0777;
|
||||
|
||||
if (mount("dos", "/dist", MNT_RDONLY, (caddr_t)&args) == -1) {
|
||||
msgConfirm("Error mounting %s on /dist: %s (%u)", args.fspec, strerror(errno), errno);
|
||||
return FALSE;
|
||||
}
|
||||
else
|
||||
msgDebug("Mounted DOS device (%s) on /dist.\n", args.fspec);
|
||||
DOSMounted = TRUE;
|
||||
msgDebug("DOS partition %s mounted\n", dev->devname);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
FILE *
|
||||
mediaGetDOS(Device *dev, char *file, Boolean probe)
|
||||
{
|
||||
char buf[PATH_MAX];
|
||||
FILE *fp;
|
||||
|
||||
if (!DOSMounted) {
|
||||
msgDebug("Can't get DOS file %s - DOSFS currently unmounted!\n", file);
|
||||
return NULL;
|
||||
}
|
||||
char buf[PATH_MAX];
|
||||
|
||||
if (isDebug())
|
||||
msgDebug("Request for %s from DOS\n", file);
|
||||
snprintf(buf, PATH_MAX, "/freebsd/%s", file);
|
||||
if ((fp = dos_open(&DOSFS, buf)))
|
||||
return fp;
|
||||
snprintf(buf, PATH_MAX, "/freebsd/dists/%s", file);
|
||||
if ((fp = dos_open(&DOSFS, buf)))
|
||||
return fp;
|
||||
snprintf(buf, PATH_MAX, "/%s", file);
|
||||
if ((fp = dos_open(&DOSFS, buf)))
|
||||
return fp;
|
||||
snprintf(buf, PATH_MAX, "/dists/%s", file);
|
||||
if ((fp = dos_open(&DOSFS, buf)))
|
||||
return fp;
|
||||
return NULL;
|
||||
snprintf(buf, PATH_MAX, "/dist/%s", file);
|
||||
if (file_readable(buf))
|
||||
return fopen(buf, "r");
|
||||
snprintf(buf, PATH_MAX, "/dist/dists/%s", file);
|
||||
if (file_readable(buf))
|
||||
return fopen(buf, "r");
|
||||
snprintf(buf, PATH_MAX, "/dist/%s/%s", variable_get(VAR_RELNAME), file);
|
||||
if (file_readable(buf))
|
||||
return fopen(buf, "r");
|
||||
snprintf(buf, PATH_MAX, "/dist/%s/dists/%s", variable_get(VAR_RELNAME), file);
|
||||
return fopen(buf, "r");
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -97,10 +102,11 @@ mediaShutdownDOS(Device *dev)
|
|||
{
|
||||
if (!RunningAsInit || !DOSMounted)
|
||||
return;
|
||||
if (dos_unmount(&DOSFS))
|
||||
msgConfirm("Could not unmount DOS partition %s : %s", dev->devname, strerror(errno));
|
||||
else if (isDebug())
|
||||
msgDebug("Unmount of DOS partition on %s successful\n", dev->devname);
|
||||
msgDebug("Unmounting %s from /dist\n", dev->name);
|
||||
if (unmount("/dist", MNT_FORCE) != 0)
|
||||
msgConfirm("Could not unmount the DOS partition: %s", strerror(errno));
|
||||
if (isDebug())
|
||||
msgDebug("Unmount successful\n");
|
||||
DOSMounted = FALSE;
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,615 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 1996, 1998 Robert Nordier
|
||||
* 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(S) ``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(S) 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/types.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include "dosio.h"
|
||||
|
||||
#define SECSIZ 512 /* sector size */
|
||||
#define SSHIFT 9 /* SECSIZ shift */
|
||||
#define DEPSEC 16 /* directory entries per sector */
|
||||
#define DSHIFT 4 /* DEPSEC shift */
|
||||
#define LOCLUS 2 /* lowest cluster number */
|
||||
|
||||
/* DOS "BIOS Parameter Block" */
|
||||
typedef struct {
|
||||
u_char secsiz[2]; /* sector size */
|
||||
u_char spc; /* sectors per cluster */
|
||||
u_char ressec[2]; /* reserved sectors */
|
||||
u_char fats; /* FATs */
|
||||
u_char dirents[2]; /* root directory entries */
|
||||
u_char secs[2]; /* total sectors */
|
||||
u_char media; /* media descriptor */
|
||||
u_char spf[2]; /* sectors per FAT */
|
||||
u_char spt[2]; /* sectors per track */
|
||||
u_char heads[2]; /* drive heads */
|
||||
u_char hidsec[4]; /* hidden sectors */
|
||||
u_char lsecs[4]; /* huge sectors */
|
||||
u_char lspf[4]; /* huge sectors per FAT */
|
||||
u_char xflg[2]; /* flags */
|
||||
u_char vers[2]; /* filesystem version */
|
||||
u_char rdcl[4]; /* root directory start cluster */
|
||||
u_char infs[2]; /* filesystem info sector */
|
||||
u_char bkbs[2]; /* backup boot sector */
|
||||
} DOS_BPB;
|
||||
|
||||
/* Initial portion of DOS boot sector */
|
||||
typedef struct {
|
||||
u_char jmp[3]; /* usually 80x86 'jmp' opcode */
|
||||
u_char oem[8]; /* OEM name and version */
|
||||
DOS_BPB bpb; /* BPB */
|
||||
} DOS_BS;
|
||||
|
||||
/* Supply missing "." and ".." root directory entries */
|
||||
static const char *const dotstr[2] = {".", ".."};
|
||||
static DOS_DE dot[2] = {
|
||||
{". ", " ", FA_DIR, {0, 0, {0, 0}, {0, 0}, {0, 0}, {0, 0}},
|
||||
{0, 0}, {0x21, 0}, {0, 0}, {0, 0, 0, 0}},
|
||||
{".. ", " ", FA_DIR, {0, 0, {0, 0}, {0, 0}, {0, 0}, {0, 0}},
|
||||
{0, 0}, {0x21, 0}, {0, 0}, {0, 0, 0, 0}}
|
||||
};
|
||||
|
||||
/* The usual conversion macros to avoid multiplication and division */
|
||||
#define bytsec(n) ((n) >> SSHIFT)
|
||||
#define secbyt(s) ((s) << SSHIFT)
|
||||
#define entsec(e) ((e) >> DSHIFT)
|
||||
#define bytblk(fs, n) ((n) >> (fs)->bshift)
|
||||
#define blkbyt(fs, b) ((b) << (fs)->bshift)
|
||||
#define secblk(fs, s) ((s) >> ((fs)->bshift - SSHIFT))
|
||||
#define blksec(fs, b) ((b) << ((fs)->bshift - SSHIFT))
|
||||
|
||||
/* Convert cluster number to offset within filesystem */
|
||||
#define blkoff(fs, b) (secbyt((fs)->lsndta) + blkbyt(fs, (b) - LOCLUS))
|
||||
|
||||
/* Convert cluster number to logical sector number */
|
||||
#define blklsn(fs, b) ((fs)->lsndta + blksec(fs, (b) - LOCLUS))
|
||||
|
||||
/* Convert cluster number to offset within FAT */
|
||||
#define fatoff(sz, c) ((sz) == 12 ? (c) + ((c) >> 1) : \
|
||||
(sz) == 16 ? (c) << 1 : \
|
||||
(c) << 2)
|
||||
|
||||
/* Does cluster number reference a valid data cluster? */
|
||||
#define okclus(fs, c) ((c) >= LOCLUS && (c) <= (fs)->xclus)
|
||||
|
||||
/* Get start cluster from directory entry */
|
||||
#define stclus(sz, de) ((sz) != 32 ? cv2((de)->clus) : \
|
||||
((u_int)cv2((de)->dex.h_clus) << 16) | \
|
||||
cv2((de)->clus))
|
||||
|
||||
/* Return on error */
|
||||
#define RETERR(err) { \
|
||||
errno = err; \
|
||||
return -1; \
|
||||
}
|
||||
|
||||
static int dosunmount(DOS_FS *);
|
||||
static int dosread(void *, char *, int);
|
||||
static fpos_t dosseek(void *, fpos_t, int);
|
||||
static int dosclose(void *);
|
||||
static int parsebs(DOS_FS *, DOS_BS *);
|
||||
static int namede(DOS_FS *, const char *, DOS_DE **);
|
||||
static int lookup(DOS_FS *, u_int, const char *, DOS_DE **);
|
||||
static void cp_xdnm(u_char *, DOS_XDE *);
|
||||
static void cp_sfn(u_char *, DOS_DE *);
|
||||
static int fatget(DOS_FS *, u_int *);
|
||||
static int fatend(u_int, u_int);
|
||||
static int ioread(DOS_FS *, u_int, void *, u_int);
|
||||
static int iobuf(DOS_FS *, u_int);
|
||||
static int ioget(int, u_int, void *, u_int);
|
||||
|
||||
/*
|
||||
* Mount DOS filesystem
|
||||
*/
|
||||
int
|
||||
dos_mount(DOS_FS *fs, const char *dname)
|
||||
{
|
||||
int err;
|
||||
|
||||
memset(fs, 0, sizeof(DOS_FS));
|
||||
if ((fs->fd = open(dname, O_RDONLY)) == -1)
|
||||
return -1;
|
||||
if ((err = !(fs->buf = malloc(SECSIZ)) ? errno : 0) ||
|
||||
(err = ioget(fs->fd, 0, fs->buf, 1)) ||
|
||||
(err = parsebs(fs, (DOS_BS *)fs->buf))) {
|
||||
(void)dosunmount(fs);
|
||||
RETERR(err);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Unmount mounted filesystem
|
||||
*/
|
||||
int
|
||||
dos_unmount(DOS_FS *fs)
|
||||
{
|
||||
int err;
|
||||
|
||||
if (fs->links)
|
||||
RETERR(EBUSY);
|
||||
if ((err = dosunmount(fs)))
|
||||
RETERR(err);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Common code shared by dos_mount() and dos_unmount()
|
||||
*/
|
||||
static int
|
||||
dosunmount(DOS_FS *fs)
|
||||
{
|
||||
if (fs->buf)
|
||||
free(fs->buf);
|
||||
return close(fs->fd) ? errno : 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Open DOS file
|
||||
*/
|
||||
FILE *
|
||||
dos_open(DOS_FS *fs, const char *path)
|
||||
{
|
||||
DOS_DE *de;
|
||||
DOS_FILE *f;
|
||||
u_int size, clus;
|
||||
int err;
|
||||
|
||||
if ((err = namede(fs, path, &de))) {
|
||||
errno = err;
|
||||
return NULL;
|
||||
}
|
||||
if (de->attr & FA_DIR) {
|
||||
errno = EISDIR;
|
||||
return NULL;
|
||||
}
|
||||
clus = stclus(fs->fatsz, de);
|
||||
size = cv4(de->size);
|
||||
if (!clus ^ !size || (clus && !okclus(fs, clus))) {
|
||||
errno = EINVAL;
|
||||
return NULL;
|
||||
}
|
||||
f = malloc(sizeof(DOS_FILE));
|
||||
memset(f, 0, sizeof(DOS_FILE));
|
||||
f->fs = fs;
|
||||
fs->links++;
|
||||
f->de = *de;
|
||||
return funopen(f, dosread, NULL, dosseek, dosclose);
|
||||
}
|
||||
|
||||
/*
|
||||
* Read from file
|
||||
*/
|
||||
static int
|
||||
dosread(void *v, char *buf, int nbyte)
|
||||
{
|
||||
u_int nb, off, clus, c, cnt, n;
|
||||
int err;
|
||||
DOS_FILE *f = v;
|
||||
|
||||
nb = (u_int)nbyte;
|
||||
if (nb > (n = cv4(f->de.size) - f->offset))
|
||||
nb = n;
|
||||
off = f->offset;
|
||||
if ((clus = stclus(f->fs->fatsz, &f->de)))
|
||||
off &= f->fs->bsize - 1;
|
||||
c = f->c;
|
||||
cnt = nb;
|
||||
while (cnt) {
|
||||
n = 0;
|
||||
if (!c) {
|
||||
if ((c = clus))
|
||||
n = bytblk(f->fs, f->offset);
|
||||
} else if (!off)
|
||||
n++;
|
||||
while (n--) {
|
||||
if ((err = fatget(f->fs, &c)))
|
||||
RETERR(err);
|
||||
if (!okclus(f->fs, c))
|
||||
RETERR(EINVAL);
|
||||
}
|
||||
if (!clus || (n = f->fs->bsize - off) > cnt)
|
||||
n = cnt;
|
||||
if ((err = ioread(f->fs, blkoff(f->fs, c) + off, buf, n)))
|
||||
RETERR(err);
|
||||
f->offset += n;
|
||||
f->c = c;
|
||||
off = 0;
|
||||
buf += n;
|
||||
cnt -= n;
|
||||
}
|
||||
return (int)nb;
|
||||
}
|
||||
|
||||
/*
|
||||
* Reposition with file
|
||||
*/
|
||||
static fpos_t
|
||||
dosseek(void *v, fpos_t offset, int whence)
|
||||
{
|
||||
off_t off;
|
||||
u_int size;
|
||||
DOS_FILE *f = v;
|
||||
|
||||
size = cv4(f->de.size);
|
||||
switch (whence) {
|
||||
case SEEK_SET:
|
||||
off = 0;
|
||||
break;
|
||||
case SEEK_CUR:
|
||||
off = f->offset;
|
||||
break;
|
||||
case SEEK_END:
|
||||
off = size;
|
||||
break;
|
||||
default:
|
||||
RETERR(EINVAL);
|
||||
}
|
||||
off += offset;
|
||||
if (off < 0 || off > size)
|
||||
RETERR(EINVAL);
|
||||
f->offset = (u_int)off;
|
||||
f->c = 0;
|
||||
return off;
|
||||
}
|
||||
|
||||
/*
|
||||
* Close open file
|
||||
*/
|
||||
static int
|
||||
dosclose(void *v)
|
||||
{
|
||||
DOS_FILE *f = v;
|
||||
|
||||
f->fs->links--;
|
||||
free(f);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Parse DOS boot sector
|
||||
*/
|
||||
static int
|
||||
parsebs(DOS_FS *fs, DOS_BS *bs)
|
||||
{
|
||||
u_int sc;
|
||||
|
||||
if ((bs->jmp[0] != 0x69 &&
|
||||
bs->jmp[0] != 0xe9 &&
|
||||
(bs->jmp[0] != 0xeb || bs->jmp[2] != 0x90)) ||
|
||||
bs->bpb.media < 0xf0)
|
||||
return EINVAL;
|
||||
if (cv2(bs->bpb.secsiz) != SECSIZ)
|
||||
return EINVAL;
|
||||
if (!(fs->spc = bs->bpb.spc) || fs->spc & (fs->spc - 1))
|
||||
return EINVAL;
|
||||
fs->bsize = secbyt(fs->spc);
|
||||
fs->bshift = ffs(fs->bsize) - 1;
|
||||
if ((fs->spf = cv2(bs->bpb.spf))) {
|
||||
if (bs->bpb.fats != 2)
|
||||
return EINVAL;
|
||||
if (!(fs->dirents = cv2(bs->bpb.dirents)))
|
||||
return EINVAL;
|
||||
} else {
|
||||
if (!(fs->spf = cv4(bs->bpb.lspf)))
|
||||
return EINVAL;
|
||||
if (!bs->bpb.fats || bs->bpb.fats > 16)
|
||||
return EINVAL;
|
||||
if ((fs->rdcl = cv4(bs->bpb.rdcl)) < LOCLUS)
|
||||
return EINVAL;
|
||||
}
|
||||
if (!(fs->lsnfat = cv2(bs->bpb.ressec)))
|
||||
return EINVAL;
|
||||
fs->lsndir = fs->lsnfat + fs->spf * bs->bpb.fats;
|
||||
fs->lsndta = fs->lsndir + entsec(fs->dirents);
|
||||
if (!(sc = cv2(bs->bpb.secs)) && !(sc = cv4(bs->bpb.lsecs)))
|
||||
return EINVAL;
|
||||
if (fs->lsndta > sc)
|
||||
return EINVAL;
|
||||
if ((fs->xclus = secblk(fs, sc - fs->lsndta) + 1) < LOCLUS)
|
||||
return EINVAL;
|
||||
fs->fatsz = fs->dirents ? fs->xclus < 0xff6 ? 12 : 16 : 32;
|
||||
sc = (secbyt(fs->spf) << 1) / (fs->fatsz >> 2) - 1;
|
||||
if (fs->xclus > sc)
|
||||
fs->xclus = sc;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Return directory entry from path
|
||||
*/
|
||||
static int
|
||||
namede(DOS_FS *fs, const char *path, DOS_DE **dep)
|
||||
{
|
||||
char name[256];
|
||||
DOS_DE *de;
|
||||
char *s;
|
||||
size_t n;
|
||||
int err;
|
||||
|
||||
err = 0;
|
||||
de = dot;
|
||||
if (*path == '/')
|
||||
path++;
|
||||
while (*path) {
|
||||
if (!(s = strchr(path, '/')))
|
||||
s = strchr(path, 0);
|
||||
if ((n = s - path) > 255)
|
||||
return ENAMETOOLONG;
|
||||
memcpy(name, path, n);
|
||||
name[n] = 0;
|
||||
path = s;
|
||||
if (!(de->attr & FA_DIR))
|
||||
return ENOTDIR;
|
||||
if ((err = lookup(fs, stclus(fs->fatsz, de), name, &de)))
|
||||
return err;
|
||||
if (*path == '/')
|
||||
path++;
|
||||
}
|
||||
*dep = de;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Lookup path segment
|
||||
*/
|
||||
static int
|
||||
lookup(DOS_FS *fs, u_int clus, const char *name, DOS_DE **dep)
|
||||
{
|
||||
static DOS_DIR dir[DEPSEC];
|
||||
u_char lfn[261];
|
||||
u_char sfn[13];
|
||||
u_int nsec, lsec, xdn, chk, sec, ent, x;
|
||||
int err, ok, i;
|
||||
|
||||
if (!clus)
|
||||
for (ent = 0; ent < 2; ent++)
|
||||
if (!strcasecmp(name, dotstr[ent])) {
|
||||
*dep = dot + ent;
|
||||
return 0;
|
||||
}
|
||||
if (!clus && fs->fatsz == 32)
|
||||
clus = fs->rdcl;
|
||||
nsec = !clus ? entsec(fs->dirents) : fs->spc;
|
||||
lsec = 0;
|
||||
xdn = chk = 0;
|
||||
for (;;) {
|
||||
if (!clus && !lsec)
|
||||
lsec = fs->lsndir;
|
||||
else if (okclus(fs, clus))
|
||||
lsec = blklsn(fs, clus);
|
||||
else
|
||||
return EINVAL;
|
||||
for (sec = 0; sec < nsec; sec++) {
|
||||
if ((err = ioget(fs->fd, lsec + sec, dir, 1)))
|
||||
return err;
|
||||
for (ent = 0; ent < DEPSEC; ent++) {
|
||||
if (!*dir[ent].de.name)
|
||||
return ENOENT;
|
||||
if (*dir[ent].de.name != 0xe5)
|
||||
if ((dir[ent].de.attr & FA_MASK) == FA_XDE) {
|
||||
x = dir[ent].xde.seq;
|
||||
if (x & 0x40 || (x + 1 == xdn &&
|
||||
dir[ent].xde.chk == chk)) {
|
||||
if (x & 0x40) {
|
||||
chk = dir[ent].xde.chk;
|
||||
x &= ~0x40;
|
||||
}
|
||||
if (x >= 1 && x <= 20) {
|
||||
cp_xdnm(lfn, &dir[ent].xde);
|
||||
xdn = x;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
} else if (!(dir[ent].de.attr & FA_LABEL)) {
|
||||
if ((ok = xdn == 1)) {
|
||||
for (x = 0, i = 0; i < 11; i++)
|
||||
x = ((((x & 1) << 7) | (x >> 1)) +
|
||||
dir[ent].de.name[i]) & 0xff;
|
||||
ok = chk == x &&
|
||||
!strcasecmp(name, (const char *)lfn);
|
||||
}
|
||||
if (!ok) {
|
||||
cp_sfn(sfn, &dir[ent].de);
|
||||
ok = !strcasecmp(name, (const char *)sfn);
|
||||
}
|
||||
if (ok) {
|
||||
*dep = &dir[ent].de;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
xdn = 0;
|
||||
}
|
||||
}
|
||||
if (!clus)
|
||||
break;
|
||||
if ((err = fatget(fs, &clus)))
|
||||
return err;
|
||||
if (fatend(fs->fatsz, clus))
|
||||
break;
|
||||
}
|
||||
return ENOENT;
|
||||
}
|
||||
|
||||
/*
|
||||
* Copy name from extended directory entry
|
||||
*/
|
||||
static void
|
||||
cp_xdnm(u_char *lfn, DOS_XDE *xde)
|
||||
{
|
||||
static struct {
|
||||
u_int off;
|
||||
u_int dim;
|
||||
} ix[3] = {
|
||||
{offsetof(DOS_XDE, name1), sizeof(xde->name1) / 2},
|
||||
{offsetof(DOS_XDE, name2), sizeof(xde->name2) / 2},
|
||||
{offsetof(DOS_XDE, name3), sizeof(xde->name3) / 2}
|
||||
};
|
||||
u_char *p;
|
||||
u_int n, x, c;
|
||||
|
||||
lfn += 13 * ((xde->seq & ~0x40) - 1);
|
||||
for (n = 0; n < 3; n++)
|
||||
for (p = (u_char *)xde + ix[n].off, x = ix[n].dim; x;
|
||||
p += 2, x--) {
|
||||
if ((c = cv2(p)) && (c < 32 || c > 127))
|
||||
c = '?';
|
||||
if (!(*lfn++ = c))
|
||||
return;
|
||||
}
|
||||
if (xde->seq & 0x40)
|
||||
*lfn = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Copy short filename
|
||||
*/
|
||||
static void
|
||||
cp_sfn(u_char *sfn, DOS_DE *de)
|
||||
{
|
||||
u_char *p;
|
||||
int j, i;
|
||||
|
||||
p = sfn;
|
||||
if (*de->name != ' ') {
|
||||
for (j = 7; de->name[j] == ' '; j--);
|
||||
for (i = 0; i <= j; i++)
|
||||
*p++ = de->name[i];
|
||||
if (*de->ext != ' ') {
|
||||
*p++ = '.';
|
||||
for (j = 2; de->ext[j] == ' '; j--);
|
||||
for (i = 0; i <= j; i++)
|
||||
*p++ = de->ext[i];
|
||||
}
|
||||
}
|
||||
*p = 0;
|
||||
if (*sfn == 5)
|
||||
*sfn = 0xe5;
|
||||
}
|
||||
|
||||
/*
|
||||
* Get next cluster in cluster chain
|
||||
*/
|
||||
static int
|
||||
fatget(DOS_FS *fs, u_int *c)
|
||||
{
|
||||
u_char buf[4];
|
||||
u_int x;
|
||||
int err;
|
||||
|
||||
err = ioread(fs, secbyt(fs->lsnfat) + fatoff(fs->fatsz, *c), buf,
|
||||
fs->fatsz != 32 ? 2 : 4);
|
||||
if (err)
|
||||
return err;
|
||||
x = fs->fatsz != 32 ? cv2(buf) : cv4(buf);
|
||||
*c = fs->fatsz == 12 ? *c & 1 ? x >> 4 : x & 0xfff : x;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Is cluster an end-of-chain marker?
|
||||
*/
|
||||
static int
|
||||
fatend(u_int sz, u_int c)
|
||||
{
|
||||
return c > (sz == 12 ? 0xff7U : sz == 16 ? 0xfff7U : 0xffffff7);
|
||||
}
|
||||
|
||||
/*
|
||||
* Offset-based I/O primitive
|
||||
*/
|
||||
static int
|
||||
ioread(DOS_FS *fs, u_int offset, void *buf, u_int nbyte)
|
||||
{
|
||||
char *s;
|
||||
u_int off, n;
|
||||
int err;
|
||||
|
||||
s = buf;
|
||||
if ((off = offset & (SECSIZ - 1))) {
|
||||
offset -= off;
|
||||
if ((err = iobuf(fs, bytsec(offset))))
|
||||
return err;
|
||||
offset += SECSIZ;
|
||||
if ((n = SECSIZ - off) > nbyte)
|
||||
n = nbyte;
|
||||
memcpy(s, fs->buf + off, n);
|
||||
s += n;
|
||||
nbyte -= n;
|
||||
}
|
||||
n = nbyte & (SECSIZ - 1);
|
||||
if (nbyte -= n) {
|
||||
if ((err = ioget(fs->fd, bytsec(offset), s, bytsec(nbyte))))
|
||||
return err;
|
||||
offset += nbyte;
|
||||
s += nbyte;
|
||||
}
|
||||
if (n) {
|
||||
if ((err = iobuf(fs, bytsec(offset))))
|
||||
return err;
|
||||
memcpy(s, fs->buf, n);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Buffered sector-based I/O primitive
|
||||
*/
|
||||
static int
|
||||
iobuf(DOS_FS *fs, u_int lsec)
|
||||
{
|
||||
int err;
|
||||
|
||||
if (fs->bufsec != lsec) {
|
||||
if ((err = ioget(fs->fd, lsec, fs->buf, 1)))
|
||||
return err;
|
||||
fs->bufsec = lsec;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Sector-based I/O primitive
|
||||
*/
|
||||
static int
|
||||
ioget(int fd, u_int lsec, void *buf, u_int nsec)
|
||||
{
|
||||
size_t nbyte;
|
||||
ssize_t n;
|
||||
|
||||
if (lseek(fd, secbyt(lsec), SEEK_SET) == -1)
|
||||
return errno;
|
||||
nbyte = secbyt(nsec);
|
||||
n = read(fd, buf, nbyte);
|
||||
return n == -1 ? errno : (size_t)n != nbyte ? EIO : 0;
|
||||
}
|
||||
|
|
@ -1,124 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 1996, 1998 Robert Nordier
|
||||
* 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(S) ``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(S) 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.
|
||||
*/
|
||||
|
||||
#ifndef DOSIO_H
|
||||
#define DOSIO_H
|
||||
|
||||
/*
|
||||
* DOS file attributes
|
||||
*/
|
||||
|
||||
#define FA_RDONLY 001 /* read-only */
|
||||
#define FA_HIDDEN 002 /* hidden file */
|
||||
#define FA_SYSTEM 004 /* system file */
|
||||
#define FA_LABEL 010 /* volume label */
|
||||
#define FA_DIR 020 /* directory */
|
||||
#define FA_ARCH 040 /* archive (file modified) */
|
||||
#define FA_XDE 017 /* extended directory entry */
|
||||
#define FA_MASK 077 /* all attributes */
|
||||
|
||||
/*
|
||||
* Macros to convert DOS-format 16-bit and 32-bit quantities
|
||||
*/
|
||||
|
||||
#define cv2(p) ((u_int16_t)(p)[0] | \
|
||||
((u_int16_t)(p)[1] << 010))
|
||||
#define cv4(p) ((u_int32_t)(p)[0] | \
|
||||
((u_int32_t)(p)[1] << 010) | \
|
||||
((u_int32_t)(p)[2] << 020) | \
|
||||
((u_int32_t)(p)[3] << 030))
|
||||
|
||||
/*
|
||||
* Directory, filesystem, and file structures.
|
||||
*/
|
||||
|
||||
typedef struct {
|
||||
u_char x_case; /* case */
|
||||
u_char c_hsec; /* created: secs/100 */
|
||||
u_char c_time[2]; /* created: time */
|
||||
u_char c_date[2]; /* created: date */
|
||||
u_char a_date[2]; /* accessed: date */
|
||||
u_char h_clus[2]; /* clus[hi] */
|
||||
} DOS_DEX;
|
||||
|
||||
typedef struct {
|
||||
u_char name[8]; /* name */
|
||||
u_char ext[3]; /* extension */
|
||||
u_char attr; /* attributes */
|
||||
DOS_DEX dex; /* VFAT/FAT32 only */
|
||||
u_char time[2]; /* modified: time */
|
||||
u_char date[2]; /* modified: date */
|
||||
u_char clus[2]; /* starting cluster */
|
||||
u_char size[4]; /* size */
|
||||
} DOS_DE;
|
||||
|
||||
typedef struct {
|
||||
u_char seq; /* flags */
|
||||
u_char name1[5][2]; /* 1st name area */
|
||||
u_char attr; /* (see fat_de) */
|
||||
u_char res; /* reserved */
|
||||
u_char chk; /* checksum */
|
||||
u_char name2[6][2]; /* 2nd name area */
|
||||
u_char clus[2]; /* (see fat_de) */
|
||||
u_char name3[2][2]; /* 3rd name area */
|
||||
} DOS_XDE;
|
||||
|
||||
typedef union {
|
||||
DOS_DE de; /* standard directory entry */
|
||||
DOS_XDE xde; /* extended directory entry */
|
||||
} DOS_DIR;
|
||||
|
||||
typedef struct {
|
||||
int fd; /* file descriptor */
|
||||
u_char *buf; /* buffer */
|
||||
u_int bufsec; /* buffered sector */
|
||||
u_int links; /* active links to structure */
|
||||
u_int spc; /* sectors per cluster */
|
||||
u_int bsize; /* cluster size in bytes */
|
||||
u_int bshift; /* cluster conversion shift */
|
||||
u_int dirents; /* root directory entries */
|
||||
u_int spf; /* sectors per fat */
|
||||
u_int rdcl; /* root directory start cluster */
|
||||
u_int lsnfat; /* start of fat */
|
||||
u_int lsndir; /* start of root dir */
|
||||
u_int lsndta; /* start of data area */
|
||||
u_int fatsz; /* FAT entry size */
|
||||
u_int xclus; /* maximum cluster number */
|
||||
} DOS_FS;
|
||||
|
||||
typedef struct {
|
||||
DOS_FS *fs; /* associated filesystem */
|
||||
DOS_DE de; /* directory entry */
|
||||
u_int offset; /* current offset */
|
||||
u_int c; /* last cluster read */
|
||||
} DOS_FILE;
|
||||
|
||||
int dos_mount(DOS_FS *, const char *);
|
||||
int dos_unmount(DOS_FS *);
|
||||
FILE *dos_open(DOS_FS *, const char *);
|
||||
|
||||
#endif /* !DOSIO_H */
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
* This is probably the last attempt in the `sysinstall' line, the next
|
||||
* generation being slated to essentially a complete rewrite.
|
||||
*
|
||||
* $Id$
|
||||
* $Id: dos.c,v 1.18 1997/02/22 14:11:39 peter Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -44,52 +44,57 @@
|
|||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <grp.h>
|
||||
#include "dosio.h"
|
||||
#define MSDOSFS
|
||||
#include <sys/mount.h>
|
||||
#include <msdosfs/msdosfsmount.h>
|
||||
#undef MSDOSFS
|
||||
|
||||
static DOS_FS DOSFS;
|
||||
static Boolean DOSMounted;
|
||||
|
||||
Boolean
|
||||
mediaInitDOS(Device *dev)
|
||||
{
|
||||
struct msdosfs_args args;
|
||||
|
||||
if (!RunningAsInit || DOSMounted)
|
||||
return TRUE;
|
||||
|
||||
if (DITEM_STATUS(Mkdir("/dist")) != DITEM_SUCCESS)
|
||||
return FALSE;
|
||||
|
||||
if (dos_mount(&DOSFS, dev->devname)) {
|
||||
msgConfirm("Error mounting DOS partition %s : %s (%u)", dev->devname, strerror(errno), errno);
|
||||
memset(&args, 0, sizeof(args));
|
||||
args.fspec = dev->devname;
|
||||
args.uid = args.gid = 0;
|
||||
args.mask = 0777;
|
||||
|
||||
if (mount("dos", "/dist", MNT_RDONLY, (caddr_t)&args) == -1) {
|
||||
msgConfirm("Error mounting %s on /dist: %s (%u)", args.fspec, strerror(errno), errno);
|
||||
return FALSE;
|
||||
}
|
||||
else
|
||||
msgDebug("Mounted DOS device (%s) on /dist.\n", args.fspec);
|
||||
DOSMounted = TRUE;
|
||||
msgDebug("DOS partition %s mounted\n", dev->devname);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
FILE *
|
||||
mediaGetDOS(Device *dev, char *file, Boolean probe)
|
||||
{
|
||||
char buf[PATH_MAX];
|
||||
FILE *fp;
|
||||
|
||||
if (!DOSMounted) {
|
||||
msgDebug("Can't get DOS file %s - DOSFS currently unmounted!\n", file);
|
||||
return NULL;
|
||||
}
|
||||
char buf[PATH_MAX];
|
||||
|
||||
if (isDebug())
|
||||
msgDebug("Request for %s from DOS\n", file);
|
||||
snprintf(buf, PATH_MAX, "/freebsd/%s", file);
|
||||
if ((fp = dos_open(&DOSFS, buf)))
|
||||
return fp;
|
||||
snprintf(buf, PATH_MAX, "/freebsd/dists/%s", file);
|
||||
if ((fp = dos_open(&DOSFS, buf)))
|
||||
return fp;
|
||||
snprintf(buf, PATH_MAX, "/%s", file);
|
||||
if ((fp = dos_open(&DOSFS, buf)))
|
||||
return fp;
|
||||
snprintf(buf, PATH_MAX, "/dists/%s", file);
|
||||
if ((fp = dos_open(&DOSFS, buf)))
|
||||
return fp;
|
||||
return NULL;
|
||||
snprintf(buf, PATH_MAX, "/dist/%s", file);
|
||||
if (file_readable(buf))
|
||||
return fopen(buf, "r");
|
||||
snprintf(buf, PATH_MAX, "/dist/dists/%s", file);
|
||||
if (file_readable(buf))
|
||||
return fopen(buf, "r");
|
||||
snprintf(buf, PATH_MAX, "/dist/%s/%s", variable_get(VAR_RELNAME), file);
|
||||
if (file_readable(buf))
|
||||
return fopen(buf, "r");
|
||||
snprintf(buf, PATH_MAX, "/dist/%s/dists/%s", variable_get(VAR_RELNAME), file);
|
||||
return fopen(buf, "r");
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -97,10 +102,11 @@ mediaShutdownDOS(Device *dev)
|
|||
{
|
||||
if (!RunningAsInit || !DOSMounted)
|
||||
return;
|
||||
if (dos_unmount(&DOSFS))
|
||||
msgConfirm("Could not unmount DOS partition %s : %s", dev->devname, strerror(errno));
|
||||
else if (isDebug())
|
||||
msgDebug("Unmount of DOS partition on %s successful\n", dev->devname);
|
||||
msgDebug("Unmounting %s from /dist\n", dev->name);
|
||||
if (unmount("/dist", MNT_FORCE) != 0)
|
||||
msgConfirm("Could not unmount the DOS partition: %s", strerror(errno));
|
||||
if (isDebug())
|
||||
msgDebug("Unmount successful\n");
|
||||
DOSMounted = FALSE;
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue