From a46f2a9eb784b52a068b7d8d4628b6212eb1ff27 Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Mon, 19 Mar 2018 17:41:46 +0000
Subject: [PATCH] s3: ignore zero length directory markers - fixes #1621

---
 backend/s3/s3.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/backend/s3/s3.go b/backend/s3/s3.go
index 943f1aa30..132a6e202 100644
--- a/backend/s3/s3.go
+++ b/backend/s3/s3.go
@@ -549,6 +549,18 @@ func (f *Fs) list(dir string, recurse bool, fn listFn) error {
 				continue
 			}
 			remote := key[rootLength:]
+			// is this a directory marker?
+			if strings.HasSuffix(remote, "/") && *object.Size == 0 {
+				if recurse {
+					// add a directory in if --fast-list since will have no prefixes
+					remote = remote[:len(remote)-1]
+					err = fn(remote, &s3.Object{Key: &remote}, true)
+					if err != nil {
+						return err
+					}
+				}
+				continue // skip directory marker
+			}
 			err = fn(remote, object, false)
 			if err != nil {
 				return err