anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Quick fix bug #4267.

Browse Source 
A real fix would be to ditch the home made file format detection and use libmagic.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40587 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2012-01-07 19:18:38 +00:00
parent d2f2148c90
commit 3dba00246c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/support/FileName.cpp
View File

@ -813,6 +813,9 @@ string FileName::guessFormatFromContents() const
// PKZIP // PKZIP
static string const zipStamp = "PK"; static string const zipStamp = "PK";
// ZIP containers (koffice, openoffice.org etc).
static string const nonzipStamp = "\008\0\0\0mimetypeapplication/";
// compress // compress
static string const compressStamp = "\037\235"; static string const compressStamp = "\037\235";
@ -840,7 +843,8 @@ string FileName::guessFormatFromContents() const
if (prefixIs(str, gzipStamp)) { if (prefixIs(str, gzipStamp)) {
format = "gzip"; format = "gzip";
} else if (stamp == zipStamp) { } else if (stamp == zipStamp &&
!contains(str, nonzipStamp)) {
format = "zip"; format = "zip";
} else if (stamp == compressStamp) { } else if (stamp == compressStamp) {