diff options
author | Rodney W. Grimes <rgrimes@FreeBSD.org> | 1995-05-30 08:16:23 +0000 |
---|---|---|
committer | Rodney W. Grimes <rgrimes@FreeBSD.org> | 1995-05-30 08:16:23 +0000 |
commit | 9b2e535452929d6f2f798a2c01b23b1f547a0b0f (patch) | |
tree | 176f04f674860c7cfae9ac5d2ff4d4e1d73cb2b7 /sys/isofs/cd9660/cd9660_rrip.c | |
parent | 44204187ec133a0ab7bd77c8d974ad5afd4d88b4 (diff) | |
download | src-9b2e535452929d6f2f798a2c01b23b1f547a0b0f.tar.gz src-9b2e535452929d6f2f798a2c01b23b1f547a0b0f.zip |
Remove trailing whitespace.
Notes
Notes:
svn path=/head/; revision=8876
Diffstat (limited to 'sys/isofs/cd9660/cd9660_rrip.c')
-rw-r--r-- | sys/isofs/cd9660/cd9660_rrip.c | 122 |
1 files changed, 61 insertions, 61 deletions
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c index 87767ea2d1c2..dca898301697 100644 --- a/sys/isofs/cd9660/cd9660_rrip.c +++ b/sys/isofs/cd9660/cd9660_rrip.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_rrip.c 8.2 (Berkeley) 1/23/94 - * $Id: cd9660_rrip.c,v 1.5 1994/09/26 00:32:57 gpalmer Exp $ + * $Id: cd9660_rrip.c,v 1.6 1995/01/16 17:03:26 joerg Exp $ */ #include <sys/param.h> @@ -95,13 +95,13 @@ cd9660_rrip_slink(p,ana) register ISO_RRIP_SLINK_COMPONENT *pcompe; int len, wlen, cont; char *outbuf, *inbuf; - + pcomp = (ISO_RRIP_SLINK_COMPONENT *)p->component; pcompe = (ISO_RRIP_SLINK_COMPONENT *)((char *)p + isonum_711(p->h.length)); len = *ana->outlen; outbuf = ana->outbuf; cont = ana->cont; - + /* * Gathering a Symbolic name from each component with path */ @@ -109,7 +109,7 @@ cd9660_rrip_slink(p,ana) pcomp < pcompe; pcomp = (ISO_RRIP_SLINK_COMPONENT *)((char *)pcomp + ISO_RRIP_SLSIZ + isonum_711(pcomp->clen))) { - + if (!cont) { if (len < ana->maxlen) { len++; @@ -117,29 +117,29 @@ cd9660_rrip_slink(p,ana) } } cont = 0; - + inbuf = ".."; wlen = 0; - + switch (*pcomp->cflag) { - + case ISO_SUSP_CFLAG_CURRENT: /* Inserting Current */ wlen = 1; break; - + case ISO_SUSP_CFLAG_PARENT: /* Inserting Parent */ wlen = 2; break; - + case ISO_SUSP_CFLAG_ROOT: /* Inserting slash for ROOT */ /* start over from beginning(?) */ outbuf -= len; len = 0; break; - + case ISO_SUSP_CFLAG_VOLROOT: /* Inserting a mount point i.e. "/cdrom" */ /* same as above */ @@ -148,13 +148,13 @@ cd9660_rrip_slink(p,ana) inbuf = ana->imp->im_mountp->mnt_stat.f_mntonname; wlen = strlen(inbuf); break; - + case ISO_SUSP_CFLAG_HOST: /* Inserting hostname i.e. "kurt.tools.de" */ inbuf = hostname; wlen = hostnamelen; break; - + case ISO_SUSP_CFLAG_CONTINUE: cont = 1; /* fall thru */ @@ -168,7 +168,7 @@ cd9660_rrip_slink(p,ana) wlen = ana->maxlen + 1; break; } - + if (len + wlen > ana->maxlen) { /* indicate error to caller */ ana->cont = 1; @@ -177,16 +177,16 @@ cd9660_rrip_slink(p,ana) *ana->outlen = 0; return 0; } - + bcopy(inbuf,outbuf,wlen); outbuf += wlen; len += wlen; - + } ana->outbuf = outbuf; *ana->outlen = len; ana->cont = cont; - + if (!isonum_711(p->flags)) { ana->fields &= ~ISO_SUSP_SLINK; return ISO_SUSP_SLINK; @@ -205,28 +205,28 @@ cd9660_rrip_altname(p,ana) char *inbuf; int wlen; int cont; - + inbuf = ".."; wlen = 0; cont = 0; - + switch (*p->flags) { case ISO_SUSP_CFLAG_CURRENT: /* Inserting Current */ wlen = 1; break; - + case ISO_SUSP_CFLAG_PARENT: /* Inserting Parent */ wlen = 2; break; - + case ISO_SUSP_CFLAG_HOST: /* Inserting hostname i.e. "kurt.tools.de" */ inbuf = hostname; wlen = hostnamelen; break; - + case ISO_SUSP_CFLAG_CONTINUE: cont = 1; /* fall thru */ @@ -235,13 +235,13 @@ cd9660_rrip_altname(p,ana) wlen = isonum_711(p->h.length) - 5; inbuf = (char *)p + 5; break; - + default: printf("RRIP with incorrect NM flags?\n"); wlen = ana->maxlen + 1; break; } - + if ((*ana->outlen += wlen) > ana->maxlen) { /* treat as no name field */ ana->fields &= ~ISO_SUSP_ALTNAME; @@ -249,10 +249,10 @@ cd9660_rrip_altname(p,ana) *ana->outlen = 0; return 0; } - + bcopy(inbuf,ana->outbuf,wlen); ana->outbuf += wlen; - + if (!cont) { ana->fields &= ~ISO_SUSP_ALTNAME; return ISO_SUSP_ALTNAME; @@ -314,55 +314,55 @@ cd9660_rrip_tstamp(p,ana) ISO_RRIP_ANALYZE *ana; { unsigned char *ptime; - + 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) ptime += 7; - + if (*p->flags&ISO_SUSP_TSTAMP_MODIFY) { cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_mtime, ISO_FTYPE_RRIP); ptime += 7; } else bzero(&ana->inop->inode.iso_mtime,sizeof(struct timespec)); - + if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) { cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_atime, ISO_FTYPE_RRIP); ptime += 7; } 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 ana->inop->inode.iso_ctime = ana->inop->inode.iso_mtime; - + } else { 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); ptime += 17; } else bzero(&ana->inop->inode.iso_mtime,sizeof(struct timespec)); - + if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) { cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_atime); ptime += 17; } 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 ana->inop->inode.iso_ctime = ana->inop->inode.iso_mtime; - + } ana->fields &= ~ISO_SUSP_TSTAMP; return ISO_SUSP_TSTAMP; @@ -385,10 +385,10 @@ cd9660_rrip_device(p,ana) ISO_RRIP_ANALYZE *ana; { unsigned high, low; - + high = isonum_733(p->dev_t_high_l); low = isonum_733(p->dev_t_low_l); - + if ( high == 0 ) { ana->inop->inode.iso_rdev = makedev( major(low), minor(low) ); } else { @@ -410,7 +410,7 @@ cd9660_rrip_idflag(p,ana) /* special handling of RE field */ if (ana->fields&ISO_SUSP_RELDIR) return cd9660_rrip_reldir(p,ana); - + return ISO_SUSP_IDFLAG; } @@ -476,7 +476,7 @@ cd9660_rrip_loop(isodir,ana,table) struct buf *bp = NULL; char *pwhead; int result; - + /* * Note: If name length is odd, * it will be padding 1 byte after the name @@ -484,23 +484,23 @@ cd9660_rrip_loop(isodir,ana,table) pwhead = isodir->name + isonum_711(isodir->name_len); if (!(isonum_711(isodir->name_len)&1)) pwhead++; - + /* If it's not the '.' entry of the root dir obey SP field */ if (*isodir->name != 0 || isonum_733(isodir->extent) != ana->imp->root_extent) pwhead += ana->imp->rr_skip; else pwhead += ana->imp->rr_skip0; - + phead = (ISO_SUSP_HEADER *)pwhead; pend = (ISO_SUSP_HEADER *)((char *)isodir + isonum_711(isodir->length)); - + result = 0; while (1) { ana->iso_ce_len = 0; /* * Note: "pend" should be more than one SUSP header - */ + */ while (pend >= phead + 1) { if (isonum_711(phead->version) == 1) { for (ptable = table; ptable->func; ptable++) { @@ -519,7 +519,7 @@ cd9660_rrip_loop(isodir,ana,table) */ phead = (ISO_SUSP_HEADER *)((char *)phead + isonum_711(phead->length)); } - + if ( ana->fields && ana->iso_ce_len ) { if (ana->iso_ce_blk >= ana->imp->volume_space_size || ana->iso_ce_off + ana->iso_ce_len > ana->imp->logical_block_size @@ -542,7 +542,7 @@ cd9660_rrip_loop(isodir,ana,table) for (ptable = table; ptable->func2; ptable++) if (!(ptable->result&result)) ptable->func2(isodir,ana); - + return result; } @@ -563,17 +563,17 @@ cd9660_rrip_analyze(isodir,inop,imp) struct iso_mnt *imp; { ISO_RRIP_ANALYZE analyze; - + analyze.inop = inop; analyze.imp = imp; analyze.fields = ISO_SUSP_ATTR|ISO_SUSP_TSTAMP|ISO_SUSP_DEVICE; - + return cd9660_rrip_loop(isodir,&analyze,rrip_table_analyze); } -/* - * Get Alternate Name from 'AL' record - * If either no AL record or 0 length, +/* + * Get Alternate Name from 'AL' record + * If either no AL record or 0 length, * it will be return the translated ISO9660 name, */ static RRIP_TABLE rrip_table_getname[] = { @@ -597,7 +597,7 @@ cd9660_rrip_getname(isodir,outbuf,outlen,inump,imp) { ISO_RRIP_ANALYZE analyze; RRIP_TABLE *tab; - + analyze.outbuf = outbuf; analyze.outlen = outlen; analyze.maxlen = NAME_MAX; @@ -605,21 +605,21 @@ cd9660_rrip_getname(isodir,outbuf,outlen,inump,imp) analyze.imp = imp; analyze.fields = ISO_SUSP_ALTNAME|ISO_SUSP_RELDIR|ISO_SUSP_CLINK|ISO_SUSP_PLINK; *outlen = 0; - + tab = rrip_table_getname; if (*isodir->name == 0 || *isodir->name == 1) { cd9660_rrip_defname(isodir,&analyze); - + analyze.fields &= ~ISO_SUSP_ALTNAME; tab++; } - + return cd9660_rrip_loop(isodir,&analyze,tab); } -/* - * Get Symbolic Name from 'SL' record +/* + * Get Symbolic Name from 'SL' record * * Note: isodir should contains SL record! */ @@ -639,7 +639,7 @@ cd9660_rrip_getsymname(isodir,outbuf,outlen,imp) struct iso_mnt *imp; { ISO_RRIP_ANALYZE analyze; - + analyze.outbuf = outbuf; analyze.outlen = outlen; *outlen = 0; @@ -647,7 +647,7 @@ cd9660_rrip_getsymname(isodir,outbuf,outlen,imp) analyze.cont = 1; /* don't start with a slash */ analyze.imp = imp; analyze.fields = ISO_SUSP_SLINK; - + return (cd9660_rrip_loop(isodir,&analyze,rrip_table_getsymname)&ISO_SUSP_SLINK); } @@ -669,7 +669,7 @@ cd9660_rrip_offset(isodir,imp) { ISO_RRIP_OFFSET *p; ISO_RRIP_ANALYZE analyze; - + imp->rr_skip0 = 0; p = (ISO_RRIP_OFFSET *)(isodir->name + 1); if (bcmp(p,"SP\7\1\276\357",6)) { @@ -679,11 +679,11 @@ cd9660_rrip_offset(isodir,imp) if (bcmp(p,"SP\7\1\276\357",6)) return -1; } - + analyze.imp = imp; analyze.fields = ISO_SUSP_EXTREF; if (!(cd9660_rrip_loop(isodir,&analyze,rrip_table_extref)&ISO_SUSP_EXTREF)) return -1; - + return isonum_711(p->skip); } |