From 5a26a86cec424d728d43523988ca70aa56ee76c9 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Sun, 2 Jun 2013 00:24:24 -0500 Subject: Stat cleanup. lib: rename format_mode() to mode_to_string() (echoing string_to_mode), make it take a normal char * argument. stat: collapse big switch/case statements that only have one line each into if/else staircase (much fewer lines of code). Remove return type (other stat implementations print ? for unknown escapes, so do that here). Inline do_stat() and do_statfs(). Set default string in normal local variable "format". Remove unnecessary struct d. Restructure stat logic to "if (flagf && !statfs()) else if (!flagf && !stat()) else perror_msg();" Teach %N to add -> symlink. Judicious use of putchar() instead of xputc to let FILE * do its job collating output. --- toys/posix/ls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toys/posix') diff --git a/toys/posix/ls.c b/toys/posix/ls.c index 76fb7947..caabe7df 100644 --- a/toys/posix/ls.c +++ b/toys/posix/ls.c @@ -337,7 +337,7 @@ static void listfiles(int dirfd, struct dirtree *indir) struct tm *tm; char perm[11], thyme[64], *usr, *upad, *grp, *grpad; - format_mode(&perm, mode); + mode_to_string(mode, perm); tm = localtime(&(st->st_mtime)); strftime(thyme, sizeof(thyme), "%F %H:%M", tm); -- cgit v1.2.3