From: Jim Meyering <jim@meyering.net>
Date: Sun, 28 Jan 2001 21:34:35 +0000 (+0000)
Subject: [FULL_TIME]: Define.
X-Git-Tag: FILEUTILS-4_0_38~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2bc68d2234eb2bd4c959dfc6b1c9a3990ab4c4eb;p=thirdparty%2Fcoreutils.git

[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 290640b601..0b14ca5e22 100644
--- 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);