/*
 * Java Hexdump Library
 *
 * Copyright (c) Matthew Johnson 2005
 *
 * This program is free software; you can redistribute it and/or 
 * modify it under the terms of the GNU Lesser General Public License 
 * as published by the Free Software Foundation, version 2 only.
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Lesser General Public License for more details. 
 * You should have received a copy of the GNU Lesser General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 *
 * To Contact the author, please email src@matthew.ath.cx
 *
 */

package cx.ath.matthew.utils;

import java.io.PrintStream;

public class Hexdump
{
   public static final char[] hexchars = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
   public static String toHex(byte[] buf)
   {
      return toHex(buf, 0, buf.length);
   }
   public static String toHex(byte[] buf, int ofs, int len)
   {
      StringBuffer sb = new StringBuffer();
      int j = ofs+len;
      for (int i = ofs; i < j; i++) {
         if (i < buf.length) {
            sb.append(hexchars[(buf[i] & 0xF0) >> 4]);
            sb.append(hexchars[buf[i] & 0x0F]);
            sb.append(' ');
         } else {
            sb.append(' ');
            sb.append(' ');
            sb.append(' ');
         }
      }
      return sb.toString();
   }
   
   public static String toAscii(byte[] buf)
   {
      return toAscii(buf, 0, buf.length);
   }
   public static String toAscii(byte[] buf, int ofs, int len)
   {
      StringBuffer sb = new StringBuffer();
      int j = ofs+len;
      for (int i = ofs; i < j ; i++) {
         if (i < buf.length) {
            if (20 <= buf[i] && 126 >= buf[i])
               sb.append((char) buf[i]);
            else
               sb.append('.');
         } else
            sb.append(' ');
      }
      return sb.toString();
   }
   public static String format(byte[] buf)
   {
      return format(buf, 80);
   }
   public static String format(byte[] buf, int width)
   {
      int bs = (width - 8) / 4;
      int i = 0;
      StringBuffer sb = new StringBuffer();
      do {
         for (int j = 0; j < 6; j++) {
            sb.append(hexchars[(i << (j*4)  & 0xF00000) >> 20]);
         }
         sb.append('\t');
         sb.append(toHex(buf, i, bs));
         sb.append(' ');
         sb.append(toAscii(buf, i, bs));
         sb.append('\n');
         i += bs;
      } while (i < buf.length);
      return sb.toString();
   }
   public static void print(byte[] buf)
   {
      print(buf, System.err);
   }
   public static void print(byte[] buf, int width)
   {
      print(buf, width, System.err);
   }
   public static void print(byte[] buf, int width, PrintStream out)
   {
      out.print(format(buf, width));
   }
   public static void print(byte[] buf, PrintStream out)
   {
      out.print(format(buf));
   }
   /**
    * Returns a string which can be written to a Java source file as part
    * of a static initializer for a byte array. 
    * Returns data in the format 0xAB, 0xCD, ....
    * use like:
    * javafile.print("byte[] data = {")
    * javafile.print(Hexdump.toByteArray(data));
    * javafile.println("};");
    */
   public static String toByteArray(byte[] buf)
   {
      return toByteArray(buf, 0, buf.length);
   }
   /**
    * Returns a string which can be written to a Java source file as part
    * of a static initializer for a byte array. 
    * Returns data in the format 0xAB, 0xCD, ....
    * use like:
    * javafile.print("byte[] data = {")
    * javafile.print(Hexdump.toByteArray(data));
    * javafile.println("};");
    */
   public static String toByteArray(byte[] buf, int ofs, int len)
   {
      StringBuffer sb = new StringBuffer();
      for (int i = ofs; i < len && i < buf.length; i++) {
         sb.append('0');
         sb.append('x');
         sb.append(hexchars[(buf[i] & 0xF0) >> 4]);
         sb.append(hexchars[buf[i] & 0x0F]);
         if ((i+1) < len && (i+1) < buf.length)
            sb.append(',');
      }
      return sb.toString();
   }
}

@@ -67,284 +67,638 @@
 5%0A *
+ 
 %0A * 
-This program is
+Permission is hereby granted,
  free 
-s
 of
-tware; you can redistribute it and/or %0A * modify it under the terms of the GNU Lesser General Public License %0A * as published by the Free Software Foundation, version 2 only.%0A * This program is distributed in the hope that it will be useful,%0A * but
+ charge, to any person obtaining a copy%0A * of this software and associated documentation files (the %22Software%22), to deal%0A * in the Software without restriction, including without limitation the rights%0A * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell%0A * copies of the Software, and to permit persons to whom the Software is%0A * furnished to do so, subject to the following conditions:%0A * %0A * The above copyright notice and this permission notice shall be included in%0A * all copies or substantial portions of the Software.%0A * %0A * THE SOFTWARE IS PROVIDED %22AS IS%22,
  WIT
@@ -706,20 +706,16 @@
 OUT 
-ANY 
 WARRANTY
 ; wi
@@ -714,49 +714,91 @@
 ANTY
-; without even the implied warranty of%0A *
+ OF ANY KIND, EXPRESS OR%0A * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  MER
@@ -809,19 +809,20 @@
 TABILITY
- or
+,%0A *
  FITNESS
@@ -850,298 +850,304 @@
 POSE
-.  See the%0A * GNU Lesser General Public License for more details. %0A * You should have received a copy of the GNU Lesser General Public License%0A * along with this program; if not, write to the Free Software%0A * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ AND NONINFRINGEMENT. IN NO EVENT SHALL THE%0A * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER%0A * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,%0A * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN%0A * THE SOFTWARE
 .%0A *
+ 
 %0A * 

Update libmatthew-utils to 0.8