Changeset 96401 in vbox

Timestamp:

Aug 22, 2022 3:06:19 PM (2 years ago)

Author:

vboxsync

Message:

bldprogs/scm: Teach it to replace the old copyright and license notices with the updated ones (e.g. GPlv2 to GPLv3).

Location:

trunk/src/bldprogs

Files:

• scm.cpp (modified) (8 diffs)
• scm.h (modified) (3 diffs)
• scmparser.cpp (modified) (11 diffs)
• scmrw.cpp (modified) (24 diffs)

trunk/src/bldprogs/scm.cpp

@@ -336 +336 @@
 SCM_REWRITER_CFG(g_Copyright_SqlComment,            "copyright-sql-style",          rewrite_Copyright_SqlComment);
 SCM_REWRITER_CFG(g_Copyright_TickComment,           "copyright-tick-style",         rewrite_Copyright_TickComment);
+SCM_REWRITER_CFG(g_Copyright_XmlComment,            "copyright-xml-style",          rewrite_Copyright_XmlComment);
 SCM_REWRITER_CFG(g_Makefile_kup,                    "makefile-kup",                 rewrite_Makefile_kup);
 SCM_REWRITER_CFG(g_Makefile_kmk,                    "makefile-kmk",                 rewrite_Makefile_kmk);
@@ -648 +649 @@
     &g_SvnSyncProcess,
     &g_UnicodeChecks,
-    /** @todo copyright is in an XML comment. */
+    &g_Copyright_XmlComment,
 };
 
@@ -661 +662 @@
     &g_SvnSyncProcess,
     &g_UnicodeChecks,
-    /** @todo copyright is in an XML comment. */
+    &g_Copyright_XmlComment,
 };
 
@@ -674 +675 @@
     &g_SvnSyncProcess,
     &g_UnicodeChecks,
-    /** @todo copyright is in an XML comment. */
+    &g_Copyright_XmlComment,
 };
 
@@ -802 +803 @@
     SCM_CFG_ENTRY("kup",        g_apRewritersFor_Makefile_kup,     false, "Makefile.kup" ),
     SCM_CFG_ENTRY("kmk",        g_apRewritersFor_Makefile_kmk,     false, "*.kmk" ),
-    SCM_CFG_ENTRY("c",          g_apRewritersFor_C_and_CPP,        false, "*.c|*.cpp|*.C|*.CPP|*.cxx|*.cc|*.m|*.mm" ),
+    SCM_CFG_ENTRY("c",          g_apRewritersFor_C_and_CPP,        false, "*.c|*.cpp|*.C|*.CPP|*.cxx|*.cc|*.m|*.mm|*.lds" ),
     SCM_CFG_ENTRY("h",          g_apRewritersFor_H_and_HPP,        false, "*.h|*.hpp" ),
     SCM_CFG_ENTRY("rc",         g_apRewritersFor_RC,               false, "*.rc" ),
@@ -821 +822 @@
     SCM_CFG_ENTRY("image",      g_apRewritersFor_Images,           true,  "*.png|*.bmp|*.jpg|*.pnm|*.ico|*.icns|*.tiff|*.tif|*.xcf|*.gif" ),
     SCM_CFG_ENTRY("xslt",       g_apRewritersFor_Xslt,             false, "*.xsl" ),
-    SCM_CFG_ENTRY("xml",        g_apRewritersFor_Xml,              false, "*.xml" ),
+    SCM_CFG_ENTRY("xml",        g_apRewritersFor_Xml,              false, "*.xml|*.dist|*.qhcp" ),
     SCM_CFG_ENTRY("wix",        g_apRewritersFor_Wix,              false, "*.wxi|*.wxs|*.wxl" ),
     SCM_CFG_ENTRY("qt-pro",     g_apRewritersFor_QtProject,        false, "*.pro" ),
@@ -832 +833 @@
     SCM_CFG_ENTRY("binary",     g_apRewritersFor_BinaryFiles,      true,  "*.bin|*.pdf|*.zip|*.bz2|*.gz" ),
     /* These should be be last: */
