[unstable] merging changes from stable.

1 files changed, 20 insertions, 4 deletions

diff --git a/hdrline.c b/hdrline.c
index 97c833bc..c41c30f4 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -414,8 +414,16 @@ hdr_format_str (char *dest,
       break;
 
     case 'l':
-      snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-      snprintf (dest, destlen, fmt, (int) hdr->lines);
+      if (!optional)
+      {
+	snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
+	snprintf (dest, destlen, fmt, (int) hdr->lines);
+      }
+      else
+      {
+	if (hdr->lines > 0)
+	  optional = 0;
+      }
       break;
 
     case 'L':
@@ -448,8 +456,16 @@ hdr_format_str (char *dest,
       break;
 
     case 'N':
-      snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-      snprintf (dest, destlen, fmt, hdr->score);
+      if (!optional)
+      {
+	snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
+	snprintf (dest, destlen, fmt, hdr->score);
+      }
+      else
+      {
+	if (hdr->score > 0)
+	  optional = 0;
+      }
       break;
 
     case 'O':