Line separator as first char for helpformatter footer and header no longer throws exception

BR: 21215


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk@130113 13f79535-47bb-0310-9956-ffa450edef68

Author: Robert James Oxspring

src/java/org/apache/commons/cli/HelpFormatter.java

@@ -797,7 +797,7 @@ protected int findWrapPos(String text, int width, int startPos)
         if (((pos = text.indexOf('\n', startPos)) != -1 && pos <= width)
             || ((pos = text.indexOf('\t', startPos)) != -1 && pos <= width))
         {
-            return pos;
+            return pos+1;
         }
         else if ((startPos + width) >= text.length())
         {
@@ -872,7 +872,7 @@ protected String rtrim(String s)
 
         int pos = s.length();
 
-        while ((pos >= 0) && Character.isWhitespace(s.charAt(pos - 1)))
+        while ((pos > 0) && Character.isWhitespace(s.charAt(pos - 1)))
         {
             --pos;
         }

src/test/org/apache/commons/cli/BugsTest.java

@@ -497,5 +497,22 @@ public void test31148() throws ParseException {
         assertTrue(cl.hasOption('o'));
         assertEquals("ovalue",cl.getOptionValue('o'));
     }
+    
+    public void test21215() {
+        Options options = new Options();
+        HelpFormatter formatter = new HelpFormatter();
+        String SEP = System.getProperty("line.separator");
+        String header = SEP+"Header";
+        String footer = "Footer";
+        StringWriter out = new StringWriter();
+        formatter.printHelp(new PrintWriter(out),80, "foobar", header, options, 2, 2, footer, true);
+        assertEquals(
+                "usage: foobar"+SEP+
+                ""+SEP+
+                "Header"+SEP+
+                ""+SEP+
+                "Footer"+SEP
+                ,out.toString());
+    }
 
 }