diff options
author | jkh <jkh@FreeBSD.org> | 1998-03-03 04:29:01 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1998-03-03 04:29:01 +0000 |
commit | d1ab9135f210e56e4a1b5104d638e7f9976b7930 (patch) | |
tree | 31c478b6a0196ca78ec4c1f8e5cc48b4d9008998 /release/sysinstall/dosio.h | |
parent | 8acfb4f2c51b23fb6afd9a5460c3e5747c9f4a82 (diff) | |
download | FreeBSD-src-d1ab9135f210e56e4a1b5104d638e7f9976b7930.zip FreeBSD-src-d1ab9135f210e56e4a1b5104d638e7f9976b7930.tar.gz |
Update stand-alone DOS I/O routines to be able to read from FAT32/VFAT
partitions. This should allow sysinstall to function properly in all
Win95 installation based scenarios now.
Submitted by: Robert Nordier <rnordier@iafrica.com>
Diffstat (limited to 'release/sysinstall/dosio.h')
-rw-r--r-- | release/sysinstall/dosio.h | 164 |
1 files changed, 85 insertions, 79 deletions
diff --git a/release/sysinstall/dosio.h b/release/sysinstall/dosio.h index 37756b1..5f4fc69 100644 --- a/release/sysinstall/dosio.h +++ b/release/sysinstall/dosio.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996 Robert Nordier + * Copyright (c) 1996, 1998 Robert Nordier * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -8,111 +8,117 @@ * 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. + * 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. + * 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 0x01 /* read-only */ -#define FA_HIDDEN 0x02 /* hidden file */ -#define FA_SYSTEM 0x04 /* system file */ -#define FA_LABEL 0x08 /* volume label */ -#define FA_DIR 0x10 /* directory */ -#define FA_ARCH 0x20 /* archive (file modified) */ - -/* - * Error number to overload if filesystem errors are detected during - * routine processing - */ - -#define EBADFS EINVAL +#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_short)(p)[0] | \ - ((u_short)(p)[1] << 010)) - -#define cv4(p) ((u_long)(p)[0] | \ - ((u_long)(p)[1] << 010) | \ - ((u_long)(p)[2] << 020) | \ - ((u_long)(p)[3] << 030)) +#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)) /* - * DOS directory structure + * Directory, filesystem, and file structures. */ typedef struct { - u_char name[8]; /* name */ - u_char ext[3]; /* extension */ - u_char attr; /* attributes */ - u_char reserved[10]; /* reserved */ - u_char time[2]; /* time */ - u_char date[2]; /* date */ - u_char clus[2]; /* starting cluster */ - u_char size[4]; /* file size */ + 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 *fat; /* FAT */ - u_long volid; /* volume id */ - u_long lsnfat; /* logical sector number: fat */ - u_long lsndir; /* logical sector number: dir */ - u_long lsndta; /* logical sector number: data area */ - short fd; /* file descriptor */ - short fat12; /* 12-bit FAT entries */ - u_short spf; /* sectors per fat */ - u_short dirents; /* root directory entries */ - u_short spc; /* sectors per cluster */ - u_short xclus; /* maximum cluster number */ - u_short bsize; /* cluster size in bytes */ - u_short bshift; /* cluster conversion shift */ - u_short links; /* active links to structure */ + 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_long offset; /* current offset */ - u_short c; /* last cluster read */ + DOS_FS *fs; /* associated filesystem */ + DOS_DE de; /* directory entry */ + u_int offset; /* current offset */ + u_int c; /* last cluster read */ } DOS_FILE; -/* - * The following variable can be set to the address of an error-handling - * routine which will be invoked when a read() returns EIO. The handler - * should return 1 to retry the read, otherwise 0. - */ - -extern int (*dos_ioerr)(int op); - -int dos_mount(DOS_FS *fs, const char *devname); -int dos_unmount(DOS_FS *fs); -u_long dos_free(DOS_FS *fs); -FILE *dos_open(DOS_FS *fs, const char *path); -int dos_close(void *v); -fpos_t dos_seek(void *v, fpos_t offset, int whence); -int dos_read(void *v, char *buf, int nbytes); -int dos_stat(DOS_FS *fs, const char *path, struct stat *sb); -int dos_fstat(DOS_FILE *f, struct stat *sb); -void dos_cvtime(time_t *timer, u_short ddate, u_short dtime); +int dos_mount(DOS_FS *, const char *); +int dos_unmount(DOS_FS *); +FILE *dos_open(DOS_FS *, const char *); -#endif /* !DOSIO_H */ +#endif /* !DOSIO_H */ |