java/src/org/openantivirus/engine/vfs/container DirectoryContainer.java,1.1,1.2

Update of /cvsroot/openantivirus/java/src/org/openantivirus/engine/vfs/container
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27654/src/org/openantivirus/engine/vfs/container

Modified Files:
	DirectoryContainer.java 
Log Message:
Restored command line handling

Index: DirectoryContainer.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/engine/vfs/container/DirectoryContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DirectoryContainer.java	14 Dec 2003 11:08:26 -0000	1.1
+++ DirectoryContainer.java	25 May 2004 06:49:10 -0000	1.2
@@ -109,9 +109,15 @@
     }
     
     /** determines the next file (not directory) */
-    protected void determineNext() {
+    protected void determineNext() throws IOException {
         File next;
         while ((next = getNext()) != null) {
+            if (!scanConf.getBoolean("engine.follow-symlinks")
+                    &&  !next.getAbsolutePath().equals(
+                            next.getCanonicalPath())) {
+                return;
+            }
+            
             if (next.isFile()) {
                 // we want a plain file, nothing else
                 break;
@@ -144,8 +150,6 @@
      * and resets the index
      */
     protected void handleDirectory(File directory) {
-        assert directory.isDirectory();
-        
         currentFiles = directory.listFiles();
         currentIndex = 0;
     }



-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click