Changeset 26347 in vbox

Timestamp:

Feb 9, 2010 4:26:18 AM (15 years ago)

Author:

vboxsync

Message:

scm: bed time

File:

• trunk/src/bldprogs/scm.cpp (modified) (3 diffs)

trunk/src/bldprogs/scm.cpp

@@ -274 +274 @@
 static PFNSCMREWRITER const g_aRewritersFor_BatchFiles[] =
 {
-    rewrite_ForceLF,
+    rewrite_ForceCRLF,
     rewrite_ExpandTabs,
     rewrite_StripTrailingBlanks
@@ -1172 +1172 @@
         RTStrmPutCh(pState->pDiff, chPrefix);
         if (pchLine && cchLine)
-            RTStrmWrite(pState->pDiff, pchLine, cchLine);
+        {
+            if (!pState->fSpecialChars)
+                RTStrmWrite(pState->pDiff, pchLine, cchLine);
+            else
+            {
+                size_t      offVir   = 0;
+                const char *pchStart = pchLine;
+                const char *pchTab   = (const char *)memchr(pchLine, '\t', cchLine);
+                while (pchTab)
+                {
+                    RTStrmWrite(pState->pDiff, pchStart, pchTab - pchStart);
+                    offVir += pchTab - pchStart;
+
+                    size_t cchTab = g_cchTab - offVir % g_cchTab;
+                    switch (cchTab)
+                    {
+                        case 1: RTStrmPutStr(pState->pDiff, "."); break;
+                        case 2: RTStrmPutStr(pState->pDiff, ".."); break;
+                        case 3: RTStrmPutStr(pState->pDiff, "[T]"); break;
+                        case 4: RTStrmPutStr(pState->pDiff, "[TA]"); break;
+                        case 5: RTStrmPutStr(pState->pDiff, "[TAB]"); break;
+                        default: RTStrmPrintf(pState->pDiff, "[TAB%.*s]", cchTab - 5, g_szTabSpaces); break;
+                    }
+                    offVir += cchTab;
+
+                    /* next */
+                    pchStart = pchTab + 1;
+                    pchTab = (const char *)memchr(pchStart, '\t', cchLine - (pchStart - pchLine));
+                }
+                size_t cchLeft = cchLine - (pchStart - pchLine);
+                if (cchLeft)
+                    RTStrmWrite(pState->pDiff, pchStart, cchLeft);
+            }
+        }
 
         if (!pState->fSpecialChars)
@@ -1452 +1485 @@
  * @param   fIgnoreTrailingWhite  Set if trailing white space should be ignored.
  * @param   fSpecialChars       Whether to print special chars in a human
- *                              readable form or not.  Currently only applicable
- *                              to the EOL marker.
+ *                              readable form or not.
  * @param   pDiff               Where to write the diff.
  */