Menu
▾
▴
jnode-svn-commits
|
From: <ls...@us...> - 2012-09-23 17:54:06
|
Revision: 5932
http://jnode.svn.sourceforge.net/jnode/?rev=5932&view=rev
Author: lsantha
Date: 2012-09-23 17:53:55 +0000 (Sun, 23 Sep 2012)
Log Message:
-----------
Integrating OpenJDK 6 build 26. Classlib updated.
Modified Paths:
--------------
trunk/all/lib/ftp.properties
trunk/core/src/openjdk/vm/java/io/JNodeFileSystem.java
trunk/core/src/openjdk/vm/java/io/NativeUnixFileSystem.java
Modified: trunk/all/lib/ftp.properties
===================================================================
--- trunk/all/lib/ftp.properties 2012-09-23 09:24:10 UTC (rev 5931)
+++ trunk/all/lib/ftp.properties 2012-09-23 17:53:55 UTC (rev 5932)
@@ -1,3 +1,3 @@
-classlib.url=http://jnode.ro//classlib/20091228090913
-classlib.md5=ac4c3f52a31d0a1f58e4515c0be7480b
-classlib-src.md5=0ba30a72207217ba95cb6c5f0031ad86
\ No newline at end of file
+classlib.url=http://jnode.ro//classlib/20120923084426
+classlib.md5=428d062b09531822195a2ae3d486e791
+classlib-src.md5=c9d1cc877354726fafdc463342de7453
\ No newline at end of file
Modified: trunk/core/src/openjdk/vm/java/io/JNodeFileSystem.java
===================================================================
--- trunk/core/src/openjdk/vm/java/io/JNodeFileSystem.java 2012-09-23 09:24:10 UTC (rev 5931)
+++ trunk/core/src/openjdk/vm/java/io/JNodeFileSystem.java 2012-09-23 17:53:55 UTC (rev 5932)
@@ -75,8 +75,12 @@
return VMFile.mkdir(f.getPath());
}
+ /**
+ * The resulting temporary file may have more restrictive access permission
+ * on some platforms, if restrictive is true.
+ */
@Override
- public boolean createFileExclusively(String pathname) throws IOException {
+ public boolean createFileExclusively(String pathname, boolean restrictive) throws IOException {
return VMFile.create(pathname);
}
Modified: trunk/core/src/openjdk/vm/java/io/NativeUnixFileSystem.java
===================================================================
--- trunk/core/src/openjdk/vm/java/io/NativeUnixFileSystem.java 2012-09-23 09:24:10 UTC (rev 5931)
+++ trunk/core/src/openjdk/vm/java/io/NativeUnixFileSystem.java 2012-09-23 17:53:55 UTC (rev 5932)
@@ -80,7 +80,7 @@
return success;
}
- private static boolean createFileExclusively(UnixFileSystem ufs, String path) {
+ private static boolean createFileExclusively(UnixFileSystem ufs, String path, boolean restrictive) {
try {
return VMFile.create(path);
} catch(IOException ioe){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2012-12-19 08:38:19
|
Revision: 5936
http://jnode.svn.sourceforge.net/jnode/?rev=5936&view=rev
Author: galatnm
Date: 2012-12-19 08:38:08 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
Various fs patches from Luke Quinane's repository + migrate to intellij 12
Modified Paths:
--------------
trunk/JNode.ipr
trunk/all/all.iml
trunk/builder/builder.iml
trunk/core/core.iml
trunk/distr/distr.iml
trunk/fs/fs.iml
trunk/fs/src/fs/org/jnode/fs/FileSystem.java
trunk/fs/src/fs/org/jnode/fs/ext2/Ext2File.java
trunk/fs/src/fs/org/jnode/fs/ext2/Ext2FileSystem.java
trunk/fs/src/fs/org/jnode/fs/fat/FatFileSystem.java
trunk/fs/src/fs/org/jnode/fs/ftpfs/FTPFileSystem.java
trunk/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFile.java
trunk/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFileSystem.java
trunk/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFileSystemType.java
trunk/fs/src/fs/org/jnode/fs/iso9660/ISO9660FileSystem.java
trunk/fs/src/fs/org/jnode/fs/jarfs/JarFileSystem.java
trunk/fs/src/fs/org/jnode/fs/jfat/CodePage.java
trunk/fs/src/fs/org/jnode/fs/jfat/FatFile.java
trunk/fs/src/fs/org/jnode/fs/jfat/FatFileSystem.java
trunk/fs/src/fs/org/jnode/fs/jifs/JIFileSystem.java
trunk/fs/src/fs/org/jnode/fs/nfs/nfs2/NFS2FileSystem.java
trunk/fs/src/fs/org/jnode/fs/ntfs/BootRecord.java
trunk/fs/src/fs/org/jnode/fs/ntfs/CompressedDataRun.java
trunk/fs/src/fs/org/jnode/fs/ntfs/DataRun.java
trunk/fs/src/fs/org/jnode/fs/ntfs/DataRunInterface.java
trunk/fs/src/fs/org/jnode/fs/ntfs/FileNameAttribute.java
trunk/fs/src/fs/org/jnode/fs/ntfs/FileRecord.java
trunk/fs/src/fs/org/jnode/fs/ntfs/IndexEntry.java
trunk/fs/src/fs/org/jnode/fs/ntfs/IndexEntryIterator.java
trunk/fs/src/fs/org/jnode/fs/ntfs/IndexRootAttribute.java
trunk/fs/src/fs/org/jnode/fs/ntfs/MasterFileTable.java
trunk/fs/src/fs/org/jnode/fs/ntfs/NTFSEntry.java
trunk/fs/src/fs/org/jnode/fs/ntfs/NTFSFile.java
trunk/fs/src/fs/org/jnode/fs/ntfs/NTFSFileSystem.java
trunk/fs/src/fs/org/jnode/fs/ntfs/NTFSNonResidentAttribute.java
trunk/fs/src/fs/org/jnode/fs/ntfs/NTFSRecord.java
trunk/fs/src/fs/org/jnode/fs/ntfs/NTFSStructure.java
trunk/fs/src/fs/org/jnode/fs/ntfs/NTFSVolume.java
trunk/fs/src/fs/org/jnode/fs/ramfs/RAMFileSystem.java
trunk/fs/src/fs/org/jnode/fs/service/def/VirtualFS.java
trunk/fs/src/fs/org/jnode/fs/smbfs/SMBFileSystem.java
trunk/gui/gui.iml
trunk/jnode.iml
trunk/net/net.iml
trunk/shell/shell.iml
trunk/textui/textui.iml
Added Paths:
-----------
trunk/fs/src/fs/org/jnode/fs/FSFileSlackSpace.java
trunk/fs/src/fs/org/jnode/fs/FSFileStreams.java
trunk/fs/src/fs/org/jnode/fs/ntfs/UsnJournalEntry.java
Modified: trunk/JNode.ipr
===================================================================
--- trunk/JNode.ipr 2012-10-24 07:04:00 UTC (rev 5935)
+++ trunk/JNode.ipr 2012-12-19 08:38:08 UTC (rev 5936)
@@ -181,7 +181,11 @@
<entry name="?*.jpeg" />
<entry name="?*.jpg" />
</wildcardResourcePatterns>
- <annotationProcessing enabled="false" useClasspath="true" />
+ <annotationProcessing>
+ <profile default="true" name="Default" enabled="false">
+ <processorPath useClasspath="true" />
+ </profile>
+ </annotationProcessing>
</component>
<component name="CopyrightManager" default="">
<module2copyright />
@@ -193,6 +197,15 @@
<component name="DependencyValidationManager">
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
</component>
+ <component name="EclipseCodeFormatter">
+ <option name="defaultSettings" value="true" />
+ <option name="formatter" value="ECLIPSE" />
+ <option name="id" value="1355311468141" />
+ <option name="name" value="default" />
+ <option name="optimizeImports" value="false" />
+ <option name="pathToConfigFileJava" value="$PROJECT_DIR$/../../../../documentation/others/isabel_codingFormat.xml" />
+ <option name="selectedJavaProfile" value="isabel" />
+ </component>
<component name="EclipseCompilerSettings">
<option name="GENERATE_NO_WARNINGS" value="true" />
<option name="DEPRECATION" value="false" />
@@ -224,6 +237,14 @@
<item index="5" class="java.lang.String" itemvalue="ERROR" />
</list>
</component>
+ <component name="IvyIDEA.ProjectSettings">
+ <option name="artifactTypeSettings">
+ <ArtifactTypeSettings />
+ </option>
+ <option name="propertiesSettings">
+ <PropertiesSettings />
+ </option>
+ </component>
<component name="JavacSettings">
<option name="MAXIMUM_HEAP_SIZE" value="1024" />
</component>
Modified: trunk/all/all.iml
===================================================================
--- trunk/all/all.iml 2012-10-24 07:04:00 UTC (rev 5935)
+++ trunk/all/all.iml 2012-12-19 08:38:08 UTC (rev 5936)
@@ -3,7 +3,6 @@
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes" />
<exclude-output />
- <exclude-exploded />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: trunk/builder/builder.iml
===================================================================
--- trunk/builder/builder.iml 2012-10-24 07:04:00 UTC (rev 5935)
+++ trunk/builder/builder.iml 2012-12-19 08:38:08 UTC (rev 5936)
@@ -3,7 +3,6 @@
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes" />
<exclude-output />
- <exclude-exploded />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/builder" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/configure" isTestSource="false" />
Modified: trunk/core/core.iml
===================================================================
--- trunk/core/core.iml 2012-10-24 07:04:00 UTC (rev 5935)
+++ trunk/core/core.iml 2012-12-19 08:38:08 UTC (rev 5936)
@@ -3,7 +3,6 @@
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes" />
<exclude-output />
- <exclude-exploded />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/classlib" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/classpath/ext" isTestSource="false" />
Modified: trunk/distr/distr.iml
===================================================================
--- trunk/distr/distr.iml 2012-10-24 07:04:00 UTC (rev 5935)
+++ trunk/distr/distr.iml 2012-12-19 08:38:08 UTC (rev 5936)
@@ -3,7 +3,6 @@
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes" />
<exclude-output />
- <exclude-exploded />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/apps" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/emu" isTestSource="false" />
Modified: trunk/fs/fs.iml
===================================================================
--- trunk/fs/fs.iml 2012-10-24 07:04:00 UTC (rev 5935)
+++ trunk/fs/fs.iml 2012-12-19 08:38:08 UTC (rev 5936)
@@ -6,7 +6,6 @@
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes" />
<exclude-output />
- <exclude-exploded />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/driver" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/fs" isTestSource="false" />
Added: trunk/fs/src/fs/org/jnode/fs/FSFileSlackSpace.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/FSFileSlackSpace.java (rev 0)
+++ trunk/fs/src/fs/org/jnode/fs/FSFileSlackSpace.java 2012-12-19 08:38:08 UTC (rev 5936)
@@ -0,0 +1,21 @@
+package org.jnode.fs;
+
+import java.io.IOException;
+
+/**
+ * <p>
+ * Interface for {@link FSFile} implementation that support reading "slack space" at the end of the file data.
+ * </p>
+ * <p>
+ * For example if a filesystem has a block size of 512 bytes and a file is only using 500 bytes then there will be 12
+ * bytes of unallocated space at the end of the block that may contain data from a previous file.
+ * </p>
+ */
+public interface FSFileSlackSpace {
+ /**
+ * Gets the file slack space.
+ * @return the slack space.
+ * @throws IOException if an error occurs reading the file.
+ */
+ byte[] getSlackSpace() throws IOException;
+}
Added: trunk/fs/src/fs/org/jnode/fs/FSFileStreams.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/FSFileStreams.java (rev 0)
+++ trunk/fs/src/fs/org/jnode/fs/FSFileStreams.java 2012-12-19 08:38:08 UTC (rev 5936)
@@ -0,0 +1,35 @@
+/*
+ * $Id$
+ *
+ * Copyright (C) 2003-2012 JNode.org
+ *
+ * This library 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; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library 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 library; If not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package org.jnode.fs;
+
+import java.util.Map;
+
+/**
+ * A FSFileStreams is a representation of a file system file that can have alternative data streams.
+ * @author Luke Quinane
+ */
+public interface FSFileStreams extends FSFile {
+ /**
+ * Gets the map of alternate stream names to their file interface.
+ * @return the mapping.
+ */
+ Map<String, FSFile> getStreams();
+}
Modified: trunk/fs/src/fs/org/jnode/fs/FileSystem.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/FileSystem.java 2012-10-24 07:04:00 UTC (rev 5935)
+++ trunk/fs/src/fs/org/jnode/fs/FileSystem.java 2012-12-19 08:38:08 UTC (rev 5936)
@@ -17,95 +17,83 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.fs;
import java.io.IOException;
-
import org.jnode.driver.Device;
/**
* The <tt>FileSystem<tt> interface provide methods common to file system implementations.
- * *
+ * *
* @param <T> {@link FSEntry} sub-type
- *
- * @author epr
+ * @author epr
*/
public interface FileSystem<T extends FSEntry> {
- /**
- * Return type of the file system.
- *
- * @return {@link FileSystemType} corresponding to this file system
- */
- public FileSystemType<? extends FileSystem<T>> getType();
+ /**
+ * Return type of the file system.
+ * @return {@link FileSystemType} corresponding to this file system
+ */
+ public FileSystemType<? extends FileSystem<T>> getType();
- /**
- * Gets the device this FS driver operates on.
- *
- * @return {@link Device} contains this file system.
- */
- public Device getDevice();
+ /**
+ * Gets the device this FS driver operates on.
+ * @return {@link Device} contains this file system.
+ */
+ public Device getDevice();
- /**
- * Gets the root entry of this filesystem. This is usually a directory, but
- * this is not required.
- *
- * @return {@link FSEntry} corresponding to root entry.
- *
- * @throws IOException if an I/O error occurs
- */
- public T getRootEntry() throws IOException;
+ /**
+ * Gets the root entry of this filesystem. This is usually a directory, but this is not required.
+ * @return {@link FSEntry} corresponding to root entry.
+ * @throws IOException if an I/O error occurs
+ */
+ public T getRootEntry() throws IOException;
- /**
- * Returns <tt>true</tt> if the file system is mounted in read-only mode.
- *
- * @return <tt>true</tt> if it's a read-only file system.
- */
- public boolean isReadOnly();
+ /**
+ * Returns <tt>true</tt> if the file system is mounted in read-only mode.
+ * @return <tt>true</tt> if it's a read-only file system.
+ */
+ public boolean isReadOnly();
- /**
- * Close this file system. After a close, all invocations of method of this
- * file system or objects created by this file system will throw an
- * IOException.
- *
- *
- *
- * @throws IOException if an I/O error occurs
- */
- public void close() throws IOException;
+ /**
+ * Close this file system. After a close, all invocations of method of this file system or objects created by this
+ * file system will throw an IOException.
+ * @throws IOException if an I/O error occurs
+ */
+ public void close() throws IOException;
- /**
- * Returns <tt>true</tt> if this file system is close.
- *
- * @return <tt>true</tt> if file system is closed.
- */
- public boolean isClosed();
+ /**
+ * Returns <tt>true</tt> if this file system is close.
+ * @return <tt>true</tt> if file system is closed.
+ */
+ public boolean isClosed();
- /**
- * Return The total size in bytes of this file system.
- *
- * @return total size in bytes or -1 if this feature is unsupported.
- *
- * @throws IOException if an I/O error occurs
- */
- public long getTotalSpace() throws IOException;
+ /**
+ * Return The total size in bytes of this file system.
+ * @return total size in bytes or -1 if this feature is unsupported.
+ * @throws IOException if an I/O error occurs
+ */
+ public long getTotalSpace() throws IOException;
- /**
- * The total free space in bytes of this file system.
- *
- * @return total free space in bytes or -1 if this feature is unsupported
- *
- * @throws IOException if an I/O error occurs
- */
- public long getFreeSpace() throws IOException;
+ /**
+ * The total free space in bytes of this file system.
+ * @return total free space in bytes or -1 if this feature is unsupported
+ * @throws IOException if an I/O error occurs
+ */
+ public long getFreeSpace() throws IOException;
- /**
- * The usable space of this file system.
- *
- * @return usable space in bytes or -1 if this feature is unsupported
- *
- * @throws IOException if an I/O error occurs
- */
- public long getUsableSpace() throws IOException;
+ /**
+ * The usable space of this file system.
+ * @return usable space in bytes or -1 if this feature is unsupported
+ * @throws IOException if an I/O error occurs
+ */
+ public long getUsableSpace() throws IOException;
+
+ /**
+ * Gets the volume name for this file system.
+ * @return the volume name.
+ * @throws IOException if an error occurs reading the volume name.
+ */
+ public String getVolumeName() throws IOException;
}
Modified: trunk/fs/src/fs/org/jnode/fs/ext2/Ext2File.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/ext2/Ext2File.java 2012-10-24 07:04:00 UTC (rev 5935)
+++ trunk/fs/src/fs/org/jnode/fs/ext2/Ext2File.java 2012-12-19 08:38:08 UTC (rev 5936)
@@ -17,13 +17,14 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.fs.ext2;
import java.io.IOException;
import java.nio.ByteBuffer;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
+import org.jnode.fs.FSFileSlackSpace;
import org.jnode.fs.FileSystemException;
import org.jnode.fs.ReadOnlyFileSystemException;
import org.jnode.fs.spi.AbstractFSFile;
@@ -32,314 +33,330 @@
/**
* @author Andras Nagy
*/
-public class Ext2File extends AbstractFSFile {
+public class Ext2File extends AbstractFSFile implements FSFileSlackSpace {
- Ext2Entry entry;
- INode iNode;
+ Ext2Entry entry;
+ INode iNode;
- private final Logger log = Logger.getLogger(getClass());
+ private final Logger log = Logger.getLogger(getClass());
- public Ext2File(Ext2Entry entry) {
- super(entry.getINode().getExt2FileSystem());
- this.iNode = entry.getINode();
- this.entry = entry;
- log.setLevel(Level.DEBUG);
- }
+ public Ext2File(Ext2Entry entry) {
+ super(entry.getINode().getExt2FileSystem());
+ this.iNode = entry.getINode();
+ this.entry = entry;
+ log.setLevel(Level.DEBUG);
+ }
- @Override
- public long getLength() {
- //log.debug("getLength(): "+iNode.getSize());
- return iNode.getSize();
- }
+ @Override
+ public long getLength() {
+ // log.debug("getLength(): "+iNode.getSize());
+ return iNode.getSize();
+ }
- @Override
- public void setLength(long length) throws IOException {
- if (!canWrite())
- throw new ReadOnlyFileSystemException("FileSystem or File is readonly");
+ @Override
+ public void setLength(long length) throws IOException {
+ if (!canWrite()) throw new ReadOnlyFileSystemException("FileSystem or File is readonly");
- long blockSize = iNode.getExt2FileSystem().getBlockSize();
+ long blockSize = iNode.getExt2FileSystem().getBlockSize();
- //synchronize to the inode cache to make sure that the inode does not
- // get
- //flushed between reading it and locking it
- synchronized (((Ext2FileSystem) getFileSystem()).getInodeCache()) {
- //reread the inode before synchronizing to it to make sure
- //all threads use the same instance
- rereadInode();
+ // synchronize to the inode cache to make sure that the inode does not
+ // get
+ // flushed between reading it and locking it
+ synchronized (((Ext2FileSystem) getFileSystem()).getInodeCache()) {
+ // reread the inode before synchronizing to it to make sure
+ // all threads use the same instance
+ rereadInode();
- //lock the inode into the cache so it is not flushed before
- // synchronizing to it
- //(otherwise a new instance of INode referring to the same inode
- // could be put
- //in the cache resulting in the possibility of two threads
- // manipulating the same
- //inode at the same time because they would synchronize to
- // different INode instances)
- iNode.incLocked();
- }
- //a single inode may be represented by more than one Ext2Directory
- // instances,
- //but each will use the same instance of the underlying inode (see
- // Ext2FileSystem.getINode()),
- //so synchronize to the inode
- synchronized (iNode) {
- try {
- //if length<getLength(), then the file is truncated
- if (length < getLength()) {
- long blockNr = length / blockSize;
- long blockOffset = length % blockSize;
- long nextBlock;
- if (blockOffset == 0)
- nextBlock = blockNr;
- else
- nextBlock = blockNr + 1;
+ // lock the inode into the cache so it is not flushed before
+ // synchronizing to it
+ // (otherwise a new instance of INode referring to the same inode
+ // could be put
+ // in the cache resulting in the possibility of two threads
+ // manipulating the same
+ // inode at the same time because they would synchronize to
+ // different INode instances)
+ iNode.incLocked();
+ }
+ // a single inode may be represented by more than one Ext2Directory
+ // instances,
+ // but each will use the same instance of the underlying inode (see
+ // Ext2FileSystem.getINode()),
+ // so synchronize to the inode
+ synchronized (iNode) {
+ try {
+ // if length<getLength(), then the file is truncated
+ if (length < getLength()) {
+ long blockNr = length / blockSize;
+ long blockOffset = length % blockSize;
+ long nextBlock;
+ if (blockOffset == 0) nextBlock = blockNr;
+ else nextBlock = blockNr + 1;
- for (long i = iNode.getAllocatedBlockCount() - 1; i >= nextBlock; i--) {
- log.debug("setLength(): freeing up block " + i + " of inode");
- iNode.freeDataBlock(i);
- }
- iNode.setSize(length);
+ for(long i = iNode.getAllocatedBlockCount() - 1; i >= nextBlock; i--) {
+ log.debug("setLength(): freeing up block " + i + " of inode");
+ iNode.freeDataBlock(i);
+ }
+ iNode.setSize(length);
- iNode.setMtime(System.currentTimeMillis() / 1000);
+ iNode.setMtime(System.currentTimeMillis() / 1000);
- return;
- }
+ return;
+ }
- //if length>getLength(), then new blocks are allocated for the
- // file
- //The content of the new blocks is undefined (see the
- // setLength(long i)
- //method of java.io.RandomAccessFile
- if (length > getLength()) {
- long len = length - getLength();
- long blocksAllocated = getLengthInBlocks();
- long bytesAllocated = getLength();
- long bytesCovered = 0;
- while (bytesCovered < len) {
- long blockIndex = (bytesAllocated + bytesCovered) / blockSize;
- long blockOffset = (bytesAllocated + bytesCovered) % blockSize;
- long newSection = Math.min(len - bytesCovered, blockSize - blockOffset);
+ // if length>getLength(), then new blocks are allocated for the
+ // file
+ // The content of the new blocks is undefined (see the
+ // setLength(long i)
+ // method of java.io.RandomAccessFile
+ if (length > getLength()) {
+ long len = length - getLength();
+ long blocksAllocated = getLengthInBlocks();
+ long bytesAllocated = getLength();
+ long bytesCovered = 0;
+ while (bytesCovered < len) {
+ long blockIndex = (bytesAllocated + bytesCovered) / blockSize;
+ long blockOffset = (bytesAllocated + bytesCovered) % blockSize;
+ long newSection = Math.min(len - bytesCovered, blockSize - blockOffset);
- //allocate a new block if needed
- if (blockIndex >= blocksAllocated) {
- iNode.allocateDataBlock(blockIndex);
- blocksAllocated++;
- }
+ // allocate a new block if needed
+ if (blockIndex >= blocksAllocated) {
+ iNode.allocateDataBlock(blockIndex);
+ blocksAllocated++;
+ }
- bytesCovered += newSection;
- }
- iNode.setSize(length);
+ bytesCovered += newSection;
+ }
+ iNode.setSize(length);
- iNode.setMtime(System.currentTimeMillis() / 1000);
+ iNode.setMtime(System.currentTimeMillis() / 1000);
- return;
- }
- } catch (Throwable ex) {
- final IOException ioe = new IOException();
- ioe.initCause(ex);
- throw ioe;
- } finally {
- //setLength done, unlock the inode from the cache
- iNode.decLocked();
- }
- } // synchronized(inode)
- }
+ return;
+ }
+ } catch (Throwable ex) {
+ final IOException ioe = new IOException();
+ ioe.initCause(ex);
+ throw ioe;
+ } finally {
+ // setLength done, unlock the inode from the cache
+ iNode.decLocked();
+ }
+ } // synchronized(inode)
+ }
+ @Override
+ public void read(long fileOffset, ByteBuffer destBuf) throws IOException {
+ if (fileOffset + destBuf.remaining() > getLength()) throw new IOException("Can't read past the file!");
+ readImpl(fileOffset, destBuf);
+ }
- @Override
- public void read(long fileOffset, ByteBuffer destBuf) throws IOException {
- final int len = destBuf.remaining();
- final int off = 0;
- //TODO optimize it also to use ByteBuffer at lower level
- final ByteBufferUtils.ByteArray destBA = ByteBufferUtils.toByteArray(destBuf);
- final byte[] dest = destBA.toArray();
+ /**
+ * A read implementation that doesn't check the file length.
+ * @param fileOffset the offset to read from.
+ * @param destBuf the destination buffer.
+ * @throws IOException if an error occurs reading.
+ */
+ public void readImpl(long fileOffset, ByteBuffer destBuf) throws IOException {
+ final int len = destBuf.remaining();
+ final int off = 0;
+ // TODO optimize it also to use ByteBuffer at lower level
+ final ByteBufferUtils.ByteArray destBA = ByteBufferUtils.toByteArray(destBuf);
+ final byte[] dest = destBA.toArray();
- //synchronize to the inode cache to make sure that the inode does not
- // get flushed between reading it and locking it
- synchronized (((Ext2FileSystem) getFileSystem()).getInodeCache()) {
- //reread the inode before synchronizing to it to make sure
- //all threads use the same instance
- rereadInode();
+ // synchronize to the inode cache to make sure that the inode does not
+ // get flushed between reading it and locking it
+ synchronized (((Ext2FileSystem) getFileSystem()).getInodeCache()) {
+ // reread the inode before synchronizing to it to make sure
+ // all threads use the same instance
+ rereadInode();
- //lock the inode into the cache so it is not flushed before
- // synchronizing to it
- //(otherwise a new instance of INode referring to the same inode
- // could be put
- //in the cache resulting in the possibility of two threads
- // manipulating the same
- //inode at the same time because they would synchronize to
- // different INode instances)
- iNode.incLocked();
- }
+ // lock the inode into the cache so it is not flushed before
+ // synchronizing to it
+ // (otherwise a new instance of INode referring to the same inode
+ // could be put
+ // in the cache resulting in the possibility of two threads
+ // manipulating the same
+ // inode at the same time because they would synchronize to
+ // different INode instances)
+ iNode.incLocked();
+ }
- if (log.isDebugEnabled()) {
- log.debug("File:" + entry.getName() + " size:" + getLength() + " read offset: " + fileOffset + " len: " +
- dest.length);
- }
+ if (log.isDebugEnabled()) {
+ log.debug("File:" + entry.getName() + " size:" + getLength() + " read offset: " + fileOffset + " len: "
+ + dest.length);
+ }
- //a single inode may be represented by more than one Ext2Directory
- // instances,
- //but each will use the same instance of the underlying inode (see
- // Ext2FileSystem.getINode()),
- //so synchronize to the inode
- synchronized (iNode) {
- try {
- if (len + off > getLength())
- throw new IOException("Can't read past the file!");
+ // a single inode may be represented by more than one Ext2Directory
+ // instances,
+ // but each will use the same instance of the underlying inode (see
+ // Ext2FileSystem.getINode()),
+ // so synchronize to the inode
+ synchronized (iNode) {
+ try {
+ if ((iNode.getMode() & Ext2Constants.EXT2_S_IFLNK) == Ext2Constants.EXT2_S_IFLNK) {
+ // Sym-links are a special case: the data seems to be stored inline in the iNode
+ System.arraycopy(iNode.getINodeBlockData(), 0, dest, 0, Math.min(64, dest.length));
+ } else {
+ long blockSize = iNode.getExt2FileSystem().getBlockSize();
+ long bytesRead = 0;
+ while (bytesRead < len) {
+ long blockNr = (fileOffset + bytesRead) / blockSize;
+ long blockOffset = (fileOffset + bytesRead) % blockSize;
+ long copyLength = Math.min(len - bytesRead, blockSize - blockOffset);
- if ((iNode.getMode() & Ext2Constants.EXT2_S_IFLNK) == Ext2Constants.EXT2_S_IFLNK) {
- // Sym-links are a special case: the data seems to be stored inline in the iNode
- System.arraycopy(iNode.getINodeBlockData(), 0, dest, 0, Math.min(64, dest.length));
- }
- else {
- long blockSize = iNode.getExt2FileSystem().getBlockSize();
- long bytesRead = 0;
- while (bytesRead < len) {
- long blockNr = (fileOffset + bytesRead) / blockSize;
- long blockOffset = (fileOffset + bytesRead) % blockSize;
- long copyLength = Math.min(len - bytesRead, blockSize - blockOffset);
+ log.debug("blockNr: " + blockNr + ", blockOffset: " + blockOffset + ", copyLength: "
+ + copyLength + ", bytesRead: " + bytesRead);
- log.debug("blockNr: " + blockNr + ", blockOffset: " + blockOffset + ", copyLength: " + copyLength +
- ", bytesRead: " + bytesRead);
+ System.arraycopy(iNode.getDataBlock(blockNr), (int) blockOffset, dest, off + (int) bytesRead,
+ (int) copyLength);
- System.arraycopy(iNode.getDataBlock(blockNr), (int) blockOffset, dest, off + (int) bytesRead,
- (int) copyLength);
+ bytesRead += copyLength;
+ }
+ }
+ } catch (Throwable ex) {
+ final IOException ioe = new IOException();
+ ioe.initCause(ex);
+ throw ioe;
+ } finally {
+ // read done, unlock the inode from the cache
+ iNode.decLocked();
+ }
+ }
- bytesRead += copyLength;
- }
- }
- } catch (Throwable ex) {
- ...
[truncated message content] |
|
From: <ga...@us...> - 2013-01-25 10:08:50
|
Revision: 5945
http://jnode.svn.sourceforge.net/jnode/?rev=5945&view=rev
Author: galatnm
Date: 2013-01-25 10:08:38 +0000 (Fri, 25 Jan 2013)
Log Message:
-----------
Add configuration for sonar-runner.
Added Paths:
-----------
trunk/fs/sonar-project.properties
trunk/sonar-project.properties
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- build
bak
build
docs
lib
.classpath
.project
.metadata
src.jpx
*.patch
jnode.properties
local
bin
JNode.iws
+ *.patch
.classpath
.metadata
.project
.sonar
JNode.iws
bak
bin
build
docs
jnode.properties
lib
local
src.jpx
Added: trunk/fs/sonar-project.properties
===================================================================
--- trunk/fs/sonar-project.properties (rev 0)
+++ trunk/fs/sonar-project.properties 2013-01-25 10:08:38 UTC (rev 5945)
@@ -0,0 +1,3 @@
+sonar.projectName= fs
+sonar.sources=src/driver, src/fs
+sonar.binaries= build
\ No newline at end of file
Added: trunk/sonar-project.properties
===================================================================
--- trunk/sonar-project.properties (rev 0)
+++ trunk/sonar-project.properties 2013-01-25 10:08:38 UTC (rev 5945)
@@ -0,0 +1,6 @@
+sonar.projectKey=org.jnode
+sonar.projectName= jnode
+sonar.projectVersion= 2.9
+sonar.modules= fs
+sonar.sources= src
+sonar.language=java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2013-01-25 11:33:10
|
Revision: 5946
http://jnode.svn.sourceforge.net/jnode/?rev=5946&view=rev
Author: galatnm
Date: 2013-01-25 11:33:00 +0000 (Fri, 25 Jan 2013)
Log Message:
-----------
Add sonar-runner config for net module
Modified Paths:
--------------
trunk/sonar-project.properties
Added Paths:
-----------
trunk/net/sonar-project.properties
Added: trunk/net/sonar-project.properties
===================================================================
--- trunk/net/sonar-project.properties (rev 0)
+++ trunk/net/sonar-project.properties 2013-01-25 11:33:00 UTC (rev 5946)
@@ -0,0 +1,3 @@
+sonar.projectName= net
+sonar.sources=src/driver, src/net
+sonar.binaries= build
\ No newline at end of file
Modified: trunk/sonar-project.properties
===================================================================
--- trunk/sonar-project.properties 2013-01-25 10:08:38 UTC (rev 5945)
+++ trunk/sonar-project.properties 2013-01-25 11:33:00 UTC (rev 5946)
@@ -1,6 +1,7 @@
sonar.projectKey=org.jnode
sonar.projectName= jnode
sonar.projectVersion= 2.9
-sonar.modules= fs
+sonar.modules= fs, net
sonar.sources= src
sonar.language=java
+sonar.forceAnalysis=true
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2013-02-24 17:25:16
|
Revision: 5986
http://jnode.svn.sourceforge.net/jnode/?rev=5986&view=rev
Author: lsantha
Date: 2013-02-24 17:25:09 +0000 (Sun, 24 Feb 2013)
Log Message:
-----------
Added support for XML headers in HeaderTask.
Modified Paths:
--------------
trunk/all/build.xml
trunk/builder/src/builder/org/jnode/ant/taskdefs/HeaderTask.java
Modified: trunk/all/build.xml
===================================================================
--- trunk/all/build.xml 2013-02-24 17:23:41 UTC (rev 5985)
+++ trunk/all/build.xml 2013-02-24 17:25:09 UTC (rev 5986)
@@ -1,3 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library 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; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library 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 library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<project name="JNode" default="help" basedir=".">
<property name="root.dir" value="${basedir}/.."/>
@@ -866,6 +886,31 @@
<fileset dir="${root.dir}/shell/src/shell" includes="**/*.java"/>
<fileset dir="${root.dir}/shell/src/test" includes="**/*.java"/>
</header>
+ <header update="on" xml="on" headerFile="${root.dir}/all/template/header.xml">
+ <fileset dir="${root.dir}/all" includes="*.xml"/>
+ <fileset dir="${root.dir}/all/conf" includes="*.xml"/>
+ <fileset dir="${root.dir}/all/conf-source" includes="*.xml"/>
+ <fileset dir="${root.dir}/all/lib" includes="*.xml"/>
+ <fileset dir="${root.dir}/builder" includes="*.xml"/>
+ <fileset dir="${root.dir}/cli" includes="*.xml"/>
+ <fileset dir="${root.dir}/cli/descriptors" includes="*.xml"/>
+ <fileset dir="${root.dir}/core" includes="*.xml"/>
+ <fileset dir="${root.dir}/core/descriptors" includes="*.xml"/>
+ <fileset dir="${root.dir}/distr" includes="*.xml"/>
+ <fileset dir="${root.dir}/distr/descriptors" includes="*.xml"/>
+ <fileset dir="${root.dir}/fs" includes="*.xml"/>
+ <fileset dir="${root.dir}/fs/descriptors" includes="*.xml"/>
+ <fileset dir="${root.dir}/gui" includes="*.xml"/>
+ <fileset dir="${root.dir}/gui/descriptors" includes="*.xml"/>
+ <fileset dir="${root.dir}/net" includes="*.xml"/>
+ <fileset dir="${root.dir}/net/descriptors" includes="*.xml"/>
+ <fileset dir="${root.dir}/shell" includes="*.xml"/>
+ <fileset dir="${root.dir}/shell/descriptors" includes="*.xml"/>
+ <fileset dir="${root.dir}/sound" includes="*.xml"/>
+ <fileset dir="${root.dir}/sound/descriptors" includes="*.xml"/>
+ <fileset dir="${root.dir}/textui" includes="*.xml"/>
+ <fileset dir="${root.dir}/textui/descriptors" includes="*.xml"/>
+ </header>
</target>
<target name="check-debugger-properties" depends="prepare">
Modified: trunk/builder/src/builder/org/jnode/ant/taskdefs/HeaderTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/ant/taskdefs/HeaderTask.java 2013-02-24 17:23:41 UTC (rev 5985)
+++ trunk/builder/src/builder/org/jnode/ant/taskdefs/HeaderTask.java 2013-02-24 17:25:09 UTC (rev 5986)
@@ -38,6 +38,7 @@
private String[] header;
private boolean update = false;
+ private boolean xml = false;
private boolean compareHeader(String[] lines, String[] header) {
final int linesCnt = lines.length;
@@ -63,6 +64,31 @@
return false;
}
+ private boolean compareXMLHeader(String[] lines, String[] header) {
+ final int linesCnt = lines.length;
+ final int hdrCnt = header.length;
+
+ for (int i = 0; i < linesCnt; i++) {
+ final String line = lines[i];
+ if (i < hdrCnt) {
+ if (!compareLine(line, header[i])) {
+ return false;
+ }
+ } else {
+ String trimmedLine = line.trim();
+ if (trimmedLine.startsWith("<")) {
+ return true;
+ }
+ if (trimmedLine.length() > 0) {
+ return false;
+ }
+ }
+ }
+
+ return false;
+ }
+
+
private boolean compareLine(String line, String hdrLine) {
if ((line.indexOf('$') >= 0) && (hdrLine.indexOf('$') >= 0)) {
return true;
@@ -93,13 +119,24 @@
@Override
protected void processFile(File file) throws IOException {
final String[] inp = readFile(file);
- if (!compareHeader(inp, header)) {
- if (update) {
- log("Updating " + file);
- writeUpdateFile(file, inp, header);
- } else {
- log("Wrong header in " + file);
+ if (xml) {
+ if (!compareXMLHeader(inp, header)) {
+ if (update) {
+ log("Updating " + file);
+ writeUpdateXMLFile(file, inp, header);
+ } else {
+ log("Wrong header in " + file);
+ }
}
+ } else {
+ if (!compareHeader(inp, header)) {
+ if (update) {
+ log("Updating " + file);
+ writeUpdateFile(file, inp, header);
+ } else {
+ log("Wrong header in " + file);
+ }
+ }
}
}
@@ -128,7 +165,48 @@
}
}
+ private void writeUpdateXMLFile(File file, String[] lines, String[] header) throws IOException {
+ PrintWriter out = new PrintWriter(new FileWriter(file));
+ try {
+ boolean write = true;
+ boolean headerAdded = false;
+ for (String line : lines) {
+ String trimmedLine = line.trim();
+ if (!headerAdded) {
+ if (!write) {
+ for (String aHeader : header) {
+ out.println(aHeader);
+ }
+ headerAdded = true;
+ if (!trimmedLine.startsWith("<!--")) {
+ write = true;
+ }
+ }
+ if (trimmedLine.startsWith("<?xml")) {
+ write = false;
+ } else if (!headerAdded) {
+ for (String aHeader : header) {
+ out.println(aHeader);
+ }
+ headerAdded = true;
+ }
+ }
+
+ if (write) {
+ out.println(line);
+ }
+
+ if (trimmedLine.endsWith("-->")) {
+ write = true;
+ }
+ }
+ } finally {
+ out.close();
+ }
+ }
+
+
private String[] readFile(File file) throws IOException {
final BufferedReader in = new BufferedReader(new FileReader(file));
try {
@@ -150,4 +228,8 @@
public final void setUpdate(boolean update) {
this.update = update;
}
+
+ public void setXml(boolean xml) {
+ this.xml = xml;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ep...@us...> - 2013-11-09 13:13:49
|
Revision: 5989
http://sourceforge.net/p/jnode/svn/5989
Author: epr
Date: 2013-11-09 13:13:47 +0000 (Sat, 09 Nov 2013)
Log Message:
-----------
Added custom display name to .vmx VMWare file.
Modified Paths:
--------------
trunk/all/build-x86.xml
trunk/builder/src/builder/org/jnode/build/VMwareBuilderTask.java
Modified: trunk/all/build-x86.xml
===================================================================
--- trunk/all/build-x86.xml 2013-11-08 09:35:27 UTC (rev 5988)
+++ trunk/all/build-x86.xml 2013-11-09 13:13:47 UTC (rev 5989)
@@ -347,6 +347,7 @@
saveDir="${save.dir}"
vmdkImageFile="${vmware.vmx.vmdk.image}"
overrideFile="${vmware.vmx.overrides}"
+ name="JNode x86"
/>
</target>
@@ -362,6 +363,7 @@
saveDir="${save.dir}"
vmdkImageFile="${vmware.vmx.vmdk.image}"
overrideFile="${vmware.vmx.overrides}"
+ name="JNode x86 lite"
/>
</target>
@@ -376,6 +378,7 @@
saveDir="${save.dir}"
vmdkImageFile="${vmware.vmx.vmdk.image}"
overrideFile="${vmware.vmx.overrides}"
+ name="JNode x64 lite"
/>
</target>
Modified: trunk/builder/src/builder/org/jnode/build/VMwareBuilderTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/VMwareBuilderTask.java 2013-11-08 09:35:27 UTC (rev 5988)
+++ trunk/builder/src/builder/org/jnode/build/VMwareBuilderTask.java 2013-11-09 13:13:47 UTC (rev 5989)
@@ -42,8 +42,8 @@
/**
* This task builds a VMWare '.vmx' file to allow JNode to be run using VMWare player.
*
- * @author ...
* @author cr...@jn...
+ * @author ep...@jn...
*/
public class VMwareBuilderTask extends Task {
@@ -53,8 +53,23 @@
private String overrideFile;
private String vmdkImageFile;
private String saveDir;
+ private String name;
/**
+ * @return Returns the Virtual machine name
+ */
+ public final String getName() {
+ return name;
+ }
+
+ /**
+ * @Set the Virtual machine name
+ */
+ public final void setName(String name) {
+ this.name = name;
+ }
+
+ /**
* @return Returns the memory size.
*/
public final int getMemSize() {
@@ -272,7 +287,7 @@
props.put("usb.present", "TRUE");
props.put("sound.present", "FALSE");
props.put("sound.virtualDev", "es1371");
- props.put("displayName", "JNode");
+ props.put("displayName", (name != null) ? name : "JNode");
props.put("guestOS", "dos");
props.put("nvram", "JNode.nvram");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X