From 009b55edc4bad5b46ace88f3c255bbff8671d137 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Sun, 26 Aug 2018 14:16:49 -0500
Subject: Convert more commands to the new option/GLOBALS code style.

---
 toys/posix/ls.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'toys/posix/ls.c')

diff --git a/toys/posix/ls.c b/toys/posix/ls.c
index ec8c6c0d..976b3343 100644
--- a/toys/posix/ls.c
+++ b/toys/posix/ls.c
@@ -54,11 +54,10 @@ config LS
 // ls -lR starts .: then ./subdir:
 
 GLOBALS(
-  long ll;
+  long l;
   char *color;
 
   struct dirtree *files, *singledir;
-
   unsigned screen_width;
   int nl_title;
   char *escmore;
@@ -467,7 +466,7 @@ static void listfiles(int dirfd, struct dirtree *indir)
       // print time, always in --time-style=long-iso
       tm = localtime(&(st->st_mtime));
       strftime(tmp, sizeof(tmp), "%F %H:%M", tm);
-      if (TT.ll>1) {
+      if (TT.l>1) {
         char *s = tmp+strlen(tmp);
 
         s += sprintf(s, ":%02d.%09d ", tm->tm_sec, (int)st->st_mtim.tv_nsec);
@@ -533,7 +532,7 @@ void ls_main(void)
 
   if (toys.optflags&FLAG_full_time) {
     toys.optflags |= FLAG_l;
-    TT.ll = 2;
+    TT.l = 2;
   }
 
   // Do we have an implied -1
-- 
cgit v1.2.3