6 files changed, 49 insertions, 13 deletions
diff --git a/pkg/api/handlers/compat/images.go b/pkg/api/handlers/compat/images.go
index 23a9b12a3..401a7ec1b 100644
--- a/pkg/api/handlers/compat/images.go
+++ b/pkg/api/handlers/compat/images.go
@@ -503,15 +503,15 @@ func LoadImages(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if len(loadReport.Names) != 1 {
-		utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Errorf("%d instead of 1 were loaded", len(loadReport.Names)))
+	if len(loadReport.Names) < 1 {
+		utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Errorf("one or more images are required"))
 		return
 	}
 
 	utils.WriteResponse(w, http.StatusOK, struct {
 		Stream string `json:"stream"`
 	}{
-		Stream: fmt.Sprintf("Loaded image: %s\n", loadReport.Names[0]),
+		Stream: fmt.Sprintf("Loaded image: %s", strings.Join(loadReport.Names, ",")),
 	})
 }
 
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index 3adf9b26c..b9c6d3ac7 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -94,7 +94,9 @@ func (ir *ImageEngine) Prune(ctx context.Context, opts entities.ImagePruneOption
 func toDomainHistoryLayer(layer *libimage.ImageHistory) entities.ImageHistoryLayer {
 	l := entities.ImageHistoryLayer{}
 	l.ID = layer.ID
-	l.Created = *layer.Created
+	if layer.Created != nil {
+		l.Created = *layer.Created
+	}
 	l.CreatedBy = layer.CreatedBy
 	copy(l.Tags, layer.Tags)
 	l.Size = layer.Size
diff --git a/pkg/domain/infra/abi/images_test.go b/pkg/domain/infra/abi/images_test.go
index 20ef1b150..e38b9390d 100644
--- a/pkg/domain/infra/abi/images_test.go
+++ b/pkg/domain/infra/abi/images_test.go
@@ -1,5 +1,22 @@
 package abi
 
+import (
+	"testing"
+
+	"github.com/containers/common/libimage"
+	"github.com/stretchr/testify/assert"
+)
+
+// This is really intended to verify what happens with a
+// nil pointer in layer.Created, but we'll just sanity
+// check round tripping 42.
+func TestToDomainHistoryLayer(t *testing.T) {
+	var layer libimage.ImageHistory
+	layer.Size = 42
+	newLayer := toDomainHistoryLayer(&layer)
+	assert.Equal(t, layer.Size, newLayer.Size)
+}
+
 //
 // import (
 // 	"context"
diff --git a/pkg/env/env_supported.go b/pkg/env/env_unix.go
index 8be9f9592..16061a700 100644
--- a/pkg/env/env_supported.go
+++ b/pkg/env/env_unix.go
@@ -1,4 +1,4 @@
-// +build linux darwin
+// +build !windows
 
 package env
 
diff --git a/pkg/env/env_unsupported.go b/pkg/env/env_unsupported.go
deleted file mode 100644
index a71c2956d..000000000
--- a/pkg/env/env_unsupported.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !linux,!darwin
-
-package env
-
-func ParseSlice(s []string) (map[string]string, error) {
-	m := make(map[string]string)
-	return m, nil
-}
diff --git a/pkg/env/env_windows.go b/pkg/env/env_windows.go
new file mode 100644
index 000000000..5df08fadc
--- /dev/null
+++ b/pkg/env/env_windows.go
@@ -0,0 +1,25 @@
+package env
+
+// ParseSlice parses the specified slice and transforms it into an environment
+// map.
+func ParseSlice(s []string) (map[string]string, error) {
+	env := make(map[string]string, len(s))
+	for _, e := range s {
+		if len(e) > 0 && e[0] == '=' {
+			// The legacy Windows CMD command interpreter uses a hack, where to emulate
+			// DOS semantics, it uses an illegal (by windows definition) env name for
+			// state storage to avoid conlficting with user defined env names. This is
+			// used to preserve drive letter paths. E.g., typing c: from another drive
+			// will remember the last CWD because CMD stores it in an env named "=C:".
+			// Since these are illegal, they are filtered from standard user access but
+			// are still available in the underlying win32 API calls. Since they have
+			// zero value to a container, we filter as well.
+			continue
+		}
+
+		if err := parseEnv(env, e); err != nil {
+			return nil, err
+		}
+	}
+	return env, nil
+}