diff options
| -rw-r--r-- | doc/magic.man | 6 | ||||
| -rw-r--r-- | magic/Magdir/android | 4 | ||||
| -rw-r--r-- | magic/Magdir/archive | 4 | ||||
| -rw-r--r-- | magic/Magdir/bsi | 2 | ||||
| -rw-r--r-- | magic/Magdir/c-lang | 4 | ||||
| -rw-r--r-- | magic/Magdir/espressif | 4 | ||||
| -rw-r--r-- | magic/Magdir/icc | 4 | ||||
| -rw-r--r-- | magic/Magdir/windows | 10 | ||||
| -rwxr-xr-x | magic/scripts/create_filemagic_flac | 2 | ||||
| -rw-r--r-- | src/vasprintf.c | 4 |
10 files changed, 22 insertions, 22 deletions
diff --git a/doc/magic.man b/doc/magic.man index bc69604a..ed074adb 100644 --- a/doc/magic.man +++ b/doc/magic.man @@ -1,4 +1,4 @@ -.\" $File: magic.man,v 1.96 2019/01/21 14:56:53 christos Exp $ +.\" $File: magic.man,v 1.97 2019/11/15 21:03:14 christos Exp $ .Dd January 21, 2019 .Dt MAGIC __FSECTION__ .Os @@ -44,7 +44,7 @@ This offset can be a negative number if it is: The first direct offset of the magic entry (at continuation level 0), in which case it is interpreted an offset from end end of the file going backwards. -This works only when a file descriptor to the file is a available and it +This works only when a file descriptor to the file is available and it is a regular file. .It A continuation offset relative to the end of the last up-level field @@ -136,7 +136,7 @@ format. .It Dv date A four-byte value interpreted as a UNIX date. .It Dv qdate -A eight-byte value interpreted as a UNIX date. +An eight-byte value interpreted as a UNIX date. .It Dv ldate A four-byte value interpreted as a UNIX-style date, but interpreted as local time rather than UTC. diff --git a/magic/Magdir/android b/magic/Magdir/android index c1c7fa42..1265d959 100644 --- a/magic/Magdir/android +++ b/magic/Magdir/android @@ -1,6 +1,6 @@ #------------------------------------------------------------ -# $File: android,v 1.15 2019/07/07 22:39:36 christos Exp $ +# $File: android,v 1.16 2019/11/15 21:03:14 christos Exp $ # Various android related magic entries #------------------------------------------------------------ @@ -50,7 +50,7 @@ 0 string/b ANDROID\ BACKUP\n Android Backup # maybe look for some more characteristics like linefeed '\n' or version #>16 string \n -# No mime-type defined offically +# No mime-type defined officially !:mime application/x-google-ab !:ext ab # on 2nd line version (often 1, 2 on kitkat 4.4.3+, 4 on 7.1.2) diff --git a/magic/Magdir/archive b/magic/Magdir/archive index fdcaaa7c..6ec5b6d3 100644 --- a/magic/Magdir/archive +++ b/magic/Magdir/archive @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------ -# $File: archive,v 1.132 2019/08/10 13:39:44 christos Exp $ +# $File: archive,v 1.133 2019/11/15 21:03:14 christos Exp $ # archive: file(1) magic for archive formats (see also "msdos" for self- # extracting compressed archives) # @@ -263,7 +263,7 @@ # NL terminated original package length >>>>>&1 string x \b, unsplitted size %s # NL terminated part length ->>>>>>&1 string x \b, part lenght %s +>>>>>>&1 string x \b, part length %s # NL terminated package part like n/m >>>>>>>&1 string x \b, part %s # NL terminated package architecture like armhf since dpkg 1.16.1 or later diff --git a/magic/Magdir/bsi b/magic/Magdir/bsi index 51a62891..20a17d9c 100644 --- a/magic/Magdir/bsi +++ b/magic/Magdir/bsi @@ -1,4 +1,4 @@ -# Chiasmus is a encryption standard developed by the German Federal +# Chiasmus is an encryption standard developed by the German Federal # Office for Information Security (Bundesamt fuer Sicherheit in der # Informationstechnik). diff --git a/magic/Magdir/c-lang b/magic/Magdir/c-lang index becf6b02..9356e82e 100644 --- a/magic/Magdir/c-lang +++ b/magic/Magdir/c-lang @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------ -# $File: c-lang,v 1.27 2019/02/27 16:46:23 christos Exp $ +# $File: c-lang,v 1.28 2019/11/15 21:03:14 christos Exp $ # c-lang: file(1) magic for C and related languages programs # # The strength is to beat standard HTML @@ -11,7 +11,7 @@ !:mime text/x-bcpl # C -# Check for class if include is found, otherwise class is beaten by include becouse of lowered strength +# Check for class if include is found, otherwise class is beaten by include because of lowered strength 0 search/8192 #include >0 regex \^#include C >>0 regex \^class[[:space:]]+ diff --git a/magic/Magdir/espressif b/magic/Magdir/espressif index 72a0ec9b..7a8616a1 100644 --- a/magic/Magdir/espressif +++ b/magic/Magdir/espressif @@ -1,5 +1,5 @@ -# $File: espressif,v 1.1 2018/11/20 18:57:17 christos Exp $ +# $File: espressif,v 1.2 2019/11/15 21:03:14 christos Exp $ # configuration dump of Tasmota firmware for ESP8266 based devices by Espressif # URL: https://github.com/arendst/Sonoff-Tasmota/ # Reference: https://codeload.github.com/arendst/Sonoff-Tasmota/zip/release-6.2/ @@ -8,7 +8,7 @@ # # cfg_holder=4617=0x1209 0 uleshort 4617 -# remainig settings normally 0x5A+offset XORed; free_1D5[20] empty since 5.12.0e +# remaining settings normally 0x5A+offset XORed; free_1D5[20] empty since 5.12.0e >0x1D5 ubequad 0x2f30313233343536 configuration of Tasmota firmware (ESP8266) !:mime application/x-tasmota-dmp !:ext dmp diff --git a/magic/Magdir/icc b/magic/Magdir/icc index 55583b7b..a8b57864 100644 --- a/magic/Magdir/icc +++ b/magic/Magdir/icc @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: icc,v 1.5 2017/08/13 00:21:47 christos Exp $ +# $File: icc,v 1.6 2019/11/15 21:03:14 christos Exp $ # icc: file(1) magic for International Color Consortium file formats # @@ -54,7 +54,7 @@ !:mime application/vnd.iccprofile # for "ICM" extension only versions 2.x and for Kodak "CC" 2.0 is found >>>8 ubyte =2 -# do not use empty message text to a avoid error like +# do not use empty message text to avoid error like # icc, 82: Warning: Current entry does not yet have a description for adding a EXTENSION type # file.exe: could not find any valid magic files! >>>>9 ubyte !0 \ble diff --git a/magic/Magdir/windows b/magic/Magdir/windows index ea4d0d68..7657e073 100644 --- a/magic/Magdir/windows +++ b/magic/Magdir/windows @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: windows,v 1.27 2019/11/10 19:20:34 christos Exp $ +# $File: windows,v 1.28 2019/11/15 21:03:14 christos Exp $ # windows: file(1) magic for Microsoft Windows # # This file is mainly reserved for files where programs @@ -275,7 +275,7 @@ !:apple ????TEXT !:ext cnt # -# Windows creates an full text search from hlp file, if the user clicks the "Find" tab and enables keyword indexing +# Windows creates a full text search from hlp file, if the user clicks the "Find" tab and enables keyword indexing 0 string tfMR MS Windows help Full Text Search index !:mime application/x-winhelp-fts !:ext fts @@ -477,8 +477,8 @@ # https://en.wikipedia.org/wiki/CONFIG.SYS >>&0 regex/c \^(menu)] MS-DOS CONFIG.SYS # @CONFIG.UI configuration file of previous DOS version saved by Caldera OPENDOS INSTALL.EXE -# CONFIG.PSS saved version of file CONFIG.SYS created by %WINDIR%\SYTEM\MSCONFIG.EXE -# CONFIG.TSH renamed file CONFIG.SYS.BAT by %WINDIR%\SYTEM\MSCONFIG.EXE +# CONFIG.PSS saved version of file CONFIG.SYS created by %WINDIR%\SYSTEM\MSCONFIG.EXE +# CONFIG.TSH renamed file CONFIG.SYS.BAT by %WINDIR%\SYSTEM\MSCONFIG.EXE # dos and w40 used in dual booting scene !:ext sys/dos/w40 # https://support.microsoft.com/kb/118579/ @@ -757,7 +757,7 @@ >0x1c string >\0 \b%.7s # AppName[0x80] like "Minimal SYStem", ClamWin Free Antivirus , ... >0xc0 string x %s -# AppId[0x80] is simliar to AppName or +# AppId[0x80] is similar to AppName or # GUID like {4BB0DCDC-BC24-49EC-8937-72956C33A470} start with left brace >0x40 ubyte 0x7b >>0x40 string x %-.38s diff --git a/magic/scripts/create_filemagic_flac b/magic/scripts/create_filemagic_flac index 27303031..0ecfb172 100755 --- a/magic/scripts/create_filemagic_flac +++ b/magic/scripts/create_filemagic_flac @@ -53,7 +53,7 @@ for samplerate in "${samplerates[@]}"; do ## use bc with sed to convert and format Hz to kHz stripped_rate="$(LANG=C bc <<< "scale=5; ${samplerate} / 1000" | \ sed 's#[0\.]*$##g')" - ## only add uniq sample rates (should be neccessary + ## only add uniq sample rates (should be necessary if [[ ! "${stripped_rates[@]}" =~ ${stripped_rate} ]]; then printf -v line ">>17\tbelong&%#-15x\t%#08x\t%s, %s kHz\n" \ "16777200" \ diff --git a/src/vasprintf.c b/src/vasprintf.c index c87465bd..49d33d4a 100644 --- a/src/vasprintf.c +++ b/src/vasprintf.c @@ -96,7 +96,7 @@ the buffer can have a shorter length. But what? If you really need to write HUGE string, don't use printf! During the process, some other memory is allocated (1024 bytes minimum) to handle the output of partial sprintf() calls. If you have only 10000 bytes -free in memory, you *may* not be able to nprintf() a 8000 bytes-long text. +free in memory, you *may* not be able to nprintf() an 8000 bytes-long text. note: if a buffer overflow occurs, exit() is called. This situation should never appear ... but if you want to be *really* sure, you have to modify the @@ -108,7 +108,7 @@ you use strange formats. #include "file.h" #ifndef lint -FILE_RCSID("@(#)$File: vasprintf.c,v 1.16 2018/10/01 18:45:39 christos Exp $") +FILE_RCSID("@(#)$File: vasprintf.c,v 1.17 2019/11/15 21:03:14 christos Exp $") #endif /* lint */ #include <assert.h> |