From: Jim Meyering <meyering(a)redhat.com&gt; * po/POTFILES.in: Reduce list of files with translatable messages to match reality. --- po/POTFILES.in | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 92b36f0..3e02786 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,9 +1,2 @@ -images/mklarge.c -lib/hivex.c -ocaml/hivex_c.c -perl/Hivex.c -perl/lib/Win/Hivex.pm -perl/lib/Win/Hivex/Regedit.pm -python/hivex-py.c sh/hivexsh.c xml/hivexml.c -- 1.7.6.rc2.302.gc2115

From: Jim Meyering <meyering(a)redhat.com&gt; now that we're using gnulib's fcntl module, which ensures that we use a conforming <fcntl.h>. * lib/hivex.c (O_CLOEXEC): Remove definition. * bootstrap (modules): Add fcntl for its guaranteed definition of O_CLOEXEC. --- bootstrap | 1 + lib/hivex.c | 4 ---- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/bootstrap b/bootstrap index e91c8c9..638d230 100755 --- a/bootstrap +++ b/bootstrap @@ -56,6 +56,7 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool modules=' c-ctype +fcntl full-read full-write gitlog-to-changelog diff --git a/lib/hivex.c b/lib/hivex.c index a72fa77..946ecf3 100644 --- a/lib/hivex.c +++ b/lib/hivex.c @@ -38,10 +38,6 @@ #include "full-read.h" #include "full-write.h" -#ifndef O_CLOEXEC -#define O_CLOEXEC 0 -#endif - #define STREQ(a,b) (strcmp((a),(b)) == 0) #define STRCASEEQ(a,b) (strcasecmp((a),(b)) == 0) //#define STRNEQ(a,b) (strcmp((a),(b)) != 0) -- 1.7.6.rc2.302.gc2115

From: Jim Meyering <meyering(a)redhat.com&gt; --- generator/generator.ml | 12 ++++++------ lib/tools/visualizer.ml | 8 ++++---- perl/lib/Win/Hivex/Regedit.pm | 6 +++--- sh/hivexsh.pod | 24 ++++++++++++------------ 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/generator/generator.ml b/generator/generator.ml index 8f1f935..31478cd 100755 --- a/generator/generator.ml +++ b/generator/generator.ml @@ -19,16 +19,16 @@ (* This script generates language bindings and some documentation for * hivex. - * + * * After editing this file, run it (./generator/generator.ml) to * regenerate all the output files. 'make' will rerun this * automatically when necessary. Note that if you are using a separate * build directory you must run generator.ml from the _source_ * directory. - * + * * IMPORTANT: This script should NOT print any warnings. If it prints * warnings, you should treat them as errors. - * + * * OCaml tips: (1) In emacs, install tuareg-mode to display and format * OCaml code correctly. 'vim' comes with a good OCaml editing mode by * default. (2) Read the resources at http://ocaml-tutorial.org/ @@ -73,7 +73,7 @@ and argt = (* Note, cannot be NULL/0 unless it (* Hive types, from: * https://secure.wikimedia.org/wikipedia/en/wiki/Windows_Registry#Keys_and_... - * + * * It's unfortunate that in our original C binding we strayed away from * the names that Windows uses (eg. REG_SZ for strings). We include * both our names and the Windows names. @@ -841,7 +841,7 @@ hivex - Windows Registry \"hive\" extraction library =head1 SYNOPSIS #include <hivex.h> - + "; List.iter ( fun (shortname, style, _, _) -> @@ -3020,7 +3020,7 @@ initlibhivexmod (void) initialized = 1; } " - + and generate_python_py () = generate_header HashStyle LGPLv2plus; diff --git a/lib/tools/visualizer.ml b/lib/tools/visualizer.ml index 5b7ac79..cc71748 100644 --- a/lib/tools/visualizer.ml +++ b/lib/tools/visualizer.ml @@ -83,10 +83,10 @@ let bitmatch header_fields = (* All three GUIDs here confirmed in Windows 7 registries. In * Windows <= 2003 these GUID fields seem to contain junk. - * + * * If you write zeroes to the GUID fields, load and unload in Win7 * REGEDIT, then Windows 7 writes some random GUIDs. - * + * * Also (on Win7) unknownguid1 == unknownguid2. unknownguid3 is * different. *) @@ -414,10 +414,10 @@ let bitmatch nk_fields = * names are usually ASCII, that would be max length of names * 2). * This is a historical maximum, so it can be greater than the * current maximum name field. - * + * * The remaining fields are often non-zero, but the purpose is * unknown. - * + * * In the hives we examined the other fields had values as * follows: * userflags: 0, 2, 0xa, 0xe diff --git a/perl/lib/Win/Hivex/Regedit.pm b/perl/lib/Win/Hivex/Regedit.pm index 9b6a5d5..3d7e5ed 100644 --- a/perl/lib/Win/Hivex/Regedit.pm +++ b/perl/lib/Win/Hivex/Regedit.pm @@ -29,13 +29,13 @@ Win::Hivex::Regedit - Helper for reading and writing regedit format files use Win::Hivex; use Win::Hivex::Regedit qw(reg_import reg_export); - + $h = Win::Hivex->open ('SOFTWARE', write => 1); - + open FILE, "updates.reg"; reg_import (\*FILE, $h); $h->commit (undef); - + reg_export ($h, "\\Microsoft\\Windows NT\\CurrentVersion", \*OUTFILE, prefix => "HKEY_LOCAL_MACHINE\\SOFTWARE"); diff --git a/sh/hivexsh.pod b/sh/hivexsh.pod index a31d9e0..7d7fc0a 100644 --- a/sh/hivexsh.pod +++ b/sh/hivexsh.pod @@ -30,13 +30,13 @@ Or you can start C<hivexsh> without any arguments, and immediately use the C<load> command to load a hive: $ hivexsh - + Welcome to hivexsh, the hivex interactive shell for examining Windows Registry binary hive files. - + Type: 'help' for help with commands 'quit' to quit the shell - + software\> @@ -198,22 +198,22 @@ The second line of each pair is the value, which has a special format C<type:value> with possible types summarized in the table below: none No data is stored, and the type is set to 0. - + string:abc "abc" is stored as a UTF16-LE-encoded string (type 1). Note that only 7 bit ASCII strings are supported as input. - + expandstring:... Same as string but with type 2. - + dword:0x01234567 A DWORD (type 4) with the hex value 0x01234567. You can also use decimal or octal numbers here. - + qword:0x0123456789abcdef A QWORD (type 11) with the hex value 0x0123456789abcdef. You can also use decimal or octal numbers here. - + hex:<type>:<hexbytes> hex:1:41,00,42,00,43,00,44,00,00,00 This is the generic way to enter any @@ -231,15 +231,15 @@ C<type:value> with possible types summarized in the table below: $ guestfish --ro -i Windows7 - + $ hivexsh software - + Welcome to hivexsh, the hivex interactive shell for examining Windows Registry binary hive files. - + Type: 'help' for help with commands 'quit' to quit the shell - + software\> ls ATI Technologies Classes -- 1.7.6.rc2.302.gc2115

Richard W.M. Jones wrote: Oh well, then we can exempt that one file from the test. I've added that to the patch I'd omitted. From: Jim Meyering <meyering(a)redhat.com&gt; Date: Tue, 28 Jun 2011 18:44:23 +0200 Subject: [PATCH hivex] maint: add cfg.mk to prepare for syntax-check tests * cfg.mk: New file, to tell maint.mk which syntax-checks to skip for now, where .gnulib/ is, to exempt images/minimal from one of the tests and to exempt sh/hivexsh\.pod from another. Also exempt lib/gettext.h from sc_useless_cpp_parens. --- cfg.mk | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) create mode 100644 cfg.mk diff --git a/cfg.mk b/cfg.mk new file mode 100644 index 0000000..c1334fe --- /dev/null +++ b/cfg.mk @@ -0,0 +1,21 @@ +# Tests not to run as part of "make distcheck". +local-checks-to-skip = \ + sc_prohibit_strcmp \ + sc_two_space_separator_in_usage \ + sc_prohibit_magic_number_exit \ + sc_file_system \ + sc_GPL_version \ + sc_bindtextdomain \ + sc_makefile_path_separator_check \ + sc_program_name + +gnulib_dir = .gnulib + +exclude_file_name_regexp--sc_trailing_blank = \ + ^sh/hivexsh\.pod$$ + +exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \ + ^images/minimal$$ + +exclude_file_name_regexp--sc_useless_cpp_parens = \ + ^lib/gettext\.h$$ -- 1.7.6.rc2.302.gc2115

