Merge branch 'mv/unknown'

* mv/unknown:
  Don't use "<unknown>" for placeholders and suppress printing of empty user formats.

1 files changed, 5 insertions, 1 deletions

diff --git a/interpolate.c b/interpolate.c
index 3de583238d..6ef53f2465 100644
--- a/interpolate.c
+++ b/interpolate.c
@@ -73,8 +73,12 @@ unsigned long interpolate(char *result, unsigned long reslen,
 			/* Check for valid interpolation. */
 			if (i < ninterps) {
 				value = interps[i].value;
-				valuelen = strlen(value);
+				if (!value) {
+					src += namelen;
+					continue;
+				}
 
+				valuelen = strlen(value);
 				if (newlen + valuelen < reslen) {
 					/* Substitute. */
 					memcpy(dest, value, valuelen);