From 7071a63dfa1112cc1c6dde0216ebc8d7ddd9ba2b Mon Sep 17 00:00:00 2001
From: Lisa Milne <lisamilne618@gmail.com>
Date: Tue, 19 Dec 2023 14:36:09 +1000
Subject: [PATCH] convert format of programs to always have main(argc,argv)

---
 clite/commands.js | 1207 ++++++++++++++++++++++++---------------------
 clite/shell.js    |   32 +-
 clite/user.js     |   88 ++--
 clite/vi.js       |   88 ++--
 4 files changed, 744 insertions(+), 671 deletions(-)

diff --git a/clite/commands.js b/clite/commands.js
index a106bea..b9661be 100644
--- a/clite/commands.js
+++ b/clite/commands.js
@@ -3,7 +3,9 @@ clite.commands.data = function() {
 
 clite.commands.load('help',function(args,env,io) {
 	var stdio = io.include('stdio');
-	stdio.printf(`
+
+	function main(argc,argv) {
+		stdio.printf(`
 Welcome to CLIte (pronounced like 'site' with an added L).
 
 Various common Unix commands are available in the CLIte shell:
@@ -22,19 +24,24 @@ As a basic guide for guests:
 Use ls to see what content is available, eg: ls web
 Use less to view the content, eg: less web/about
 `);
-	return 0;
+		return 0;
+	}
+
+	return main(args.length,args);
 });
 
 clite.commands.load('ls',function(args,env,io) {
+	var stdlib = io.include('stdlib');
+	var stdio = io.include('stdio');
+	var time = io.include('time');
+	var clite = io.include('clite');
+
 	var dirs = [];
 	var long = false;
 	var all = false;
 	var access = false;
 	var one = false;
-	var stdlib = io.include('stdlib');
-	var stdio = io.include('stdio');
-	var time = io.include('time');
-	var clite = io.include('clite');
+
 	function help() {
 		stdio.printf(`
 ls - list directory contents
@@ -94,85 +101,91 @@ Options:
 		}
 	}
 
-	for (var i=1; i<args.length; i++) {
-		if (args[i][0] == '-') {
-			for (var j=1; j<args[i].length; j++) {
-				switch (args[i][j]) {
-				case '?':
-					help();
-					return 0;
-					break;
-				case 'l':
-					long = true;
-					break;
-				case 'u':
-					access = true;
-					break;
-				case 'a':
-					all = true;
-					break;
-				case '1':
-					one = true;
-					break;
-				default:
-					stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
+	function main(argc,argv) {
+
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
+					case '?':
+						help();
+						return 0;
+						break;
+					case 'l':
+						long = true;
+						break;
+					case 'u':
+						access = true;
+						break;
+					case 'a':
+						all = true;
+						break;
+					case '1':
+						one = true;
+						break;
+					default:
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
+					}
 				}
+			}else{
+				dirs.push(clite.resolvePath(argv[i],false));
 			}
-		}else{
-			dirs.push(clite.resolvePath(args[i],false));
 		}
-	}
 
-	if (dirs.length < 1)
-		dirs.push(env.PWD);
+		if (dirs.length < 1)
+			dirs.push(env.PWD);
 
-	dirs.forEach(function(dir,index) {
-		if (dirs.length > 1)
-			stdio.printf('%s:\n',dir);
-		var st = stdio.lstat(dir);
-		if (!st) {
-			stdio.fprintf(io.stderr,'cannot read file: %s\n',dir);
+		dirs.forEach(function(dir,index) {
+			if (dirs.length > 1)
+				stdio.printf('%s:\n',dir);
+			var st = stdio.lstat(dir);
+			if (!st) {
+				stdio.fprintf(io.stderr,'cannot read file: %s\n',dir);
+				stdio.close(fd);
+				return;
+			}
+			if (st.type != stdio.types.FT_DIR) {
+				writeNodeData(st,dir);
+				if (!one && !long)
+					stdio.write(io.stdout,'\n');
+				return;
+			}
+			var fd = stdio.open(dir,stdio.flags.O_RDONLY|stdio.flags.O_SYNC);
+			if (!fd) {
+				stdio.fprintf(io.stderr,'cannot open directory: %s\n',dir);
+				return;
+			}
+			var e;
+			while ((e = stdio.read(fd)) != null) {
+				if (e[0] == '.' && !all)
+					continue;
+				var est = stdio.lstat(dir+'/'+e,stdio.flags.AT_SYMLINK_NOFOLLOW);
+				if (!est) {
+					stdio.fprintf(io.stderr,'cannot read content: %s\n',dir);
+					break;
+				}
+				writeNodeData(est,dir+'/'+e);
+			}
 			stdio.close(fd);
-			return;
-		}
-		if (st.type != stdio.types.FT_DIR) {
-			writeNodeData(st,dir);
 			if (!one && !long)
 				stdio.write(io.stdout,'\n');
-			return;
-		}
-		var fd = stdio.open(dir,stdio.flags.O_RDONLY|stdio.flags.O_SYNC);
-		if (!fd) {
-			stdio.fprintf(io.stderr,'cannot open directory: %s\n',dir);
-			return;
-		}
-		var e;
-		while ((e = stdio.read(fd)) != null) {
-			if (e[0] == '.' && !all)
-				continue;
-			var est = stdio.lstat(dir+'/'+e,stdio.flags.AT_SYMLINK_NOFOLLOW);
-			if (!est) {
-				stdio.fprintf(io.stderr,'cannot read content: %s\n',dir);
-				break;
-			}
-			writeNodeData(est,dir+'/'+e);
-		}
-		stdio.close(fd);
-		if (!one && !long)
-			stdio.write(io.stdout,'\n');
-	});
+		});
 
-	return 0;
+		return 0;
+	}
+
+	return main(args.length,args);
 });
 
 clite.commands.load('cat',function(args,env,io) {
+	var stdlib = io.include('stdlib');
+	var stdio = io.include('stdio');
+	var clite = io.include('clite');
+
 	var files = [];
 	var download = false;
 	var remote = true;
 	var pending = 0;
-	var stdlib = io.include('stdlib');
-	var stdio = io.include('stdio');
-	var clite = io.include('clite');
 
 	function help() {
 		stdio.printf(`
@@ -186,40 +199,6 @@ Options:
 `);
 	}
 
-	for (var i=1; i<args.length; i++) {
-		if (args[i][0] == '-') {
-			for (var j=1; j<args[i].length; j++) {
-				switch (args[i][j]) {
-				case '?':
-					help();
-					return 0;
-					break;
-				case 'd':
-					download = true;
-					break;
-				case 'l':
-					remote = false;
-					break;
-				default:
-					stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
-				}
-			}
-		}else{
-			files.push(clite.resolvePath(args[i],false));
-		}
-	}
-
-	if (files.length < 1)
-		return 1;
-	pending = files.length;
-
-	// check if we're on a webserver
-	if (!remote) {
-		var u = stdlib.uname();
-		if (u && u.nodename != 'localhost')
-			remote = true;
-	}
-
 	function fcb(fd) {
 		var st = stdio.fstatat(fd,stdio.flags.AT_SYMLINK_NOFOLLOW);
 		// check if it's a directory or link
@@ -259,44 +238,82 @@ Options:
 			io.exit(0);
 	}
 
-	files.forEach(function(file,index) {
-		var st = stdio.stat(file);
-		// check if it's a directory or link
-		if (
-			!st
-			|| st.type == stdio.types.FT_DIR
-			|| st.type == stdio.types.FT_LINK
-			|| st.type == stdio.types.FT_BINARY
-			|| st.type == stdio.types.FT_UNKOWN
-			|| st.type == stdio.types.FT_IMAGE
-		) {
-			stdio.fprintf(io.stderr,'not a normal file: %s\n',file);
-			pending--;
-			return;
-		}
-		if (!remote && st.type == stdio.types.FT_REMOTE) {
-			pending--;
-			return;
-		}
-		var fd = stdio.open(file,stdio.flags.O_RDONLY,fcb);
-		if (!fd) {
-			stdio.fprintf(io.stderr,'cannot open file: %s\n',file);
-			pending--;
-			return;
-		}
-	});
+	function main(argc,argv) {
 
-	if (pending <1)
-		return 0;
+	for (var i=1; i<argc; i++) {
+		if (argv[i][0] == '-') {
+			for (var j=1; j<argv[i].length; j++) {
+				switch (argv[i][j]) {
+				case '?':
+					help();
+					return 0;
+					break;
+				case 'd':
+					download = true;
+					break;
+				case 'l':
+					remote = false;
+					break;
+				default:
+					stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
+				}
+			}
+		}else{
+			files.push(clite.resolvePath(argv[i],false));
+		}
+	}
 
-	return null;
+		if (files.length < 1)
+			return 1;
+		pending = files.length;
+
+		// check if we're on a webserver
+		if (!remote) {
+			var u = stdlib.uname();
+			if (u && u.nodename != 'localhost')
+				remote = true;
+		}
+
+		files.forEach(function(file,index) {
+			var st = stdio.stat(file);
+			// check if it's a directory or link
+			if (
+				!st
+				|| st.type == stdio.types.FT_DIR
+				|| st.type == stdio.types.FT_LINK
+				|| st.type == stdio.types.FT_BINARY
+				|| st.type == stdio.types.FT_UNKOWN
+				|| st.type == stdio.types.FT_IMAGE
+			) {
+				stdio.fprintf(io.stderr,'not a normal file: %s\n',file);
+				pending--;
+				return;
+			}
+			if (!remote && st.type == stdio.types.FT_REMOTE) {
+				pending--;
+				return;
+			}
+			var fd = stdio.open(file,stdio.flags.O_RDONLY,fcb);
+			if (!fd) {
+				stdio.fprintf(io.stderr,'cannot open file: %s\n',file);
+				pending--;
+				return;
+			}
+		});
+
+		if (pending <1)
+			return 0;
+		return null;
+	}
+
+	return main(args.length,args);
 });
 
 clite.commands.load('touch',function(args,env,io) {
-	var file = null;
 	var stdlib = io.include('stdlib');
 	var stdio = io.include('stdio');
 	var clite = io.include('clite');
+
 	function help() {
 		stdio.printf(`
 touch - create a new empty file
@@ -307,30 +324,6 @@ Options:
 `);
 	}
 
-	for (var i=1; i<args.length; i++) {
-		if (args[i][0] == '-') {
-			for (var j=1; j<args[i].length; j++) {
-				switch (args[i][j]) {
-				case '?':
-					help();
-					return 0;
-					break;
-				default:
-					stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
-				}
-			}
-		}else if (file == null) {
-			file = clite.resolvePath(args[i],false);
-		}else{
-			stdio.fprintf(io.stderr,'unknown argument: %s\n',args[i]);
-		}
-	}
-
-	if (file == null) {
-		stdio.write(io.stderr,'no file specified\n');
-		return 1;
-	}
-
 	function loadRemote(fd) {
 		if (!fd) {
 			stdio.fprintf(io.stderr,'unable to create file: %s\n',file);
@@ -340,12 +333,41 @@ Options:
 		io.exit(0);
 	}
 
-	if (!stdio.creat(file)) {
-		var fd = stdio.open(file,stdio.flags.O_RDONLY,loadRemote);
-		return null;
+	function main(argc,argv) {
+		let file = null;
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
+					case '?':
+						help();
+						return 0;
+						break;
+					default:
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
+					}
+				}
+			}else if (file == null) {
+				file = clite.resolvePath(argv[i],false);
+			}else{
+				stdio.fprintf(io.stderr,'unknown argument: %s\n',argv[i]);
+			}
+		}
+
+		if (file == null) {
+			stdio.write(io.stderr,'no file specified\n');
+			return 1;
+		}
+
+		if (!stdio.creat(file)) {
+			var fd = stdio.open(file,stdio.flags.O_RDONLY,loadRemote);
+			return null;
+		}
+
+		return 0;
 	}
 
