Page MenuHomeFreeBSD
Files F149025591

D55865.diff
No OneTemporary
Actions

D55865.diff
View Options

diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c
--- a/sys/fs/cd9660/cd9660_rrip.c
+++ b/sys/fs/cd9660/cd9660_rrip.c
@@ -88,7 +88,7 @@
ana->inop->inode.iso_gid = isonum_733(p->gid);
ana->inop->inode.iso_links = isonum_733(p->links);
ana->fields &= ~ISO_SUSP_ATTR;
- return ISO_SUSP_ATTR;
+ return (ISO_SUSP_ATTR);
}
static void
@@ -96,7 +96,7 @@
{
/* But this is a required field! */
printf("RRIP without PX field?\n");
- cd9660_defattr(isodir,ana->inop,NULL,ISO_FTYPE_RRIP);
+ cd9660_defattr(isodir, ana->inop, NULL, ISO_FTYPE_RRIP);
}
/*
@@ -188,7 +188,7 @@
ana->fields = 0;
ana->outbuf -= *ana->outlen;
*ana->outlen = 0;
- return 0;
+ return (0);
}
memcpy(outbuf, inbuf, wlen);
@@ -201,9 +201,9 @@
if (!isonum_711(p->flags)) {
ana->fields &= ~ISO_SUSP_SLINK;
- return ISO_SUSP_SLINK;
+ return (ISO_SUSP_SLINK);
}
- return 0;
+ return (0);
}
/*
@@ -259,7 +259,7 @@
ana->fields &= ~ISO_SUSP_ALTNAME;
ana->outbuf -= *ana->outlen - wlen;
*ana->outlen = 0;
- return 0;
+ return (0);
}
memcpy(ana->outbuf, inbuf, wlen);
@@ -267,18 +267,17 @@
if (!cont) {
ana->fields &= ~ISO_SUSP_ALTNAME;
- return ISO_SUSP_ALTNAME;
+ return (ISO_SUSP_ALTNAME);
}
- return 0;
+ return (0);
}
static void
cd9660_rrip_defname(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana)
{
- isofntrans(isodir->name,isonum_711(isodir->name_len),
- ana->outbuf,ana->outlen,
- 1,isonum_711(isodir->flags)&4, ana->imp->joliet_level,
- ana->imp->im_flags, ana->imp->im_d2l);
+ isofntrans(isodir->name, isonum_711(isodir->name_len),
+ ana->outbuf, ana->outlen, 1, isonum_711(isodir->flags)&4,
+ ana->imp->joliet_level, ana->imp->im_flags, ana->imp->im_d2l);
switch (*ana->outbuf) {
default:
break;
@@ -287,7 +286,7 @@
/* FALLTHROUGH */
case 0:
/* outlen is 1 already */
- strcpy(ana->outbuf,"..");
+ strcpy(ana->outbuf, "..");
break;
}
}
@@ -299,8 +298,8 @@
cd9660_rrip_pclink(ISO_RRIP_CLINK *p, ISO_RRIP_ANALYZE *ana)
{
*ana->inump = isonum_733(p->dir_loc) << ana->imp->im_bshift;
- ana->fields &= ~(ISO_SUSP_CLINK|ISO_SUSP_PLINK);
- return *p->h.type == 'C' ? ISO_SUSP_CLINK : ISO_SUSP_PLINK;
+ ana->fields &= ~(ISO_SUSP_CLINK | ISO_SUSP_PLINK);
+ return (*p->h.type == 'C' ? ISO_SUSP_CLINK : ISO_SUSP_PLINK);
}
/*
@@ -312,7 +311,7 @@
/* special hack to make caller aware of RE field */
*ana->outlen = 0;
ana->fields = 0;
- return ISO_SUSP_RELDIR|ISO_SUSP_ALTNAME|ISO_SUSP_CLINK|ISO_SUSP_PLINK;
+ return (ISO_SUSP_RELDIR | ISO_SUSP_ALTNAME | ISO_SUSP_CLINK | ISO_SUSP_PLINK);
}
static int
@@ -323,60 +322,61 @@
ptime = p->time;
/* Check a format of time stamp (7bytes/17bytes) */
- if (!(*p->flags&ISO_SUSP_TSTAMP_FORM17)) {
- if (*p->flags&ISO_SUSP_TSTAMP_CREAT)
+ if (!(*p->flags & ISO_SUSP_TSTAMP_FORM17)) {
+ if (*p->flags & ISO_SUSP_TSTAMP_CREAT) {
ptime += 7;
-
- if (*p->flags&ISO_SUSP_TSTAMP_MODIFY) {
- cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_mtime,
- ISO_FTYPE_RRIP);
+ }
+ if (*p->flags & ISO_SUSP_TSTAMP_MODIFY) {
+ cd9660_tstamp_conv7(ptime, &ana->inop->inode.iso_mtime,
+ ISO_FTYPE_RRIP);
ptime += 7;
- } else
+ } else {
memset(&ana->inop->inode.iso_mtime, 0, sizeof(struct timespec));
-
- if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) {
- cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_atime,
- ISO_FTYPE_RRIP);
+ }
+ if (*p->flags & ISO_SUSP_TSTAMP_ACCESS) {
+ cd9660_tstamp_conv7(ptime, &ana->inop->inode.iso_atime,
+ ISO_FTYPE_RRIP);
ptime += 7;
- } else
+ } else {
ana->inop->inode.iso_atime = ana->inop->inode.iso_mtime;
-
- if (*p->flags&ISO_SUSP_TSTAMP_ATTR)
- cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_ctime,
- ISO_FTYPE_RRIP);
- else
+ }
+ if (*p->flags & ISO_SUSP_TSTAMP_ATTR) {
+ cd9660_tstamp_conv7(ptime, &ana->inop->inode.iso_ctime,
+ ISO_FTYPE_RRIP);
+ } else {
ana->inop->inode.iso_ctime = ana->inop->inode.iso_mtime;
-
+ }
} else {
- if (*p->flags&ISO_SUSP_TSTAMP_CREAT)
+ if (*p->flags & ISO_SUSP_TSTAMP_CREAT) {
ptime += 17;
-
- if (*p->flags&ISO_SUSP_TSTAMP_MODIFY) {
- cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_mtime);
+ }
+ if (*p->flags & ISO_SUSP_TSTAMP_MODIFY) {
+ cd9660_tstamp_conv17(ptime, &ana->inop->inode.iso_mtime);
ptime += 17;
- } else
+ } else {
memset(&ana->inop->inode.iso_mtime, 0, sizeof(struct timespec));
-
- if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) {
- cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_atime);
+ }
+ if (*p->flags & ISO_SUSP_TSTAMP_ACCESS) {
+ cd9660_tstamp_conv17(ptime, &ana->inop->inode.iso_atime);
ptime += 17;
- } else
+ } else {
ana->inop->inode.iso_atime = ana->inop->inode.iso_mtime;
-
- if (*p->flags&ISO_SUSP_TSTAMP_ATTR)
- cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_ctime);
- else
+ }
+ if (*p->flags & ISO_SUSP_TSTAMP_ATTR) {
+ cd9660_tstamp_conv17(ptime, &ana->inop->inode.iso_ctime);
+ } else {
ana->inop->inode.iso_ctime = ana->inop->inode.iso_mtime;
+ }
}
ana->fields &= ~ISO_SUSP_TSTAMP;
- return ISO_SUSP_TSTAMP;
+ return (ISO_SUSP_TSTAMP);
}
static void
cd9660_rrip_deftstamp(struct iso_directory_record *isodir,
ISO_RRIP_ANALYZE *ana)
{
- cd9660_deftstamp(isodir,ana->inop,NULL,ISO_FTYPE_RRIP);
+ cd9660_deftstamp(isodir, ana->inop, NULL, ISO_FTYPE_RRIP);
}
/*
@@ -395,7 +395,7 @@
else
ana->inop->inode.iso_rdev = makedev(high, minor(low));
ana->fields &= ~ISO_SUSP_DEVICE;
- return ISO_SUSP_DEVICE;
+ return (ISO_SUSP_DEVICE);
}
/*
@@ -404,12 +404,12 @@
static int
cd9660_rrip_idflag(ISO_RRIP_IDFLAG *p, ISO_RRIP_ANALYZE *ana)
{
- ana->fields &= isonum_711(p->flags)|~0xff; /* don't touch high bits */
+ ana->fields &= isonum_711(p->flags) | ~0xff; /* don't touch high bits */
/* special handling of RE field */
- if (ana->fields&ISO_SUSP_RELDIR)
- return cd9660_rrip_reldir(/* XXX */ (ISO_RRIP_RELDIR *)p,ana);
+ if (ana->fields & ISO_SUSP_RELDIR)
+ return (cd9660_rrip_reldir(/* XXX */ (ISO_RRIP_RELDIR *)p, ana));
- return ISO_SUSP_IDFLAG;
+ return (ISO_SUSP_IDFLAG);
}
/*
@@ -421,7 +421,7 @@
ana->iso_ce_blk = isonum_733(p->location);
ana->iso_ce_off = isonum_733(p->offset);
ana->iso_ce_len = isonum_733(p->length);
- return ISO_SUSP_CONT;
+ return (ISO_SUSP_CONT);
}
/*
@@ -430,7 +430,7 @@
static int
cd9660_rrip_stop(ISO_SUSP_HEADER *p, ISO_RRIP_ANALYZE *ana)
{
- return ISO_SUSP_STOP;
+ return (ISO_SUSP_STOP);
}
/*
@@ -439,16 +439,18 @@
static int
cd9660_rrip_extref(ISO_RRIP_EXTREF *p, ISO_RRIP_ANALYZE *ana)
{
- if ( ! ((isonum_711(p->len_id) == 10
- && bcmp((char *)p + 8,"RRIP_1991A",10) == 0)
- || (isonum_711(p->len_id) == 10
- && bcmp((char *)p + 8,"IEEE_P1282",10) == 0)
- || (isonum_711(p->len_id) == 9
- && bcmp((char *)p + 8,"IEEE_1282", 9) == 0))
- || isonum_711(p->version) != 1)
- return 0;
- ana->fields &= ~ISO_SUSP_EXTREF;
- return ISO_SUSP_EXTREF;
+ size_t len = isonum_711(p->len_id);
+ char *data = (char *)(p + 1);
+
+ if ((len == 10 && memcmp(data, "RRIP_1991A", len) == 0) ||
+ (len == 10 && memcmp(data, "IEEE_P1282", len) == 0) ||
+ (len == 9 && memcmp(data, "IEEE_1282", len) == 0)) {
+ if (isonum_711(p->version) == 1) {
+ ana->fields &= ~ISO_SUSP_EXTREF;
+ return (ISO_SUSP_EXTREF);
+ }
+ }
+ return (0);
}
static int
@@ -471,7 +473,7 @@
if (!(isonum_711(isodir->name_len)&1))
pwhead++;
isochar(isodir->name, pwhead, ana->imp->joliet_level, &c, NULL,
- ana->imp->im_flags, ana->imp->im_d2l);
+ ana->imp->im_flags, ana->imp->im_d2l);
/* If it's not the '.' entry of the root dir obey SP field */
if (c != 0 || isonum_733(isodir->extent) != ana->imp->root_extent)
@@ -491,16 +493,16 @@
while (pend >= phead + 1) {
if (isonum_711(phead->version) == 1) {
for (ptable = table; ptable->func; ptable++) {
- if (*phead->type == *ptable->type
- && phead->type[1] == ptable->type[1]) {
- result |= ptable->func(phead,ana);
+ if (phead->type[0] == ptable->type[0] &&
+ phead->type[1] == ptable->type[1]) {
+ result |= ptable->func(phead, ana);
break;
}
}
if (!ana->fields)
break;
}
- if (result&ISO_SUSP_STOP) {
+ if (result & ISO_SUSP_STOP) {
result &= ~ISO_SUSP_STOP;
break;
}
@@ -530,7 +532,7 @@
/* what to do now? */
break;
phead = (ISO_SUSP_HEADER *)(bp->b_data + ana->iso_ce_off);
- pend = (ISO_SUSP_HEADER *) ((char *)phead + ana->iso_ce_len);
+ pend = (ISO_SUSP_HEADER *)((char *)phead + ana->iso_ce_len);
} else
break;
}
@@ -541,10 +543,10 @@
* (attribute/time stamp)
*/
for (ptable = table; ptable->func2; ptable++)
- if (!(ptable->result&result))
- ptable->func2(isodir,ana);
+ if (!(ptable->result & result))
+ ptable->func2(isodir, ana);
- return result;
+ return (result);
}
/*
@@ -572,9 +574,9 @@
analyze.inop = inop;
analyze.imp = imp;
- analyze.fields = ISO_SUSP_ATTR|ISO_SUSP_TSTAMP|ISO_SUSP_DEVICE;
+ analyze.fields = ISO_SUSP_ATTR | ISO_SUSP_TSTAMP | ISO_SUSP_DEVICE;
- return cd9660_rrip_loop(isodir,&analyze,rrip_table_analyze);
+ return (cd9660_rrip_loop(isodir, &analyze, rrip_table_analyze));
}
/*
@@ -582,8 +584,8 @@
*/
static RRIP_TABLE rrip_table_getname[] = {
{ "NM", BC cd9660_rrip_altname, cd9660_rrip_defname, ISO_SUSP_ALTNAME },
- { "CL", BC cd9660_rrip_pclink, 0, ISO_SUSP_CLINK|ISO_SUSP_PLINK },
- { "PL", BC cd9660_rrip_pclink, 0, ISO_SUSP_CLINK|ISO_SUSP_PLINK },
+ { "CL", BC cd9660_rrip_pclink, 0, ISO_SUSP_CLINK | ISO_SUSP_PLINK },
+ { "PL", BC cd9660_rrip_pclink, 0, ISO_SUSP_CLINK | ISO_SUSP_PLINK },
{ "RE", BC cd9660_rrip_reldir, 0, ISO_SUSP_RELDIR },
{ "RR", BC cd9660_rrip_idflag, 0, ISO_SUSP_IDFLAG },
{ "CE", BC cd9660_rrip_cont, 0, ISO_SUSP_CONT },
@@ -604,20 +606,20 @@
analyze.maxlen = NAME_MAX;
analyze.inump = inump;
analyze.imp = imp;
- analyze.fields = ISO_SUSP_ALTNAME|ISO_SUSP_RELDIR|ISO_SUSP_CLINK|ISO_SUSP_PLINK;
+ analyze.fields = ISO_SUSP_ALTNAME | ISO_SUSP_RELDIR | ISO_SUSP_CLINK | ISO_SUSP_PLINK;
*outlen = 0;
isochar(isodir->name, isodir->name + isonum_711(isodir->name_len),
- imp->joliet_level, &c, NULL, imp->im_flags, imp->im_d2l);
+ imp->joliet_level, &c, NULL, imp->im_flags, imp->im_d2l);
tab = rrip_table_getname;
if (c == 0 || c == 1) {
- cd9660_rrip_defname(isodir,&analyze);
+ cd9660_rrip_defname(isodir, &analyze);
analyze.fields &= ~ISO_SUSP_ALTNAME;
tab++;
}
- return cd9660_rrip_loop(isodir,&analyze,tab);
+ return (cd9660_rrip_loop(isodir, &analyze, tab));
}
/*
@@ -636,6 +638,7 @@
u_short *outlen, struct iso_mnt *imp)
{
ISO_RRIP_ANALYZE analyze;
+ int ret;
analyze.outbuf = outbuf;
analyze.outlen = outlen;
@@ -645,7 +648,8 @@
analyze.imp = imp;
analyze.fields = ISO_SUSP_SLINK;
- return (cd9660_rrip_loop(isodir,&analyze,rrip_table_getsymname)&ISO_SUSP_SLINK);
+ ret = cd9660_rrip_loop(isodir, &analyze, rrip_table_getsymname);
+ return (ret & ISO_SUSP_SLINK);
}
static RRIP_TABLE rrip_table_extref[] = {
@@ -664,21 +668,23 @@
{
ISO_RRIP_OFFSET *p;
ISO_RRIP_ANALYZE analyze;
+ int ret;
imp->rr_skip0 = 0;
p = (ISO_RRIP_OFFSET *)(isodir->name + 1);
- if (bcmp(p,"SP\7\1\276\357",6)) {
+ if (memcmp(p, "SP\7\1\276\357", 6) != 0) {
/* Maybe, it's a CDROM XA disc? */
imp->rr_skip0 = 15;
p = (ISO_RRIP_OFFSET *)((char *)p + 15);
- if (bcmp(p,"SP\7\1\276\357",6))
- return -1;
+ if (memcmp(p, "SP\7\1\276\357", 6) != 0)
+ return (-1);
}
analyze.imp = imp;
analyze.fields = ISO_SUSP_EXTREF;
- if (!(cd9660_rrip_loop(isodir,&analyze,rrip_table_extref)&ISO_SUSP_EXTREF))
- return -1;
+ ret = cd9660_rrip_loop(isodir, &analyze, rrip_table_extref);
+ if ((ret & ISO_SUSP_EXTREF) == 0)
+ return (-1);
- return isonum_711(p->skip);
+ return (isonum_711(p->skip));
}

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 22, 9:00 PM (5 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29775753
Default Alt Text
D55865.diff (11 KB)

Event Timeline