Changeset 4395

Timestamp:

2003-05-28T14:58:07+12:00 (21 years ago)

Author:

jmt12

Message:

FileNode now check, when mapping their children, for symbolic links so as to avoid infinite copy loops. However this may cause the ugly 'Disk Not Found in Drive A:' bug to resurface. Watch this space.

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileNode.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/file/FileNode.java

@@ -1 +1 @@
 package org.greenstone.gatherer.file;
 
-import java.io.File;
+import java.io.*;
 import java.util.*;
 import javax.swing.*;
@@ -249 +249 @@
             // Preclude the directory of any open collection
             String collection_name = Gatherer.c_man.getCollection().getName();
-            for(int j = 0; collection_name != null && files != null && j < files.length; j++) {
+            for(int j = 0; collection_name != null && j < files.length; j++) {
             if(files[j].getName().equals(collection_name)) {
                 // Remove the offending directory
@@ -255 +255 @@
                 collection_name = null; // Only have to do this once.
             }
+            }
+        }
+        // Finally remove any files whose canonical path do not match their absolute one (ie symbolic links)
+        for(int k = files.length; k != 0; k--) {
+            try {
+            if(!files[k-1].getAbsolutePath().equals(files[k-1].getCanonicalPath())) {
+                ///ystem.err.println("For file: " + files[k-1].getName());
+                ///ystem.err.println("Absolute Path:  " + files[k-1].getAbsolutePath());
+                ///ystem.err.println("Canonical Path: " + files[k-1].getCanonicalPath());
+                files = ArrayTools.remove(files, (k-1));
+            }
+            }
+            catch (IOException exception) {
+            Gatherer.printStackTrace(exception);
             }
         }