-    SCM_CFG_ENTRY("make",       g_apRewritersFor_OtherMakefiles,   false, "Makefile|makefile|GNUmakefile|SMakefile|Makefile.am|Makefile.in|*.cmake" ),
+    SCM_CFG_ENTRY("make",       g_apRewritersFor_OtherMakefiles,   false, "Makefile|makefile|GNUmakefile|SMakefile|Makefile.am|Makefile.in|*.cmake|*.gmk" ),
     SCM_CFG_ENTRY("text",       g_apRewritersFor_TextFiles,        false, "*.txt|README*|readme*|ReadMe*|NOTE*|TODO*" ),
     SCM_CFG_ENTRY("plaintext",  g_apRewritersFor_PlainTextFiles,   false, "LICENSE|ChangeLog|FAQ|AUTHORS|INSTALL|NEWS" ),
@@ -2837 +2838 @@
                              || strstr(paOpts[i+1].pszLong, "-not-") != NULL
                              || strstr(paOpts[i+1].pszLong, "-dont-") != NULL
-                             || strcmp(paOpts[i+1].pszLong, "--unrestricted-ASMMemPage-use") == 0
+                             || strstr(paOpts[i+1].pszLong, "-unrestricted-") != NULL
                              || (paOpts[i].iShort == 'q' && paOpts[i+1].iShort == 'v')
                              || (paOpts[i].iShort == 'd' && paOpts[i+1].iShort == 'D')

trunk/src/bldprogs/scm.h

@@ -85 +85 @@
     kScmCommentStyle_Sql,
     kScmCommentStyle_Tick,
+    kScmCommentStyle_Xml,
     kScmCommentStyle_End
 } SCMCOMMENTSTYLE;
@@ -105 +106 @@
     kScmCommentType_MultiLine_Qt_After,         /**< Multi-line comment, Qt after-member style.  */
     kScmCommentType_DocString,                  /**< Triple quoted python doc string. */
+    kScmCommentType_Xml,                        /**< XML comment style. */
     kScmCommentType_End                         /**< Customary exclusive end value. */
 } SCMCOMMENTTYPE;
@@ -262 +264 @@
 FNSCMREWRITER rewrite_Copyright_SqlComment;
 FNSCMREWRITER rewrite_Copyright_TickComment;
+FNSCMREWRITER rewrite_Copyright_XmlComment;
 FNSCMREWRITER rewrite_Makefile_kup;
 FNSCMREWRITER rewrite_Makefile_kmk;

trunk/src/bldprogs/scmparser.cpp

@@ -95 +95 @@
 
 
+/** Macro for checking for a XML comment start. */
+#define IS_XML_COMMENT_START(a_pch, a_off, a_cch) \
+        (   (a_off) + 4 <= (a_cch) \
+         && (a_pch)[(a_off)    ] == '<' \
+         && (a_pch)[(a_off) + 1] == '!' \
+         && (a_pch)[(a_off) + 2] == '-' \
+         && (a_pch)[(a_off) + 3] == '-' \
+         && ((a_off) + 4 == (a_cch) || RT_C_IS_SPACE((a_pch)[(a_off) + 4])) )
+
+/** Macro for checking for a XML comment end. */
+#define IS_XML_COMMENT_END(a_pch, a_off, a_cch) \
+        (   (a_off) + 3 <= (a_cch) \
+         && (a_pch)[(a_off)    ] == '-' \
+         && (a_pch)[(a_off) + 1] == '-' \
+         && (a_pch)[(a_off) + 2] == '>')
+
+
 /** Macro for checking for a batch file comment prefix. */
 #define IS_REM(a_pch, a_off, a_cch) \
@@ -199 +216 @@
     off += cchSkip;
 
-    /* Determin comment type. */
+    /* Determine comment type. */
     Info.enmType = kScmCommentType_Line;
     char ch;
@@ -340 +357 @@
 
 /**
- * Common string litteral handler.
+ * Common string literal handler.
  *
  * @returns new pchLine value.
@@ -352 +369 @@
  * @param   poff        Pointer to the line offset variable.
  */
