Added type(1), a replacement for the "traditional" Sortix cat(1).

cat(1) now work as you would expect.

utils/Makefile

@@ -27,6 +27,7 @@ column \
 pager \
 head \
 tail \
+type \
 
 BINARIES:=$(addprefix $(INITRDDIR)/,$(LOCALBINARIES))
 

utils/cat.cpp

@@ -20,12 +20,11 @@
 
 *******************************************************************************/
 
-#include <sys/keycodes.h>
-#include <sys/termmode.h>
-#include <stdio.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <fcntl.h>
 #include <errno.h>
 #include <error.h>
 
@@ -51,12 +50,47 @@ int docat(const char* inputname, int fd)
 	return 0;
 }
 
-int cat(int argc, char* argv[])
+void usage(FILE* fp, const char* argv0)
 {
-	int result = 0;
+	fprintf(fp, "usage: %s [FILE ...]\n", argv0);
+	fprintf(fp, "Concatenate files and print on the standard output.\n");
+}
+
+void help(FILE* fp, const char* argv0)
+{
+	return usage(fp, argv0);
+}
+
+void version(FILE* fp, const char* argv0)
+{
+	return usage(fp, argv0);
+}
+
+int main(int argc, char* argv[])
+{
+	const char* argv0 = argv[0];
 
 	for ( int i = 1; i < argc; i++ )
 	{
+		const char* arg = argv[i];
+		if ( arg[0] != '-' ) { continue; }
+		argv[i] = NULL;
+		if ( !strcmp(arg, "--") ) { break; }
+		if ( !strcmp(arg, "--help") ) { help(stdout, argv0); exit(0); }
+		if ( !strcmp(arg, "--usage") ) { usage(stdout, argv0); exit(0); }
+		if ( !strcmp(arg, "--version") ) { version(stdout, argv0); exit(0); }
+		error(0, 0, "unrecognized option: %s", arg);
+		usage(stderr, argv0);
+		exit(1);
+	}
+
+	int result = 0;
+
+	bool any = false;
+	for ( int i = 1; i < argc; i++ )
+	{
+		if ( !argv[i] ) { continue; }
+		any = true;
 		int fd = open(argv[i], O_RDONLY);
 		if ( fd < 0 )
 		{
@@ -69,49 +103,8 @@ int cat(int argc, char* argv[])
 		close(fd);
 	}
 
+	if ( !any ) { result = docat("<stdin>", 0); }
+
 	return result;
 }
 
-int main(int argc, char* argv[])
-{
-	if ( 1 < argc )
-	{
-		return cat(argc, argv);
-	}
-
-	if ( !isatty(0) || !isatty(1) ) { return docat("<stdin>", 0); }
-
-	bool lastwasesc = false;
-
-	// TODO: This is just compatibility with how cat worked in early versions of
-	// Sortix. Ideally, this should be removed and just cat the raw stdin.
-	// Read the keyboard input from the user.
-	unsigned termmode = TERMMODE_KBKEY | TERMMODE_UNICODE | TERMMODE_SIGNAL;
-	if ( settermmode(0, termmode) ) { error(1, errno, "settermmode"); }
-	while ( true )
-	{
-		uint32_t codepoint;
-		ssize_t numbytes = read(0, &codepoint, sizeof(codepoint));
-		if ( !numbytes ) { break; }
-		if ( numbytes < 0 ) { break; }
-		int kbkey = KBKEY_DECODE(codepoint);
-		if ( kbkey < 0 ) { continue; }
-		if ( kbkey == KBKEY_UP ) { printf("\e[A"); fflush(stdout); continue; }
-		if ( kbkey == KBKEY_DOWN ) { printf("\e[B"); fflush(stdout); continue; }
-		if ( kbkey == KBKEY_RIGHT ) { printf("\e[C"); fflush(stdout); continue; }
-		if ( kbkey == KBKEY_LEFT ) { printf("\e[D"); fflush(stdout); continue; }
-		if ( kbkey == KBKEY_ESC ) { printf("\e["); fflush(stdout); lastwasesc = true; continue; }
-		if ( kbkey ) { continue; }
-		if ( lastwasesc && codepoint == '[' ) { continue; }
-
-		if ( codepoint >= 0x80 ) { continue; }
-
-		char msg[2]; msg[0] = codepoint; msg[1] = '\0';
-		printf(msg);
-		fflush(stdout);
-		lastwasesc = false;
-	}
-
-	return 0;
-}
-

utils/type.cpp

@@ -0,0 +1,100 @@
+/*******************************************************************************
+
+	COPYRIGHT(C) JONAS 'SORTIE' TERMANSEN 2011, 2012.
+
+	This program is free software: you can redistribute it and/or modify it
+	under the terms of the GNU General Public License as published by the Free
+	Software Foundation, either version 3 of the License, or (at your option)
+	any later version.
+
+	This program is distributed in the hope that it will be useful, but WITHOUT
+	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+	FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+	more details.
+
+	You should have received a copy of the GNU General Public License along with
+	this program. If not, see <http://www.gnu.org/licenses/>.
+
+	type.cpp
+	Lets you move the tty cursor around and easily issue ANSI escape codes.
+
+*******************************************************************************/
+
+#include <sys/keycodes.h>
+#include <sys/termmode.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <error.h>
+
+void usage(FILE* fp, const char* argv0)
+{
+	fprintf(fp, "usage: %s [--usage | --help | --version]\n", argv0);
+	fprintf(fp, "Lets you type freely onto the tty.\n");
+}
+
+void help(FILE* fp, const char* argv0)
+{
+	return usage(fp, argv0);
+}
+
+void version(FILE* fp, const char* argv0)
+{
+	return usage(fp, argv0);
+}
+
+int main(int argc, char* argv[])
+{
+	const char* argv0 = argv[0];
+
+	for ( int i = 1; i < argc; i++ )
+	{
+		const char* arg = argv[i];
+		if ( arg[0] != '-' ) { continue; }
+		argv[i] = NULL;
+		if ( !strcmp(arg, "--") ) { break; }
+		if ( !strcmp(arg, "--help") ) { help(stdout, argv0); exit(0); }
+		if ( !strcmp(arg, "--usage") ) { usage(stdout, argv0); exit(0); }
+		if ( !strcmp(arg, "--version") ) { version(stdout, argv0); exit(0); }
+		error(0, 0, "unrecognized option: %s", arg);
+		usage(stderr, argv0);
+		exit(1);
+	}
+
+	if ( !isatty(0) || !isatty(1) )
+	{
+		error(1, errno, "standard output and input must be a tty");
+	}
+
+	bool lastwasesc = false;
+	unsigned termmode = TERMMODE_KBKEY | TERMMODE_UNICODE | TERMMODE_SIGNAL;
+	if ( settermmode(0, termmode) ) { error(1, errno, "settermmode"); }
+	while ( true )
+	{
+		uint32_t codepoint;
+		ssize_t numbytes = read(0, &codepoint, sizeof(codepoint));
+		if ( !numbytes ) { break; }
+		if ( numbytes < 0 ) { break; }
+		int kbkey = KBKEY_DECODE(codepoint);
+		if ( kbkey < 0 ) { continue; }
+		if ( kbkey == KBKEY_UP ) { printf("\e[A"); fflush(stdout); continue; }
+		if ( kbkey == KBKEY_DOWN ) { printf("\e[B"); fflush(stdout); continue; }
+		if ( kbkey == KBKEY_RIGHT ) { printf("\e[C"); fflush(stdout); continue; }
+		if ( kbkey == KBKEY_LEFT ) { printf("\e[D"); fflush(stdout); continue; }
+		if ( kbkey == KBKEY_ESC ) { printf("\e["); fflush(stdout); lastwasesc = true; continue; }
+		if ( kbkey ) { continue; }
+		if ( lastwasesc && codepoint == '[' ) { continue; }
+
+		if ( codepoint >= 0x80 ) { continue; }
+
+		char msg[2]; msg[0] = codepoint; msg[1] = '\0';
+		printf(msg);
+		lastwasesc = false;
+		fflush(stdout);
+	}
+
+	return 0;
+}
+