commit - 30968c3fe914232886455cd67d66541fe6ea7c5f
commit + 452c09358fad7b099eb7f351ee8255a38c7df3bb
blob - 1c93f471aeab17fe201e8e7f42f132f6625bb67a
blob + ae2618f4de10e27dd7dd96f0ba9bcc9cb8a4b2be
--- src/cmd/9term/mkfile
+++ src/cmd/9term/mkfile
rcstart.$O\
$SYSNAME.$O\
-SHORTLIB=complete frame draw plumb fs mux thread 9
-
<$PLAN9/src/mkmany
-LDFLAGS=-L$X11/lib -lX11
-
Darwin.$O Linux.$O FreeBSD.$O: bsdpty.c
blob - d471f987eb14f7ae46281b93c65719da29dba9b8
blob + 660c1aa30df97fffbfebc53df5d4b1814b3c0680
--- src/cmd/9term/win.c
+++ src/cmd/9term/win.c
#include <libc.h>
#include <thread.h>
#include <fcall.h>
-#include <fs.h>
+#include <9pclient.h>
#include "term.h"
int noecho = 1;
Q q;
-Fid *eventfd;
-Fid *addrfd;
-Fid *datafd;
-Fid *ctlfd;
+CFid *eventfd;
+CFid *addrfd;
+CFid *datafd;
+CFid *ctlfd;
// int bodyfd;
char *typing;
void error(char*);
void stdinproc(void*);
void stdoutproc(void*);
-void type(Event*, int, Fid*, Fid*);
-void sende(Event*, int, Fid*, Fid*, Fid*, int);
+void type(Event*, int, CFid*, CFid*);
+void sende(Event*, int, CFid*, CFid*, CFid*, int);
char *onestring(int, char**);
int delete(Event*);
void deltype(uint, uint);
void runproc(void*);
int
-fsfidprint(Fid *fid, char *fmt, ...)
+fsfidprint(CFid *fid, char *fmt, ...)
{
char buf[256];
va_list arg;
int fd, id;
char buf[256];
char buf1[128];
- Fsys *fs;
+ CFsys *fs;
ARGBEGIN{
case 'd':
}
int
-getec(Fid *efd)
+getec(CFid *efd)
{
static char buf[8192];
static char *bufp;
}
int
-geten(Fid *efd)
+geten(CFid *efd)
{
int n, c;
}
int
-geter(Fid *efd, char *buf, int *nb)
+geter(CFid *efd, char *buf, int *nb)
{
Rune r;
int n;
}
void
-gete(Fid *efd, Event *e)
+gete(CFid *efd, Event *e)
{
int i, nb;
void
stdinproc(void *v)
{
- Fid *cfd = ctlfd;
- Fid *efd = eventfd;
- Fid *dfd = datafd;
- Fid *afd = addrfd;
+ CFid *cfd = ctlfd;
+ CFid *efd = eventfd;
+ CFid *dfd = datafd;
+ CFid *afd = addrfd;
int fd0 = rcfd;
Event e, e2, e3, e4;
stdoutproc(void *v)
{
int fd1 = rcfd;
- Fid *afd = addrfd;
- Fid *dfd = datafd;
+ CFid *afd = addrfd;
+ CFid *dfd = datafd;
int n, m, w, npart;
char *buf, *s, *t;
Rune r;
}
void
-type(Event *e, int fd0, Fid *afd, Fid *dfd)
+type(Event *e, int fd0, CFid *afd, CFid *dfd)
{
int m, n, nr;
char buf[128];
}
void
-sende(Event *e, int fd0, Fid *cfd, Fid *afd, Fid *dfd, int donl)
+sende(Event *e, int fd0, CFid *cfd, CFid *afd, CFid *dfd, int donl)
{
int l, m, n, nr, lastc, end;
char abuf[16], buf[128];