Changeset 268

Timestamp:

11/17/02 15:32:42 (21 years ago)

Author:

piso

Message:

Support --time-style=iso and --time-style=long-iso ls options (fixes bug 638385).

File:

• trunk/j/src/org/armedbear/j/Directory.java (modified) (6 diffs)

trunk/j/src/org/armedbear/j/Directory.java

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: Directory.java,v 1.5 2002-10-17 14:12:36 piso Exp $
+ * $Id: Directory.java,v 1.6 2002-11-17 15:32:42 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -57 +57 @@
     private int numMarked = 0;
 
-    // The offset on the line where the filename starts.
-    private int nameOffset = -1;
-
     private DirectoryHistory history = new DirectoryHistory();
 
-    static private RE nativeMoveToFilenameRegExp;
-    static private RE internalMoveToFilenameRegExp;
+    private static RE nativeMoveToFilenameRegExp;
+    private static RE internalMoveToFilenameRegExp;
 
     private long totalSize;
@@ -97 +94 @@
             RESyntax syntax = new RESyntax(RESyntax.RE_SYNTAX_PERL5);
             syntax.set(RESyntax.RE_CHAR_CLASSES);
-            nativeMoveToFilenameRegExp = new RE("[0-9]+" + s + monthAndDay +
-                s + timeOrYear + s, 0, syntax);
+
+            String normal = "[0-9]+" + s + monthAndDay + s + timeOrYear + s;
+
+            // --time-style=long-iso
+            // -rw-r--r--    1 peter    peter         147 2002-11-13 13:10 notes
+            // --time-style=iso
+            // -rw-r--r--    1 peter    peter       69016 11-16 18:29 Directory.java
+            // -rw-r--r--    1 peter    peter       13274 2001-09-08  thinbox.tar.gz
+            String iso = "[0-9]+" + s + "[0-9\\-]+" + s + "(" + HHMM + ")? *";
+
+            nativeMoveToFilenameRegExp =
+                new RE("(" + normal + ")|(" + iso + ")", 0, syntax);
             internalMoveToFilenameRegExp = new RE(":[0-5][0-9]" + s);
         }
-        catch (REException e) {}
+        catch (REException e) {
+            Log.error(e);
+        }
     }
 
@@ -578 +587 @@
                 else if (sortBy == SORT_BY_SIZE)
                     flags = "-laS";
+                String extraOptions =
+                    getStringProperty(Property.LS_EXTRA_OPTIONS);
+                if (extraOptions != null) {
+                    flags += " ";
+                    flags += extraOptions;
+                    Log.debug("Directory.loadInternal flags = " + flags);
+                }
                 BufferedReader reader = null;
                 if (getListing() != null) {
@@ -668 +684 @@
             try {
                 addEntriesToBuffer();
-                setNameOffset(); // We may have changed formats.
                 if (totalSize != 0) {
+                    int end;
+                    if (usingNativeFormat) {
+                        end = getFileSizeEndOffset();
+                        if (end <= 0)
+                            end = 45;
+                    } else {
+                        int nameOffset = getNameOffset();
+                        end = nameOffset - 19;
+                        if (end <= 0)
+                            end = 13;
+                    }
                     String s = String.valueOf(totalSize);
-                    int end =
-                        usingNativeFormat ? nameOffset - 14 : nameOffset - 19;
                     int begin = end - s.length();
+                    if (begin < 0)
+                        begin = 0;
                     FastStringBuffer sb =  new FastStringBuffer(80);
                     sb.append(Utilities.spaces(begin));
@@ -1851 +1877 @@
     {
         if (line != null) {
-            try {
-                REMatch match;
-                if (usingNativeFormat)
-                    match = nativeMoveToFilenameRegExp.getMatch(line.getText());
-                else
-                    match = internalMoveToFilenameRegExp.getMatch(line.getText());
-                if (match != null)
-                    return match.getEndIndex();
-            }
-            catch (Exception e) {
-                Log.error(e);
-            }
+            REMatch match;
+            if (usingNativeFormat)
+                match = nativeMoveToFilenameRegExp.getMatch(line.getText());
+            else
+                match = internalMoveToFilenameRegExp.getMatch(line.getText());
+            if (match != null)
+                return match.getEndIndex();
         }
         return 0;
     }
 
-    private void setNameOffset()
-    {
-        nameOffset = 0;
+    private int getNameOffset()
+    {
+        return getNameOffset(getFirstLine());
+    }
+
+    private int getFileSizeEndOffset()
+    {
         Line line = getFirstLine();
         if (line != null) {
-            try {
-                REMatch match;
-                if (usingNativeFormat)
-                    match = nativeMoveToFilenameRegExp.getMatch(line.getText());
-                else
-                    match = internalMoveToFilenameRegExp.getMatch(line.getText());
-                if (match != null)
-                    nameOffset = match.getEndIndex();
-            }
-            catch (Exception e) {
-                Log.error(e);
-            }
-        }
+            final String text = line.getText();
+            REMatch match;
+            if (usingNativeFormat)
+                match = nativeMoveToFilenameRegExp.getMatch(text);
+            else
+                match = internalMoveToFilenameRegExp.getMatch(text);
+            if (match != null) {
+                int start = match.getStartIndex();
+                // The file size is followed by a single space.
+                return text.indexOf(' ', start);
+            }
+        }
+        return -1; // Error!
     }