[FULL_TIME]: Define.

(long_options): Use it.
(decode_switches): Make --full-time imply -l.

diff --git a/src/ls.c b/src/ls.c
index 290640b601202347d7f0ad9eebe9fde6b871f292..0b14ca5e22eac02009857cefc4b6626ccd69bd29 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -671,6 +671,7 @@ enum
   BLOCK_SIZE_OPTION = CHAR_MAX + 1,
   COLOR_OPTION,
   FORMAT_OPTION,
+  FULL_TIME,
   INDICATOR_STYLE_OPTION,
   QUOTING_STYLE_OPTION,
   SHOW_CONTROL_CHARS_OPTION,
@@ -684,7 +685,7 @@ static struct option const long_options[] =
   {"escape", no_argument, 0, 'b'},
   {"directory", no_argument, 0, 'd'},
   {"dired", no_argument, 0, 'D'},
-  {"full-time", no_argument, &full_time, 1},
+  {"full-time", no_argument, 0, FULL_TIME},
   {"human-readable", no_argument, 0, 'h'},
   {"inode", no_argument, 0, 'i'},
   {"kilobytes", no_argument, 0, 'k'},
@@ -1288,6 +1289,11 @@ decode_switches (int argc, char **argv)
          format = XARGMATCH ("--format", optarg, format_args, format_types);
          break;
 
+       case FULL_TIME:
+         format = long_format;
+         full_time = 1;
+         break;
+
        case COLOR_OPTION:
          if (optarg)
            i = XARGMATCH ("--color", optarg, color_args, color_types);