-static const char *handleStringLitteral(PSCMSTREAM pIn, char chType, const char *pchLine, size_t *pcchLine, PSCMEOL penmEol,
-                                        uint32_t *piLine, size_t *poff)
+static const char *handleStringLiteral(PSCMSTREAM pIn, char chType, const char *pchLine, size_t *pcchLine, PSCMEOL penmEol,
+                                       uint32_t *piLine, size_t *poff)
 {
     size_t off = *poff;
@@ -443 +460 @@
                         Info.cBlankLinesBefore  = 0;
 
-                        /* Determin comment type (same as for line-comments). */
+                        /* Determine comment type (same as for line-comments). */
                         Info.enmType = kScmCommentType_MultiLine;
                         if (   off < cchLine
@@ -594 +611 @@
             {
                 /*
-                 * String litterals may include sequences that looks like comments.  So,
+                 * String literal may include sequences that looks like comments.  So,
                  * they needs special handling to avoid confusion.
                  */
-                pchLine = handleStringLitteral(pIn, '"', pchLine, &cchLine, &enmEol, &iLine, &off);
+                pchLine = handleStringLiteral(pIn, '"', pchLine, &cchLine, &enmEol, &iLine, &off);
             }
-            /* else: We don't have to deal with character litterals as these shouldn't
+            /* else: We don't have to deal with character literal as these shouldn't
                      include comment-like sequences. */
         } /* for each character in the line */
@@ -659 +676 @@
             {
                 /*
-                 * String litterals may be doc strings and they may legally include hashes.
+                 * String literal may be doc strings and they may legally include hashes.
                  */
                 const char chType = ch;
@@ -665 +682 @@
                     || pchLine[off] != chType
                     || pchLine[off + 1] != chType)
-                    pchLine = handleStringLitteral(pIn, chType, pchLine, &cchLine, &enmEol, &iLine, &off);
+                    pchLine = handleStringLiteral(pIn, chType, pchLine, &cchLine, &enmEol, &iLine, &off);
                 else
                 {
@@ -806 +823 @@
                     break;
             }
-            /* else: We don't have to deal with character litterals as these shouldn't
+            /* else: We don't have to deal with character literal as these shouldn't
                      include comment-like sequences. */
+        } /* for each character in the line */
+
+        iLine++;
+    } /* for each line in the stream */
+
+    int rcStream = ScmStreamGetStatus(pIn);
+    if (RT_SUCCESS(rcStream))
+        return rcRet;
+    return rcStream;
+}
+
+
+/**
+ * Deals with XML comments.
+ *
+ * @returns VBox status code / callback return code.
+ * @param   pIn                 The stream to parse.
+ * @param   pfnCallback         The callback.
+ * @param   pvUser              The user parameter for the callback.
+ */
+static int enumerateXmlComments(PSCMSTREAM pIn, PFNSCMCOMMENTENUMERATOR pfnCallback, void *pvUser)
+{
+    int             rcRet = VINF_SUCCESS;
+    uint32_t        iLine = 0;
+    SCMEOL          enmEol;
+    size_t          cchLine;
+    const char     *pchLine;
+    while ((pchLine = ScmStreamGetLine(pIn, &cchLine, &enmEol)) != NULL)
+    {
+        size_t off = 0;
+        while (off < cchLine)
+        {
+            /*
+             * Skip leading blanks and check for start of XML comment.
+             */
+            while (off + 3 < cchLine && RT_C_IS_SPACE(pchLine[off]))
+                off++;
+            if (IS_XML_COMMENT_START(pchLine, off, cchLine))
+            {
+                /*
+                 * XML comment.  Find the end.
+                 *
+                 * Note! This is very similar to the python doc string handling above.
+                 */
+                SCMCOMMENTINFO  Info;
+                Info.iLineStart         = iLine;
+                Info.offStart           = (uint32_t)off;
+                Info.iLineEnd           = UINT32_MAX;
+                Info.offEnd             = UINT32_MAX;
+                Info.cBlankLinesBefore  = 0;
+                Info.enmType            = kScmCommentType_Xml;
+
+                off += 4;
+
+                /*
+                 * Copy the body and find the end of the XML comment.
+                 */
+                size_t          cbBodyAlloc = 0;
+                size_t          cchBody     = 0;
+                char           *pszBody     = NULL;
+                for (;;)
+                {
+                    /* Parse the line up to the end-of-comment or end-of-line. */
+                    size_t offLineStart     = off;
+                    size_t offLastNonBlank  = off;
+                    size_t offFirstNonBlank = ~(size_t)0;
+                    while (off < cchLine)
+                    {
+                        if (!IS_XML_COMMENT_END(pchLine, off, cchLine))
+                        {
+                            char ch = pchLine[off++];
+                            if (RT_C_IS_BLANK(ch))
+                            {/* kind of likely */}
+                            else
+                            {
+                                offLastNonBlank = off - 1;
+                                if (offFirstNonBlank != ~(size_t)0)
+                                {/* likely */}
+                                else if (   (ch != '*' && ch != '#')    /* ignore continuation-asterisks */
+                                         || off > Info.offStart + 1 + 1
+                                         || off > cchLine
+                                         || (   off < cchLine
+                                              && !RT_C_IS_SPACE(pchLine[off]))
+                                         || pszBody == NULL)
+                                    offFirstNonBlank = off - 1;
+                            }
+                        }
+                        else
+                        {
+                            off += 3;
+                            Info.offEnd   = (uint32_t)off;
+                            Info.iLineEnd = iLine;
+                            break;
+                        }
+                    }
+
+                    /* Append line content to the comment body string. */
+                    size_t cchAppend;
+                    if (offFirstNonBlank == ~(size_t)0)
+                        cchAppend = 0; /* empty line */
+                    else
+                    {
+                        offLineStart = offFirstNonBlank;
+                        cchAppend = offLastNonBlank + 1 - offLineStart;
+                        Assert(cchAppend <= cchLine);
+                    }
+
+                    size_t cchNewBody = cchBody + (cchBody > 0) + cchAppend;
+                    if (cchNewBody >= cbBodyAlloc)
+                    {
+                        cbBodyAlloc = RT_MAX(cbBodyAlloc ? cbBodyAlloc * 2 : _1K, RT_ALIGN_Z(cchNewBody + 64, 128));
+                        void *pvNew = RTMemRealloc(pszBody, cbBodyAlloc);
+                        if (pvNew)
+                            pszBody = (char *)pvNew;
+                        else
+                        {
+                            RTMemFree(pszBody);
+                            return VERR_NO_MEMORY;
+                        }
+                    }
+
+                    if (cchBody > 0)                        /* no leading blank lines */
+                        pszBody[cchBody++] = '\n';
+                    else if (cchAppend == 0)
+                        Info.cBlankLinesBefore++;
+                    memcpy(&pszBody[cchBody], &pchLine[offLineStart], cchAppend);
+                    cchBody += cchAppend;
+                    pszBody[cchBody] = '\0';
+
+                    /* Advance to the next line, if we haven't yet seen the end of this comment. */
+                    if (Info.iLineEnd != UINT32_MAX)
+                        break;
+                    pchLine = ScmStreamGetLine(pIn, &cchLine, &enmEol);
+                    if (!pchLine)
+                    {
+                        Info.offEnd   = (uint32_t)cchLine;
+                        Info.iLineEnd = iLine;
+                        break;
+                    }
+                    iLine++;
+                    off = 0;
+                }
+
+                /* Strip trailing empty lines in the body. */
+                Info.cBlankLinesAfter = 0;
+                while (cchBody >= 1 && pszBody[cchBody - 1] == '\n')
+                {
+                    Info.cBlankLinesAfter++;
+                    pszBody[--cchBody] = '\0';
+                }
+
+                /* Do the callback. */
+                int rc = pfnCallback(&Info, pszBody, cchBody, pvUser);
+                RTMemFree(pszBody);
+                if (RT_FAILURE(rc))
+                    return rc;
+                if (rc > VINF_SUCCESS && rcRet == VINF_SUCCESS)
+                    rcRet = rc;
+            }
+            else
+                off++;
         } /* for each character in the line */
 
@@ -839 +1017 @@
         /*
          * Skip leading blanks and check for 'rem'.
-         * At the moment we do not parse '::lable-comments'.
+         * At the moment we do not parse '::label-comments'.
          */
         size_t off = 0;
@@ -1002 +1180 @@
             return enumerateSimpleLineComments(pIn, '\'', isTickComment, pfnCallback, pvUser);
 
+        case kScmCommentStyle_Xml:
+            return enumerateXmlComments(pIn, pfnCallback, pvUser);
+
         default:
             AssertFailedReturn(VERR_INVALID_PARAMETER);

trunk/src/bldprogs/scmrw.cpp

@@ -135 +135 @@
 /** --license-ose-gpl */
 static const char g_szVBoxOseGpl[] =
+    "This file is part of VirtualBox base platform packages, as\n"
+    "available from https://www.virtualbox.org.\n"
+    "\n"
+    "This program is free software; you can redistribute it and/or\n"
+    "modify it under the terms of the GNU General Public License\n"
+    "as published by the Free Software Foundation, in version 3 of the\n"
+    "License.\n"
+    "\n"
+    "This program is distributed in the hope that it will be useful, but\n"
+    "WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
+    "General Public License for more details.\n"
+    "\n"
+    "You should have received a copy of the GNU General Public License\n"
+    "along with this program; if not, see <https://www.gnu.org/licenses>.\n"
+    "\n"
+    "SPDX-License-Identifier: GPL-3.0-only\n";
+
+static const char g_szVBoxOseOldGpl2[] =
     "This file is part of VirtualBox Open Source Edition (OSE), as\n"
     "available from http://www.virtualbox.org. This file is free software;\n"
@@ -145 +164 @@
 /** --license-ose-dual */
 static const char g_szVBoxOseDualGplCddl[] =
+    "This file is part of VirtualBox base platform packages, as\n"
+    "available from https://www.virtualbox.org.\n"
+    "\n"
+    "This program is free software; you can redistribute it and/or\n"
+    "modify it under the terms of the GNU General Public License\n"
+    "as published by the Free Software Foundation, in version 3 of the\n"
+    "License.\n"
+    "\n"
+    "This program is distributed in the hope that it will be useful, but\n"
+    "WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
+    "General Public License for more details.\n"
+    "\n"
+    "You should have received a copy of the GNU General Public License\n"
+    "along with this program; if not, see <https://www.gnu.org/licenses>.\n"
+    "\n"
+    "The contents of this file may alternatively be used under the terms\n"
+    "of the Common Development and Distribution License Version 1.0\n"
+    "(CDDL), a copy of it is provided in the \"COPYING.CDDL\" file included\n"
+    "in the VirtualBox distribution, in which case the provisions of the\n"
+    "CDDL are applicable instead of those of the GPL.\n"
+    "\n"
+    "You may elect to license modified versions of this file under the\n"
+    "terms and conditions of either the GPL or the CDDL or both.\n"
+    "\n"
+    "SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0\n";
+
+static const char g_szVBoxOseOldDualGpl2Cddl[] =
     "This file is part of VirtualBox Open Source Edition (OSE), as\n"
     "available from http://www.virtualbox.org. This file is free software;\n"
@@ -164 +211 @@
 /** --license-ose-cddl   */
 static const char g_szVBoxOseCddl[] =
+    "This file is part of VirtualBox base platform packages, as\n"
+    "available from http://www.virtualbox.org.\n"
+    "\n"
+    "The contents of this file are subject to the terms of the Common\n"
+    "Development and Distribution License Version 1.0 (CDDL) only, as it\n"
+    "comes in the \"COPYING.CDDL\" file of the VirtualBox distribution.\n"
+    "\n"
+    "SPDX-License-Identifier: CDDL-1.0\n";
+
+static const char g_szVBoxOseOldCddl[] =
     "This file is part of VirtualBox Open Source Edition (OSE), as\n"
     "available from http://www.virtualbox.org. This file is free software;\n"
@@ -177 +234 @@
     "it and/or modify it under the terms of the GNU Lesser General\n"
     "Public License version 2.1 as published by the Free Software\n"
-    "Foundation and shipped in the \"COPYING\" file with this library.\n"
+    "Foundation and shipped in the \"COPYING.LIB\" file with this library.\n"
     "The library is distributed in the hope that it will be useful,\n"
     "but WITHOUT ANY WARRANTY of any kind.\n"
@@ -188 +245 @@
     "language indicating that LGPLv2 or any later version may be used,\n"
     "or where a choice of which version of the LGPL is applied is\n"
-    "otherwise unspecified.\n";
+    "otherwise unspecified.\n"
+    "\n"
+    "SPDX-License-Identifier: LGPL-2.1-only\n";
 
 /** --license-mit
@@ -333 +392 @@
 /** Oracle confidential. */
 static const char g_szOracleConfidential[] =
+    "Oracle Corporation confidential\n";
+
+/** Oracle confidential, old style. */
+static const char g_szOracleConfidentialOld[] =
     "Oracle Corporation confidential\n"
     "All rights reserved\n";
@@ -340 +403 @@
 {
     { kScmLicenseType_OseGpl,           kScmLicense_OseGpl,         RT_STR_TUPLE(g_szVBoxOseGpl)},
+    { kScmLicenseType_OseGpl,           kScmLicense_OseGpl,         RT_STR_TUPLE(g_szVBoxOseOldGpl2)},
     { kScmLicenseType_OseDualGplCddl,   kScmLicense_OseDualGplCddl, RT_STR_TUPLE(g_szVBoxOseDualGplCddl) },
+    { kScmLicenseType_OseDualGplCddl,   kScmLicense_OseDualGplCddl, RT_STR_TUPLE(g_szVBoxOseOldDualGpl2Cddl) },
     { kScmLicenseType_OseCddl,          kScmLicense_OseCddl,        RT_STR_TUPLE(g_szVBoxOseCddl) },
+    { kScmLicenseType_OseCddl,          kScmLicense_OseCddl,        RT_STR_TUPLE(g_szVBoxOseOldCddl) },
     { kScmLicenseType_VBoxLgpl,         kScmLicense_Lgpl,           RT_STR_TUPLE(g_szVBoxLgpl)},
     { kScmLicenseType_Confidential,     kScmLicense_End,            RT_STR_TUPLE(g_szOracleConfidential) },
+    { kScmLicenseType_Confidential,     kScmLicense_End,            RT_STR_TUPLE(g_szOracleConfidentialOld) },
     { kScmLicenseType_Invalid,          kScmLicense_End,            NULL, 0 },
 };
@@ -357 +424 @@
     { kScmLicenseType_Mit,              kScmLicense_Mit,            RT_STR_TUPLE(g_szMitAlt5) },
     { kScmLicenseType_OseGpl,           kScmLicense_OseGpl,         RT_STR_TUPLE(g_szVBoxOseGpl)},
+    { kScmLicenseType_OseGpl,           kScmLicense_OseGpl,         RT_STR_TUPLE(g_szVBoxOseOldGpl2)},
     { kScmLicenseType_OseDualGplCddl,   kScmLicense_OseDualGplCddl, RT_STR_TUPLE(g_szVBoxOseDualGplCddl) },
+    { kScmLicenseType_OseDualGplCddl,   kScmLicense_OseDualGplCddl, RT_STR_TUPLE(g_szVBoxOseOldDualGpl2Cddl) },
     { kScmLicenseType_VBoxLgpl,         kScmLicense_Lgpl,           RT_STR_TUPLE(g_szVBoxLgpl)},
     { kScmLicenseType_Confidential,     kScmLicense_End,            RT_STR_TUPLE(g_szOracleConfidential) },
+    { kScmLicenseType_Confidential,     kScmLicense_End,            RT_STR_TUPLE(g_szOracleConfidentialOld) },
     { kScmLicenseType_Invalid,          kScmLicense_End,            NULL, 0 },
 };
 
 /** Copyright holder. */
-static const char g_szCopyrightHolder[] = "Oracle Corporation";
+static const char g_szCopyrightHolder[] = "Oracle and/or its affiliates.";
+
+/** Old copyright holder. */
+static const char g_szOldCopyrightHolder[] = "Oracle Corporation";
 
 /** LGPL disclaimer. */
@@ -388 +461 @@
     { RT_STR_TUPLE("--") },
     { RT_STR_TUPLE("'") },
+    { RT_STR_TUPLE("<!--") },
     { RT_STR_TUPLE("<end>") },
 };
