diff options
| author | grehan <grehan@FreeBSD.org> | 2011-06-28 06:26:03 +0000 |
|---|---|---|
| committer | grehan <grehan@FreeBSD.org> | 2011-06-28 06:26:03 +0000 |
| commit | 2c6741be0f59191f2283eb268e4f7690399d578a (patch) | |
| tree | b139c8c6dcca4fa284815daade405b75886ee360 /usr.sbin/makefs/cd9660/cd9660_write.c | |
| parent | 3c35264f695e0a1f8a04dbcca1c93bb5159b2274 (diff) | |
| parent | 19ae02bba572390c7299166228d31e54003e094a (diff) | |
| download | FreeBSD-src-2c6741be0f59191f2283eb268e4f7690399d578a.zip FreeBSD-src-2c6741be0f59191f2283eb268e4f7690399d578a.tar.gz | |
IFC @ r222830
Diffstat (limited to 'usr.sbin/makefs/cd9660/cd9660_write.c')
| -rw-r--r-- | usr.sbin/makefs/cd9660/cd9660_write.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/makefs/cd9660/cd9660_write.c b/usr.sbin/makefs/cd9660/cd9660_write.c index 46d4a34..4622701 100644 --- a/usr.sbin/makefs/cd9660/cd9660_write.c +++ b/usr.sbin/makefs/cd9660/cd9660_write.c @@ -294,10 +294,12 @@ cd9660_write_file(FILE *fd, cd9660node *writenode) INODE_WARNX(("%s: writing inode %d blocks at %" PRIu32, __func__, (int)inode->st.st_ino, inode->ino)); inode->flags |= FI_WRITTEN; - cd9660_compute_full_filename(writenode, - temp_file_name, 0); + if (writenode->node->contents == NULL) + cd9660_compute_full_filename(writenode, + temp_file_name, 0); ret = cd9660_copy_file(fd, writenode->fileDataSector, - temp_file_name); + (writenode->node->contents != NULL) ? + writenode->node->contents : temp_file_name); if (ret == 0) goto out; } |
