Changeset 40530 in vbox for trunk

Timestamp:

Mar 19, 2012 11:13:17 AM (13 years ago)

Author:

vboxsync

Message:

scm: Splitting out the diff code while I'm at it.

Location:

trunk/src/bldprogs

Files:

: 3 edited
: 2 copied

Makefile.kmk (modified) (1 diff)
scm.cpp (modified) (3 diffs)
scmdiff.cpp (copied) (copied from trunk/src/bldprogs/scm.cpp ) (3 diffs)
scmdiff.h (copied) (copied from trunk/src/bldprogs/scm.cpp ) (3 diffs)
scmstream.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/src/bldprogs/Makefile.kmk

-              r40528
+              r40530
  scm_SOURCES = \
         scm.cpp \
+        scmstream.cpp
+        scmstream.cpp \
+        scmdiff.cpp
  scm_LIBS = \
         $(LIB_RUNTIME)

trunk/src/bldprogs/scm.cpp

-              r40528
+              r40530
 #include "scmstream.h"
+#include "scmdiff.h"
 …
 typedef SCMCFGENTRY const *PCSCMCFGENTRY;
-/**
- * Diff state.
- */
-typedef struct SCMDIFFSTATE
+{
-    size_t          cDiffs;
-    const char     *pszFilename;
-    PSCMSTREAM      pLeft;
-    PSCMSTREAM      pRight;
-    /** Whether to ignore end of line markers when diffing. */
-    bool            fIgnoreEol;
-    /** Whether to ignore trailing whitespace. */
-    bool            fIgnoreTrailingWhite;
-    /** Whether to ignore leading whitespace. */
-    bool            fIgnoreLeadingWhite;
-    /** Whether to print special characters in human readable form or not. */
-    bool            fSpecialChars;
-    /** The tab size. */
-    size_t          cchTab;
-    /** Where to push the diff. */
-    PRTSTREAM       pDiff;
-} SCMDIFFSTATE;
-/** Pointer to a diff state. */
-typedef SCMDIFFSTATE *PSCMDIFFSTATE;
 /**
 …
-/* -=-=-=-=-=- diff -=-=-=-=-=- */
-/**
- * Prints a range of lines with a prefix.
+ *
- * @param   pState              The diff state.
- * @param   chPrefix            The prefix.
- * @param   pStream             The stream to get the lines from.
- * @param   iLine               The first line.
- * @param   cLines              The number of lines.
- */
-static void scmDiffPrintLines(PSCMDIFFSTATE pState, char chPrefix, PSCMSTREAM pStream, size_t iLine, size_t cLines)
+{
-    while (cLines-- > 0)
+    {
-        SCMEOL      enmEol;
-        size_t      cchLine;
-        const char *pchLine = ScmStreamGetLineByNo(pStream, iLine, &cchLine, &enmEol);
-        RTStrmPutCh(pState->pDiff, chPrefix);
-        if (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 = pState->cchTab - offVir % pState->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)
-            RTStrmPutCh(pState->pDiff, '\n');
-        else if (enmEol == SCMEOL_LF)
-            RTStrmPutStr(pState->pDiff, "[LF]\n");
-        else if (enmEol == SCMEOL_CRLF)
-            RTStrmPutStr(pState->pDiff, "[CRLF]\n");
-        else
-            RTStrmPutStr(pState->pDiff, "[NONE]\n");
-        iLine++;
+    }
+}
-/**
- * Reports a difference and propels the streams to the lines following the
- * resync.
+ *
+ *
- * @returns New pState->cDiff value (just to return something).
- * @param   pState              The diff state.  The cDiffs member will be
- *                              incremented.
- * @param   cMatches            The resync length.
- * @param   iLeft               Where the difference starts on the left side.
- * @param   cLeft               How long it is on this side.  ~(size_t)0 is used
- *                              to indicate that it goes all the way to the end.
- * @param   iRight              Where the difference starts on the right side.
- * @param   cRight              How long it is.
- */
-static size_t scmDiffReport(PSCMDIFFSTATE pState, size_t cMatches,
-                            size_t iLeft, size_t cLeft,
-                            size_t iRight, size_t cRight)
+{
-    /*
-     * Adjust the input.
-     */
-    if (cLeft == ~(size_t)0)
+    {
-        size_t c = ScmStreamCountLines(pState->pLeft);
-        if (c >= iLeft)
-            cLeft = c - iLeft;
-        else
+        {
-            iLeft = c;
-            cLeft = 0;
+        }
+    }
-    if (cRight == ~(size_t)0)
+    {
-        size_t c = ScmStreamCountLines(pState->pRight);
-        if (c >= iRight)
-            cRight = c - iRight;
-        else
+        {
-            iRight = c;
-            cRight = 0;
+        }
+    }
-    /*
-     * Print header if it's the first difference
-     */
-    if (!pState->cDiffs)
-        RTStrmPrintf(pState->pDiff, "diff %s %s\n", pState->pszFilename, pState->pszFilename);
-    /*
-     * Emit the change description.
-     */
-    char ch = cLeft == 0
-            ? 'a'
-            : cRight == 0
-            ? 'd'
-            : 'c';
-    if (cLeft > 1 && cRight > 1)
-        RTStrmPrintf(pState->pDiff, "%zu,%zu%c%zu,%zu\n", iLeft + 1, iLeft + cLeft, ch, iRight + 1, iRight + cRight);
-    else if (cLeft > 1)
-        RTStrmPrintf(pState->pDiff, "%zu,%zu%c%zu\n",     iLeft + 1, iLeft + cLeft, ch, iRight + 1);
-    else if (cRight > 1)
-        RTStrmPrintf(pState->pDiff, "%zu%c%zu,%zu\n",     iLeft + 1,                ch, iRight + 1, iRight + cRight);
-    else
-        RTStrmPrintf(pState->pDiff, "%zu%c%zu\n",         iLeft + 1,                ch, iRight + 1);
-    /*
-     * And the lines.
-     */
-    if (cLeft)
-        scmDiffPrintLines(pState, '<', pState->pLeft, iLeft, cLeft);
-    if (cLeft && cRight)
-        RTStrmPrintf(pState->pDiff, "---\n");
-    if (cRight)
-        scmDiffPrintLines(pState, '>', pState->pRight, iRight, cRight);
-    /*
-     * Reposition the streams (safely ignores return value).
-     */
-    ScmStreamSeekByLine(pState->pLeft,  iLeft  + cLeft  + cMatches);
-    ScmStreamSeekByLine(pState->pRight, iRight + cRight + cMatches);
-    pState->cDiffs++;
-    return pState->cDiffs;
+}
-/**
- * Helper for scmDiffCompare that takes care of trailing spaces and stuff
- * like that.
- */
-static bool scmDiffCompareSlow(PSCMDIFFSTATE pState,
-                               const char *pchLeft,  size_t cchLeft,  SCMEOL enmEolLeft,
-                               const char *pchRight, size_t cchRight, SCMEOL enmEolRight)
+{
-    if (pState->fIgnoreTrailingWhite)
+    {
-        while (cchLeft > 0 && RT_C_IS_SPACE(pchLeft[cchLeft - 1]))
-            cchLeft--;
-        while (cchRight > 0 && RT_C_IS_SPACE(pchRight[cchRight - 1]))
-            cchRight--;
+    }
-    if (pState->fIgnoreLeadingWhite)
+    {
-        while (cchLeft > 0 && RT_C_IS_SPACE(*pchLeft))
-            pchLeft++, cchLeft--;
-        while (cchRight > 0 && RT_C_IS_SPACE(*pchRight))
-            pchRight++, cchRight--;
+    }
-    if (   cchLeft != cchRight
-        || (enmEolLeft != enmEolRight && !pState->fIgnoreEol)
-        || memcmp(pchLeft, pchRight, cchLeft))
-        return false;
-    return true;
+}
-/**
- * Compare two lines.
+ *
- * @returns true if the are equal, false if not.
- */
-DECLINLINE(bool) scmDiffCompare(PSCMDIFFSTATE pState,
-                                const char *pchLeft,  size_t cchLeft,  SCMEOL enmEolLeft,
-                                const char *pchRight, size_t cchRight, SCMEOL enmEolRight)
+{
-    if (   cchLeft != cchRight
-        || (enmEolLeft != enmEolRight && !pState->fIgnoreEol)
-        || memcmp(pchLeft, pchRight, cchLeft))
+    {
-        if (   pState->fIgnoreTrailingWhite
-            || pState->fIgnoreTrailingWhite)
-            return scmDiffCompareSlow(pState,
-                                      pchLeft, cchLeft, enmEolLeft,
-                                      pchRight, cchRight, enmEolRight);
-        return false;
+    }
-    return true;
+}
-/**
- * Compares two sets of lines from the two files.
+ *
- * @returns true if they matches, false if they don't.
- * @param   pState              The diff state.
- * @param   iLeft               Where to start in the left stream.
- * @param   iRight              Where to start in the right stream.
- * @param   cLines              How many lines to compare.
- */
-static bool scmDiffCompareLines(PSCMDIFFSTATE pState, size_t iLeft, size_t iRight, size_t cLines)
+{
-    for (size_t iLine = 0; iLine < cLines; iLine++)
+    {
-        SCMEOL      enmEolLeft;
-        size_t      cchLeft;
-        const char *pchLeft  = ScmStreamGetLineByNo(pState->pLeft,  iLeft + iLine,  &cchLeft,  &enmEolLeft);
-        SCMEOL      enmEolRight;
-        size_t      cchRight;
-        const char *pchRight = ScmStreamGetLineByNo(pState->pRight, iRight + iLine, &cchRight, &enmEolRight);
-        if (!scmDiffCompare(pState, pchLeft, cchLeft, enmEolLeft, pchRight, cchRight, enmEolRight))
-            return false;
+    }
-    return true;
+}
-/**
- * Resynchronize the two streams and reports the difference.
+ *
- * Upon return, the streams will be positioned after the block of @a cMatches
- * lines where it resynchronized them.
+ *
- * @returns pState->cDiffs (just so we can use it in a return statement).
- * @param   pState              The state.
- * @param   cMatches            The number of lines that needs to match for the
- *                              stream to be considered synchronized again.
- */
-static size_t scmDiffSynchronize(PSCMDIFFSTATE pState, size_t cMatches)
+{
-    size_t const iStartLeft  = ScmStreamTellLine(pState->pLeft)  - 1;
-    size_t const iStartRight = ScmStreamTellLine(pState->pRight) - 1;
-    Assert(cMatches > 0);
-    /*
-     * Compare each new line from each of the streams will all the preceding
-     * ones, including iStartLeft/Right.
-     */
-    for (size_t iRange = 1; ; iRange++)
+    {
-        /*
-         * Get the next line in the left stream and compare it against all the
-         * preceding lines on the right side.
-         */
-        SCMEOL      enmEol;
-        size_t      cchLine;
-        const char *pchLine = ScmStreamGetLineByNo(pState->pLeft, iStartLeft + iRange, &cchLine, &enmEol);
-        if (!pchLine)
-            return scmDiffReport(pState, 0, iStartLeft, ~(size_t)0, iStartRight, ~(size_t)0);
-        for (size_t iRight = cMatches - 1; iRight < iRange; iRight++)
+        {
-            SCMEOL      enmEolRight;
-            size_t      cchRight;
-            const char *pchRight = ScmStreamGetLineByNo(pState->pRight, iStartRight + iRight,
-                                                        &cchRight, &enmEolRight);
-            if (   scmDiffCompare(pState, pchLine, cchLine, enmEol, pchRight, cchRight, enmEolRight)
-                && scmDiffCompareLines(pState,
-                                       iStartLeft  + iRange + 1 - cMatches,
-                                       iStartRight + iRight + 1 - cMatches,
-                                       cMatches - 1)
+               )
-                return scmDiffReport(pState, cMatches,
-                                     iStartLeft,  iRange + 1 - cMatches,
-                                     iStartRight, iRight + 1 - cMatches);
+        }
-        /*
-         * Get the next line in the right stream and compare it against all the
-         * lines on the right side.
-         */
-        pchLine = ScmStreamGetLineByNo(pState->pRight, iStartRight + iRange, &cchLine, &enmEol);
-        if (!pchLine)
-            return scmDiffReport(pState, 0, iStartLeft, ~(size_t)0, iStartRight, ~(size_t)0);
-        for (size_t iLeft = cMatches - 1; iLeft <= iRange; iLeft++)
+        {
-            SCMEOL      enmEolLeft;
-            size_t      cchLeft;
-            const char *pchLeft = ScmStreamGetLineByNo(pState->pLeft, iStartLeft + iLeft,
-                                                       &cchLeft, &enmEolLeft);
-            if (    scmDiffCompare(pState, pchLeft, cchLeft, enmEolLeft, pchLine, cchLine, enmEol)
-                && scmDiffCompareLines(pState,
-                                       iStartLeft  + iLeft  + 1 - cMatches,
-                                       iStartRight + iRange + 1 - cMatches,
-                                       cMatches - 1)
+               )
-                return scmDiffReport(pState, cMatches,
-                                     iStartLeft,  iLeft  + 1 - cMatches,
-                                     iStartRight, iRange + 1 - cMatches);
+        }
+    }
+}
-/**
- * Creates a diff of the changes between the streams @a pLeft and @a pRight.
+ *
- * This currently only implements the simplest diff format, so no contexts.
+ *
- * Also, note that we won't detect differences in the final newline of the
- * streams.
+ *
- * @returns The number of differences.
- * @param   pszFilename         The filename.
- * @param   pLeft               The left side stream.
- * @param   pRight              The right side stream.
- * @param   fIgnoreEol          Whether to ignore end of line markers.
- * @param   fIgnoreLeadingWhite Set if leading white space should be ignored.
- * @param   fIgnoreTrailingWhite  Set if trailing white space should be ignored.
- * @param   fSpecialChars       Whether to print special chars in a human
- *                              readable form or not.
- * @param   cchTab              The tab size.
- * @param   pDiff               Where to write the diff.
- */
-size_t ScmDiffStreams(const char *pszFilename, PSCMSTREAM pLeft, PSCMSTREAM pRight, bool fIgnoreEol,
-                      bool fIgnoreLeadingWhite, bool fIgnoreTrailingWhite, bool fSpecialChars,
-                      size_t cchTab, PRTSTREAM pDiff)
+{
-#ifdef RT_STRICT
-    ScmStreamCheckItegrity(pLeft);
-    ScmStreamCheckItegrity(pRight);
-#endif
-    /*
-     * Set up the diff state.
-     */
-    SCMDIFFSTATE State;
-    State.cDiffs                = 0;
-    State.pszFilename           = pszFilename;
-    State.pLeft                 = pLeft;
-    State.pRight                = pRight;
-    State.fIgnoreEol            = fIgnoreEol;
-    State.fIgnoreLeadingWhite   = fIgnoreLeadingWhite;
-    State.fIgnoreTrailingWhite  = fIgnoreTrailingWhite;
-    State.fSpecialChars         = fSpecialChars;
-    State.cchTab                = cchTab;
-    State.pDiff                 = pDiff;
-    /*
-     * Compare them line by line.
-     */
-    ScmStreamRewindForReading(pLeft);
-    ScmStreamRewindForReading(pRight);
-    const char *pchLeft;
-    const char *pchRight;
-    for (;;)
+    {
-        SCMEOL  enmEolLeft;
-        size_t  cchLeft;
-        pchLeft  = ScmStreamGetLine(pLeft,  &cchLeft,  &enmEolLeft);
-        SCMEOL  enmEolRight;
-        size_t  cchRight;
-        pchRight = ScmStreamGetLine(pRight, &cchRight, &enmEolRight);
-        if (!pchLeft || !pchRight)
-            break;
-        if (!scmDiffCompare(&State, pchLeft, cchLeft, enmEolLeft, pchRight, cchRight, enmEolRight))
-            scmDiffSynchronize(&State, 3);
+    }
-    /*
-     * Deal with any remaining differences.
-     */
-    if (pchLeft)
-        scmDiffReport(&State, 0, ScmStreamTellLine(pLeft) - 1, ~(size_t)0, ScmStreamTellLine(pRight), 0);
-    else if (pchRight)
-        scmDiffReport(&State, 0, ScmStreamTellLine(pLeft), 0, ScmStreamTellLine(pRight) - 1, ~(size_t)0);
-    /*
-     * Report any errors.
-     */
-    if (RT_FAILURE(ScmStreamGetStatus(pLeft)))
-        RTMsgError("Left diff stream error: %Rrc\n", ScmStreamGetStatus(pLeft));
-    if (RT_FAILURE(ScmStreamGetStatus(pRight)))
-        RTMsgError("Right diff stream error: %Rrc\n", ScmStreamGetStatus(pRight));
-    return State.cDiffs;
+}
 /* -=-=-=-=-=- settings -=-=-=-=-=- */
 /**

trunk/src/bldprogs/scmdiff.cpp

-              r40528
+              r40530
 #include <iprt/assert.h>
 #include <iprt/ctype.h>
-#include <iprt/dir.h>
-#include <iprt/env.h>
-#include <iprt/file.h>
-#include <iprt/err.h>
-#include <iprt/getopt.h>
-#include <iprt/initterm.h>
-#include <iprt/mem.h>
 #include <iprt/message.h>
-#include <iprt/param.h>
-#include <iprt/path.h>
-#include <iprt/process.h>
 #include <iprt/stream.h>
 #include <iprt/string.h>
+#include "scmstream.h"
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+/** The name of the settings files. */
+#define SCM_SETTINGS_FILENAME           ".scm-settings"
+/*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
+/** Pointer to const massager settings. */
+typedef struct SCMSETTINGSBASE const *PCSCMSETTINGSBASE;
+/**
+ * SVN property.
+ */
+typedef struct SCMSVNPROP
+{
+    /** The property. */
+    char           *pszName;
+    /** The value.
+     * When used to record updates, this can be set to NULL to trigger the
+     * deletion of the property. */
+    char           *pszValue;
+} SCMSVNPROP;
+/** Pointer to a SVN property. */
+typedef SCMSVNPROP *PSCMSVNPROP;
+/** Pointer to a const  SVN property. */
+typedef SCMSVNPROP const *PCSCMSVNPROP;
+/**
+ * Rewriter state.
+ */
+typedef struct SCMRWSTATE
+{
+    /** The filename.  */
+    const char     *pszFilename;
+    /** Set after the printing the first verbose message about a file under
+     *  rewrite. */
+    bool            fFirst;
+    /** The number of SVN property changes. */
+    size_t          cSvnPropChanges;
+    /** Pointer to an array of SVN property changes. */
+    PSCMSVNPROP     paSvnPropChanges;
+} SCMRWSTATE;
+/** Pointer to the rewriter state. */
+typedef SCMRWSTATE *PSCMRWSTATE;
+/**
+ * A rewriter.
+ *
+ * This works like a stream editor, reading @a pIn, modifying it and writing it
+ * to @a pOut.
+ *
+ * @returns true if any changes were made, false if not.
+ * @param   pIn                 The input stream.
+ * @param   pOut                The output stream.
+ * @param   pSettings           The settings.
+ */
+typedef bool (*PFNSCMREWRITER)(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
+/**
+ * Configuration entry.
+ */
+typedef struct SCMCFGENTRY
+{
+    /** Number of rewriters. */
+    size_t          cRewriters;
+    /** Pointer to an array of rewriters. */
+    PFNSCMREWRITER const  *papfnRewriter;
+    /** File pattern (simple).  */
+    const char     *pszFilePattern;
+} SCMCFGENTRY;
+typedef SCMCFGENTRY *PSCMCFGENTRY;
+typedef SCMCFGENTRY const *PCSCMCFGENTRY;
+/**
+ * Diff state.
+ */
+typedef struct SCMDIFFSTATE
+{
+    size_t          cDiffs;
+    const char     *pszFilename;
+    PSCMSTREAM      pLeft;
+    PSCMSTREAM      pRight;
+    /** Whether to ignore end of line markers when diffing. */
+    bool            fIgnoreEol;
+    /** Whether to ignore trailing whitespace. */
+    bool            fIgnoreTrailingWhite;
+    /** Whether to ignore leading whitespace. */
+    bool            fIgnoreLeadingWhite;
+    /** Whether to print special characters in human readable form or not. */
+    bool            fSpecialChars;
+    /** The tab size. */
+    size_t          cchTab;
+    /** Where to push the diff. */
+    PRTSTREAM       pDiff;
+} SCMDIFFSTATE;
+/** Pointer to a diff state. */
+typedef SCMDIFFSTATE *PSCMDIFFSTATE;
+/**
+ * Source Code Massager Settings.
+ */
+typedef struct SCMSETTINGSBASE
+{
+    bool            fConvertEol;
+    bool            fConvertTabs;
+    bool            fForceFinalEol;
+    bool            fForceTrailingLine;
+    bool            fStripTrailingBlanks;
+    bool            fStripTrailingLines;
+    /** Only process files that are part of a SVN working copy. */
+    bool            fOnlySvnFiles;
+    /** Only recurse into directories containing an .svn dir.  */
+    bool            fOnlySvnDirs;
+    /** Set svn:eol-style if missing or incorrect. */
+    bool            fSetSvnEol;
+    /** Set svn:executable according to type (unusually this means deleting it). */
+    bool            fSetSvnExecutable;
+    /** Set svn:keyword if completely or partially missing. */
+    bool            fSetSvnKeywords;
+    /**  */
+    unsigned        cchTab;
+    /** Only consider files matching these patterns.  This is only applied to the
+     *  base names. */
+    char           *pszFilterFiles;
+    /** Filter out files matching the following patterns.  This is applied to base
+     *  names as well as the absolute paths.  */
+    char           *pszFilterOutFiles;
+    /** Filter out directories matching the following patterns.  This is applied
+     *  to base names as well as the absolute paths.  All absolute paths ends with a
+     *  slash and dot ("/.").  */
+    char           *pszFilterOutDirs;
+} SCMSETTINGSBASE;
+/** Pointer to massager settings. */
+typedef SCMSETTINGSBASE *PSCMSETTINGSBASE;
+/**
+ * Option identifiers.
+ *
+ * @note    The first chunk, down to SCMOPT_TAB_SIZE, are alternately set &
+ *          clear.  So, the option setting a flag (boolean) will have an even
+ *          number and the one clearing it will have an odd number.
+ * @note    Down to SCMOPT_LAST_SETTINGS corresponds exactly to SCMSETTINGSBASE.
+ */
+typedef enum SCMOPT
+{
+    SCMOPT_CONVERT_EOL = 10000,
+    SCMOPT_NO_CONVERT_EOL,
+    SCMOPT_CONVERT_TABS,
+    SCMOPT_NO_CONVERT_TABS,
+    SCMOPT_FORCE_FINAL_EOL,
+    SCMOPT_NO_FORCE_FINAL_EOL,
+    SCMOPT_FORCE_TRAILING_LINE,
+    SCMOPT_NO_FORCE_TRAILING_LINE,
+    SCMOPT_STRIP_TRAILING_BLANKS,
+    SCMOPT_NO_STRIP_TRAILING_BLANKS,
+    SCMOPT_STRIP_TRAILING_LINES,
+    SCMOPT_NO_STRIP_TRAILING_LINES,
+    SCMOPT_ONLY_SVN_DIRS,
+    SCMOPT_NOT_ONLY_SVN_DIRS,
+    SCMOPT_ONLY_SVN_FILES,
+    SCMOPT_NOT_ONLY_SVN_FILES,
+    SCMOPT_SET_SVN_EOL,
+    SCMOPT_DONT_SET_SVN_EOL,
+    SCMOPT_SET_SVN_EXECUTABLE,
+    SCMOPT_DONT_SET_SVN_EXECUTABLE,
+    SCMOPT_SET_SVN_KEYWORDS,
+    SCMOPT_DONT_SET_SVN_KEYWORDS,
+    SCMOPT_TAB_SIZE,
+    SCMOPT_FILTER_OUT_DIRS,
+    SCMOPT_FILTER_FILES,
+    SCMOPT_FILTER_OUT_FILES,
+    SCMOPT_LAST_SETTINGS = SCMOPT_FILTER_OUT_FILES,
+    //
+    SCMOPT_DIFF_IGNORE_EOL,
+    SCMOPT_DIFF_NO_IGNORE_EOL,
+    SCMOPT_DIFF_IGNORE_SPACE,
+    SCMOPT_DIFF_NO_IGNORE_SPACE,
+    SCMOPT_DIFF_IGNORE_LEADING_SPACE,
+    SCMOPT_DIFF_NO_IGNORE_LEADING_SPACE,
+    SCMOPT_DIFF_IGNORE_TRAILING_SPACE,
+    SCMOPT_DIFF_NO_IGNORE_TRAILING_SPACE,
+    SCMOPT_DIFF_SPECIAL_CHARS,
+    SCMOPT_DIFF_NO_SPECIAL_CHARS,
+    SCMOPT_END
+} SCMOPT;
+/**
+ * File/dir pattern + options.
+ */
+typedef struct SCMPATRNOPTPAIR
+{
+    char *pszPattern;
+    char *pszOptions;
+} SCMPATRNOPTPAIR;
+/** Pointer to a pattern + option pair. */
+typedef SCMPATRNOPTPAIR *PSCMPATRNOPTPAIR;
+/** Pointer to a settings set. */
+typedef struct SCMSETTINGS *PSCMSETTINGS;
+/**
+ * Settings set.
+ *
+ * This structure is constructed from the command line arguments or any
+ * .scm-settings file found in a directory we recurse into.  When recursing in
+ * and out of a directory, we push and pop a settings set for it.
+ *
+ * The .scm-settings file has two kinds of setttings, first there are the
+ * unqualified base settings and then there are the settings which applies to a
+ * set of files or directories.  The former are lines with command line options.
+ * For the latter, the options are preceded by a string pattern and a colon.
+ * The pattern specifies which files (and/or directories) the options applies
+ * to.
+ *
+ * We parse the base options into the Base member and put the others into the
+ * paPairs array.
+ */
+typedef struct SCMSETTINGS
+{
+    /** Pointer to the setting file below us in the stack. */
+    PSCMSETTINGS        pDown;
+    /** Pointer to the setting file above us in the stack. */
+    PSCMSETTINGS        pUp;
+    /** File/dir patterns and their options. */
+    PSCMPATRNOPTPAIR    paPairs;
+    /** The number of entires in paPairs. */
+    uint32_t            cPairs;
+    /** The base settings that was read out of the file. */
+    SCMSETTINGSBASE     Base;
+} SCMSETTINGS;
+/** Pointer to a const settings set. */
+typedef SCMSETTINGS const *PCSCMSETTINGS;
+/*******************************************************************************
+*   Internal Functions                                                         *
+*******************************************************************************/
+static bool rewrite_StripTrailingBlanks(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
+static bool rewrite_ExpandTabs(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
+static bool rewrite_ForceNativeEol(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
+static bool rewrite_ForceLF(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
+static bool rewrite_ForceCRLF(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
+static bool rewrite_AdjustTrailingLines(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
+static bool rewrite_SvnNoExecutable(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
+static bool rewrite_SvnKeywords(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
+static bool rewrite_Makefile_kup(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
+static bool rewrite_Makefile_kmk(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
+static bool rewrite_C_and_CPP(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
+#include "scmdiff.h"
 …
 *   Global Variables                                                           *
 *******************************************************************************/
-static const char   g_szProgName[]          = "scm";
-static const char  *g_pszChangedSuff        = "";
 static const char   g_szTabSpaces[16+1]     = "                ";
+static bool         g_fDryRun               = true;
+static bool         g_fDiffSpecialChars     = true;
+static bool         g_fDiffIgnoreEol        = false;
+static bool         g_fDiffIgnoreLeadingWS  = false;
+static bool         g_fDiffIgnoreTrailingWS = false;
+static int          g_iVerbosity            = 2;//99; //0;
+/** The global settings. */
+static SCMSETTINGSBASE const g_Defaults =
+{
+    /* .fConvertEol = */            true,
+    /* .fConvertTabs = */           true,
+    /* .fForceFinalEol = */         true,
+    /* .fForceTrailingLine = */     false,
+    /* .fStripTrailingBlanks = */   true,
+    /* .fStripTrailingLines = */    true,
+    /* .fOnlySvnFiles = */          false,
+    /* .fOnlySvnDirs = */           false,
+    /* .fSetSvnEol = */             false,
+    /* .fSetSvnExecutable = */      false,
+    /* .fSetSvnKeywords = */        false,
+    /* .cchTab = */                 8,
+    /* .pszFilterFiles = */         (char *)"",
+    /* .pszFilterOutFiles = */      (char *)"*.exe|*.com|20*-*-*.log",
+    /* .pszFilterOutDirs = */       (char *)".svn|.hg|.git|CVS",
+};
+/** Option definitions for the base settings. */
+static RTGETOPTDEF  g_aScmOpts[] =
+{
+    { "--convert-eol",                      SCMOPT_CONVERT_EOL,                     RTGETOPT_REQ_NOTHING },
+    { "--no-convert-eol",                   SCMOPT_NO_CONVERT_EOL,                  RTGETOPT_REQ_NOTHING },
+    { "--convert-tabs",                     SCMOPT_CONVERT_TABS,                    RTGETOPT_REQ_NOTHING },
+    { "--no-convert-tabs",                  SCMOPT_NO_CONVERT_TABS,                 RTGETOPT_REQ_NOTHING },
+    { "--force-final-eol",                  SCMOPT_FORCE_FINAL_EOL,                 RTGETOPT_REQ_NOTHING },
+    { "--no-force-final-eol",               SCMOPT_NO_FORCE_FINAL_EOL,              RTGETOPT_REQ_NOTHING },
+    { "--force-trailing-line",              SCMOPT_FORCE_TRAILING_LINE,             RTGETOPT_REQ_NOTHING },
+    { "--no-force-trailing-line",           SCMOPT_NO_FORCE_TRAILING_LINE,          RTGETOPT_REQ_NOTHING },
+    { "--strip-trailing-blanks",            SCMOPT_STRIP_TRAILING_BLANKS,           RTGETOPT_REQ_NOTHING },
+    { "--no-strip-trailing-blanks",         SCMOPT_NO_STRIP_TRAILING_BLANKS,        RTGETOPT_REQ_NOTHING },
+    { "--strip-trailing-lines",             SCMOPT_STRIP_TRAILING_LINES,            RTGETOPT_REQ_NOTHING },
+    { "--strip-no-trailing-lines",          SCMOPT_NO_STRIP_TRAILING_LINES,         RTGETOPT_REQ_NOTHING },
+    { "--only-svn-dirs",                    SCMOPT_ONLY_SVN_DIRS,                   RTGETOPT_REQ_NOTHING },
+    { "--not-only-svn-dirs",                SCMOPT_NOT_ONLY_SVN_DIRS,               RTGETOPT_REQ_NOTHING },
+    { "--only-svn-files",                   SCMOPT_ONLY_SVN_FILES,                  RTGETOPT_REQ_NOTHING },
+    { "--not-only-svn-files",               SCMOPT_NOT_ONLY_SVN_FILES,              RTGETOPT_REQ_NOTHING },
+    { "--set-svn-eol",                      SCMOPT_SET_SVN_EOL,                     RTGETOPT_REQ_NOTHING },
+    { "--dont-set-svn-eol",                 SCMOPT_DONT_SET_SVN_EOL,                RTGETOPT_REQ_NOTHING },
+    { "--set-svn-executable",               SCMOPT_SET_SVN_EXECUTABLE,              RTGETOPT_REQ_NOTHING },
+    { "--dont-set-svn-executable",          SCMOPT_DONT_SET_SVN_EXECUTABLE,         RTGETOPT_REQ_NOTHING },
+    { "--set-svn-keywords",                 SCMOPT_SET_SVN_KEYWORDS,                RTGETOPT_REQ_NOTHING },
+    { "--dont-set-svn-keywords",            SCMOPT_DONT_SET_SVN_KEYWORDS,           RTGETOPT_REQ_NOTHING },
+    { "--tab-size",                         SCMOPT_TAB_SIZE,                        RTGETOPT_REQ_UINT8   },
+    { "--filter-out-dirs",                  SCMOPT_FILTER_OUT_DIRS,                 RTGETOPT_REQ_STRING  },
+    { "--filter-files",                     SCMOPT_FILTER_FILES,                    RTGETOPT_REQ_STRING  },
+    { "--filter-out-files",                 SCMOPT_FILTER_OUT_FILES,                RTGETOPT_REQ_STRING  },
+};
+/** Consider files matching the following patterns (base names only). */
+static const char  *g_pszFileFilter         = NULL;
+static PFNSCMREWRITER const g_aRewritersFor_Makefile_kup[] =
+{
+    rewrite_SvnNoExecutable,
+    rewrite_Makefile_kup
+};
+static PFNSCMREWRITER const g_aRewritersFor_Makefile_kmk[] =
+{
+    rewrite_ForceNativeEol,
+    rewrite_StripTrailingBlanks,
+    rewrite_AdjustTrailingLines,
+    rewrite_SvnNoExecutable,
+    rewrite_SvnKeywords,
+    rewrite_Makefile_kmk
+};
+static PFNSCMREWRITER const g_aRewritersFor_C_and_CPP[] =
+{
+    rewrite_ForceNativeEol,
+    rewrite_ExpandTabs,
+    rewrite_StripTrailingBlanks,
+    rewrite_AdjustTrailingLines,
+    rewrite_SvnNoExecutable,
+    rewrite_SvnKeywords,
+    rewrite_C_and_CPP
+};
+static PFNSCMREWRITER const g_aRewritersFor_H_and_HPP[] =
+{
+    rewrite_ForceNativeEol,
+    rewrite_ExpandTabs,
+    rewrite_StripTrailingBlanks,
+    rewrite_AdjustTrailingLines,
+    rewrite_SvnNoExecutable,
+    rewrite_C_and_CPP
+};
+static PFNSCMREWRITER const g_aRewritersFor_RC[] =
+{
+    rewrite_ForceNativeEol,
+    rewrite_ExpandTabs,
+    rewrite_StripTrailingBlanks,
+    rewrite_AdjustTrailingLines,
+    rewrite_SvnNoExecutable,
+    rewrite_SvnKeywords
+};
+static PFNSCMREWRITER const g_aRewritersFor_ShellScripts[] =
+{
+    rewrite_ForceLF,
+    rewrite_ExpandTabs,
+    rewrite_StripTrailingBlanks
+};
+static PFNSCMREWRITER const g_aRewritersFor_BatchFiles[] =
+{
+    rewrite_ForceCRLF,
+    rewrite_ExpandTabs,
+    rewrite_StripTrailingBlanks
+};
+static SCMCFGENTRY const g_aConfigs[] =
+{
+    { RT_ELEMENTS(g_aRewritersFor_Makefile_kup), &g_aRewritersFor_Makefile_kup[0], "Makefile.kup" },
+    { RT_ELEMENTS(g_aRewritersFor_Makefile_kmk), &g_aRewritersFor_Makefile_kmk[0], "Makefile.kmk|Config.kmk" },
+    { RT_ELEMENTS(g_aRewritersFor_C_and_CPP),    &g_aRewritersFor_C_and_CPP[0],    "*.c|*.cpp|*.C|*.CPP|*.cxx|*.cc" },
+    { RT_ELEMENTS(g_aRewritersFor_H_and_HPP),    &g_aRewritersFor_H_and_HPP[0],    "*.h|*.hpp" },
+    { RT_ELEMENTS(g_aRewritersFor_RC),           &g_aRewritersFor_RC[0],           "*.rc" },
+    { RT_ELEMENTS(g_aRewritersFor_ShellScripts), &g_aRewritersFor_ShellScripts[0], "*.sh|configure" },
+    { RT_ELEMENTS(g_aRewritersFor_BatchFiles),   &g_aRewritersFor_BatchFiles[0],   "*.bat|*.cmd|*.btm|*.vbs|*.ps1" },
+};
+/* -=-=-=-=-=- diff -=-=-=-=-=- */
 …
+}
-/* -=-=-=-=-=- settings -=-=-=-=-=- */
-/**
- * Init a settings structure with settings from @a pSrc.
+ *
- * @returns IPRT status code
- * @param   pSettings           The settings.
- * @param   pSrc                The source settings.
- */
-static int scmSettingsBaseInitAndCopy(PSCMSETTINGSBASE pSettings, PCSCMSETTINGSBASE pSrc)
+{
-    *pSettings = *pSrc;
-    int rc = RTStrDupEx(&pSettings->pszFilterFiles, pSrc->pszFilterFiles);
-    if (RT_SUCCESS(rc))
+    {
-        rc = RTStrDupEx(&pSettings->pszFilterOutFiles, pSrc->pszFilterOutFiles);
-        if (RT_SUCCESS(rc))
+        {
-            rc = RTStrDupEx(&pSettings->pszFilterOutDirs, pSrc->pszFilterOutDirs);
-            if (RT_SUCCESS(rc))
-                return VINF_SUCCESS;
-            RTStrFree(pSettings->pszFilterOutFiles);
+        }
-        RTStrFree(pSettings->pszFilterFiles);
+    }
-    pSettings->pszFilterFiles = NULL;
-    pSettings->pszFilterOutFiles = NULL;
-    pSettings->pszFilterOutDirs = NULL;
-    return rc;
+}
-/**
- * Init a settings structure.
+ *
- * @returns IPRT status code
- * @param   pSettings           The settings.
- */
-static int scmSettingsBaseInit(PSCMSETTINGSBASE pSettings)
+{
-    return scmSettingsBaseInitAndCopy(pSettings, &g_Defaults);
+}
-/**
- * Deletes the settings, i.e. free any dynamically allocated content.
+ *
- * @param   pSettings           The settings.
- */
-static void scmSettingsBaseDelete(PSCMSETTINGSBASE pSettings)
+{
-    if (pSettings)
+    {
-        Assert(pSettings->cchTab != ~(unsigned)0);
-        pSettings->cchTab = ~(unsigned)0;
-        RTStrFree(pSettings->pszFilterFiles);
-        pSettings->pszFilterFiles = NULL;
-        RTStrFree(pSettings->pszFilterOutFiles);
-        pSettings->pszFilterOutFiles = NULL;
-        RTStrFree(pSettings->pszFilterOutDirs);
-        pSettings->pszFilterOutDirs = NULL;
+    }
+}
-/**
- * Processes a RTGetOpt result.
+ *
- * @retval  VINF_SUCCESS if handled.
- * @retval  VERR_OUT_OF_RANGE if the option value was out of range.
- * @retval  VERR_GETOPT_UNKNOWN_OPTION if the option was not recognized.
+ *
- * @param   pSettings           The settings to change.
- * @param   rc                  The RTGetOpt return value.
- * @param   pValueUnion         The RTGetOpt value union.
- */
-static int scmSettingsBaseHandleOpt(PSCMSETTINGSBASE pSettings, int rc, PRTGETOPTUNION pValueUnion)
+{
-    switch (rc)
+    {
-        case SCMOPT_CONVERT_EOL:
-            pSettings->fConvertEol = true;
-            return VINF_SUCCESS;
-        case SCMOPT_NO_CONVERT_EOL:
-            pSettings->fConvertEol = false;
-            return VINF_SUCCESS;
-        case SCMOPT_CONVERT_TABS:
-            pSettings->fConvertTabs = true;
-            return VINF_SUCCESS;
-        case SCMOPT_NO_CONVERT_TABS:
-            pSettings->fConvertTabs = false;
-            return VINF_SUCCESS;
-        case SCMOPT_FORCE_FINAL_EOL:
-            pSettings->fForceFinalEol = true;
-            return VINF_SUCCESS;
-        case SCMOPT_NO_FORCE_FINAL_EOL:
-            pSettings->fForceFinalEol = false;
-            return VINF_SUCCESS;
-        case SCMOPT_FORCE_TRAILING_LINE:
-            pSettings->fForceTrailingLine = true;
-            return VINF_SUCCESS;
-        case SCMOPT_NO_FORCE_TRAILING_LINE:
-            pSettings->fForceTrailingLine = false;
-            return VINF_SUCCESS;
-        case SCMOPT_STRIP_TRAILING_BLANKS:
-            pSettings->fStripTrailingBlanks = true;
-            return VINF_SUCCESS;
-        case SCMOPT_NO_STRIP_TRAILING_BLANKS:
-            pSettings->fStripTrailingBlanks = false;
-            return VINF_SUCCESS;
-        case SCMOPT_STRIP_TRAILING_LINES:
-            pSettings->fStripTrailingLines = true;
-            return VINF_SUCCESS;
-        case SCMOPT_NO_STRIP_TRAILING_LINES:
-            pSettings->fStripTrailingLines = false;
-            return VINF_SUCCESS;
-        case SCMOPT_ONLY_SVN_DIRS:
-            pSettings->fOnlySvnDirs = true;
-            return VINF_SUCCESS;
-        case SCMOPT_NOT_ONLY_SVN_DIRS:
-            pSettings->fOnlySvnDirs = false;
-            return VINF_SUCCESS;
-        case SCMOPT_ONLY_SVN_FILES:
-            pSettings->fOnlySvnFiles = true;
-            return VINF_SUCCESS;
-        case SCMOPT_NOT_ONLY_SVN_FILES:
-            pSettings->fOnlySvnFiles = false;
-            return VINF_SUCCESS;
-        case SCMOPT_SET_SVN_EOL:
-            pSettings->fSetSvnEol = true;
-            return VINF_SUCCESS;
-        case SCMOPT_DONT_SET_SVN_EOL:
-            pSettings->fSetSvnEol = false;
-            return VINF_SUCCESS;
-        case SCMOPT_SET_SVN_EXECUTABLE:
-            pSettings->fSetSvnExecutable = true;
-            return VINF_SUCCESS;
-        case SCMOPT_DONT_SET_SVN_EXECUTABLE:
-            pSettings->fSetSvnExecutable = false;
-            return VINF_SUCCESS;
-        case SCMOPT_SET_SVN_KEYWORDS:
-            pSettings->fSetSvnKeywords = true;
-            return VINF_SUCCESS;
-        case SCMOPT_DONT_SET_SVN_KEYWORDS:
-            pSettings->fSetSvnKeywords = false;
-            return VINF_SUCCESS;
-        case SCMOPT_TAB_SIZE:
-            if (   pValueUnion->u8 < 1
-                || pValueUnion->u8 >= RT_ELEMENTS(g_szTabSpaces))
+            {
-                RTMsgError("Invalid tab size: %u - must be in {1..%u}\n",
-                           pValueUnion->u8, RT_ELEMENTS(g_szTabSpaces) - 1);
-                return VERR_OUT_OF_RANGE;
+            }
-            pSettings->cchTab = pValueUnion->u8;
-            return VINF_SUCCESS;
-        case SCMOPT_FILTER_OUT_DIRS:
-        case SCMOPT_FILTER_FILES:
-        case SCMOPT_FILTER_OUT_FILES:
+        {
-            char **ppsz = NULL;
-            switch (rc)
+            {
-                case SCMOPT_FILTER_OUT_DIRS:    ppsz = &pSettings->pszFilterOutDirs; break;
-                case SCMOPT_FILTER_FILES:       ppsz = &pSettings->pszFilterFiles; break;
-                case SCMOPT_FILTER_OUT_FILES:   ppsz = &pSettings->pszFilterOutFiles; break;
+            }
-            /*
-             * An empty string zaps the current list.
-             */
-            if (!*pValueUnion->psz)
-                return RTStrATruncate(ppsz, 0);
-            /*
-             * Non-empty strings are appended to the pattern list.
+             *
-             * Strip leading and trailing pattern separators before attempting
-             * to append it.  If it's just separators, don't do anything.
-             */
-            const char *pszSrc = pValueUnion->psz;
-            while (*pszSrc == '|')
-                pszSrc++;
-            size_t cchSrc = strlen(pszSrc);
-            while (cchSrc > 0 && pszSrc[cchSrc - 1] == '|')
-                cchSrc--;
-            if (!cchSrc)
-                return VINF_SUCCESS;
-            return RTStrAAppendExN(ppsz, 2,
-                                   "|", *ppsz && **ppsz ? 1 : 0,
-                                   pszSrc, cchSrc);
+        }
-        default:
-            return VERR_GETOPT_UNKNOWN_OPTION;
+    }
+}
-/**
- * Parses an option string.
+ *
- * @returns IPRT status code.
- * @param   pBase               The base settings structure to apply the options
- *                              to.
- * @param   pszOptions          The options to parse.
- */
-static int scmSettingsBaseParseString(PSCMSETTINGSBASE pBase, const char *pszLine)
+{
-    int    cArgs;
-    char **papszArgs;
-    int rc = RTGetOptArgvFromString(&papszArgs, &cArgs, pszLine, NULL);
-    if (RT_SUCCESS(rc))
+    {
-        RTGETOPTUNION   ValueUnion;
-        RTGETOPTSTATE   GetOptState;
-        rc = RTGetOptInit(&GetOptState, cArgs, papszArgs, &g_aScmOpts[0], RT_ELEMENTS(g_aScmOpts), 0, 0 /*fFlags*/);
-        if (RT_SUCCESS(rc))
+        {
-            while ((rc = RTGetOpt(&GetOptState, &ValueUnion)) != 0)
+            {
-                rc = scmSettingsBaseHandleOpt(pBase, rc, &ValueUnion);
-                if (RT_FAILURE(rc))
-                    break;
+            }
+        }
-        RTGetOptArgvFree(papszArgs);
+    }
-    return rc;
+}
-/**
- * Parses an unterminated option string.
+ *
- * @returns IPRT status code.
- * @param   pBase               The base settings structure to apply the options
- *                              to.
- * @param   pchLine             The line.
- * @param   cchLine             The line length.
- */
-static int scmSettingsBaseParseStringN(PSCMSETTINGSBASE pBase, const char *pchLine, size_t cchLine)
+{
-    char *pszLine = RTStrDupN(pchLine, cchLine);
-    if (!pszLine)
-        return VERR_NO_MEMORY;
-    int rc = scmSettingsBaseParseString(pBase, pszLine);
-    RTStrFree(pszLine);
-    return rc;
+}
-/**
- * Verifies the options string.
+ *
- * @returns IPRT status code.
- * @param   pszOptions          The options to verify .
- */
-static int scmSettingsBaseVerifyString(const char *pszOptions)
+{
-    SCMSETTINGSBASE Base;
-    int rc = scmSettingsBaseInit(&Base);
-    if (RT_SUCCESS(rc))
+    {
-        rc = scmSettingsBaseParseString(&Base, pszOptions);
-        scmSettingsBaseDelete(&Base);
+    }
-    return rc;
+}
-/**
- * Loads settings found in editor and SCM settings directives within the
- * document (@a pStream).
+ *
- * @returns IPRT status code.
- * @param   pBase               The settings base to load settings into.
- * @param   pStream             The stream to scan for settings directives.
- */
-static int scmSettingsBaseLoadFromDocument(PSCMSETTINGSBASE pBase, PSCMSTREAM pStream)
+{
-    /** @todo Editor and SCM settings directives in documents.  */
-    return VINF_SUCCESS;
+}
-/**
- * Creates a new settings file struct, cloning @a pSettings.
+ *
- * @returns IPRT status code.
- * @param   ppSettings          Where to return the new struct.
- * @param   pSettingsBase       The settings to inherit from.
- */
-static int scmSettingsCreate(PSCMSETTINGS *ppSettings, PCSCMSETTINGSBASE pSettingsBase)
+{
-    PSCMSETTINGS pSettings = (PSCMSETTINGS)RTMemAlloc(sizeof(*pSettings));
-    if (!pSettings)
-        return VERR_NO_MEMORY;
-    int rc = scmSettingsBaseInitAndCopy(&pSettings->Base, pSettingsBase);
-    if (RT_SUCCESS(rc))
+    {
-        pSettings->pDown   = NULL;
-        pSettings->pUp     = NULL;
-        pSettings->paPairs = NULL;
-        pSettings->cPairs  = 0;
-        *ppSettings = pSettings;
-        return VINF_SUCCESS;
+    }
-    RTMemFree(pSettings);
-    return rc;
+}
-/**
- * Destroys a settings structure.
+ *
- * @param   pSettings           The settings structure to destroy.  NULL is OK.
- */
-static void scmSettingsDestroy(PSCMSETTINGS pSettings)
+{
-    if (pSettings)
+    {
-        scmSettingsBaseDelete(&pSettings->Base);
-        for (size_t i = 0; i < pSettings->cPairs; i++)
+        {
-            RTStrFree(pSettings->paPairs[i].pszPattern);
-            RTStrFree(pSettings->paPairs[i].pszOptions);
-            pSettings->paPairs[i].pszPattern = NULL;
-            pSettings->paPairs[i].pszOptions = NULL;
+        }
-        RTMemFree(pSettings->paPairs);
-        pSettings->paPairs = NULL;
-        RTMemFree(pSettings);
+    }
+}
-/**
- * Adds a pattern/options pair to the settings structure.
+ *
- * @returns IPRT status code.
- * @param   pSettings           The settings.
- * @param   pchLine             The line containing the unparsed pair.
- * @param   cchLine             The length of the line.
- */
-static int scmSettingsAddPair(PSCMSETTINGS pSettings, const char *pchLine, size_t cchLine)
+{
-    /*
-     * Split the string.
-     */
-    const char *pchOptions = (const char *)memchr(pchLine, ':', cchLine);
-    if (!pchOptions)
-        return VERR_INVALID_PARAMETER;
-    size_t cchPattern = pchOptions - pchLine;
-    size_t cchOptions = cchLine - cchPattern - 1;
-    pchOptions++;
-    /* strip spaces everywhere */
-    while (cchPattern > 0 && RT_C_IS_SPACE(pchLine[cchPattern - 1]))
-        cchPattern--;
-    while (cchPattern > 0 && RT_C_IS_SPACE(*pchLine))
-        cchPattern--, pchLine++;
-    while (cchOptions > 0 && RT_C_IS_SPACE(pchOptions[cchOptions - 1]))
-        cchOptions--;
-    while (cchOptions > 0 && RT_C_IS_SPACE(*pchOptions))
-        cchOptions--, pchOptions++;
-    /* Quietly ignore empty patterns and empty options. */
-    if (!cchOptions || !cchPattern)
-        return VINF_SUCCESS;
-    /*
-     * Add the pair and verify the option string.
-     */
-    uint32_t iPair = pSettings->cPairs;
-    if ((iPair % 32) == 0)
+    {
-        void *pvNew = RTMemRealloc(pSettings->paPairs, (iPair + 32) * sizeof(pSettings->paPairs[0]));
-        if (!pvNew)
-            return VERR_NO_MEMORY;
-        pSettings->paPairs = (PSCMPATRNOPTPAIR)pvNew;
+    }
-    pSettings->paPairs[iPair].pszPattern = RTStrDupN(pchLine, cchPattern);
-    pSettings->paPairs[iPair].pszOptions = RTStrDupN(pchOptions, cchOptions);
-    int rc;
-    if (   pSettings->paPairs[iPair].pszPattern
-        && pSettings->paPairs[iPair].pszOptions)
-        rc = scmSettingsBaseVerifyString(pSettings->paPairs[iPair].pszOptions);
-    else
-        rc = VERR_NO_MEMORY;
-    if (RT_SUCCESS(rc))
-        pSettings->cPairs = iPair + 1;
-    else
+    {
-        RTStrFree(pSettings->paPairs[iPair].pszPattern);
-        RTStrFree(pSettings->paPairs[iPair].pszOptions);
+    }
-    return rc;
+}
-/**
- * Loads in the settings from @a pszFilename.
+ *
- * @returns IPRT status code.
- * @param   pSettings           Where to load the settings file.
- * @param   pszFilename         The file to load.
- */
-static int scmSettingsLoadFile(PSCMSETTINGS pSettings, const char *pszFilename)
+{
-    SCMSTREAM Stream;
-    int rc = ScmStreamInitForReading(&Stream, pszFilename);
-    if (RT_FAILURE(rc))
+    {
-        RTMsgError("%s: ScmStreamInitForReading -> %Rrc\n", pszFilename, rc);
-        return rc;
+    }
-    SCMEOL      enmEol;
-    const char *pchLine;
-    size_t      cchLine;
-    while ((pchLine = ScmStreamGetLine(&Stream, &cchLine, &enmEol)) != NULL)
+    {
-        /* Ignore leading spaces. */
-        while (cchLine > 0 && RT_C_IS_SPACE(*pchLine))
-            pchLine++, cchLine--;
-        /* Ignore empty lines and comment lines. */
-        if (cchLine < 1 || *pchLine == '#')
-            continue;
-        /* What kind of line is it? */
-        const char *pchColon = (const char *)memchr(pchLine, ':', cchLine);
-        if (pchColon)
-            rc = scmSettingsAddPair(pSettings, pchLine, cchLine);
-        else
-            rc = scmSettingsBaseParseStringN(&pSettings->Base, pchLine, cchLine);
-        if (RT_FAILURE(rc))
+        {
-            RTMsgError("%s:%d: %Rrc\n", pszFilename, ScmStreamTellLine(&Stream), rc);
-            break;
+        }
+    }
-    if (RT_SUCCESS(rc))
+    {
-        rc = ScmStreamGetStatus(&Stream);
-        if (RT_FAILURE(rc))
-            RTMsgError("%s: ScmStreamGetStatus- > %Rrc\n", pszFilename, rc);
+    }
-    ScmStreamDelete(&Stream);
-    return rc;
+}
-/**
- * Parse the specified settings file creating a new settings struct from it.
+ *
- * @returns IPRT status code
- * @param   ppSettings          Where to return the new settings.
- * @param   pszFilename         The file to parse.
- * @param   pSettingsBase       The base settings we inherit from.
- */
-static int scmSettingsCreateFromFile(PSCMSETTINGS *ppSettings, const char *pszFilename, PCSCMSETTINGSBASE pSettingsBase)
+{
-    PSCMSETTINGS pSettings;
-    int rc = scmSettingsCreate(&pSettings, pSettingsBase);
-    if (RT_SUCCESS(rc))
+    {
-        rc = scmSettingsLoadFile(pSettings, pszFilename);
-        if (RT_SUCCESS(rc))
+        {
-            *ppSettings = pSettings;
-            return VINF_SUCCESS;
+        }
-        scmSettingsDestroy(pSettings);
+    }
-    *ppSettings = NULL;
-    return rc;
+}
-/**
- * Create an initial settings structure when starting processing a new file or
- * directory.
+ *
- * This will look for .scm-settings files from the root and down to the
- * specified directory, combining them into the returned settings structure.
+ *
- * @returns IPRT status code.
- * @param   ppSettings          Where to return the pointer to the top stack
- *                              object.
- * @param   pBaseSettings       The base settings we inherit from (globals
- *                              typically).
- * @param   pszPath             The absolute path to the new directory or file.
- */
-static int scmSettingsCreateForPath(PSCMSETTINGS *ppSettings, PCSCMSETTINGSBASE pBaseSettings, const char *pszPath)
+{
-    *ppSettings = NULL;                 /* try shut up gcc. */
-    /*
-     * We'll be working with a stack copy of the path.
-     */
-    char    szFile[RTPATH_MAX];
-    size_t  cchDir = strlen(pszPath);
-    if (cchDir >= sizeof(szFile) - sizeof(SCM_SETTINGS_FILENAME))
-        return VERR_FILENAME_TOO_LONG;
-    /*
-     * Create the bottom-most settings.
-     */
-    PSCMSETTINGS pSettings;
-    int rc = scmSettingsCreate(&pSettings, pBaseSettings);
-    if (RT_FAILURE(rc))
-        return rc;
-    /*
-     * Enumerate the path components from the root and down. Load any setting
-     * files we find.
-     */
-    size_t cComponents = RTPathCountComponents(pszPath);
-    for (size_t i = 1; i <= cComponents; i++)
+    {
-        rc = RTPathCopyComponents(szFile, sizeof(szFile), pszPath, i);
-        if (RT_SUCCESS(rc))
-            rc = RTPathAppend(szFile, sizeof(szFile), SCM_SETTINGS_FILENAME);
-        if (RT_FAILURE(rc))
-            break;
-        if (RTFileExists(szFile))
+        {
-            rc = scmSettingsLoadFile(pSettings, szFile);
-            if (RT_FAILURE(rc))
-                break;
+        }
+    }
-    if (RT_SUCCESS(rc))
-        *ppSettings = pSettings;
-    else
-        scmSettingsDestroy(pSettings);
-    return rc;
+}
-/**
- * Pushes a new settings set onto the stack.
+ *
- * @param   ppSettingsStack     The pointer to the pointer to the top stack
- *                              element.  This will be used as input and output.
- * @param   pSettings           The settings to push onto the stack.
- */
-static void scmSettingsStackPush(PSCMSETTINGS *ppSettingsStack, PSCMSETTINGS pSettings)
+{
-    PSCMSETTINGS pOld = *ppSettingsStack;
-    pSettings->pDown  = pOld;
-    pSettings->pUp    = NULL;
-    if (pOld)
-        pOld->pUp = pSettings;
-    *ppSettingsStack = pSettings;
+}
-/**
- * Pushes the settings of the specified directory onto the stack.
+ *
- * We will load any .scm-settings in the directory.  A stack entry is added even
- * if no settings file was found.
+ *
- * @returns IPRT status code.
- * @param   ppSettingsStack     The pointer to the pointer to the top stack
- *                              element.  This will be used as input and output.
- * @param   pszDir              The directory to do this for.
- */
-static int scmSettingsStackPushDir(PSCMSETTINGS *ppSettingsStack, const char *pszDir)
+{
-    char szFile[RTPATH_MAX];
-    int rc = RTPathJoin(szFile, sizeof(szFile), pszDir, SCM_SETTINGS_FILENAME);
-    if (RT_SUCCESS(rc))
+    {
-        PSCMSETTINGS pSettings;
-        rc = scmSettingsCreate(&pSettings, &(*ppSettingsStack)->Base);
-        if (RT_SUCCESS(rc))
+        {
-            if (RTFileExists(szFile))
-                rc = scmSettingsLoadFile(pSettings, szFile);
-            if (RT_SUCCESS(rc))
+            {
-                scmSettingsStackPush(ppSettingsStack, pSettings);
-                return VINF_SUCCESS;
+            }
-            scmSettingsDestroy(pSettings);
+        }
+    }
-    return rc;
+}
-/**
- * Pops a settings set off the stack.
+ *
- * @returns The popped setttings.
- * @param   ppSettingsStack     The pointer to the pointer to the top stack
- *                              element.  This will be used as input and output.
- */
-static PSCMSETTINGS scmSettingsStackPop(PSCMSETTINGS *ppSettingsStack)
+{
-    PSCMSETTINGS pRet = *ppSettingsStack;
-    PSCMSETTINGS pNew = pRet ? pRet->pDown : NULL;
-    *ppSettingsStack = pNew;
-    if (pNew)
-        pNew->pUp    = NULL;
-    if (pRet)
+    {
-        pRet->pUp    = NULL;
-        pRet->pDown  = NULL;
+    }
-    return pRet;
+}
-/**
- * Pops and destroys the top entry of the stack.
+ *
- * @param   ppSettingsStack     The pointer to the pointer to the top stack
- *                              element.  This will be used as input and output.
- */
-static void scmSettingsStackPopAndDestroy(PSCMSETTINGS *ppSettingsStack)
+{
-    scmSettingsDestroy(scmSettingsStackPop(ppSettingsStack));
+}
-/**
- * Constructs the base settings for the specified file name.
+ *
- * @returns IPRT status code.
- * @param   pSettingsStack      The top element on the settings stack.
- * @param   pszFilename         The file name.
- * @param   pszBasename         The base name (pointer within @a pszFilename).
- * @param   cchBasename         The length of the base name.  (For passing to
- *                              RTStrSimplePatternMultiMatch.)
- * @param   pBase               Base settings to initialize.
- */
-static int scmSettingsStackMakeFileBase(PCSCMSETTINGS pSettingsStack, const char *pszFilename,
-                                        const char *pszBasename, size_t cchBasename, PSCMSETTINGSBASE pBase)
+{
-    int rc = scmSettingsBaseInitAndCopy(pBase, &pSettingsStack->Base);
-    if (RT_SUCCESS(rc))
+    {
-        /* find the bottom entry in the stack. */
-        PCSCMSETTINGS pCur = pSettingsStack;
-        while (pCur->pDown)
-            pCur = pCur->pDown;
-        /* Work our way up thru the stack and look for matching pairs. */
-        while (pCur)
+        {
-            size_t const cPairs = pCur->cPairs;
-            if (cPairs)
+            {
-                for (size_t i = 0; i < cPairs; i++)
-                    if (   RTStrSimplePatternMultiMatch(pCur->paPairs[i].pszPattern, RTSTR_MAX,
-                                                        pszBasename,  cchBasename, NULL)
-                        || RTStrSimplePatternMultiMatch(pCur->paPairs[i].pszPattern, RTSTR_MAX,
-                                                        pszFilename,  RTSTR_MAX, NULL))
+                    {
-                        rc = scmSettingsBaseParseString(pBase, pCur->paPairs[i].pszOptions);
-                        if (RT_FAILURE(rc))
-                            break;
+                    }
-                if (RT_FAILURE(rc))
-                    break;
+            }
-            /* advance */
-            pCur = pCur->pUp;
+        }
+    }
-    if (RT_FAILURE(rc))
-        scmSettingsBaseDelete(pBase);
-    return rc;
+}
-/* -=-=-=-=-=- misc -=-=-=-=-=- */
-/**
- * Prints a verbose message if the level is high enough.
+ *
- * @param   pState              The rewrite state.  Optional.
- * @param   iLevel              The required verbosity level.
- * @param   pszFormat           The message format string.  Can be NULL if we
- *                              only want to trigger the per file message.
- * @param   ...                 Format arguments.
- */
-static void ScmVerbose(PSCMRWSTATE pState, int iLevel, const char *pszFormat, ...)
+{
-    if (iLevel <= g_iVerbosity)
+    {
-        if (pState && !pState->fFirst)
+        {
-            RTPrintf("%s: info: --= Rewriting '%s' =--\n", g_szProgName, pState->pszFilename);
-            pState->fFirst = true;
+        }
-        if (pszFormat)
+        {
-            RTPrintf(pState
-                     ? "%s: info:   "
-                     : "%s: info: ",
-                     g_szProgName);
-            va_list va;
-            va_start(va, pszFormat);
-            RTPrintfV(pszFormat, va);
-            va_end(va);
+        }
+    }
+}
-/* -=-=-=-=-=- subversion -=-=-=-=-=- */
-#define SCM_WITHOUT_LIBSVN
-#ifdef SCM_WITHOUT_LIBSVN
-/**
- * Callback that is call for each path to search.
- */
-static DECLCALLBACK(int) scmSvnFindSvnBinaryCallback(char const *pchPath, size_t cchPath, void *pvUser1, void *pvUser2)
+{
-    char   *pszDst = (char *)pvUser1;
-    size_t  cchDst = (size_t)pvUser2;
-    if (cchDst > cchPath)
+    {
-        memcpy(pszDst, pchPath, cchPath);
-        pszDst[cchPath] = '\0';
-#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-        int rc = RTPathAppend(pszDst, cchDst, "svn.exe");
-#else
-        int rc = RTPathAppend(pszDst, cchDst, "svn");
-#endif
-        if (   RT_SUCCESS(rc)
-            && RTFileExists(pszDst))
-            return VINF_SUCCESS;
+    }
-    return VERR_TRY_AGAIN;
+}
-/**
- * Finds the svn binary.
+ *
- * @param   pszPath             Where to store it.  Worst case, we'll return
- *                              "svn" here.
- * @param   cchPath             The size of the buffer pointed to by @a pszPath.
- */
-static void scmSvnFindSvnBinary(char *pszPath, size_t cchPath)
+{
-    /** @todo code page fun... */
-    Assert(cchPath >= sizeof("svn"));
-#ifdef RT_OS_WINDOWS
-    const char *pszEnvVar = RTEnvGet("Path");
-#else
-    const char *pszEnvVar = RTEnvGet("PATH");
-#endif
-    if (pszPath)
+    {
-#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-        int rc = RTPathTraverseList(pszEnvVar, ';', scmSvnFindSvnBinaryCallback, pszPath, (void *)cchPath);
-#else
-        int rc = RTPathTraverseList(pszEnvVar, ':', scmSvnFindSvnBinaryCallback, pszPath, (void *)cchPath);
-#endif
-        if (RT_SUCCESS(rc))
-            return;
+    }
-    strcpy(pszPath, "svn");
+}
-/**
- * Construct a dot svn filename for the file being rewritten.
+ *
- * @returns IPRT status code.
- * @param   pState              The rewrite state (for the name).
- * @param   pszDir              The directory, including ".svn/".
- * @param   pszSuff             The filename suffix.
- * @param   pszDst              The output buffer.  RTPATH_MAX in size.
- */
-static int scmSvnConstructName(PSCMRWSTATE pState, const char *pszDir, const char *pszSuff, char *pszDst)
+{
-    strcpy(pszDst, pState->pszFilename); /* ASSUMES sizeof(szBuf) <= sizeof(szPath) */
-    RTPathStripFilename(pszDst);
-    int rc = RTPathAppend(pszDst, RTPATH_MAX, pszDir);
-    if (RT_SUCCESS(rc))
+    {
-        rc = RTPathAppend(pszDst, RTPATH_MAX, RTPathFilename(pState->pszFilename));
-        if (RT_SUCCESS(rc))
+        {
-            size_t cchDst  = strlen(pszDst);
-            size_t cchSuff = strlen(pszSuff);
-            if (cchDst + cchSuff < RTPATH_MAX)
+            {
-                memcpy(&pszDst[cchDst], pszSuff, cchSuff + 1);
-                return VINF_SUCCESS;
+            }
-            else
-                rc = VERR_BUFFER_OVERFLOW;
+        }
+    }
-    return rc;
+}
-/**
- * Interprets the specified string as decimal numbers.
+ *
- * @returns true if parsed successfully, false if not.
- * @param   pch                 The string (not terminated).
- * @param   cch                 The string length.
- * @param   pu                  Where to return the value.
- */
-static bool scmSvnReadNumber(const char *pch, size_t cch, size_t *pu)
+{
-    size_t u = 0;
-    while (cch-- > 0)
+    {
-        char ch = *pch++;
-        if (ch < '0' || ch > '9')
-            return false;
-        u *= 10;
-        u += ch - '0';
+    }
-    *pu = u;
-    return true;
+}
-#endif /* SCM_WITHOUT_LIBSVN */
-/**
- * Checks if the file we're operating on is part of a SVN working copy.
+ *
- * @returns true if it is, false if it isn't or we cannot tell.
- * @param   pState              The rewrite state to work on.
- */
-static bool scmSvnIsInWorkingCopy(PSCMRWSTATE pState)
+{
-#ifdef SCM_WITHOUT_LIBSVN
-    /*
-     * Hack: check if the .svn/text-base/<file>.svn-base file exists.
-     */
-    char szPath[RTPATH_MAX];
-    int rc = scmSvnConstructName(pState, ".svn/text-base/", ".svn-base", szPath);
-    if (RT_SUCCESS(rc))
-        return RTFileExists(szPath);
-#else
-    NOREF(pState);
-#endif
-    return false;
+}
-/**
- * Queries the value of an SVN property.
+ *
- * This will automatically adjust for scheduled changes.
+ *
- * @returns IPRT status code.
- * @retval  VERR_INVALID_STATE if not a SVN WC file.
- * @retval  VERR_NOT_FOUND if the property wasn't found.
- * @param   pState              The rewrite state to work on.
- * @param   pszName             The property name.
- * @param   ppszValue           Where to return the property value.  Free this
- *                              using RTStrFree.  Optional.
- */
-static int scmSvnQueryProperty(PSCMRWSTATE pState, const char *pszName, char **ppszValue)
+{
-    /*
-     * Look it up in the scheduled changes.
-     */
-    uint32_t i = pState->cSvnPropChanges;
-    while (i-- > 0)
-        if (!strcmp(pState->paSvnPropChanges[i].pszName, pszName))
+        {
-            const char *pszValue = pState->paSvnPropChanges[i].pszValue;
-            if (!pszValue)
-                return VERR_NOT_FOUND;
-            if (ppszValue)
-                return RTStrDupEx(ppszValue, pszValue);
-            return VINF_SUCCESS;
+        }
-#ifdef SCM_WITHOUT_LIBSVN
-    /*
-     * Hack: Read the .svn/props/<file>.svn-work file exists.
-     */
-    char szPath[RTPATH_MAX];
-    int rc = scmSvnConstructName(pState, ".svn/props/", ".svn-work", szPath);
-    if (RT_SUCCESS(rc) && !RTFileExists(szPath))
-        rc = scmSvnConstructName(pState, ".svn/prop-base/", ".svn-base", szPath);
-    if (RT_SUCCESS(rc))
+    {
-        SCMSTREAM Stream;
-        rc = ScmStreamInitForReading(&Stream, szPath);
-        if (RT_SUCCESS(rc))
+        {
-            /*
-             * The current format is K len\n<name>\nV len\n<value>\n" ... END.
-             */
-            rc = VERR_NOT_FOUND;
-            size_t const    cchName = strlen(pszName);
-            SCMEOL          enmEol;
-            size_t          cchLine;
-            const char     *pchLine;
-            while ((pchLine = ScmStreamGetLine(&Stream, &cchLine, &enmEol)) != NULL)
+            {
-                /*
-                 * Parse the 'K num' / 'END' line.
-                 */
-                if (   cchLine == 3
-                    && !memcmp(pchLine, "END", 3))
-                    break;
-                size_t cchKey;
-                if (   cchLine < 3
-                    || pchLine[0] != 'K'
-                    || pchLine[1] != ' '
-                    || !scmSvnReadNumber(&pchLine[2], cchLine - 2, &cchKey)
-                    || cchKey == 0
-                    || cchKey > 4096)
+                {
-                    RTMsgError("%s:%u: Unexpected data '%.*s'\n", szPath, ScmStreamTellLine(&Stream), cchLine, pchLine);
-                    rc = VERR_PARSE_ERROR;
-                    break;
+                }
-                /*
-                 * Match the key and skip to the value line.  Don't bother with
-                 * names containing EOL markers.
-                 */
-                size_t const offKey = ScmStreamTell(&Stream);
-                bool fMatch = cchName == cchKey;
-                if (fMatch)
+                {
-                    pchLine = ScmStreamGetLine(&Stream, &cchLine, &enmEol);
-                    if (!pchLine)
-                        break;
-                    fMatch = cchLine == cchName
-                          && !memcmp(pchLine, pszName, cchName);
+                }
-                if (RT_FAILURE(ScmStreamSeekAbsolute(&Stream, offKey + cchKey)))
-                    break;
-                if (RT_FAILURE(ScmStreamSeekByLine(&Stream, ScmStreamTellLine(&Stream) + 1)))
-                    break;
-                /*
-                 * Read and Parse the 'V num' line.
-                 */
-                pchLine = ScmStreamGetLine(&Stream, &cchLine, &enmEol);
-                if (!pchLine)
-                    break;
-                size_t cchValue;
-                if (   cchLine < 3
-                    || pchLine[0] != 'V'
-                    || pchLine[1] != ' '
-                    || !scmSvnReadNumber(&pchLine[2], cchLine - 2, &cchValue)
-                    || cchValue > _1M)
+                {
-                    RTMsgError("%s:%u: Unexpected data '%.*s'\n", szPath, ScmStreamTellLine(&Stream), cchLine, pchLine);
-                    rc = VERR_PARSE_ERROR;
-                    break;
+                }
-                /*
-                 * If we have a match, allocate a return buffer and read the
-                 * value into it.  Otherwise skip this value and continue
-                 * searching.
-                 */
-                if (fMatch)
+                {
-                    if (!ppszValue)
-                        rc = VINF_SUCCESS;
-                    else
+                    {
-                        char *pszValue;
-                        rc = RTStrAllocEx(&pszValue, cchValue + 1);
-                        if (RT_SUCCESS(rc))
+                        {
-                            rc = ScmStreamRead(&Stream, pszValue, cchValue);
-                            if (RT_SUCCESS(rc))
-                                *ppszValue = pszValue;
-                            else
-                                RTStrFree(pszValue);
+                        }
+                    }
-                    break;
+                }
-                if (RT_FAILURE(ScmStreamSeekRelative(&Stream, cchValue)))
-                    break;
-                if (RT_FAILURE(ScmStreamSeekByLine(&Stream, ScmStreamTellLine(&Stream) + 1)))
-                    break;
+            }
-            if (RT_FAILURE(ScmStreamGetStatus(&Stream)))
+            {
-                rc = ScmStreamGetStatus(&Stream);
-                RTMsgError("%s: stream error %Rrc\n", szPath, rc);
+            }
-            ScmStreamDelete(&Stream);
+        }
+    }
-    if (rc == VERR_FILE_NOT_FOUND)
-        rc = VERR_NOT_FOUND;
-    return rc;
-#else
-    NOREF(pState);
-#endif
-    return VERR_NOT_FOUND;
+}
-/**
- * Schedules the setting of a property.
+ *
- * @returns IPRT status code.
- * @retval  VERR_INVALID_STATE if not a SVN WC file.
- * @param   pState              The rewrite state to work on.
- * @param   pszName             The name of the property to set.
- * @param   pszValue            The value.  NULL means deleting it.
- */
-static int scmSvnSetProperty(PSCMRWSTATE pState, const char *pszName, const char *pszValue)
+{
-    /*
-     * Update any existing entry first.
-     */
-    size_t i = pState->cSvnPropChanges;
-    while (i-- > 0)
-        if (!strcmp(pState->paSvnPropChanges[i].pszName,  pszName))
+        {
-            if (!pszValue)
+            {
-                RTStrFree(pState->paSvnPropChanges[i].pszValue);
-                pState->paSvnPropChanges[i].pszValue = NULL;
+            }
-            else
+            {
-                char *pszCopy;
-                int rc = RTStrDupEx(&pszCopy, pszValue);
-                if (RT_FAILURE(rc))
-                    return rc;
-                pState->paSvnPropChanges[i].pszValue = pszCopy;
+            }
-            return VINF_SUCCESS;
+        }
-    /*
-     * Insert a new entry.
-     */
-    i = pState->cSvnPropChanges;
-    if ((i % 32) == 0)
+    {
-        void *pvNew = RTMemRealloc(pState->paSvnPropChanges, (i + 32) * sizeof(SCMSVNPROP));
-        if (!pvNew)
-            return VERR_NO_MEMORY;
-        pState->paSvnPropChanges = (PSCMSVNPROP)pvNew;
+    }
-    pState->paSvnPropChanges[i].pszName  = RTStrDup(pszName);
-    pState->paSvnPropChanges[i].pszValue = pszValue ? RTStrDup(pszValue) : NULL;
-    if (   pState->paSvnPropChanges[i].pszName
-        && (pState->paSvnPropChanges[i].pszValue || !pszValue) )
-        pState->cSvnPropChanges = i + 1;
-    else
+    {
-        RTStrFree(pState->paSvnPropChanges[i].pszName);
-        pState->paSvnPropChanges[i].pszName = NULL;
-        RTStrFree(pState->paSvnPropChanges[i].pszValue);
-        pState->paSvnPropChanges[i].pszValue = NULL;
-        return VERR_NO_MEMORY;
+    }
-    return VINF_SUCCESS;
+}
-/**
- * Schedules a property deletion.
+ *
- * @returns IPRT status code.
- * @param   pState              The rewrite state to work on.
- * @param   pszName             The name of the property to delete.
- */
-static int scmSvnDelProperty(PSCMRWSTATE pState, const char *pszName)
+{
-    return scmSvnSetProperty(pState, pszName, NULL);
+}
-/**
- * Applies any SVN property changes to the work copy of the file.
+ *
- * @returns IPRT status code.
- * @param   pState              The rewrite state which SVN property changes
- *                              should be applied.
- */
-static int scmSvnDisplayChanges(PSCMRWSTATE pState)
+{
-    size_t i = pState->cSvnPropChanges;
-    while (i-- > 0)
+    {
-        const char *pszName  = pState->paSvnPropChanges[i].pszName;
-        const char *pszValue = pState->paSvnPropChanges[i].pszValue;
-        if (pszValue)
-            ScmVerbose(pState, 0, "svn ps '%s' '%s'  %s\n", pszName, pszValue, pState->pszFilename);
-        else
-            ScmVerbose(pState, 0, "svn pd '%s'  %s\n", pszName, pszValue, pState->pszFilename);
+    }
-    return VINF_SUCCESS;
+}
-/**
- * Applies any SVN property changes to the work copy of the file.
+ *
- * @returns IPRT status code.
- * @param   pState              The rewrite state which SVN property changes
- *                              should be applied.
- */
-static int scmSvnApplyChanges(PSCMRWSTATE pState)
+{
-#ifdef SCM_WITHOUT_LIBSVN
-    /*
-     * This sucks. We gotta find svn(.exe).
-     */
-    static char s_szSvnPath[RTPATH_MAX];
-    if (s_szSvnPath[0] == '\0')
-        scmSvnFindSvnBinary(s_szSvnPath, sizeof(s_szSvnPath));
-    /*
-     * Iterate thru the changes and apply them by starting the svn client.
-     */
-    for (size_t i = 0; i <pState->cSvnPropChanges; i++)
+    {
-        const char *apszArgv[6];
-        apszArgv[0] = s_szSvnPath;
-        apszArgv[1] = pState->paSvnPropChanges[i].pszValue ? "ps" : "pd";
-        apszArgv[2] = pState->paSvnPropChanges[i].pszName;
-        int iArg = 3;
-        if (pState->paSvnPropChanges[i].pszValue)
-            apszArgv[iArg++] = pState->paSvnPropChanges[i].pszValue;
-        apszArgv[iArg++] = pState->pszFilename;
-        apszArgv[iArg++] = NULL;
-        ScmVerbose(pState, 2, "executing: %s %s %s %s %s\n",
-                   apszArgv[0], apszArgv[1], apszArgv[2], apszArgv[3], apszArgv[4]);
-        RTPROCESS pid;
-        int rc = RTProcCreate(s_szSvnPath, apszArgv, RTENV_DEFAULT, 0 /*fFlags*/, &pid);
-        if (RT_SUCCESS(rc))
+        {
-            RTPROCSTATUS Status;
-            rc = RTProcWait(pid, RTPROCWAIT_FLAGS_BLOCK, &Status);
-            if (    RT_SUCCESS(rc)
-                &&  (   Status.enmReason != RTPROCEXITREASON_NORMAL
-                     || Status.iStatus != 0) )
+            {
-                RTMsgError("%s: %s %s %s %s %s -> %s %u\n",
-                           pState->pszFilename, apszArgv[0], apszArgv[1], apszArgv[2], apszArgv[3], apszArgv[4],
-                           Status.enmReason == RTPROCEXITREASON_NORMAL   ? "exit code"
-                           : Status.enmReason == RTPROCEXITREASON_SIGNAL ? "signal"
-                           : Status.enmReason == RTPROCEXITREASON_ABEND  ? "abnormal end"
-                           : "abducted by alien",
-                           Status.iStatus);
-                return VERR_GENERAL_FAILURE;
+            }
+        }
-        if (RT_FAILURE(rc))
+        {
-            RTMsgError("%s: error executing %s %s %s %s %s: %Rrc\n",
-                       pState->pszFilename, apszArgv[0], apszArgv[1], apszArgv[2], apszArgv[3], apszArgv[4], rc);
-            return rc;
+        }
+    }
-    return VINF_SUCCESS;
-#else
-    return VERR_NOT_IMPLEMENTED;
-#endif
+}
-/* -=-=-=-=-=- rewriters -=-=-=-=-=- */
-/**
- * Strip trailing blanks (space & tab).
+ *
- * @returns True if modified, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
- */
-static bool rewrite_StripTrailingBlanks(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    if (!pSettings->fStripTrailingBlanks)
-        return false;
-    bool        fModified = false;
-    SCMEOL      enmEol;
-    size_t      cchLine;
-    const char *pchLine;
-    while ((pchLine = ScmStreamGetLine(pIn, &cchLine, &enmEol)) != NULL)
+    {
-        int rc;
-        if (    cchLine == 0
-            ||  !RT_C_IS_BLANK(pchLine[cchLine - 1]) )
-            rc = ScmStreamPutLine(pOut, pchLine, cchLine, enmEol);
-        else
+        {
-            cchLine--;
-            while (cchLine > 0 && RT_C_IS_BLANK(pchLine[cchLine - 1]))
-                cchLine--;
-            rc = ScmStreamPutLine(pOut, pchLine, cchLine, enmEol);
-            fModified = true;
+        }
-        if (RT_FAILURE(rc))
-            return false;
+    }
-    if (fModified)
-        ScmVerbose(pState, 2, " * Stripped trailing blanks\n");
-    return fModified;
+}
-/**
- * Expand tabs.
+ *
- * @returns True if modified, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
- */
-static bool rewrite_ExpandTabs(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    if (!pSettings->fConvertTabs)
-        return false;
-    size_t const    cchTab = pSettings->cchTab;
-    bool            fModified = false;
-    SCMEOL          enmEol;
-    size_t          cchLine;
-    const char     *pchLine;
-    while ((pchLine = ScmStreamGetLine(pIn, &cchLine, &enmEol)) != NULL)
+    {
-        int rc;
-        const char *pchTab = (const char *)memchr(pchLine, '\t', cchLine);
-        if (!pchTab)
-            rc = ScmStreamPutLine(pOut, pchLine, cchLine, enmEol);
-        else
+        {
-            size_t      offTab   = 0;
-            const char *pchChunk = pchLine;
-            for (;;)
+            {
-                size_t  cchChunk = pchTab - pchChunk;
-                offTab += cchChunk;
-                ScmStreamWrite(pOut, pchChunk, cchChunk);
-                size_t  cchToTab = cchTab - offTab % cchTab;
-                ScmStreamWrite(pOut, g_szTabSpaces, cchToTab);
-                offTab += cchToTab;
-                pchChunk = pchTab + 1;
-                size_t  cchLeft  = cchLine - (pchChunk - pchLine);
-                pchTab = (const char *)memchr(pchChunk, '\t', cchLeft);
-                if (!pchTab)
+                {
-                    rc = ScmStreamPutLine(pOut, pchChunk, cchLeft, enmEol);
-                    break;
+                }
+            }
-            fModified = true;
+        }
-        if (RT_FAILURE(rc))
-            return false;
+    }
-    if (fModified)
-        ScmVerbose(pState, 2, " * Expanded tabs\n");
-    return fModified;
+}
-/**
- * Worker for rewrite_ForceNativeEol, rewrite_ForceLF and rewrite_ForceCRLF.
+ *
- * @returns true if modifications were made, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
- * @param   enmDesiredEol       The desired end of line indicator type.
- * @param   pszDesiredSvnEol    The desired svn:eol-style.
- */
-static bool rewrite_ForceEol(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings,
-                             SCMEOL enmDesiredEol, const char *pszDesiredSvnEol)
+{
-    if (!pSettings->fConvertEol)
-        return false;
-    bool        fModified = false;
-    SCMEOL      enmEol;
-    size_t      cchLine;
-    const char *pchLine;
-    while ((pchLine = ScmStreamGetLine(pIn, &cchLine, &enmEol)) != NULL)
+    {
-        if (   enmEol != enmDesiredEol
-            && enmEol != SCMEOL_NONE)
+        {
-            fModified = true;
-            enmEol = enmDesiredEol;
+        }
-        int rc = ScmStreamPutLine(pOut, pchLine, cchLine, enmEol);
-        if (RT_FAILURE(rc))
-            return false;
+    }
-    if (fModified)
-        ScmVerbose(pState, 2, " * Converted EOL markers\n");
-    /* Check svn:eol-style if appropriate */
-    if (   pSettings->fSetSvnEol
-        && scmSvnIsInWorkingCopy(pState))
+    {
-        char *pszEol;
-        int rc = scmSvnQueryProperty(pState, "svn:eol-style", &pszEol);
-        if (   (RT_SUCCESS(rc) && strcmp(pszEol, pszDesiredSvnEol))
-            || rc == VERR_NOT_FOUND)
+        {
-            if (rc == VERR_NOT_FOUND)
-                ScmVerbose(pState, 2, " * Setting svn:eol-style to %s (missing)\n", pszDesiredSvnEol);
-            else
-                ScmVerbose(pState, 2, " * Setting svn:eol-style to %s (was: %s)\n", pszDesiredSvnEol, pszEol);
-            int rc2 = scmSvnSetProperty(pState, "svn:eol-style", pszDesiredSvnEol);
-            if (RT_FAILURE(rc2))
-                RTMsgError("scmSvnSetProperty: %Rrc\n", rc2); /** @todo propagate the error somehow... */
+        }
-        if (RT_SUCCESS(rc))
-            RTStrFree(pszEol);
+    }
-    /** @todo also check the subversion svn:eol-style state! */
-    return fModified;
+}
-/**
- * Force native end of line indicator.
+ *
- * @returns true if modifications were made, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
- */
-static bool rewrite_ForceNativeEol(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-    return rewrite_ForceEol(pState, pIn, pOut, pSettings, SCMEOL_CRLF, "native");
-#else
-    return rewrite_ForceEol(pState, pIn, pOut, pSettings, SCMEOL_LF,   "native");
-#endif
+}
-/**
- * Force the stream to use LF as the end of line indicator.
+ *
- * @returns true if modifications were made, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
- */
-static bool rewrite_ForceLF(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    return rewrite_ForceEol(pState, pIn, pOut, pSettings, SCMEOL_LF, "LF");
+}
-/**
- * Force the stream to use CRLF as the end of line indicator.
+ *
- * @returns true if modifications were made, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
- */
-static bool rewrite_ForceCRLF(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    return rewrite_ForceEol(pState, pIn, pOut, pSettings, SCMEOL_CRLF, "CRLF");
+}
-/**
- * Strip trailing blank lines and/or make sure there is exactly one blank line
- * at the end of the file.
+ *
- * @returns true if modifications were made, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
+ *
- * @remarks ASSUMES trailing white space has been removed already.
- */
-static bool rewrite_AdjustTrailingLines(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    if (   !pSettings->fStripTrailingLines
-        && !pSettings->fForceTrailingLine
-        && !pSettings->fForceFinalEol)
-        return false;
-    size_t const cLines = ScmStreamCountLines(pIn);
-    /* Empty files remains empty. */
-    if (cLines <= 1)
-        return false;
-    /* Figure out if we need to adjust the number of lines or not. */
-    size_t cLinesNew = cLines;
-    if (   pSettings->fStripTrailingLines
-        && ScmStreamIsWhiteLine(pIn, cLinesNew - 1))
+    {
-        while (   cLinesNew > 1
-               && ScmStreamIsWhiteLine(pIn, cLinesNew - 2))
-            cLinesNew--;
+    }
-    if (    pSettings->fForceTrailingLine
-        && !ScmStreamIsWhiteLine(pIn, cLinesNew - 1))
-        cLinesNew++;
-    bool fFixMissingEol = pSettings->fForceFinalEol
-                       && ScmStreamGetEolByLine(pIn, cLinesNew - 1) == SCMEOL_NONE;
-    if (   !fFixMissingEol
-        && cLines == cLinesNew)
-        return false;
-    /* Copy the number of lines we've arrived at. */
-    ScmStreamRewindForReading(pIn);
-    size_t cCopied = RT_MIN(cLinesNew, cLines);
-    ScmStreamCopyLines(pOut, pIn, cCopied);
-    if (cCopied != cLinesNew)
+    {
-        while (cCopied++ < cLinesNew)
-            ScmStreamPutLine(pOut, "", 0, ScmStreamGetEol(pIn));
+    }
-    /* Fix missing EOL if required. */
-    else if (fFixMissingEol)
+    {
-        if (ScmStreamGetEol(pIn) == SCMEOL_LF)
-            ScmStreamWrite(pOut, "\n", 1);
-        else
-            ScmStreamWrite(pOut, "\r\n", 2);
+    }
-    ScmVerbose(pState, 2, " * Adjusted trailing blank lines\n");
-    return true;
+}
-/**
- * Make sure there is no svn:executable keyword on the current file.
+ *
- * @returns false - the state carries these kinds of changes.
- * @param   pState              The rewriter state.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
- */
-static bool rewrite_SvnNoExecutable(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    if (   !pSettings->fSetSvnExecutable
-        || !scmSvnIsInWorkingCopy(pState))
-        return false;
-    int rc = scmSvnQueryProperty(pState, "svn:executable", NULL);
-    if (RT_SUCCESS(rc))
+    {
-        ScmVerbose(pState, 2, " * removing svn:executable\n");
-        rc = scmSvnDelProperty(pState, "svn:executable");
-        if (RT_FAILURE(rc))
-            RTMsgError("scmSvnSetProperty: %Rrc\n", rc); /** @todo error propagation here.. */
+    }
-    return false;
+}
-/**
- * Make sure the Id and Revision keywords are expanded.
+ *
- * @returns false - the state carries these kinds of changes.
- * @param   pState              The rewriter state.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
- */
-static bool rewrite_SvnKeywords(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    if (   !pSettings->fSetSvnKeywords
-        || !scmSvnIsInWorkingCopy(pState))
-        return false;
-    char *pszKeywords;
-    int rc = scmSvnQueryProperty(pState, "svn:keywords", &pszKeywords);
-    if (    RT_SUCCESS(rc)
-        && (   !strstr(pszKeywords, "Id") /** @todo need some function for finding a word in a string.  */
-            || !strstr(pszKeywords, "Revision")) )
+    {
-        if (!strstr(pszKeywords, "Id") && !strstr(pszKeywords, "Revision"))
-            rc = RTStrAAppend(&pszKeywords, " Id Revision");
-        else if (!strstr(pszKeywords, "Id"))
-            rc = RTStrAAppend(&pszKeywords, " Id");
-        else
-            rc = RTStrAAppend(&pszKeywords, " Revision");
-        if (RT_SUCCESS(rc))
+        {
-            ScmVerbose(pState, 2, " * changing svn:keywords to '%s'\n", pszKeywords);
-            rc = scmSvnSetProperty(pState, "svn:keywords", pszKeywords);
-            if (RT_FAILURE(rc))
-                RTMsgError("scmSvnSetProperty: %Rrc\n", rc); /** @todo error propagation here.. */
+        }
-        else
-            RTMsgError("RTStrAppend: %Rrc\n", rc); /** @todo error propagation here.. */
-        RTStrFree(pszKeywords);
+    }
-    else if (rc == VERR_NOT_FOUND)
+    {
-        ScmVerbose(pState, 2, " * setting svn:keywords to 'Id Revision'\n");
-        rc = scmSvnSetProperty(pState, "svn:keywords", "Id Revision");
-        if (RT_FAILURE(rc))
-            RTMsgError("scmSvnSetProperty: %Rrc\n", rc); /** @todo error propagation here.. */
+    }
-    else if (RT_SUCCESS(rc))
-        RTStrFree(pszKeywords);
-    return false;
+}
-/**
- * Makefile.kup are empty files, enforce this.
+ *
- * @returns true if modifications were made, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
- */
-static bool rewrite_Makefile_kup(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    /* These files should be zero bytes. */
-    if (pIn->cb == 0)
-        return false;
-    ScmVerbose(pState, 2, " * Truncated file to zero bytes\n");
-    return true;
+}
-/**
- * Rewrite a kBuild makefile.
+ *
- * @returns true if modifications were made, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
+ *
- * @todo
+ *
- * Ideas for Makefile.kmk and Config.kmk:
- *      - sort if1of/ifn1of sets.
- *      - line continuation slashes should only be preceded by one space.
- */
-static bool rewrite_Makefile_kmk(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    return false;
+}
-/**
- * Rewrite a C/C++ source or header file.
+ *
- * @returns true if modifications were made, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
+ *
- * @todo
+ *
- * Ideas for C/C++:
- *      - space after if, while, for, switch
- *      - spaces in for (i=0;i<x;i++)
- *      - complex conditional, bird style.
- *      - remove unnecessary parentheses.
- *      - sort defined RT_OS_*||  and RT_ARCH
- *      - sizeof without parenthesis.
- *      - defined without parenthesis.
- *      - trailing spaces.
- *      - parameter indentation.
- *      - space after comma.
- *      - while (x--); -> multi line + comment.
- *      - else statement;
- *      - space between function and left parenthesis.
- *      - TODO, XXX, @todo cleanup.
- *      - Space before/after '*'.
- *      - ensure new line at end of file.
- *      - Indentation of precompiler statements (#ifdef, #defines).
- *      - space between functions.
- *      - string.h -> iprt/string.h, stdarg.h -> iprt/stdarg.h, etc.
- */
-static bool rewrite_C_and_CPP(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    return false;
+}
-/* -=-=-=-=-=- file and directory processing -=-=-=-=-=- */
-/**
- * Processes a file.
+ *
- * @returns IPRT status code.
- * @param   pState              The rewriter state.
- * @param   pszFilename         The file name.
- * @param   pszBasename         The base name (pointer within @a pszFilename).
- * @param   cchBasename         The length of the base name.  (For passing to
- *                              RTStrSimplePatternMultiMatch.)
- * @param   pBaseSettings       The base settings to use.  It's OK to modify
- *                              these.
- */
-static int scmProcessFileInner(PSCMRWSTATE pState, const char *pszFilename, const char *pszBasename, size_t cchBasename,
-                               PSCMSETTINGSBASE pBaseSettings)
+{
-    /*
-     * Do the file level filtering.
-     */
-    if (   pBaseSettings->pszFilterFiles
-        && *pBaseSettings->pszFilterFiles
-        && !RTStrSimplePatternMultiMatch(pBaseSettings->pszFilterFiles, RTSTR_MAX, pszBasename, cchBasename, NULL))
+    {
-        ScmVerbose(NULL, 5, "skipping '%s': file filter mismatch\n", pszFilename);
-        return VINF_SUCCESS;
+    }
-    if (   pBaseSettings->pszFilterOutFiles
-        && *pBaseSettings->pszFilterOutFiles
-        && (   RTStrSimplePatternMultiMatch(pBaseSettings->pszFilterOutFiles, RTSTR_MAX, pszBasename, cchBasename, NULL)
-            || RTStrSimplePatternMultiMatch(pBaseSettings->pszFilterOutFiles, RTSTR_MAX, pszFilename, RTSTR_MAX, NULL)) )
+    {
-        ScmVerbose(NULL, 5, "skipping '%s': filterd out\n", pszFilename);
-        return VINF_SUCCESS;
+    }
-    if (   pBaseSettings->fOnlySvnFiles
-        && !scmSvnIsInWorkingCopy(pState))
+    {
-        ScmVerbose(NULL, 5, "skipping '%s': not in SVN WC\n", pszFilename);
-        return VINF_SUCCESS;
+    }
-    /*
-     * Try find a matching rewrite config for this filename.
-     */
-    PCSCMCFGENTRY pCfg = NULL;
-    for (size_t iCfg = 0; iCfg < RT_ELEMENTS(g_aConfigs); iCfg++)
-        if (RTStrSimplePatternMultiMatch(g_aConfigs[iCfg].pszFilePattern, RTSTR_MAX, pszBasename, cchBasename, NULL))
+        {
-            pCfg = &g_aConfigs[iCfg];
-            break;
+        }
-    if (!pCfg)
+    {
-        ScmVerbose(NULL, 4, "skipping '%s': no rewriters configured\n", pszFilename);
-        return VINF_SUCCESS;
+    }
-    ScmVerbose(pState, 4, "matched \"%s\"\n", pCfg->pszFilePattern);
-    /*
-     * Create an input stream from the file and check that it's text.
-     */
-    SCMSTREAM Stream1;
-    int rc = ScmStreamInitForReading(&Stream1, pszFilename);
-    if (RT_FAILURE(rc))
+    {
-        RTMsgError("Failed to read '%s': %Rrc\n", pszFilename, rc);
-        return rc;
+    }
-    if (ScmStreamIsText(&Stream1))
+    {
-        ScmVerbose(pState, 3, NULL);
-        /*
-         * Gather SCM and editor settings from the stream.
-         */
-        rc = scmSettingsBaseLoadFromDocument(pBaseSettings, &Stream1);
-        if (RT_SUCCESS(rc))
+        {
-            ScmStreamRewindForReading(&Stream1);
-            /*
-             * Create two more streams for output and push the text thru all the
-             * rewriters, switching the two streams around when something is
-             * actually rewritten.  Stream1 remains unchanged.
-             */
-            SCMSTREAM Stream2;
-            rc = ScmStreamInitForWriting(&Stream2, &Stream1);
-            if (RT_SUCCESS(rc))
+            {
-                SCMSTREAM Stream3;
-                rc = ScmStreamInitForWriting(&Stream3, &Stream1);
-                if (RT_SUCCESS(rc))
+                {
-                    bool        fModified = false;
-                    PSCMSTREAM  pIn       = &Stream1;
-                    PSCMSTREAM  pOut      = &Stream2;
-                    for (size_t iRw = 0; iRw < pCfg->cRewriters; iRw++)
+                    {
-                        bool fRc = pCfg->papfnRewriter[iRw](pState, pIn, pOut, pBaseSettings);
-                        if (fRc)
+                        {
-                            PSCMSTREAM pTmp = pOut;
-                            pOut = pIn == &Stream1 ? &Stream3 : pIn;
-                            pIn  = pTmp;
-                            fModified = true;
+                        }
-                        ScmStreamRewindForReading(pIn);
-                        ScmStreamRewindForWriting(pOut);
+                    }
-                    rc = ScmStreamGetStatus(&Stream1);
-                    if (RT_SUCCESS(rc))
-                        rc = ScmStreamGetStatus(&Stream2);
-                    if (RT_SUCCESS(rc))
-                        rc = ScmStreamGetStatus(&Stream3);
-                    if (RT_SUCCESS(rc))
+                    {
-                        /*
-                         * If rewritten, write it back to disk.
-                         */
-                        if (fModified)
+                        {
-                            if (!g_fDryRun)
+                            {
-                                ScmVerbose(pState, 1, "writing modified file to \"%s%s\"\n", pszFilename, g_pszChangedSuff);
-                                rc = ScmStreamWriteToFile(pIn, "%s%s", pszFilename, g_pszChangedSuff);
-                                if (RT_FAILURE(rc))
-                                    RTMsgError("Error writing '%s%s': %Rrc\n", pszFilename, g_pszChangedSuff, rc);
+                            }
-                            else
+                            {
-                                ScmVerbose(pState, 1, NULL);
-                                ScmDiffStreams(pszFilename, &Stream1, pIn, g_fDiffIgnoreEol, g_fDiffIgnoreLeadingWS,
-                                               g_fDiffIgnoreTrailingWS, g_fDiffSpecialChars, pBaseSettings->cchTab, g_pStdOut);
-                                ScmVerbose(pState, 2, "would have modified the file \"%s%s\"\n", pszFilename, g_pszChangedSuff);
+                            }
+                        }
-                        /*
-                         * If pending SVN property changes, apply them.
-                         */
-                        if (pState->cSvnPropChanges && RT_SUCCESS(rc))
+                        {
-                            if (!g_fDryRun)
+                            {
-                                rc = scmSvnApplyChanges(pState);
-                                if (RT_FAILURE(rc))
-                                    RTMsgError("%s: failed to apply SVN property changes (%Rrc)\n", pszFilename, rc);
+                            }
-                            else
-                                scmSvnDisplayChanges(pState);
+                        }
-                        if (!fModified && !pState->cSvnPropChanges)
-                            ScmVerbose(pState, 3, "no change\n", pszFilename);
+                    }
-                    else
-                        RTMsgError("%s: stream error %Rrc\n", pszFilename);
-                    ScmStreamDelete(&Stream3);
+                }
-                else
-                    RTMsgError("Failed to init stream for writing: %Rrc\n", rc);
-                ScmStreamDelete(&Stream2);
+            }
-            else
-                RTMsgError("Failed to init stream for writing: %Rrc\n", rc);
+        }
-        else
-            RTMsgError("scmSettingsBaseLoadFromDocument: %Rrc\n", rc);
+    }
-    else
-        ScmVerbose(pState, 4, "not text file: \"%s\"\n", pszFilename);
-    ScmStreamDelete(&Stream1);
-    return rc;
+}
-/**
- * Processes a file.
+ *
- * This is just a wrapper for scmProcessFileInner for avoid wasting stack in the
- * directory recursion method.
+ *
- * @returns IPRT status code.
- * @param   pszFilename         The file name.
- * @param   pszBasename         The base name (pointer within @a pszFilename).
- * @param   cchBasename         The length of the base name.  (For passing to
- *                              RTStrSimplePatternMultiMatch.)
- * @param   pSettingsStack      The settings stack (pointer to the top element).
- */
-static int scmProcessFile(const char *pszFilename, const char *pszBasename, size_t cchBasename,
-                          PSCMSETTINGS pSettingsStack)
+{
-    SCMSETTINGSBASE Base;
-    int rc = scmSettingsStackMakeFileBase(pSettingsStack, pszFilename, pszBasename, cchBasename, &Base);
-    if (RT_SUCCESS(rc))
+    {
-        SCMRWSTATE State;
-        State.fFirst           = false;
-        State.pszFilename      = pszFilename;
-        State.cSvnPropChanges  = 0;
-        State.paSvnPropChanges = NULL;
-        rc = scmProcessFileInner(&State, pszFilename, pszBasename, cchBasename, &Base);
-        size_t i = State.cSvnPropChanges;
-        while (i-- > 0)
+        {
-            RTStrFree(State.paSvnPropChanges[i].pszName);
-            RTStrFree(State.paSvnPropChanges[i].pszValue);
+        }
-        RTMemFree(State.paSvnPropChanges);
-        scmSettingsBaseDelete(&Base);
+    }
-    return rc;
+}
-/**
- * Tries to correct RTDIRENTRY_UNKNOWN.
+ *
- * @returns Corrected type.
- * @param   pszPath             The path to the object in question.
- */
-static RTDIRENTRYTYPE scmFigureUnknownType(const char *pszPath)
+{
-    RTFSOBJINFO Info;
-    int rc = RTPathQueryInfo(pszPath, &Info, RTFSOBJATTRADD_NOTHING);
-    if (RT_FAILURE(rc))
-        return RTDIRENTRYTYPE_UNKNOWN;
-    if (RTFS_IS_DIRECTORY(Info.Attr.fMode))
-        return RTDIRENTRYTYPE_DIRECTORY;
-    if (RTFS_IS_FILE(Info.Attr.fMode))
-        return RTDIRENTRYTYPE_FILE;
-    return RTDIRENTRYTYPE_UNKNOWN;
+}
-/**
- * Recurse into a sub-directory and process all the files and directories.
+ *
- * @returns IPRT status code.
- * @param   pszBuf              Path buffer containing the directory path on
- *                              entry.  This ends with a dot.  This is passed
- *                              along when recursing in order to save stack space
- *                              and avoid needless copying.
- * @param   cchDir              Length of our path in pszbuf.
- * @param   pEntry              Directory entry buffer.  This is also passed
- *                              along when recursing to save stack space.
- * @param   pSettingsStack      The settings stack (pointer to the top element).
- * @param   iRecursion          The recursion depth.  This is used to restrict
- *                              the recursions.
- */
-static int scmProcessDirTreeRecursion(char *pszBuf, size_t cchDir, PRTDIRENTRY pEntry,
-                                      PSCMSETTINGS pSettingsStack, unsigned iRecursion)
+{
-    int rc;
-    Assert(cchDir > 1 && pszBuf[cchDir - 1] == '.');
-    /*
-     * Make sure we stop somewhere.
-     */
-    if (iRecursion > 128)
+    {
-        RTMsgError("recursion too deep: %d\n", iRecursion);
-        return VINF_SUCCESS; /* ignore */
+    }
-    /*
-     * Check if it's excluded by --only-svn-dir.
-     */
-    if (pSettingsStack->Base.fOnlySvnDirs)
+    {
-        rc = RTPathAppend(pszBuf, RTPATH_MAX, ".svn");
-        if (RT_FAILURE(rc))
+        {
-            RTMsgError("RTPathAppend: %Rrc\n", rc);
-            return rc;
+        }
-        if (!RTDirExists(pszBuf))
-            return VINF_SUCCESS;
-        Assert(RTPATH_IS_SLASH(pszBuf[cchDir]));
-        pszBuf[cchDir]     = '\0';
-        pszBuf[cchDir - 1] = '.';
+    }
-    /*
-     * Try open and read the directory.
-     */
-    PRTDIR pDir;
-    rc = RTDirOpenFiltered(&pDir, pszBuf, RTDIRFILTER_NONE, 0);
-    if (RT_FAILURE(rc))
+    {
-        RTMsgError("Failed to enumerate directory '%s': %Rrc", pszBuf, rc);
-        return rc;
+    }
-    for (;;)
+    {
-        /* Read the next entry. */
-        rc = RTDirRead(pDir, pEntry, NULL);
-        if (RT_FAILURE(rc))
+        {
-            if (rc == VERR_NO_MORE_FILES)
-                rc = VINF_SUCCESS;
-            else
-                RTMsgError("RTDirRead -> %Rrc\n", rc);
-            break;
+        }
-        /* Skip '.' and '..'. */
-        if (    pEntry->szName[0] == '.'
-            &&  (   pEntry->cbName == 1
-                 || (   pEntry->cbName == 2
-                     && pEntry->szName[1] == '.')))
-            continue;
-        /* Enter it into the buffer so we've got a full name to work
-           with when needed. */
-        if (pEntry->cbName + cchDir >= RTPATH_MAX)
+        {
-            RTMsgError("Skipping too long entry: %s", pEntry->szName);
-            continue;
+        }
-        memcpy(&pszBuf[cchDir - 1], pEntry->szName, pEntry->cbName + 1);
-        /* Figure the type. */
-        RTDIRENTRYTYPE enmType = pEntry->enmType;
-        if (enmType == RTDIRENTRYTYPE_UNKNOWN)
-            enmType = scmFigureUnknownType(pszBuf);
-        /* Process the file or directory, skip the rest. */
-        if (enmType == RTDIRENTRYTYPE_FILE)
-            rc = scmProcessFile(pszBuf, pEntry->szName, pEntry->cbName, pSettingsStack);
-        else if (enmType == RTDIRENTRYTYPE_DIRECTORY)
+        {
-            /* Append the dot for the benefit of the pattern matching. */
-            if (pEntry->cbName + cchDir + 5 >= RTPATH_MAX)
+            {
-                RTMsgError("Skipping too deep dir entry: %s", pEntry->szName);
-                continue;
+            }
-            memcpy(&pszBuf[cchDir - 1 + pEntry->cbName], "/.", sizeof("/."));
-            size_t cchSubDir = cchDir - 1 + pEntry->cbName + sizeof("/.") - 1;
-            if (   !pSettingsStack->Base.pszFilterOutDirs
-                || !*pSettingsStack->Base.pszFilterOutDirs
-                || (   !RTStrSimplePatternMultiMatch(pSettingsStack->Base.pszFilterOutDirs, RTSTR_MAX,
-                                                     pEntry->szName, pEntry->cbName, NULL)
-                    && !RTStrSimplePatternMultiMatch(pSettingsStack->Base.pszFilterOutDirs, RTSTR_MAX,
-                                                     pszBuf, cchSubDir, NULL)
+                   )
+               )
+            {
-                rc = scmSettingsStackPushDir(&pSettingsStack, pszBuf);
-                if (RT_SUCCESS(rc))
+                {
-                    rc = scmProcessDirTreeRecursion(pszBuf, cchSubDir, pEntry, pSettingsStack, iRecursion + 1);
-                    scmSettingsStackPopAndDestroy(&pSettingsStack);
+                }
+            }
+        }
-        if (RT_FAILURE(rc))
-            break;
+    }
-    RTDirClose(pDir);
-    return rc;
+}
-/**
- * Process a directory tree.
+ *
- * @returns IPRT status code.
- * @param   pszDir              The directory to start with.  This is pointer to
- *                              a RTPATH_MAX sized buffer.
- */
-static int scmProcessDirTree(char *pszDir, PSCMSETTINGS pSettingsStack)
+{
-    /*
-     * Setup the recursion.
-     */
-    int rc = RTPathAppend(pszDir, RTPATH_MAX, ".");
-    if (RT_SUCCESS(rc))
+    {
-        RTDIRENTRY Entry;
-        rc = scmProcessDirTreeRecursion(pszDir, strlen(pszDir), &Entry, pSettingsStack, 0);
+    }
-    else
-        RTMsgError("RTPathAppend: %Rrc\n", rc);
-    return rc;
+}
-/**
- * Processes a file or directory specified as an command line argument.
+ *
- * @returns IPRT status code
- * @param   pszSomething        What we found in the command line arguments.
- * @param   pSettingsStack      The settings stack (pointer to the top element).
- */
-static int scmProcessSomething(const char *pszSomething, PSCMSETTINGS pSettingsStack)
+{
-    char szBuf[RTPATH_MAX];
-    int rc = RTPathAbs(pszSomething, szBuf, sizeof(szBuf));
-    if (RT_SUCCESS(rc))
+    {
-        RTPathChangeToUnixSlashes(szBuf, false /*fForce*/);
-        PSCMSETTINGS pSettings;
-        rc = scmSettingsCreateForPath(&pSettings, &pSettingsStack->Base, szBuf);
-        if (RT_SUCCESS(rc))
+        {
-            scmSettingsStackPush(&pSettingsStack, pSettings);
-            if (RTFileExists(szBuf))
+            {
-                const char *pszBasename = RTPathFilename(szBuf);
-                if (pszBasename)
+                {
-                    size_t cchBasename = strlen(pszBasename);
-                    rc = scmProcessFile(szBuf, pszBasename, cchBasename, pSettingsStack);
+                }
-                else
+                {
-                    RTMsgError("RTPathFilename: NULL\n");
-                    rc = VERR_IS_A_DIRECTORY;
+                }
+            }
-            else
-                rc = scmProcessDirTree(szBuf, pSettingsStack);
-            PSCMSETTINGS pPopped = scmSettingsStackPop(&pSettingsStack);
-            Assert(pPopped == pSettings);
-            scmSettingsDestroy(pSettings);
+        }
-        else
-            RTMsgError("scmSettingsInitStack: %Rrc\n", rc);
+    }
-    else
-        RTMsgError("RTPathAbs: %Rrc\n", rc);
-    return rc;
+}
-int main(int argc, char **argv)
+{
-    int rc = RTR3InitExe(argc, &argv, 0);
-    if (RT_FAILURE(rc))
-        return 1;
-    /*
-     * Init the settings.
-     */
-    PSCMSETTINGS pSettings;
-    rc = scmSettingsCreate(&pSettings, &g_Defaults);
-    if (RT_FAILURE(rc))
+    {
-        RTMsgError("scmSettingsCreate: %Rrc\n", rc);
-        return 1;
+    }
-    /*
-     * Parse arguments and process input in order (because this is the only
-     * thing that works at the moment).
-     */
-    static RTGETOPTDEF s_aOpts[14 + RT_ELEMENTS(g_aScmOpts)] =
+    {
-        { "--dry-run",                          'd',                                    RTGETOPT_REQ_NOTHING },
-        { "--real-run",                         'D',                                    RTGETOPT_REQ_NOTHING },
-        { "--file-filter",                      'f',                                    RTGETOPT_REQ_STRING  },
-        { "--quiet",                            'q',                                    RTGETOPT_REQ_NOTHING },
-        { "--verbose",                          'v',                                    RTGETOPT_REQ_NOTHING },
-        { "--diff-ignore-eol",                  SCMOPT_DIFF_IGNORE_EOL,                 RTGETOPT_REQ_NOTHING },
-        { "--diff-no-ignore-eol",               SCMOPT_DIFF_NO_IGNORE_EOL,              RTGETOPT_REQ_NOTHING },
-        { "--diff-ignore-space",                SCMOPT_DIFF_IGNORE_SPACE,               RTGETOPT_REQ_NOTHING },
-        { "--diff-no-ignore-space",             SCMOPT_DIFF_NO_IGNORE_SPACE,            RTGETOPT_REQ_NOTHING },
-        { "--diff-ignore-leading-space",        SCMOPT_DIFF_IGNORE_LEADING_SPACE,       RTGETOPT_REQ_NOTHING },
-        { "--diff-no-ignore-leading-space",     SCMOPT_DIFF_NO_IGNORE_LEADING_SPACE,    RTGETOPT_REQ_NOTHING },
-        { "--diff-ignore-trailing-space",       SCMOPT_DIFF_IGNORE_TRAILING_SPACE,      RTGETOPT_REQ_NOTHING },
-        { "--diff-no-ignore-trailing-space",    SCMOPT_DIFF_NO_IGNORE_TRAILING_SPACE,   RTGETOPT_REQ_NOTHING },
-        { "--diff-special-chars",               SCMOPT_DIFF_SPECIAL_CHARS,              RTGETOPT_REQ_NOTHING },
-        { "--diff-no-special-chars",            SCMOPT_DIFF_NO_SPECIAL_CHARS,           RTGETOPT_REQ_NOTHING },
-    };
-    memcpy(&s_aOpts[RT_ELEMENTS(s_aOpts) - RT_ELEMENTS(g_aScmOpts)], &g_aScmOpts[0], sizeof(g_aScmOpts));
-    RTGETOPTUNION   ValueUnion;
-    RTGETOPTSTATE   GetOptState;
-    rc = RTGetOptInit(&GetOptState, argc, argv, &s_aOpts[0], RT_ELEMENTS(s_aOpts), 1, RTGETOPTINIT_FLAGS_OPTS_FIRST);
-    AssertReleaseRCReturn(rc, 1);
-    size_t          cProcessed = 0;
-    while ((rc = RTGetOpt(&GetOptState, &ValueUnion)) != 0)
+    {
-        switch (rc)
+        {
-            case 'd':
-                g_fDryRun = true;
-                break;
-            case 'D':
-                g_fDryRun = false;
-                break;
-            case 'f':
-                g_pszFileFilter = ValueUnion.psz;
-                break;
-            case 'h':
-                RTPrintf("VirtualBox Source Code Massager\n"
-                         "\n"
-                         "Usage: %s [options] <files & dirs>\n"
-                         "\n"
-                         "Options:\n", g_szProgName);
-                for (size_t i = 0; i < RT_ELEMENTS(s_aOpts); i++)
+                {
-                    bool fAdvanceTwo = false;
-                    if ((s_aOpts[i].fFlags & RTGETOPT_REQ_MASK) == RTGETOPT_REQ_NOTHING)
+                    {
-                        fAdvanceTwo = i + 1 < RT_ELEMENTS(s_aOpts)
-                                   && (   strstr(s_aOpts[i+1].pszLong, "-no-") != NULL
-                                       || strstr(s_aOpts[i+1].pszLong, "-not-") != NULL
-                                       || strstr(s_aOpts[i+1].pszLong, "-dont-") != NULL
-                                      );
-                        if (fAdvanceTwo)
-                            RTPrintf("  %s, %s\n", s_aOpts[i].pszLong, s_aOpts[i + 1].pszLong);
-                        else
-                            RTPrintf("  %s\n", s_aOpts[i].pszLong);
+                    }
-                    else if ((s_aOpts[i].fFlags & RTGETOPT_REQ_MASK) == RTGETOPT_REQ_STRING)
-                        RTPrintf("  %s string\n", s_aOpts[i].pszLong);
-                    else
-                        RTPrintf("  %s value\n", s_aOpts[i].pszLong);
-                    switch (s_aOpts[i].iShort)
+                    {
-                        case SCMOPT_CONVERT_EOL:            RTPrintf("      Default: %RTbool\n", g_Defaults.fConvertEol); break;
-                        case SCMOPT_CONVERT_TABS:           RTPrintf("      Default: %RTbool\n", g_Defaults.fConvertTabs); break;
-                        case SCMOPT_FORCE_FINAL_EOL:        RTPrintf("      Default: %RTbool\n", g_Defaults.fForceFinalEol); break;
-                        case SCMOPT_FORCE_TRAILING_LINE:    RTPrintf("      Default: %RTbool\n", g_Defaults.fForceTrailingLine); break;
-                        case SCMOPT_STRIP_TRAILING_BLANKS:  RTPrintf("      Default: %RTbool\n", g_Defaults.fStripTrailingBlanks); break;
-                        case SCMOPT_STRIP_TRAILING_LINES:   RTPrintf("      Default: %RTbool\n", g_Defaults.fStripTrailingLines); break;
-                        case SCMOPT_ONLY_SVN_DIRS:          RTPrintf("      Default: %RTbool\n", g_Defaults.fOnlySvnDirs); break;
-                        case SCMOPT_ONLY_SVN_FILES:         RTPrintf("      Default: %RTbool\n", g_Defaults.fOnlySvnFiles); break;
-                        case SCMOPT_SET_SVN_EOL:            RTPrintf("      Default: %RTbool\n", g_Defaults.fSetSvnEol); break;
-                        case SCMOPT_SET_SVN_EXECUTABLE:     RTPrintf("      Default: %RTbool\n", g_Defaults.fSetSvnExecutable); break;
-                        case SCMOPT_SET_SVN_KEYWORDS:       RTPrintf("      Default: %RTbool\n", g_Defaults.fSetSvnKeywords); break;
-                        case SCMOPT_TAB_SIZE:               RTPrintf("      Default: %u\n", g_Defaults.cchTab); break;
-                        case SCMOPT_FILTER_OUT_DIRS:        RTPrintf("      Default: %s\n", g_Defaults.pszFilterOutDirs); break;
-                        case SCMOPT_FILTER_FILES:           RTPrintf("      Default: %s\n", g_Defaults.pszFilterFiles); break;
-                        case SCMOPT_FILTER_OUT_FILES:       RTPrintf("      Default: %s\n", g_Defaults.pszFilterOutFiles); break;
+                    }
-                    i += fAdvanceTwo;
+                }
-                return 1;
-            case 'q':
-                g_iVerbosity = 0;
-                break;
-            case 'v':
-                g_iVerbosity++;
-                break;
-            case 'V':
+            {
-                /* The following is assuming that svn does it's job here. */
-                static const char s_szRev[] = "$Revision$";
-                const char *psz = RTStrStripL(strchr(s_szRev, ' '));
-                RTPrintf("r%.*s\n", strchr(psz, ' ') - psz, psz);
-                return 0;
+            }
-            case SCMOPT_DIFF_IGNORE_EOL:
-                g_fDiffIgnoreEol = true;
-                break;
-            case SCMOPT_DIFF_NO_IGNORE_EOL:
-                g_fDiffIgnoreEol = false;
-                break;
-            case SCMOPT_DIFF_IGNORE_SPACE:
-                g_fDiffIgnoreTrailingWS = g_fDiffIgnoreLeadingWS = true;
-                break;
-            case SCMOPT_DIFF_NO_IGNORE_SPACE:
-                g_fDiffIgnoreTrailingWS = g_fDiffIgnoreLeadingWS = false;
-                break;
-            case SCMOPT_DIFF_IGNORE_LEADING_SPACE:
-                g_fDiffIgnoreLeadingWS = true;
-                break;
-            case SCMOPT_DIFF_NO_IGNORE_LEADING_SPACE:
-                g_fDiffIgnoreLeadingWS = false;
-                break;
-            case SCMOPT_DIFF_IGNORE_TRAILING_SPACE:
-                g_fDiffIgnoreTrailingWS = true;
-                break;
-            case SCMOPT_DIFF_NO_IGNORE_TRAILING_SPACE:
-                g_fDiffIgnoreTrailingWS = false;
-                break;
-            case SCMOPT_DIFF_SPECIAL_CHARS:
-                g_fDiffSpecialChars = true;
-                break;
-            case SCMOPT_DIFF_NO_SPECIAL_CHARS:
-                g_fDiffSpecialChars = false;
-                break;
-            case VINF_GETOPT_NOT_OPTION:
+            {
-                if (!g_fDryRun)
+                {
-                    if (!cProcessed)
+                    {
-                        RTPrintf("%s: Warning! This program will make changes to your source files and\n"
-                                 "%s:          there is a slight risk that bugs or a full disk may cause\n"
-                                 "%s:          LOSS OF DATA.   So, please make sure you have checked in\n"
-                                 "%s:          all your changes already.  If you didn't, then don't blame\n"
-                                 "%s:          anyone for not warning you!\n"
-                                 "%s:\n"
-                                 "%s:          Press any key to continue...\n",
-                                 g_szProgName, g_szProgName, g_szProgName, g_szProgName, g_szProgName,
-                                 g_szProgName, g_szProgName);
-                        RTStrmGetCh(g_pStdIn);
+                    }
-                    cProcessed++;
+                }
-                rc = scmProcessSomething(ValueUnion.psz, pSettings);
-                if (RT_FAILURE(rc))
-                    return rc;
-                break;
+            }
-            default:
+            {
-                int rc2 = scmSettingsBaseHandleOpt(&pSettings->Base, rc, &ValueUnion);
-                if (RT_SUCCESS(rc2))
-                    break;
-                if (rc2 != VERR_GETOPT_UNKNOWN_OPTION)
-                    return 2;
-                return RTGetOptPrintError(rc, &ValueUnion);
+            }
+        }
+    }
-    scmSettingsDestroy(pSettings);
-    return 0;
+}

trunk/src/bldprogs/scmdiff.h

-              r40528
+              r40530
 /* $Id$ */
 /** @file
  * IPRT Testcase / Tool - Source Code Massager.
+ * IPRT Testcase / Tool - Source Code Massager Diff Code.
  */
 …
  */
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
+#include <iprt/assert.h>
+#include <iprt/ctype.h>
+#include <iprt/dir.h>
+#include <iprt/env.h>
+#include <iprt/file.h>
+#include <iprt/err.h>
+#include <iprt/getopt.h>
+#include <iprt/initterm.h>
+#include <iprt/mem.h>
+#include <iprt/message.h>
+#include <iprt/param.h>
+#include <iprt/path.h>
+#include <iprt/process.h>
+#ifndef ___scmdiff_h___
+#define ___scmdiff_h___
 #include <iprt/stream.h>
-#include <iprt/string.h>
 #include "scmstream.h"
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+/** The name of the settings files. */
+#define SCM_SETTINGS_FILENAME           ".scm-settings"
+/*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
+/** Pointer to const massager settings. */
+typedef struct SCMSETTINGSBASE const *PCSCMSETTINGSBASE;
+/**
+ * SVN property.
+ */
+typedef struct SCMSVNPROP
+{
+    /** The property. */
+    char           *pszName;
+    /** The value.
+     * When used to record updates, this can be set to NULL to trigger the
+     * deletion of the property. */
+    char           *pszValue;
+} SCMSVNPROP;
+/** Pointer to a SVN property. */
+typedef SCMSVNPROP *PSCMSVNPROP;
+/** Pointer to a const  SVN property. */
+typedef SCMSVNPROP const *PCSCMSVNPROP;
+/**
+ * Rewriter state.
+ */
+typedef struct SCMRWSTATE
+{
+    /** The filename.  */
+    const char     *pszFilename;
+    /** Set after the printing the first verbose message about a file under
+     *  rewrite. */
+    bool            fFirst;
+    /** The number of SVN property changes. */
+    size_t          cSvnPropChanges;
+    /** Pointer to an array of SVN property changes. */
+    PSCMSVNPROP     paSvnPropChanges;
+} SCMRWSTATE;
+/** Pointer to the rewriter state. */
+typedef SCMRWSTATE *PSCMRWSTATE;
+/**
+ * A rewriter.
+ *
+ * This works like a stream editor, reading @a pIn, modifying it and writing it
+ * to @a pOut.
+ *
+ * @returns true if any changes were made, false if not.
+ * @param   pIn                 The input stream.
+ * @param   pOut                The output stream.
+ * @param   pSettings           The settings.
+ */
+typedef bool (*PFNSCMREWRITER)(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
+/**
+ * Configuration entry.
+ */
+typedef struct SCMCFGENTRY
+{
+    /** Number of rewriters. */
+    size_t          cRewriters;
+    /** Pointer to an array of rewriters. */
+    PFNSCMREWRITER const  *papfnRewriter;
+    /** File pattern (simple).  */
+    const char     *pszFilePattern;
+} SCMCFGENTRY;
+typedef SCMCFGENTRY *PSCMCFGENTRY;
+typedef SCMCFGENTRY const *PCSCMCFGENTRY;
+RT_C_DECLS_BEGIN
 /**
 …
 typedef SCMDIFFSTATE *PSCMDIFFSTATE;
-/**
- * Source Code Massager Settings.
- */
-typedef struct SCMSETTINGSBASE
+{
-    bool            fConvertEol;
-    bool            fConvertTabs;
-    bool            fForceFinalEol;
-    bool            fForceTrailingLine;
-    bool            fStripTrailingBlanks;
-    bool            fStripTrailingLines;
-    /** Only process files that are part of a SVN working copy. */
-    bool            fOnlySvnFiles;
-    /** Only recurse into directories containing an .svn dir.  */
-    bool            fOnlySvnDirs;
-    /** Set svn:eol-style if missing or incorrect. */
-    bool            fSetSvnEol;
-    /** Set svn:executable according to type (unusually this means deleting it). */
-    bool            fSetSvnExecutable;
-    /** Set svn:keyword if completely or partially missing. */
-    bool            fSetSvnKeywords;
-    /**  */
-    unsigned        cchTab;
-    /** Only consider files matching these patterns.  This is only applied to the
-     *  base names. */
-    char           *pszFilterFiles;
-    /** Filter out files matching the following patterns.  This is applied to base
-     *  names as well as the absolute paths.  */
-    char           *pszFilterOutFiles;
-    /** Filter out directories matching the following patterns.  This is applied
-     *  to base names as well as the absolute paths.  All absolute paths ends with a
-     *  slash and dot ("/.").  */
-    char           *pszFilterOutDirs;
-} SCMSETTINGSBASE;
-/** Pointer to massager settings. */
-typedef SCMSETTINGSBASE *PSCMSETTINGSBASE;
-/**
- * Option identifiers.
+ *
- * @note    The first chunk, down to SCMOPT_TAB_SIZE, are alternately set &
- *          clear.  So, the option setting a flag (boolean) will have an even
- *          number and the one clearing it will have an odd number.
- * @note    Down to SCMOPT_LAST_SETTINGS corresponds exactly to SCMSETTINGSBASE.
- */
-typedef enum SCMOPT
+{
-    SCMOPT_CONVERT_EOL = 10000,
-    SCMOPT_NO_CONVERT_EOL,
-    SCMOPT_CONVERT_TABS,
-    SCMOPT_NO_CONVERT_TABS,
-    SCMOPT_FORCE_FINAL_EOL,
-    SCMOPT_NO_FORCE_FINAL_EOL,
-    SCMOPT_FORCE_TRAILING_LINE,
-    SCMOPT_NO_FORCE_TRAILING_LINE,
-    SCMOPT_STRIP_TRAILING_BLANKS,
-    SCMOPT_NO_STRIP_TRAILING_BLANKS,
-    SCMOPT_STRIP_TRAILING_LINES,
-    SCMOPT_NO_STRIP_TRAILING_LINES,
-    SCMOPT_ONLY_SVN_DIRS,
-    SCMOPT_NOT_ONLY_SVN_DIRS,
-    SCMOPT_ONLY_SVN_FILES,
-    SCMOPT_NOT_ONLY_SVN_FILES,
-    SCMOPT_SET_SVN_EOL,
-    SCMOPT_DONT_SET_SVN_EOL,
-    SCMOPT_SET_SVN_EXECUTABLE,
-    SCMOPT_DONT_SET_SVN_EXECUTABLE,
-    SCMOPT_SET_SVN_KEYWORDS,
-    SCMOPT_DONT_SET_SVN_KEYWORDS,
-    SCMOPT_TAB_SIZE,
-    SCMOPT_FILTER_OUT_DIRS,
-    SCMOPT_FILTER_FILES,
-    SCMOPT_FILTER_OUT_FILES,
-    SCMOPT_LAST_SETTINGS = SCMOPT_FILTER_OUT_FILES,
-    //
-    SCMOPT_DIFF_IGNORE_EOL,
-    SCMOPT_DIFF_NO_IGNORE_EOL,
-    SCMOPT_DIFF_IGNORE_SPACE,
-    SCMOPT_DIFF_NO_IGNORE_SPACE,
-    SCMOPT_DIFF_IGNORE_LEADING_SPACE,
-    SCMOPT_DIFF_NO_IGNORE_LEADING_SPACE,
-    SCMOPT_DIFF_IGNORE_TRAILING_SPACE,
-    SCMOPT_DIFF_NO_IGNORE_TRAILING_SPACE,
-    SCMOPT_DIFF_SPECIAL_CHARS,
-    SCMOPT_DIFF_NO_SPECIAL_CHARS,
-    SCMOPT_END
-} SCMOPT;
-/**
- * File/dir pattern + options.
- */
-typedef struct SCMPATRNOPTPAIR
+{
-    char *pszPattern;
-    char *pszOptions;
-} SCMPATRNOPTPAIR;
-/** Pointer to a pattern + option pair. */
-typedef SCMPATRNOPTPAIR *PSCMPATRNOPTPAIR;
-/** Pointer to a settings set. */
-typedef struct SCMSETTINGS *PSCMSETTINGS;
-/**
- * Settings set.
+ *
- * This structure is constructed from the command line arguments or any
- * .scm-settings file found in a directory we recurse into.  When recursing in
- * and out of a directory, we push and pop a settings set for it.
+ *
- * The .scm-settings file has two kinds of setttings, first there are the
- * unqualified base settings and then there are the settings which applies to a
- * set of files or directories.  The former are lines with command line options.
- * For the latter, the options are preceded by a string pattern and a colon.
- * The pattern specifies which files (and/or directories) the options applies
- * to.
+ *
- * We parse the base options into the Base member and put the others into the
- * paPairs array.
- */
-typedef struct SCMSETTINGS
+{
-    /** Pointer to the setting file below us in the stack. */
-    PSCMSETTINGS        pDown;
-    /** Pointer to the setting file above us in the stack. */
-    PSCMSETTINGS        pUp;
-    /** File/dir patterns and their options. */
-    PSCMPATRNOPTPAIR    paPairs;
-    /** The number of entires in paPairs. */
-    uint32_t            cPairs;
-    /** The base settings that was read out of the file. */
-    SCMSETTINGSBASE     Base;
-} SCMSETTINGS;
-/** Pointer to a const settings set. */
-typedef SCMSETTINGS const *PCSCMSETTINGS;
-/*******************************************************************************
-*   Internal Functions                                                         *
-*******************************************************************************/
-static bool rewrite_StripTrailingBlanks(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
-static bool rewrite_ExpandTabs(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
-static bool rewrite_ForceNativeEol(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
-static bool rewrite_ForceLF(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
-static bool rewrite_ForceCRLF(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
-static bool rewrite_AdjustTrailingLines(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
-static bool rewrite_SvnNoExecutable(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
-static bool rewrite_SvnKeywords(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
-static bool rewrite_Makefile_kup(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
-static bool rewrite_Makefile_kmk(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
-static bool rewrite_C_and_CPP(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings);
-/*******************************************************************************
-*   Global Variables                                                           *
-*******************************************************************************/
-static const char   g_szProgName[]          = "scm";
-static const char  *g_pszChangedSuff        = "";
-static const char   g_szTabSpaces[16+1]     = "                ";
-static bool         g_fDryRun               = true;
-static bool         g_fDiffSpecialChars     = true;
-static bool         g_fDiffIgnoreEol        = false;
-static bool         g_fDiffIgnoreLeadingWS  = false;
-static bool         g_fDiffIgnoreTrailingWS = false;
-static int          g_iVerbosity            = 2;//99; //0;
-/** The global settings. */
-static SCMSETTINGSBASE const g_Defaults =
+{
-    /* .fConvertEol = */            true,
-    /* .fConvertTabs = */           true,
-    /* .fForceFinalEol = */         true,
-    /* .fForceTrailingLine = */     false,
-    /* .fStripTrailingBlanks = */   true,
-    /* .fStripTrailingLines = */    true,
-    /* .fOnlySvnFiles = */          false,
-    /* .fOnlySvnDirs = */           false,
-    /* .fSetSvnEol = */             false,
-    /* .fSetSvnExecutable = */      false,
-    /* .fSetSvnKeywords = */        false,
-    /* .cchTab = */                 8,
-    /* .pszFilterFiles = */         (char *)"",
-    /* .pszFilterOutFiles = */      (char *)"*.exe|*.com|20*-*-*.log",
-    /* .pszFilterOutDirs = */       (char *)".svn|.hg|.git|CVS",
-};
-/** Option definitions for the base settings. */
-static RTGETOPTDEF  g_aScmOpts[] =
+{
-    { "--convert-eol",                      SCMOPT_CONVERT_EOL,                     RTGETOPT_REQ_NOTHING },
-    { "--no-convert-eol",                   SCMOPT_NO_CONVERT_EOL,                  RTGETOPT_REQ_NOTHING },
-    { "--convert-tabs",                     SCMOPT_CONVERT_TABS,                    RTGETOPT_REQ_NOTHING },
-    { "--no-convert-tabs",                  SCMOPT_NO_CONVERT_TABS,                 RTGETOPT_REQ_NOTHING },
-    { "--force-final-eol",                  SCMOPT_FORCE_FINAL_EOL,                 RTGETOPT_REQ_NOTHING },
-    { "--no-force-final-eol",               SCMOPT_NO_FORCE_FINAL_EOL,              RTGETOPT_REQ_NOTHING },
-    { "--force-trailing-line",              SCMOPT_FORCE_TRAILING_LINE,             RTGETOPT_REQ_NOTHING },
-    { "--no-force-trailing-line",           SCMOPT_NO_FORCE_TRAILING_LINE,          RTGETOPT_REQ_NOTHING },
-    { "--strip-trailing-blanks",            SCMOPT_STRIP_TRAILING_BLANKS,           RTGETOPT_REQ_NOTHING },
-    { "--no-strip-trailing-blanks",         SCMOPT_NO_STRIP_TRAILING_BLANKS,        RTGETOPT_REQ_NOTHING },
-    { "--strip-trailing-lines",             SCMOPT_STRIP_TRAILING_LINES,            RTGETOPT_REQ_NOTHING },
-    { "--strip-no-trailing-lines",          SCMOPT_NO_STRIP_TRAILING_LINES,         RTGETOPT_REQ_NOTHING },
-    { "--only-svn-dirs",                    SCMOPT_ONLY_SVN_DIRS,                   RTGETOPT_REQ_NOTHING },
-    { "--not-only-svn-dirs",                SCMOPT_NOT_ONLY_SVN_DIRS,               RTGETOPT_REQ_NOTHING },
-    { "--only-svn-files",                   SCMOPT_ONLY_SVN_FILES,                  RTGETOPT_REQ_NOTHING },
-    { "--not-only-svn-files",               SCMOPT_NOT_ONLY_SVN_FILES,              RTGETOPT_REQ_NOTHING },
-    { "--set-svn-eol",                      SCMOPT_SET_SVN_EOL,                     RTGETOPT_REQ_NOTHING },
-    { "--dont-set-svn-eol",                 SCMOPT_DONT_SET_SVN_EOL,                RTGETOPT_REQ_NOTHING },
-    { "--set-svn-executable",               SCMOPT_SET_SVN_EXECUTABLE,              RTGETOPT_REQ_NOTHING },
-    { "--dont-set-svn-executable",          SCMOPT_DONT_SET_SVN_EXECUTABLE,         RTGETOPT_REQ_NOTHING },
-    { "--set-svn-keywords",                 SCMOPT_SET_SVN_KEYWORDS,                RTGETOPT_REQ_NOTHING },
-    { "--dont-set-svn-keywords",            SCMOPT_DONT_SET_SVN_KEYWORDS,           RTGETOPT_REQ_NOTHING },
-    { "--tab-size",                         SCMOPT_TAB_SIZE,                        RTGETOPT_REQ_UINT8   },
-    { "--filter-out-dirs",                  SCMOPT_FILTER_OUT_DIRS,                 RTGETOPT_REQ_STRING  },
-    { "--filter-files",                     SCMOPT_FILTER_FILES,                    RTGETOPT_REQ_STRING  },
-    { "--filter-out-files",                 SCMOPT_FILTER_OUT_FILES,                RTGETOPT_REQ_STRING  },
-};
-/** Consider files matching the following patterns (base names only). */
-static const char  *g_pszFileFilter         = NULL;
-static PFNSCMREWRITER const g_aRewritersFor_Makefile_kup[] =
+{
-    rewrite_SvnNoExecutable,
-    rewrite_Makefile_kup
-};
-static PFNSCMREWRITER const g_aRewritersFor_Makefile_kmk[] =
+{
-    rewrite_ForceNativeEol,
-    rewrite_StripTrailingBlanks,
-    rewrite_AdjustTrailingLines,
-    rewrite_SvnNoExecutable,
-    rewrite_SvnKeywords,
-    rewrite_Makefile_kmk
-};
-static PFNSCMREWRITER const g_aRewritersFor_C_and_CPP[] =
+{
-    rewrite_ForceNativeEol,
-    rewrite_ExpandTabs,
-    rewrite_StripTrailingBlanks,
-    rewrite_AdjustTrailingLines,
-    rewrite_SvnNoExecutable,
-    rewrite_SvnKeywords,
-    rewrite_C_and_CPP
-};
-static PFNSCMREWRITER const g_aRewritersFor_H_and_HPP[] =
+{
-    rewrite_ForceNativeEol,
-    rewrite_ExpandTabs,
-    rewrite_StripTrailingBlanks,
-    rewrite_AdjustTrailingLines,
-    rewrite_SvnNoExecutable,
-    rewrite_C_and_CPP
-};
-static PFNSCMREWRITER const g_aRewritersFor_RC[] =
+{
-    rewrite_ForceNativeEol,
-    rewrite_ExpandTabs,
-    rewrite_StripTrailingBlanks,
-    rewrite_AdjustTrailingLines,
-    rewrite_SvnNoExecutable,
-    rewrite_SvnKeywords
-};
-static PFNSCMREWRITER const g_aRewritersFor_ShellScripts[] =
+{
-    rewrite_ForceLF,
-    rewrite_ExpandTabs,
-    rewrite_StripTrailingBlanks
-};
-static PFNSCMREWRITER const g_aRewritersFor_BatchFiles[] =
+{
-    rewrite_ForceCRLF,
-    rewrite_ExpandTabs,
-    rewrite_StripTrailingBlanks
-};
-static SCMCFGENTRY const g_aConfigs[] =
+{
-    { RT_ELEMENTS(g_aRewritersFor_Makefile_kup), &g_aRewritersFor_Makefile_kup[0], "Makefile.kup" },
-    { RT_ELEMENTS(g_aRewritersFor_Makefile_kmk), &g_aRewritersFor_Makefile_kmk[0], "Makefile.kmk|Config.kmk" },
-    { RT_ELEMENTS(g_aRewritersFor_C_and_CPP),    &g_aRewritersFor_C_and_CPP[0],    "*.c|*.cpp|*.C|*.CPP|*.cxx|*.cc" },
-    { RT_ELEMENTS(g_aRewritersFor_H_and_HPP),    &g_aRewritersFor_H_and_HPP[0],    "*.h|*.hpp" },
-    { RT_ELEMENTS(g_aRewritersFor_RC),           &g_aRewritersFor_RC[0],           "*.rc" },
-    { RT_ELEMENTS(g_aRewritersFor_ShellScripts), &g_aRewritersFor_ShellScripts[0], "*.sh|configure" },
-    { RT_ELEMENTS(g_aRewritersFor_BatchFiles),   &g_aRewritersFor_BatchFiles[0],   "*.bat|*.cmd|*.btm|*.vbs|*.ps1" },
-};
-/* -=-=-=-=-=- diff -=-=-=-=-=- */
-/**
- * Prints a range of lines with a prefix.
+ *
- * @param   pState              The diff state.
- * @param   chPrefix            The prefix.
- * @param   pStream             The stream to get the lines from.
- * @param   iLine               The first line.
- * @param   cLines              The number of lines.
- */
-static void scmDiffPrintLines(PSCMDIFFSTATE pState, char chPrefix, PSCMSTREAM pStream, size_t iLine, size_t cLines)
+{
-    while (cLines-- > 0)
+    {
-        SCMEOL      enmEol;
-        size_t      cchLine;
-        const char *pchLine = ScmStreamGetLineByNo(pStream, iLine, &cchLine, &enmEol);
-        RTStrmPutCh(pState->pDiff, chPrefix);
-        if (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 = pState->cchTab - offVir % pState->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)
-            RTStrmPutCh(pState->pDiff, '\n');
-        else if (enmEol == SCMEOL_LF)
-            RTStrmPutStr(pState->pDiff, "[LF]\n");
-        else if (enmEol == SCMEOL_CRLF)
-            RTStrmPutStr(pState->pDiff, "[CRLF]\n");
-        else
-            RTStrmPutStr(pState->pDiff, "[NONE]\n");
-        iLine++;
+    }
+}
-/**
- * Reports a difference and propels the streams to the lines following the
- * resync.
+ *
+ *
- * @returns New pState->cDiff value (just to return something).
- * @param   pState              The diff state.  The cDiffs member will be
- *                              incremented.
- * @param   cMatches            The resync length.
- * @param   iLeft               Where the difference starts on the left side.
- * @param   cLeft               How long it is on this side.  ~(size_t)0 is used
- *                              to indicate that it goes all the way to the end.
- * @param   iRight              Where the difference starts on the right side.
- * @param   cRight              How long it is.
- */
-static size_t scmDiffReport(PSCMDIFFSTATE pState, size_t cMatches,
-                            size_t iLeft, size_t cLeft,
-                            size_t iRight, size_t cRight)
+{
-    /*
-     * Adjust the input.
-     */
-    if (cLeft == ~(size_t)0)
+    {
-        size_t c = ScmStreamCountLines(pState->pLeft);
-        if (c >= iLeft)
-            cLeft = c - iLeft;
-        else
+        {
-            iLeft = c;
-            cLeft = 0;
+        }
+    }
-    if (cRight == ~(size_t)0)
+    {
-        size_t c = ScmStreamCountLines(pState->pRight);
-        if (c >= iRight)
-            cRight = c - iRight;
-        else
+        {
-            iRight = c;
-            cRight = 0;
+        }
+    }
-    /*
-     * Print header if it's the first difference
-     */
-    if (!pState->cDiffs)
-        RTStrmPrintf(pState->pDiff, "diff %s %s\n", pState->pszFilename, pState->pszFilename);
-    /*
-     * Emit the change description.
-     */
-    char ch = cLeft == 0
-            ? 'a'
-            : cRight == 0
-            ? 'd'
-            : 'c';
-    if (cLeft > 1 && cRight > 1)
-        RTStrmPrintf(pState->pDiff, "%zu,%zu%c%zu,%zu\n", iLeft + 1, iLeft + cLeft, ch, iRight + 1, iRight + cRight);
-    else if (cLeft > 1)
-        RTStrmPrintf(pState->pDiff, "%zu,%zu%c%zu\n",     iLeft + 1, iLeft + cLeft, ch, iRight + 1);
-    else if (cRight > 1)
-        RTStrmPrintf(pState->pDiff, "%zu%c%zu,%zu\n",     iLeft + 1,                ch, iRight + 1, iRight + cRight);
-    else
-        RTStrmPrintf(pState->pDiff, "%zu%c%zu\n",         iLeft + 1,                ch, iRight + 1);
-    /*
-     * And the lines.
-     */
-    if (cLeft)
-        scmDiffPrintLines(pState, '<', pState->pLeft, iLeft, cLeft);
-    if (cLeft && cRight)
-        RTStrmPrintf(pState->pDiff, "---\n");
-    if (cRight)
-        scmDiffPrintLines(pState, '>', pState->pRight, iRight, cRight);
-    /*
-     * Reposition the streams (safely ignores return value).
-     */
-    ScmStreamSeekByLine(pState->pLeft,  iLeft  + cLeft  + cMatches);
-    ScmStreamSeekByLine(pState->pRight, iRight + cRight + cMatches);
-    pState->cDiffs++;
-    return pState->cDiffs;
+}
-/**
- * Helper for scmDiffCompare that takes care of trailing spaces and stuff
- * like that.
- */
-static bool scmDiffCompareSlow(PSCMDIFFSTATE pState,
-                               const char *pchLeft,  size_t cchLeft,  SCMEOL enmEolLeft,
-                               const char *pchRight, size_t cchRight, SCMEOL enmEolRight)
+{
-    if (pState->fIgnoreTrailingWhite)
+    {
-        while (cchLeft > 0 && RT_C_IS_SPACE(pchLeft[cchLeft - 1]))
-            cchLeft--;
-        while (cchRight > 0 && RT_C_IS_SPACE(pchRight[cchRight - 1]))
-            cchRight--;
+    }
-    if (pState->fIgnoreLeadingWhite)
+    {
-        while (cchLeft > 0 && RT_C_IS_SPACE(*pchLeft))
-            pchLeft++, cchLeft--;
-        while (cchRight > 0 && RT_C_IS_SPACE(*pchRight))
-            pchRight++, cchRight--;
+    }
-    if (   cchLeft != cchRight
-        || (enmEolLeft != enmEolRight && !pState->fIgnoreEol)
-        || memcmp(pchLeft, pchRight, cchLeft))
-        return false;
-    return true;
+}
-/**
- * Compare two lines.
+ *
- * @returns true if the are equal, false if not.
- */
-DECLINLINE(bool) scmDiffCompare(PSCMDIFFSTATE pState,
-                                const char *pchLeft,  size_t cchLeft,  SCMEOL enmEolLeft,
-                                const char *pchRight, size_t cchRight, SCMEOL enmEolRight)
+{
-    if (   cchLeft != cchRight
-        || (enmEolLeft != enmEolRight && !pState->fIgnoreEol)
-        || memcmp(pchLeft, pchRight, cchLeft))
+    {
-        if (   pState->fIgnoreTrailingWhite
-            || pState->fIgnoreTrailingWhite)
-            return scmDiffCompareSlow(pState,
-                                      pchLeft, cchLeft, enmEolLeft,
-                                      pchRight, cchRight, enmEolRight);
-        return false;
+    }
-    return true;
+}
-/**
- * Compares two sets of lines from the two files.
+ *
- * @returns true if they matches, false if they don't.
- * @param   pState              The diff state.
- * @param   iLeft               Where to start in the left stream.
- * @param   iRight              Where to start in the right stream.
- * @param   cLines              How many lines to compare.
- */
-static bool scmDiffCompareLines(PSCMDIFFSTATE pState, size_t iLeft, size_t iRight, size_t cLines)
+{
-    for (size_t iLine = 0; iLine < cLines; iLine++)
+    {
-        SCMEOL      enmEolLeft;
-        size_t      cchLeft;
-        const char *pchLeft  = ScmStreamGetLineByNo(pState->pLeft,  iLeft + iLine,  &cchLeft,  &enmEolLeft);
-        SCMEOL      enmEolRight;
-        size_t      cchRight;
-        const char *pchRight = ScmStreamGetLineByNo(pState->pRight, iRight + iLine, &cchRight, &enmEolRight);
-        if (!scmDiffCompare(pState, pchLeft, cchLeft, enmEolLeft, pchRight, cchRight, enmEolRight))
-            return false;
+    }
-    return true;
+}
-/**
- * Resynchronize the two streams and reports the difference.
+ *
- * Upon return, the streams will be positioned after the block of @a cMatches
- * lines where it resynchronized them.
+ *
- * @returns pState->cDiffs (just so we can use it in a return statement).
- * @param   pState              The state.
- * @param   cMatches            The number of lines that needs to match for the
- *                              stream to be considered synchronized again.
- */
-static size_t scmDiffSynchronize(PSCMDIFFSTATE pState, size_t cMatches)
+{
-    size_t const iStartLeft  = ScmStreamTellLine(pState->pLeft)  - 1;
-    size_t const iStartRight = ScmStreamTellLine(pState->pRight) - 1;
-    Assert(cMatches > 0);
-    /*
-     * Compare each new line from each of the streams will all the preceding
-     * ones, including iStartLeft/Right.
-     */
-    for (size_t iRange = 1; ; iRange++)
+    {
-        /*
-         * Get the next line in the left stream and compare it against all the
-         * preceding lines on the right side.
-         */
-        SCMEOL      enmEol;
-        size_t      cchLine;
-        const char *pchLine = ScmStreamGetLineByNo(pState->pLeft, iStartLeft + iRange, &cchLine, &enmEol);
-        if (!pchLine)
-            return scmDiffReport(pState, 0, iStartLeft, ~(size_t)0, iStartRight, ~(size_t)0);
-        for (size_t iRight = cMatches - 1; iRight < iRange; iRight++)
+        {
-            SCMEOL      enmEolRight;
-            size_t      cchRight;
-            const char *pchRight = ScmStreamGetLineByNo(pState->pRight, iStartRight + iRight,
-                                                        &cchRight, &enmEolRight);
-            if (   scmDiffCompare(pState, pchLine, cchLine, enmEol, pchRight, cchRight, enmEolRight)
-                && scmDiffCompareLines(pState,
-                                       iStartLeft  + iRange + 1 - cMatches,
-                                       iStartRight + iRight + 1 - cMatches,
-                                       cMatches - 1)
+               )
-                return scmDiffReport(pState, cMatches,
-                                     iStartLeft,  iRange + 1 - cMatches,
-                                     iStartRight, iRight + 1 - cMatches);
+        }
-        /*
-         * Get the next line in the right stream and compare it against all the
-         * lines on the right side.
-         */
-        pchLine = ScmStreamGetLineByNo(pState->pRight, iStartRight + iRange, &cchLine, &enmEol);
-        if (!pchLine)
-            return scmDiffReport(pState, 0, iStartLeft, ~(size_t)0, iStartRight, ~(size_t)0);
-        for (size_t iLeft = cMatches - 1; iLeft <= iRange; iLeft++)
+        {
-            SCMEOL      enmEolLeft;
-            size_t      cchLeft;
-            const char *pchLeft = ScmStreamGetLineByNo(pState->pLeft, iStartLeft + iLeft,
-                                                       &cchLeft, &enmEolLeft);
-            if (    scmDiffCompare(pState, pchLeft, cchLeft, enmEolLeft, pchLine, cchLine, enmEol)
-                && scmDiffCompareLines(pState,
-                                       iStartLeft  + iLeft  + 1 - cMatches,
-                                       iStartRight + iRange + 1 - cMatches,
-                                       cMatches - 1)
+               )
-                return scmDiffReport(pState, cMatches,
-                                     iStartLeft,  iLeft  + 1 - cMatches,
-                                     iStartRight, iRange + 1 - cMatches);
+        }
+    }
+}
-/**
- * Creates a diff of the changes between the streams @a pLeft and @a pRight.
+ *
- * This currently only implements the simplest diff format, so no contexts.
+ *
- * Also, note that we won't detect differences in the final newline of the
- * streams.
+ *
- * @returns The number of differences.
- * @param   pszFilename         The filename.
- * @param   pLeft               The left side stream.
- * @param   pRight              The right side stream.
- * @param   fIgnoreEol          Whether to ignore end of line markers.
- * @param   fIgnoreLeadingWhite Set if leading white space should be ignored.
- * @param   fIgnoreTrailingWhite  Set if trailing white space should be ignored.
- * @param   fSpecialChars       Whether to print special chars in a human
- *                              readable form or not.
- * @param   cchTab              The tab size.
- * @param   pDiff               Where to write the diff.
- */
 size_t ScmDiffStreams(const char *pszFilename, PSCMSTREAM pLeft, PSCMSTREAM pRight, bool fIgnoreEol,
                       bool fIgnoreLeadingWhite, bool fIgnoreTrailingWhite, bool fSpecialChars,
+                      size_t cchTab, PRTSTREAM pDiff)
+{
+#ifdef RT_STRICT
+    ScmStreamCheckItegrity(pLeft);
+    ScmStreamCheckItegrity(pRight);
+                      size_t cchTab, PRTSTREAM pDiff);
+RT_C_DECLS_END
 #endif
-    /*
-     * Set up the diff state.
-     */
-    SCMDIFFSTATE State;
-    State.cDiffs                = 0;
-    State.pszFilename           = pszFilename;
-    State.pLeft                 = pLeft;
-    State.pRight                = pRight;
-    State.fIgnoreEol            = fIgnoreEol;
-    State.fIgnoreLeadingWhite   = fIgnoreLeadingWhite;
-    State.fIgnoreTrailingWhite  = fIgnoreTrailingWhite;
-    State.fSpecialChars         = fSpecialChars;
-    State.cchTab                = cchTab;
-    State.pDiff                 = pDiff;
-    /*
-     * Compare them line by line.
-     */
-    ScmStreamRewindForReading(pLeft);
-    ScmStreamRewindForReading(pRight);
-    const char *pchLeft;
-    const char *pchRight;
-    for (;;)
+    {
-        SCMEOL  enmEolLeft;
-        size_t  cchLeft;
-        pchLeft  = ScmStreamGetLine(pLeft,  &cchLeft,  &enmEolLeft);
-        SCMEOL  enmEolRight;
-        size_t  cchRight;
-        pchRight = ScmStreamGetLine(pRight, &cchRight, &enmEolRight);
-        if (!pchLeft || !pchRight)
-            break;
-        if (!scmDiffCompare(&State, pchLeft, cchLeft, enmEolLeft, pchRight, cchRight, enmEolRight))
-            scmDiffSynchronize(&State, 3);
+    }
-    /*
-     * Deal with any remaining differences.
-     */
-    if (pchLeft)
-        scmDiffReport(&State, 0, ScmStreamTellLine(pLeft) - 1, ~(size_t)0, ScmStreamTellLine(pRight), 0);
-    else if (pchRight)
-        scmDiffReport(&State, 0, ScmStreamTellLine(pLeft), 0, ScmStreamTellLine(pRight) - 1, ~(size_t)0);
-    /*
-     * Report any errors.
-     */
-    if (RT_FAILURE(ScmStreamGetStatus(pLeft)))
-        RTMsgError("Left diff stream error: %Rrc\n", ScmStreamGetStatus(pLeft));
-    if (RT_FAILURE(ScmStreamGetStatus(pRight)))
-        RTMsgError("Right diff stream error: %Rrc\n", ScmStreamGetStatus(pRight));
-    return State.cDiffs;
+}
-/* -=-=-=-=-=- settings -=-=-=-=-=- */
-/**
- * Init a settings structure with settings from @a pSrc.
+ *
- * @returns IPRT status code
- * @param   pSettings           The settings.
- * @param   pSrc                The source settings.
- */
-static int scmSettingsBaseInitAndCopy(PSCMSETTINGSBASE pSettings, PCSCMSETTINGSBASE pSrc)
+{
-    *pSettings = *pSrc;
-    int rc = RTStrDupEx(&pSettings->pszFilterFiles, pSrc->pszFilterFiles);
-    if (RT_SUCCESS(rc))
+    {
-        rc = RTStrDupEx(&pSettings->pszFilterOutFiles, pSrc->pszFilterOutFiles);
-        if (RT_SUCCESS(rc))
+        {
-            rc = RTStrDupEx(&pSettings->pszFilterOutDirs, pSrc->pszFilterOutDirs);
-            if (RT_SUCCESS(rc))
-                return VINF_SUCCESS;
-            RTStrFree(pSettings->pszFilterOutFiles);
+        }
-        RTStrFree(pSettings->pszFilterFiles);
+    }
-    pSettings->pszFilterFiles = NULL;
-    pSettings->pszFilterOutFiles = NULL;
-    pSettings->pszFilterOutDirs = NULL;
-    return rc;
+}
-/**
- * Init a settings structure.
+ *
- * @returns IPRT status code
- * @param   pSettings           The settings.
- */
-static int scmSettingsBaseInit(PSCMSETTINGSBASE pSettings)
+{
-    return scmSettingsBaseInitAndCopy(pSettings, &g_Defaults);
+}
-/**
- * Deletes the settings, i.e. free any dynamically allocated content.
+ *
- * @param   pSettings           The settings.
- */
-static void scmSettingsBaseDelete(PSCMSETTINGSBASE pSettings)
+{
-    if (pSettings)
+    {
-        Assert(pSettings->cchTab != ~(unsigned)0);
-        pSettings->cchTab = ~(unsigned)0;
-        RTStrFree(pSettings->pszFilterFiles);
-        pSettings->pszFilterFiles = NULL;
-        RTStrFree(pSettings->pszFilterOutFiles);
-        pSettings->pszFilterOutFiles = NULL;
-        RTStrFree(pSettings->pszFilterOutDirs);
-        pSettings->pszFilterOutDirs = NULL;
+    }
+}
-/**
- * Processes a RTGetOpt result.
+ *
- * @retval  VINF_SUCCESS if handled.
- * @retval  VERR_OUT_OF_RANGE if the option value was out of range.
- * @retval  VERR_GETOPT_UNKNOWN_OPTION if the option was not recognized.
+ *
- * @param   pSettings           The settings to change.
- * @param   rc                  The RTGetOpt return value.
- * @param   pValueUnion         The RTGetOpt value union.
- */
-static int scmSettingsBaseHandleOpt(PSCMSETTINGSBASE pSettings, int rc, PRTGETOPTUNION pValueUnion)
+{
-    switch (rc)
+    {
-        case SCMOPT_CONVERT_EOL:
-            pSettings->fConvertEol = true;
-            return VINF_SUCCESS;
-        case SCMOPT_NO_CONVERT_EOL:
-            pSettings->fConvertEol = false;
-            return VINF_SUCCESS;
-        case SCMOPT_CONVERT_TABS:
-            pSettings->fConvertTabs = true;
-            return VINF_SUCCESS;
-        case SCMOPT_NO_CONVERT_TABS:
-            pSettings->fConvertTabs = false;
-            return VINF_SUCCESS;
-        case SCMOPT_FORCE_FINAL_EOL:
-            pSettings->fForceFinalEol = true;
-            return VINF_SUCCESS;
-        case SCMOPT_NO_FORCE_FINAL_EOL:
-            pSettings->fForceFinalEol = false;
-            return VINF_SUCCESS;
-        case SCMOPT_FORCE_TRAILING_LINE:
-            pSettings->fForceTrailingLine = true;
-            return VINF_SUCCESS;
-        case SCMOPT_NO_FORCE_TRAILING_LINE:
-            pSettings->fForceTrailingLine = false;
-            return VINF_SUCCESS;
-        case SCMOPT_STRIP_TRAILING_BLANKS:
-            pSettings->fStripTrailingBlanks = true;
-            return VINF_SUCCESS;
-        case SCMOPT_NO_STRIP_TRAILING_BLANKS:
-            pSettings->fStripTrailingBlanks = false;
-            return VINF_SUCCESS;
-        case SCMOPT_STRIP_TRAILING_LINES:
-            pSettings->fStripTrailingLines = true;
-            return VINF_SUCCESS;
-        case SCMOPT_NO_STRIP_TRAILING_LINES:
-            pSettings->fStripTrailingLines = false;
-            return VINF_SUCCESS;
-        case SCMOPT_ONLY_SVN_DIRS:
-            pSettings->fOnlySvnDirs = true;
-            return VINF_SUCCESS;
-        case SCMOPT_NOT_ONLY_SVN_DIRS:
-            pSettings->fOnlySvnDirs = false;
-            return VINF_SUCCESS;
-        case SCMOPT_ONLY_SVN_FILES:
-            pSettings->fOnlySvnFiles = true;
-            return VINF_SUCCESS;
-        case SCMOPT_NOT_ONLY_SVN_FILES:
-            pSettings->fOnlySvnFiles = false;
-            return VINF_SUCCESS;
-        case SCMOPT_SET_SVN_EOL:
-            pSettings->fSetSvnEol = true;
-            return VINF_SUCCESS;
-        case SCMOPT_DONT_SET_SVN_EOL:
-            pSettings->fSetSvnEol = false;
-            return VINF_SUCCESS;
-        case SCMOPT_SET_SVN_EXECUTABLE:
-            pSettings->fSetSvnExecutable = true;
-            return VINF_SUCCESS;
-        case SCMOPT_DONT_SET_SVN_EXECUTABLE:
-            pSettings->fSetSvnExecutable = false;
-            return VINF_SUCCESS;
-        case SCMOPT_SET_SVN_KEYWORDS:
-            pSettings->fSetSvnKeywords = true;
-            return VINF_SUCCESS;
-        case SCMOPT_DONT_SET_SVN_KEYWORDS:
-            pSettings->fSetSvnKeywords = false;
-            return VINF_SUCCESS;
-        case SCMOPT_TAB_SIZE:
-            if (   pValueUnion->u8 < 1
-                || pValueUnion->u8 >= RT_ELEMENTS(g_szTabSpaces))
+            {
-                RTMsgError("Invalid tab size: %u - must be in {1..%u}\n",
-                           pValueUnion->u8, RT_ELEMENTS(g_szTabSpaces) - 1);
-                return VERR_OUT_OF_RANGE;
+            }
-            pSettings->cchTab = pValueUnion->u8;
-            return VINF_SUCCESS;
-        case SCMOPT_FILTER_OUT_DIRS:
-        case SCMOPT_FILTER_FILES:
-        case SCMOPT_FILTER_OUT_FILES:
+        {
-            char **ppsz = NULL;
-            switch (rc)
+            {
-                case SCMOPT_FILTER_OUT_DIRS:    ppsz = &pSettings->pszFilterOutDirs; break;
-                case SCMOPT_FILTER_FILES:       ppsz = &pSettings->pszFilterFiles; break;
-                case SCMOPT_FILTER_OUT_FILES:   ppsz = &pSettings->pszFilterOutFiles; break;
+            }
-            /*
-             * An empty string zaps the current list.
-             */
-            if (!*pValueUnion->psz)
-                return RTStrATruncate(ppsz, 0);
-            /*
-             * Non-empty strings are appended to the pattern list.
+             *
-             * Strip leading and trailing pattern separators before attempting
-             * to append it.  If it's just separators, don't do anything.
-             */
-            const char *pszSrc = pValueUnion->psz;
-            while (*pszSrc == '|')
-                pszSrc++;
-            size_t cchSrc = strlen(pszSrc);
-            while (cchSrc > 0 && pszSrc[cchSrc - 1] == '|')
-                cchSrc--;
-            if (!cchSrc)
-                return VINF_SUCCESS;
-            return RTStrAAppendExN(ppsz, 2,
-                                   "|", *ppsz && **ppsz ? 1 : 0,
-                                   pszSrc, cchSrc);
+        }
-        default:
-            return VERR_GETOPT_UNKNOWN_OPTION;
+    }
+}
-/**
- * Parses an option string.
+ *
- * @returns IPRT status code.
- * @param   pBase               The base settings structure to apply the options
- *                              to.
- * @param   pszOptions          The options to parse.
- */
-static int scmSettingsBaseParseString(PSCMSETTINGSBASE pBase, const char *pszLine)
+{
-    int    cArgs;
-    char **papszArgs;
-    int rc = RTGetOptArgvFromString(&papszArgs, &cArgs, pszLine, NULL);
-    if (RT_SUCCESS(rc))
+    {
-        RTGETOPTUNION   ValueUnion;
-        RTGETOPTSTATE   GetOptState;
-        rc = RTGetOptInit(&GetOptState, cArgs, papszArgs, &g_aScmOpts[0], RT_ELEMENTS(g_aScmOpts), 0, 0 /*fFlags*/);
-        if (RT_SUCCESS(rc))
+        {
-            while ((rc = RTGetOpt(&GetOptState, &ValueUnion)) != 0)
+            {
-                rc = scmSettingsBaseHandleOpt(pBase, rc, &ValueUnion);
-                if (RT_FAILURE(rc))
-                    break;
+            }
+        }
-        RTGetOptArgvFree(papszArgs);
+    }
-    return rc;
+}
-/**
- * Parses an unterminated option string.
+ *
- * @returns IPRT status code.
- * @param   pBase               The base settings structure to apply the options
- *                              to.
- * @param   pchLine             The line.
- * @param   cchLine             The line length.
- */
-static int scmSettingsBaseParseStringN(PSCMSETTINGSBASE pBase, const char *pchLine, size_t cchLine)
+{
-    char *pszLine = RTStrDupN(pchLine, cchLine);
-    if (!pszLine)
-        return VERR_NO_MEMORY;
-    int rc = scmSettingsBaseParseString(pBase, pszLine);
-    RTStrFree(pszLine);
-    return rc;
+}
-/**
- * Verifies the options string.
+ *
- * @returns IPRT status code.
- * @param   pszOptions          The options to verify .
- */
-static int scmSettingsBaseVerifyString(const char *pszOptions)
+{
-    SCMSETTINGSBASE Base;
-    int rc = scmSettingsBaseInit(&Base);
-    if (RT_SUCCESS(rc))
+    {
-        rc = scmSettingsBaseParseString(&Base, pszOptions);
-        scmSettingsBaseDelete(&Base);
+    }
-    return rc;
+}
-/**
- * Loads settings found in editor and SCM settings directives within the
- * document (@a pStream).
+ *
- * @returns IPRT status code.
- * @param   pBase               The settings base to load settings into.
- * @param   pStream             The stream to scan for settings directives.
- */
-static int scmSettingsBaseLoadFromDocument(PSCMSETTINGSBASE pBase, PSCMSTREAM pStream)
+{
-    /** @todo Editor and SCM settings directives in documents.  */
-    return VINF_SUCCESS;
+}
-/**
- * Creates a new settings file struct, cloning @a pSettings.
+ *
- * @returns IPRT status code.
- * @param   ppSettings          Where to return the new struct.
- * @param   pSettingsBase       The settings to inherit from.
- */
-static int scmSettingsCreate(PSCMSETTINGS *ppSettings, PCSCMSETTINGSBASE pSettingsBase)
+{
-    PSCMSETTINGS pSettings = (PSCMSETTINGS)RTMemAlloc(sizeof(*pSettings));
-    if (!pSettings)
-        return VERR_NO_MEMORY;
-    int rc = scmSettingsBaseInitAndCopy(&pSettings->Base, pSettingsBase);
-    if (RT_SUCCESS(rc))
+    {
-        pSettings->pDown   = NULL;
-        pSettings->pUp     = NULL;
-        pSettings->paPairs = NULL;
-        pSettings->cPairs  = 0;
-        *ppSettings = pSettings;
-        return VINF_SUCCESS;
+    }
-    RTMemFree(pSettings);
-    return rc;
+}
-/**
- * Destroys a settings structure.
+ *
- * @param   pSettings           The settings structure to destroy.  NULL is OK.
- */
-static void scmSettingsDestroy(PSCMSETTINGS pSettings)
+{
-    if (pSettings)
+    {
-        scmSettingsBaseDelete(&pSettings->Base);
-        for (size_t i = 0; i < pSettings->cPairs; i++)
+        {
-            RTStrFree(pSettings->paPairs[i].pszPattern);
-            RTStrFree(pSettings->paPairs[i].pszOptions);
-            pSettings->paPairs[i].pszPattern = NULL;
-            pSettings->paPairs[i].pszOptions = NULL;
+        }
-        RTMemFree(pSettings->paPairs);
-        pSettings->paPairs = NULL;
-        RTMemFree(pSettings);
+    }
+}
-/**
- * Adds a pattern/options pair to the settings structure.
+ *
- * @returns IPRT status code.
- * @param   pSettings           The settings.
- * @param   pchLine             The line containing the unparsed pair.
- * @param   cchLine             The length of the line.
- */
-static int scmSettingsAddPair(PSCMSETTINGS pSettings, const char *pchLine, size_t cchLine)
+{
-    /*
-     * Split the string.
-     */
-    const char *pchOptions = (const char *)memchr(pchLine, ':', cchLine);
-    if (!pchOptions)
-        return VERR_INVALID_PARAMETER;
-    size_t cchPattern = pchOptions - pchLine;
-    size_t cchOptions = cchLine - cchPattern - 1;
-    pchOptions++;
-    /* strip spaces everywhere */
-    while (cchPattern > 0 && RT_C_IS_SPACE(pchLine[cchPattern - 1]))
-        cchPattern--;
-    while (cchPattern > 0 && RT_C_IS_SPACE(*pchLine))
-        cchPattern--, pchLine++;
-    while (cchOptions > 0 && RT_C_IS_SPACE(pchOptions[cchOptions - 1]))
-        cchOptions--;
-    while (cchOptions > 0 && RT_C_IS_SPACE(*pchOptions))
-        cchOptions--, pchOptions++;
-    /* Quietly ignore empty patterns and empty options. */
-    if (!cchOptions || !cchPattern)
-        return VINF_SUCCESS;
-    /*
-     * Add the pair and verify the option string.
-     */
-    uint32_t iPair = pSettings->cPairs;
-    if ((iPair % 32) == 0)
+    {
-        void *pvNew = RTMemRealloc(pSettings->paPairs, (iPair + 32) * sizeof(pSettings->paPairs[0]));
-        if (!pvNew)
-            return VERR_NO_MEMORY;
-        pSettings->paPairs = (PSCMPATRNOPTPAIR)pvNew;
+    }
-    pSettings->paPairs[iPair].pszPattern = RTStrDupN(pchLine, cchPattern);
-    pSettings->paPairs[iPair].pszOptions = RTStrDupN(pchOptions, cchOptions);
-    int rc;
-    if (   pSettings->paPairs[iPair].pszPattern
-        && pSettings->paPairs[iPair].pszOptions)
-        rc = scmSettingsBaseVerifyString(pSettings->paPairs[iPair].pszOptions);
-    else
-        rc = VERR_NO_MEMORY;
-    if (RT_SUCCESS(rc))
-        pSettings->cPairs = iPair + 1;
-    else
+    {
-        RTStrFree(pSettings->paPairs[iPair].pszPattern);
-        RTStrFree(pSettings->paPairs[iPair].pszOptions);
+    }
-    return rc;
+}
-/**
- * Loads in the settings from @a pszFilename.
+ *
- * @returns IPRT status code.
- * @param   pSettings           Where to load the settings file.
- * @param   pszFilename         The file to load.
- */
-static int scmSettingsLoadFile(PSCMSETTINGS pSettings, const char *pszFilename)
+{
-    SCMSTREAM Stream;
-    int rc = ScmStreamInitForReading(&Stream, pszFilename);
-    if (RT_FAILURE(rc))
+    {
-        RTMsgError("%s: ScmStreamInitForReading -> %Rrc\n", pszFilename, rc);
-        return rc;
+    }
-    SCMEOL      enmEol;
-    const char *pchLine;
-    size_t      cchLine;
-    while ((pchLine = ScmStreamGetLine(&Stream, &cchLine, &enmEol)) != NULL)
+    {
-        /* Ignore leading spaces. */
-        while (cchLine > 0 && RT_C_IS_SPACE(*pchLine))
-            pchLine++, cchLine--;
-        /* Ignore empty lines and comment lines. */
-        if (cchLine < 1 || *pchLine == '#')
-            continue;
-        /* What kind of line is it? */
-        const char *pchColon = (const char *)memchr(pchLine, ':', cchLine);
-        if (pchColon)
-            rc = scmSettingsAddPair(pSettings, pchLine, cchLine);
-        else
-            rc = scmSettingsBaseParseStringN(&pSettings->Base, pchLine, cchLine);
-        if (RT_FAILURE(rc))
+        {
-            RTMsgError("%s:%d: %Rrc\n", pszFilename, ScmStreamTellLine(&Stream), rc);
-            break;
+        }
+    }
-    if (RT_SUCCESS(rc))
+    {
-        rc = ScmStreamGetStatus(&Stream);
-        if (RT_FAILURE(rc))
-            RTMsgError("%s: ScmStreamGetStatus- > %Rrc\n", pszFilename, rc);
+    }
-    ScmStreamDelete(&Stream);
-    return rc;
+}
-/**
- * Parse the specified settings file creating a new settings struct from it.
+ *
- * @returns IPRT status code
- * @param   ppSettings          Where to return the new settings.
- * @param   pszFilename         The file to parse.
- * @param   pSettingsBase       The base settings we inherit from.
- */
-static int scmSettingsCreateFromFile(PSCMSETTINGS *ppSettings, const char *pszFilename, PCSCMSETTINGSBASE pSettingsBase)
+{
-    PSCMSETTINGS pSettings;
-    int rc = scmSettingsCreate(&pSettings, pSettingsBase);
-    if (RT_SUCCESS(rc))
+    {
-        rc = scmSettingsLoadFile(pSettings, pszFilename);
-        if (RT_SUCCESS(rc))
+        {
-            *ppSettings = pSettings;
-            return VINF_SUCCESS;
+        }
-        scmSettingsDestroy(pSettings);
+    }
-    *ppSettings = NULL;
-    return rc;
+}
-/**
- * Create an initial settings structure when starting processing a new file or
- * directory.
+ *
- * This will look for .scm-settings files from the root and down to the
- * specified directory, combining them into the returned settings structure.
+ *
- * @returns IPRT status code.
- * @param   ppSettings          Where to return the pointer to the top stack
- *                              object.
- * @param   pBaseSettings       The base settings we inherit from (globals
- *                              typically).
- * @param   pszPath             The absolute path to the new directory or file.
- */
-static int scmSettingsCreateForPath(PSCMSETTINGS *ppSettings, PCSCMSETTINGSBASE pBaseSettings, const char *pszPath)
+{
-    *ppSettings = NULL;                 /* try shut up gcc. */
-    /*
-     * We'll be working with a stack copy of the path.
-     */
-    char    szFile[RTPATH_MAX];
-    size_t  cchDir = strlen(pszPath);
-    if (cchDir >= sizeof(szFile) - sizeof(SCM_SETTINGS_FILENAME))
-        return VERR_FILENAME_TOO_LONG;
-    /*
-     * Create the bottom-most settings.
-     */
-    PSCMSETTINGS pSettings;
-    int rc = scmSettingsCreate(&pSettings, pBaseSettings);
-    if (RT_FAILURE(rc))
-        return rc;
-    /*
-     * Enumerate the path components from the root and down. Load any setting
-     * files we find.
-     */
-    size_t cComponents = RTPathCountComponents(pszPath);
-    for (size_t i = 1; i <= cComponents; i++)
+    {
-        rc = RTPathCopyComponents(szFile, sizeof(szFile), pszPath, i);
-        if (RT_SUCCESS(rc))
-            rc = RTPathAppend(szFile, sizeof(szFile), SCM_SETTINGS_FILENAME);
-        if (RT_FAILURE(rc))
-            break;
-        if (RTFileExists(szFile))
+        {
-            rc = scmSettingsLoadFile(pSettings, szFile);
-            if (RT_FAILURE(rc))
-                break;
+        }
+    }
-    if (RT_SUCCESS(rc))
-        *ppSettings = pSettings;
-    else
-        scmSettingsDestroy(pSettings);
-    return rc;
+}
-/**
- * Pushes a new settings set onto the stack.
+ *
- * @param   ppSettingsStack     The pointer to the pointer to the top stack
- *                              element.  This will be used as input and output.
- * @param   pSettings           The settings to push onto the stack.
- */
-static void scmSettingsStackPush(PSCMSETTINGS *ppSettingsStack, PSCMSETTINGS pSettings)
+{
-    PSCMSETTINGS pOld = *ppSettingsStack;
-    pSettings->pDown  = pOld;
-    pSettings->pUp    = NULL;
-    if (pOld)
-        pOld->pUp = pSettings;
-    *ppSettingsStack = pSettings;
+}
-/**
- * Pushes the settings of the specified directory onto the stack.
+ *
- * We will load any .scm-settings in the directory.  A stack entry is added even
- * if no settings file was found.
+ *
- * @returns IPRT status code.
- * @param   ppSettingsStack     The pointer to the pointer to the top stack
- *                              element.  This will be used as input and output.
- * @param   pszDir              The directory to do this for.
- */
-static int scmSettingsStackPushDir(PSCMSETTINGS *ppSettingsStack, const char *pszDir)
+{
-    char szFile[RTPATH_MAX];
-    int rc = RTPathJoin(szFile, sizeof(szFile), pszDir, SCM_SETTINGS_FILENAME);
-    if (RT_SUCCESS(rc))
+    {
-        PSCMSETTINGS pSettings;
-        rc = scmSettingsCreate(&pSettings, &(*ppSettingsStack)->Base);
-        if (RT_SUCCESS(rc))
+        {
-            if (RTFileExists(szFile))
-                rc = scmSettingsLoadFile(pSettings, szFile);
-            if (RT_SUCCESS(rc))
+            {
-                scmSettingsStackPush(ppSettingsStack, pSettings);
-                return VINF_SUCCESS;
+            }
-            scmSettingsDestroy(pSettings);
+        }
+    }
-    return rc;
+}
-/**
- * Pops a settings set off the stack.
+ *
- * @returns The popped setttings.
- * @param   ppSettingsStack     The pointer to the pointer to the top stack
- *                              element.  This will be used as input and output.
- */
-static PSCMSETTINGS scmSettingsStackPop(PSCMSETTINGS *ppSettingsStack)
+{
-    PSCMSETTINGS pRet = *ppSettingsStack;
-    PSCMSETTINGS pNew = pRet ? pRet->pDown : NULL;
-    *ppSettingsStack = pNew;
-    if (pNew)
-        pNew->pUp    = NULL;
-    if (pRet)
+    {
-        pRet->pUp    = NULL;
-        pRet->pDown  = NULL;
+    }
-    return pRet;
+}
-/**
- * Pops and destroys the top entry of the stack.
+ *
- * @param   ppSettingsStack     The pointer to the pointer to the top stack
- *                              element.  This will be used as input and output.
- */
-static void scmSettingsStackPopAndDestroy(PSCMSETTINGS *ppSettingsStack)
+{
-    scmSettingsDestroy(scmSettingsStackPop(ppSettingsStack));
+}
-/**
- * Constructs the base settings for the specified file name.
+ *
- * @returns IPRT status code.
- * @param   pSettingsStack      The top element on the settings stack.
- * @param   pszFilename         The file name.
- * @param   pszBasename         The base name (pointer within @a pszFilename).
- * @param   cchBasename         The length of the base name.  (For passing to
- *                              RTStrSimplePatternMultiMatch.)
- * @param   pBase               Base settings to initialize.
- */
-static int scmSettingsStackMakeFileBase(PCSCMSETTINGS pSettingsStack, const char *pszFilename,
-                                        const char *pszBasename, size_t cchBasename, PSCMSETTINGSBASE pBase)
+{
-    int rc = scmSettingsBaseInitAndCopy(pBase, &pSettingsStack->Base);
-    if (RT_SUCCESS(rc))
+    {
-        /* find the bottom entry in the stack. */
-        PCSCMSETTINGS pCur = pSettingsStack;
-        while (pCur->pDown)
-            pCur = pCur->pDown;
-        /* Work our way up thru the stack and look for matching pairs. */
-        while (pCur)
+        {
-            size_t const cPairs = pCur->cPairs;
-            if (cPairs)
+            {
-                for (size_t i = 0; i < cPairs; i++)
-                    if (   RTStrSimplePatternMultiMatch(pCur->paPairs[i].pszPattern, RTSTR_MAX,
-                                                        pszBasename,  cchBasename, NULL)
-                        || RTStrSimplePatternMultiMatch(pCur->paPairs[i].pszPattern, RTSTR_MAX,
-                                                        pszFilename,  RTSTR_MAX, NULL))
+                    {
-                        rc = scmSettingsBaseParseString(pBase, pCur->paPairs[i].pszOptions);
-                        if (RT_FAILURE(rc))
-                            break;
+                    }
-                if (RT_FAILURE(rc))
-                    break;
+            }
-            /* advance */
-            pCur = pCur->pUp;
+        }
+    }
-    if (RT_FAILURE(rc))
-        scmSettingsBaseDelete(pBase);
-    return rc;
+}
-/* -=-=-=-=-=- misc -=-=-=-=-=- */
-/**
- * Prints a verbose message if the level is high enough.
+ *
- * @param   pState              The rewrite state.  Optional.
- * @param   iLevel              The required verbosity level.
- * @param   pszFormat           The message format string.  Can be NULL if we
- *                              only want to trigger the per file message.
- * @param   ...                 Format arguments.
- */
-static void ScmVerbose(PSCMRWSTATE pState, int iLevel, const char *pszFormat, ...)
+{
-    if (iLevel <= g_iVerbosity)
+    {
-        if (pState && !pState->fFirst)
+        {
-            RTPrintf("%s: info: --= Rewriting '%s' =--\n", g_szProgName, pState->pszFilename);
-            pState->fFirst = true;
+        }
-        if (pszFormat)
+        {
-            RTPrintf(pState
-                     ? "%s: info:   "
-                     : "%s: info: ",
-                     g_szProgName);
-            va_list va;
-            va_start(va, pszFormat);
-            RTPrintfV(pszFormat, va);
-            va_end(va);
+        }
+    }
+}
-/* -=-=-=-=-=- subversion -=-=-=-=-=- */
-#define SCM_WITHOUT_LIBSVN
-#ifdef SCM_WITHOUT_LIBSVN
-/**
- * Callback that is call for each path to search.
- */
-static DECLCALLBACK(int) scmSvnFindSvnBinaryCallback(char const *pchPath, size_t cchPath, void *pvUser1, void *pvUser2)
+{
-    char   *pszDst = (char *)pvUser1;
-    size_t  cchDst = (size_t)pvUser2;
-    if (cchDst > cchPath)
+    {
-        memcpy(pszDst, pchPath, cchPath);
-        pszDst[cchPath] = '\0';
-#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-        int rc = RTPathAppend(pszDst, cchDst, "svn.exe");
-#else
-        int rc = RTPathAppend(pszDst, cchDst, "svn");
-#endif
-        if (   RT_SUCCESS(rc)
-            && RTFileExists(pszDst))
-            return VINF_SUCCESS;
+    }
-    return VERR_TRY_AGAIN;
+}
-/**
- * Finds the svn binary.
+ *
- * @param   pszPath             Where to store it.  Worst case, we'll return
- *                              "svn" here.
- * @param   cchPath             The size of the buffer pointed to by @a pszPath.
- */
-static void scmSvnFindSvnBinary(char *pszPath, size_t cchPath)
+{
-    /** @todo code page fun... */
-    Assert(cchPath >= sizeof("svn"));
-#ifdef RT_OS_WINDOWS
-    const char *pszEnvVar = RTEnvGet("Path");
-#else
-    const char *pszEnvVar = RTEnvGet("PATH");
-#endif
-    if (pszPath)
+    {
-#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-        int rc = RTPathTraverseList(pszEnvVar, ';', scmSvnFindSvnBinaryCallback, pszPath, (void *)cchPath);
-#else
-        int rc = RTPathTraverseList(pszEnvVar, ':', scmSvnFindSvnBinaryCallback, pszPath, (void *)cchPath);
-#endif
-        if (RT_SUCCESS(rc))
-            return;
+    }
-    strcpy(pszPath, "svn");
+}
-/**
- * Construct a dot svn filename for the file being rewritten.
+ *
- * @returns IPRT status code.
- * @param   pState              The rewrite state (for the name).
- * @param   pszDir              The directory, including ".svn/".
- * @param   pszSuff             The filename suffix.
- * @param   pszDst              The output buffer.  RTPATH_MAX in size.
- */
-static int scmSvnConstructName(PSCMRWSTATE pState, const char *pszDir, const char *pszSuff, char *pszDst)
+{
-    strcpy(pszDst, pState->pszFilename); /* ASSUMES sizeof(szBuf) <= sizeof(szPath) */
-    RTPathStripFilename(pszDst);
-    int rc = RTPathAppend(pszDst, RTPATH_MAX, pszDir);
-    if (RT_SUCCESS(rc))
+    {
-        rc = RTPathAppend(pszDst, RTPATH_MAX, RTPathFilename(pState->pszFilename));
-        if (RT_SUCCESS(rc))
+        {
-            size_t cchDst  = strlen(pszDst);
-            size_t cchSuff = strlen(pszSuff);
-            if (cchDst + cchSuff < RTPATH_MAX)
+            {
-                memcpy(&pszDst[cchDst], pszSuff, cchSuff + 1);
-                return VINF_SUCCESS;
+            }
-            else
-                rc = VERR_BUFFER_OVERFLOW;
+        }
+    }
-    return rc;
+}
-/**
- * Interprets the specified string as decimal numbers.
+ *
- * @returns true if parsed successfully, false if not.
- * @param   pch                 The string (not terminated).
- * @param   cch                 The string length.
- * @param   pu                  Where to return the value.
- */
-static bool scmSvnReadNumber(const char *pch, size_t cch, size_t *pu)
+{
-    size_t u = 0;
-    while (cch-- > 0)
+    {
-        char ch = *pch++;
-        if (ch < '0' || ch > '9')
-            return false;
-        u *= 10;
-        u += ch - '0';
+    }
-    *pu = u;
-    return true;
+}
-#endif /* SCM_WITHOUT_LIBSVN */
-/**
- * Checks if the file we're operating on is part of a SVN working copy.
+ *
- * @returns true if it is, false if it isn't or we cannot tell.
- * @param   pState              The rewrite state to work on.
- */
-static bool scmSvnIsInWorkingCopy(PSCMRWSTATE pState)
+{
-#ifdef SCM_WITHOUT_LIBSVN
-    /*
-     * Hack: check if the .svn/text-base/<file>.svn-base file exists.
-     */
-    char szPath[RTPATH_MAX];
-    int rc = scmSvnConstructName(pState, ".svn/text-base/", ".svn-base", szPath);
-    if (RT_SUCCESS(rc))
-        return RTFileExists(szPath);
-#else
-    NOREF(pState);
-#endif
-    return false;
+}
-/**
- * Queries the value of an SVN property.
+ *
- * This will automatically adjust for scheduled changes.
+ *
- * @returns IPRT status code.
- * @retval  VERR_INVALID_STATE if not a SVN WC file.
- * @retval  VERR_NOT_FOUND if the property wasn't found.
- * @param   pState              The rewrite state to work on.
- * @param   pszName             The property name.
- * @param   ppszValue           Where to return the property value.  Free this
- *                              using RTStrFree.  Optional.
- */
-static int scmSvnQueryProperty(PSCMRWSTATE pState, const char *pszName, char **ppszValue)
+{
-    /*
-     * Look it up in the scheduled changes.
-     */
-    uint32_t i = pState->cSvnPropChanges;
-    while (i-- > 0)
-        if (!strcmp(pState->paSvnPropChanges[i].pszName, pszName))
+        {
-            const char *pszValue = pState->paSvnPropChanges[i].pszValue;
-            if (!pszValue)
-                return VERR_NOT_FOUND;
-            if (ppszValue)
-                return RTStrDupEx(ppszValue, pszValue);
-            return VINF_SUCCESS;
+        }
-#ifdef SCM_WITHOUT_LIBSVN
-    /*
-     * Hack: Read the .svn/props/<file>.svn-work file exists.
-     */
-    char szPath[RTPATH_MAX];
-    int rc = scmSvnConstructName(pState, ".svn/props/", ".svn-work", szPath);
-    if (RT_SUCCESS(rc) && !RTFileExists(szPath))
-        rc = scmSvnConstructName(pState, ".svn/prop-base/", ".svn-base", szPath);
-    if (RT_SUCCESS(rc))
+    {
-        SCMSTREAM Stream;
-        rc = ScmStreamInitForReading(&Stream, szPath);
-        if (RT_SUCCESS(rc))
+        {
-            /*
-             * The current format is K len\n<name>\nV len\n<value>\n" ... END.
-             */
-            rc = VERR_NOT_FOUND;
-            size_t const    cchName = strlen(pszName);
-            SCMEOL          enmEol;
-            size_t          cchLine;
-            const char     *pchLine;
-            while ((pchLine = ScmStreamGetLine(&Stream, &cchLine, &enmEol)) != NULL)
+            {
-                /*
-                 * Parse the 'K num' / 'END' line.
-                 */
-                if (   cchLine == 3
-                    && !memcmp(pchLine, "END", 3))
-                    break;
-                size_t cchKey;
-                if (   cchLine < 3
-                    || pchLine[0] != 'K'
-                    || pchLine[1] != ' '
-                    || !scmSvnReadNumber(&pchLine[2], cchLine - 2, &cchKey)
-                    || cchKey == 0
-                    || cchKey > 4096)
+                {
-                    RTMsgError("%s:%u: Unexpected data '%.*s'\n", szPath, ScmStreamTellLine(&Stream), cchLine, pchLine);
-                    rc = VERR_PARSE_ERROR;
-                    break;
+                }
-                /*
-                 * Match the key and skip to the value line.  Don't bother with
-                 * names containing EOL markers.
-                 */
-                size_t const offKey = ScmStreamTell(&Stream);
-                bool fMatch = cchName == cchKey;
-                if (fMatch)
+                {
-                    pchLine = ScmStreamGetLine(&Stream, &cchLine, &enmEol);
-                    if (!pchLine)
-                        break;
-                    fMatch = cchLine == cchName
-                          && !memcmp(pchLine, pszName, cchName);
+                }
-                if (RT_FAILURE(ScmStreamSeekAbsolute(&Stream, offKey + cchKey)))
-                    break;
-                if (RT_FAILURE(ScmStreamSeekByLine(&Stream, ScmStreamTellLine(&Stream) + 1)))
-                    break;
-                /*
-                 * Read and Parse the 'V num' line.
-                 */
-                pchLine = ScmStreamGetLine(&Stream, &cchLine, &enmEol);
-                if (!pchLine)
-                    break;
-                size_t cchValue;
-                if (   cchLine < 3
-                    || pchLine[0] != 'V'
-                    || pchLine[1] != ' '
-                    || !scmSvnReadNumber(&pchLine[2], cchLine - 2, &cchValue)
-                    || cchValue > _1M)
+                {
-                    RTMsgError("%s:%u: Unexpected data '%.*s'\n", szPath, ScmStreamTellLine(&Stream), cchLine, pchLine);
-                    rc = VERR_PARSE_ERROR;
-                    break;
+                }
-                /*
-                 * If we have a match, allocate a return buffer and read the
-                 * value into it.  Otherwise skip this value and continue
-                 * searching.
-                 */
-                if (fMatch)
+                {
-                    if (!ppszValue)
-                        rc = VINF_SUCCESS;
-                    else
+                    {
-                        char *pszValue;
-                        rc = RTStrAllocEx(&pszValue, cchValue + 1);
-                        if (RT_SUCCESS(rc))
+                        {
-                            rc = ScmStreamRead(&Stream, pszValue, cchValue);
-                            if (RT_SUCCESS(rc))
-                                *ppszValue = pszValue;
-                            else
-                                RTStrFree(pszValue);
+                        }
+                    }
-                    break;
+                }
-                if (RT_FAILURE(ScmStreamSeekRelative(&Stream, cchValue)))
-                    break;
-                if (RT_FAILURE(ScmStreamSeekByLine(&Stream, ScmStreamTellLine(&Stream) + 1)))
-                    break;
+            }
-            if (RT_FAILURE(ScmStreamGetStatus(&Stream)))
+            {
-                rc = ScmStreamGetStatus(&Stream);
-                RTMsgError("%s: stream error %Rrc\n", szPath, rc);
+            }
-            ScmStreamDelete(&Stream);
+        }
+    }
-    if (rc == VERR_FILE_NOT_FOUND)
-        rc = VERR_NOT_FOUND;
-    return rc;
-#else
-    NOREF(pState);
-#endif
-    return VERR_NOT_FOUND;
+}
-/**
- * Schedules the setting of a property.
+ *
- * @returns IPRT status code.
- * @retval  VERR_INVALID_STATE if not a SVN WC file.
- * @param   pState              The rewrite state to work on.
- * @param   pszName             The name of the property to set.
- * @param   pszValue            The value.  NULL means deleting it.
- */
-static int scmSvnSetProperty(PSCMRWSTATE pState, const char *pszName, const char *pszValue)
+{
-    /*
-     * Update any existing entry first.
-     */
-    size_t i = pState->cSvnPropChanges;
-    while (i-- > 0)
-        if (!strcmp(pState->paSvnPropChanges[i].pszName,  pszName))
+        {
-            if (!pszValue)
+            {
-                RTStrFree(pState->paSvnPropChanges[i].pszValue);
-                pState->paSvnPropChanges[i].pszValue = NULL;
+            }
-            else
+            {
-                char *pszCopy;
-                int rc = RTStrDupEx(&pszCopy, pszValue);
-                if (RT_FAILURE(rc))
-                    return rc;
-                pState->paSvnPropChanges[i].pszValue = pszCopy;
+            }
-            return VINF_SUCCESS;
+        }
-    /*
-     * Insert a new entry.
-     */
-    i = pState->cSvnPropChanges;
-    if ((i % 32) == 0)
+    {
-        void *pvNew = RTMemRealloc(pState->paSvnPropChanges, (i + 32) * sizeof(SCMSVNPROP));
-        if (!pvNew)
-            return VERR_NO_MEMORY;
-        pState->paSvnPropChanges = (PSCMSVNPROP)pvNew;
+    }
-    pState->paSvnPropChanges[i].pszName  = RTStrDup(pszName);
-    pState->paSvnPropChanges[i].pszValue = pszValue ? RTStrDup(pszValue) : NULL;
-    if (   pState->paSvnPropChanges[i].pszName
-        && (pState->paSvnPropChanges[i].pszValue || !pszValue) )
-        pState->cSvnPropChanges = i + 1;
-    else
+    {
-        RTStrFree(pState->paSvnPropChanges[i].pszName);
-        pState->paSvnPropChanges[i].pszName = NULL;
-        RTStrFree(pState->paSvnPropChanges[i].pszValue);
-        pState->paSvnPropChanges[i].pszValue = NULL;
-        return VERR_NO_MEMORY;
+    }
-    return VINF_SUCCESS;
+}
-/**
- * Schedules a property deletion.
+ *
- * @returns IPRT status code.
- * @param   pState              The rewrite state to work on.
- * @param   pszName             The name of the property to delete.
- */
-static int scmSvnDelProperty(PSCMRWSTATE pState, const char *pszName)
+{
-    return scmSvnSetProperty(pState, pszName, NULL);
+}
-/**
- * Applies any SVN property changes to the work copy of the file.
+ *
- * @returns IPRT status code.
- * @param   pState              The rewrite state which SVN property changes
- *                              should be applied.
- */
-static int scmSvnDisplayChanges(PSCMRWSTATE pState)
+{
-    size_t i = pState->cSvnPropChanges;
-    while (i-- > 0)
+    {
-        const char *pszName  = pState->paSvnPropChanges[i].pszName;
-        const char *pszValue = pState->paSvnPropChanges[i].pszValue;
-        if (pszValue)
-            ScmVerbose(pState, 0, "svn ps '%s' '%s'  %s\n", pszName, pszValue, pState->pszFilename);
-        else
-            ScmVerbose(pState, 0, "svn pd '%s'  %s\n", pszName, pszValue, pState->pszFilename);
+    }
-    return VINF_SUCCESS;
+}
-/**
- * Applies any SVN property changes to the work copy of the file.
+ *
- * @returns IPRT status code.
- * @param   pState              The rewrite state which SVN property changes
- *                              should be applied.
- */
-static int scmSvnApplyChanges(PSCMRWSTATE pState)
+{
-#ifdef SCM_WITHOUT_LIBSVN
-    /*
-     * This sucks. We gotta find svn(.exe).
-     */
-    static char s_szSvnPath[RTPATH_MAX];
-    if (s_szSvnPath[0] == '\0')
-        scmSvnFindSvnBinary(s_szSvnPath, sizeof(s_szSvnPath));
-    /*
-     * Iterate thru the changes and apply them by starting the svn client.
-     */
-    for (size_t i = 0; i <pState->cSvnPropChanges; i++)
+    {
-        const char *apszArgv[6];
-        apszArgv[0] = s_szSvnPath;
-        apszArgv[1] = pState->paSvnPropChanges[i].pszValue ? "ps" : "pd";
-        apszArgv[2] = pState->paSvnPropChanges[i].pszName;
-        int iArg = 3;
-        if (pState->paSvnPropChanges[i].pszValue)
-            apszArgv[iArg++] = pState->paSvnPropChanges[i].pszValue;
-        apszArgv[iArg++] = pState->pszFilename;
-        apszArgv[iArg++] = NULL;
-        ScmVerbose(pState, 2, "executing: %s %s %s %s %s\n",
-                   apszArgv[0], apszArgv[1], apszArgv[2], apszArgv[3], apszArgv[4]);
-        RTPROCESS pid;
-        int rc = RTProcCreate(s_szSvnPath, apszArgv, RTENV_DEFAULT, 0 /*fFlags*/, &pid);
-        if (RT_SUCCESS(rc))
+        {
-            RTPROCSTATUS Status;
-            rc = RTProcWait(pid, RTPROCWAIT_FLAGS_BLOCK, &Status);
-            if (    RT_SUCCESS(rc)
-                &&  (   Status.enmReason != RTPROCEXITREASON_NORMAL
-                     || Status.iStatus != 0) )
+            {
-                RTMsgError("%s: %s %s %s %s %s -> %s %u\n",
-                           pState->pszFilename, apszArgv[0], apszArgv[1], apszArgv[2], apszArgv[3], apszArgv[4],
-                           Status.enmReason == RTPROCEXITREASON_NORMAL   ? "exit code"
-                           : Status.enmReason == RTPROCEXITREASON_SIGNAL ? "signal"
-                           : Status.enmReason == RTPROCEXITREASON_ABEND  ? "abnormal end"
-                           : "abducted by alien",
-                           Status.iStatus);
-                return VERR_GENERAL_FAILURE;
+            }
+        }
-        if (RT_FAILURE(rc))
+        {
-            RTMsgError("%s: error executing %s %s %s %s %s: %Rrc\n",
-                       pState->pszFilename, apszArgv[0], apszArgv[1], apszArgv[2], apszArgv[3], apszArgv[4], rc);
-            return rc;
+        }
+    }
-    return VINF_SUCCESS;
-#else
-    return VERR_NOT_IMPLEMENTED;
-#endif
+}
-/* -=-=-=-=-=- rewriters -=-=-=-=-=- */
-/**
- * Strip trailing blanks (space & tab).
+ *
- * @returns True if modified, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
- */
-static bool rewrite_StripTrailingBlanks(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    if (!pSettings->fStripTrailingBlanks)
-        return false;
-    bool        fModified = false;
-    SCMEOL      enmEol;
-    size_t      cchLine;
-    const char *pchLine;
-    while ((pchLine = ScmStreamGetLine(pIn, &cchLine, &enmEol)) != NULL)
+    {
-        int rc;
-        if (    cchLine == 0
-            ||  !RT_C_IS_BLANK(pchLine[cchLine - 1]) )
-            rc = ScmStreamPutLine(pOut, pchLine, cchLine, enmEol);
-        else
+        {
-            cchLine--;
-            while (cchLine > 0 && RT_C_IS_BLANK(pchLine[cchLine - 1]))
-                cchLine--;
-            rc = ScmStreamPutLine(pOut, pchLine, cchLine, enmEol);
-            fModified = true;
+        }
-        if (RT_FAILURE(rc))
-            return false;
+    }
-    if (fModified)
-        ScmVerbose(pState, 2, " * Stripped trailing blanks\n");
-    return fModified;
+}
-/**
- * Expand tabs.
+ *
- * @returns True if modified, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
- */
-static bool rewrite_ExpandTabs(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    if (!pSettings->fConvertTabs)
-        return false;
-    size_t const    cchTab = pSettings->cchTab;
-    bool            fModified = false;
-    SCMEOL          enmEol;
-    size_t          cchLine;
-    const char     *pchLine;
-    while ((pchLine = ScmStreamGetLine(pIn, &cchLine, &enmEol)) != NULL)
+    {
-        int rc;
-        const char *pchTab = (const char *)memchr(pchLine, '\t', cchLine);
-        if (!pchTab)
-            rc = ScmStreamPutLine(pOut, pchLine, cchLine, enmEol);
-        else
+        {
-            size_t      offTab   = 0;
-            const char *pchChunk = pchLine;
-            for (;;)
+            {
-                size_t  cchChunk = pchTab - pchChunk;
-                offTab += cchChunk;
-                ScmStreamWrite(pOut, pchChunk, cchChunk);
-                size_t  cchToTab = cchTab - offTab % cchTab;
-                ScmStreamWrite(pOut, g_szTabSpaces, cchToTab);
-                offTab += cchToTab;
-                pchChunk = pchTab + 1;
-                size_t  cchLeft  = cchLine - (pchChunk - pchLine);
-                pchTab = (const char *)memchr(pchChunk, '\t', cchLeft);
-                if (!pchTab)
+                {
-                    rc = ScmStreamPutLine(pOut, pchChunk, cchLeft, enmEol);
-                    break;
+                }
+            }
-            fModified = true;
+        }
-        if (RT_FAILURE(rc))
-            return false;
+    }
-    if (fModified)
-        ScmVerbose(pState, 2, " * Expanded tabs\n");
-    return fModified;
+}
-/**
- * Worker for rewrite_ForceNativeEol, rewrite_ForceLF and rewrite_ForceCRLF.
+ *
- * @returns true if modifications were made, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
- * @param   enmDesiredEol       The desired end of line indicator type.
- * @param   pszDesiredSvnEol    The desired svn:eol-style.
- */
-static bool rewrite_ForceEol(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings,
-                             SCMEOL enmDesiredEol, const char *pszDesiredSvnEol)
+{
-    if (!pSettings->fConvertEol)
-        return false;
-    bool        fModified = false;
-    SCMEOL      enmEol;
-    size_t      cchLine;
-    const char *pchLine;
-    while ((pchLine = ScmStreamGetLine(pIn, &cchLine, &enmEol)) != NULL)
+    {
-        if (   enmEol != enmDesiredEol
-            && enmEol != SCMEOL_NONE)
+        {
-            fModified = true;
-            enmEol = enmDesiredEol;
+        }
-        int rc = ScmStreamPutLine(pOut, pchLine, cchLine, enmEol);
-        if (RT_FAILURE(rc))
-            return false;
+    }
-    if (fModified)
-        ScmVerbose(pState, 2, " * Converted EOL markers\n");
-    /* Check svn:eol-style if appropriate */
-    if (   pSettings->fSetSvnEol
-        && scmSvnIsInWorkingCopy(pState))
+    {
-        char *pszEol;
-        int rc = scmSvnQueryProperty(pState, "svn:eol-style", &pszEol);
-        if (   (RT_SUCCESS(rc) && strcmp(pszEol, pszDesiredSvnEol))
-            || rc == VERR_NOT_FOUND)
+        {
-            if (rc == VERR_NOT_FOUND)
-                ScmVerbose(pState, 2, " * Setting svn:eol-style to %s (missing)\n", pszDesiredSvnEol);
-            else
-                ScmVerbose(pState, 2, " * Setting svn:eol-style to %s (was: %s)\n", pszDesiredSvnEol, pszEol);
-            int rc2 = scmSvnSetProperty(pState, "svn:eol-style", pszDesiredSvnEol);
-            if (RT_FAILURE(rc2))
-                RTMsgError("scmSvnSetProperty: %Rrc\n", rc2); /** @todo propagate the error somehow... */
+        }
-        if (RT_SUCCESS(rc))
-            RTStrFree(pszEol);
+    }
-    /** @todo also check the subversion svn:eol-style state! */
-    return fModified;
+}
-/**
- * Force native end of line indicator.
+ *
- * @returns true if modifications were made, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
- */
-static bool rewrite_ForceNativeEol(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-    return rewrite_ForceEol(pState, pIn, pOut, pSettings, SCMEOL_CRLF, "native");
-#else
-    return rewrite_ForceEol(pState, pIn, pOut, pSettings, SCMEOL_LF,   "native");
-#endif
+}
-/**
- * Force the stream to use LF as the end of line indicator.
+ *
- * @returns true if modifications were made, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
- */
-static bool rewrite_ForceLF(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    return rewrite_ForceEol(pState, pIn, pOut, pSettings, SCMEOL_LF, "LF");
+}
-/**
- * Force the stream to use CRLF as the end of line indicator.
+ *
- * @returns true if modifications were made, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
- */
-static bool rewrite_ForceCRLF(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    return rewrite_ForceEol(pState, pIn, pOut, pSettings, SCMEOL_CRLF, "CRLF");
+}
-/**
- * Strip trailing blank lines and/or make sure there is exactly one blank line
- * at the end of the file.
+ *
- * @returns true if modifications were made, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
+ *
- * @remarks ASSUMES trailing white space has been removed already.
- */
-static bool rewrite_AdjustTrailingLines(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    if (   !pSettings->fStripTrailingLines
-        && !pSettings->fForceTrailingLine
-        && !pSettings->fForceFinalEol)
-        return false;
-    size_t const cLines = ScmStreamCountLines(pIn);
-    /* Empty files remains empty. */
-    if (cLines <= 1)
-        return false;
-    /* Figure out if we need to adjust the number of lines or not. */
-    size_t cLinesNew = cLines;
-    if (   pSettings->fStripTrailingLines
-        && ScmStreamIsWhiteLine(pIn, cLinesNew - 1))
+    {
-        while (   cLinesNew > 1
-               && ScmStreamIsWhiteLine(pIn, cLinesNew - 2))
-            cLinesNew--;
+    }
-    if (    pSettings->fForceTrailingLine
-        && !ScmStreamIsWhiteLine(pIn, cLinesNew - 1))
-        cLinesNew++;
-    bool fFixMissingEol = pSettings->fForceFinalEol
-                       && ScmStreamGetEolByLine(pIn, cLinesNew - 1) == SCMEOL_NONE;
-    if (   !fFixMissingEol
-        && cLines == cLinesNew)
-        return false;
-    /* Copy the number of lines we've arrived at. */
-    ScmStreamRewindForReading(pIn);
-    size_t cCopied = RT_MIN(cLinesNew, cLines);
-    ScmStreamCopyLines(pOut, pIn, cCopied);
-    if (cCopied != cLinesNew)
+    {
-        while (cCopied++ < cLinesNew)
-            ScmStreamPutLine(pOut, "", 0, ScmStreamGetEol(pIn));
+    }
-    /* Fix missing EOL if required. */
-    else if (fFixMissingEol)
+    {
-        if (ScmStreamGetEol(pIn) == SCMEOL_LF)
-            ScmStreamWrite(pOut, "\n", 1);
-        else
-            ScmStreamWrite(pOut, "\r\n", 2);
+    }
-    ScmVerbose(pState, 2, " * Adjusted trailing blank lines\n");
-    return true;
+}
-/**
- * Make sure there is no svn:executable keyword on the current file.
+ *
- * @returns false - the state carries these kinds of changes.
- * @param   pState              The rewriter state.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
- */
-static bool rewrite_SvnNoExecutable(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    if (   !pSettings->fSetSvnExecutable
-        || !scmSvnIsInWorkingCopy(pState))
-        return false;
-    int rc = scmSvnQueryProperty(pState, "svn:executable", NULL);
-    if (RT_SUCCESS(rc))
+    {
-        ScmVerbose(pState, 2, " * removing svn:executable\n");
-        rc = scmSvnDelProperty(pState, "svn:executable");
-        if (RT_FAILURE(rc))
-            RTMsgError("scmSvnSetProperty: %Rrc\n", rc); /** @todo error propagation here.. */
+    }
-    return false;
+}
-/**
- * Make sure the Id and Revision keywords are expanded.
+ *
- * @returns false - the state carries these kinds of changes.
- * @param   pState              The rewriter state.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
- */
-static bool rewrite_SvnKeywords(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    if (   !pSettings->fSetSvnKeywords
-        || !scmSvnIsInWorkingCopy(pState))
-        return false;
-    char *pszKeywords;
-    int rc = scmSvnQueryProperty(pState, "svn:keywords", &pszKeywords);
-    if (    RT_SUCCESS(rc)
-        && (   !strstr(pszKeywords, "Id") /** @todo need some function for finding a word in a string.  */
-            || !strstr(pszKeywords, "Revision")) )
+    {
-        if (!strstr(pszKeywords, "Id") && !strstr(pszKeywords, "Revision"))
-            rc = RTStrAAppend(&pszKeywords, " Id Revision");
-        else if (!strstr(pszKeywords, "Id"))
-            rc = RTStrAAppend(&pszKeywords, " Id");
-        else
-            rc = RTStrAAppend(&pszKeywords, " Revision");
-        if (RT_SUCCESS(rc))
+        {
-            ScmVerbose(pState, 2, " * changing svn:keywords to '%s'\n", pszKeywords);
-            rc = scmSvnSetProperty(pState, "svn:keywords", pszKeywords);
-            if (RT_FAILURE(rc))
-                RTMsgError("scmSvnSetProperty: %Rrc\n", rc); /** @todo error propagation here.. */
+        }
-        else
-            RTMsgError("RTStrAppend: %Rrc\n", rc); /** @todo error propagation here.. */
-        RTStrFree(pszKeywords);
+    }
-    else if (rc == VERR_NOT_FOUND)
+    {
-        ScmVerbose(pState, 2, " * setting svn:keywords to 'Id Revision'\n");
-        rc = scmSvnSetProperty(pState, "svn:keywords", "Id Revision");
-        if (RT_FAILURE(rc))
-            RTMsgError("scmSvnSetProperty: %Rrc\n", rc); /** @todo error propagation here.. */
+    }
-    else if (RT_SUCCESS(rc))
-        RTStrFree(pszKeywords);
-    return false;
+}
-/**
- * Makefile.kup are empty files, enforce this.
+ *
- * @returns true if modifications were made, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
- */
-static bool rewrite_Makefile_kup(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    /* These files should be zero bytes. */
-    if (pIn->cb == 0)
-        return false;
-    ScmVerbose(pState, 2, " * Truncated file to zero bytes\n");
-    return true;
+}
-/**
- * Rewrite a kBuild makefile.
+ *
- * @returns true if modifications were made, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
+ *
- * @todo
+ *
- * Ideas for Makefile.kmk and Config.kmk:
- *      - sort if1of/ifn1of sets.
- *      - line continuation slashes should only be preceded by one space.
- */
-static bool rewrite_Makefile_kmk(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    return false;
+}
-/**
- * Rewrite a C/C++ source or header file.
+ *
- * @returns true if modifications were made, false if not.
- * @param   pIn                 The input stream.
- * @param   pOut                The output stream.
- * @param   pSettings           The settings.
+ *
- * @todo
+ *
- * Ideas for C/C++:
- *      - space after if, while, for, switch
- *      - spaces in for (i=0;i<x;i++)
- *      - complex conditional, bird style.
- *      - remove unnecessary parentheses.
- *      - sort defined RT_OS_*||  and RT_ARCH
- *      - sizeof without parenthesis.
- *      - defined without parenthesis.
- *      - trailing spaces.
- *      - parameter indentation.
- *      - space after comma.
- *      - while (x--); -> multi line + comment.
- *      - else statement;
- *      - space between function and left parenthesis.
- *      - TODO, XXX, @todo cleanup.
- *      - Space before/after '*'.
- *      - ensure new line at end of file.
- *      - Indentation of precompiler statements (#ifdef, #defines).
- *      - space between functions.
- *      - string.h -> iprt/string.h, stdarg.h -> iprt/stdarg.h, etc.
- */
-static bool rewrite_C_and_CPP(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
+{
-    return false;
+}
-/* -=-=-=-=-=- file and directory processing -=-=-=-=-=- */
-/**
- * Processes a file.
+ *
- * @returns IPRT status code.
- * @param   pState              The rewriter state.
- * @param   pszFilename         The file name.
- * @param   pszBasename         The base name (pointer within @a pszFilename).
- * @param   cchBasename         The length of the base name.  (For passing to
- *                              RTStrSimplePatternMultiMatch.)
- * @param   pBaseSettings       The base settings to use.  It's OK to modify
- *                              these.
- */
-static int scmProcessFileInner(PSCMRWSTATE pState, const char *pszFilename, const char *pszBasename, size_t cchBasename,
-                               PSCMSETTINGSBASE pBaseSettings)
+{
-    /*
-     * Do the file level filtering.
-     */
-    if (   pBaseSettings->pszFilterFiles
-        && *pBaseSettings->pszFilterFiles
-        && !RTStrSimplePatternMultiMatch(pBaseSettings->pszFilterFiles, RTSTR_MAX, pszBasename, cchBasename, NULL))
+    {
-        ScmVerbose(NULL, 5, "skipping '%s': file filter mismatch\n", pszFilename);
-        return VINF_SUCCESS;
+    }
-    if (   pBaseSettings->pszFilterOutFiles
-        && *pBaseSettings->pszFilterOutFiles
-        && (   RTStrSimplePatternMultiMatch(pBaseSettings->pszFilterOutFiles, RTSTR_MAX, pszBasename, cchBasename, NULL)
-            || RTStrSimplePatternMultiMatch(pBaseSettings->pszFilterOutFiles, RTSTR_MAX, pszFilename, RTSTR_MAX, NULL)) )
+    {
-        ScmVerbose(NULL, 5, "skipping '%s': filterd out\n", pszFilename);
-        return VINF_SUCCESS;
+    }
-    if (   pBaseSettings->fOnlySvnFiles
-        && !scmSvnIsInWorkingCopy(pState))
+    {
-        ScmVerbose(NULL, 5, "skipping '%s': not in SVN WC\n", pszFilename);
-        return VINF_SUCCESS;
+    }
-    /*
-     * Try find a matching rewrite config for this filename.
-     */
-    PCSCMCFGENTRY pCfg = NULL;
-    for (size_t iCfg = 0; iCfg < RT_ELEMENTS(g_aConfigs); iCfg++)
-        if (RTStrSimplePatternMultiMatch(g_aConfigs[iCfg].pszFilePattern, RTSTR_MAX, pszBasename, cchBasename, NULL))
+        {
-            pCfg = &g_aConfigs[iCfg];
-            break;
+        }
-    if (!pCfg)
+    {
-        ScmVerbose(NULL, 4, "skipping '%s': no rewriters configured\n", pszFilename);
-        return VINF_SUCCESS;
+    }
-    ScmVerbose(pState, 4, "matched \"%s\"\n", pCfg->pszFilePattern);
-    /*
-     * Create an input stream from the file and check that it's text.
-     */
-    SCMSTREAM Stream1;
-    int rc = ScmStreamInitForReading(&Stream1, pszFilename);
-    if (RT_FAILURE(rc))
+    {
-        RTMsgError("Failed to read '%s': %Rrc\n", pszFilename, rc);
-        return rc;
+    }
-    if (ScmStreamIsText(&Stream1))
+    {
-        ScmVerbose(pState, 3, NULL);
-        /*
-         * Gather SCM and editor settings from the stream.
-         */
-        rc = scmSettingsBaseLoadFromDocument(pBaseSettings, &Stream1);
-        if (RT_SUCCESS(rc))
+        {
-            ScmStreamRewindForReading(&Stream1);
-            /*
-             * Create two more streams for output and push the text thru all the
-             * rewriters, switching the two streams around when something is
-             * actually rewritten.  Stream1 remains unchanged.
-             */
-            SCMSTREAM Stream2;
-            rc = ScmStreamInitForWriting(&Stream2, &Stream1);
-            if (RT_SUCCESS(rc))
+            {
-                SCMSTREAM Stream3;
-                rc = ScmStreamInitForWriting(&Stream3, &Stream1);
-                if (RT_SUCCESS(rc))
+                {
-                    bool        fModified = false;
-                    PSCMSTREAM  pIn       = &Stream1;
-                    PSCMSTREAM  pOut      = &Stream2;
-                    for (size_t iRw = 0; iRw < pCfg->cRewriters; iRw++)
+                    {
-                        bool fRc = pCfg->papfnRewriter[iRw](pState, pIn, pOut, pBaseSettings);
-                        if (fRc)
+                        {
-                            PSCMSTREAM pTmp = pOut;
-                            pOut = pIn == &Stream1 ? &Stream3 : pIn;
-                            pIn  = pTmp;
-                            fModified = true;
+                        }
-                        ScmStreamRewindForReading(pIn);
-                        ScmStreamRewindForWriting(pOut);
+                    }
-                    rc = ScmStreamGetStatus(&Stream1);
-                    if (RT_SUCCESS(rc))
-                        rc = ScmStreamGetStatus(&Stream2);
-                    if (RT_SUCCESS(rc))
-                        rc = ScmStreamGetStatus(&Stream3);
-                    if (RT_SUCCESS(rc))
+                    {
-                        /*
-                         * If rewritten, write it back to disk.
-                         */
-                        if (fModified)
+                        {
-                            if (!g_fDryRun)
+                            {
-                                ScmVerbose(pState, 1, "writing modified file to \"%s%s\"\n", pszFilename, g_pszChangedSuff);
-                                rc = ScmStreamWriteToFile(pIn, "%s%s", pszFilename, g_pszChangedSuff);
-                                if (RT_FAILURE(rc))
-                                    RTMsgError("Error writing '%s%s': %Rrc\n", pszFilename, g_pszChangedSuff, rc);
+                            }
-                            else
+                            {
-                                ScmVerbose(pState, 1, NULL);
-                                ScmDiffStreams(pszFilename, &Stream1, pIn, g_fDiffIgnoreEol, g_fDiffIgnoreLeadingWS,
-                                               g_fDiffIgnoreTrailingWS, g_fDiffSpecialChars, pBaseSettings->cchTab, g_pStdOut);
-                                ScmVerbose(pState, 2, "would have modified the file \"%s%s\"\n", pszFilename, g_pszChangedSuff);
+                            }
+                        }
-                        /*
-                         * If pending SVN property changes, apply them.
-                         */
-                        if (pState->cSvnPropChanges && RT_SUCCESS(rc))
+                        {
-                            if (!g_fDryRun)
+                            {
-                                rc = scmSvnApplyChanges(pState);
-                                if (RT_FAILURE(rc))
-                                    RTMsgError("%s: failed to apply SVN property changes (%Rrc)\n", pszFilename, rc);
+                            }
-                            else
-                                scmSvnDisplayChanges(pState);
+                        }
-                        if (!fModified && !pState->cSvnPropChanges)
-                            ScmVerbose(pState, 3, "no change\n", pszFilename);
+                    }
-                    else
-                        RTMsgError("%s: stream error %Rrc\n", pszFilename);
-                    ScmStreamDelete(&Stream3);
+                }
-                else
-                    RTMsgError("Failed to init stream for writing: %Rrc\n", rc);
-                ScmStreamDelete(&Stream2);
+            }
-            else
-                RTMsgError("Failed to init stream for writing: %Rrc\n", rc);
+        }
-        else
-            RTMsgError("scmSettingsBaseLoadFromDocument: %Rrc\n", rc);
+    }
-    else
-        ScmVerbose(pState, 4, "not text file: \"%s\"\n", pszFilename);
-    ScmStreamDelete(&Stream1);
-    return rc;
+}
-/**
- * Processes a file.
+ *
- * This is just a wrapper for scmProcessFileInner for avoid wasting stack in the
- * directory recursion method.
+ *
- * @returns IPRT status code.
- * @param   pszFilename         The file name.
- * @param   pszBasename         The base name (pointer within @a pszFilename).
- * @param   cchBasename         The length of the base name.  (For passing to
- *                              RTStrSimplePatternMultiMatch.)
- * @param   pSettingsStack      The settings stack (pointer to the top element).
- */
-static int scmProcessFile(const char *pszFilename, const char *pszBasename, size_t cchBasename,
-                          PSCMSETTINGS pSettingsStack)
+{
-    SCMSETTINGSBASE Base;
-    int rc = scmSettingsStackMakeFileBase(pSettingsStack, pszFilename, pszBasename, cchBasename, &Base);
-    if (RT_SUCCESS(rc))
+    {
-        SCMRWSTATE State;
-        State.fFirst           = false;
-        State.pszFilename      = pszFilename;
-        State.cSvnPropChanges  = 0;
-        State.paSvnPropChanges = NULL;
-        rc = scmProcessFileInner(&State, pszFilename, pszBasename, cchBasename, &Base);
-        size_t i = State.cSvnPropChanges;
-        while (i-- > 0)
+        {
-            RTStrFree(State.paSvnPropChanges[i].pszName);
-            RTStrFree(State.paSvnPropChanges[i].pszValue);
+        }
-        RTMemFree(State.paSvnPropChanges);
-        scmSettingsBaseDelete(&Base);
+    }
-    return rc;
+}
-/**
- * Tries to correct RTDIRENTRY_UNKNOWN.
+ *
- * @returns Corrected type.
- * @param   pszPath             The path to the object in question.
- */
-static RTDIRENTRYTYPE scmFigureUnknownType(const char *pszPath)
+{
-    RTFSOBJINFO Info;
-    int rc = RTPathQueryInfo(pszPath, &Info, RTFSOBJATTRADD_NOTHING);
-    if (RT_FAILURE(rc))
-        return RTDIRENTRYTYPE_UNKNOWN;
-    if (RTFS_IS_DIRECTORY(Info.Attr.fMode))
-        return RTDIRENTRYTYPE_DIRECTORY;
-    if (RTFS_IS_FILE(Info.Attr.fMode))
-        return RTDIRENTRYTYPE_FILE;
-    return RTDIRENTRYTYPE_UNKNOWN;
+}
-/**
- * Recurse into a sub-directory and process all the files and directories.
+ *
- * @returns IPRT status code.
- * @param   pszBuf              Path buffer containing the directory path on
- *                              entry.  This ends with a dot.  This is passed
- *                              along when recursing in order to save stack space
- *                              and avoid needless copying.
- * @param   cchDir              Length of our path in pszbuf.
- * @param   pEntry              Directory entry buffer.  This is also passed
- *                              along when recursing to save stack space.
- * @param   pSettingsStack      The settings stack (pointer to the top element).
- * @param   iRecursion          The recursion depth.  This is used to restrict
- *                              the recursions.
- */
-static int scmProcessDirTreeRecursion(char *pszBuf, size_t cchDir, PRTDIRENTRY pEntry,
-                                      PSCMSETTINGS pSettingsStack, unsigned iRecursion)
+{
-    int rc;
-    Assert(cchDir > 1 && pszBuf[cchDir - 1] == '.');
-    /*
-     * Make sure we stop somewhere.
-     */
-    if (iRecursion > 128)
+    {
-        RTMsgError("recursion too deep: %d\n", iRecursion);
-        return VINF_SUCCESS; /* ignore */
+    }
-    /*
-     * Check if it's excluded by --only-svn-dir.
-     */
-    if (pSettingsStack->Base.fOnlySvnDirs)
+    {
-        rc = RTPathAppend(pszBuf, RTPATH_MAX, ".svn");
-        if (RT_FAILURE(rc))
+        {
-            RTMsgError("RTPathAppend: %Rrc\n", rc);
-            return rc;
+        }
-        if (!RTDirExists(pszBuf))
-            return VINF_SUCCESS;
-        Assert(RTPATH_IS_SLASH(pszBuf[cchDir]));
-        pszBuf[cchDir]     = '\0';
-        pszBuf[cchDir - 1] = '.';
+    }
-    /*
-     * Try open and read the directory.
-     */
-    PRTDIR pDir;
-    rc = RTDirOpenFiltered(&pDir, pszBuf, RTDIRFILTER_NONE, 0);
-    if (RT_FAILURE(rc))
+    {
-        RTMsgError("Failed to enumerate directory '%s': %Rrc", pszBuf, rc);
-        return rc;
+    }
-    for (;;)
+    {
-        /* Read the next entry. */
-        rc = RTDirRead(pDir, pEntry, NULL);
-        if (RT_FAILURE(rc))
+        {
-            if (rc == VERR_NO_MORE_FILES)
-                rc = VINF_SUCCESS;
-            else
-                RTMsgError("RTDirRead -> %Rrc\n", rc);
-            break;
+        }
-        /* Skip '.' and '..'. */
-        if (    pEntry->szName[0] == '.'
-            &&  (   pEntry->cbName == 1
-                 || (   pEntry->cbName == 2
-                     && pEntry->szName[1] == '.')))
-            continue;
-        /* Enter it into the buffer so we've got a full name to work
-           with when needed. */
-        if (pEntry->cbName + cchDir >= RTPATH_MAX)
+        {
-            RTMsgError("Skipping too long entry: %s", pEntry->szName);
-            continue;
+        }
-        memcpy(&pszBuf[cchDir - 1], pEntry->szName, pEntry->cbName + 1);
-        /* Figure the type. */
-        RTDIRENTRYTYPE enmType = pEntry->enmType;
-        if (enmType == RTDIRENTRYTYPE_UNKNOWN)
-            enmType = scmFigureUnknownType(pszBuf);
-        /* Process the file or directory, skip the rest. */
-        if (enmType == RTDIRENTRYTYPE_FILE)
-            rc = scmProcessFile(pszBuf, pEntry->szName, pEntry->cbName, pSettingsStack);
-        else if (enmType == RTDIRENTRYTYPE_DIRECTORY)
+        {
-            /* Append the dot for the benefit of the pattern matching. */
-            if (pEntry->cbName + cchDir + 5 >= RTPATH_MAX)
+            {
-                RTMsgError("Skipping too deep dir entry: %s", pEntry->szName);
-                continue;
+            }
-            memcpy(&pszBuf[cchDir - 1 + pEntry->cbName], "/.", sizeof("/."));
-            size_t cchSubDir = cchDir - 1 + pEntry->cbName + sizeof("/.") - 1;
-            if (   !pSettingsStack->Base.pszFilterOutDirs
-                || !*pSettingsStack->Base.pszFilterOutDirs
-                || (   !RTStrSimplePatternMultiMatch(pSettingsStack->Base.pszFilterOutDirs, RTSTR_MAX,
-                                                     pEntry->szName, pEntry->cbName, NULL)
-                    && !RTStrSimplePatternMultiMatch(pSettingsStack->Base.pszFilterOutDirs, RTSTR_MAX,
-                                                     pszBuf, cchSubDir, NULL)
+                   )
+               )
+            {
-                rc = scmSettingsStackPushDir(&pSettingsStack, pszBuf);
-                if (RT_SUCCESS(rc))
+                {
-                    rc = scmProcessDirTreeRecursion(pszBuf, cchSubDir, pEntry, pSettingsStack, iRecursion + 1);
-                    scmSettingsStackPopAndDestroy(&pSettingsStack);
+                }
+            }
+        }
-        if (RT_FAILURE(rc))
-            break;
+    }
-    RTDirClose(pDir);
-    return rc;
+}
-/**
- * Process a directory tree.
+ *
- * @returns IPRT status code.
- * @param   pszDir              The directory to start with.  This is pointer to
- *                              a RTPATH_MAX sized buffer.
- */
-static int scmProcessDirTree(char *pszDir, PSCMSETTINGS pSettingsStack)
+{
-    /*
-     * Setup the recursion.
-     */
-    int rc = RTPathAppend(pszDir, RTPATH_MAX, ".");
-    if (RT_SUCCESS(rc))
+    {
-        RTDIRENTRY Entry;
-        rc = scmProcessDirTreeRecursion(pszDir, strlen(pszDir), &Entry, pSettingsStack, 0);
+    }
-    else
-        RTMsgError("RTPathAppend: %Rrc\n", rc);
-    return rc;
+}
-/**
- * Processes a file or directory specified as an command line argument.
+ *
- * @returns IPRT status code
- * @param   pszSomething        What we found in the command line arguments.
- * @param   pSettingsStack      The settings stack (pointer to the top element).
- */
-static int scmProcessSomething(const char *pszSomething, PSCMSETTINGS pSettingsStack)
+{
-    char szBuf[RTPATH_MAX];
-    int rc = RTPathAbs(pszSomething, szBuf, sizeof(szBuf));
-    if (RT_SUCCESS(rc))
+    {
-        RTPathChangeToUnixSlashes(szBuf, false /*fForce*/);
-        PSCMSETTINGS pSettings;
-        rc = scmSettingsCreateForPath(&pSettings, &pSettingsStack->Base, szBuf);
-        if (RT_SUCCESS(rc))
+        {
-            scmSettingsStackPush(&pSettingsStack, pSettings);
-            if (RTFileExists(szBuf))
+            {
-                const char *pszBasename = RTPathFilename(szBuf);
-                if (pszBasename)
+                {
-                    size_t cchBasename = strlen(pszBasename);
-                    rc = scmProcessFile(szBuf, pszBasename, cchBasename, pSettingsStack);
+                }
-                else
+                {
-                    RTMsgError("RTPathFilename: NULL\n");
-                    rc = VERR_IS_A_DIRECTORY;
+                }
+            }
-            else
-                rc = scmProcessDirTree(szBuf, pSettingsStack);
-            PSCMSETTINGS pPopped = scmSettingsStackPop(&pSettingsStack);
-            Assert(pPopped == pSettings);
-            scmSettingsDestroy(pSettings);
+        }
-        else
-            RTMsgError("scmSettingsInitStack: %Rrc\n", rc);
+    }
-    else
-        RTMsgError("RTPathAbs: %Rrc\n", rc);
-    return rc;
+}
-int main(int argc, char **argv)
+{
-    int rc = RTR3InitExe(argc, &argv, 0);
-    if (RT_FAILURE(rc))
-        return 1;
-    /*
-     * Init the settings.
-     */
-    PSCMSETTINGS pSettings;
-    rc = scmSettingsCreate(&pSettings, &g_Defaults);
-    if (RT_FAILURE(rc))
+    {
-        RTMsgError("scmSettingsCreate: %Rrc\n", rc);
-        return 1;
+    }
-    /*
-     * Parse arguments and process input in order (because this is the only
-     * thing that works at the moment).
-     */
-    static RTGETOPTDEF s_aOpts[14 + RT_ELEMENTS(g_aScmOpts)] =
+    {
-        { "--dry-run",                          'd',                                    RTGETOPT_REQ_NOTHING },
-        { "--real-run",                         'D',                                    RTGETOPT_REQ_NOTHING },
-        { "--file-filter",                      'f',                                    RTGETOPT_REQ_STRING  },
-        { "--quiet",                            'q',                                    RTGETOPT_REQ_NOTHING },
-        { "--verbose",                          'v',                                    RTGETOPT_REQ_NOTHING },
-        { "--diff-ignore-eol",                  SCMOPT_DIFF_IGNORE_EOL,                 RTGETOPT_REQ_NOTHING },
-        { "--diff-no-ignore-eol",               SCMOPT_DIFF_NO_IGNORE_EOL,              RTGETOPT_REQ_NOTHING },
-        { "--diff-ignore-space",                SCMOPT_DIFF_IGNORE_SPACE,               RTGETOPT_REQ_NOTHING },
-        { "--diff-no-ignore-space",             SCMOPT_DIFF_NO_IGNORE_SPACE,            RTGETOPT_REQ_NOTHING },
-        { "--diff-ignore-leading-space",        SCMOPT_DIFF_IGNORE_LEADING_SPACE,       RTGETOPT_REQ_NOTHING },
-        { "--diff-no-ignore-leading-space",     SCMOPT_DIFF_NO_IGNORE_LEADING_SPACE,    RTGETOPT_REQ_NOTHING },
-        { "--diff-ignore-trailing-space",       SCMOPT_DIFF_IGNORE_TRAILING_SPACE,      RTGETOPT_REQ_NOTHING },
-        { "--diff-no-ignore-trailing-space",    SCMOPT_DIFF_NO_IGNORE_TRAILING_SPACE,   RTGETOPT_REQ_NOTHING },
-        { "--diff-special-chars",               SCMOPT_DIFF_SPECIAL_CHARS,              RTGETOPT_REQ_NOTHING },
-        { "--diff-no-special-chars",            SCMOPT_DIFF_NO_SPECIAL_CHARS,           RTGETOPT_REQ_NOTHING },
-    };
-    memcpy(&s_aOpts[RT_ELEMENTS(s_aOpts) - RT_ELEMENTS(g_aScmOpts)], &g_aScmOpts[0], sizeof(g_aScmOpts));
-    RTGETOPTUNION   ValueUnion;
-    RTGETOPTSTATE   GetOptState;
-    rc = RTGetOptInit(&GetOptState, argc, argv, &s_aOpts[0], RT_ELEMENTS(s_aOpts), 1, RTGETOPTINIT_FLAGS_OPTS_FIRST);
-    AssertReleaseRCReturn(rc, 1);
-    size_t          cProcessed = 0;
-    while ((rc = RTGetOpt(&GetOptState, &ValueUnion)) != 0)
+    {
-        switch (rc)
+        {
-            case 'd':
-                g_fDryRun = true;
-                break;
-            case 'D':
-                g_fDryRun = false;
-                break;
-            case 'f':
-                g_pszFileFilter = ValueUnion.psz;
-                break;
-            case 'h':
-                RTPrintf("VirtualBox Source Code Massager\n"
-                         "\n"
-                         "Usage: %s [options] <files & dirs>\n"
-                         "\n"
-                         "Options:\n", g_szProgName);
-                for (size_t i = 0; i < RT_ELEMENTS(s_aOpts); i++)
+                {
-                    bool fAdvanceTwo = false;
-                    if ((s_aOpts[i].fFlags & RTGETOPT_REQ_MASK) == RTGETOPT_REQ_NOTHING)
+                    {
-                        fAdvanceTwo = i + 1 < RT_ELEMENTS(s_aOpts)
-                                   && (   strstr(s_aOpts[i+1].pszLong, "-no-") != NULL
-                                       || strstr(s_aOpts[i+1].pszLong, "-not-") != NULL
-                                       || strstr(s_aOpts[i+1].pszLong, "-dont-") != NULL
-                                      );
-                        if (fAdvanceTwo)
-                            RTPrintf("  %s, %s\n", s_aOpts[i].pszLong, s_aOpts[i + 1].pszLong);
-                        else
-                            RTPrintf("  %s\n", s_aOpts[i].pszLong);
+                    }
-                    else if ((s_aOpts[i].fFlags & RTGETOPT_REQ_MASK) == RTGETOPT_REQ_STRING)
-                        RTPrintf("  %s string\n", s_aOpts[i].pszLong);
-                    else
-                        RTPrintf("  %s value\n", s_aOpts[i].pszLong);
-                    switch (s_aOpts[i].iShort)
+                    {
-                        case SCMOPT_CONVERT_EOL:            RTPrintf("      Default: %RTbool\n", g_Defaults.fConvertEol); break;
-                        case SCMOPT_CONVERT_TABS:           RTPrintf("      Default: %RTbool\n", g_Defaults.fConvertTabs); break;
-                        case SCMOPT_FORCE_FINAL_EOL:        RTPrintf("      Default: %RTbool\n", g_Defaults.fForceFinalEol); break;
-                        case SCMOPT_FORCE_TRAILING_LINE:    RTPrintf("      Default: %RTbool\n", g_Defaults.fForceTrailingLine); break;
-                        case SCMOPT_STRIP_TRAILING_BLANKS:  RTPrintf("      Default: %RTbool\n", g_Defaults.fStripTrailingBlanks); break;
-                        case SCMOPT_STRIP_TRAILING_LINES:   RTPrintf("      Default: %RTbool\n", g_Defaults.fStripTrailingLines); break;
-                        case SCMOPT_ONLY_SVN_DIRS:          RTPrintf("      Default: %RTbool\n", g_Defaults.fOnlySvnDirs); break;
-                        case SCMOPT_ONLY_SVN_FILES:         RTPrintf("      Default: %RTbool\n", g_Defaults.fOnlySvnFiles); break;
-                        case SCMOPT_SET_SVN_EOL:            RTPrintf("      Default: %RTbool\n", g_Defaults.fSetSvnEol); break;
-                        case SCMOPT_SET_SVN_EXECUTABLE:     RTPrintf("      Default: %RTbool\n", g_Defaults.fSetSvnExecutable); break;
-                        case SCMOPT_SET_SVN_KEYWORDS:       RTPrintf("      Default: %RTbool\n", g_Defaults.fSetSvnKeywords); break;
-                        case SCMOPT_TAB_SIZE:               RTPrintf("      Default: %u\n", g_Defaults.cchTab); break;
-                        case SCMOPT_FILTER_OUT_DIRS:        RTPrintf("      Default: %s\n", g_Defaults.pszFilterOutDirs); break;
-                        case SCMOPT_FILTER_FILES:           RTPrintf("      Default: %s\n", g_Defaults.pszFilterFiles); break;
-                        case SCMOPT_FILTER_OUT_FILES:       RTPrintf("      Default: %s\n", g_Defaults.pszFilterOutFiles); break;
+                    }
-                    i += fAdvanceTwo;
+                }
-                return 1;
-            case 'q':
-                g_iVerbosity = 0;
-                break;
-            case 'v':
-                g_iVerbosity++;
-                break;
-            case 'V':
+            {
-                /* The following is assuming that svn does it's job here. */
-                static const char s_szRev[] = "$Revision$";
-                const char *psz = RTStrStripL(strchr(s_szRev, ' '));
-                RTPrintf("r%.*s\n", strchr(psz, ' ') - psz, psz);
-                return 0;
+            }
-            case SCMOPT_DIFF_IGNORE_EOL:
-                g_fDiffIgnoreEol = true;
-                break;
-            case SCMOPT_DIFF_NO_IGNORE_EOL:
-                g_fDiffIgnoreEol = false;
-                break;
-            case SCMOPT_DIFF_IGNORE_SPACE:
-                g_fDiffIgnoreTrailingWS = g_fDiffIgnoreLeadingWS = true;
-                break;
-            case SCMOPT_DIFF_NO_IGNORE_SPACE:
-                g_fDiffIgnoreTrailingWS = g_fDiffIgnoreLeadingWS = false;
-                break;
-            case SCMOPT_DIFF_IGNORE_LEADING_SPACE:
-                g_fDiffIgnoreLeadingWS = true;
-                break;
-            case SCMOPT_DIFF_NO_IGNORE_LEADING_SPACE:
-                g_fDiffIgnoreLeadingWS = false;
-                break;
-            case SCMOPT_DIFF_IGNORE_TRAILING_SPACE:
-                g_fDiffIgnoreTrailingWS = true;
-                break;
-            case SCMOPT_DIFF_NO_IGNORE_TRAILING_SPACE:
-                g_fDiffIgnoreTrailingWS = false;
-                break;
-            case SCMOPT_DIFF_SPECIAL_CHARS:
-                g_fDiffSpecialChars = true;
-                break;
-            case SCMOPT_DIFF_NO_SPECIAL_CHARS:
-                g_fDiffSpecialChars = false;
-                break;
-            case VINF_GETOPT_NOT_OPTION:
+            {
-                if (!g_fDryRun)
+                {
-                    if (!cProcessed)
+                    {
-                        RTPrintf("%s: Warning! This program will make changes to your source files and\n"
-                                 "%s:          there is a slight risk that bugs or a full disk may cause\n"
-                                 "%s:          LOSS OF DATA.   So, please make sure you have checked in\n"
-                                 "%s:          all your changes already.  If you didn't, then don't blame\n"
-                                 "%s:          anyone for not warning you!\n"
-                                 "%s:\n"
-                                 "%s:          Press any key to continue...\n",
-                                 g_szProgName, g_szProgName, g_szProgName, g_szProgName, g_szProgName,
-                                 g_szProgName, g_szProgName);
-                        RTStrmGetCh(g_pStdIn);
+                    }
-                    cProcessed++;
+                }
-                rc = scmProcessSomething(ValueUnion.psz, pSettings);
-                if (RT_FAILURE(rc))
-                    return rc;
-                break;
+            }
-            default:
+            {
-                int rc2 = scmSettingsBaseHandleOpt(&pSettings->Base, rc, &ValueUnion);
-                if (RT_SUCCESS(rc2))
-                    break;
-                if (rc2 != VERR_GETOPT_UNKNOWN_OPTION)
-                    return 2;
-                return RTGetOptPrintError(rc, &ValueUnion);
+            }
+        }
+    }
-    scmSettingsDestroy(pSettings);
-    return 0;
+}

trunk/src/bldprogs/scmstream.cpp

-              r40528
+              r40530
 #include <iprt/assert.h>
 #include <iprt/ctype.h>
-//#include <iprt/dir.h>
-//#include <iprt/env.h>
 #include <iprt/file.h>
 #include <iprt/err.h>
-//#include <iprt/getopt.h>
-//#include <iprt/initterm.h>
 #include <iprt/mem.h>
-//#include <iprt/message.h>
-//#include <iprt/param.h>
-//#include <iprt/path.h>
-//#include <iprt/process.h>
-//#include <iprt/stream.h>
 #include <iprt/string.h>

Note: See TracChangeset for help on using the changeset viewer.