From ed6b2938397ba285e7cc2d69b7b55bffc9144bb6 Mon Sep 17 00:00:00 2001
From: Vincent Batts <vbatts@hashbangbash.com>
Date: Wed, 20 Jul 2016 13:28:08 -0400
Subject: [PATCH 1/2] debug: add an mtree.Debugf and -debug flag

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
---
 cmd/gomtree/main.go |  6 ++++++
 debug.go            | 18 ++++++++++++++++++
 keywords.go         |  3 ++-
 keywords_linux.go   |  2 --
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 debug.go

diff --git a/cmd/gomtree/main.go b/cmd/gomtree/main.go
index 25777ef..6563cbc 100644
--- a/cmd/gomtree/main.go
+++ b/cmd/gomtree/main.go
@@ -23,6 +23,8 @@ var (
 	flListKeywords = flag.Bool("list-keywords", false, "List the keywords available")
 	flResultFormat = flag.String("result-format", "bsd", "output the validation results using the given format (bsd, json, path)")
 	flTar          = flag.String("T", "", "use tar archive to create or validate a directory hierarchy spec")
+
+	flDebug = flag.Bool("debug", false, "output debug info to STDERR")
 )
 
 var formats = map[string]func(*mtree.Result) string{
@@ -57,6 +59,10 @@ var formats = map[string]func(*mtree.Result) string{
 func main() {
 	flag.Parse()
 
+	if *flDebug {
+		os.Setenv("DEBUG", "1")
+	}
+
 	// so that defers cleanly exec
 	var isErr bool
 	defer func() {
diff --git a/debug.go b/debug.go
new file mode 100644
index 0000000..832035e
--- /dev/null
+++ b/debug.go
@@ -0,0 +1,18 @@
+package mtree
+
+import (
+	"fmt"
+	"os"
+	"time"
+)
+
+// DebugOutput is the where DEBUG output is written
+var DebugOutput = os.Stderr
+
+// Debugf does formatted output to DebugOutput, only if DEBUG environment variable is set
+func Debugf(format string, a ...interface{}) (n int, err error) {
+	if os.Getenv("DEBUG") != "" {
+		return fmt.Fprintf(DebugOutput, "[%d] [DEBUG] %s\n", time.Now().UnixNano(), fmt.Sprintf(format, a...))
+	}
+	return 0, nil
+}
diff --git a/keywords.go b/keywords.go
index 4119fc0..136f679 100644
--- a/keywords.go
+++ b/keywords.go
@@ -185,7 +185,8 @@ var (
 		// The pattern for this keyword key is prefixed by "xattr." followed by the extended attribute "namespace.key".
 		// The keyword value is the SHA1 digest of the extended attribute's value.
 		// In this way, the order of the keys does not matter, and the contents of the value is not revealed.
-		"xattr": xattrKeywordFunc,
+		"xattr":  xattrKeywordFunc,
+		"xattrs": xattrKeywordFunc,
 	}
 )
 
diff --git a/keywords_linux.go b/keywords_linux.go
index 26bfc40..177c89f 100644
--- a/keywords_linux.go
+++ b/keywords_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package mtree
 
 import (

From 2685cd3cc5c0dc7935f34b50f5b9f76134e0fe0c Mon Sep 17 00:00:00 2001
From: Vincent Batts <vbatts@hashbangbash.com>
Date: Tue, 26 Jul 2016 13:55:25 -0400
Subject: [PATCH 2/2] xattr: fix the failure on empty list

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
---
 xattr/xattr.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/xattr/xattr.go b/xattr/xattr.go
index 3e2b53b..d6ad9ce 100644
--- a/xattr/xattr.go
+++ b/xattr/xattr.go
@@ -29,7 +29,14 @@ func List(path string) ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
-	return strings.Split(strings.TrimRight(string(dest[:i]), nilByte), nilByte), nil
+
+	// If the returned list is empty, return nil instead of []string{""}
+	str := string(dest[:i])
+	if str == "" {
+		return nil, nil
+	}
+
+	return strings.Split(strings.TrimRight(str, nilByte), nilByte), nil
 }
 
 const nilByte = "\x00"