From 4eac48d4a965a0573a620c92cf12c405e3fba1c0 Mon Sep 17 00:00:00 2001
From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 24 Nov 2015 18:27:40 -0500
Subject: [PATCH] fixed issue with new parameter skipping in splitter.

---
 nucleus/applications/utilities/splitter.cpp | 13 +++++++++----
 scripts/rev_control/version_control.sh      |  7 +++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/nucleus/applications/utilities/splitter.cpp b/nucleus/applications/utilities/splitter.cpp
index 7eac606f..ca5b3a67 100644
--- a/nucleus/applications/utilities/splitter.cpp
+++ b/nucleus/applications/utilities/splitter.cpp
@@ -77,14 +77,14 @@ int splitter_app::execute()
   // retrieve any specific flags first.
   astring temp;
   int min_col = 0;
-  int min_indy = 0;
+  int min_indy = -1;
 //hmmm: this whole thing is annoying.  we need a better way to have a list of parms.
   if (cmds.find("mincol", min_indy)) {
     cmds.get_value("mincol", temp);
     min_col = temp.convert(min_col);
   }
   int max_col = 78;
-  int max_indy = 0;
+  int max_indy = -1;
   if (cmds.find("maxcol", max_indy)) {
     cmds.get_value("maxcol", temp);
     max_col = temp.convert(max_col);
@@ -100,8 +100,13 @@ int splitter_app::execute()
     return 0;
   }
 
-  int skip_index = basis::maximum(min_indy, max_indy);
-  skip_index += 2;
+  // see if we found any flags that would make us skip some of the parameters.
+//hmmm: automate this!
+  int skip_index = 0;
+  if ( (min_indy >= 0) || (max_indy >= 0) ) {
+    skip_index = basis::maximum(min_indy, max_indy);
+    skip_index += 2;
+  }
 //printf("got a skip index of %d\n", skip_index);
 
   // gather extra input files.
diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index f76f3301..a38d22a8 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -3,6 +3,9 @@
 # these are helper functions for doing localized revision control.
 # this script should be sourced into other scripts that use it.
 
+# the maximum depth that the recursive functions will try to go below the starting directory.
+export MAX_DEPTH=5
+
 #hmmm: re-address this code, since it doesn't make a lot of sense to me right now...
 # one unpleasantry to take care of first; cygwin barfs aggressively if the TMP directory
 # is a DOS path, but we need it to be a DOS path for our GFFS testing, so that blows.
@@ -259,8 +262,8 @@ function generate_rev_ctrl_filelist()
   local dirhere="$( \cd "$(\dirname "$dir")" && /bin/pwd )"
   local tempfile=$(mktemp /tmp/zz_rev_checkin.XXXXXX)
   echo >$tempfile
-  find $dirhere -follow -maxdepth 5 -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
-  find $dirhere -follow -maxdepth 5 -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
+  find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".svn" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
+  find $dirhere -follow -maxdepth $MAX_DEPTH -type d -iname ".git" -exec echo {}/.. ';' >>$tempfile 2>/dev/null
   # CVS is not well behaved like git and (now) svn, and we seldom use it anymore.
   popd &>/dev/null
   local sortfile=$(mktemp /tmp/zz_rev_checkin_sort.XXXXXX)
-- 
2.34.1