@@ -404 +478 @@
     { RT_STR_TUPLE("-- ") },
     { RT_STR_TUPLE("' ") },
+    { RT_STR_TUPLE("    ") },
     { RT_STR_TUPLE("<end>") },
 };
@@ -420 +495 @@
     { RT_STR_TUPLE("--") },
     { RT_STR_TUPLE("'") },
+    { RT_STR_TUPLE("") },
     { RT_STR_TUPLE("<end>") },
 };
@@ -436 +512 @@
     { RT_STR_TUPLE("--") },
     { RT_STR_TUPLE("'") },
+    { RT_STR_TUPLE("-->") },
     { RT_STR_TUPLE("<end>") },
 };
@@ -446 +523 @@
  * @param   pIn         The file to scan.  Will be rewound.
  */
-static SCMCOMMENTSTYLE determinBatchFileCommentStyle(PSCMSTREAM pIn)
+static SCMCOMMENTSTYLE determineBatchFileCommentStyle(PSCMSTREAM pIn)
 {
     /*
@@ -1333 +1410 @@
     uint32_t cBlankLinesAfterCopyright = 0;
     if (   pState->iLineCopyright == UINT32_MAX
-        && cchBody > sizeof("Copyright") + sizeof(g_szCopyrightHolder)
+        && cchBody > sizeof("Copyright") + RT_MIN(sizeof(g_szCopyrightHolder), sizeof(g_szOldCopyrightHolder))
         && RTStrNICmp(pszBody, RT_STR_TUPLE("copyright")) == 0)
     {
@@ -1342 +1419 @@
         while (RT_C_IS_SPACE(pszEnd[-1]))
             pszEnd--;
-        if (   (uintptr_t)(pszEnd - pszBody) > sizeof(g_szCopyrightHolder)
-            && (*(unsigned char *)(pszEnd - sizeof(g_szCopyrightHolder) + 1) & 0x80) == 0 /* to avoid annoying assertion */
-            && RTStrNICmp(pszEnd - sizeof(g_szCopyrightHolder) + 1, RT_STR_TUPLE(g_szCopyrightHolder)) == 0)
+        if (   (   (uintptr_t)(pszEnd - pszBody) > sizeof(g_szCopyrightHolder)
+                && (*(unsigned char *)(pszEnd - sizeof(g_szCopyrightHolder) + 1) & 0x80) == 0 /* to avoid annoying assertion */
+                && RTStrNICmp(pszEnd - sizeof(g_szCopyrightHolder) + 1, RT_STR_TUPLE(g_szCopyrightHolder)) == 0)
+            || (   (uintptr_t)(pszEnd - pszBody) > sizeof(g_szOldCopyrightHolder)
+                && (*(unsigned char *)(pszEnd - sizeof(g_szOldCopyrightHolder) + 1) & 0x80) == 0 /* to avoid annoying assertion */
+                && RTStrNICmp(pszEnd - sizeof(g_szOldCopyrightHolder) + 1, RT_STR_TUPLE(g_szOldCopyrightHolder)) == 0) )
         {
             /* Parse out the year(s). */
@@ -1361 +1441 @@
                         || pState->uFirstYear > 3000)
                     {
-                        ScmError(pState->pState, VERR_OUT_OF_RANGE, "Copyright year is out of range: %u ('%.*s')\n",
-                                 pState->uFirstYear, pszEnd - pszBody, pszBody);
+                        char *pszCopy = RTStrDupN(pszBody, pszEnd - pszBody);
+                        RTStrPurgeEncoding(pszCopy);
+                        ScmError(pState->pState, VERR_OUT_OF_RANGE, "Copyright year is out of range: %u ('%s')\n",
+                                 pState->uFirstYear, pszCopy);
+                        RTStrFree(pszCopy);
                         pState->uFirstYear = UINT32_MAX;
                     }
