From: Christos Zoulas Date: Wed, 16 Jan 2013 13:53:10 +0000 (+0000) Subject: re-factor gnome. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=404d18dcb6f183c58a950febe74e0e60bfa909bd;p=file re-factor gnome. --- diff --git a/magic/Magdir/database b/magic/Magdir/database index e95b0b16..03611581 100644 --- a/magic/Magdir/database +++ b/magic/Magdir/database @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: database,v 1.30 2012/08/26 10:23:30 christos Exp $ +# $File: database,v 1.31 2013/01/16 13:53:10 christos Exp $ # database: file(1) magic for various databases # # extracted from header/code files by Graeme Wilford (eep2gw@ee.surrey.ac.uk) @@ -271,14 +271,6 @@ >48 lequad x \b, rnum=%lld >56 lequad x \b, fsiz=%lld -# G-IR database made by gobject-introspect toolset, -# http://live.gnome.org/GObjectIntrospection -0 string GOBJ\nMETADATA\r\n\032 G-IR binary database ->16 byte x \b, v%d ->17 byte x \b.%d ->20 leshort x \b, %d entries ->22 leshort x \b/%d local - # Type: QDBM Quick Database Manager # From: Benoit Sibaud 0 string \\[depot\\]\n\f Quick Database Manager, little endian diff --git a/magic/Magdir/gnome-keyring b/magic/Magdir/gnome similarity index 52% rename from magic/Magdir/gnome-keyring rename to magic/Magdir/gnome index 0aeb25d2..2130a0a5 100644 --- a/magic/Magdir/gnome-keyring +++ b/magic/Magdir/gnome @@ -1,7 +1,8 @@ #------------------------------------------------------------------------------ -# $File: gnome-keyring,v 1.3 2012/06/21 01:19:51 christos Exp $ -# GNOME keyring +# $File: gnome,v 1.1 2013/01/16 13:53:10 christos Exp $ +# GNOME related files + # Contributed by Josh Triplett # FIXME: Could be simplified if pstring supported two-byte counts 0 string GnomeKeyring\n\r\0\n GNOME keyring @@ -24,3 +25,35 @@ >>>>>>&24 ubelong x \b, hash iterations %u >>>>>>&28 ubequad x \b, salt %llu >>>>>>&52 ubelong x \b, %u item(s) + +# From: Alex Beregszaszi +4 string gtktalog GNOME Catalogue (gtktalog) +>13 string >\0 version %s + +# Summary: GStreamer binary registry +# Extension: .bin +# Submitted by: Josh Triplett +0 belong 0xc0def00d GStreamer binary registry +>4 string x \b, version %s + +# GVariant Database file +# By Elan Ruusam=E4e +# https://github.com/GNOME/gvdb/blob/master/gvdb-format.h +# It's always "GVariant", it's byte swapped on incompatible archs +# See https://github.com/GNOME/gvdb/blob/master/gvdb-builder.c +file_builder_serialise() +# http://developer.gnome.org/glib/2.34/glib-GVariant.html#GVariant +0 string GVariant GVariant Database file, +# version is never filled. probably future extension +>8 lelong x version %d +# not sure are these usable, so commented out +#>>16 lelong x start %d, +#>>>20 lelong x end %d + +# G-IR database made by gobject-introspect toolset, +# http://live.gnome.org/GObjectIntrospection +0 string GOBJ\nMETADATA\r\n\032 G-IR binary database +>16 byte x \b, v%d +>17 byte x \b.%d +>20 leshort x \b, %d entries +>22 leshort x \b/%d local diff --git a/magic/Magdir/misctools b/magic/Magdir/misctools index 39470656..06bd7b78 100644 --- a/magic/Magdir/misctools +++ b/magic/Magdir/misctools @@ -1,6 +1,6 @@ #----------------------------------------------------------------------------- -# $File: misctools,v 1.12 2010/09/29 18:36:49 rrt Exp $ +# $File: misctools,v 1.13 2013/01/16 13:53:10 christos Exp $ # misctools: file(1) magic for miscellaneous UNIX tools. # 0 search/1 %%!! X-Post-It-Note text @@ -9,16 +9,6 @@ 0 string/c BEGIN:VCARD vCard visiting card !:mime text/x-vcard -# From: Alex Beregszaszi -4 string gtktalog GNOME Catalogue (gtktalog) ->13 string >\0 version %s - -# Summary: GStreamer binary registry -# Extension: .bin -# Submitted by: Josh Triplett -0 belong 0xc0def00d GStreamer binary registry ->4 string x \b, version %s - # Summary: Libtool library file # Extension: .la # Submitted by: Tomasz Trojanowski diff --git a/magic/Makefile.am b/magic/Makefile.am index 6bb897fe..96544046 100644 --- a/magic/Makefile.am +++ b/magic/Makefile.am @@ -1,5 +1,5 @@ # -# $File: Makefile.am,v 1.87 2013/01/09 22:37:38 christos Exp $ +# $File: Makefile.am,v 1.88 2013/01/16 13:53:10 christos Exp $ # MAGIC_FRAGMENT_BASE = Magdir MAGIC_DIR = $(top_srcdir)/magic @@ -86,7 +86,7 @@ $(MAGIC_FRAGMENT_DIR)/gcc \ $(MAGIC_FRAGMENT_DIR)/geo \ $(MAGIC_FRAGMENT_DIR)/geos \ $(MAGIC_FRAGMENT_DIR)/gimp \ -$(MAGIC_FRAGMENT_DIR)/gnome-keyring \ +$(MAGIC_FRAGMENT_DIR)/gnome \ $(MAGIC_FRAGMENT_DIR)/gnu \ $(MAGIC_FRAGMENT_DIR)/gnumeric \ $(MAGIC_FRAGMENT_DIR)/grace \