add line ending support

Author: xipki

app-package/src/main/java/org/xipki/apppackage/LineEncodingConverter.java

@@ -0,0 +1,71 @@
+package org.xipki.apppackage;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.Writer;
+import java.nio.file.Path;
+
+public class LineEncodingConverter
+{
+
+  private final PackageConf conf;
+
+  public LineEncodingConverter(File confFile) {
+    try {
+      conf = new PackageConf(confFile);
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public static void main(String[] args) {
+    try {
+      if (args == null || args.length != 2) {
+        System.out.println("Usage: java " + LineEncodingConverter.class.getName() +
+            " <conf-file> <dir>");
+        System.exit(1);
+      }
+
+      File confFile = new File(args[0]);
+      File dir = new File(args[1]);
+      new LineEncodingConverter(confFile).convertLineEncodingInDir(dir, dir.toPath());
+    } catch (Exception e) {
+      //e.printStackTrace();
+    }
+  }
+
+  private void convertLineEncodingInDir(File dir, Path baseDir) throws Exception
+  {
+    if (!(dir.exists() && dir.isDirectory())) {
+      throw new IllegalArgumentException("dir does not exist");
+    }
+
+    File[] subDirsOrFiles = dir.listFiles();
+    for (File subDirOrFile : subDirsOrFiles) {
+      if (subDirOrFile.isDirectory()) {
+        convertLineEncodingInDir(subDirOrFile, baseDir);
+      } else if (subDirOrFile.isFile()) {
+        boolean isDosLineEncoding  = conf.isDosLineEncoding(baseDir, subDirOrFile.toPath());
+        boolean isUnixLineEncoding = conf.isUnixLineEncoding(baseDir, subDirOrFile.toPath());
+        if (isDosLineEncoding || isUnixLineEncoding) {
+          String lineEncoding = isDosLineEncoding ? "\r\n" : "\n";
+          StringBuilder sb = new StringBuilder();
+          try (BufferedReader r = new BufferedReader(new FileReader(subDirOrFile))) {
+            String line;
+            while ((line = r.readLine()) != null) {
+              sb.append(line);
+              sb.append(lineEncoding);
+            }
+          }
+
+          try (Writer w = new FileWriter(subDirOrFile)) {
+            w.write(sb.toString());
+          }
+        }
+      }
+    }
+  }
+
+}

app-package/src/main/java/org/xipki/apppackage/MyUtil.java

@@ -141,7 +141,6 @@ public static byte[] readByteString(CborDecoder decoder) throws IOException {
     }
   }
 
-
   public static List<String> readTextList(CborDecoder decoder) throws IOException {
     if (MyUtil.isNull(decoder)) {
       decoder.readNull();

app-package/src/main/java/org/xipki/apppackage/PackageConf.java

@@ -21,6 +21,10 @@ enum SuffixMode {
 
   private Map<String, Integer> posixPermissions;
 
+  private final Set<String> dosLineEncodings;
+
+  private final Set<String> unixLineEncodings;
+
   public PackageConf(File confFile) throws IOException  {
     Properties props = new Properties();
     try (Reader reader = new FileReader(confFile)) {
@@ -54,6 +58,24 @@ public PackageConf(File confFile) throws IOException  {
         this.posixPermissions.put(MyUtil.toUnixPath(tokens[0]), Integer.parseInt(tokens[1]));
       }
     }
+
+    value = props.getProperty("lineEnding.dos");
+    this.dosLineEncodings = new HashSet<>();
+    if (value != null) {
+      Set<String> _files = splitStr(value);
+      for (String m : _files) {
+        this.dosLineEncodings.add(m.toLowerCase());
+      }
+    }
+
+    value = props.getProperty("lineEnding.unix");
+    this.unixLineEncodings = new HashSet<>();
+    if (value != null) {
+      Set<String> _files = splitStr(value);
+      for (String m : _files) {
+        this.unixLineEncodings.add(m.toLowerCase());
+      }
+    }
   }
 
   public String getSuffix(Path path) {
@@ -82,6 +104,20 @@ public Integer posixPermission(Path baseDir, Path filePath) {
     return str == null ? null : posixPermissions.get(str);
   }
 
+  public boolean isDosLineEncoding(Path baseDir, Path filePath)
+  {
+    String extension = getExtension(filePath.getFileName().toString());
+    String path = getMatchElement(baseDir, filePath, extension, dosLineEncodings);
+    return path != null;
+  }
+
+  public boolean isUnixLineEncoding(Path baseDir, Path filePath)
+  {
+    String extension = getExtension(filePath.getFileName().toString());
+    String path = getMatchElement(baseDir, filePath, extension, unixLineEncodings);
+    return path != null;
+  }
+
   private static String getMatchElement(Path baseDir, Path filePath, String extension, Collection<String> coll) {
     String canonicalPath = MyUtil.toUnixPath(baseDir, filePath);
     // full pah mach

app-package/src/main/java/org/xipki/apppackage/cbor/CborConstants.java

@@ -1,6 +1,6 @@
 /*
  * JACOB - CBOR implementation in Java.
- * 
+ *
  * (C) Copyright - 2013 - J.W. Janssen <[email protected]>
  *
  * Licensed under Apache License v2.0.
@@ -27,7 +27,7 @@ public interface CborConstants {
     int TYPE_TAG = 0x06;
     /** Major type 7: floating point, simple data types. */
     int TYPE_FLOAT_SIMPLE = 0x07;
-    
+
     /** Denotes a one-byte value (uint8). */
     int ONE_BYTE = 0x18;
     /** Denotes a two-byte value (uint16). */

app-package/src/main/java/org/xipki/apppackage/cbor/CborDecoder.java

@@ -1,6 +1,6 @@
 /*
  * JACOB - CBOR implementation in Java.
- * 
+ *
  * (C) Copyright - 2013 - J.W. Janssen <[email protected]>
  */
 package org.xipki.apppackage.cbor;
@@ -18,7 +18,7 @@ public class CborDecoder {
 
     /**
      * Creates a new {@link CborDecoder} instance.
-     * 
+     *
      * @param is the actual input stream to read the CBOR-encoded data from, cannot be <code>null</code>.
      */
     public CborDecoder(InputStream is) {
@@ -34,7 +34,7 @@ private static void fail(String msg, Object... args) throws IOException {
 
     /**
      * Peeks in the input stream for the upcoming type.
-     * 
+     *
      * @return the upcoming type in the stream, or <code>null</code> in case of an end-of-stream.
      * @throws IOException in case of I/O problems reading the CBOR-type from the underlying input stream.
      */
@@ -50,7 +50,7 @@ public CborType peekType() throws IOException {
 
     /**
      * Prolog to reading an array value in CBOR format.
-     * 
+     *
      * @return the number of elements in the array to read, or -1 in case of infinite-length arrays.
      * @throws IOException in case of I/O problems reading the CBOR-encoded value from the underlying input stream.
      */
@@ -60,7 +60,7 @@ public long readArrayLength() throws IOException {
 
     /**
      * Reads a boolean value in CBOR format.
-     * 
+     *
      * @return the read boolean.
      * @throws IOException in case of I/O problems reading the CBOR-encoded value from the underlying input stream.
      */
@@ -75,7 +75,8 @@ public boolean readBoolean() throws IOException {
     /**
      * Reads a byte string value in CBOR format.
      *
-     * @return the read byte string, never <code>null</code>. In case the encoded string has a length of 0, an empty string is returned.
+     * @return the read byte string, never <code>null</code>. In case the encoded string has a length of 0, an
+     *         empty string is returned.
      * @throws IOException in case of I/O problems reading the CBOR-encoded value from the underlying input stream.
      */
     public byte[] readByteString() throws IOException {
@@ -91,7 +92,7 @@ public byte[] readByteString() throws IOException {
 
     /**
      * Reads a signed or unsigned integer value in CBOR format.
-     * 
+     *
      * @return the read integer value, values from {@link Long#MIN_VALUE} to {@link Long#MAX_VALUE} are supported.
      * @throws IOException in case of I/O problems reading the CBOR-encoded value from the underlying input stream.
      */
@@ -106,7 +107,7 @@ public long readInt() throws IOException {
 
     /**
      * Reads a <code>null</code>-value in CBOR format.
-     * 
+     *
      * @return always <code>null</code>.
      * @throws IOException in case of I/O problems reading the CBOR-encoded value from the underlying input stream.
      */
@@ -117,8 +118,9 @@ public Object readNull() throws IOException {
 
     /**
      * Reads an UTF-8 encoded string value in CBOR format.
-     * 
-     * @return the read UTF-8 encoded string, never <code>null</code>. In case the encoded string has a length of 0, an empty string is returned.
+     *
+     * @return the read UTF-8 encoded string, never <code>null</code>. In case the encoded string has a length of
+     *         0, an empty string is returned.
      * @throws IOException in case of I/O problems reading the CBOR-encoded value from the underlying input stream.
      */
     public String readTextString() throws IOException {
@@ -133,24 +135,27 @@ public String readTextString() throws IOException {
     }
 
     /**
-     * Reads the next major type from the underlying input stream, and verifies whether it matches the given expectation.
-     * 
+     * Reads the next major type from the underlying input stream, and verifies whether it matches the given
+     * expectation.
+     *
      * @param ib the expected major type, cannot be <code>null</code> (unchecked).
      * @return either -1 if the major type was an signed integer, or 0 otherwise.
      * @throws IOException in case of I/O problems reading the CBOR-encoded value from the underlying input stream.
      */
     protected long expectIntegerType(int ib) throws IOException {
         int majorType = ((ib & 0xFF) >>> 5);
         if ((majorType != CborConstants.TYPE_UNSIGNED_INTEGER) && (majorType != CborConstants.TYPE_NEGATIVE_INTEGER)) {
-            fail("Unexpected type: %s, expected type %s or %s!", CborType.getName(majorType), CborType.getName(CborConstants.TYPE_UNSIGNED_INTEGER),
+            fail("Unexpected type: %s, expected type %s or %s!", CborType.getName(majorType),
+                CborType.getName(CborConstants.TYPE_UNSIGNED_INTEGER),
                 CborType.getName(CborConstants.TYPE_NEGATIVE_INTEGER));
         }
         return -majorType;
     }
 
     /**
-     * Reads the next major type from the underlying input stream, and verifies whether it matches the given expectation.
-     * 
+     * Reads the next major type from the underlying input stream, and verifies whether it matches the given
+     * expectation.
+     *
      * @param majorType the expected major type, cannot be <code>null</code> (unchecked).
      * @return the read subtype, or payload, of the read major type.
      * @throws IOException in case of I/O problems reading the CBOR-encoded value from the underlying input stream.
@@ -164,8 +169,9 @@ protected int readMajorType(int majorType) throws IOException {
     }
 
     /**
-     * Reads the next major type from the underlying input stream, and verifies whether it matches the given expectations.
-     * 
+     * Reads the next major type from the underlying input stream, and verifies whether it matches the given
+     * expectations.
+     *
      * @param majorType the expected major type, cannot be <code>null</code> (unchecked);
      * @param subtype the expected subtype.
      * @throws IOException in case of I/O problems reading the CBOR-encoded value from the underlying input stream.
@@ -178,8 +184,9 @@ protected void readMajorTypeExact(int majorType, int subtype) throws IOException
     }
 
     /**
-     * Reads the next major type from the underlying input stream, verifies whether it matches the given expectation, and decodes the payload into a size.
-     * 
+     * Reads the next major type from the underlying input stream, verifies whether it matches the given
+     * expectation, and decodes the payload into a size.
+     *
      * @param majorType the expected major type, cannot be <code>null</code> (unchecked).
      * @return the number of succeeding bytes, &gt;= 0, or -1 if an infinite-length type is read.
      * @throws IOException in case of I/O problems reading the CBOR-encoded value from the underlying input stream.
@@ -190,7 +197,7 @@ protected long readMajorTypeWithSize(int majorType) throws IOException {
 
     /**
      * Reads an unsigned integer with a given length-indicator.
-     * 
+     *
      * @param length the length indicator to use;
      * @param breakAllowed whether break is allowed.
      * @return the read unsigned integer, as long value.
@@ -219,7 +226,7 @@ protected long readUInt(int length, boolean breakAllowed) throws IOException {
 
     /**
      * Reads an unsigned 16-bit integer value
-     * 
+     *
      * @return value the read value, values from {@link Long#MIN_VALUE} to {@link Long#MAX_VALUE} are supported.
      * @throws IOException in case of I/O problems writing the CBOR-encoded value to the underlying output stream.
      */
@@ -230,7 +237,7 @@ protected int readUInt16() throws IOException {
 
     /**
      * Reads an unsigned 32-bit integer value
-     * 
+     *
      * @return value the read value, values from {@link Long#MIN_VALUE} to {@link Long#MAX_VALUE} are supported.
      * @throws IOException in case of I/O problems writing the CBOR-encoded value to the underlying output stream.
      */
@@ -241,7 +248,7 @@ protected long readUInt32() throws IOException {
 
     /**
      * Reads an unsigned 64-bit integer value
-     * 
+     *
      * @return value the read value, values from {@link Long#MIN_VALUE} to {@link Long#MAX_VALUE} are supported.
      * @throws IOException in case of I/O problems writing the CBOR-encoded value to the underlying output stream.
      */
@@ -253,7 +260,7 @@ protected long readUInt64() throws IOException {
 
     /**
      * Reads an unsigned 8-bit integer value
-     * 
+     *
      * @return value the read value, values from {@link Long#MIN_VALUE} to {@link Long#MAX_VALUE} are supported.
      * @throws IOException in case of I/O problems writing the CBOR-encoded value to the underlying output stream.
      */