shithub: mc

Info  •  Files  •  Log  •  Branches

Merge commit '1877918ac3ebf4ca955a0956a1067139c06efb7c'

Conflicts:
	libstd/env+plan9.myr
	libstd/sys+plan9-x64.myr
	myrbuild/myrbuild.c

--- a/libstd/env+plan9.myr

+++ b/libstd/env+plan9.myr

@@ -41,8 +41,8 @@

 		match std.slurp(buf[:n])

 		| `Fail m: -> `None

 		| `Ok data:

-			slpush(envkey, sldup(name))

-			slpush(envval, data)

+			envkey = slpush(envkey, sldup(name))

+			envval = slpush(envval, data)

 			-> `Some data

 		;;

 	;;

--- a/libstd/sys+plan9-x64.myr

+++ b/libstd/sys+plan9-x64.myr

@@ -204,7 +204,7 @@

 const segflush	= {va, len;	-> syscall(Syssegfree, a(va), a(len))}

 const unmount	= {name, old;	-> syscall(Sysunmount, cstring(name), cstring(old))}

 const errstr	= {buf;		-> syscall(Syserrstr, p(buf), a(buf.len))}

-const stat	= {name, edir;	-> syscall(Sysstat, cstring(name), p(edir), a(edir.len)) & 0xfffffff}

+const stat	= {name, edir;	-> syscall(Sysstat, cstring(name), p(edir), a(edir.len))}

 const fstat	= {fd, edir;	-> syscall(Sysstat, a(fd), p(edir), a(edir.len))}

 const wstat	= {name, edir;	-> syscall(Syswstat, cstring(name), p(edir), a(edir.len))}

 const fwstat	= {fd, edir;	-> syscall(Sysfwstat, a(fd), p(edir), a(edir.len))}