Merged in ursaf/inferno-os (pull request #4)

Fix "clipboard get only the first symbol" (Issue #303)

3 files changed, 4 insertions, 8 deletions

diff --git a/emu/Nt/r16.h b/emu/Nt/r16.h
index 4dbfa43f..de09eacc 100644
--- a/emu/Nt/r16.h
+++ b/emu/Nt/r16.h
@@ -7,4 +7,4 @@ typedef unsigned short Rune16;
 	Rune16*	runes16dup(Rune16*);
 	Rune16*	utftorunes16(Rune16*, char*, int);
 	char*	runes16toutf(char*, Rune16*, int);
-	int		runescmp(Rune16*, Rune16*);
+	int		runes16cmp(Rune16*, Rune16*);
diff --git a/emu/Nt/win.c b/emu/Nt/win.c
index 4eb56f45..b6330b16 100644
--- a/emu/Nt/win.c
+++ b/emu/Nt/win.c
@@ -752,7 +752,7 @@ int
 clipwrite(char *buf)
 {
 	HANDLE h;
-	char *p, *e;
+	char *p;
 	Rune *rp;
 	int n;
 
@@ -771,11 +771,7 @@ clipwrite(char *buf)
 	if(h == NULL)
 		error(Enovmem);
 	rp = GlobalLock(h);
-	p = buf;
-	e = p+n;
-	while(p<e)
-		p += chartorune(rp++, p);
-	*rp = 0;
+	utftorunes16(rp, buf, n+1);
 	GlobalUnlock(h);
 
 	SetClipboardData(CF_UNICODETEXT, h);
diff --git a/mkfile b/mkfile
index 4f7637fb..4bcd77c6 100644
--- a/mkfile
+++ b/mkfile
@@ -180,4 +180,4 @@ mkdirs-sh:V:
 	chmod 555 mnt/* n/client/* n/*
 
 mkdirs-nt:V:
-	mkdir -p `{cat lib/emptydirs}
+	mkdir -p `{cmd /c type lib\emptydirs}