@@ -1381 +1464 @@
                                 || pState->uLastYear > 3000)
                             {
-                                ScmError(pState->pState, VERR_OUT_OF_RANGE, "Second copyright year is out of range: %u ('%.*s')\n",
-                                         pState->uLastYear, pszEnd - pszBody, pszBody);
+                                char *pszCopy = RTStrDupN(pszBody, pszEnd - pszBody);
+                                RTStrPurgeEncoding(pszCopy);
+                                ScmError(pState->pState, VERR_OUT_OF_RANGE, "Second copyright year is out of range: %u ('%s')\n",
+                                         pState->uLastYear, pszCopy);
+                                RTStrFree(pszCopy);
                                 pState->uLastYear = UINT32_MAX;
                             }
                             else if (pState->uFirstYear > pState->uLastYear)
                             {
-                                RTMsgWarning("Copyright years switched(?): '%.*s'\n", pszEnd - pszBody, pszBody);
+                                char *pszCopy = RTStrDupN(pszBody, pszEnd - pszBody);
+                                RTStrPurgeEncoding(pszCopy);
+                                RTMsgWarning("Copyright years switched(?): '%s'\n", pszCopy);
+                                RTStrFree(pszCopy);
                                 uint32_t iTmp = pState->uLastYear;
                                 pState->uLastYear = pState->uFirstYear;
@@ -1396 +1485 @@
                         {
                             pState->uLastYear = UINT32_MAX;
+                            char *pszCopy = RTStrDupN(pszBody, pszEnd - pszBody);
+                            RTStrPurgeEncoding(pszCopy);
                             ScmError(pState->pState, RT_SUCCESS(rc) ? -rc : rc,
-                                     "Failed to parse second copyright year: '%.*s'\n", pszEnd - pszBody, pszBody);
+                                     "Failed to parse second copyright year: '%s'\n", pszCopy);
+                            RTMemFree(pszCopy);
                         }
                     }
                     else if (*pszNext != g_szCopyrightHolder[0])
