[Libguestfs] [PATCH hivex 1/2] maint: avoid some syntax-check test failures

[Jim Meyering]

Hi Rich,

I've updated hivex to use the latest from gnulib
and fixed a few syntax-check failures.
With these changes, almost all of "make distcheck" succeeds.
(details coming separately)

>From c6300c44a1eda1a55a23249fde94882ea5a1c430 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Tue, 28 Aug 2012 11:28:40 +0200
Subject: [PATCH hivex 1/2] maint: avoid some syntax-check test failures

* cfg.mk (_img_regexp): Exempt two VC'd image files from syntax
check rules that look for trailing blanks and empty lines at EOF.
* sh/hivexsh.pod: Remove trailing spaces.
---
 cfg.mk         |  7 +++++--
 sh/hivexsh.pod | 24 ++++++++++++------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index c1334fe..528f722 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -14,8 +14,11 @@ 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$$
+_img_regexp = ^images/(minimal|rlenvalue_test_hive)$$
+exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = $(_img_regexp)
+exclude_file_name_regexp--sc_trailing_blank = $(_img_regexp)

 exclude_file_name_regexp--sc_useless_cpp_parens = \
   ^lib/gettext\.h$$
+
+config_h_header ?= ["<](hivex|config)\.h[>"]
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
- 
+
  > load software
  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
  ><fs> download win:c:\windows\system32\config\software software
  ><fs> quit
- 
+
  $ 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.12.116.g31e0100


>From 95fe2b195f230115a5f716fb65b6bcb1856cda6e Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Tue, 28 Aug 2012 11:00:36 +0200
Subject: [PATCH hivex 2/2] build: update gnulib submodule to latest

---
 .gnulib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gnulib b/.gnulib
index 1f96aa0..68f693f 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 1f96aa01f72bba8c9a0600280594a1a92bb505fc
+Subproject commit 68f693ff1db33bf24695f0f42c62e7801966fd06
-- 
1.7.12.116.g31e0100