[Dctrl-tools-devel] [SCM] Debian control file query tools branch, master, updated. 2.11-18-g6861afb

[Jon Bernard]

The branch, master has been updated
       via  6861afbf34530ee9466fc136945a52c7ca909337 (commit)
      from  07d586f563a1a60d2407e38f225abd5768ebfc76 (commit)


- Shortlog ------------------------------------------------------------
6861afb grep-dctrl/grep-dctrl.c: don't display a field with an empty value

Summary of changes:
 debian/changelog        |    9 +++++++++
 grep-dctrl/grep-dctrl.c |   13 ++++++++++---
 tests/0006.out          |    1 -
 3 files changed, 19 insertions(+), 4 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 6861afbf34530ee9466fc136945a52c7ca909337
Author: Jon Bernard <jbernard at debian.org>
Date:   Sun Dec 9 21:16:32 2007 -0500

    grep-dctrl/grep-dctrl.c: don't display a field with an empty value
    
    Reported by Dan Jacobson <jidanni at jidanni.org>
    
    Signed-off-by: Jon Bernard <jbernard at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 079480f..4d43343 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+dctrl-tools (2.14) UNRELEASED; urgency=low
+
+  * grep-dctrl/grep-dctrl.c: don't display a field with an empty value,
+    closes: #264907
+  * tests/0006.out: remove "Version: ", no output is expected with the above
+    change.
+
+ -- Jon Bernard <jbernard at debian.org>  Fri, 07 Dec 2007 10:55:13 -0500
+
 dctrl-tools (2.13) UNRELEASED; urgency=low
 
   * debian/control: suggest debtags, note grep-debtags in description
diff --git a/grep-dctrl/grep-dctrl.c b/grep-dctrl/grep-dctrl.c
index 98ecc87..3f6a81f 100644
--- a/grep-dctrl/grep-dctrl.c
+++ b/grep-dctrl/grep-dctrl.c
@@ -751,9 +751,6 @@ static void show_field(struct arguments *args,
                        struct paragraph *para,
                        struct field_attr *fa)
 {
-        if (args->show_field_name) {
-                printf("%s: ", fa->name);
-        }
         struct fsaf_read_rv r 
                 = get_field(para, 
                             fa->inx,
@@ -764,6 +761,16 @@ static void show_field(struct arguments *args,
                 char * nl = memchr(r.b, '\n', r.len);
                 if (nl != 0) r.len = nl - r.b;
         }
+
+        if (r.len == 0) {
+                /* don't display a field with an empty value */
+                return;
+        }
+
+        if (args->show_field_name) {
+                printf("%s: ", fa->name);
+        }
+
         fwrite(r.b, 1, r.len, stdout);
         puts("");
 }
diff --git a/tests/0006.out b/tests/0006.out
index 988cac6..e69de29 100644
--- a/tests/0006.out
+++ b/tests/0006.out
@@ -1 +0,0 @@
-Version: 

-- 
Debian control file query tools