diff options
| author | Christos Zoulas <christos@zoulas.com> | 2011-02-03 01:43:33 +0000 |
|---|---|---|
| committer | Christos Zoulas <christos@zoulas.com> | 2011-02-03 01:43:33 +0000 |
| commit | 701120ead33dad657da11532b3d4eac1ccce8aa0 (patch) | |
| tree | d913bba47372dc9128e4e36e784ec4263fa74635 /python/magic.py | |
| parent | 029556a8bcb053e9ff46bdb7e76ff7154f8a7db1 (diff) | |
| download | file-git-701120ead33dad657da11532b3d4eac1ccce8aa0.tar.gz | |
When matching softmagic for ascii files, don't just print
the softmagic classification, keep going and print the
text classification too. This fixes broken troff files when
we moved them from keyword recognition to softmagic
(they stopped printing "with CRLF" etc.)
Reported by Doug McIlroy.
Diffstat (limited to 'python/magic.py')
| -rw-r--r-- | python/magic.py | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/python/magic.py b/python/magic.py index 35a71825..41a42ee5 100644 --- a/python/magic.py +++ b/python/magic.py @@ -19,32 +19,32 @@ _libraries = {} _libraries['magic'] = _init() # Flag constants for open and setflags -NONE = 0 -DEBUG = 1 -SYMLINK = 2 -COMPRESS = 4 -DEVICES = 8 -MIME_TYPE = 16 -CONTINUE = 32 -CHECK = 64 -PRESERVE_ATIME = 128 -RAW = 256 -ERROR = 512 -MIME_ENCODING = 1024 -MIME = 1040 -APPLE = 2048 - -NO_CHECK_COMPRESS = 4096 -NO_CHECK_TAR = 8192 -NO_CHECK_SOFT = 16384 -NO_CHECK_APPTYPE = 32768 -NO_CHECK_ELF = 65536 -NO_CHECK_TEXT = 131072 -NO_CHECK_CDF = 262144 -NO_CHECK_TOKENS = 1048576 -NO_CHECK_ENCODING = 2097152 - -NO_CHECK_BUILTIN = 4173824 +MAGIC_NONE = NONE = 0 +MAGIC_DEBUG = DEBUG = 1 +MAGIC_SYMLINK = SYMLINK = 2 +MAGIC_COMPRESS = COMPRESS = 4 +MAGIC_DEVICES = DEVICES = 8 +MAGIC_MIME_TYPE = MIME_TYPE = 16 +MAGIC_CONTINUE = CONTINUE = 32 +MAGIC_CHECK = CHECK = 64 +MAGIC_PRESERVE_ATIME = PRESERVE_ATIME = 128 +MAGIC_RAW = RAW = 256 +MAGIC_ERROR = ERROR = 512 +MAGIC_MIME_ENCODING = MIME_ENCODING = 1024 +MAGIC_MIME = MIME = 1040 +MAGIC_APPLE = APPLE = 2048 + +MAGIC_NO_CHECK_COMPRESS = NO_CHECK_COMPRESS = 4096 +MAGIC_NO_CHECK_TAR = NO_CHECK_TAR = 8192 +MAGIC_NO_CHECK_SOFT = NO_CHECK_SOFT = 16384 +MAGIC_NO_CHECK_APPTYPE = NO_CHECK_APPTYPE = 32768 +MAGIC_NO_CHECK_ELF = NO_CHECK_ELF = 65536 +MAGIC_NO_CHECK_TEXT = NO_CHECK_TEXT = 131072 +MAGIC_NO_CHECK_CDF = NO_CHECK_CDF = 262144 +MAGIC_NO_CHECK_TOKENS = NO_CHECK_TOKENS = 1048576 +MAGIC_NO_CHECK_ENCODING = NO_CHECK_ENCODING = 2097152 + +MAGIC_NO_CHECK_BUILTIN = NO_CHECK_BUILTIN = 4173824 class magic_set(Structure): pass |