Changeset 69286 in vbox for trunk/src/bldprogs/scmrw.cpp

Timestamp:

Oct 25, 2017 11:31:24 AM (7 years ago)

Author:

vboxsync

Message:

scm: Multiline contrib stuff. DTrace scripts. Darwin icons.

File:

• trunk/src/bldprogs/scmrw.cpp (modified) (2 diffs)

trunk/src/bldprogs/scmrw.cpp

@@ -1034 +1034 @@
     {
         const char *pszNextLine = (const char *)memchr(pszBody, '\n', cchBody);
+        while (pszNextLine && pszNextLine[1] != '\n')
+            pszNextLine = (const char *)memchr(pszNextLine + 1, '\n', cchBody);
         if (pszNextLine)
         {
@@ -1444 +1446 @@
                         if (Info.pszContributedBy)
                         {
-                            ScmStreamWrite(pOut, g_aCopyrightCommentPrefix[enmCommentStyle].psz,
-                                           g_aCopyrightCommentPrefix[enmCommentStyle].cch);
-                            ScmStreamWrite(pOut, Info.pszContributedBy, strlen(Info.pszContributedBy));
-                            ScmStreamPutEol(pOut, enmEol);
+                            const char *psz = Info.pszContributedBy;
+                            for (;;)
+                            {
+                                const char *pszEol = strchr(psz, '\n');
+                                size_t cchLine = pszEol ? pszEol - psz : strlen(psz);
+                                ScmStreamWrite(pOut, g_aCopyrightCommentPrefix[enmCommentStyle].psz,
+                                               g_aCopyrightCommentPrefix[enmCommentStyle].cch);
+                                ScmStreamWrite(pOut, psz, cchLine);
+                                ScmStreamPutEol(pOut, enmEol);
+                                if (!pszEol)
+                                    break;
+                                psz = pszEol + 1;
+                            }
 
                             ScmStreamPutLine(pOut, g_aCopyrightCommentEmpty[enmCommentStyle].psz,