+                    {
+                        char *pszCopy = RTStrDupN(pszBody, pszEnd - pszBody);
+                        RTStrPurgeEncoding(pszCopy);
                         ScmError(pState->pState, VERR_PARSE_ERROR,
-                                 "Failed to parse copyright: '%.*s'\n", pszEnd - pszBody, pszBody);
-                    else
+                                 "Failed to parse copyright: '%s'\n", pszCopy);
+                        RTMemFree(pszCopy);
+                    } else
                         pState->uLastYear = pState->uFirstYear;
                 }
@@ -1409 +1505 @@
                 {
                     pState->uFirstYear = UINT32_MAX;
+                    char *pszCopy = RTStrDupN(pszBody, pszEnd - pszBody);
+                    RTStrPurgeEncoding(pszCopy);
                     ScmError(pState->pState, RT_SUCCESS(rc) ? -rc : rc,
-                             "Failed to parse copyright year: '%.*s'\n", pszEnd - pszBody, pszBody);
+                             "Failed to parse copyright year: '%s'\n", pszCopy);
+                    RTMemFree(pszCopy);
                 }
             }
@@ -1482 +1581 @@
         }
         else
-            ScmVerbose(pState->pState, 3, "not oracle copyright: '%.*s'\n", pszEnd - pszBody, pszBody);
+        {
+            char *pszCopy = RTStrDupN(pszBody, pszEnd - pszBody);
+            RTStrPurgeEncoding(pszCopy);
+            ScmVerbose(pState->pState, 3, "not oracle copyright: '%s'\n", pszCopy);
+            RTStrFree(pszCopy);
+        }
 
         if (!pszNextLine)