-	return 0;
+	return main(args.length,args);
 });
 
 clite.commands.load('less',function(args,env,io) {
@@ -354,7 +376,13 @@ clite.commands.load('less',function(args,env,io) {
 	var term = io.include('term');
 	var curses = io.include('curses');
 	var clite = io.include('clite');
+
 	var file = null;
+	var cols;
+	var rows;
+	var lines = [];
+	var topLine = 0;
+	var bottomLine = 0;
 
 	function help() {
 		stdio.printf(`
@@ -366,31 +394,6 @@ Options:
 `);
 	}
 
-	for (var i=1; i<args.length; i++) {
-		if (args[i][0] == '-') {
-			for (var j=1; j<args[i].length; j++) {
-				switch (args[i][j]) {
-				case '?':
-					help();
-					return 0;
-					break;
-				default:
-					stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
-				}
-			}
-		}else if (file == null) {
-			file = clite.resolvePath(args[i],false);
-		}else{
-			stdio.fprintf(io.stderr,'unknown argument: %s\n',args[i]);
-		}
-	}
-
-	var cols;
-	var rows;
-	var lines = [];
-	var topLine = 0;
-	var bottomLine = 0;
-
 	function showAt(line) {
 		var start = line;
 		var end = line+rows-1;
@@ -432,33 +435,6 @@ Options:
 		showAt(0);
 	}
 
-	var fd = null;
-
-	if (file == null) {
-		if (stdio.isatty(io.stdin)) {
-			stdio.write(io.stderr,'no file specified\n');
-			return 1;
-		}
-		fd = io.stdin;
-		io.stdin = stdio.open('/dev/tty',stdio.flags.O_RDONLY|stdio.flags.O_SYNC);
-		stdlib.sleep(2,function() {
-			prepFile(fd);
-		});
-	}else{
-		fd = stdio.open(file,stdio.flags.O_RDONLY,prepFile);
-		if (!fd) {
-			stdio.fprintf(io.stderr,'could not open file: %s\n',file);
-			return 1;
-		}
-	}
-
-	curses.initscr();
-	cols = curses.getmaxx();
-	rows = curses.getmaxy();
-	curses.cbreak();
-	curses.noecho();
-	curses.printw('Loading...');
-
 	function input(key) {
 		switch (key) {
 		case curses.key.KEY_ESCAPE:
@@ -507,18 +483,70 @@ Options:
 		curses.getch(input);
 	}
 
-	curses.getch(input);
+	function main(argc,argv) {
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
+					case '?':
+						help();
+						return 0;
+						break;
+					default:
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
+					}
+				}
+			}else if (file == null) {
+				file = clite.resolvePath(argv[i],false);
+			}else{
+				stdio.fprintf(io.stderr,'unknown argument: %s\n',argv[i]);
+			}
+		}
 
-	return null;
+		let fd = null;
+
+		if (file == null) {
+			if (stdio.isatty(io.stdin)) {
+				stdio.write(io.stderr,'no file specified\n');
+				return 1;
+			}
+			fd = io.stdin;
+			io.stdin = stdio.open('/dev/tty',stdio.flags.O_RDONLY|stdio.flags.O_SYNC);
+			stdlib.sleep(2,function() {
+				prepFile(fd);
+			});
+		}else{
+			fd = stdio.open(file,stdio.flags.O_RDONLY,prepFile);
+			if (!fd) {
+				stdio.fprintf(io.stderr,'could not open file: %s\n',file);
+				return 1;
+			}
+		}
+
+		curses.initscr();
+		cols = curses.getmaxx();
+		rows = curses.getmaxy();
+		curses.cbreak();
+		curses.noecho();
+		curses.printw('Loading...');
+
+		curses.getch(input);
+
+		return null;
+	}
+
+	return main(args.length,args);
 });
 
 clite.commands.load('rm',function(args,env,io) {
-	var short = null;
-	var file = null;
 	var stdio = io.include('stdio');
 	var clite = io.include('clite');
+
 	var recurse = false;
 	var force = false;
+	var short = null;
+	var file = null;
+
 	function help() {
 		stdio.printf(`
 rm - remove files or directories
@@ -531,37 +559,6 @@ Options:
 `);
 	}
 
-	for (var i=1; i<args.length; i++) {
-		if (args[i][0] == '-') {
-			for (var j=1; j<args[i].length; j++) {
-				switch (args[i][j]) {
-				case 'r':
-					recurse = true;
-					break;
-				case 'f':
-					force = true;
-					break;
-				case '?':
-					help();
-					return 0;
-					break;
-				default:
-					stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
-				}
-			}
-		}else if (file == null) {
-			short = args[i];
-			file = clite.resolvePath(args[i],false);
-		}else{
-			stdio.fprintf(io.stderr,'unknown argument: %s\n',args[i]);
-		}
-	}
-
-	if (file == null) {
-		stdio.fprintf(io.stderr,'no file specified\n');
-		return 1;
-	}
-
 	function removeFile(path) {
 		var st = stdio.lstat(path);
 		if (!st) {
@@ -612,16 +609,50 @@ Options:
 		return 0;
 	}
 
-	return removeFile(file);
+	function main(argc,argv) {
+
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
+					case 'r':
+						recurse = true;
+						break;
+					case 'f':
+						force = true;
+						break;
+					case '?':
+						help();
+						return 0;
+						break;
+					default:
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
+					}
+				}
+			}else if (file == null) {
+				short = argv[i];
+				file = clite.resolvePath(argv[i],false);
+			}else{
+				stdio.fprintf(io.stderr,'unknown argument: %s\n',argv[i]);
+			}
+		}
+
+		if (file == null) {
+			stdio.fprintf(io.stderr,'no file specified\n');
+			return 1;
+		}
+
+		return removeFile(file);
+	}
+
+	return main(args.length,args);
 });
 
 clite.commands.load('mkdir',function(args,env,io) {
-	var short = null;
-	var file = null;
 	var stdio = io.include('stdio');
 	var stdlib = io.include('stdlib');
 	var clite = io.include('clite');
-	var recurse = false;
+
 	function help() {
 		stdio.printf(`
 mkdir - remove files or directories
@@ -633,76 +664,86 @@ Options:
 `);
 	}
 
-	for (var i=1; i<args.length; i++) {
-		if (args[i][0] == '-') {
-			for (var j=1; j<args[i].length; j++) {
-				switch (args[i][j]) {
-				case 'p':
-					recurse = true;
-					break;
-				case '?':
-					help();
-					return 0;
-					break;
-				default:
-					stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
+	function main(argc,argv) {
+		var recurse = false;
+		var short = null;
+		var file = null;
+
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
+					case 'p':
+						recurse = true;
+						break;
+					case '?':
+						help();
+						return 0;
+						break;
+					default:
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
+					}
 				}
+			}else if (file == null) {
+				short = argv[i];
+				file = clite.resolvePath(argv[i]);
+			}else{
+				stdio.fprintf(io.stderr,'unknown argument: %s\n',argv[i]);
 			}
-		}else if (file == null) {
-			short = args[i];
-			file = clite.resolvePath(args[i],false);
-		}else{
-			stdio.fprintf(io.stderr,'unknown argument: %s\n',args[i]);
 		}
-	}
 
-	if (file == null) {
-		stdio.fprintf(io.stderr,'no path specified\n');
-		return 1;
-	}
-
-	var st = stdio.lstat(file);
-	if (st) {
-		stdio.fprintf(io.stderr,'already exists: %s\n',short);
-		return 1;
-	}
-
-	if (!stdio.mkdir(file)) {
-		if (!recurse) {
-			stdio.fprintf(io.stderr,'persmission denied: %s\n',short);
+		if (file == null) {
+			stdio.fprintf(io.stderr,'no path specified\n');
 			return 1;
 		}
 
-		var parts = file.split('/');
-		var path = '';
-		for (var i=0; i<parts.length; i++) {
-			path += '/'+parts[i];
-			st = stdio.stat(path);
-			if (st) {
-				if (st.type != stdio.types.FT_DIR) {
+		var st = stdio.lstat(file);
+		if (st) {
+			stdio.fprintf(io.stderr,'already exists: %s\n',short);
+			return 1;
+		}
+
+		if (!stdio.mkdir(file)) {
+			if (!recurse) {
+				stdio.fprintf(io.stderr,'persmission denied: %s\n',short);
+				return 1;
+			}
+
+			var parts = file.split('/');
+			var path = '';
+			for (var i=0; i<parts.length; i++) {
+				path += '/'+parts[i];
+				st = stdio.stat(path);
+				if (st) {
+					if (st.type != stdio.types.FT_DIR) {
+						stdio.fprintf(io.stderr,'permission denied: %s\n',path);
+						return 1;
+					}
+					continue;
+				}
+				if (!stdio.mkdir(path)) {
 					stdio.fprintf(io.stderr,'permission denied: %s\n',path);
 					return 1;
 				}
-				continue;
-			}
-			if (!stdio.mkdir(path)) {
-				stdio.fprintf(io.stderr,'permission denied: %s\n',path);
-				return 1;
 			}
 		}
+
+		return 0;
 	}
 
-	return 0;
+	return main(args.length,args);
 });
 
 clite.commands.load('chmod',function(args,env,io) {
-	var short = '';
-	var file = null;
 	var stdlib = io.include('stdlib');
 	var stdio = io.include('stdio');
 	var clite = io.include('clite');
+
 	var recurse = false;
 	var modmask = null;
+	var short = '';
+	var file = null;
+
 	function help() {
 		stdio.printf(`
 chmod - change file mode bits
@@ -1025,71 +1066,74 @@ Options:
 		return n;
 	}
 
-	if (args.length == 3) { // name mode file
-		modmask = getModMask(args[1]);
-		short = args[2];
-		file = clite.resolvePath(short);
-	}else if (args.length == 4) { // name option mode file
-		if (args[1][0] != '-') {
+	function main(argc,argv) {
+		if (argc == 3) { // name mode file
+			modmask = getModMask(argv[1]);
+			short = argv[2];
+			file = clite.resolvePath(short);
+		}else if (argc == 4) { // name option mode file
+			if (argv[1][0] != '-') {
+				stdio.write(io.stderr,'invalid arguments\n');
+				return 1;
+			}
+			for (var j=1; j<argv[1].length; j++) {
+				switch (argv[1][j]) {
+				case 'R':
+					recurse = true;
+					break;
+				case '?':
+					help();
+					return 0;
+					break;
+				default:
+					stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
+				}
+			}
+			modmask = getModMask(argv[2]);
+			short = argv[3];
+			file = clite.resolvePath(short);
+		}else if (argc == 2 && argv[1] == '-?') {
+			help();
+			return 0;
+		}else{
 			stdio.write(io.stderr,'invalid arguments\n');
 			return 1;
 		}
-		for (var j=1; j<args[1].length; j++) {
-			switch (args[1][j]) {
-			case 'R':
-				recurse = true;
-				break;
-			case '?':
-				help();
-				return 0;
-				break;
-			default:
-				stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
-			}
+
+		if (modmask == null || modmask == '?????????') {
+			stdio.write(io.stderr,'invalid mode\n');
+			return 1;
 		}
-		modmask = getModMask(args[2]);
-		short = args[3];
-		file = clite.resolvePath(short);
-	}else if (args.length == 2 && args[1] == '-?') {
-		help();
+
+		if (file == null) {
+			stdio.write(io.stderr,'no file specified\n');
+			return 1;
+		}
+
+		var st = stdio.lstat(file);
+		if (!st) {
+			stdio.fprintf(io.stderr,'cannot open file: %s\n',short);
+			return 1;
+		}
+
+		var mode = getMode(st.st_mode,(st.type == stdio.types.FT_DIR));
+
+		if (!stdio.chmod(file,mode)) {
+			stdio.fprintf(io.stderr,'cannot write file: %s\n',short);
+			return 1;
+		}
+
 		return 0;
-	}else{
-		stdio.write(io.stderr,'invalid arguments\n');
-		return 1;
 	}
 
-	if (modmask == null || modmask == '?????????') {
-		stdio.write(io.stderr,'invalid mode\n');
-		return 1;
-	}
-
-	if (file == null) {
-		stdio.write(io.stderr,'no file specified\n');
-		return 1;
-	}
-
-	var st = stdio.lstat(file);
-	if (!st) {
-		stdio.fprintf(io.stderr,'cannot open file: %s\n',short);
-		return 1;
-	}
-
-	var mode = getMode(st.st_mode,(st.type == stdio.types.FT_DIR));
-
-	if (!stdio.chmod(file,mode)) {
-		stdio.fprintf(io.stderr,'cannot write file: %s\n',short);
-		return 1;
-	}
-
-	return 0;
+	return main(args.length,args);
 });
 
 clite.commands.load('file',function(args,env,io) {
-	var short = '';
-	var file = null;
 	var stdlib = io.include('stdlib');
 	var stdio = io.include('stdio');
 	var clite = io.include('clite');
+
 	function help() {
 		stdio.printf(`
 file - determine the file type
@@ -1100,79 +1144,87 @@ Options:
 `);
 	}
 
-	for (var i=1; i<args.length; i++) {
-		if (args[i][0] == '-') {
-			for (var j=1; j<args[i].length; j++) {
-				switch (args[i][j]) {
-				case '?':
-					help();
-					return 0;
-					break;
-				default:
-					stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
+	function main(argc,argv) {
+		var short = '';
+		var file = null;
+
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
+					case '?':
+						help();
+						return 0;
+						break;
+					default:
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
+					}
 				}
+			}else if (file == null) {
+				short = argv[i];
+				file = clite.resolvePath(argv[i],false);
+			}else{
+				stdio.fprintf(io.stderr,'unknown argument: %s\n',argv[i]);
 			}
-		}else if (file == null) {
-			short = args[i];
-			file = clite.resolvePath(args[i],false);
+		}
+
+		if (file == null) {
+			stdio.write(io.stderr,'no file specified\n');
+			return 1;
+		}
+
+		var st = stdio.lstat(file);
+
+		var txt = short+': ';
+		if (!st) {
+			stdio.fprintf(io.stderr,'cannot open file: %s\n',file);
+			return 1;
 		}else{
-			stdio.fprintf(io.stderr,'unknown argument: %s\n',args[i]);
+			switch (st.type) {
+			case stdio.types.FT_TEXT:
+				txt += 'Plain Text';
+				break;
+			case stdio.types.FT_BINARY:
+				txt += 'CLIte Executable';
+				break;
+			case stdio.types.FT_DIR:
+				txt += 'Directory';
+				break;
+			case stdio.types.FT_LINK:
+				txt += 'Link';
+				break;
+			case stdio.types.FT_DEV:
+				txt += 'Device File';
+				break;
+			case stdio.types.FT_REMOTE:
+				txt += 'Unloaded Remote Data';
+				break;
+			case stdio.types.FT_SCRIPT:
+				txt += 'Shell Script';
+				break;
+			case stdio.types.FT_IMAGE:
+				txt += 'Image';
+				break;
+			case stdio.types.FT_LIBRARY:
+				txt += 'Shared Object';
+				break;
+			default:
+				txt += 'Unknown Data';
+				break;
+			}
 		}
+
+		stdio.printf('%s\n',txt);
+
+		return 0;
 	}
 
-	if (file == null) {
-		stdio.write(io.stderr,'no file specified\n');
-		return 1;
-	}
-
-	var st = stdio.lstat(file);
-
-	var txt = short+': ';
-	if (!st) {
-		stdio.fprintf(io.stderr,'cannot open file: %s\n',file);
-		return 1;
-	}else{
-		switch (st.type) {
-		case stdio.types.FT_TEXT:
-			txt += 'Plain Text';
-			break;
-		case stdio.types.FT_BINARY:
-			txt += 'CLIte Executable';
-			break;
-		case stdio.types.FT_DIR:
-			txt += 'Directory';
-			break;
-		case stdio.types.FT_LINK:
-			txt += 'Link';
-			break;
-		case stdio.types.FT_DEV:
-			txt += 'Device File';
-			break;
-		case stdio.types.FT_REMOTE:
-			txt += 'Unloaded Remote Data';
-			break;
-		case stdio.types.FT_SCRIPT:
-			txt += 'Shell Script';
-			break;
-		case stdio.types.FT_IMAGE:
-			txt += 'Image';
-			break;
-		case stdio.types.FT_LIBRARY:
-			txt += 'Shared Object';
-			break;
-		default:
-			txt += 'Unknown Data';
-			break;
-		}
-	}
-
-	stdio.printf('%s\n',txt);
-
-	return 0;
+	return main(args.length,args);
 });
 
 clite.commands.load('reboot',function(args,env,io) {
 	var stdio = io.include('stdio');
+
 	function help() {
 		stdio.printf(`
 reboot - reboot the system, forcing reload of all code
@@ -1183,40 +1235,39 @@ Options:
 `);
 	}
 
-	for (var i=1; i<args.length; i++) {
-		if (args[i][0] == '-') {
-			for (var j=1; j<args[i].length; j++) {
-				switch (args[i][j]) {
-				case '?':
-					help();
-					return 0;
-					break;
-				default:
-					stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
+	function main(argc,argv) {
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
+					case '?':
+						help();
+						return 0;
+						break;
+					default:
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
+					}
 				}
+			}else{
+				stdio.fprintf(io.stderr,'unknown argument: %s\n',argv[i]);
 			}
-		}else{
-			stdio.fprintf(io.stderr,'unknown argument: %s\n',args[i]);
 		}
+
+		var fd = stdio.open('/dev/initctl',stdio.flags.O_WRONLY|stdio.flags.O_SYNC);
+		if (!fd)
+			return 1;
+		stdio.write(fd,'6'); // switch to runlevel 6, reboot
+		stdio.close(fd);
+
+		return 0;
 	}
 
-	var fd = stdio.open('/dev/initctl',stdio.flags.O_WRONLY|stdio.flags.O_SYNC);
-	if (!fd)
-		return 1;
-	stdio.write(fd,'6'); // switch to runlevel 6, reboot
-	stdio.close(fd);
-
-	return 0;
+	return main(args.length,args);
 });
 
 clite.commands.load('uname',function(args,env,io) {
 	var stdio = io.include('stdio');
 	var stdlib = io.include('stdlib');
-	var sysname = false;
-	var nodename = false;
-	var release = false;
-	var version = false;
-	var machine = false;
 
 	function help() {
 		stdio.printf(`
@@ -1234,65 +1285,74 @@ Options:
 `);
 	}
 
-	for (var i=1; i<args.length; i++) {
-		if (args[i][0] == '-') {
-			for (var j=1; j<args[i].length; j++) {
-				switch (args[i][j]) {
-				case '?':
-					help();
-					return 0;
-					break;
-				case 'a':
-					machine = true;
-					nodename = true;
-					release = true;
-					sysname = true;
-					version = true;
-					break;
-				case 'm':
-					machine = true;
-					break;
-				case 'n':
-					nodename = true;
-					break;
-				case 'r':
-					release = true;
-					break;
-				case 's':
-					sysname = true;
-					break;
-				case 'v':
-					version = true;
-					break;
-				default:
-					stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
+	function main(argc,argv) {
+		var sysname = false;
+		var nodename = false;
+		var release = false;
+		var version = false;
+		var machine = false;
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
+					case '?':
+						help();
+						return 0;
+						break;
+					case 'a':
+						machine = true;
+						nodename = true;
+						release = true;
+						sysname = true;
+						version = true;
+						break;
+					case 'm':
+						machine = true;
+						break;
+					case 'n':
+						nodename = true;
+						break;
+					case 'r':
+						release = true;
+						break;
+					case 's':
+						sysname = true;
+						break;
+					case 'v':
+						version = true;
+						break;
+					default:
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
+					}
 				}
+			}else{
+				stdio.fprintf(io.stderr,'unknown argument: %s\n',argv[i]);
 			}
-		}else{
-			stdio.fprintf(io.stderr,'unknown argument: %s\n',args[i]);
 		}
+
+		if (!machine && !nodename && !release && !sysname && !version)
+			sysname = true;
+
+		var ut = stdlib.uname();
+
+		var txt = '';
+		if (sysname)
+			txt += ut.sysname+' ';
+		if (nodename)
+			txt += ut.nodename+' ';
+		if (release)
+			txt += ut.release+' ';
+		if (version)
+			txt += ut.version+' ';
+		if (machine)
+			txt += ut.machine;
+
+		stdio.printf('%s\n',txt);
+
+		return 0;
 	}
 
-	if (!machine && !nodename && !release && !sysname && !version)
-		sysname = true;
-
-	var ut = stdlib.uname();
-
-	var txt = '';
-	if (sysname)
-		txt += ut.sysname+' ';
-	if (nodename)
-		txt += ut.nodename+' ';
-	if (release)
-		txt += ut.release+' ';
-	if (version)
-		txt += ut.version+' ';
-	if (machine)
-		txt += ut.machine;
-
-	stdio.printf('%s\n',txt);
-
-	return 0;
+	return main(args.length,args);
 });
 
 clite.commands.load('date',function(args,env,io) {
@@ -1320,13 +1380,13 @@ Options:
 			//tm_yday:0,	// day of year (0-365)
 			//tm_isdst:0	// 1 if daylight savings
 
-	function main(args) {
+	function main(argc,argv) {
 		var utc = false;
 		var format = '%a %d %b %Y %T %Z';
-		for (var i=1; i<args.length; i++) {
-			if (args[i][0] == '-') {
-				for (var j=1; j<args[i].length; j++) {
-					switch (args[i][j]) {
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
 					case '?':
 						help();
 						return 0;
@@ -1335,14 +1395,14 @@ Options:
 						utc = true;
 						break;
 					default:
-						stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
 					}
 				}
-			}else if (args[i][0] == '+') {
-				format = args[i].substring(1);
+			}else if (argv[i][0] == '+') {
+				format = argv[i].substring(1);
 			}else{
 				// TODO: set time
-				stdio.fprintf(io.stderr,'unknown argument: %s\n',args[i]);
+				stdio.fprintf(io.stderr,'unknown argument: %s\n',argv[i]);
 			}
 		}
 
@@ -1367,12 +1427,13 @@ Options:
 	}
 
 
-	return main(args);
+	return main(args.length,args);
 });
 
 clite.commands.load('head',function(args,env,io) {
 	var stdio = io.include('stdio');
 	var clite = io.include('clite');
+
 	var lines = 10;
 
 	function help() {
@@ -1402,14 +1463,14 @@ Options:
 		io.exit(0);
 	}
 
-	function main(args) {
+	function main(argc,argv) {
 		var lnext = false;
 		var short = null;
 		var file = null;
-		for (var i=1; i<args.length; i++) {
-			if (args[i][0] == '-') {
-				for (var j=1; j<args[i].length; j++) {
-					switch (args[i][j]) {
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
 					case '?':
 						help();
 						return 0;
@@ -1418,21 +1479,21 @@ Options:
 						lnext = true;
 						break;
 					default:
-						stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
 					}
 				}
 			}else if (lnext) {
-				lines = parseInt(args[i]);
+				lines = parseInt(argv[i]);
 				if (lines < 1) {
 					stdio.fprintf(io.stderr,'invalid lines count "%d"\n',lines);
 					return 1;
 				}
 				lnext = false;
 			}else if (file == null) {
-				short = args[i];
-				file = clite.resolvePath(args[i]);
+				short = argv[i];
+				file = clite.resolvePath(argv[i]);
 			}else{
-				stdio.fprintf(io.stderr,'unknown argument: %s\n',args[i]);
+				stdio.fprintf(io.stderr,'unknown argument: %s\n',argv[i]);
 			}
 		}
 
@@ -1455,12 +1516,13 @@ Options:
 	}
 
 
-	return main(args);
+	return main(args.length,args);
 });
 
 clite.commands.load('tail',function(args,env,io) {
 	var stdio = io.include('stdio');
 	var clite = io.include('clite');
+
 	var lines = 10;
 	var chars = 0;
 
@@ -1509,15 +1571,15 @@ Options:
 		io.exit(0);
 	}
 
-	function main(args) {
+	function main(argc,argv) {
 		var lnext = false;
 		var cnext = false;
 		var short = null;
 		var file = null;
-		for (var i=1; i<args.length; i++) {
-			if (args[i][0] == '-') {
-				for (var j=1; j<args[i].length; j++) {
-					switch (args[i][j]) {
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
 					case '?':
 						help();
 						return 0;
@@ -1529,28 +1591,28 @@ Options:
 						lnext = true;
 						break;
 					default:
-						stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
 					}
 				}
 			}else if (lnext) {
-				lines = parseInt(args[i]);
+				lines = parseInt(argv[i]);
 				if (lines < 1) {
 					stdio.fprintf(io.stderr,'invalid lines count "%d"\n',lines);
 					return 1;
 				}
 				lnext = false;
 			}else if (cnext) {
-				chars = parseInt(args[i]);
+				chars = parseInt(argv[i]);
 				if (chars < 1) {
 					stdio.fprintf(io.stderr,'invalid characters count "%d"\n',chars);
 					return 1;
 				}
 				cnext = false;
 			}else if (file == null) {
-				short = args[i];
-				file = clite.resolvePath(args[i]);
+				short = argv[i];
+				file = clite.resolvePath(argv[i]);
 			}else{
-				stdio.fprintf(io.stderr,'unknown argument: %s\n',args[i]);
+				stdio.fprintf(io.stderr,'unknown argument: %s\n',argv[i]);
 			}
 		}
 
@@ -1573,7 +1635,7 @@ Options:
 	}
 
 
-	return main(args);
+	return main(args.length,args);
 });
 
 clite.commands.load('strip',function(args,env,io) {
@@ -1597,27 +1659,27 @@ Options:
 	// unnecessary for execution of those files" - doing nothing is
 	// compliant
 
-	function main(args) {
-		for (var i=1; i<args.length; i++) {
-			if (args[i][0] == '-') {
-				for (var j=1; j<args[i].length; j++) {
-					switch (args[i][j]) {
+	function main(argc,argv) {
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
 					case '?':
 						help();
 						return 0;
 						break;
 					default:
-						stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
 					}
 				}
 			}else{
-				stdio.fprintf(io.stderr,'unknown argument: %s\n',args[i]);
+				stdio.fprintf(io.stderr,'unknown argument: %s\n',argv[i]);
 			}
 		}
 		return 0;
 	}
 
-	return main(args);
+	return main(args.length,args);
 });
 
 clite.commands.load('sleep',function(args,env,io) {
@@ -1638,22 +1700,22 @@ Options:
 		io.exit(0);
 	}
 
-	function main(args) {
+	function main(argc,argv) {
 		var seconds = 0;
-		for (var i=1; i<args.length; i++) {
-			if (args[i][0] == '-') {
-				for (var j=1; j<args[i].length; j++) {
-					switch (args[i][j]) {
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
 					case '?':
 						help();
 						return 0;
 						break;
 					default:
-						stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
 					}
 				}
 			}else{
-				seconds = parseInt(args[i]);
+				seconds = parseInt(argv[i]);
 			}
 		}
 		if (seconds < 1)
@@ -1664,7 +1726,7 @@ Options:
 		return null;
 	}
 
-	return main(args);
+	return main(args.length,args);
 });
 
 clite.commands.load('test',function(args,env,io) {
@@ -1681,27 +1743,27 @@ Options:
 `);
 	}
 
-	function main(args) {
+	function main(argc,argv) {
 		var negate = false;
-		if (args.length == 1)
+		if (argc == 1)
 			return 1;
-		if (args.length == 2) {
-			if (args[1] == '-?') {
+		if (argc == 2) {
+			if (argv[1] == '-?') {
 				help();
 				return 0;
 			}
-			if (args[1].length > 0)
+			if (argv[1].length > 0)
 				return 0;
 			return 1;
 		}
 
-		if (args.length > 5)
+		if (argc > 5)
 			return 1;
 
-		var uargs = Array.from(args);
+		var uargs = Array.from(argv);
 		uargs.shift();
 
-		if (args[0] == '[' && uargs[uargs.length-1] == ']')
+		if (argv[0] == '[' && uargs[uargs.length-1] == ']')
 			uargs.pop();
 
 		if (uargs[0] == '!') {
@@ -2065,7 +2127,7 @@ Options:
 	}
 
 
-	return main(args);
+	return main(args.length,args);
 });
 
 clite.commands.load('load',function(args,env,io) {
@@ -2116,21 +2178,21 @@ Options:
 		io.exit(0);
 	}
 
-	function main(args) {
-		for (var i=1; i<args.length; i++) {
-			if (args[i][0] == '-') {
-				for (var j=1; j<args[i].length; j++) {
-					switch (args[i][j]) {
+	function main(argc,argv) {
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
 					case '?':
 						help();
 						return 0;
 						break;
 					default:
-						stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
 					}
 				}
 			}else{
-				short = args[i];
+				short = argv[i];
 				file = clite.resolvePath(short);
 			}
 		}
@@ -2157,7 +2219,7 @@ Options:
 		return null;
 	}
 
-	return main(args);
+	return main(args.length,args);
 });
 
 clite.commands.load('chown',function(args,env,io) {
@@ -2197,13 +2259,13 @@ Options:
 		stdio.close(fd);
 	}
 
-	function main(args) {
+	function main(argc,argv) {
 		let files = [];
 		let recurse = false;
-		for (var i=1; i<args.length; i++) {
-			if (args[i][0] == '-') {
-				for (var j=1; j<args[i].length; j++) {
-					switch (args[i][j]) {
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
 					case '?':
 						help();
 						return 0;
@@ -2212,13 +2274,13 @@ Options:
 						recurse = true;
 						break;
 					default:
-						stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
 					}
 				}
 			}else if (user == null) {
-				user = args[i];
+				user = argv[i];
 			}else{
-				files.push(args[i]);
+				files.push(argv[i]);
 			}
 		}
 
@@ -2288,16 +2350,21 @@ Options:
 		return 0;
 	}
 
-	return main(args);
+	return main(args.length,args);
 });
 
 if (window.location.protocol == 'file:')
 clite.commands.load('exp',function(args,env,io) {
 	var stdio = io.include('stdio');
 	var stdlib = io.include('stdlib');
-	stdio.printf('%d %d %d\n',stdlib.getuid(),stdlib.getgid(),io.pid);
 
-	return 0;
+	function main(argc,argv) {
+		stdio.printf('%d %d %d\n',stdlib.getuid(),stdlib.getgid(),io.pid);
+
+		return 0;
+	}
+
+	return main(args.length,args);
 });
 
 // insert commands above this line
diff --git a/clite/shell.js b/clite/shell.js
index 0349cce..5903087 100644
--- a/clite/shell.js
+++ b/clite/shell.js
@@ -6,7 +6,9 @@ clite.commands.load('sh',function(args,env,io) {
 	var stdlib = io.include('stdlib');
 	var term = io.include('term');
 	var clite = io.include('clite');
+
 	var has_exited = false;
+
 	var macro = {
 		clear:function(args,io) {
 			term.clear();
@@ -1073,13 +1075,13 @@ Options:
 		stdio.read(io.stdin,inputProcess);
 	}
 
-	function main(args) {
+	function main(argc,argv) {
 		var f = null;
 		var s = false;
-		for (var i=1; i<args.length; i++) {
-			if (args[i][0] == '-') {
-				for (var j=1; j<args[i].length; j++) {
-					switch (args[i][j]) {
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
 					case '?':
 						help();
 						return 0;
@@ -1088,25 +1090,25 @@ Options:
 						s = true;
 						break;
 					default:
-						stdio.fprintf(io.stderr,'unknown argument -%c\n',args[i][j]);
+						stdio.fprintf(io.stderr,'unknown argument -%c\n',argv[i][j]);
 					}
 				}
 			}else if (f == null) {
-				f = clite.resolvePath(args[i]);
+				f = clite.resolvePath(argv[i]);
 			}else{
-				stdio.fprintf(io.stderr,'unknown argument - %s\n',args[i]);
+				stdio.fprintf(io.stderr,'unknown argument - %s\n',argv[i]);
 			}
 		}
 
-		// if args[0] isn't the shell itself, then we're running a shell script
-		if (!f && args[0] != '/bin/sh' && args[0] != 'sh') {
-			f = clite.resolvePath(args[0]);
+		// if argv[0] isn't the shell itself, then we're running a shell script
+		if (!f && argv[0] != '/bin/sh' && argv[0] != 'sh') {
+			f = clite.resolvePath(argv[0]);
 			if (!f)
 				return 1;
 			// make the arguments readable by the shell script
-			env['#'] = args.length.toString();
-			for (var i=0; i<args.length; i++) {
-				env[i.toString()] = args[i];
+			env['#'] = argc.toString();
+			for (var i=0; i<argc; i++) {
+				env[i.toString()] = argv[i];
 			}
 		}
 
@@ -1136,7 +1138,7 @@ Options:
 		return null;
 	}
 
-	return main(args);
+	return main(args.length,args);
 });
 
 }
diff --git a/clite/user.js b/clite/user.js
index 1d08184..d9695ef 100644
--- a/clite/user.js
+++ b/clite/user.js
@@ -113,19 +113,19 @@ Options:
 		}
 	}
 
-	function main(args) {
+	function main(argc,argv) {
 		var user = 'root';
 		var shellnext = false;
 		var accept = false;
-		for (var i=1; i<args.length; i++) {
+		for (var i=1; i<argc; i++) {
 			if (shellnext == true) {
-				shell = args[i];
+				shell = argv[i];
 				shellnext = false;
-			}else if (args[i] == '-') {
+			}else if (argv[i] == '-') {
 				preserve = false;
-			}else if (args[i][0] == '-') {
-				for (var j=1; j<args[i].length; j++) {
-					switch (args[i][j]) {
+			}else if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
 					case '?':
 						help();
 						return 0;
@@ -143,11 +143,11 @@ Options:
 						accept = true;
 						break;
 					default:
-						stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
 					}
 				}
 			}else{
-				user = args[i];
+				user = argv[i];
 			}
 		}
 
@@ -182,7 +182,7 @@ Options:
 		return null;
 	}
 
-	return main(args);
+	return main(args.length,args);
 },true);
 
 clite.commands.load('user',function(args,env,io) {
@@ -378,21 +378,21 @@ Options:
 		}
 	}
 
-	function main(args) {
+	function main(argc,argv) {
 		let add = false;
 		let rem = false;
 		let shellnext = false;
 		let groupnext = false;
-		for (var i=1; i<args.length; i++) {
+		for (var i=1; i<argc; i++) {
 			if (shellnext == true) {
-				shell = args[i];
+				shell = argv[i];
 				shellnext = false;
 			}else if (groupnext == true) {
-				group = args[i];
+				group = argv[i];
 				groupnext = false;
-			}else if (args[i][0] == '-') {
-				for (var j=1; j<args[i].length; j++) {
-					switch (args[i][j]) {
+			}else if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
 					case '?':
 						help();
 						return 0;
@@ -410,11 +410,11 @@ Options:
 						groupnext = true;
 						break;
 					default:
-						stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
 					}
 				}
 			}else{
-				user = args[i];
+				user = argv[i];
 			}
 		}
 
@@ -443,7 +443,7 @@ Options:
 		return 1;
 	}
 
-	return main(args);
+	return main(args.length,args);
 },true);
 
 clite.commands.load('login',function(args,env,io) {
@@ -555,22 +555,22 @@ Options:
 			stdio.write(io.stderr,'internal error\n');
 	}
 
-	function main(args) {
+	function main(argc,argv) {
 		let user = null;
-		for (var i=1; i<args.length; i++) {
-			if (args[i][0] == '-') {
-				for (var j=1; j<args[i].length; j++) {
-					switch (args[i][j]) {
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
 					case '?':
 						help();
 						return 0;
 						break;
 					default:
-						stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
 					}
 				}
 			}else{
-				user = args[i];
+				user = argv[i];
 			}
 		}
 
@@ -596,7 +596,7 @@ Options:
 		return null;
 	}
 
-	return main(args);
+	return main(args.length,args);
 });
 
 clite.commands.load('cookie',function(args,env,io) {
@@ -643,14 +643,14 @@ Options:
 		}
 	}
 
-	function main(args) {
+	function main(argc,argv) {
 		let accept = false;
 		let reject = false;
 		let check = false;
-		for (var i=1; i<args.length; i++) {
-			if (args[i][0] == '-') {
-				for (var j=1; j<args[i].length; j++) {
-					switch (args[i][j]) {
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
 					case '?':
 						help();
 						return 0;
@@ -665,11 +665,11 @@ Options:
 						reject = true;
 						break;
 					default:
-						stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
 					}
 				}
 			}else{
-				stdio.fprintf(io.stderr,'unknown argument: %s\n',args[i]);
+				stdio.fprintf(io.stderr,'unknown argument: %s\n',argv[i]);
 			}
 		}
 
@@ -699,7 +699,7 @@ Options:
 		return null;
 	}
 
-	return main(args);
+	return main(args.length,args);
 });
 
 clite.commands.load('passwd',function(args,env,io) {
@@ -776,21 +776,21 @@ Options:
 		}
 	}
 
-	function main(args) {
-		for (var i=1; i<args.length; i++) {
-			if (args[i][0] == '-') {
-				for (var j=1; j<args[i].length; j++) {
-					switch (args[i][j]) {
+	function main(argc,argv) {
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
 					case '?':
 						help();
 						return 0;
 						break;
 					default:
-						stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
 					}
 				}
 			}else{
-				user = args[i];
+				user = argv[i];
 			}
 		}
 
@@ -822,7 +822,7 @@ Options:
 		return null;
 	}
 
-	return main(args);
+	return main(args.length,args);
 });
 
 }
diff --git a/clite/vi.js b/clite/vi.js
index e3b79d0..c9cbc5a 100644
--- a/clite/vi.js
+++ b/clite/vi.js
@@ -62,28 +62,6 @@ Options:
 `);
 	}
 
-	for (var i=1; i<args.length; i++) {
-		if (args[i][0] == '-') {
-			for (var j=1; j<args[i].length; j++) {
-				switch (args[i][j]) {
-				case '?':
-					help();
-					return 0;
-					break;
-				default:
-					stdio.fprintf(io.stderr,'unknown argument: -%c\n',args[i][j]);
-				}
-			}
-		}else if (file == null) {
-			file = clite.resolvePath(args[i],false);
-		}else{
-			stdio.fprintf(io.stderr,'unknown argument: %s\n',args[i]);
-		}
-	}
-
-	if (!stdio.isatty(io.stdin))
-		return 1;
-
 	function calculateBottomLine() {
 		bottomLine = lines.length;
 		var r = rows;
@@ -274,24 +252,6 @@ Options:
 		changed = true;
 	}
 
-	if (file == null) {
-		stdio.write(io.stderr,'no file specified\n');
-		return 1;
-	}
-
-	var fd = stdio.open(file,stdio.flags.O_RDONLY|stdio.flags.O_CREAT,prepFile);
-	if (!fd) {
-		stdio.fprintf(io.stderr,'could not open file: %s\n',file);
-		return 1;
-	}
-
-	curses.initscr();
-	cols = curses.getmaxx();
-	rows = curses.getmaxy();
-	curses.cbreak();
-	curses.noecho();
-	curses.printw('Loading...');
-
 	function input(key) {
 		if (mode == 0) { // view mode
 			//message = '';
@@ -405,9 +365,53 @@ Options:
 		curses.getch(input);
 	}
 
-	curses.getch(input);
+	function main(argc,argv) {
+		for (var i=1; i<argc; i++) {
+			if (argv[i][0] == '-') {
+				for (var j=1; j<argv[i].length; j++) {
+					switch (argv[i][j]) {
+					case '?':
+						help();
+						return 0;
+						break;
+					default:
+						stdio.fprintf(io.stderr,'unknown argument: -%c\n',argv[i][j]);
+					}
+				}
+			}else if (file == null) {
+				file = clite.resolvePath(argv[i],false);
+			}else{
+				stdio.fprintf(io.stderr,'unknown argument: %s\n',argv[i]);
+			}
+		}
 
-	return null;
+		if (!stdio.isatty(io.stdin))
+			return 1;
+
+		if (file == null) {
+			stdio.write(io.stderr,'no file specified\n');
+			return 1;
+		}
+
+		var fd = stdio.open(file,stdio.flags.O_RDONLY|stdio.flags.O_CREAT,prepFile);
+		if (!fd) {
+			stdio.fprintf(io.stderr,'could not open file: %s\n',file);
+			return 1;
+		}
+
+		curses.initscr();
+		cols = curses.getmaxx();
+		rows = curses.getmaxy();
+		curses.cbreak();
+		curses.noecho();
+		curses.printw('Loading...');
+
+		curses.getch(input);
+
+		return null;
+	}
+
+	return main(args.length,args);
 });
 
 }