Greatly improved ls(1).

utils/ls.cpp

@@ -20,42 +20,187 @@
 
 *******************************************************************************/
 
-#include <stdio.h>
-#include <fcntl.h>
-#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <stddef.h>
+#include <dirent.h>
 #include <unistd.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include <errno.h>
 #include <error.h>
-#include <dirent.h>
-#include <sys/wait.h>
-#include <libmaxsi/platform.h>
-#include <libmaxsi/process.h>
+#include <fcntl.h>
+
+#if defined(sortix)
+#define execvp execv
+#endif
+
+bool longformat = false;
+bool showdotdot = false;
+bool showdotfiles = false;
+
+pid_t childpid;
+
+void finishoutput()
+{
+	int status;
+	fflush(stdout);
+	if ( childpid ) { close(1); wait(&status); }
+	childpid = 0;
+}
+
+int handleentry(const char* path, const char* name)
+{
+	bool isdotdot = strcmp(name, ".") == 0 || strcmp(name, "..") == 0;
+	bool isdotfile = !isdotdot && name[0] == '.';
+	if ( isdotdot && !showdotdot ) { return 0; }
+	if ( isdotfile && !showdotfiles ) { return 0; }
+	if ( !longformat )
+	{
+		printf("%s\n", name);
+		return 0;
+	}
+	// TODO: Use openat and fstat.
+	char* fullpath = new char[strlen(path) + 1 + strlen(name) + 1];
+	strcpy(fullpath, path);
+	strcat(fullpath, "/");
+	strcat(fullpath, name);
+	struct stat st;
+	if ( stat(fullpath, &st) )
+	{
+		finishoutput();
+		error(0, errno, "stat: %s", fullpath);
+		return 2;
+	}
+	char perms[11];
+	perms[0] = '?';
+	if ( S_ISREG(st.st_mode) ) { perms[0] = '-'; }
+	if ( S_ISDIR(st.st_mode) ) { perms[0] = 'd'; }
+	const char flagnames[] = { 'x', 'w', 'r' };
+	for ( size_t i = 0; i < 9; i++ )
+	{
+		bool set = st.st_mode & (1UL<<i);
+		perms[9-i] = set ? flagnames[i % 3] : '-';
+	}
+	const char* sizeunit = "B";
+	off_t size = st.st_size;
+	if ( 1023 < size ) { size /= 1024UL; sizeunit = "K"; }
+	if ( 1023 < size ) { size /= 1024UL; sizeunit = "M"; }
+	if ( 1023 < size ) { size /= 1024UL; sizeunit = "G"; }
+	if ( 1023 < size ) { size /= 1024UL; sizeunit = "T"; }
+	if ( 1023 < size ) { size /= 1024UL; sizeunit = "P"; }
+	perms[10] = 0;
+	printf("%s %ji root root %ji%s\t%s\n", perms, (uintmax_t) st.st_nlink,
+	       (uintmax_t) size, sizeunit, name);
+	return 0;
+}
 
 int ls(const char* path)
 {
 	DIR* dir = opendir(path);
-	if ( !dir ) { error(2, errno, "%s", path); return 2; }
+	if ( !dir ) { finishoutput(); error(0, errno, "%s", path); return 2; }
+
+#if defined(sortix)
+	handleentry(path, ".");
+	handleentry(path, "..");
+#endif
 
 	struct dirent* entry;
 	while ( (entry = readdir(dir)) )
 	{
-		printf("%s\n", entry->d_name);
+		int result;
+		if ( (result = handleentry(path, entry->d_name)) ) { return result; }
 	}
 
+#if defined(sortix)
 	if ( derror(dir) )
 	{
-		error(2, errno, "readdir: %s", path);
+		finishoutput();
+		error(0, errno, "readdir: %s", path);
+		return 2;
 	}
+#endif
 
 	closedir(dir);
 
 	return 0;
 }
 
+void usage(FILE* fp, const char* argv0)
+{
+	fprintf(fp, "usage: %s [-l] [-a | -A] [<DIR> ...]\n", argv0);
+}
+
+void version(FILE* fp, const char* argv0)
+{
+	return usage(fp, argv0);
+}
+
+void help(FILE* fp, const char* argv0)
+{
+	return usage(fp, argv0);
+}
+
 int main(int argc, char* argv[])
 {
-	pid_t childpid = 0;
-	if ( isatty(1) )
+	const char* argv0 = argv[0];
+	for ( int i = 0; i < argc; i++ )
+	{
+		const char* arg = argv[i];
+		if ( arg[0] != '-' || !argv[1] ) { continue; }
+		argv[i] = NULL;
+		if ( !strcmp(arg, "--") ) { break; }
+		if ( arg[1] != '-' )
+		{
+			char c;
+			while ( (c = *++arg) )
+			{
+				switch ( c )
+				{
+				case 'l':
+					longformat = true;
+					break;
+				case 'a':
+					showdotdot = true;
+					showdotfiles = true;
+					break;
+				case 'A':
+					showdotdot = false;
+					showdotfiles = true;
+					break;
+				default:
+					fprintf(stderr, "%s: unknown option -- '%c'\n", argv0, c);
+					usage(stderr, argv0);
+					exit(2);
+				}
+			}
+		}
+		else if ( !strcmp(arg, "--version") )
+		{
+			version(stdout, argv0); exit(0);
+		}
+		else if ( !strcmp(arg, "--usage") )
+		{
+			usage(stdout, argv0); exit(0);
+		}
+		else if ( !strcmp(arg, "--help") )
+		{
+			help(stdout, argv0); exit(0);
+		}
+		else
+		{
+			fprintf(stderr, "%s: unrecognized option: %s\n", argv0, arg);
+			usage(stderr, argv0);
+			exit(2);
+		}
+	}
+
+	childpid = 0;
+	bool columnable = !longformat;
+	if ( columnable && isatty(1) )
 	{
 		int pipes[2];
 		if ( pipe(pipes) ) { perror("pipe"); return 1; }
@@ -76,22 +221,24 @@ int main(int argc, char* argv[])
 			close(pipes[1]);
 			const char* columner = "column";
 			const char* argv[] = { columner, NULL };
-			execv(columner, (char* const*) argv);
+			execvp(columner, (char* const*) argv);
 			error(127, errno, "%s", columner);
 		}
 	}
 
-	const size_t CWD_SIZE = 512;
-	char cwd[CWD_SIZE];
-	const char* path = getcwd(cwd, CWD_SIZE);
-	if ( !path ) { path = "."; }
+	int result = 0;
+	bool anyargs = false;
+	for ( int i = 1; i < argc; i++ )
+	{
+		if ( !argv[i] ) { continue; }
+		anyargs = true;
+		if ( (result = ls(argv[i])) ) { break; }
+	}
 
-	if ( 1 < argc ) { path = argv[1]; }
+	if ( !anyargs ) { result = ls("."); }
 
-	int result = ls(path);
+	finishoutput();
 
-	int status;
-	if ( childpid ) { close(1); wait(&status); }
 	return result;
 }