@@ -1611 +1715 @@
                 {
                     /* In C/C++ code, this must be a multiline comment.  While in python it
-                       must be a */
+                       must be a doc-string. */
                     if (pState->enmCommentStyle == kScmCommentStyle_C && pInfo->enmType != kScmCommentType_MultiLine)
                         ScmError(pState->pState, VERR_WRONG_ORDER, "License must appear in a multiline comment (no doxygen stuff)\n");
@@ -1626 +1730 @@
                     pState->pCurrentLicense     = pCur;
                     pState->fExternalLicense    = fExternal;
-                    pState->fIsCorrectLicense   = pState->fOpenSource
-                                                ? pCur == pState->pExpectedLicense
-                                                : pCur->enmType == kScmLicenseType_Confidential;
+                    pState->fIsCorrectLicense   = pCur == pState->pExpectedLicense;
                     pState->fWellFormedLicense  = memcmp(pszBody, pCur->psz, pCur->cch - 1) == 0;
                     if (!pState->fWellFormedLicense)
@@ -2008 +2110 @@
 bool rewrite_Copyright_RemComment(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
 {
-    return rewrite_Copyright_Common(pState, pIn, pOut, pSettings, determinBatchFileCommentStyle(pIn));
+    return rewrite_Copyright_Common(pState, pIn, pOut, pSettings, determineBatchFileCommentStyle(pIn));
 }
 
@@ -2033 +2135 @@
 {
     return rewrite_Copyright_Common(pState, pIn, pOut, pSettings, kScmCommentStyle_Tick);
+}
+
+/** Copyright updater for XML comments.   */
+bool rewrite_Copyright_XmlComment(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
+    return rewrite_Copyright_Common(pState, pIn, pOut, pSettings, kScmCommentStyle_Xml);
 }