summaryrefslogtreecommitdiff
path: root/usr.bin/file/magdir
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2015-10-05 22:48:27 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2015-10-05 22:48:27 +0000
commit5f8656e4a4ad80b84fbb149e113d9ebfc38d484c (patch)
tree5a1162b81db57cbbc8260574dad03df9e2cebd19 /usr.bin/file/magdir
parent44b538ba0a54f11b2bf27f4da51f2f204226cf11 (diff)
Very trivial changes from file 5.x: spelling mistakes, %ld->%d and some
style nits.
Diffstat (limited to 'usr.bin/file/magdir')
-rw-r--r--usr.bin/file/magdir/att3b10
-rw-r--r--usr.bin/file/magdir/bflt4
-rw-r--r--usr.bin/file/magdir/blender4
-rw-r--r--usr.bin/file/magdir/bout4
-rw-r--r--usr.bin/file/magdir/cddb4
-rw-r--r--usr.bin/file/magdir/clarion4
-rw-r--r--usr.bin/file/magdir/clipper6
-rw-r--r--usr.bin/file/magdir/efi4
-rw-r--r--usr.bin/file/magdir/encore6
-rw-r--r--usr.bin/file/magdir/ibm37010
-rw-r--r--usr.bin/file/magdir/inform4
-rw-r--r--usr.bin/file/magdir/karma4
-rw-r--r--usr.bin/file/magdir/natinst6
-rw-r--r--usr.bin/file/magdir/ocaml6
-rw-r--r--usr.bin/file/magdir/os94
-rw-r--r--usr.bin/file/magdir/osf13
-rw-r--r--usr.bin/file/magdir/securitycerts3
-rw-r--r--usr.bin/file/magdir/sharc4
-rw-r--r--usr.bin/file/magdir/smalltalk3
-rw-r--r--usr.bin/file/magdir/ti-8x6
-rw-r--r--usr.bin/file/magdir/tuxedo3
-rw-r--r--usr.bin/file/magdir/vmware4
22 files changed, 53 insertions, 53 deletions
diff --git a/usr.bin/file/magdir/att3b b/usr.bin/file/magdir/att3b
index 70985504fbf..466fcb5bccb 100644
--- a/usr.bin/file/magdir/att3b
+++ b/usr.bin/file/magdir/att3b
@@ -1,4 +1,4 @@
-# $OpenBSD: att3b,v 1.2 2004/06/03 03:14:19 tedu Exp $
+# $OpenBSD: att3b,v 1.3 2015/10/05 22:48:26 nicm Exp $
#------------------------------------------------------------------------------
# att3b: file(1) magic for AT&T 3B machines
@@ -11,10 +11,10 @@
# The 3B20 conflicts with SCCS.
#0 beshort 0550 3b20 COFF executable
#>12 belong >0 not stripped
-#>22 beshort >0 - version %ld
+#>22 beshort >0 - version %d
#0 beshort 0551 3b20 COFF executable (TV)
#>12 belong >0 not stripped
-#>22 beshort >0 - version %ld
+#>22 beshort >0 - version %d
#
# WE32K
#
@@ -29,12 +29,12 @@
>20 beshort 0410 (pure)
>20 beshort 0413 (demand paged)
>20 beshort 0443 (target shared library)
->22 beshort >0 - version %ld
+>22 beshort >0 - version %d
0 beshort 0561 WE32000 COFF executable (TV)
>12 belong >0 not stripped
#>18 beshort &00020000 - 32100 required
#>18 beshort &00040000 and MAU hardware required
-#>22 beshort >0 - version %ld
+#>22 beshort >0 - version %d
#
# core file for 3b2
0 string \000\004\036\212\200 3b2 core file
diff --git a/usr.bin/file/magdir/bflt b/usr.bin/file/magdir/bflt
index 62ece04f88e..528925dfe09 100644
--- a/usr.bin/file/magdir/bflt
+++ b/usr.bin/file/magdir/bflt
@@ -1,4 +1,4 @@
-# $OpenBSD: bflt,v 1.2 2008/05/14 20:45:35 chl Exp $
+# $OpenBSD: bflt,v 1.3 2015/10/05 22:48:26 nicm Exp $
#------------------------------------------------------------------------------
# bFLT: file(1) magic for BFLT uclinux binary files
@@ -6,7 +6,7 @@
# From Philippe De Muyter <phdm@macqel.be>
#
0 string bFLT BFLT executable
->4 belong x - version %ld
+>4 belong x - version %d
>4 belong 4
>>36 belong&0x1 0x1 ram
>>36 belong&0x2 0x2 gotpic
diff --git a/usr.bin/file/magdir/blender b/usr.bin/file/magdir/blender
index a78af50bb3d..12dde6b8351 100644
--- a/usr.bin/file/magdir/blender
+++ b/usr.bin/file/magdir/blender
@@ -1,4 +1,4 @@
-# $OpenBSD: blender,v 1.2 2009/04/24 18:54:34 chl Exp $
+# $OpenBSD: blender,v 1.3 2015/10/05 22:48:26 nicm Exp $
#------------------------------------------------------------------------------
# blender: file(1) magic for Blender 3D related files
@@ -35,5 +35,5 @@
>>>0x44 string =GLOB \b.
>>>>0x60 beshort x \b%.4d
-# Scripts that run in the embeded Python interpreter
+# Scripts that run in the embedded Python interpreter
0 string #!BPY Blender3D BPython script
diff --git a/usr.bin/file/magdir/bout b/usr.bin/file/magdir/bout
index 80652d98def..898aaaf1c25 100644
--- a/usr.bin/file/magdir/bout
+++ b/usr.bin/file/magdir/bout
@@ -1,6 +1,6 @@
-# $OpenBSD: bout,v 1.3 2008/05/08 01:40:57 chl Exp $
+# $OpenBSD: bout,v 1.4 2015/10/05 22:48:26 nicm Exp $
-#
+#------------------------------------------------------------------------------
# i80960 b.out objects and archives
#
0 long 0x10d i960 b.out relocatable object
diff --git a/usr.bin/file/magdir/cddb b/usr.bin/file/magdir/cddb
index 17084c7a861..500c4748173 100644
--- a/usr.bin/file/magdir/cddb
+++ b/usr.bin/file/magdir/cddb
@@ -1,4 +1,4 @@
-# $OpenBSD: cddb,v 1.2 2009/04/24 18:54:34 chl Exp $
+# $OpenBSD: cddb,v 1.3 2015/10/05 22:48:26 nicm Exp $
#------------------------------------------------------------------------------
# CDDB: file(1) magic for CDDB(tm) format CD text data files
@@ -9,4 +9,4 @@
# CDDB-enabled CD player applications.
#
-0 search/1/b #\040xmcd CDDB(tm) format CD text data
+0 search/1/w #\040xmcd CDDB(tm) format CD text data
diff --git a/usr.bin/file/magdir/clarion b/usr.bin/file/magdir/clarion
index 21cc2261d70..1eb3018c6be 100644
--- a/usr.bin/file/magdir/clarion
+++ b/usr.bin/file/magdir/clarion
@@ -1,4 +1,4 @@
-# $OpenBSD: clarion,v 1.2 2009/04/26 14:17:45 chl Exp $
+# $OpenBSD: clarion,v 1.3 2015/10/05 22:48:26 nicm Exp $
#------------------------------------------------------------------------------
# clarion: file(1) magic for # Clarion Personal/Professional Developer
@@ -15,7 +15,7 @@
>2 leshort &0x0010 \b, compressed
>2 leshort &0x0040 \b, read only
# number of records
->5 lelong x \b, %ld records
+>5 lelong x \b, %d records
# Memo files
0 leshort 0x334d Clarion Developer (v2 and above) memo data
diff --git a/usr.bin/file/magdir/clipper b/usr.bin/file/magdir/clipper
index b218446e9f1..c85fb353d8c 100644
--- a/usr.bin/file/magdir/clipper
+++ b/usr.bin/file/magdir/clipper
@@ -1,4 +1,4 @@
-# $OpenBSD: clipper,v 1.2 2004/06/03 03:14:19 tedu Exp $
+# $OpenBSD: clipper,v 1.3 2015/10/05 22:48:26 nicm Exp $
#------------------------------------------------------------------------------
# clipper: file(1) magic for Intergraph (formerly Fairchild) Clipper.
@@ -35,7 +35,7 @@
>20 short 0413 (demand paged)
>20 short 0443 (target shared library)
>12 long >0 not stripped
->22 short >0 - version %ld
+>22 short >0 - version %d
0 short 0577 CLIPPER COFF executable
>18 short&074000 000000 C1 R1
>18 short&074000 004000 C2 R1
@@ -47,7 +47,7 @@
>20 short 0413 (paged)
>20 short 0443 (target shared library)
>12 long >0 not stripped
->22 short >0 - version %ld
+>22 short >0 - version %d
>48 long&01 01 alignment trap enabled
>52 byte 1 -Ctnc
>52 byte 2 -Ctsw
diff --git a/usr.bin/file/magdir/efi b/usr.bin/file/magdir/efi
index 1290d9873ae..081ea5dc706 100644
--- a/usr.bin/file/magdir/efi
+++ b/usr.bin/file/magdir/efi
@@ -1,4 +1,4 @@
-# $OpenBSD: efi,v 1.2 2009/04/26 14:17:45 chl Exp $
+# $OpenBSD: efi,v 1.3 2015/10/05 22:48:26 nicm Exp $
#------------------------------------------------------------------------------
# efi: file(1) magic for Universal EFI binaries
@@ -12,4 +12,4 @@
>>&0 lelong 0x01000007 \b, x86_64
>>&20 lelong 7 \b, i386
>>&20 lelong 0x01000007 \b, x86_64
->4 lelong >2 Universal EFI binary with %ld architectures
+>4 lelong >2 Universal EFI binary with %d architectures
diff --git a/usr.bin/file/magdir/encore b/usr.bin/file/magdir/encore
index 8186e36f634..13eb1e1127a 100644
--- a/usr.bin/file/magdir/encore
+++ b/usr.bin/file/magdir/encore
@@ -1,4 +1,4 @@
-# $OpenBSD: encore,v 1.2 2004/06/03 03:14:20 tedu Exp $
+# $OpenBSD: encore,v 1.3 2015/10/05 22:48:26 nicm Exp $
#------------------------------------------------------------------------------
# encore: file(1) magic for Encore machines
@@ -12,11 +12,11 @@
>20 short 0x10b demand-paged executable
>20 short 0x10f unsupported executable
>12 long >0 not stripped
->22 short >0 - version %ld
+>22 short >0 - version %d
>22 short 0 -
#>4 date x stamp %s
0 short 0x155 Encore unsupported executable
>12 long >0 not stripped
->22 short >0 - version %ld
+>22 short >0 - version %d
>22 short 0 -
#>4 date x stamp %s
diff --git a/usr.bin/file/magdir/ibm370 b/usr.bin/file/magdir/ibm370
index c160ef642ca..f6ae2b819de 100644
--- a/usr.bin/file/magdir/ibm370
+++ b/usr.bin/file/magdir/ibm370
@@ -1,4 +1,4 @@
-# $OpenBSD: ibm370,v 1.4 2004/06/03 03:14:20 tedu Exp $
+# $OpenBSD: ibm370,v 1.5 2015/10/05 22:48:26 nicm Exp $
#------------------------------------------------------------------------------
# ibm370: file(1) magic for IBM 370 and compatibles.
@@ -36,13 +36,13 @@
>12 belong >0 not stripped
0 beshort 0531 SVR2 executable (Amdahl-UTS)
>12 belong >0 not stripped
->24 belong >0 - version %ld
+>24 belong >0 - version %d
0 beshort 0534 SVR2 pure executable (Amdahl-UTS)
>12 belong >0 not stripped
->24 belong >0 - version %ld
+>24 belong >0 - version %d
0 beshort 0530 SVR2 pure executable (USS/370)
>12 belong >0 not stripped
->24 belong >0 - version %ld
+>24 belong >0 - version %d
0 beshort 0535 SVR2 executable (USS/370)
>12 belong >0 not stripped
->24 belong >0 - version %ld
+>24 belong >0 - version %d
diff --git a/usr.bin/file/magdir/inform b/usr.bin/file/magdir/inform
index 48ea85bdb33..281def83a22 100644
--- a/usr.bin/file/magdir/inform
+++ b/usr.bin/file/magdir/inform
@@ -1,4 +1,4 @@
-# $OpenBSD: inform,v 1.3 2015/04/24 16:24:42 nicm Exp $
+# $OpenBSD: inform,v 1.4 2015/10/05 22:48:26 nicm Exp $
#------------------------------------------------------------------------------
# inform: file(1) magic for Inform interactive fiction language
@@ -6,4 +6,4 @@
# URL: http://www.inform-fiction.org/
# From: Reuben Thomas <rrt@sc3d.org>
-0 search/100/cB constant\ story Inform source text
+0 search/100/cW constant\ story Inform source text
diff --git a/usr.bin/file/magdir/karma b/usr.bin/file/magdir/karma
index 4a39844142b..163feed7b13 100644
--- a/usr.bin/file/magdir/karma
+++ b/usr.bin/file/magdir/karma
@@ -1,4 +1,4 @@
-# $OpenBSD: karma,v 1.4 2004/06/03 03:14:20 tedu Exp $
+# $OpenBSD: karma,v 1.5 2015/10/05 22:48:26 nicm Exp $
#------------------------------------------------------------------------------
# karma: file(1) magic for Karma data files
@@ -6,4 +6,4 @@
# From <rgooch@atnf.csiro.au>
0 string KarmaRHD Version Karma Data Structure Version
->16 belong x %lu
+>16 belong x %u
diff --git a/usr.bin/file/magdir/natinst b/usr.bin/file/magdir/natinst
index 913b332d9a1..da49b0c77f0 100644
--- a/usr.bin/file/magdir/natinst
+++ b/usr.bin/file/magdir/natinst
@@ -1,10 +1,10 @@
-# $OpenBSD: natinst,v 1.1 2004/06/03 03:14:20 tedu Exp $
+# $OpenBSD: natinst,v 1.2 2015/10/05 22:48:26 nicm Exp $
#-----------------------------------------------------------------------------
# natinst: file(1) magic for National Instruments Code Files
#
-# From <egamez@fcfm.buap.mx> Enrique Gámez-Flores
+# From <egamez@fcfm.buap.mx> Enrique Gamez-Flores
# version 1
# Many formats still missing, we use, for the moment LabVIEW
# We guess VXI format file. VISA, LabWindowsCVI, BridgeVIEW, etc, are missing
@@ -12,7 +12,7 @@
0 string RSRC National Instruments,
# Check if it's a LabVIEW File
>8 string LV LabVIEW File,
-# Check wich kind of file is
+# Check which kind of file it is
>>10 string SB Code Resource File, data
>>10 string IN Virtual Instrument Program, data
>>10 string AR VI Library, data
diff --git a/usr.bin/file/magdir/ocaml b/usr.bin/file/magdir/ocaml
index 9f135a1192d..c7e52987dd4 100644
--- a/usr.bin/file/magdir/ocaml
+++ b/usr.bin/file/magdir/ocaml
@@ -1,8 +1,8 @@
-# $OpenBSD: ocaml,v 1.1 2004/06/03 03:14:20 tedu Exp $
+# $OpenBSD: ocaml,v 1.2 2015/10/05 22:48:26 nicm Exp $
#------------------------------------------------------------------------------
# ocaml: file(1) magic for Objective Caml files.
-0 string Caml1999 Objective caml
+0 string Caml1999 OCaml
>8 string X exec file
>8 string I interface file (.cmi)
>8 string O object file (.cmo)
@@ -11,4 +11,4 @@
>8 string Z native library file (.cmxa)
>8 string M abstract syntax tree implementation file
>8 string N abstract syntax tree interface file
->9 string >\0 (Version %3.3s).
+>9 string >\0 (Version %3.3s)
diff --git a/usr.bin/file/magdir/os9 b/usr.bin/file/magdir/os9
index c48a65fd9a7..41beb3779e5 100644
--- a/usr.bin/file/magdir/os9
+++ b/usr.bin/file/magdir/os9
@@ -1,6 +1,6 @@
-# $OpenBSD: os9,v 1.5 2011/10/15 14:23:29 schwarze Exp $
+# $OpenBSD: os9,v 1.6 2015/10/05 22:48:26 nicm Exp $
-# $NetBSD: os9,v 1.1 1996/05/06 18:24:01 is Exp $
+#------------------------------------------------------------------------------
#
# Copyright (c) 1996 Ignatios Souvatzis. All rights reserved.
#
diff --git a/usr.bin/file/magdir/osf1 b/usr.bin/file/magdir/osf1
index 24d5d0e07aa..fa2bef32dcb 100644
--- a/usr.bin/file/magdir/osf1
+++ b/usr.bin/file/magdir/osf1
@@ -1,5 +1,6 @@
-# $OpenBSD: osf1,v 1.2 2001/01/29 01:57:57 niklas Exp $
+# $OpenBSD: osf1,v 1.3 2015/10/05 22:48:26 nicm Exp $
+#------------------------------------------------------------------------------
#
# Mach magic number info
#
diff --git a/usr.bin/file/magdir/securitycerts b/usr.bin/file/magdir/securitycerts
index ec43ee71052..54b350477ae 100644
--- a/usr.bin/file/magdir/securitycerts
+++ b/usr.bin/file/magdir/securitycerts
@@ -1,5 +1,6 @@
-# $OpenBSD: securitycerts,v 1.2 2009/04/26 14:17:45 chl Exp $
+# $OpenBSD: securitycerts,v 1.3 2015/10/05 22:48:26 nicm Exp $
+#------------------------------------------------------------------------------
0 search/1 -----BEGIN\ CERTIFICATE------ RFC1421 Security Certificate text
0 search/1 -----BEGIN\ NEW\ CERTIFICATE RFC1421 Security Certificate Signing Request text
0 belong 0xedfeedfe Sun 'jks' Java Keystore File data
diff --git a/usr.bin/file/magdir/sharc b/usr.bin/file/magdir/sharc
index efb736d0682..5653f43ff04 100644
--- a/usr.bin/file/magdir/sharc
+++ b/usr.bin/file/magdir/sharc
@@ -1,4 +1,4 @@
-# $OpenBSD: sharc,v 1.3 2009/04/24 18:54:34 chl Exp $
+# $OpenBSD: sharc,v 1.4 2015/10/05 22:48:26 nicm Exp $
#------------------------------------------------------------------------
# file(1) magic for sharc files
@@ -19,5 +19,5 @@
0 string .system SHARC architecture file
0 leshort 0x521C SHARC COFF binary
->2 leshort >1 , %hd sections
+>2 leshort >1 , %d sections
>>12 lelong >0 , not stripped
diff --git a/usr.bin/file/magdir/smalltalk b/usr.bin/file/magdir/smalltalk
index 1d360197adf..a15eeaef549 100644
--- a/usr.bin/file/magdir/smalltalk
+++ b/usr.bin/file/magdir/smalltalk
@@ -1,4 +1,4 @@
-# $OpenBSD: smalltalk,v 1.1 2004/06/03 03:14:20 tedu Exp $
+# $OpenBSD: smalltalk,v 1.2 2015/10/05 22:48:26 nicm Exp $
#-----------------------------------------------
# GNU Smalltalk image, starting at version 1.6.2
@@ -22,4 +22,3 @@
#>>16 belong x , table: %ld
#>>20 belong x , memory: %ld
-
diff --git a/usr.bin/file/magdir/ti-8x b/usr.bin/file/magdir/ti-8x
index 515b0021b9e..91c976865d4 100644
--- a/usr.bin/file/magdir/ti-8x
+++ b/usr.bin/file/magdir/ti-8x
@@ -1,6 +1,6 @@
-# $OpenBSD: ti-8x,v 1.1 2004/06/03 03:14:20 tedu Exp $
+# $OpenBSD: ti-8x,v 1.2 2015/10/05 22:48:26 nicm Exp $
-# ------------------------------------------------------------------------
+#------------------------------------------------------------------------------
# ti-8x: file(1) magic for the TI-8x and TI-9x Graphing Calculators.
#
# From: Ryan McGuire (rmcguire@freenet.columbus.oh.us).
@@ -222,7 +222,7 @@
>49 byte 0x24 type: application,
>49 byte 0x25 type: certificate,
>49 byte 0x3e type: license,
->74 lelong >0 size: %ld bytes
+>74 lelong >0 size: %d bytes
# VTi & TiEmu skins (TI Graphing Calculators).
# From: Romain Lievin (roms@lpg.ticalc.org).
diff --git a/usr.bin/file/magdir/tuxedo b/usr.bin/file/magdir/tuxedo
index 2078c1a7290..a4415d4db3b 100644
--- a/usr.bin/file/magdir/tuxedo
+++ b/usr.bin/file/magdir/tuxedo
@@ -1,6 +1,5 @@
-# $OpenBSD: tuxedo,v 1.2 2008/05/08 01:40:57 chl Exp $
+# $OpenBSD: tuxedo,v 1.3 2015/10/05 22:48:26 nicm Exp $
-#
#------------------------------------------------------------------------------
# tuxedo: file(1) magic for BEA TUXEDO data files
#
diff --git a/usr.bin/file/magdir/vmware b/usr.bin/file/magdir/vmware
index 257b17b715a..dd9393ed1cb 100644
--- a/usr.bin/file/magdir/vmware
+++ b/usr.bin/file/magdir/vmware
@@ -1,6 +1,6 @@
-# $OpenBSD: vmware,v 1.2 2008/05/08 01:40:57 chl Exp $
+# $OpenBSD: vmware,v 1.3 2015/10/05 22:48:26 nicm Exp $
-# -----------------------------------------------------------
+#------------------------------------------------------------------------------
# VMware specific files (deducted from version 1.1 and log file entries)
# Anthon van der Neut (anthon@mnt.org)
0 belong 0x4d52564e VMware nvram
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 21:34:36 +0000