shithub: mc

Info  •  Files  •  Log  •  Branches

Merge branch 'master' of git+ssh://mimir.eigenstate.org/git/ori/mc

--- a/libstd/fmt.myr

+++ b/libstd/fmt.myr

@@ -220,7 +220,7 @@

                         | 'c':    (c_val, ap) = vanext(ap)

                                 n += encode(buf[n:], c_val)

                         | _:

-                                die("Unknown format specifier")

+                                die("Unknown format specifier\n")

 			;;

 		else

 			n += encode(buf[n:], c)

--- a/libstd/sys-linux.myr

+++ b/libstd/sys-linux.myr

@@ -565,7 +565,7 @@

 const stat	= {path, sb;		-> syscall(Sysstat, cstring(path), sb)}

 const fstat	= {fd, sb;		-> syscall(Sysfstat, fd, sb)}

 const mkdir	= {path, mode;		-> syscall(Sysmkdir, cstring(path), mode) castto(int64)}

-const ioctl	= {fd, req, args	-> syscall(Sysioctl, fd, req, &args) castto(int64)}

+const ioctl	= {fd, req, args;	-> syscall(Sysioctl, fd, req, &args) castto(int64)}

 /* networking */

 const socket	= {dom, stype, proto;	-> syscall(Syssocket, dom castto(int64), stype, proto) castto(fd)}

--- a/libstd/sys-osx.myr

+++ b/libstd/sys-osx.myr

@@ -508,6 +508,7 @@

 	const stat	: (path:byte[:], sb:statbuf# -> int64)

 	const fstat	: (fd:fd, sb:statbuf# -> int64)

 	const mkdir	: (path : byte[:], mode : int64	-> int64)

+	const ioctl	: (fd:fd, req : int64, args:... -> int64)

 	/* networking */

 	const socket	: (dom : sockfam, stype : socktype, proto : sockproto	-> fd)

@@ -599,6 +600,7 @@

 const stat	= {path, sb;		-> syscall(Sysstat, cstring(path), sb)}

 const fstat	= {fd, sb;		-> syscall(Sysfstat, fd, sb)}

 const mkdir	= {path, mode;		-> syscall(Sysmkdir, cstring(path), mode) castto(int64)}

+const ioctl	= {fd, req, args;	-> syscall(Sysioctl, fd, req, &args) castto(int64)}

 /* networking */

 const socket	= {dom, stype, proto;	-> syscall(Syssocket, dom castto(int64), stype, proto) castto(fd) }