diff --git a/ECSUtil/CRWLock.cpp b/ECSUtil/CRWLock.cpp index 7f44423..82f81a0 100644 --- a/ECSUtil/CRWLock.cpp +++ b/ECSUtil/CRWLock.cpp @@ -1,6 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. - All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/CRWLock.h b/ECSUtil/CRWLock.h index 7611c0c..b580369 100644 --- a/ECSUtil/CRWLock.h +++ b/ECSUtil/CRWLock.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/CSharedQueue.cpp b/ECSUtil/CSharedQueue.cpp index d26a68f..0122c1f 100644 --- a/ECSUtil/CSharedQueue.cpp +++ b/ECSUtil/CSharedQueue.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/CngAES_GCM.cpp b/ECSUtil/CngAES_GCM.cpp index 75eebe5..25fdfbc 100644 --- a/ECSUtil/CngAES_GCM.cpp +++ b/ECSUtil/CngAES_GCM.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/CngAES_GCM.h b/ECSUtil/CngAES_GCM.h index 8d87b5e..31547cd 100644 --- a/ECSUtil/CngAES_GCM.h +++ b/ECSUtil/CngAES_GCM.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/DLLFUNC.H b/ECSUtil/DLLFUNC.H index 94e313b..9988f0f 100644 --- a/ECSUtil/DLLFUNC.H +++ b/ECSUtil/DLLFUNC.H @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/ECSConnection.cpp b/ECSUtil/ECSConnection.cpp index 3a9bc9b..443a9e2 100644 --- a/ECSUtil/ECSConnection.cpp +++ b/ECSUtil/ECSConnection.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -3621,6 +3621,12 @@ HRESULT XmlDirListingS3CB(const CStringW& sXmlPath, void *pContext, IXmlReader * return 0; } +inline void AppendQuery(CString& sResource, bool& bContinuation, const CString& sQuery) +{ + sResource += (bContinuation ? _T("&") : _T("?")) + sQuery; + bContinuation = true; +} + CECSConnection::S3_ERROR CECSConnection::DirListingInternal( LPCTSTR pszPathIn, DirEntryList_t& DirList, @@ -3630,7 +3636,8 @@ CECSConnection::S3_ERROR CECSConnection::DirListingInternal( bool bSingle, // if true, don't keep going back for more files. we just want to know if there are SOME DWORD *pdwGetECSRetention, // if non-nullptr, check for ECS bucket retention. return retention period LPCTSTR pszObjName, - LISTING_NEXT_MARKER_CONTEXT *pNextRequestMarker) // if non-nullptr, only one request is done at a time. this holds the next marker for the next page of entries + LISTING_NEXT_MARKER_CONTEXT *pNextRequestMarker, // if non-nullptr, only one request is done at a time. this holds the next marker for the next page of entries + TCHAR cDelimiter) // defaults to L'/'. if NUL, then don't do a delimiter listing { CStateRef State(this); S3_ERROR Error; @@ -3682,10 +3689,11 @@ CECSConnection::S3_ERROR CECSConnection::DirListingInternal( sPrefix = UriEncode(sPrefix, E_URI_ENCODE::AllSAFE); } sResource = sBucket + _T("/"); + bool bContinuation = false; if (bS3Versions) - sResource += _T("?versions&delimiter=/"); - else - sResource += _T("?delimiter=/"); + AppendQuery(sResource, bContinuation, _T("versions")); + if (cDelimiter != _T('\0')) + AppendQuery(sResource, bContinuation, CString(_T("delimiter=")) + cDelimiter); { DWORD dwMaxKeys = 0; if ((pNextRequestMarker != nullptr) && (pNextRequestMarker->dwMaxNum != 0)) @@ -3695,16 +3703,16 @@ CECSConnection::S3_ERROR CECSConnection::DirListingInternal( else if ((dwS3BucketListingMax >= 10) && (dwS3BucketListingMax < 1000)) dwMaxKeys = dwS3BucketListingMax; if (dwMaxKeys != 0) - sResource += _T("&max-keys=") + FmtNum(dwMaxKeys); + AppendQuery(sResource, bContinuation, _T("max-keys=") + FmtNum(dwMaxKeys)); } if (!sPrefix.IsEmpty()) - sResource += _T("&prefix=") + sPrefix; + AppendQuery(sResource, bContinuation, _T("prefix=") + sPrefix); if (!sS3NextMarker.IsEmpty()) - sResource += _T("&marker=") + UriEncode(sS3NextMarker, E_URI_ENCODE::AllSAFE); + AppendQuery(sResource, bContinuation, _T("marker=") + UriEncode(sS3NextMarker, E_URI_ENCODE::AllSAFE)); if (!sS3NextKeyMarker.IsEmpty()) - sResource += _T("&key-marker=") + UriEncode(sS3NextKeyMarker, E_URI_ENCODE::AllSAFE); + AppendQuery(sResource, bContinuation, _T("key-marker=") + UriEncode(sS3NextKeyMarker, E_URI_ENCODE::AllSAFE)); if (!sS3NextVersionIdMarker.IsEmpty()) - sResource += _T("&version-id-marker=") + UriEncode(sS3NextVersionIdMarker, E_URI_ENCODE::AllSAFE); + AppendQuery(sResource, bContinuation, _T("version-id-marker=") + UriEncode(sS3NextVersionIdMarker, E_URI_ENCODE::AllSAFE)); if (pdwGetECSRetention != nullptr) { Req.push_back(HEADER_REQ(_T("x-emc-retention-period"))); @@ -3827,16 +3835,16 @@ CECSConnection::S3_ERROR CECSConnection::DirListingInternal( return Error; } -CECSConnection::S3_ERROR CECSConnection::DirListing(LPCTSTR pszPath, DirEntryList_t& DirList, bool bSingle, DWORD *pdwGetECSRetention, LPCTSTR pszObjName, LISTING_NEXT_MARKER_CONTEXT *pNextRequestMarker) +CECSConnection::S3_ERROR CECSConnection::DirListing(LPCTSTR pszPath, DirEntryList_t& DirList, bool bSingle, DWORD *pdwGetECSRetention, LPCTSTR pszObjName, LISTING_NEXT_MARKER_CONTEXT *pNextRequestMarker, TCHAR cDelimiter) { CString sRetSearchName; - return DirListingInternal(pszPath, DirList, nullptr, sRetSearchName, false, bSingle, pdwGetECSRetention, pszObjName, pNextRequestMarker); + return DirListingInternal(pszPath, DirList, nullptr, sRetSearchName, false, bSingle, pdwGetECSRetention, pszObjName, pNextRequestMarker, cDelimiter); } -CECSConnection::S3_ERROR CECSConnection::DirListingS3Versions(LPCTSTR pszPath, DirEntryList_t& DirList, LPCTSTR pszObjName, LISTING_NEXT_MARKER_CONTEXT *pNextRequestMarker) +CECSConnection::S3_ERROR CECSConnection::DirListingS3Versions(LPCTSTR pszPath, DirEntryList_t& DirList, LPCTSTR pszObjName, LISTING_NEXT_MARKER_CONTEXT *pNextRequestMarker, TCHAR cDelimiter) { CString sRetSearchName; - return DirListingInternal(pszPath, DirList, nullptr, sRetSearchName, true, false, nullptr, pszObjName, pNextRequestMarker); + return DirListingInternal(pszPath, DirList, nullptr, sRetSearchName, true, false, nullptr, pszObjName, pNextRequestMarker, cDelimiter); } CString CECSConnection::S3_ERROR_BASE::Format(bool bOneLine) const diff --git a/ECSUtil/ECSConnection.h b/ECSUtil/ECSConnection.h index 8af7939..c92a107 100644 --- a/ECSUtil/ECSConnection.h +++ b/ECSUtil/ECSConnection.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -1493,7 +1493,7 @@ class ECSUTIL_EXT_CLASS CECSConnection DWORD ChooseAuthScheme(DWORD dwSupportedSchemes); CString FormatAuthScheme(void); // internal version of DirListing allowing it to search for a single file/dir and not return the whole list - S3_ERROR DirListingInternal(LPCTSTR pszPathIn, DirEntryList_t& DirList, LPCTSTR pszSearchName, CString& sRetSearchName, bool bS3Versions, bool bSingle, DWORD *pdwGetECSRetention, LPCTSTR pszObjName, LISTING_NEXT_MARKER_CONTEXT *pNextRequestMarker); + S3_ERROR DirListingInternal(LPCTSTR pszPathIn, DirEntryList_t& DirList, LPCTSTR pszSearchName, CString& sRetSearchName, bool bS3Versions, bool bSingle, DWORD *pdwGetECSRetention, LPCTSTR pszObjName, LISTING_NEXT_MARKER_CONTEXT *pNextRequestMarker, TCHAR cDelimiter); CString signS3ShareableURL(CString& sResource, const CString& sExpire, const CString& sHostPort); void KillHostSessions(void); void DeleteS3Send(void); @@ -1573,8 +1573,8 @@ class ECSUTIL_EXT_CLASS CECSConnection S3_ERROR DeleteS3(LPCTSTR pszPath, LPCTSTR pszVersionId = nullptr); S3_ERROR DeleteS3(const list& PathList); S3_ERROR Read(LPCTSTR pszPath, ULONGLONG lwLen, ULONGLONG lwOffset, CBuffer& RetData, DWORD dwBufOffset = 0, STREAM_CONTEXT *pStreamReceive = nullptr, list *pRcvHeaders = nullptr, ULONGLONG *pullReturnedLength = nullptr); - S3_ERROR DirListing(LPCTSTR pszPath, DirEntryList_t& DirList, bool bSingle = false, DWORD *pdwGetECSRetention = nullptr, LPCTSTR pszObjName = nullptr, LISTING_NEXT_MARKER_CONTEXT *pNextRequestMarker = nullptr); - S3_ERROR DirListingS3Versions(LPCTSTR pszPath, DirEntryList_t& DirList, LPCTSTR pszObjName = nullptr, LISTING_NEXT_MARKER_CONTEXT *pNextRequestMarker = nullptr); + S3_ERROR DirListing(LPCTSTR pszPath, DirEntryList_t& DirList, bool bSingle = false, DWORD *pdwGetECSRetention = nullptr, LPCTSTR pszObjName = nullptr, LISTING_NEXT_MARKER_CONTEXT *pNextRequestMarker = nullptr, TCHAR cDelimiter = _T('/')); + S3_ERROR DirListingS3Versions(LPCTSTR pszPath, DirEntryList_t& DirList, LPCTSTR pszObjName = nullptr, LISTING_NEXT_MARKER_CONTEXT *pNextRequestMarker = nullptr, TCHAR cDelimiter = _T('/')); S3_ERROR S3ServiceInformation(S3_SERVICE_INFO& ServiceInfo); void WriteMetadataEntry(list& MDList, LPCTSTR pszTag, const CBuffer& Data); void WriteMetadataEntry(list& MDList, LPCTSTR pszTag, const CString& sStr); diff --git a/ECSUtil/ECSGlobal.cpp b/ECSUtil/ECSGlobal.cpp index 89f317d..279691a 100644 --- a/ECSUtil/ECSGlobal.cpp +++ b/ECSUtil/ECSGlobal.cpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2017, EMC Corporation. All Rights Reserved. +* Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/ECSGlobal.h b/ECSUtil/ECSGlobal.h index 7ba01eb..5a1a70d 100644 --- a/ECSUtil/ECSGlobal.h +++ b/ECSUtil/ECSGlobal.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2017, EMC Corporation. All Rights Reserved. +* Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/ECSUtil.cpp b/ECSUtil/ECSUtil.cpp index e5ec0a9..cc0746e 100644 --- a/ECSUtil/ECSUtil.cpp +++ b/ECSUtil/ECSUtil.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/ECSUtil.h b/ECSUtil/ECSUtil.h index 85996fa..4a35433 100644 --- a/ECSUtil/ECSUtil.h +++ b/ECSUtil/ECSUtil.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/FileSupport.cpp b/ECSUtil/FileSupport.cpp index 2b45474..786c54a 100644 --- a/ECSUtil/FileSupport.cpp +++ b/ECSUtil/FileSupport.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/FileSupport.h b/ECSUtil/FileSupport.h index 27e533f..9e0bcbf 100644 --- a/ECSUtil/FileSupport.h +++ b/ECSUtil/FileSupport.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/Logging.cpp b/ECSUtil/Logging.cpp index a0b237a..a35c1c8 100644 --- a/ECSUtil/Logging.cpp +++ b/ECSUtil/Logging.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/Logging.h b/ECSUtil/Logging.h index b2dadc2..72ab2c6 100644 --- a/ECSUtil/Logging.h +++ b/ECSUtil/Logging.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/NTERRTXT.CPP b/ECSUtil/NTERRTXT.CPP index aa4a339..d34b0cf 100644 --- a/ECSUtil/NTERRTXT.CPP +++ b/ECSUtil/NTERRTXT.CPP @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/NTERRTXT.H b/ECSUtil/NTERRTXT.H index d825209..cdfa5f5 100644 --- a/ECSUtil/NTERRTXT.H +++ b/ECSUtil/NTERRTXT.H @@ -1,6 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. - All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/ProcessEvent.cpp b/ECSUtil/ProcessEvent.cpp index bb7f3df..dfc23c3 100644 --- a/ECSUtil/ProcessEvent.cpp +++ b/ECSUtil/ProcessEvent.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/ProcessEvent.h b/ECSUtil/ProcessEvent.h index c123fea..af67884 100644 --- a/ECSUtil/ProcessEvent.h +++ b/ECSUtil/ProcessEvent.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/S3Error.cpp b/ECSUtil/S3Error.cpp index bcdf88c..f9e37a0 100644 --- a/ECSUtil/S3Error.cpp +++ b/ECSUtil/S3Error.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/S3Error.h b/ECSUtil/S3Error.h index c05f424..4e88b7c 100644 --- a/ECSUtil/S3Error.h +++ b/ECSUtil/S3Error.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/SimpleWorkerThread.cpp b/ECSUtil/SimpleWorkerThread.cpp index cf51dd7..241692e 100644 --- a/ECSUtil/SimpleWorkerThread.cpp +++ b/ECSUtil/SimpleWorkerThread.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/SimpleWorkerThread.h b/ECSUtil/SimpleWorkerThread.h index eb3b4b3..84ee846 100644 --- a/ECSUtil/SimpleWorkerThread.h +++ b/ECSUtil/SimpleWorkerThread.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/ThreadPool.cpp b/ECSUtil/ThreadPool.cpp index 7cf0ace..bae1d97 100644 --- a/ECSUtil/ThreadPool.cpp +++ b/ECSUtil/ThreadPool.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/ThreadPool.h b/ECSUtil/ThreadPool.h index c7f916e..ed98d5f 100644 --- a/ECSUtil/ThreadPool.h +++ b/ECSUtil/ThreadPool.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/UriUtils.cpp b/ECSUtil/UriUtils.cpp index 93716fc..3b79c56 100644 --- a/ECSUtil/UriUtils.cpp +++ b/ECSUtil/UriUtils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/UriUtils.h b/ECSUtil/UriUtils.h index a18ae04..a490a13 100644 --- a/ECSUtil/UriUtils.h +++ b/ECSUtil/UriUtils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/Version.h b/ECSUtil/Version.h index 021bb47..8520391 100644 --- a/ECSUtil/Version.h +++ b/ECSUtil/Version.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2017, EMC Corporation. All Rights Reserved. +* Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -17,4 +17,4 @@ #define ECSUTIL_COPYRIGHT _T("Copyright © 2019 Dell Inc. or its subsidiaries.") -#define ECSUTIL_VERSION "v1.0.6.1" +#define ECSUTIL_VERSION "v1.0.7.1" diff --git a/ECSUtil/XmlLiteUtil.cpp b/ECSUtil/XmlLiteUtil.cpp index 2cbdcdd..f6562f3 100644 --- a/ECSUtil/XmlLiteUtil.cpp +++ b/ECSUtil/XmlLiteUtil.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/XmlLiteUtil.h b/ECSUtil/XmlLiteUtil.h index b2a17f5..ba8a05d 100644 --- a/ECSUtil/XmlLiteUtil.h +++ b/ECSUtil/XmlLiteUtil.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/cbuffer.cpp b/ECSUtil/cbuffer.cpp index b7a3566..68efd09 100644 --- a/ECSUtil/cbuffer.cpp +++ b/ECSUtil/cbuffer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/cbuffer.h b/ECSUtil/cbuffer.h index 1c5a6e5..eaaf307 100644 --- a/ECSUtil/cbuffer.h +++ b/ECSUtil/cbuffer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/dyndll.h b/ECSUtil/dyndll.h index 56188cc..682dc1e 100644 --- a/ECSUtil/dyndll.h +++ b/ECSUtil/dyndll.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/exportdef.h b/ECSUtil/exportdef.h index 866b185..b97109c 100644 --- a/ECSUtil/exportdef.h +++ b/ECSUtil/exportdef.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/fmtnum.cpp b/ECSUtil/fmtnum.cpp index d3b3d37..035d5e2 100644 --- a/ECSUtil/fmtnum.cpp +++ b/ECSUtil/fmtnum.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/fmtnum.h b/ECSUtil/fmtnum.h index 56304e7..1eb9b68 100644 --- a/ECSUtil/fmtnum.h +++ b/ECSUtil/fmtnum.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/generic_defs.h b/ECSUtil/generic_defs.h index d2931d1..c72823d 100644 --- a/ECSUtil/generic_defs.h +++ b/ECSUtil/generic_defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/libhandle.h b/ECSUtil/libhandle.h index a328d67..fc5eb16 100644 --- a/ECSUtil/libhandle.h +++ b/ECSUtil/libhandle.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/stdafx.cpp b/ECSUtil/stdafx.cpp index fdb2227..2188aea 100644 --- a/ECSUtil/stdafx.cpp +++ b/ECSUtil/stdafx.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/stdafx.h b/ECSUtil/stdafx.h index 580e2b5..a24b0ad 100644 --- a/ECSUtil/stdafx.h +++ b/ECSUtil/stdafx.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/targetver.h b/ECSUtil/targetver.h index dbe2a81..3f884a2 100644 --- a/ECSUtil/targetver.h +++ b/ECSUtil/targetver.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/ECSUtil/widestring.h b/ECSUtil/widestring.h index 9861e3a..adefff3 100644 --- a/ECSUtil/widestring.h +++ b/ECSUtil/widestring.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994 - 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/S3Test/Resource.h b/S3Test/Resource.h index d9ac198..a7d65bd 100644 --- a/S3Test/Resource.h +++ b/S3Test/Resource.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/S3Test/S3Test.cpp b/S3Test/S3Test.cpp index 5e8f880..c3fb587 100644 --- a/S3Test/S3Test.cpp +++ b/S3Test/S3Test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/S3Test/S3Test.h b/S3Test/S3Test.h index 0ae2543..9a73dad 100644 --- a/S3Test/S3Test.h +++ b/S3Test/S3Test.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/S3Test/stdafx.cpp b/S3Test/stdafx.cpp index ba020a1..8a48da0 100644 --- a/S3Test/stdafx.cpp +++ b/S3Test/stdafx.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/S3Test/stdafx.h b/S3Test/stdafx.h index 447e2a4..8622684 100644 --- a/S3Test/stdafx.h +++ b/S3Test/stdafx.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/S3Test/targetver.h b/S3Test/targetver.h index dbe2a81..3f884a2 100644 --- a/S3Test/targetver.h +++ b/S3Test/targetver.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, EMC Corporation. All Rights Reserved. + * Copyright (c) 2017 - 2019, Dell Technologies, Inc. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License.