From 08d75deb239ccfe93269f236ac22992ca6695d66 Mon Sep 17 00:00:00 2001 From: John Barton Date: Fri, 27 Jan 2023 12:55:00 +1100 Subject: [PATCH] Fix up bad merge --- godotenv.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/godotenv.go b/godotenv.go index a281d3a..95124e3 100644 --- a/godotenv.go +++ b/godotenv.go @@ -108,7 +108,15 @@ func Read(filenames ...string) (envMap map[string]string, err error) { // Unmarshal reads an env file from a string, returning a map of keys and values. func Unmarshal(str string) (envMap map[string]string, err error) { - return Parse(strings.NewReader(str)) + return UnmarshalBytes([]byte(str)) +} + +// UnmarshalBytes parses env file from byte slice of chars, returning a map of keys and values. +func UnmarshalBytes(src []byte) (map[string]string, error) { + out := make(map[string]string) + err := parseBytes(src, out) + + return out, err } // Exec loads env vars from the specified filenames (empty map falls back to default)