@@ -105,7 +105,7 @@ class S3(object):

 		response["list"] = getListFromXml(response["data"], "Bucket")

 		return response

-	def bucket_list(self, bucket, prefix = None):

+	def bucket_list(self, bucket, prefix = None, recursive = None):

 		def _list_truncated(data):

 			## <IsTruncated> can either be "true" or "false" or be missing completely

 			is_truncated = getTextFromXml(data, ".//IsTruncated") or "false"

@@ -120,7 +120,7 @@ class S3(object):

 		uri_params = {}

 		if prefix:

 			uri_params['prefix'] = self.urlencode_string(prefix)

-		if not self.config.recursive:

+		if not self.config.recursive and not recursive:

 			uri_params['delimiter'] = "/"

 		request = self.create_request("BUCKET_LIST", bucket = bucket, **uri_params)

 		response = self.send_request(request)

@@ -129,7 +129,7 @@ class S3(object):

 		prefixes = _get_common_prefixes(response["data"])

 		while _list_truncated(response["data"]):

 			uri_params['marker'] = self.urlencode_string(list[-1]["Key"])

-			debug("Listing continues after '%s'" % marker)

+			debug("Listing continues after '%s'" % uri_params['marker'])

 			request = self.create_request("BUCKET_LIST", bucket = bucket, **uri_params)

 			response = self.send_request(request)

 			list += _get_contents(response["data"])

@@ -100,10 +100,14 @@ test_s3cmd("Buckets list", ["ls"],

 test_s3cmd("Sync to S3", ['sync', 'testsuite', 's3://s3cmd-autotest-1/xyz/', '--exclude', '.svn/*', '--exclude', '*.png', '--no-encrypt'])

-test_s3cmd("Check bucket content", ['ls', 's3://s3cmd-autotest-1'],

+test_s3cmd("Check bucket content (-r)", ['ls', '--recursive', 's3://s3cmd-autotest-1'],

 	must_find = [ u"s3://s3cmd-autotest-1/xyz/unicode/ŪņЇЌœđЗ/☺ unicode € rocks ™" ],

 	must_not_find = [ "logo.png" ])

+test_s3cmd("Check bucket content", ['ls', 's3://s3cmd-autotest-1/xyz/'],

+	must_find_re = [ u"D s3://s3cmd-autotest-1/xyz/unicode/$" ],

+	must_not_find = [ u"ŪņЇЌœđЗ/☺ unicode € rocks ™" ])

+

 # test_s3cmd("Recursive put", ['put', '--recursive', 'testsuite/etc', 's3://s3cmd-autotest-1/xyz/'])

 test_s3cmd("Put public, guess MIME", ['put', '--guess-mime-type', '--acl-public', 'testsuite/etc/logo.png', 's3://s3cmd-autotest-1/xyz/etc/logo.png'],

@@ -68,7 +68,7 @@ def subcmd_bucket_usage(s3, uri):

 	if object.endswith('*'):

 		object = object[:-1]

 	try:

-		response = s3.bucket_list(bucket, prefix = object)

+		response = s3.bucket_list(bucket, prefix = object, recursive = True)

 	except S3Error, e:

 		if S3.codes.has_key(e.Code):

 			error(S3.codes[e.Code] % bucket)

@@ -420,7 +420,7 @@ def _get_filelist_remote(remote_uri):

 	info("Retrieving list of remote files...")

 	s3 = S3(Config())

-	response = s3.bucket_list(remote_uri.bucket(), prefix = remote_uri.object())

+	response = s3.bucket_list(remote_uri.bucket(), prefix = remote_uri.object(), recursive = True)

 	rem_base = remote_uri.object()

 	rem_base_len = len(rem_base)