Mercurial > illumos > illumos-gate
changeset 3603:1420c3b9fd96
6520712 DBoot complains about zero size conf files.
6520956 zmod is gone, so ZMOD_OBJS should go away, too
| author | smaybe |
|---|---|
| date | Tue, 06 Feb 2007 15:00:42 -0800 |
| parents | c482c5274168 |
| children | 66c3c8c384a6 |
| files | usr/src/common/fs/decompress.c usr/src/uts/common/Makefile.files |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/common/fs/decompress.c Tue Feb 06 13:55:56 2007 -0800 +++ b/usr/src/common/fs/decompress.c Tue Feb 06 15:00:42 2007 -0800 @@ -106,6 +106,12 @@ unsigned char *filebytes; z_stream *zsp; + /* + * If the file is not long enough to check for a decompression header + * then return not compressed. + */ + if (filep->fi_inode->i_size < 3) + return (0); filep->fi_offset = 0; if ((filep->fi_getblock)(filep) == -1) return (-1);
--- a/usr/src/uts/common/Makefile.files Tue Feb 06 13:55:56 2007 -0800 +++ b/usr/src/uts/common/Makefile.files Tue Feb 06 15:00:42 2007 -0800 @@ -1294,9 +1294,6 @@ CTF_OBJS += ctf_create.o ctf_decl.o ctf_error.o ctf_hash.o ctf_labels.o \ ctf_lookup.o ctf_open.o ctf_types.o ctf_util.o ctf_subr.o ctf_mod.o -ZMOD_OBJS += adler32.o infblock.o infcodes.o inffast.o inflate.o inftrees.o \ - infutil.o zutil.o zmod.o - SMBIOS_OBJS += smb_error.o smb_info.o smb_open.o smb_subr.o smb_dev.o RPCIB_OBJS += rpcib.o