Changeset 15445

Timestamp:

10/29/20 16:54:39 (3 years ago)

Author:

Mark Evenson

Message:

Use getFile() in Pathname TRUENAME resolution

File:

• trunk/abcl/src/org/armedbear/lisp/Pathname.java (modified) (4 diffs)

trunk/abcl/src/org/armedbear/lisp/Pathname.java

@@ -1404 +1404 @@
           }
 
-          String s = pathname.getNamestring();
-          if (s != null) {
-            File f = new File(s);
-            if (f.isDirectory()) {
-              try {
-                File[] files = f.listFiles();
-                if (files == null) {
-                  return error(new FileError("Unable to list directory "
-                                             + pathname.princToString() + ".",
-                                             pathname));
-                }
-                for (int i = files.length; i-- > 0;) {
-                  File file = files[i];
-                  String path;
-                  if (resolveSymlinks == NIL) {
-                    path = file.getAbsolutePath();
-                  } else {
-                    path = file.getCanonicalPath();
-                  }
-                  if (file.isDirectory()
-                      && !path.endsWith("/")) {
-                    path += "/";
-                  }
-                  Pathname p;
-                  p = (Pathname)Pathname.create(path);
-                  result = new Cons(p, result);
-                }
-              } catch (IOException e) {
-                return error(new FileError("Unable to list directory " 
+          File f = pathname.getFile();
+          if (f.isDirectory()) {
+            try {
+              File[] files = f.listFiles();
+              if (files == null) {
+                return error(new FileError("Unable to list directory "
                                            + pathname.princToString() + ".",
                                            pathname));
-              } catch (SecurityException e) {
-                return error(new FileError("Unable to list directory: " + e, pathname));
               }
+              for (int i = files.length; i-- > 0;) {
+                File file = files[i];
+                String path;
+                if (resolveSymlinks == NIL) {
+                  path = file.getAbsolutePath();
+                } else {
+                  path = file.getCanonicalPath();
+                }
+                if (file.isDirectory()
+                    && !path.endsWith("/")) {
+                  path += "/";
+                }
+                Pathname p;
+                p = (Pathname)Pathname.create(path);
+                result = new Cons(p, result);
+              }
+            } catch (IOException e) {
+              return error(new FileError("Unable to list directory " 
+                                         + pathname.princToString() + ".",
+                                         pathname));
+            } catch (SecurityException e) {
+              return error(new FileError("Unable to list directory: " + e, pathname));
             }
           }
@@ -1863 +1860 @@
      */
     public static LispObject truename(Pathname pathname,
-            boolean errorIfDoesNotExist) {
+                                      boolean errorIfDoesNotExist) {
       if (pathname == null || pathname.equals(NIL)) {  
         return doTruenameExit(pathname, errorIfDoesNotExist); 
@@ -1879 +1876 @@
                                    NIL);
       final File file = result.getFile();
-      if (file.exists()) {
+      if (file != null
+          && file.exists()) {
         if (file.isDirectory()) {
           result = Pathname.getDirectoryPathname(file);
@@ -2089 +2087 @@
     }
   }
-    
-  public URL toURL() {
-    try {
-      if (isURL()) {
-        return new URL(getNamestring());
-      } else {
-        return toFile().toURI().toURL();
-      }
-    } catch (MalformedURLException e) {
-      error(new LispError(getNamestring() + " is not a valid URL"));
-      return null; // not reached
-    }
-  }
-
-  public File toFile() {
-    if(!isURL()) {
-      return new File(getNamestring());
-    } else {
-      throw new RuntimeException(this + " does not represent a file");
-    }
-  }
 
   static {