From: Jim Meyering <meyering(a)redhat.com&gt; * cfg.mk: Exempt lib/gettext.h from sc_useless_cpp_parens. --- cfg.mk | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/cfg.mk b/cfg.mk index d10cf23..3ba36c5 100644 --- a/cfg.mk +++ b/cfg.mk @@ -13,3 +13,6 @@ gnulib_dir = .gnulib exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \ ^images/minimal$$ + +exclude_file_name_regexp--sc_useless_cpp_parens = \ + ^lib/gettext\.h$$ -- 1.7.6.rc2.302.gc2115

From: Jim Meyering <meyering(a)redhat.com&gt; * perl/typemap: Remove spaces-before-TAB. --- perl/typemap | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/perl/typemap b/perl/typemap index 2cc5e0c..c29c02d 100644 --- a/perl/typemap +++ b/perl/typemap @@ -2,7 +2,7 @@ TYPEMAP char * T_PV const char * T_PV hive_h * O_OBJECT_hive_h -int64_t T_IV +int64_t T_IV INPUT O_OBJECT_hive_h -- 1.7.6.rc2.302.gc2115

From: Jim Meyering <meyering(a)redhat.com&gt; * Makefile.am (all-local): Remove rule. It would put many files in po/POTFILES.in that contain no translatable diagnostic. --- Makefile.am | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index b86caca..0d59bbf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,16 +41,6 @@ dist-hook: $(top_srcdir)/build-aux/gitlog-to-changelog > ChangeLog cp ChangeLog $(distdir)/ChangeLog -# Update the list of translatable files in po/POTFILES.in. -all-local: - cd $(srcdir); \ - find $(DIST_SUBDIRS) \ - -name '*.c' -o -name '*.pl' -o -name '*.pm' | \ - grep -v '^gnulib/' | \ - grep -v 'perl/blib/' | \ - LC_ALL=C sort | \ - sed 's,^\./,,' > po/POTFILES.in - # Pkgconfig. pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = hivex.pc -- 1.7.6.rc2.302.gc2115