diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-06-15 12:09:35 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-06-15 12:09:35 +0000 |
| commit | da28b8a59d948d7cc69b1e5d53775d362eb772bc (patch) | |
| tree | b25fb7e87288605d04659e49641f274fe2ebb19c /usr/src/cmd/file/magic | |
| parent | aecb08e40876f4c921b2eafb54c43fd32677e5be (diff) | |
| parent | b30f02def0d29c7f2398666939cf35cf81f809f1 (diff) | |
| download | illumos-joyent-da28b8a59d948d7cc69b1e5d53775d362eb772bc.tar.gz | |
[illumos-gate merge]
commit b30f02def0d29c7f2398666939cf35cf81f809f1
12850 demangle(1) can trip up on names starting with underscore
commit 61de0de2b543856b77c5769b0d8981f58a7f26bd
12829 Add Zstandard to /etc/magic
commit f2fe7acaed48e65ea8626868085ea6e40a63b3a9
12763 ixgbe ufm support
commit a377495feb6d6c6a51d6cca4065a74f320f29a07
12762 topo should create per-device UFM entries by default
commit 44b0ba916e529fad7fa22597911db69ae8f24994
12761 i40e should only register ufm data on func 0
commit 8d55b80625b903a8ec6c560f6a38b5c16d1f5cfc
12759 Want ability to read ufm images
12758 ufm_detach doesn't properly clean up
12760 igb ufm support
12765 fwflash plugin cleanup handling is buggy
commit 1fa07ac719189ed3e8a0f8170264877c29bff62b
12848 Clarify bhyve's dual license
commit 154972aff898a787b38af3bab5b8d754b5a42447
12792 bhyve upstream sync 2020 May
commit 440a8a36792bdf9ef51639066aab0b7771ffcab8
12789 increase timers allowed per-process
commit 926d645fe2416b8ee611fc8ee4e28b7c7f9744dd
12531 storage: NULL pointer errors
Conflicts:
usr/src/test/os-tests/tests/Makefile
usr/src/test/os-tests/tests/timer/Makefile
usr/src/test/os-tests/tests/timer/timer_limit.c
usr/src/uts/common/os/timer.c
usr/src/uts/common/sys/timer.h
usr/src/uts/common/syscall/sysconfig.c
Diffstat (limited to 'usr/src/cmd/file/magic')
| -rw-r--r-- | usr/src/cmd/file/magic | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr/src/cmd/file/magic b/usr/src/cmd/file/magic index f6e945b8c3..84e2915162 100644 --- a/usr/src/cmd/file/magic +++ b/usr/src/cmd/file/magic @@ -1,5 +1,6 @@ # # Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2020 OmniOS Community Edition (OmniOSce) Association. # # CDDL HEADER START # @@ -422,7 +423,7 @@ >20 long 2 run-length byte encoded image >20 long 3 XRGB or RGB format image >20 long 4 tiff format image ->20 long 5 iff (TAAC format) image +>20 long 5 iff (TAAC format) image >20 long 0xffff experimental format image # little-endian rasterfile entries # cannot translate resolution stored as big-endian longs @@ -432,7 +433,7 @@ >23 long 2 run-length byte encoded image >23 long 3 XRGB or RGB format image >23 long 4 tiff format image ->23 long 5 iff (TAAC format) image +>23 long 5 iff (TAAC format) image >20 long 0xffff experimental format image 0 long 0x884f5053 Interleaf fast-saved document 0 long 0x2a535441 Aster*x @@ -463,7 +464,7 @@ 8 string ILBM IFF ILBM file 0 string \312\376\272\276 java class file 36 string acsp Kodak Color Management System, ICC Profile -0 string %PDF Adobe Portable Document Format (PDF) +0 string %PDF Adobe Portable Document Format (PDF) >4 string -1.0 v1.0 >4 string -1.1 v1.1 >4 string -1.2 v1.2 @@ -527,6 +528,7 @@ 0 string TZif zoneinfo timezone data file 0 string BZh bzip2 compressed data >3 byte >47 , block size = %c00k +0 ulong 0xfd2fb528 Zstandard compressed file 0 string SUNWcpch Sun C compiler precompiled header 0 string SUNWCpch Sun C++ compiler precompiled header 0 string \043\040PaCkAgE\040DaTaStReAm package datastream @@ -542,7 +544,7 @@ >6 byte x version %u >7 byte x .%u 0 byte 0x11 Solaris Audit File -0 byte 0x78 Solaris Audit File +0 byte 0x78 Solaris Audit File # ZFS send stream entries 8 ullong 0x00000002f5bacbac ZFS snapshot stream # little endian stream @@ -589,7 +591,7 @@ >2 byte 0 Verbatim, >5 ubyte x %u-D >7 ubyte x %u x ->9 ubyte x %u, +>9 ubyte x %u, >11 ubyte x %u channel(s) 2048 string PCD_IPI Kodak Photo CD image pack file |