names;
private String[] vals; // contains null or value of attribute at the same index
private byte[] magic;
private byte[] mask;
-
+ /** Used to search in the file for given pattern in given range. If there is an inner
+ * pattern element, it is used only if outer is fulfilled. Searching starts
+ * always from the beginning of the file. For example:
+ *
+ * Pattern <?php in first 255 bytes
+ *
+ * <pattern value="<?php" range="255"/>
+ *
+ *
+ *
+ * Pattern <HTML>> or <html> in first 255 bytes and pattern <?php in first 4000 bytes.
+ *
+ * <pattern value="<HTML>" range="255" ignorecase="true">
+ * <pattern value="<?php" range="4000"/>
+ * </pattern>
+ *
+ *
+ */
+ private class FilePattern {
+ // case sensitive by default
+ private static final boolean DEFAULT_IGNORE_CASE = false;
+ private final String value;
+ private final int range;
+ private final boolean ignoreCase;
+ private FilePattern inner;
+ private int pointer = 0;
+ private final byte[] bytes;
+ private final int valueLength;
+
+ public FilePattern(String value, int range, boolean ignoreCase) {
+ this.value = value;
+ this.valueLength = value.length();
+ if (ignoreCase) {
+ this.bytes = value.toLowerCase().getBytes();
+ } else {
+ this.bytes = value.getBytes();
+ }
+ this.range = range;
+ this.ignoreCase = ignoreCase;
+ }
+
+ public void setInner(FilePattern inner) {
+ this.inner = inner;
+ }
+
+ private boolean match(byte b) {
+ if (pointer < valueLength) {
+ if (b == bytes[pointer]) {
+ pointer++;
+ } else {
+ pointer = 0;
+ return false;
+ }
+ }
+ return pointer >= valueLength;
+ }
+
+ /** Read from given file and compare byte-by-byte if pattern
+ * appers in given range.
+ */
+ public boolean match(FileObject fo) throws IOException {
+ pointer = 0;
+ InputStream is = null;
+ boolean matched = false;
+ try {
+ is = fo.getInputStream(); // it is CachedInputStream, so you can call getInputStream and read more times without performance penalty
+ byte[] byteRange = new byte[range];
+ int read = is.read(byteRange);
+ for (int i = 0; i < read; i++) {
+ byte b = byteRange[i];
+ if (ignoreCase) {
+ b = (byte) Character.toLowerCase(b);
+ }
+ if (match(b)) {
+ matched = true;
+ break;
+ }
+ }
+ } finally {
+ try {
+ if (is != null) {
+ is.close();
+ }
+ } catch (IOException ioe) {
+ // already closed
+ }
+ }
+ if (matched) {
+ if (inner == null) {
+ return true;
+ } else {
+ return inner.match(fo);
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return "[" + value + ", " + range + ", " + ignoreCase + (inner != null ? ", " + inner : "") + "]";
+ }
+ }
+
+ /** Used to compare filename with given name.
+ * For example:
+ *
+ * Filename matches makefile, Makefile, MaKeFiLe, mymakefile, gnumakefile, makefile1, ....
+ *
+ * <name name="makefile" substring="true"/>
+ *
+ *
+ *
+ * Filename exactly matches rakefile or Rakefile.
+ *
+ * <name name="rakefile" ignorecase="false"/>
+ * <name name="Rakefile" ignorecase="false"/>
+ *
+ *
+ */
+ private class FileName {
+
+ // case insensitive by default
+ private static final boolean DEFAULT_IGNORE_CASE = true;
+ private static final boolean DEFAULT_SUBSTRING = false;
+ private final String name;
+ private final boolean substring;
+ private final boolean ignoreCase;
+
+ public FileName(String name, boolean substring, boolean ignoreCase) {
+ if (ignoreCase) {
+ this.name = name.toLowerCase();
+ } else {
+ this.name = name;
+ }
+ this.substring = substring;
+ this.ignoreCase = ignoreCase;
+ }
+
+ public boolean match(FileObject fo) {
+ String nameAndExt = fo.getNameExt();
+ if (ignoreCase) {
+ nameAndExt = nameAndExt.toLowerCase();
+ }
+ if (substring) {
+ return nameAndExt.indexOf(name) != -1;
+ } else {
+ return nameAndExt.equals(name);
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "[" + name + ", " + substring + ", " + ignoreCase + "]";
+ }
+ }
+
/**
* For debug purposes only.
*/
+ @Override
public String toString() {
int i = 0;
StringBuffer buf = new StringBuffer();
@@ -529,6 +754,20 @@
buf.append("file-attributes:");
for (i = 0; i();
+ }
+ lastAddedPattern = new FilePattern(value, range, ignoreCase);
+ patterns.add(lastAddedPattern);
+ }
+
+ private void addInnerPattern(String value, int range, boolean ignoreCase) {
+ FilePattern inner = new FilePattern(value, range, ignoreCase);
+ lastAddedPattern.setInner(inner);
+ lastAddedPattern = inner;
+ }
+
+ private void addName(String name, boolean substring, boolean ignoreCase) {
+ if (names == null) {
+ names = new ArrayList();
+ }
+ names.add(new FileName(name, substring, ignoreCase));
+ }
+
private boolean setMagic(byte[] magic, byte[] mask) {
if (magic == null) return true;
if (mask != null && magic.length != mask.length) return false;
@@ -574,11 +834,26 @@
private static String getMIMEType(String extension) {
return FileUtil.getMIMEType(extension);
}
+
+ /** #26521, 114976 - ignore not readable and windows' locked files. */
+ private static void handleIOException(FileObject fo, IOException ioe) throws IOException {
+ if (fo.canRead()) {
+ if (!Utilities.isWindows() || !(ioe instanceof FileNotFoundException) || !fo.isValid() || fo.getName().toLowerCase().indexOf("ntuser") == -1) {//NOI18N
+ throw ioe;
+ }
+ }
+ }
+
private boolean accept(FileObject fo) throws IOException {
// check for resource extension
if (exts != null) {
- if (fo.getExt() == null) return false;
- if (!Util.contains(exts, fo.getExt(), CASE_INSENSITIVE)) return false;
+ String ext = fo.getExt();
+ if (ext == null) {
+ ext = EMPTY_EXTENSION;
+ }
+ if (!Util.contains(exts, ext, CASE_INSENSITIVE)) {
+ return false;
+ }
}
// check for resource mime type
@@ -613,63 +888,36 @@
if (magic != null) {
byte[] header = new byte[magic.length];
-// System.err.println("FO" + fo);
-
-// String m = mask == null ? "" : " mask " + XMLUtil.toHex(mask, 0, mask.length);
-// System.err.println("Magic test " + XMLUtil.toHex(magic, 0, magic.length) + m);
-
// fetch header
InputStream in = null;
- boolean unexpectedEnd = false;
try {
in = fo.getInputStream();
- for (int i = 0; i escape loop, otherwise continue
+ matched = true;
+ break;
+ }
+ }
+ if (!matched) {
+ return false;
+ }
+ } catch (IOException ioe) {
+ handleIOException(fo, ioe);
+ return false;
+ }
+ }
+
+ // check file name
+ if (names != null) {
+ boolean matched = false;
+ for (FileName name : names) {
+ if(name.match(fo)) {
+ // at least one matched => escape loop, otherwise continue
+ matched = true;
+ break;
+ }
+ }
+ if (!matched) {
+ return false;
+ }
+ }
+
// all templates matched
return true;
}
-
}
}
diff --git a/openide.filesystems/src/org/netbeans/modules/openide/filesystems/declmime/resolver.dtd b/openide.filesystems/src/org/netbeans/modules/openide/filesystems/declmime/resolver.dtd
--- a/openide.filesystems/src/org/netbeans/modules/openide/filesystems/declmime/resolver.dtd
+++ b/openide.filesystems/src/org/netbeans/modules/openide/filesystems/declmime/resolver.dtd
@@ -27,7 +27,7 @@
Contributor(s):
The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
Microsystems, Inc. All Rights Reserved.
If you wish your version of this file to be governed by only the CDDL
@@ -85,10 +85,11 @@
so there is a danger of recursion if these call this.getMIMEType().
-->
-
+
@@ -123,6 +124,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
+
+
+
+
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ]]>
+
diff --git a/openide.filesystems/test/unit/src/org/netbeans/modules/openide/filesystems/declmime/data-fs.xml b/openide.filesystems/test/unit/src/org/netbeans/modules/openide/filesystems/declmime/data-fs.xml
--- a/openide.filesystems/test/unit/src/org/netbeans/modules/openide/filesystems/declmime/data-fs.xml
+++ b/openide.filesystems/test/unit/src/org/netbeans/modules/openide/filesystems/declmime/data-fs.xml
@@ -37,5 +37,44 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
]]>
+
+
+
+
+
+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+