directory.c (1ed161718a8f763130e6e349f2bbb1b764e6c5b3) directory.c (af793295bf9ee92660f5e77d337b0493cea3f9b9)
1/*
2 * directory.c
3 *
4 * PURPOSE
5 * Directory related functions
6 *
7 * COPYRIGHT
8 * This file is distributed under the terms of the GNU General Public

--- 81 unchanged lines hidden (view full) ---

90 (iinfo->i_efe ?
91 sizeof(struct extendedFileEntry) :
92 sizeof(struct fileEntry)),
93 dir->i_sb->s_blocksize,
94 &(fibh->eoffset));
95 if (!fi)
96 return NULL;
97
1/*
2 * directory.c
3 *
4 * PURPOSE
5 * Directory related functions
6 *
7 * COPYRIGHT
8 * This file is distributed under the terms of the GNU General Public

--- 81 unchanged lines hidden (view full) ---

90 (iinfo->i_efe ?
91 sizeof(struct extendedFileEntry) :
92 sizeof(struct fileEntry)),
93 dir->i_sb->s_blocksize,
94 &(fibh->eoffset));
95 if (!fi)
96 return NULL;
97
98 *nf_pos += ((fibh->eoffset - fibh->soffset) >> 2);
98 *nf_pos += fibh->eoffset - fibh->soffset;
99
100 memcpy((uint8_t *)cfi, (uint8_t *)fi,
101 sizeof(struct fileIdentDesc));
102
103 return fi;
104 }
105
106 if (fibh->eoffset == dir->i_sb->s_blocksize) {

--- 45 unchanged lines hidden (view full) ---

152 }
153
154 fi = udf_get_fileident(fibh->sbh->b_data, dir->i_sb->s_blocksize,
155 &(fibh->eoffset));
156
157 if (!fi)
158 return NULL;
159
99
100 memcpy((uint8_t *)cfi, (uint8_t *)fi,
101 sizeof(struct fileIdentDesc));
102
103 return fi;
104 }
105
106 if (fibh->eoffset == dir->i_sb->s_blocksize) {

--- 45 unchanged lines hidden (view full) ---

152 }
153
154 fi = udf_get_fileident(fibh->sbh->b_data, dir->i_sb->s_blocksize,
155 &(fibh->eoffset));
156
157 if (!fi)
158 return NULL;
159
160 *nf_pos += ((fibh->eoffset - fibh->soffset) >> 2);
160 *nf_pos += fibh->eoffset - fibh->soffset;
161
162 if (fibh->eoffset <= dir->i_sb->s_blocksize) {
163 memcpy((uint8_t *)cfi, (uint8_t *)fi,
164 sizeof(struct fileIdentDesc));
165 } else if (fibh->eoffset > dir->i_sb->s_blocksize) {
166 int lextoffset = epos->offset;
167
168 if (udf_next_aext(dir, epos, eloc, elen, 1) !=

--- 23 unchanged lines hidden (view full) ---

192 memcpy((uint8_t *)cfi - fibh->soffset,
193 fibh->ebh->b_data,
194 sizeof(struct fileIdentDesc) + fibh->soffset);
195
196 fi_len = (sizeof(struct fileIdentDesc) +
197 cfi->lengthFileIdent +
198 le16_to_cpu(cfi->lengthOfImpUse) + 3) & ~3;
199
161
162 if (fibh->eoffset <= dir->i_sb->s_blocksize) {
163 memcpy((uint8_t *)cfi, (uint8_t *)fi,
164 sizeof(struct fileIdentDesc));
165 } else if (fibh->eoffset > dir->i_sb->s_blocksize) {
166 int lextoffset = epos->offset;
167
168 if (udf_next_aext(dir, epos, eloc, elen, 1) !=

--- 23 unchanged lines hidden (view full) ---

192 memcpy((uint8_t *)cfi - fibh->soffset,
193 fibh->ebh->b_data,
194 sizeof(struct fileIdentDesc) + fibh->soffset);
195
196 fi_len = (sizeof(struct fileIdentDesc) +
197 cfi->lengthFileIdent +
198 le16_to_cpu(cfi->lengthOfImpUse) + 3) & ~3;
199
200 *nf_pos += (fi_len - (fibh->eoffset - fibh->soffset))
201 >> 2;
200 *nf_pos += fi_len - (fibh->eoffset - fibh->soffset);
202 fibh->eoffset = fibh->soffset + fi_len;
203 } else {
204 memcpy((uint8_t *)cfi, (uint8_t *)fi,
205 sizeof(struct fileIdentDesc));
206 }
207 }
208 return fi;
209}

--- 119 unchanged lines hidden --- 		201 fibh->eoffset = fibh->soffset + fi_len;
202 } else {
203 memcpy((uint8_t *)cfi, (uint8_t *)fi,
204 sizeof(struct fileIdentDesc));
205 }
206 }
207 return fi;
208}

--- 119 unchanged lines hidden ---