mirror of https://git.FreeBSD.org/src.git
parent
08e4b2b3b6
commit
06a400d76b
|
@ -886,7 +886,7 @@ cd9660_translate_node(iso9660_disk *diskStructure, fsnode *node,
|
|||
* @param const char * The first file name
|
||||
* @param const char * The second file name
|
||||
* @returns : -1 if first is less than second, 0 if they are the same, 1 if
|
||||
* the second is greater than the first
|
||||
* the second is greater than the first
|
||||
*/
|
||||
static int
|
||||
cd9660_compare_filename(const char *first, const char *second)
|
||||
|
@ -1705,7 +1705,7 @@ cd9660_level2_convert_filename(iso9660_disk *diskStructure, const char *oldname,
|
|||
*newname++ = *oldname;
|
||||
else if (diskStructure->allow_multidot &&
|
||||
*oldname == '.') {
|
||||
*newname++ = '.';
|
||||
*newname++ = '.';
|
||||
} else {
|
||||
*newname++ = '_';
|
||||
}
|
||||
|
@ -1852,7 +1852,7 @@ cd9660_compute_offsets(iso9660_disk *diskStructure, cd9660node *node,
|
|||
cd9660_compute_record_size(diskStructure, child);
|
||||
if ((cd9660_compute_record_size(diskStructure, child) +
|
||||
current_sector_usage) >=
|
||||
diskStructure->sectorSize) {
|
||||
diskStructure->sectorSize) {
|
||||
current_sector_usage = 0;
|
||||
node->fileSectorsUsed++;
|
||||
}
|
||||
|
|
|
@ -316,8 +316,8 @@ void cd9660_721(uint16_t, unsigned char *);
|
|||
void cd9660_731(uint32_t, unsigned char *);
|
||||
void cd9660_722(uint16_t, unsigned char *);
|
||||
void cd9660_732(uint32_t, unsigned char *);
|
||||
void cd9660_bothendian_dword(uint32_t dw, unsigned char *);
|
||||
void cd9660_bothendian_word(uint16_t dw, unsigned char *);
|
||||
void cd9660_bothendian_dword(uint32_t dw, unsigned char *);
|
||||
void cd9660_bothendian_word(uint16_t dw, unsigned char *);
|
||||
void cd9660_set_date(char *, time_t);
|
||||
void cd9660_time_8426(unsigned char *, time_t);
|
||||
void cd9660_time_915(unsigned char *, time_t);
|
||||
|
|
|
@ -131,7 +131,7 @@ struct boot_catalog_entry {
|
|||
char entry_type;
|
||||
union {
|
||||
boot_catalog_validation_entry VE;
|
||||
boot_catalog_initial_entry IE;
|
||||
boot_catalog_initial_entry IE;
|
||||
boot_catalog_section_header SH;
|
||||
boot_catalog_section_entry SE;
|
||||
boot_catalog_section_entry_extension EX;
|
||||
|
@ -144,7 +144,7 @@ struct boot_catalog_entry {
|
|||
struct cd9660_boot_image {
|
||||
char *filename;
|
||||
int size;
|
||||
int sector; /* copied to LoadRBA */
|
||||
int sector; /* copied to LoadRBA */
|
||||
int num_sectors;
|
||||
unsigned int loadSegment;
|
||||
u_char targetMode;
|
||||
|
|
|
@ -316,7 +316,7 @@ cd9660_write_file(iso9660_disk *diskStructure, FILE *fd, cd9660node *writenode)
|
|||
/*
|
||||
* Now loop over children, writing out their directory
|
||||
* records - beware of sector boundaries
|
||||
*/
|
||||
*/
|
||||
TAILQ_FOREACH(temp, &writenode->cn_children, cn_next_child) {
|
||||
/*
|
||||
* Copy the temporary record and adjust its size
|
||||
|
|
|
@ -209,7 +209,7 @@ struct ISO_SUSP_ATTRIBUTES {
|
|||
char type_of[2];
|
||||
char last_in_suf; /* last entry in the System Use Field? */
|
||||
/* Dan's addons - will merge later. This allows use of a switch */
|
||||
char susp_type; /* SUSP or RRIP */
|
||||
char susp_type; /* SUSP or RRIP */
|
||||
char entry_type; /* Record type */
|
||||
char write_location;
|
||||
TAILQ_ENTRY(ISO_SUSP_ATTRIBUTES) rr_ll;
|
||||
|
|
|
@ -907,7 +907,7 @@ ffs_populate_dir(const char *dir, fsnode *root, fsinfo_t *fsopts)
|
|||
static void
|
||||
ffs_write_file(union dinode *din, uint32_t ino, void *buf, fsinfo_t *fsopts)
|
||||
{
|
||||
int isfile, ffd;
|
||||
int isfile, ffd;
|
||||
char *fbuf, *p;
|
||||
off_t bufleft, chunk, offset;
|
||||
ssize_t nread;
|
||||
|
@ -1097,7 +1097,7 @@ ffs_make_dirbuf(dirbuf_t *dbuf, const char *name, fsnode *node, int needswap)
|
|||
static void
|
||||
ffs_write_inode(union dinode *dp, uint32_t ino, const fsinfo_t *fsopts)
|
||||
{
|
||||
char *buf;
|
||||
char *buf;
|
||||
struct ufs1_dinode *dp1;
|
||||
struct ufs2_dinode *dp2, *dip;
|
||||
struct cg *cgp;
|
||||
|
|
|
@ -46,7 +46,7 @@ union dinode {
|
|||
};
|
||||
|
||||
struct inode {
|
||||
ino_t i_number; /* The identity of the inode. */
|
||||
ino_t i_number; /* The identity of the inode. */
|
||||
struct vnode *i_devvp; /* vnode pointer (contains fsopts) */
|
||||
struct fs *i_fs; /* File system */
|
||||
union dinode i_din;
|
||||
|
|
|
@ -100,7 +100,7 @@ main(int argc, char *argv[])
|
|||
fstype_t *fstype;
|
||||
fsinfo_t fsoptions;
|
||||
fsnode *root;
|
||||
int ch, i, len;
|
||||
int ch, i, len;
|
||||
const char *subtree;
|
||||
const char *specfile;
|
||||
|
||||
|
|
|
@ -58,7 +58,7 @@
|
|||
*
|
||||
* name "." "bin" "netbsd"
|
||||
* type S_IFDIR S_IFDIR S_IFREG
|
||||
* next > > NULL
|
||||
* next > > NULL
|
||||
* parent NULL NULL NULL
|
||||
* child NULL v
|
||||
*
|
||||
|
|
Loading…
Reference in New Issue