Move utf, fmt. Small header file changes.

4 files changed, 19 insertions, 3 deletions

diff --git a/include/complete.h b/include/complete.h
index 7ee2b18a..ae8003d7 100644
--- a/include/complete.h
+++ b/include/complete.h
@@ -1,5 +1,7 @@
+/*
 #pragma	lib	"libcomplete.a"
 #pragma src "/sys/src/libcomplete"
+*/
 
 typedef struct Completion Completion;
 
@@ -7,7 +9,8 @@ struct Completion{
 	uchar advance;		/* whether forward progress has been made */
 	uchar complete;	/* whether the completion now represents a file or directory */
 	char *string;		/* the string to advance, suffixed " " or "/" for file or directory */
-	int nfile;			/* number of files that matched */
+	int nmatch;		/* number of files that matched */
+	int nfile;			/* number of files returned */
 	char **filename;	/* their names */
 };
 
diff --git a/include/lib9.h b/include/lib9.h
index 8d5bdf96..94936e9e 100644
--- a/include/lib9.h
+++ b/include/lib9.h
@@ -742,6 +742,7 @@ extern	void	abort(void);
 extern	int	p9access(char*, int);
 extern	long	p9alarm(ulong);
 extern	int	await(char*, int);
+extern	int	awaitnohang(char*, int);
 /* extern	int	bind(char*, char*, int); give up */
 /* extern	int	brk(void*); <unistd.h> */
 extern	int	p9chdir(char*);
@@ -790,6 +791,7 @@ extern	int	segfree(void*, ulong);
 extern	int	p9sleep(long);
 /* extern	int	stat(char*, uchar*, int); give up */
 extern	Waitmsg*	p9wait(void);
+extern	Waitmsg*	waitnohang(void);
 extern	int	p9waitpid(void);
 /* <unistd.h>
 extern	long	write(int, void*, long);
diff --git a/include/plumb.h b/include/plumb.h
index 4a315467..a84344ac 100644
--- a/include/plumb.h
+++ b/include/plumb.h
@@ -42,6 +42,7 @@ struct Plumbattr
 
 int			plumbsend(int, Plumbmsg*);
 Plumbmsg*	plumbrecv(int);
+Plumbmsg*	threadplumbrecv(int);
 char*		plumbpack(Plumbmsg*, int*);
 Plumbmsg*	plumbunpack(char*, int);
 Plumbmsg*	plumbunpackpartial(char*, int, int*);
diff --git a/include/thread.h b/include/thread.h
index b4a1c946..6c12648e 100644
--- a/include/thread.h
+++ b/include/thread.h
@@ -80,8 +80,8 @@ int		nbsendul(Channel *c, unsigned long v);
 int		proccreate(void (*f)(void *arg), void *arg, unsigned int stacksize);
 int		procrfork(void (*f)(void *arg), void *arg, unsigned int stacksize, int flag);
 void**		procdata(void);
-void		procexec(Channel *, int[3], char *, char *[]);
-void		procexecl(Channel *, int[3], char *, ...);
+void		threadexec(Channel *, int[3], char *, char *[]);
+void		threadexecl(Channel *, int[3], char *, ...);
 int		recv(Channel *c, void *v);
 void*		recvp(Channel *c);
 unsigned long		recvul(Channel *c);
@@ -93,6 +93,8 @@ int		threadcreateidle(void (*f)(void*), void*, unsigned int);
 void**		threaddata(void);
 void		threadexits(char *);
 void		threadexitsall(char *);
+void		threadfdwait(int, int);
+void		threadfdwaitsetup(void);
 int		threadgetgrp(void);	/* return thread group of current thread */
 char*		threadgetname(void);
 void		threadint(int);	/* interrupt thread */
@@ -100,12 +102,20 @@ void		threadintgrp(int);	/* interrupt threads in grp */
 void		threadkill(int);	/* kill thread */
 void		threadkillgrp(int);	/* kill threads in group */
 void		threadmain(int argc, char *argv[]);
+void		threadfdnoblock(int);
 void		threadnonotes(void);
 int		threadnotify(int (*f)(void*, char*), int in);
 int		threadid(void);
 int		threadpid(int);
+long		threadread(int, void*, long);
+long		threadreadn(int, void*, long);
+int		threadread9pmsg(int, void*, uint);
+int		threadrecvfd(int);
+long		threadwrite(int, const void*, long);
+int		threadsendfd(int, int);
 int		threadsetgrp(int);	/* set thread group, return old */
 void		threadsetname(char *name);
+void		threadsleep(int);
 Channel*	threadwaitchan(void);
 int	tprivalloc(void);
 void	tprivfree(int);