ref: 9c70d9eff63775f79cdf91a5cea86de8a169bcbd
parent: d79335d57a7f6f608e8caf800b74155a299a550c
author: Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>
date: Tue Oct 1 22:43:26 EDT 2024
Squashed 'c9/' changes from 3196726..e5e39ad e5e39ad wip revamping aa98d28 C9stat: put qid first, as it has to match with qid[0] git-subtree-dir: c9 git-subtree-split: e5e39adf2d8810e8a0aca2acf4e825ebcb21e3ed
--- a/.gitignore
+++ /dev/null
@@ -1,2 +1,0 @@
-9pex
-9gc
--- a/9gc.c
+++ /dev/null
@@ -1,460 +1,0 @@
-#define _DEFAULT_SOURCE
-#define _FILE_OFFSET_BITS 64
-#include <errno.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/select.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <termios.h>
-#include <unistd.h>
-#include "c9.h"
-#include "parg.h"
-
-enum {- Msize = 8192,
-
- Rootfid = 0,
- Indexfid,
- Chatfid,
-
- Error = 1<<0,
- Joined = 1<<1,
- Disconnected = 1<<2,
-};
-
-typedef struct C9aux C9aux;
-typedef struct REntry REntry;
-
-struct C9aux {- C9ctx c;
- int f;
- int flags;
- uint8_t rdbuf[Msize];
- uint8_t wrbuf[Msize];
- uint32_t wroff;
-};
-
-static const char *nick;
-static int printjoin;
-static uint64_t chatoff, skipuntil;
-//static char *regsrv = "tcp!registry.9p.zone!6675";
-static char *chatsrv = "tcp!chat.9p.zone!9990";
-static const char *channel = "chat";
-
-static uint8_t *
-ctxread(C9ctx *ctx, uint32_t size, int *err)
-{- uint32_t n;
- int r;
- C9aux *a;
-
- a = ctx->aux;
- *err = 0;
- for (n = 0; n < size; n += r) {- if ((r = read(a->f, a->rdbuf+n, size-n)) <= 0) {- if (errno == EINTR)
- continue;
- a->flags |= Disconnected;
- close(a->f);
- return NULL;
- }
- }
-
- return a->rdbuf;
-}
-
-static int
-wrsend(C9aux *a)
-{- uint32_t n;
- int w;
-
- for (n = 0; n < a->wroff; n += w) {- if ((w = write(a->f, a->wrbuf+n, a->wroff-n)) <= 0) {- if (errno == EINTR)
- continue;
- if (errno != EPIPE) /* remote end closed */
- perror("write");- return -1;
- }
- }
- a->wroff = 0;
-
- return 0;
-}
-
-static uint8_t *
-ctxbegin(C9ctx *ctx, uint32_t size)
-{- uint8_t *b;
- C9aux *a;
-
- a = ctx->aux;
- if (a->wroff + size > sizeof(a->wrbuf)) {- if (wrsend(a) != 0 || a->wroff + size > sizeof(a->wrbuf))
- return NULL;
- }
- b = a->wrbuf + a->wroff;
- a->wroff += size;
-
- return b;
-}
-
-static int
-ctxend(C9ctx *ctx)
-{- (void)ctx;
- return 0;
-}
-
-static int
-dial(char *s)
-{- struct addrinfo *r, *a, hint = {.ai_flags = AI_ADDRCONFIG, .ai_family = AF_UNSPEC, 0};- char host[64], *port;
- int e, f;
-
- if (strncmp(s, "udp!", 4) == 0) {- hint.ai_socktype = SOCK_DGRAM;
- hint.ai_protocol = IPPROTO_UDP;
- } else if (strncmp(s, "tcp!", 4) == 0) {- hint.ai_socktype = SOCK_STREAM;
- hint.ai_protocol = IPPROTO_TCP;
- } else {- fprintf(stderr, "invalid dial string: %s\n", s);
- return -1;
- }
- if ((port = strchr(s+4, '!')) == NULL) {- fprintf(stderr, "invalid dial string: %s\n", s);
- return -1;
- }
- if (snprintf(host, sizeof(host), "%.*s", (int)(port-s-4), s+4) >= (int)sizeof(host)) {- fprintf(stderr, "host name too large: %s\n", s);
- return -1;
- }
- port++;
- if ((e = getaddrinfo(host, port, &hint, &r)) != 0)
- return -1;
- f = -1;
- for (a = r; a != NULL; a = a->ai_next) {- if ((f = socket(a->ai_family, a->ai_socktype, a->ai_protocol)) < 0)
- continue;
- if (connect(f, a->ai_addr, a->ai_addrlen) != 0) {- close(f);
- f = -1;
- continue;
- }
- }
- freeaddrinfo(r);
-
- return f;
-}
-
-static void
-output(uint8_t *d, int sz)
-{- int i, j;
-
- for (i = j = 0; i < sz; i++) {- d[j] = d[i];
- if (d[j] > 31 || d[j] == '\t' || d[j] == '\n')
- j++;
- }
- write(1, d, j);
-}
-
-static void
-ctxchatR(C9ctx *ctx, C9r *r)
-{- C9aux *a;
- C9tag tag;
- const char *path[2];
- char buf[64];
-
- a = ctx->aux;
- switch (r->type) {- case Rversion:
- c9attach(ctx, &tag, Rootfid, C9nofid, "none", NULL);
- path[0] = channel;
- path[1] = NULL;
- c9walk(ctx, &tag, Rootfid, Chatfid, path);
- c9open(ctx, &tag, Chatfid, C9rdwr);
- break;
-
- case Rread:
- if (chatoff >= skipuntil)
- output(r->read.data, r->read.size);
- chatoff += r->read.size;
- /* fallthrough */
- case Ropen:
- if ((a->flags & Joined) == 0 && printjoin) {- c9write(ctx, &tag, Chatfid, 0, buf, snprintf(buf, sizeof(buf), "JOIN %s to chat\n", nick));
- a->flags |= Joined;
- }
- c9read(ctx, &tag, Chatfid, chatoff, chatoff < skipuntil ? skipuntil-chatoff : Msize);
- break;
-
- case Rerror:
- fprintf(stderr, "chat error: %s\n", r->error);
- a->flags |= Error;
- break;
-
- default:
- break;
- }
-}
-
-static void
-ctxregistryR(C9ctx *ctx, C9r *r)
-{- char *s, *b;
- C9aux *a;
- C9tag tag;
- const char *path[2];
-
- a = ctx->aux;
- switch (r->type) {- case Rversion:
- c9attach(ctx, &tag, Rootfid, C9nofid, "none", NULL);
- path[0] = "index";
- path[1] = NULL;
- c9walk(ctx, &tag, Rootfid, Indexfid, path);
- c9open(ctx, &tag, Indexfid, C9read);
- break;
-
- case Ropen:
- c9read(ctx, &tag, Indexfid, 0, Msize);
- break;
-
- case Rread:
- r->read.data[r->read.size] = 0;
- for (s = (char*)r->read.data;;) {- if ((s = strstr(s, "chat")) == NULL)
- break;
- for (b = s; b != (char*)r->read.data && *b != '\n'; b--);
- if (*b == '\n')
- b++;
- if ((s = strchr(s, '\n')) == NULL)
- s = (char*)&r->read.data[r->read.size];
- else
- *s++ = 0;
- if (strstr(b, "tlssrv") == NULL && (s = strchr(b, ' ')) != NULL) {- *s = 0;
-fallback:
- close(a->f);
- if ((a->f = dial(b)) < 0)
- exit(1);
- a->flags = 0;
- ctx->r = ctxchatR;
- a->wroff = 0;
- c9version(ctx, &tag, Msize);
- if (wrsend(a) != 0)
- exit(1);
- return;
- }
- }
- b = chatsrv;
- goto fallback;
-
- case Rerror:
- fprintf(stderr, "registry error: %s\n", r->error);
- a->flags |= Error;
- break;
-
- default:
- break;
- }
-}
-
-__attribute__ ((format (printf, 1, 2)))
-static void
-ctxerror(const char *fmt, ...)
-{- va_list ap;
-
- va_start(ap, fmt);
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, "\n");
- va_end(ap);
-}
-
-static C9aux *
-srv(char *s)
-{- C9aux *c;
- int f;
-
- if ((f = dial(s)) < 0)
- return NULL;
- c = calloc(1, sizeof(*c));
- c->f = f;
- c->c.read = ctxread;
- c->c.begin = ctxbegin;
- c->c.end = ctxend;
- c->c.error = ctxerror;
- c->c.aux = c;
-
- return c;
-}
-
-static C9aux *
-registry(void)
-{- C9aux *a;
- C9tag tag;
- int i;
-
- for (i = 0; i < 10; i++) {-// if ((a = srv(regsrv)) == NULL) {- if ((a = srv(chatsrv)) != NULL) {- a->c.r = ctxchatR;
- c9version(&a->c, &tag, Msize);
- wrsend(a);
- return a;
- }
-// } else {-// break;
-// }
- sleep(10);
- }
-
- if (a == NULL)
- return NULL;
- a->c.r = ctxregistryR;
- c9version(&a->c, &tag, Msize);
- wrsend(a);
- while (c9proc(&a->c) == 0 && a->c.r == ctxregistryR)
- wrsend(a);
-
- return a;
-}
-
-static int
-chatrw(C9aux *a)
-{- struct timeval t;
- fd_set r, e;
- int n, sz;
- C9tag tag;
- C9ctx *ctx;
- char *s;
-
- FD_ZERO(&r);
- FD_SET(a->f, &r);
- FD_SET(0, &r);
- FD_ZERO(&e);
- FD_SET(a->f, &e);
- FD_SET(0, &e);
- memset(&t, 0, sizeof(t));
- t.tv_sec = 10;
- for (;;) {- errno = 0;
- if ((n = select(a->f + 1, &r, NULL, &e, &t)) < 0 || FD_ISSET(a->f, &e) || FD_ISSET(0, &e)) {- if (errno == EINTR)
- continue;
- return -1;
- }
- break;
- }
-
- ctx = &a->c;
- if (FD_ISSET(a->f, &r)) {- c9proc(ctx);
- } else if (FD_ISSET(0, &r)) {- s = (char*)a->rdbuf;
- sz = sprintf(s, "%s → ", nick);
- for (;;) {- if ((n = read(0, s+sz, sizeof(a->rdbuf)-sz)) > 0)
- sz += n;
- else
- exit(0);
- if (s[sz-1] != '\n'){- s[sz-1] = '\n';
- }else{- c9write(ctx, &tag, Chatfid, 0, s, sz);
- break;
- }
- }
- } else {- const char *path[] = {NULL};- c9walk(ctx, &tag, Rootfid, Rootfid, path);
- }
-
- return 0;
-}
-
-int
-main(int argc, char **argv)
-{- struct parg_state ps;
- struct termios t;
- C9aux *a;
- int c, noecho;
-
- parg_init(&ps);
- noecho = 0;
- while ((c = parg_getopt(&ps, argc, argv, "hjedc:")) >= 0) {- switch (c) {- case 1:
- if (nick != NULL) {- fprintf(stderr, "only one nickname can be specified\n");
- return 1;
- }
- nick = ps.optarg;
- break;
- case 'c':
- channel = ps.optarg;
- break;
- case 'j':
- printjoin = 1;
- break;
- case 'e':
- noecho = 1;
- break;
- case 'h':
- fprintf(stderr, "usage: 9gc [-j] [-e] [-c CHANNEL] NICKNAME\n");
- return 0;
- break;
- case '?':
- fprintf(stderr, "unknown option -%c\n", ps.optopt);
- return 1;
- break;
- default:
- fprintf(stderr, "unhandled option -%c\n", c);
- return 1;
- break;
- }
- }
-
- if (nick == NULL) {- fprintf(stderr, "no nickname specified\n");
- return 1;
- }
-
- if (noecho && tcgetattr(0, &t) == 0) {- t.c_lflag &= ~ECHO;
- tcsetattr(STDIN_FILENO, TCSANOW, &t);
- }
-
- for (;;) {- if ((a = registry()) == NULL)
- return 1;
- while (chatrw(a) == 0 && wrsend(a) == 0);
- if (a->flags & (Disconnected|Error)) {- a->flags &= ~(Disconnected|Error);
- skipuntil = chatoff;
- chatoff = 0;
- free(a);
- } else {- printf("exiting\n");- exit(1);
- }
- }
-
- return 0;
-}
--- a/9pex.c
+++ /dev/null
@@ -1,1052 +1,0 @@
-#ifdef __linux__
-#define _GNU_SOURCE
-#else
-#define _DEFAULT_SOURCE
-#endif
-#define _FILE_OFFSET_BITS 64
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <inttypes.h>
-#include <pwd.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/select.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include "c9.h"
-#include "parg.h"
-
-#define max(a,b) ((a)>(b)?(a):(b))
-#define used(x) ((void)(x))
-#define nelem(x) (int)(sizeof(x)/sizeof((x)[0]))
-
-uint32_t crc32(const void *data, int len);
-
-enum
-{- Canrd = 1<<0,
- Canwr = 1<<1,
-};
-
-typedef struct
-{- char *path; /* full path */
- char *name; /* base name */
-
- DIR *dir; /* set when it's an opened directory */
- uint64_t diroffset; /* to read dirs correctly */
-
- C9qid qid;
- C9fid fid;
- C9mode mode; /* mode in which the file was opened */
- uint32_t iounit;
-
- int fd; /* set when it's an opened file */
-}Fid;
-
-typedef struct
-{- C9tag tag;
-}Tag;
-
-typedef struct
-{- char *name;
- uint32_t id;
-}Id;
-
-static char *t2s[] = {- [Tversion-Tversion] = "Tversion",
- [Tauth-Tversion] = "Tauth",
- [Tattach-Tversion] = "Tattach",
- [Tflush-Tversion] = "Tflush",
- [Twalk-Tversion] = "Twalk",
- [Topen-Tversion] = "Topen",
- [Tcreate-Tversion] = "Tcreate",
- [Tread-Tversion] = "Tread",
- [Twrite-Tversion] = "Twrite",
- [Tclunk-Tversion] = "Tclunk",
- [Tremove-Tversion] = "Tremove",
- [Tstat-Tversion] = "Tstat",
- [Twstat-Tversion] = "Twstat",
-};
-
-static char *modes[] = {- "read", "write", "rdwr", "exec",
-};
-
-static char *Enoauth = "authentication not required";
-static char *Eunknownfid = "unknown fid";
-static char *Enowstat = "wstat prohibited";
-static char *Eperm = "permission denied";
-static char *Enowrite = "write prohibited";
-static char *Enomem = "out of memory";
-static char *Edupfid = "duplicate fid";
-static char *Ewalknodir = "walk in non-directory";
-static char *Enotfound = "file not found";
-static char *Eduptag = "duplicate tag";
-static char *Ebotch = "9P protocol botch";
-static char *Enocreate = "create prohibited";
-static char *Eisdir = "is a directory";
-static char *Ebadoffset = "bad offset";
-
-static int in, out, eof;
-static C9ctx ctx;
-static int debug, rootescape;
-static Fid **fids;
-static int numfids;
-static Tag **tags;
-static int numtags;
-static char *rootpath;
-static size_t rootlen;
-static C9qid walkqids[C9maxpathel];
-static uint8_t *rdbuf;
-static uint8_t *wrbuf;
-static uint32_t wroff, wrend, wrbufsz;
-static Id *uids, *gids;
-static int numuids, numgids;
-
-__attribute__ ((format (printf, 1, 2)))
-static void
-trace(const char *fmt, ...)
-{- va_list ap;
-
- if (debug == 0)
- return;
-
- va_start(ap, fmt);
- vfprintf(stderr, fmt, ap);
- va_end(ap);
-}
-
-static int
-canrw(int rdonly, int block)
-{- struct timeval t;
- fd_set r, w, e;
- int n, fl;
-
- FD_ZERO(&r);
- FD_SET(in, &r);
- FD_ZERO(&w);
- if (rdonly == 0)
- FD_SET(out, &w);
- FD_ZERO(&e);
- FD_SET(in, &e);
- FD_SET(out, &e);
- memset(&t, 0, sizeof(t));
- t.tv_usec = 1000;
- for (;;) {- errno = 0;
- if ((n = select(max(in, out) + 1, &r, &w, &e, block ? NULL : &t)) < 0 || FD_ISSET(in, &e) || FD_ISSET(out, &e)) {- if (errno == EINTR)
- continue;
- return -1;
- }
- break;
- }
-
- fl = 0;
- if (FD_ISSET(in, &r))
- fl |= Canrd;
- if (FD_ISSET(out, &w))
- fl |= Canwr;
-
- return fl;
-}
-
-static int
-wrsend(void)
-{- uint32_t n;
- int w;
-
- if (wrend == 0)
- return 0;
- for (n = 0; n < wrend; n += w) {- errno = 0;
- if ((w = write(out, wrbuf+n, wrend-n)) <= 0) {- if (errno == EINTR)
- continue;
- if (errno != EPIPE) /* remote end closed */
- perror("write");- return -1;
- }
- }
- if (debug >= 2)
- trace("<- %d bytes, %d left\n", wrend, wroff-wrend);- memmove(wrbuf, wrbuf+wrend, wroff-wrend);
- wroff = wroff - wrend;
-
- return 0;
-}
-
-static int
-hastag(C9tag tag)
-{- int i;
-
- for (i = 0; i < numtags; i++) {- if (tags[i] != NULL && tags[i]->tag == tag)
- return 1;
- }
-
- return 0;
-}
-
-static int
-statpath(char *path, struct stat *st, char **err)
-{- if (stat(path, st) == 0)
- return 0;
-
- if (errno == EACCES)
- *err = Eperm;
- else if (errno == ENOMEM)
- *err = Enomem;
- else if (errno == ENOTDIR)
- *err = Ewalknodir;
- else if (errno == ENOENT)
- *err = Enotfound;
- else
- *err = strerror(errno);
-
- return -1;
-}
-
-static void
-stat2qid(struct stat *st, C9qid *qid, uint32_t *iounit)
-{- int fmt;
-
- qid->path = st->st_ino;
- qid->version = crc32(&st->st_ctim, sizeof(st->st_ctim));
- qid->type = C9qtfile;
- fmt = st->st_mode & S_IFMT;
- if (fmt == S_IFDIR)
- qid->type |= C9qtdir;
- if ((st->st_mode & 0222) != 0 && (fmt == S_IFCHR || fmt == S_IFCHR || fmt == S_IFSOCK || fmt == S_IFIFO))
- qid->type |= C9qtappend;
- if (iounit != NULL)
- *iounit = st->st_blksize;
-}
-
-static Fid *
-newfid(C9fid fid, char *path, char **err)
-{- Fid *f, **newfids;
- struct stat st;
- int i;
-
- for (i = 0; i < numfids; i++) {- if (fids[i] != NULL && fids[i]->fid == fid) {- *err = Edupfid;
- return NULL;
- }
- }
-
- if (statpath(path, &st, err) != 0)
- return NULL;
-
- if ((f = calloc(1, sizeof(*f))) == NULL) {- *err = Enomem;
- return NULL;
- }
- f->fd = -1;
- f->path = strdup(path);
- f->name = strrchr(f->path, '/');
- if (f->name == NULL)
- f->name = f->path;
- else
- f->name++;
- if (f->name[0] == 0)
- fprintf(stderr, "%s -> empty file name\n", f->path);
-
- for (i = 0; i < numfids; i++) {- if (fids[i] == NULL) {- fids[i] = f;
- break;
- }
- }
- if (i >= numfids) {- if ((newfids = realloc(fids, (numfids+1)*sizeof(*fids))) == NULL) {- *err = Enomem;
- return NULL;
- }
- fids = newfids;
- fids[numfids++] = f;
- }
-
- f->fid = fid;
- stat2qid(&st, &f->qid, &f->iounit);
-
- return f;
-}
-
-static Fid *
-findfid(C9fid fid, char **err)
-{- int i;
-
- for (i = 0; i < numfids; i++) {- if (fids[i] != NULL && fids[i]->fid == fid) {- return fids[i];
- }
- }
-
- *err = Eunknownfid;
-
- return NULL;
-}
-
-static int
-delfid(C9fid fid, char **err)
-{- Fid *f;
- int i;
-
- for (i = 0; i < numfids; i++) {- f = fids[i];
- if (f != NULL && f->fid == fid) {- if (f->dir != NULL)
- closedir(f->dir);
- else if (f->fd >= 0)
- close(f->fd);
- free(f->path);
- free(f);
- fids[i] = NULL;
- return 0;
- }
- }
-
- *err = Eunknownfid;
-
- return -1;
-}
-
-static int
-hasperm(struct stat *st, C9mode mode, char **err)
-{- int m, stm, fmt;
-
- m = mode & 0xf;
- stm = st->st_mode & 0777;
- *err = Eperm;
- if (((stm & 0111) == 0 || (stm & 0444) == 0) && m == C9exec) /* executing needs rx */
- return 0;
- if ((stm & 0222) == 0 && (m == C9write || m == C9rdwr)) /* writing needs w */
- return 0;
- if ((stm & 0444) == 0 && m != C9write) /* reading needs r */
- return 0;
- fmt = st->st_mode & S_IFMT;
- if (fmt == S_IFDIR && ((stm & 0111) == 0 || (stm & 0444) == 0)) /* dirs need rx */
- return 0;
- *err = NULL;
-
- return 1;
-}
-
-static Fid *
-walk(C9fid fid, C9fid nfid, char *el[], C9qid *qids[], char **err)
-{- Fid *f;
- char *path, *real, *p;
- struct stat st;
- int i, plen, ellen;
-
- if ((f = findfid(fid, err)) == NULL)
- return NULL;
-
- if (el[0] == NULL) { /* nwname = 0 */- qids[0] = NULL;
- if (fid == nfid)
- return f;
- return newfid(nfid, f->path, err);
- }
-
- if ((f->qid.type & C9qtdir) == 0) { /* has to be a dir */- *err = Ewalknodir;
- return NULL;
- }
-
- p = strdup(f->path);
- f = NULL;
- for (i = 0; el[i] != NULL; i++) {- plen = strlen(p);
- ellen = strlen(el[i]);
- path = malloc(plen + 1 + ellen + 1);
- memmove(path, p, plen);
- path[plen] = '/';
- memmove(path+plen+1, el[i], ellen);
- path[plen+1+ellen] = 0;
-
- if (!rootescape) {- if ((real = realpath(path, NULL)) == NULL)
- break;
- free(path);
- if (strlen(real) < rootlen) { /* don't escape root */- free(real);
- real = strdup(rootpath);
- }
- } else {- real = path;
- }
-
- free(p);
- p = real;
-
- if (statpath(p, &st, err) != 0)
- break;
- if (el[i+1] != NULL && !hasperm(&st, C9read, err))
- break;
-
- qids[i] = &walkqids[i];
- stat2qid(&st, qids[i], NULL);
- }
-
- qids[i] = NULL;
- if (el[i] == NULL) { /* could walk all the way */- f = newfid(nfid, p, err);
- if (f != NULL && f->name[0] == '/' && f->name[1] == 0) /* root */
- f->name = "/";
- } else if (i != 0) { /* didn't fail on the first one */- *err = NULL;
- }
- free(p);
-
- return f;
-}
-
-static int
-mode2unix(C9mode mode, int qidtype)
-{- int omode;
-
- omode = O_NOFOLLOW;
- if ((mode & 3) == C9read)
- omode |= O_RDONLY;
- else if ((mode & 3) == C9write)
- omode |= O_WRONLY;
- else if ((mode & 3) == C9rdwr)
- omode |= O_RDWR;
- if (mode & C9trunc)
- omode |= O_TRUNC;
-#ifdef __linux__
- if (mode & C9rclose)
- omode |= O_TMPFILE;
-#endif
- if ((qidtype & C9qtappend) != 0)
- omode |= O_APPEND;
-
- return omode;
-}
-
-static int
-openfid(Fid *f, C9mode mode, char **err)
-{- struct stat st;
- int omode;
-
- if (stat(f->path, &st) != 0 || !hasperm(&st, mode, err))
- goto error;
- stat2qid(&st, &f->qid, &f->iounit);
-
- if ((f->qid.type & C9qtdir) != 0) {- if ((f->dir = opendir(f->path)) == NULL) {- *err = strerror(errno);
- return -1;
- }
- f->fd = dirfd(f->dir);
- } else {- omode = mode2unix(mode, f->qid.type);
- f->fd = open(f->path, omode);
- }
-
- if (f->fd < 0)
- goto error;
- f->mode = mode;
-
- return 0;
-error:
- if (*err == NULL)
- *err = strerror(errno);
-
- if (f->dir != NULL)
- closedir(f->dir);
- else if (f->fd >= 0)
- close(f->fd);
-
- f->dir = NULL;
- f->fd = -1;
- return -1;
-}
-
-static char *
-uid2str(uid_t uid, char **err)
-{- struct passwd *p;
- Id *newuids;
- int i;
-
- for (i = 0; i < numuids; i++) {- if (uids[i].id == uid)
- return uids[i].name;
- }
- if ((p = getpwuid(uid)) == NULL) {- *err = strerror(errno);
- return NULL;
- }
- if ((newuids = realloc(uids, sizeof(*uids)*(numuids+1))) == NULL) {- *err = Enomem;
- return NULL;
- }
- uids = newuids;
- uids[numuids].id = uid;
- uids[numuids].name = strdup(p->pw_name);
-
- return uids[numuids++].name;
-}
-
-static char *
-gid2str(gid_t gid, char **err)
-{- struct group *g;
- Id *newgids;
- int i;
-
- for (i = 0; i < numgids; i++) {- if (gids[i].id == gid)
- return gids[i].name;
- }
- if ((g = getgrgid(gid)) == NULL) {- *err = strerror(errno);
- return NULL;
- }
- if ((newgids = realloc(gids, sizeof(*gids)*(numgids+1))) == NULL) {- *err = Enomem;
- return NULL;
- }
- gids = newgids;
- gids[numgids].id = gid;
- gids[numgids].name = strdup(g->gr_name);
-
- return gids[numgids++].name;
-}
-
-static int
-stat2c9stat(char *name, struct stat *st, C9stat *stout, char **err)
-{- int fmt;
-
- memset(stout, 0, sizeof(*stout));
- stout->size = st->st_size;
- stat2qid(st, &stout->qid, NULL);
- stout->name = name;
- stout->atime = st->st_atim.tv_sec;
- stout->mtime = st->st_ctim.tv_sec;
-
- fmt = st->st_mode & S_IFMT;
- if (fmt == S_IFDIR)
- stout->mode |= C9stdir;
- if (fmt == S_IFCHR || fmt == S_IFCHR || fmt == S_IFSOCK || fmt == S_IFIFO)
- stout->mode |= C9stappend;
- stout->mode |= st->st_mode & 0x1ff;
- if ((stout->uid = uid2str(st->st_uid, err)) == NULL)
- return -1;
- if ((stout->gid = gid2str(st->st_gid, err)) == NULL)
- return -1;
-
- return 0;
-}
-
-static int
-statfid(Fid *f, C9stat *stout, char **err)
-{- struct stat st;
- int r;
-
- if (f->fd >= 0)
- r = fstat(f->fd, &st);
- else
- r = stat(f->path, &st);
- if (r != 0) {- *err = strerror(errno);
- return -1;
- }
-
- return stat2c9stat(f->name, &st, stout, err);
-}
-
-static uint8_t *
-ctxread(C9ctx *c, uint32_t size, int *err)
-{- uint32_t n;
- int r;
-
- used(c);
- r = 0;
- *err = 0;
- for (n = 0; n < size; n += r) {- errno = 0;
- if ((r = read(in, rdbuf+n, size-n)) <= 0) {- if (r == EINTR)
- continue;
- if (r == 0) {- eof = 1;
- } else {- *err = 1;
- perror("ctxread");- }
- return NULL;
- }
- }
-
- return rdbuf;
-}
-
-static uint8_t *
-ctxbegin(C9ctx *c, uint32_t size)
-{- uint8_t *b;
-
- used(c);
- if (wroff + size > wrbufsz) {- if (wrsend() != 0 || wroff + size > wrbufsz)
- return NULL;
- }
- b = wrbuf + wroff;
- wroff += size;
-
- return b;
-}
-
-static int
-ctxend(C9ctx *c)
-{- used(c);
- wrend = wroff;
- return 0;
-}
-
-__attribute__ ((format (printf, 1, 2)))
-static void
-ctxerror(const char *fmt, ...)
-{- va_list ap;
-
- va_start(ap, fmt);
- vfprintf(stderr, fmt, ap);
- fprintf(stderr, "\n");
- va_end(ap);
-}
-
-static int
-s9do(C9error e, char **err)
-{- if (e == 0) {- *err = NULL;
- return 0;
- }
-
- switch (e) {- case C9Einit: *err = "c9: initialization failed"; break;
- case C9Ever: *err = "c9: protocol version doesn't match"; break;
- case C9Epkt: *err = "c9: incoming packet error"; break;
- case C9Etag: *err = "c9: no free tags or bad tag"; break;
- case C9Ebuf: *err = Enomem; break;
- case C9Epath: *err = "c9: path is too long or just invalid"; break;
- case C9Eflush: *err = "c9: limit of outstanding flushes reached"; break;
- case C9Esize: *err = "c9: can't fit data in one message"; break;
- case C9Estr: *err = "c9: bad string"; break;
- default: *err = "c9: unknown error"; break;
- }
-
- return -1;
-}
-
-static int
-readf(C9ctx *c, C9tag tag, Fid *f, uint64_t offset, uint32_t size, char **err)
-{- struct stat st;
- void *p;
- struct dirent *e;
- ssize_t n;
- C9stat c9st[16], *c9stp[16];
- long dirpos[16];
- int i, num, res;
-
- if (size > c->msize - 12) /* make sure it fits */
- size = c->msize - 12;
-
- if (f->dir == NULL) { /* a file */- if ((p = malloc(size)) == NULL) {- *err = Enomem;
- return -1;
- }
- if ((n = pread(f->fd, p, size, offset)) < 0) {- *err = strerror(errno);
- free(p);
- return -1;
- }
- res = s9do(s9read(c, tag, p, n), err);
- free(p);
- if (res != 0)
- return -1;
- trace("<- Rread tag=%d count=%zd data=...\n", tag, n);- return 0;
- }
-
- /* dir */
- if (offset != f->diroffset) {- if (offset == 0) {- rewinddir(f->dir);
- f->diroffset = 0;
- } else {- *err = Ebadoffset;
- return -1;
- }
- }
-
- res = 0;
- num = 0;
- for (i = 0; i < nelem(c9st); i++) {- dirpos[i] = telldir(f->dir); /* so we can rewind in case another stat doesn't fit */
-
- errno = 0;
- if ((e = readdir(f->dir)) == NULL && errno != 0) {- *err = strerror(errno);
- res = -1;
- goto done;
- }
- if (e == NULL) /* eof */
- break;
- if (e->d_name[0] == '.' && (e->d_name[1] == 0 || ((e->d_name[1] == '.' && e->d_name[2] == 0))))
- continue;
-
- if (fstatat(f->fd, e->d_name, &st, 0) != 0) {- *err = strerror(errno);
- if (fstatat(f->fd, e->d_name, &st, AT_SYMLINK_NOFOLLOW) != 0) { /* broken symlink, try to stat the link itself */- res = -1;
- goto done;
- }
- }
- if (stat2c9stat(e->d_name, &st, &c9st[i], err) != 0) {- res = -1;
- goto done;
- }
- c9st[i].name = strdup(c9st[i].name);
- c9stp[num++] = &c9st[i];
- }
-
- i = num;
- if (s9do(s9readdir(c, tag, c9stp, &num, &f->diroffset, size), err) != 0) {- res = -1;
- goto done;
- }
- trace("<- Rread tag=%d count=%"PRIu64" data=...\n", tag, f->diroffset - offset);- if (i != num)
- seekdir(f->dir, dirpos[num]);
-
-done:
- for (i = 0; i < num; i++)
- free(c9stp[i]->name);
- return res;
-}
-
-static void
-ctxt(C9ctx *c, C9t *t)
-{- Fid *f;
- C9qid *qids[C9maxpathel+1];
- char *err, *err2;
- C9stat st;
- int i;
-
- trace("-> %s tag=%d", t2s[t->type-Tversion], t->tag);-
- err = NULL;
- if (hastag(t->tag)) {- err = Eduptag;
- } else {- switch (t->type){- case Tversion:
- trace("\n");- if (s9do(s9version(c), &err) == 0)
- trace("<- Rversion\n");- break;
- case Tauth:
- trace(" afid=%d uname=\"%s\" aname=\"%s\"\n", t->auth.afid, t->auth.uname, t->auth.aname);- err = Enoauth;
- break;
- case Tattach:
- trace(" afid=%d fid=%d uname=\"%s\" aname=\"%s\"\n", t->attach.afid, t->fid, t->attach.uname, t->attach.aname);- if (t->attach.afid != C9nofid) {- err = Eunknownfid;
- } else if ((f = newfid(t->fid, rootpath, &err)) != NULL) {- f->name = "/";
- if (s9do(s9attach(c, t->tag, &f->qid), &err) == 0)
- trace("<- Rattach\n");- }
- break;
- case Tflush:
- trace(" oldtag=%d\n", t->flush.oldtag);- /* FIXME flush it for realz */
- if (s9do(s9flush(c, t->tag), &err) == 0)
- trace("<- Rflush tag=%d\n", t->tag);- break;
- case Twalk:
- trace(" fid=%d newfid=%d", t->fid, t->walk.newfid);- for (i = 0; t->walk.wname[i] != NULL; i++)
- trace(" \"%s\"", t->walk.wname[i]);- trace("\n");- walk(t->fid, t->walk.newfid, t->walk.wname, qids, &err);
- if (err == NULL && s9do(s9walk(c, t->tag, qids), &err) == 0) {- trace("<- Rwalk tag=%d ", t->tag);- for (i = 0; qids[i] != NULL; i++)
- trace("qid=[path=%"PRIu64" type=0x%02x version=%"PRIu32"] ", qids[i]->path, qids[i]->type, qids[i]->version);- trace("\n");- }
- break;
- case Topen:
- trace(" fid=%d mode=0x%02x\n", t->fid, t->open.mode);- if ((f = findfid(t->fid, &err)) != NULL) {- if (f->fd >= 0)
- err = Ebotch;
- else if (t->open.mode != C9read && t->open.mode != C9exec)
- err = Eperm;
- else if (t->open.mode != C9read && (f->qid.type & C9qtdir) != 0)
- err = Eisdir;
- else if (openfid(f, t->open.mode, &err) == 0 && s9do(s9open(c, t->tag, &f->qid, f->iounit), &err) == 0)
- trace("<- Ropen tag=%d qid=[path=%"PRIu64" type=0x%02x version=%"PRIu32"] iounit=%d\n", t->tag, f->qid.path, f->qid.type, f->qid.version, f->iounit);- }
- break;
- case Tcreate:
- trace("...\n");- err = Enocreate;
- break;
- case Tread:
- trace(" fid=%d offset=%"PRIu64" count=%"PRIu32"\n", t->fid, t->read.offset, t->read.size);- if ((f = findfid(t->fid, &err)) != NULL) {- if ((f->dir == NULL && f->fd < 0) || (f->mode & 0xf) == C9write)
- err = Ebotch;
- else if (readf(c, t->tag, f, t->read.offset, t->read.size, &err) != 0)
- trace("readf failed\n");- }
- break;
- case Twrite:
- trace("...\n");- err = Enowrite;
- break;
- case Tclunk:
- trace(" fid=%d\n", t->fid);- if (delfid(t->fid, &err) == 0 && s9do(s9clunk(c, t->tag), &err) == 0)
- trace("<- Rclunk tag=%d\n", t->tag);- break;
- case Tremove:
- trace("\n");- err = Eperm;
- break;
- case Tstat:
- trace(" fid=%d\n", t->fid);- if ((f = findfid(t->fid, &err)) != NULL && statfid(f, &st, &err) == 0 && s9do(s9stat(c, t->tag, &st), &err) == 0)
- trace("<- Rstat tag=%d ...\n", t->tag);- break;
- case Twstat:
- trace("...\n");- err = Enowstat;
- break;
- }
- }
-
- if (err != NULL) {- if (s9do(s9error(c, t->tag, err), &err2) == 0)
- trace("<- Rerror tag=%d \"%s\"\n", t->tag, err);- else
- fprintf(stderr, "s9error: %s\n", err2);
- }
-}
-
-static void
-sigdebug(int s)
-{- Fid *f;
- int i, n;
-
- used(s);
- n = 0;
- for (i = 0; i < numfids; i++) {- f = fids[i];
- if (f == NULL)
- continue;
-
- fprintf(stderr, "fid %u ", f->fid);
-
- if (f->dir != NULL)
- fprintf(stderr, "open mode=dir ");
- else if (f->fd >= 0)
- fprintf(stderr, "open mode=%s%s%s ", modes[(f->mode & 0xf)], (f->mode & C9trunc) ? ",trunc" : "", (f->mode & C9rclose) ? ",rclose" : "");
-
- fprintf(stderr, "qid=[path=%"PRIu64" type=0x%02x version=%"PRIu32"] iounit=%d ", f->qid.path, f->qid.type, f->qid.version, f->iounit);
- fprintf(stderr, " %s %s\n", f->path, f->name);
- n++;
- }
-
- fprintf(stderr, "fids\t%d\n", n);
- fprintf(stderr, "tags\t%d\n", numtags);
- fprintf(stderr, "uids\t%d\n", numuids);
- fprintf(stderr, "gids\t%d\n", numgids);
-}
-
-int
-main(int argc, char **argv)
-{- const char *dir;
- char *err;
- Fid *f;
- struct parg_state ps;
- struct sigaction sa;
- int can, i, c, rdonly, block;
-
- parg_init(&ps);
-
- debug = 0;
- dir = NULL;
- while ((c = parg_getopt(&ps, argc, argv, "deh")) >= 0) {- switch (c) {- case 1:
- if (dir != NULL) {- fprintf(stderr, "only one dir can be specified\n");
- return 1;
- }
- dir = ps.optarg;
- break;
- case 'e':
- rootescape++;
- break;
- case 'd':
- debug++;
- break;
- case 'h':
- fprintf(stderr, "usage: 9pex [-e] [-d] DIR\n");
- return 0;
- break;
- case '?':
- fprintf(stderr, "unknown option -%c\n", ps.optopt);
- return 1;
- break;
- default:
- fprintf(stderr, "unhandled option -%c\n", c);
- return 1;
- break;
- }
- }
-
- if (dir == NULL) {- fprintf(stderr, "no dir specified\n");
- return 1;
- }
-
- if ((rootpath = realpath(dir, NULL)) == NULL) {- trace("%s: %s\n", dir, strerror(errno));- return 1;
- }
- rootlen = strlen(rootpath);
-
- in = 0;
- out = 1;
- eof = 0;
- fids = NULL;
- numfids = 0;
- tags = NULL;
- numtags = 0;
- uids = NULL;
- numuids = 0;
- gids = NULL;
- numgids = 0;
-
- memset(&ctx, 0, sizeof(ctx));
- ctx.msize = 64*1024;
- ctx.read = ctxread;
- ctx.begin = ctxbegin;
- ctx.end = ctxend;
- ctx.t = ctxt;
- ctx.error = ctxerror;
-
- rdbuf = calloc(1, ctx.msize);
- wrbufsz = ctx.msize;
- wrbuf = calloc(1, wrbufsz);
- wroff = wrend = 0;
-
- memset(&sa, 0, sizeof(sa));
- sa.sa_handler = SIG_IGN;
- sa.sa_flags = SA_RESTART;
- sigaction(SIGPIPE, &sa, NULL);
-
- memset(&sa, 0, sizeof(sa));
- sa.sa_handler = sigdebug;
- sa.sa_flags = SA_RESTART;
- sigfillset(&sa.sa_mask);
- sigaction(SIGUSR1, &sa, NULL);
-
- err = NULL;
- rdonly = block = 1; /* at first we wait until the client sends in data */
- for (; !eof;) {- if ((can = canrw(rdonly, block)) < 0)
- break;
- if ((can & Canrd) != 0) { /* if there is data, process it */- if (s9do(s9proc(&ctx), &err) != 0)
- break;
- /* give it a chance to receive all the data first */
- rdonly = 1;
- block = 0;
- } else if (block == 0) { /* got all the data */- if (rdonly != 0) { /* wait until we can send OR we get more data */- rdonly = 0;
- block = 1;
- }
- } else if (rdonly == 0 && (can & Canwr) != 0) { /* can send */- if (wrsend() != 0) /* send all the data */
- break;
- rdonly = 1; /* and go back to reading */
- block = 1;
- }
- }
-
- if (err != NULL)
- trace("s9proc: %s\n", err);-
- for (i = 0; i < numfids; i++) {- if ((f = fids[i]) != NULL) {- if (f->dir != NULL)
- closedir(f->dir);
- else if (f->fd >= 0)
- close(f->fd);
- free(f->path);
- free(f);
- }
- }
-
- for (i = 0; i < numuids; i++)
- free(uids[i].name);
- free(uids);
- for (i = 0; i < numgids; i++)
- free(gids[i].name);
- free(gids);
-
- memset(wrbuf, 0, ctx.msize);
- free(wrbuf);
- memset(rdbuf, 0, ctx.msize);
- free(rdbuf);
- free(fids);
- free(rootpath);
-
- return 0;
-}
--- a/README.md
+++ b/README.md
@@ -1,25 +1,25 @@
-# 9pro
+# c9
-Plan9-related tools for Unix-like operating systems.
+NOTE (2022-06-27): the library's (yep, it's going to be a library)
+API is getting completely revamped, and examples are being added.
+Use either an older version, or expect API breakage.
- * 9pex - share a directory over stdin/stdout, can be used with socat/inetd
- * 9gc - a very simple stdin/stdout 9gridchan client
+A lightweight library for implmeneting 9p clients and servers in C.
-This is all _WIP_ still. 9pex is working in read-only mode so far but
-lacks proper auth, async IO, some more error control etc.
+This is 9p client and server implementation which aims to be correct,
+small and secure, targetting mainly low-resource MCUs.
-To build static binaries with musl:
+`proto.[ch]`: lowest level of the library, contains nothing but
+(de)serealization of the protocol messages and tag (de)allocation.
-```
-CC=musl-gcc CFLAGS="-Os -s -g0 -static" ./build.sh
-```
+`fs.h`: higher level, blocking file API based on POSIX.
-# Why
+`fs9p.[ch]`: blocking file API implementation for 9p - having a
+context created with `proto.[ch]` one can use POSIX-like file API to
+work with a remote filesystem.
-We can do better.
+Goals:
-# Notes/todo
-
- * 9pex: to allow "escaping the root" by following symlinks you have to pass `-e` option
- * 9pex: chrooting with musl makes `realpath` not work as it requires /proc to be mounted, get rid of `realpath`?
- * 9gc: you can run it in termux on Android like so: `rlwrap -a'XXXXXXwth' -s 0 -t dumb 9gc -e NICKNAME`
+* portability: zero external dependencies, no POSIX, just C
+* no dynamic memory allocation
+* security: no crashes due to incoming data
--- a/build.sh
+++ /dev/null
@@ -1,5 +1,0 @@
-#!/bin/sh
-set -e
-set -x
-${CC:-gcc} -std=c99 -fms-extensions -DC9_NO_SERVER -O0 -g -Wall -Wextra -Wshadow $CFLAGS c9/*.c parg/*.c -Ic9 -Iparg 9gc.c -o 9gc || rm -f 9gc-${CC:-gcc} -std=c99 -fms-extensions -DC9_NO_CLIENT -O0 -g -Wall -Wextra -Wshadow $CFLAGS c9/*.c parg/*.c -Ic9 -Iparg 9pex.c crc32.c -o 9pex || rm -f 9pex--- a/c9/LICENSE
+++ /dev/null
@@ -1,1 +1,0 @@
-Public domain.
--- a/c9/README.md
+++ /dev/null
@@ -1,8 +1,0 @@
-# c9
-
-Low level 9p client and server.
-
-## Examples
-
-Until I have time to write a minimal example you could take a look at
-https://git.sr.ht/~ft/9pro/blob/master/9pex.c
--- a/c9/c9.c
+++ /dev/null
@@ -1,1176 +1,0 @@
-/*
- * This is 9p client and server implementation which aims to be
- * correct, small and secure. It's the lowest level implementation.
- * It doesn't have much comments, mostly because it doesn't make
- * any sense to copy-paste protocol documentation, which
- * you can read at http://man.cat-v.org/plan_9/5/, see 'intro'.
- */
-#ifdef __plan9__
-#include <u.h>
-#include <libc.h>
-#else
-#include <stdint.h>
-#include <string.h>
-#endif
-#include "c9.h"
-
-enum
-{- Svver = 1<<0,
-};
-
-#define safestrlen(s) (s == NULL ? 0 : (uint32_t)strlen(s))
-#define maxread(c) (c->msize-4-4-1-2)
-#define maxwrite(c) maxread(c)
-
-static void
-w08(uint8_t **p, uint8_t x)
-{- (*p)[0] = x;
- *p += 1;
-}
-
-static void
-w16(uint8_t **p, uint16_t x)
-{- (*p)[0] = x;
- (*p)[1] = x>>8;
- *p += 2;
-}
-
-static void
-w32(uint8_t **p, uint32_t x)
-{- (*p)[0] = x;
- (*p)[1] = x>>8;
- (*p)[2] = x>>16;
- (*p)[3] = x>>24;
- *p += 4;
-}
-
-static void
-w64(uint8_t **p, uint64_t x)
-{- (*p)[0] = x;
- (*p)[1] = x>>8;
- (*p)[2] = x>>16;
- (*p)[3] = x>>24;
- (*p)[4] = x>>32;
- (*p)[5] = x>>40;
- (*p)[6] = x>>48;
- (*p)[7] = x>>56;
- *p += 8;
-}
-
-static void
-wcs(uint8_t **p, const char *s, int len)
-{- w16(p, len);
- if(s != NULL){- memmove(*p, s, len);
- *p += len;
- }
-}
-
-static uint8_t
-r08(uint8_t **p)
-{- *p += 1;
- return (*p)[-1];
-}
-
-static uint16_t
-r16(uint8_t **p)
-{- *p += 2;
- return (*p)[-2]<<0 | (*p)[-1]<<8;
-}
-
-static uint32_t
-r32(uint8_t **p)
-{- *p += 4;
- return (*p)[-4]<<0 | (*p)[-3]<<8 | (*p)[-2]<<16 | (*p)[-1]<<24;
-}
-
-static uint64_t
-r64(uint8_t **p)
-{- uint64_t v;
-
- v = r32(p);
- v |= (uint64_t)r32(p)<<32;
- return v;
-}
-
-#ifndef C9_NO_CLIENT
-
-static C9error
-newtag(C9ctx *c, C9ttype type, C9tag *tag)
-{- uint32_t i;
-
- if(type == Tversion){- *tag = 0xffff;
- return 0;
- }
-
- if(c->lowfreetag < C9maxtags){- uint32_t d = c->lowfreetag / C9tagsbits, m = c->lowfreetag % C9tagsbits;
- if((c->tags[d] & 1<<m) != 0){- c->tags[d] &= ~(1<<m);
- *tag = c->lowfreetag++;
- return 0;
- }
- }
-
- for(i = 0; i < (int)sizeof(c->tags)/sizeof(c->tags[0]); i++){- uint32_t x, j;
- if((x = c->tags[i]) == 0)
- continue;
- for(j = 0; j < C9tagsbits; j++){- if((x & (1<<j)) != 0){- c->tags[i] &= ~(1<<j);
- *tag = i*C9tagsbits + j;
- c->lowfreetag = *tag + 1;
- return 0;
- }
- }
- }
-
- c->error("newtag: no free tags");- return C9Etag;
-}
-
-static int
-freetag(C9ctx *c, C9tag tag)
-{- if(tag != 0xffff){- uint32_t d = tag / C9tagsbits, m = tag % C9tagsbits;
- if(tag >= C9maxtags){- c->error("freetag: invalid tag %ud", (uint32_t)tag);- return -1;
- }
- if((c->tags[d] & 1<<m) != 0){- c->error("freetag: double free for tag %ud", (uint32_t)tag);- return -1;
- }
- if(c->lowfreetag > tag)
- c->lowfreetag = tag;
- c->tags[d] |= 1<<m;
- }
- return 0;
-}
-
-static uint8_t *
-T(C9ctx *c, uint32_t size, C9ttype type, C9tag *tag, C9error *err)
-{- uint8_t *p = NULL;
-
- if(size > c->msize-4-1-2){- c->error("T: invalid size %ud", size);- *err = C9Esize;
- }else if((*err = newtag(c, type, tag)) == 0){- size += 4+1+2;
- if((p = c->begin(c, size)) == NULL){- c->error("T: no buffer for %ud bytes", size);- freetag(c, *tag);
- *err = C9Ebuf;
- }else{- *err = 0;
- w32(&p, size);
- w08(&p, type);
- w16(&p, *tag);
- }
- }
- return p;
-}
-
-C9error
-c9version(C9ctx *c, C9tag *tag, uint32_t msize)
-{- uint8_t *b;
- C9error err;
-
- if(msize < C9minmsize){- c->error("c9version: msize too small: %ud", msize);- return C9Einit;
- }
- memset(c->tags, 0xff, sizeof(c->tags));
- memset(c->flush, 0xff, sizeof(c->flush));
- c->lowfreetag = 0;
- c->msize = msize;
-
- if((b = T(c, 4+2+6, Tversion, tag, &err)) != NULL){- w32(&b, msize);
- wcs(&b, "9P2000", 6);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-c9auth(C9ctx *c, C9tag *tag, C9fid afid, const char *uname, const char *aname)
-{- uint8_t *b;
- uint32_t ulen = safestrlen(uname), alen = safestrlen(aname);
- C9error err;
-
- if(ulen > C9maxstr || alen > C9maxstr){- c->error("c9auth: string too long: %ud chars", ulen > alen ? ulen : alen);- return C9Estr;
- }
- if((b = T(c, 4+2+ulen+2+alen, Tauth, tag, &err)) != NULL){- w32(&b, afid);
- wcs(&b, uname, ulen);
- wcs(&b, aname, alen);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-c9flush(C9ctx *c, C9tag *tag, C9tag oldtag)
-{- uint8_t *b;
- C9error err;
- int i;
-
- for(i = 0; i < C9maxflush && c->flush[i] != (uint32_t)~0; i++);
- if(i == C9maxflush){- c->error("c9flush: no free flush slots");- return C9Eflush;
- }
- if((b = T(c, 2, Tflush, tag, &err)) != NULL){- w16(&b, oldtag);
- err = c->end(c);
- if(err == 0)
- c->flush[i] = (uint32_t)oldtag<<16 | *tag;
- }
- return err;
-}
-
-C9error
-c9attach(C9ctx *c, C9tag *tag, C9fid fid, C9fid afid, const char *uname, const char *aname)
-{- uint32_t ulen = safestrlen(uname), alen = safestrlen(aname);
- uint8_t *b;
- C9error err;
-
- if(ulen > C9maxstr || alen > C9maxstr){- c->error("c9attach: string too long: %ud chars", ulen > alen ? ulen : alen);- return C9Estr;
- }
- if((b = T(c, 4+4+2+ulen+2+alen, Tattach, tag, &err)) != NULL){- w32(&b, fid);
- w32(&b, afid);
- wcs(&b, uname, ulen);
- wcs(&b, aname, alen);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-c9walk(C9ctx *c, C9tag *tag, C9fid fid, C9fid newfid, const char *path[])
-{- uint32_t i, j, sz;
- uint32_t len[C9maxpathel];
- uint8_t *b;
- C9error err;
-
- for(sz = i = 0; i < (int)sizeof(len)/sizeof(len[0]) && path[i] != NULL; i++){- len[i] = safestrlen(path[i]);
- if(len[i] == 0 || len[i] > C9maxstr){- c->error("c9walk: invalid path element: %ud chars", len[i]);- return C9Epath;
- }
- sz += 2 + len[i];
- }
- if(path[i] != NULL){- c->error("c9walk: invalid elements !(0 <= %ud <= %ud)", i, C9maxpathel);- return C9Epath;
- }
-
- if((b = T(c, 4+4+2+sz, Twalk, tag, &err)) != NULL){- w32(&b, fid);
- w32(&b, newfid);
- w16(&b, i);
- for(j = 0; j < i; j++)
- wcs(&b, path[j], len[j]);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-c9open(C9ctx *c, C9tag *tag, C9fid fid, C9mode mode)
-{- uint8_t *b;
- C9error err;
-
- if((b = T(c, 4+1, Topen, tag, &err)) != NULL){- w32(&b, fid);
- w08(&b, mode);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-c9create(C9ctx *c, C9tag *tag, C9fid fid, const char *name, uint32_t perm, C9mode mode)
-{- uint32_t nlen = strlen(name);
- uint8_t *b;
- C9error err;
-
- if(nlen == 0 || nlen > C9maxstr){- c->error("c9create: invalid name: %ud chars", nlen);- return C9Epath;
- }
- if((b = T(c, 4+2+nlen+4+1, Tcreate, tag, &err)) != NULL){- w32(&b, fid);
- wcs(&b, name, nlen);
- w32(&b, perm);
- w08(&b, mode);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-c9read(C9ctx *c, C9tag *tag, C9fid fid, uint64_t offset, uint32_t count)
-{- uint8_t *b;
- C9error err;
-
- if((b = T(c, 4+8+4, Tread, tag, &err)) != NULL){- w32(&b, fid);
- w64(&b, offset);
- w32(&b, count);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-c9write(C9ctx *c, C9tag *tag, C9fid fid, uint64_t offset, const void *in, uint32_t count)
-{- uint8_t *b;
- C9error err;
-
- if((b = T(c, 4+8+4+count, Twrite, tag, &err)) != NULL){- w32(&b, fid);
- w64(&b, offset);
- w32(&b, count);
- memmove(b, in, count);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-c9wrstr(C9ctx *c, C9tag *tag, C9fid fid, const char *s)
-{- return c9write(c, tag, fid, 0, s, strlen(s));
-}
-
-C9error
-c9clunk(C9ctx *c, C9tag *tag, C9fid fid)
-{- uint8_t *b;
- C9error err;
-
- if((b = T(c, 4, Tclunk, tag, &err)) != NULL){- w32(&b, fid);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-c9remove(C9ctx *c, C9tag *tag, C9fid fid)
-{- uint8_t *b;
- C9error err;
-
- if((b = T(c, 4, Tremove, tag, &err)) != NULL){- w32(&b, fid);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-c9stat(C9ctx *c, C9tag *tag, C9fid fid)
-{- uint8_t *b;
- C9error err;
-
- if((b = T(c, 4, Tstat, tag, &err)) != NULL){- w32(&b, fid);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-c9wstat(C9ctx *c, C9tag *tag, C9fid fid, const C9stat *s)
-{- uint32_t nlen = safestrlen(s->name), ulen = safestrlen(s->uid), glen = safestrlen(s->gid);
- uint32_t unusedsz = 2+4+13, statsz = unusedsz+4+4+4+8+2+nlen+2+ulen+2+glen+2;
- uint8_t *b;
- C9error err;
-
- if(nlen == 0 || nlen > C9maxstr){- c->error("c9wstat: invalid name: %ud chars", nlen);- return C9Epath;
- }
- if(ulen > C9maxstr || glen > C9maxstr){- c->error("c9wstat: string too long: %ud chars", ulen > glen ? ulen : glen);- return C9Estr;
- }
- if((b = T(c, 4+2+2+statsz, Twstat, tag, &err)) != NULL){- w32(&b, fid);
- w16(&b, statsz+2);
- w16(&b, statsz);
- memset(b, 0xff, unusedsz); /* leave type(2), dev(4) and qid(13) unchanged */
- b += unusedsz;
- w32(&b, s->mode);
- w32(&b, s->atime);
- w32(&b, s->mtime);
- w64(&b, s->size);
- wcs(&b, s->name, nlen);
- wcs(&b, s->uid, ulen);
- wcs(&b, s->gid, glen);
- wcs(&b, NULL, 0); /* muid unchanged */
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-c9proc(C9ctx *c)
-{- uint32_t i, sz, cnt, msize;
- uint8_t *b;
- int err;
- C9r r;
-
- err = -1;
- if((b = c->read(c, 4, &err)) == NULL){- if(err != 0)
- c->error("c9proc: short read");- return err == 0 ? 0 : C9Epkt;
- }
-
- sz = r32(&b);
- if(sz < 7 || sz > c->msize){- c->error("c9proc: invalid packet size !(7 <= %ud <= %ud)", sz, c->msize);- return C9Epkt;
- }
- sz -= 4;
- err = -1;
- if((b = c->read(c, sz, &err)) == NULL){- if(err != 0)
- c->error("c9proc: short read");- return err == 0 ? 0 : C9Epkt;
- }
-
- r.type = r08(&b);
- r.tag = r16(&b);
- if(r.type != Rversion){- if(r.tag >= C9maxtags){- c->error("c9proc: invalid tag %ud", (uint32_t)r.tag);- return C9Epkt;
- }
- if(freetag(c, r.tag) != 0)
- return C9Etag;
- }
- sz -= 3;
- r.numqid = 0;
-
- switch(r.type){- case Rread:
- if(sz < 4 || (cnt = r32(&b)) > sz-4)
- goto error;
- r.read.data = b;
- r.read.size = cnt;
- c->r(c, &r);
- break;
-
- case Rwrite:
- if(sz < 4 || (cnt = r32(&b)) > c->msize)
- goto error;
- r.write.size = cnt;
- c->r(c, &r);
- break;
-
- case Rwalk:
- if(sz < 2 || (cnt = r16(&b))*13 > sz-2)
- goto error;
- if(cnt > C9maxpathel){- c->error("c9proc: Rwalk !(%ud <= %ud)", cnt, C9maxpathel);- return C9Epath;
- }
- for(i = 0; i < cnt; i++){- r.qid[i].type = r08(&b);
- r.qid[i].version = r32(&b);
- r.qid[i].path = r64(&b);
- }
- r.numqid = cnt;
- c->r(c, &r);
- break;
-
- case Rstat:
- b += 2; sz -= 2;
- if((err = c9parsedir(c, &r.stat, &b, &sz)) != 0)
- return err;
- r.numqid = 1;
- c->r(c, &r);
- break;
-
- case Rflush:
- for(i = 0; i < C9maxflush; i++){- if((c->flush[i] & 0xffff) == r.tag){- freetag(c, c->flush[i]>>16);
- c->flush[i] = 0xffffffff;
- break;
- }
- }
- /* fallthrough */
- case Rclunk:
- case Rremove:
- case Rwstat:
- c->r(c, &r);
- break;
-
- case Ropen:
- case Rcreate:
- if(sz < 17)
- goto error;
- r.qid[0].type = r08(&b);
- r.qid[0].version = r32(&b);
- r.qid[0].path = r64(&b);
- r.iounit = r32(&b);
- r.numqid = 1;
- c->r(c, &r);
- break;
-
- case Rerror:
- if(sz < 2 || (cnt = r16(&b)) > sz-2)
- goto error;
- r.error = memmove(b-1, b, cnt);
- r.error[cnt] = 0;
- c->r(c, &r);
- break;
-
- case Rauth:
- case Rattach:
- if(sz < 13)
- goto error;
- r.qid[0].type = r08(&b);
- r.qid[0].version = r32(&b);
- r.qid[0].path = r64(&b);
- r.numqid = 1;
- c->r(c, &r);
- break;
-
- case Rversion:
- if(sz < 4+2 || (msize = r32(&b)) < C9minmsize || (cnt = r16(&b)) > sz-4-2)
- goto error;
- if(cnt < 6 || memcmp(b, "9P2000", 6) != 0){- c->error("invalid version");- return C9Ever;
- }
- if(msize < c->msize)
- c->msize = msize;
- c->r(c, &r);
- break;
-
- default:
- goto error;
- }
- return 0;
-error:
- c->error("c9proc: invalid packet type %ud", r.type);- return C9Epkt;
-}
-
-#endif /* C9_NO_CLIENT */
-
-C9error
-c9parsedir(C9ctx *c, C9stat *stat, uint8_t **t, uint32_t *size)
-{- uint8_t *b;
- uint32_t cnt, sz;
-
- sz = 0;
- if(*size < 49 || (sz = r16(t)) < 47 || *size < 2+sz)
- goto error;
- *size -= 2+sz;
- *t += 6; /* skip type(2) and dev(4) */
- stat->qid.type = r08(t);
- stat->qid.version = r32(t);
- stat->qid.path = r64(t);
- stat->mode = r32(t);
- stat->atime = r32(t);
- stat->mtime = r32(t);
- stat->size = r64(t);
- sz -= 39;
- if((cnt = r16(t)) > sz-2)
- goto error;
- stat->name = (char*)*t; b = *t = *t+cnt; sz -= 2+cnt;
- if(sz < 2 || (cnt = r16(t)) > sz-2)
- goto error;
- stat->uid = (char*)*t; *b = 0; b = *t = *t+cnt; sz -= 2+cnt;
- if(sz < 2 || (cnt = r16(t)) > sz-2)
- goto error;
- stat->gid = (char*)*t; *b = 0; b = *t = *t+cnt; sz -= 2+cnt;
- if(sz < 2 || (cnt = r16(t)) > sz-2)
- goto error;
- stat->muid = memmove(*t-1, *t, cnt); *b = stat->muid[cnt] = 0; *t = *t+cnt; sz -= 2+cnt;
- *t += sz;
- return 0;
-error:
- c->error("c9parsedir: invalid size: size=%ud sz=%ud", *size, sz);- return C9Epkt;
-}
-
-#ifndef C9_NO_SERVER
-
-static uint8_t *
-R(C9ctx *c, uint32_t size, C9rtype type, C9tag tag, C9error *err)
-{- uint8_t *p = NULL;
-
- if(size > c->msize-4-1-2){- c->error("R: invalid size %ud", size);- *err = C9Esize;
- }else{- size += 4+1+2;
- if((p = c->begin(c, size)) == NULL){- c->error("R: no buffer for %ud bytes", size);- *err = C9Ebuf;
- }else{- *err = 0;
- w32(&p, size);
- w08(&p, type);
- w16(&p, tag);
- }
- }
- return p;
-}
-
-C9error
-s9version(C9ctx *c)
-{- uint8_t *b;
- C9error err;
-
- if((b = R(c, 4+2+6, Rversion, 0xffff, &err)) != NULL){- w32(&b, c->msize);
- wcs(&b, "9P2000", 6);
- err = c->end(c);
- };
- return err;
-}
-
-C9error
-s9auth(C9ctx *c, C9tag tag, const C9qid *aqid)
-{- uint8_t *b;
- C9error err;
-
- if((b = R(c, 13, Rauth, tag, &err)) != NULL){- w08(&b, aqid->type);
- w32(&b, aqid->version);
- w64(&b, aqid->path);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-s9error(C9ctx *c, C9tag tag, const char *ename)
-{- uint32_t len = safestrlen(ename);
- uint8_t *b;
- C9error err;
-
- if(len > C9maxstr){- c->error("s9error: invalid ename: %ud chars", len);- return C9Estr;
- }
- if((b = R(c, 2+len, Rerror, tag, &err)) != NULL){- wcs(&b, ename, len);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-s9attach(C9ctx *c, C9tag tag, const C9qid *qid)
-{- uint8_t *b;
- C9error err;
-
- if((b = R(c, 13, Rattach, tag, &err)) != NULL){- w08(&b, qid->type);
- w32(&b, qid->version);
- w64(&b, qid->path);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-s9flush(C9ctx *c, C9tag tag)
-{- C9error err;
-
- if(R(c, 0, Rflush, tag, &err) != NULL)
- err = c->end(c);
- return err;
-}
-
-C9error
-s9walk(C9ctx *c, C9tag tag, C9qid *qids[])
-{- uint32_t i, n;
- uint8_t *b;
- C9error err;
-
- for(n = 0; n < C9maxpathel && qids[n] != NULL; n++);
- if(n > C9maxpathel){- c->error("s9walk: invalid elements !(0 <= %ud <= %ud)", n, C9maxpathel);- return C9Epath;
- }
-
- if((b = R(c, 2+n*13, Rwalk, tag, &err)) != NULL){- w16(&b, n);
- for(i = 0; i < n; i++){- w08(&b, qids[i]->type);
- w32(&b, qids[i]->version);
- w64(&b, qids[i]->path);
- }
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-s9open(C9ctx *c, C9tag tag, const C9qid *qid, uint32_t iounit)
-{- uint8_t *b;
- C9error err;
-
- if((b = R(c, 13+4, Ropen, tag, &err)) != NULL){- w08(&b, qid->type);
- w32(&b, qid->version);
- w64(&b, qid->path);
- w32(&b, iounit);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-s9create(C9ctx *c, C9tag tag, const C9qid *qid, uint32_t iounit)
-{- uint8_t *b;
- C9error err;
-
- if((b = R(c, 13+4, Rcreate, tag, &err)) != NULL){- w08(&b, qid->type);
- w32(&b, qid->version);
- w64(&b, qid->path);
- w32(&b, iounit);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-s9read(C9ctx *c, C9tag tag, const void *data, uint32_t size)
-{- uint8_t *b;
- C9error err;
-
- if((b = R(c, 4+size, Rread, tag, &err)) != NULL){- w32(&b, size);
- memmove(b, data, size);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-s9write(C9ctx *c, C9tag tag, uint32_t size)
-{- uint8_t *b;
- C9error err;
-
- if((b = R(c, 4, Rwrite, tag, &err)) != NULL){- w32(&b, size);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-s9readdir(C9ctx *c, C9tag tag, C9stat *st[], int *num, uint64_t *offset, uint32_t size)
-{- uint8_t *b;
- const C9stat *s;
- uint32_t nlen, ulen, glen, mulen, m, n;
- C9error err;
- int i;
-
- if(size > c->msize-4-1-2)
- size = c->msize-4-1-2;
-
- m = 0;
- for(i = 0; i < *num; i++){- s = st[i];
- nlen = safestrlen(s->name);
- ulen = safestrlen(s->uid);
- glen = safestrlen(s->gid);
- mulen = safestrlen(s->muid);
-
- if(nlen == 0 || nlen > C9maxstr){- c->error("s9readdir: invalid name: %ud chars", nlen);- return C9Epath;
- }
- if(ulen > C9maxstr || glen > C9maxstr || mulen > C9maxstr){- ulen = ulen > glen ? ulen : glen;
- ulen = ulen > mulen ? ulen : mulen;
- c->error("s9readdir: string too long: %ud chars", ulen);- return C9Estr;
- }
-
- n = 2 + 2+4+13+4+4+4+8+2+nlen+2+ulen+2+glen+2+mulen;
- if(4+m+n > size)
- break;
- m += n;
- }
-
- if((b = R(c, 4+m, Rread, tag, &err)) != NULL){- *num = i;
- w32(&b, m);
- for(i = 0; i < *num; i++){- s = st[i];
- nlen = safestrlen(s->name);
- ulen = safestrlen(s->uid);
- glen = safestrlen(s->gid);
- mulen = safestrlen(s->muid);
- w16(&b, 2+4+13+4+4+4+8+2+nlen+2+ulen+2+glen+2+mulen);
- w16(&b, 0xffff); /* type */
- w32(&b, 0xffffffff); /* dev */
- w08(&b, s->qid.type);
- w32(&b, s->qid.version);
- w64(&b, s->qid.path);
- w32(&b, s->mode);
- w32(&b, s->atime);
- w32(&b, s->mtime);
- w64(&b, s->size);
- wcs(&b, s->name, nlen);
- wcs(&b, s->uid, ulen);
- wcs(&b, s->gid, glen);
- wcs(&b, s->muid, mulen);
- }
- err = c->end(c);
- if(err == 0)
- *offset += m;
- }
- return err;
-}
-
-C9error
-s9clunk(C9ctx *c, C9tag tag)
-{- C9error err;
-
- if(R(c, 0, Rclunk, tag, &err) != NULL)
- err = c->end(c);
- return err;
-}
-
-C9error
-s9remove(C9ctx *c, C9tag tag)
-{- C9error err;
-
- if(R(c, 0, Rremove, tag, &err) != NULL)
- err = c->end(c);
- return err;
-}
-
-C9error
-s9stat(C9ctx *c, C9tag tag, const C9stat *s)
-{- uint32_t nlen = safestrlen(s->name), ulen = safestrlen(s->uid);
- uint32_t glen = safestrlen(s->gid), mulen = safestrlen(s->name);
- uint32_t statsz = 2+4+13+4+4+4+8+2+nlen+2+ulen+2+glen+2+mulen;
- uint8_t *b;
- C9error err;
-
- if(nlen == 0 || nlen > C9maxstr){- c->error("s9stat: invalid name: %ud chars", nlen);- return C9Epath;
- }
- if(ulen > C9maxstr || glen > C9maxstr || mulen > C9maxstr){- ulen = ulen > glen ? ulen : glen;
- ulen = ulen > mulen ? ulen : mulen;
- c->error("s9stat: string too long: %ud chars", ulen);- return C9Estr;
- }
-
- if((b = R(c, 2+2+statsz, Rstat, tag, &err)) != NULL){- w16(&b, statsz+2);
- w16(&b, statsz);
- w16(&b, 0xffff); /* type */
- w32(&b, 0xffffffff); /* dev */
- w08(&b, s->qid.type);
- w32(&b, s->qid.version);
- w64(&b, s->qid.path);
- w32(&b, s->mode);
- w32(&b, s->atime);
- w32(&b, s->mtime);
- w64(&b, s->size);
- wcs(&b, s->name, nlen);
- wcs(&b, s->uid, ulen);
- wcs(&b, s->gid, glen);
- wcs(&b, s->muid, mulen);
- err = c->end(c);
- }
- return err;
-}
-
-C9error
-s9wstat(C9ctx *c, C9tag tag)
-{- C9error err;
-
- if(R(c, 0, Rwstat, tag, &err) != NULL)
- err = c->end(c);
- return err;
-}
-
-C9error
-s9proc(C9ctx *c)
-{- uint32_t i, sz, cnt, n, msize;
- int readerr;
- uint8_t *b;
- C9error err;
- C9t t;
-
- readerr = -1;
- if((b = c->read(c, 4, &readerr)) == NULL){- if(readerr != 0)
- c->error("s9proc: short read");- return readerr == 0 ? 0 : C9Epkt;
- }
-
- sz = r32(&b);
- if(sz < 7 || sz > c->msize){- c->error("s9proc: invalid packet size !(7 <= %ud <= %ud)", sz, c->msize);- return C9Epkt;
- }
- sz -= 4;
- readerr = -1;
- if((b = c->read(c, sz, &readerr)) == NULL){- if(readerr != 0)
- c->error("s9proc: short read");- return readerr == 0 ? 0 : C9Epkt;
- }
-
- t.type = r08(&b);
- t.tag = r16(&b);
- sz -= 3;
-
- if((c->svflags & Svver) == 0 && t.type != Tversion){- c->error("s9proc: expected Tversion, got %ud", t.type);- return C9Epkt;
- }
-
- switch(t.type){- case Tread:
- if(sz < 4+8+4)
- goto error;
- t.fid = r32(&b);
- t.read.offset = r64(&b);
- t.read.size = r32(&b);
- if(t.read.size > maxread(c))
- t.read.size = maxread(c);
- c->t(c, &t);
- break;
-
- case Twrite:
- if(sz < 4+8+4)
- goto error;
- t.fid = r32(&b);
- t.write.offset = r64(&b);
- if((t.write.size = r32(&b)) < sz-4-8-4)
- goto error;
- if(t.write.size > maxwrite(c))
- t.write.size = maxwrite(c);
- t.write.data = b;
- c->t(c, &t);
- break;
-
- case Tclunk:
- case Tstat:
- case Tremove:
- if(sz < 4)
- goto error;
- t.fid = r32(&b);
- c->t(c, &t);
- break;
-
- case Twalk:
- if(sz < 4+4+2)
- goto error;
- t.fid = r32(&b);
- t.walk.newfid = r32(&b);
- if((n = r16(&b)) > 16){- c->error("s9proc: Twalk !(%ud <= 16)", n);- return C9Epath;
- }
- sz -= 4+4+2;
- if(n > 0){- for(i = 0; i < n; i++){- if(sz < 2 || (cnt = r16(&b)) > sz-2)
- goto error;
- if(cnt < 1){- c->error("s9proc: Twalk invalid element [%ud]", i);- return C9Epath;
- }
- b[-2] = 0;
- t.walk.wname[i] = (char*)b;
- b += cnt;
- sz -= 2 + cnt;
- }
- memmove(t.walk.wname[i-1]-1, t.walk.wname[i-1], (char*)b - t.walk.wname[i-1]);
- t.walk.wname[i-1]--;
- b[-1] = 0;
- }else
- i = 0;
- t.walk.wname[i] = NULL;
- c->t(c, &t);
- break;
-
- case Topen:
- if(sz < 4+1)
- goto error;
- t.fid = r32(&b);
- t.open.mode = r08(&b);
- c->t(c, &t);
- break;
-
- case Twstat:
- if(sz < 4+2)
- goto error;
- t.fid = r32(&b);
- if((cnt = r16(&b)) > sz-4)
- goto error;
- if((err = c9parsedir(c, &t.wstat, &b, &cnt)) != 0){- c->error("s9proc");- return err;
- }
- c->t(c, &t);
- break;
-
- case Tcreate:
- if(sz < 4+2+4+1)
- goto error;
- t.fid = r32(&b);
- if((cnt = r16(&b)) < 1 || cnt > sz-4-2-4-1)
- goto error;
- t.create.name = (char*)b;
- b += cnt;
- t.create.perm = r32(&b);
- t.create.mode = r08(&b);
- t.create.name[cnt] = 0;
- c->t(c, &t);
- break;
-
- case Tflush:
- if(sz < 2)
- goto error;
- t.flush.oldtag = r16(&b);
- c->t(c, &t);
- break;
-
- case Tversion:
- if(sz < 4+2 || (msize = r32(&b)) < C9minmsize || (cnt = r16(&b)) > sz-4-2)
- goto error;
- if(cnt < 6 || memcmp(b, "9P2000", 6) != 0){- if((b = R(c, 4+2+7, Rversion, 0xffff, &err)) != NULL){- w32(&b, 0);
- wcs(&b, "unknown", 7);
- err = c->end(c);
- c->error("s9proc: invalid version");- }
- return C9Ever;
- }
- if(msize < c->msize)
- c->msize = msize;
- c->svflags |= Svver;
- c->t(c, &t);
- break;
-
- case Tattach:
- if(sz < 4+4+2+2)
- goto error;
- t.fid = r32(&b);
- t.attach.afid = r32(&b);
- cnt = r16(&b);
- sz -= 4+4+2;
- if(cnt+2 > sz)
- goto error;
- t.attach.uname = (char*)b;
- b += cnt;
- cnt = r16(&b);
- b[-2] = 0;
- sz -= cnt+2;
- if(cnt > sz)
- goto error;
- memmove(b-1, b, cnt);
- t.attach.aname = (char*)b-1;
- t.attach.aname[cnt] = 0;
- c->t(c, &t);
- break;
-
- case Tauth:
- if(sz < 4+2+2)
- goto error;
- t.auth.afid = r32(&b);
- cnt = r16(&b);
- sz -= 4+2;
- if(cnt+2 > sz)
- goto error;
- t.auth.uname = (char*)b;
- b += cnt;
- cnt = r16(&b);
- b[-2] = 0;
- sz -= cnt+2;
- if(cnt > sz)
- goto error;
- memmove(b-1, b, cnt);
- t.auth.aname = (char*)b-1;
- t.auth.aname[cnt] = 0;
- c->t(c, &t);
- break;
-
- default:
- goto error;
- }
- return 0;
-error:
- c->error("s9proc: invalid packet (type=%ud)", t.type);- return C9Epkt;
-}
-
-#endif /* C9_NO_SERVER */
--- a/c9/c9.h
+++ /dev/null
@@ -1,365 +1,0 @@
-#ifdef __plan9__
-typedef u64int uint64_t;
-typedef u32int uint32_t;
-typedef u16int uint16_t;
-typedef u8int uint8_t;
-#define __attribute__(...)
-#define NULL nil
-#endif
-
-struct C9aux;
-
-typedef struct C9r C9r;
-typedef struct C9t C9t;
-typedef struct C9stat C9stat;
-typedef struct C9ctx C9ctx;
-typedef struct C9qid C9qid;
-typedef uint32_t C9fid;
-typedef uint16_t C9tag;
-
-/* Stat field is not changed if it's set to this value when calling c9wstat. */
-#define C9nochange (~0)
-
-/* Special fid used with auth/attach to basically avoid authentication. */
-#define C9nofid ((C9fid)~0)
-
-/* C9modes for opening a file. */
-typedef enum
-{- C9read = 0,
- C9write = 1,
- C9rdwr = 2,
- C9exec = 3,
- C9trunc = 0x10,
- C9rclose = 0x40,
- C9excl = 0x1000,
-}C9mode;
-
-typedef enum
-{- /* User/owner. */
- C9permur = 1<<8, /* Readable. */
- C9permuw = 1<<7, /* Writable. */
- C9permux = 1<<6, /* Executable. */
-
- /* Group. */
- C9permgr = 1<<5,
- C9permgw = 1<<4,
- C9permgx = 1<<3,
-
- /* Other. */
- C9permor = 1<<2,
- C9permow = 1<<1,
- C9permox = 1<<0,
-}C9perm;
-
-/* Directory. */
-#define C9permdir 0x80000000
-
-/* Bitmask of stat.mode. */
-#define C9stdir 0x80000000
-#define C9stappend 0x40000000
-#define C9stexcl 0x20000000
-#define C9sttmp 0x04000000
-
-/* Limits. */
-enum
-{- C9maxtags = 64, /* Maximal number of outstanding requests. [1-65535] */
- C9maxflush = 8, /* Maximal number of outstanding flushes. [1-65535] */
- C9maxstr = 0xffff, /* Maximal string length. [1-65535] */
- C9minmsize = 4096, /* Minimal sane msize. [4096-...] */
- C9maxpathel = 16, /* Maximal number of elements in a path. Do not change. */
-};
-
-/* Errors. */
-typedef enum
-{- C9Einit = -1, /* Initialization failed. */
- C9Ever = -2, /* Protocol version doesn't match. */
- C9Epkt = -3, /* Incoming packet error. */
- C9Etag = -4, /* No free tags or bad tag. */
- C9Ebuf = -5, /* No buffer space enough for a message. */
- C9Epath = -6, /* Path is too long or just invalid. */
- C9Eflush = -7, /* Limit of outstanding flushes reached. */
- C9Esize = -8, /* Can't fit data in one message. */
- C9Estr = -9 /* Bad string. */
-}C9error;
-
-/* Request types. */
-typedef enum
-{- Tversion = 100,
- Tauth = 102,
- Tattach = 104,
- Tflush = 108,
- Twalk = 110,
- Topen = 112,
- Tcreate = 114,
- Tread = 116,
- Twrite = 118,
- Tclunk = 120,
- Tremove = 122,
- Tstat = 124,
- Twstat = 126
-}C9ttype;
-
-/* Response types. */
-typedef enum
-{- Rversion = 101,
- Rauth = 103,
- Rattach = 105,
- Rerror = 107,
- Rflush = 109,
- Rwalk = 111,
- Ropen = 113,
- Rcreate = 115,
- Rread = 117,
- Rwrite = 119,
- Rclunk = 121,
- Rremove = 123,
- Rstat = 125,
- Rwstat = 127
-}C9rtype;
-
-/* Unique file id type. */
-typedef enum
-{- C9qtdir = 1<<7,
- C9qtappend = 1<<6,
- C9qtexcl = 1<<5,
- C9qtauth = 1<<3,
- C9qttmp = 1<<2,
- C9qtfile = 0
-}C9qt;
-
-/* Unique file id. */
-struct C9qid
-{- uint64_t path;
- uint32_t version;
- C9qt type;
-};
-
-/*
- * File stats. Version and muid are ignored on wstat. Dmdir bit
- * change in mode won't work on wstat. Set any integer field to
- * C9nochange to keep it unchanged on wstat. Set any string to NULL to
- * keep it unchanged. Strings can be empty (""), but never NULL after- * stat call.
- */
-struct C9stat
-{- uint64_t size; /* Size of the file (in bytes). */
- char *name; /* Name of the file. */
- char *uid; /* Owner of the file. */
- char *gid; /* Group of the file. */
- char *muid; /* The user who modified the file last. */
- C9qid qid; /* Same as qid[0]. */
- uint32_t mode; /* Permissions. See C9st* and C9perm. */
- uint32_t atime; /* Last access time. */
- uint32_t mtime; /* Last modification time. */
-};
-
-/* Response data. */
-struct C9r
-{- union
- {- char *error;
-
- struct
- {- uint8_t *data;
- uint32_t size;
- }read;
-
- struct
- {- uint32_t size;
- }write;
-
- /* File stats (only valid if type is Rstat). */
- C9stat stat;
-
- /*
- * Qid(s). qid[0] is valid for auth/attach/create/stat/open.
- * More ids may be a result of a walk, see numqid.
- */
- C9qid qid[C9maxpathel];
- };
- C9rtype type; /* Response type. */
-
- /*
- * If not zero, is the maximum number of bytes that are guaranteed
- * to be read or written atomically, without breaking into multiple
- * messages.
- */
- uint32_t iounit;
-
- int numqid; /* Number of valid unique ids in qid array. */
- C9tag tag; /* Tag number. */
-};
-
-/* Request data. */
-struct C9t
-{- C9ttype type;
- C9tag tag;
- union
- {- struct
- {- char *uname;
- char *aname;
- C9fid afid;
- }attach;
-
- struct
- {- char *uname;
- char *aname;
- C9fid afid;
- }auth;
-
- struct
- {- char *name;
- uint32_t perm;
- C9mode mode;
- }create;
-
- struct
- {- C9tag oldtag;
- }flush;
-
- struct
- {- C9mode mode;
- }open;
-
- struct
- {- uint64_t offset;
- uint32_t size;
- }read;
-
- struct
- {- char *wname[C9maxpathel+1]; /* wname[16] is always NULL */
- C9fid newfid;
- }walk;
-
- struct
- {- uint64_t offset;
- uint8_t *data;
- uint32_t size;
- }write;
-
- C9stat wstat;
- };
- C9fid fid;
-};
-
-enum
-{- C9tagsbits = sizeof(uint32_t) * 8,
-};
-
-struct C9ctx
-{- /*
- * Should return a pointer to the data (exactly 'size' bytes) read.
- * Set 'err' to non-zero and return NULL in case of error.
- * 'err' set to zero (no error) should be used to return from c9process
- * early (timeout on read to do non-blocking operations, for example).
- */
- uint8_t *(*read)(C9ctx *ctx, uint32_t size, int *err) __attribute__((nonnull(1, 3)));
-
- /* Should return a buffer to store 'size' bytes. Nil means no memory. */
- uint8_t *(*begin)(C9ctx *ctx, uint32_t size) __attribute__((nonnull(1)));
-
- /*
- * Marks the end of a message. Callback may decide if any accumulated
- * messages should be sent to the server/client.
- */
- int (*end)(C9ctx *ctx) __attribute__((nonnull(1)));
-
- /* Callback called every time a new R-message is received. */
- void (*r)(C9ctx *ctx, C9r *r) __attribute__((nonnull(1, 2)));
-
- /* Callback called every time a new T-message is received. */
- void (*t)(C9ctx *ctx, C9t *t) __attribute__((nonnull(1, 2)));
-
- /* Callback for error messages. */
- void (*error)(const char *fmt, ...) __attribute__((nonnull(1), format(printf, 1, 2)));
-
- /* Auxiliary data, can be used by any of above callbacks. */
- struct C9aux *aux;
-
- /* private stuff */
- uint32_t msize;
-#ifndef C9_NO_CLIENT
- uint32_t flush[C9maxflush];
- uint32_t tags[C9maxtags/C9tagsbits];
-#endif
- union
- {- C9tag lowfreetag;
- uint16_t svflags;
- };
-};
-
-/* Parse one directory entry. */
-extern C9error c9parsedir(C9ctx *c, C9stat *stat, uint8_t **data, uint32_t *size) __attribute__((nonnull(1, 2, 3)));
-
-#ifndef C9_NO_CLIENT
-
-extern C9error c9version(C9ctx *c, C9tag *tag, uint32_t msize) __attribute__((nonnull(1, 2)));
-extern C9error c9auth(C9ctx *c, C9tag *tag, C9fid afid, const char *uname, const char *aname) __attribute__((nonnull(1, 2)));
-extern C9error c9flush(C9ctx *c, C9tag *tag, C9tag oldtag) __attribute__((nonnull(1, 2)));
-extern C9error c9attach(C9ctx *c, C9tag *tag, C9fid fid, C9fid afid, const char *uname, const char *aname) __attribute__((nonnull(1, 2)));
-extern C9error c9walk(C9ctx *c, C9tag *tag, C9fid fid, C9fid newfid, const char *path[]) __attribute__((nonnull(1, 2, 5)));
-extern C9error c9open(C9ctx *c, C9tag *tag, C9fid fid, C9mode mode) __attribute__((nonnull(1, 2)));
-extern C9error c9create(C9ctx *c, C9tag *tag, C9fid fid, const char *name, uint32_t perm, C9mode mode) __attribute__((nonnull(1, 2, 4)));
-extern C9error c9read(C9ctx *c, C9tag *tag, C9fid fid, uint64_t offset, uint32_t count) __attribute__((nonnull(1, 2)));
-extern C9error c9write(C9ctx *c, C9tag *tag, C9fid fid, uint64_t offset, const void *in, uint32_t count) __attribute__((nonnull(1, 2, 5)));
-extern C9error c9wrstr(C9ctx *c, C9tag *tag, C9fid fid, const char *s) __attribute__((nonnull(1, 2, 4)));
-extern C9error c9clunk(C9ctx *c, C9tag *tag, C9fid fid) __attribute__((nonnull(1, 2)));
-extern C9error c9remove(C9ctx *c, C9tag *tag, C9fid fid) __attribute__((nonnull(1, 2)));
-extern C9error c9stat(C9ctx *c, C9tag *tag, C9fid fid) __attribute__((nonnull(1, 2)));
-extern C9error c9wstat(C9ctx *c, C9tag *tag, C9fid fid, const C9stat *s) __attribute__((nonnull(1, 2, 4)));
-
-/*
- * Wait until a response comes and process it. If the function returns
- * any error, context must be treated as 'broken' and no subsequent calls
- * should be made without reinitialization (c9version).
- */
-extern C9error c9proc(C9ctx *c) __attribute__((nonnull(1)));
-
-#endif /* C9_NO_CLIENT */
-
-#ifndef C9_NO_SERVER
-
-extern C9error s9version(C9ctx *c) __attribute__((nonnull(1)));
-extern C9error s9auth(C9ctx *c, C9tag tag, const C9qid *aqid) __attribute__((nonnull(1, 3)));
-extern C9error s9error(C9ctx *c, C9tag tag, const char *err) __attribute__((nonnull(1)));
-extern C9error s9attach(C9ctx *c, C9tag tag, const C9qid *qid) __attribute__((nonnull(1, 3)));
-extern C9error s9flush(C9ctx *c, C9tag tag) __attribute__((nonnull(1)));
-extern C9error s9walk(C9ctx *c, C9tag tag, C9qid *qids[]) __attribute__((nonnull(1, 3)));
-extern C9error s9open(C9ctx *c, C9tag tag, const C9qid *qid, uint32_t iounit) __attribute__((nonnull(1, 3)));
-extern C9error s9create(C9ctx *c, C9tag tag, const C9qid *qid, uint32_t iounit) __attribute__((nonnull(1, 3)));
-extern C9error s9read(C9ctx *c, C9tag tag, const void *data, uint32_t size) __attribute__((nonnull(1, 3)));
-extern C9error s9readdir(C9ctx *c, C9tag tag, C9stat *st[], int *num, uint64_t *offset, uint32_t size) __attribute__((nonnull(1, 3, 4)));
-extern C9error s9write(C9ctx *c, C9tag tag, uint32_t size) __attribute__((nonnull(1)));
-extern C9error s9clunk(C9ctx *c, C9tag tag) __attribute__((nonnull(1)));
-extern C9error s9remove(C9ctx *c, C9tag tag) __attribute__((nonnull(1)));
-extern C9error s9stat(C9ctx *c, C9tag tag, const C9stat *s) __attribute__((nonnull(1, 3)));
-extern C9error s9wstat(C9ctx *c, C9tag tag) __attribute__((nonnull(1)));
-
-extern C9error s9proc(C9ctx *c) __attribute__((nonnull(1)));
-
-#endif /* C9_NO_SERVER */
--- a/crc32.c
+++ /dev/null
@@ -1,52 +1,0 @@
-#define _DEFAULT_SOURCE
-#include <stdint.h>
-
-static uint32_t table[256] = {- 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
- 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
- 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
- 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
- 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
- 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
- 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
- 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
- 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
- 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
- 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
- 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
- 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
- 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
- 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
- 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
- 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
- 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
- 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
- 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
- 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
- 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
- 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
- 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
- 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
- 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
- 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
- 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
- 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
- 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
- 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
- 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d,
-};
-
-uint32_t
-crc32(const void *data, int len)
-{- const uint8_t *d;
- uint32_t c;
- int i;
-
- d = data;
- c = 0xffffffff;
- for (i = 0; i < len; i++)
- c = table[(c & 0xff) ^ d[i]] ^ (c >> 8);
-
- return ~c;
-}
--- /dev/null
+++ b/examples/dial.c
@@ -1,0 +1,50 @@
+#include <string.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <unistd.h>
+
+int
+dial(const char *s)
+{+ struct addrinfo *r, *a, hint = {.ai_flags = AI_ADDRCONFIG, .ai_family = AF_UNSPEC, 0};+ char host[128], *port;
+ int e, f;
+
+ if(strncmp(s, "udp!", 4) == 0){+ hint.ai_socktype = SOCK_DGRAM;
+ hint.ai_protocol = IPPROTO_UDP;
+ }else if(strncmp(s, "tcp!", 4) == 0){+ hint.ai_socktype = SOCK_STREAM;
+ hint.ai_protocol = IPPROTO_TCP;
+ }else{+ fprintf(stderr, "invalid dial string: %s\n", s);
+ return -1;
+ }
+ if((port = strchr(s+4, '!')) == NULL){+ fprintf(stderr, "invalid dial string: %s\n", s);
+ return -1;
+ }
+ if(snprintf(host, sizeof(host), "%.*s", (int)(port-s-4), s+4) >= (int)sizeof(host)){+ fprintf(stderr, "host name too large: %s\n", s);
+ return -1;
+ }
+ port++;
+ if((e = getaddrinfo(host, port, &hint, &r)) != 0){+ fprintf(stderr, "%s: %s\n", gai_strerror(e), s);
+ return -1;
+ }
+ f = -1;
+ for(a = r; a != NULL; a = a->ai_next){+ if((f = socket(a->ai_family, a->ai_socktype, a->ai_protocol)) < 0)
+ continue;
+ if(connect(f, a->ai_addr, a->ai_addrlen) == 0)
+ break;
+ close(f);
+ f = -1;
+ }
+ freeaddrinfo(r);
+
+ return f;
+}
--- /dev/null
+++ b/examples/fs9ptest.c
@@ -1,0 +1,52 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include "c9/proto.h"
+#include "c9/fs.h"
+#include "c9/fs9p.h"
+
+int dial(const char *s);
+C9ctx *init9p(int f);
+
+static FS9pfd fds[8];
+
+static void
+fserror(FS *fs, const char *fmt, ...)
+{+ va_list ap;
+
+ (void)fs;
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
+ fprintf(stderr, "\n");
+ va_end(ap);
+}
+
+int
+main(int argc, char **argv)
+{+ C9ctx *ctx;
+ FSstat st;
+ FS fs;
+ FS9p fs9 = {+ .fds = fds,
+ .numfds = sizeof(fds)/sizeof(fds[0]),
+ };
+ int f;
+
+ (void)argc; (void)argv;
+
+ fs.error = fserror;
+ fs.aux = (void*)&fs9;
+ if((f = dial("tcp!ftrv.se!564")) < 0)+ return 1;
+ ctx = init9p(f);
+ fs9.ctx = ctx;
+ if(fs9pinit(&fs, 8192) != 0)
+ return 1;
+ if(fs.fstat(&fs, FS9proot, &st) != 0)
+ return 1;
+ printf("%s %d %s %o\n", st.name, (int)st.size, st.uid, st.mode&0777);+
+ return 0;
+}
--- /dev/null
+++ b/examples/sockets.c
@@ -1,0 +1,127 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "c9/proto.h"
+
+enum {+ Msize = 8192,
+
+ Disconnected = 1<<0,
+};
+
+typedef struct C9aux C9aux;
+
+struct C9aux {+ C9ctx c;
+ int f;
+ int flags;
+ uint8_t rdbuf[Msize];
+ uint8_t wrbuf[Msize];
+ uint32_t wroff;
+};
+
+static uint8_t *
+ctxread(C9ctx *ctx, uint32_t size, int *err)
+{+ uint32_t n;
+ int r;
+ C9aux *a;
+
+ a = ctx->aux;
+ *err = 0;
+ for(n = 0; n < size; n += r){+ if((r = read(a->f, a->rdbuf+n, size-n)) <= 0){+ if(errno == EINTR)
+ continue;
+ a->flags |= Disconnected;
+ close(a->f);
+ return NULL;
+ }
+ }
+
+ return a->rdbuf;
+}
+
+static int
+wrsend(C9aux *a)
+{+ uint32_t n;
+ int w;
+
+ for(n = 0; n < a->wroff; n += w){+ if((w = write(a->f, a->wrbuf+n, a->wroff-n)) <= 0){+ if(errno == EINTR)
+ continue;
+ if(errno != EPIPE) /* remote end closed */
+ perror("write");+ return -1;
+ }
+ }
+ a->wroff = 0;
+
+ return 0;
+}
+
+static uint8_t *
+ctxbegin(C9ctx *ctx, uint32_t size)
+{+ uint8_t *b;
+ C9aux *a;
+
+ a = ctx->aux;
+ if(a->wroff + size > sizeof(a->wrbuf)){+ if(wrsend(a) != 0 || a->wroff + size > sizeof(a->wrbuf))
+ return NULL;
+ }
+ b = a->wrbuf + a->wroff;
+ a->wroff += size;
+
+ return b;
+}
+
+static int
+ctxend(C9ctx *ctx)
+{+ C9aux *a;
+
+ /*
+ * To batch up requests and instead flush them all at once just return 0
+ * here and call wrsend yourself when needed.
+ */
+ a = ctx->aux;
+ return wrsend(a);
+}
+
+static void
+ctxerror(C9ctx *ctx, const char *fmt, ...)
+{+ va_list ap;
+
+ (void)ctx;
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
+ fprintf(stderr, "\n");
+ va_end(ap);
+}
+
+C9aux *
+init9p(int f)
+{+ C9aux *c;
+
+ if((c = calloc(1, sizeof(*c))) == NULL){+ close(f);
+ return NULL;
+ }
+ c->f = f;
+ c->c.read = ctxread;
+ c->c.begin = ctxbegin;
+ c->c.end = ctxend;
+ c->c.error = ctxerror;
+ c->c.aux = c;
+
+ return c;
+}
--- /dev/null
+++ b/fs9p.c
@@ -1,0 +1,301 @@
+#include <stdint.h>
+#include <string.h>
+#include "c9/proto.h"
+#include "c9/fs.h"
+#include "c9/fs9p.h"
+
+enum
+{+ Flinit = 1<<0,
+ Flerror = 1<<1,
+
+ F9init = 0,
+ F9chdir,
+ F9open,
+ F9create,
+ F9read,
+ F9readdir,
+ F9write,
+ F9seek,
+ F9stat,
+ F9fstat,
+ F9close,
+ F9remove,
+ F9rename,
+};
+
+static const FS9pfd freefd =
+{+ .offset = ~0ULL,
+};
+
+#define isfree(fd) ((fd).offset == ~0ULL)
+
+static const char *f2s[] =
+{+ [F9init] = "init",
+ [F9chdir] = "chdir",
+ [F9open] = "open",
+ [F9create] = "create",
+ [F9read] = "read",
+ [F9readdir] = "readdir",
+ [F9write] = "write",
+ [F9seek] = "seek",
+ [F9stat] = "stat",
+ [F9fstat] = "fstat",
+ [F9close] = "close",
+ [F9remove] = "remove",
+ [F9rename] = "rename",
+};
+
+static int
+fs9pchdir(FS *fs, const char *path)
+{+ FS9p *aux = (void*)fs->aux;
+
+ aux->f = F9chdir;
+
+ return -1;
+}
+
+static int
+fs9popen(FS *fs, const char *name, FSmode mode)
+{+ FS9p *aux = (void*)fs->aux;
+
+ aux->f = F9open;
+
+ return -1;
+}
+
+static int
+fs9pcreate(FS *fs, const char *path, int perm)
+{+ FS9p *aux = (void*)fs->aux;
+
+ aux->f = F9create;
+
+ return -1;
+}
+
+static int64_t
+fs9pread(FS *fs, int fd, void *buf, uint64_t count)
+{+ FS9p *aux = (void*)fs->aux;
+
+ aux->f = F9read;
+
+ return -1;
+}
+
+static int64_t
+fs9preaddir(FS *fs, int fd, FSstat *st, int nst)
+{+ FS9p *aux = (void*)fs->aux;
+
+ aux->f = F9readdir;
+
+ return -1;
+}
+
+static int64_t
+fs9pwrite(FS *fs, int fd, const void *buf, uint64_t count)
+{+ FS9p *aux = (void*)fs->aux;
+
+ aux->f = F9write;
+
+ return -1;
+}
+
+static int64_t
+fs9pseek(FS *fs, int fd, int64_t offset, int whence)
+{+ FS9p *aux = (void*)fs->aux;
+
+ aux->f = F9seek;
+
+ return -1;
+}
+
+static int
+fs9pstat(FS *fs, const char *path, FSstat *st)
+{+ FS9p *aux = (void*)fs->aux;
+
+ aux->f = F9stat;
+
+ return -1;
+}
+
+static int
+fs9pfstat(FS *fs, int fd, FSstat *st)
+{+ FS9p *aux = (void*)fs->aux;
+ C9tag tag;
+ int e;
+
+ aux->f = F9fstat;
+ aux->p = st;
+ if((e = c9stat(aux->ctx, &tag, fd)) < 0)
+ return e;
+ while(aux->f != -F9fstat)
+ c9proc(aux->ctx);
+
+ return 0;
+}
+
+static int
+fs9pclose(FS *fs, int fd)
+{+ FS9p *aux = (void*)fs->aux;
+
+ aux->f = F9close;
+
+ return -1;
+}
+
+static int
+fs9premove(FS *fs, const char *name)
+{+ FS9p *aux = (void*)fs->aux;
+
+ aux->f = F9remove;
+
+ return -1;
+}
+
+static int
+fs9prename(FS *fs, const char *oldpath, const char *newpath)
+{+ FS9p *aux = (void*)fs->aux;
+
+ aux->f = F9rename;
+
+ return -1;
+}
+
+static void
+fs9pr(C9ctx *ctx, C9r *r)
+{+ FSstat *st;
+ C9tag tag;
+ FS9p *aux;
+ FS *fs;
+
+ fs = ctx->paux;
+ aux = (void*)fs->aux;
+
+ switch(r->type){+ case Rversion:
+ c9attach(ctx, &tag, FS9proot, C9nofid, "none", NULL); /* FIXME those need to be configurable */
+ break;
+
+ case Rauth:
+ break;
+
+ case Rattach:
+ aux->flags |= Flinit;
+ break;
+
+ case Rerror:
+ fs->error(fs, "%s: %s", f2s[aux->f], r->error);
+ aux->flags |= Flerror;
+ break;
+
+ case Rflush:
+ break;
+
+ case Rwalk:
+ break;
+
+ case Ropen:
+ break;
+
+ case Rcreate:
+ break;
+
+ case Rread:
+ break;
+
+ case Rwrite:
+ break;
+
+ case Rclunk:
+ break;
+
+ case Rremove:
+ break;
+
+ case Rstat:
+ if(aux->f == F9stat || aux->f == F9fstat){+ st = aux->p;
+ st->size = r->stat.size;
+ st->name = r->stat.name;
+ st->uid = r->stat.uid;
+ st->gid = r->stat.gid;
+ st->mode = r->stat.mode;
+ st->mtime = r->stat.mtime;
+ aux->f = -aux->f;
+ }
+ break;
+
+ case Rwstat:
+ break;
+ }
+}
+
+int
+fs9pinit(FS *fs, uint32_t msize)
+{+ FS9p *aux = (void*)fs->aux;
+ C9error err;
+ C9tag tag;
+ int i;
+
+ if(fs->error == NULL)
+ return -1;
+ if(aux == NULL || aux->ctx == NULL || aux->fds == NULL || aux->numfds < 1){+ fs->error(fs, "fs9pinit: invalid aux");
+ return -1;
+ }
+ if(aux->ctx == NULL){+ fs->error(fs, "fs9pinit: invalid ctx");
+ return -1;
+ }
+
+ fs->chdir = fs9pchdir;
+ fs->open = fs9popen;
+ fs->create = fs9pcreate;
+ fs->read = fs9pread;
+ fs->readdir = fs9preaddir;
+ fs->write = fs9pwrite;
+ fs->seek = fs9pseek;
+ fs->stat = fs9pstat;
+ fs->fstat = fs9pfstat;
+ fs->close = fs9pclose;
+ fs->remove = fs9premove;
+ fs->rename = fs9prename;
+
+ aux->root.offset = 0;
+ for(i = 0; i < aux->numfds; i++)
+ aux->fds[i] = freefd;
+
+ aux->ctx->r = fs9pr;
+ aux->ctx->paux = fs;
+ aux->f = F9init;
+ aux->flags = 0;
+
+ if((err = c9version(aux->ctx, &tag, msize)) != 0)
+ return err;
+ for(;;){+ if((err = c9proc(aux->ctx)) != 0)
+ return err;
+ if(aux->flags & Flerror)
+ return -1;
+ if(aux->flags & Flinit)
+ break;
+ }
+
+ return 0;
+}
--- /dev/null
+++ b/include/c9/fs.h
@@ -1,0 +1,48 @@
+typedef struct FS FS;
+typedef struct FSstat FSstat;
+
+typedef enum
+{+ FS_OREAD,
+ FS_OWRITE,
+ FS_ORDWR,
+ FS_OEXEC,
+ FS_OTRUNC = 0x10,
+ FS_ORCLOSE = 0x40,
+ FS_OEXCL = 0x1000,
+ FS_DIR = 0x80000000U, /* open/create: it's supposed to be a directory. */
+}FSmode;
+
+struct FSstat
+{+ uint64_t size; /* Size of the file (in bytes). */
+ char *name; /* Name of the file. */
+ char *uid; /* Owner of the file. */
+ char *gid; /* Group of the file. */
+ uint32_t mode; /* Permissions. See C9st* and C9perm. */
+ uint64_t mtime; /* Last modification time. Nanoseconds since epoch. */
+};
+
+struct FSaux;
+
+struct FS
+{+ /* Callback for error messages. */
+ void (*error)(FS *fs, const char *fmt, ...) __attribute__((nonnull(1), format(printf, 2, 3)));
+
+ /* Do not set these. */
+ int (*chdir)(FS *fs, const char *path) __attribute__((nonnull(1, 2)));
+ int (*open)(FS *fs, const char *name, FSmode mode) __attribute__((nonnull(1, 2)));
+ int (*create)(FS *fs, const char *path, int perm) __attribute__((nonnull(1, 2)));
+ int64_t (*read)(FS *fs, int fd, void *buf, uint64_t count) __attribute__((nonnull(1, 3)));
+ int64_t (*readdir)(FS *fs, int fd, FSstat *st, int nst);
+ int64_t (*write)(FS *fs, int fd, const void *buf, uint64_t count) __attribute__((nonnull(1, 3)));
+ int64_t (*seek)(FS *fs, int fd, int64_t offset, int whence) __attribute__((nonnull(1)));
+ int (*stat)(FS *fs, const char *path, FSstat *st) __attribute__((nonnull(1, 2, 3)));
+ int (*fstat)(FS *fs, int fd, FSstat *st) __attribute__((nonnull(1, 3)));
+ int (*close)(FS *fs, int fd) __attribute__((nonnull(1)));
+ int (*remove)(FS *fs, const char *name) __attribute__((nonnull(1, 2)));
+ int (*rename)(FS *fs, const char *oldpath, const char *newpath) __attribute__((nonnull(1, 2, 3)));
+
+ struct FSaux *aux;
+};
--- /dev/null
+++ b/include/c9/fs9p.h
@@ -1,0 +1,31 @@
+enum
+{+ FS9proot = 3, /* '/' file descriptor. */
+};
+
+typedef struct FS9p FS9p;
+typedef struct FS9pfd FS9pfd;
+
+struct FS9pfd
+{+ uint64_t offset;
+};
+
+struct FS9p
+{+ /* The following three fields need to be set before calling fs9pinit. */
+
+ C9ctx *ctx; /* Set to a full set up context, except "r" and "t" fields. */
+ FS9pfd *fds; /* Point at the allocated fds array. */
+ int numfds; /* Set to the number of entries available in fds array. */
+ void *aux; /* Optional, user-supplied aux value. */
+
+ /* Private, do not touch. */
+ FS9pfd root;
+ FS9pfd cwd;
+ int f;
+ void *p;
+ int flags;
+};
+
+extern int fs9pinit(FS *fs, uint32_t msize) __attribute__((nonnull(1)));
--- /dev/null
+++ b/include/c9/proto.h
@@ -1,0 +1,361 @@
+struct C9aux;
+
+typedef struct C9r C9r;
+typedef struct C9t C9t;
+typedef struct C9stat C9stat;
+typedef struct C9ctx C9ctx;
+typedef struct C9qid C9qid;
+typedef uint32_t C9fid;
+typedef uint16_t C9tag;
+
+/* Stat field is not changed if it's set to this value when calling c9wstat. */
+#define C9nochange (~0)
+
+/* Special fid used with auth/attach to basically avoid authentication. */
+#define C9nofid ((C9fid)~0)
+
+/* C9modes for opening a file. */
+typedef enum
+{+ C9read = 0,
+ C9write = 1,
+ C9rdwr = 2,
+ C9exec = 3,
+ C9trunc = 0x10,
+ C9rclose = 0x40,
+ C9excl = 0x1000,
+}C9mode;
+
+typedef enum
+{+ /* User/owner. */
+ C9permur = 1<<8, /* Readable. */
+ C9permuw = 1<<7, /* Writable. */
+ C9permux = 1<<6, /* Executable. */
+
+ /* Group. */
+ C9permgr = 1<<5,
+ C9permgw = 1<<4,
+ C9permgx = 1<<3,
+
+ /* Other. */
+ C9permor = 1<<2,
+ C9permow = 1<<1,
+ C9permox = 1<<0,
+}C9perm;
+
+/* Directory. */
+#define C9permdir 0x80000000
+
+/* Bitmask of stat.mode. */
+#define C9stdir 0x80000000
+#define C9stappend 0x40000000
+#define C9stexcl 0x20000000
+#define C9sttmp 0x04000000
+
+/* Limits. */
+enum
+{+ C9maxtags = 64, /* Maximal number of outstanding requests. [1-65535] */
+ C9maxflush = 8, /* Maximal number of outstanding flushes. [1-65535] */
+ C9maxstr = 0xffff, /* Maximal string length. [1-65535] */
+ C9minmsize = 4096, /* Minimal sane msize. [4096-...] */
+ C9maxpathel = 16, /* Maximal number of elements in a path. Do not change. */
+};
+
+/* Errors. */
+typedef enum
+{+ C9Einit = -1, /* Initialization failed. */
+ C9Ever = -2, /* Protocol version doesn't match. */
+ C9Epkt = -3, /* Incoming packet error. */
+ C9Etag = -4, /* No free tags or bad tag. */
+ C9Ebuf = -5, /* No buffer space enough for a message. */
+ C9Epath = -6, /* Path is too long or just invalid. */
+ C9Eflush = -7, /* Limit of outstanding flushes reached. */
+ C9Esize = -8, /* Can't fit data in one message. */
+ C9Estr = -9 /* Bad string. */
+}C9error;
+
+/* Request types. */
+typedef enum
+{+ Tversion = 100,
+ Tauth = 102,
+ Tattach = 104,
+ Tflush = 108,
+ Twalk = 110,
+ Topen = 112,
+ Tcreate = 114,
+ Tread = 116,
+ Twrite = 118,
+ Tclunk = 120,
+ Tremove = 122,
+ Tstat = 124,
+ Twstat = 126
+}C9ttype;
+
+/* Response types. */
+typedef enum
+{+ Rversion = 101,
+ Rauth = 103,
+ Rattach = 105,
+ Rerror = 107,
+ Rflush = 109,
+ Rwalk = 111,
+ Ropen = 113,
+ Rcreate = 115,
+ Rread = 117,
+ Rwrite = 119,
+ Rclunk = 121,
+ Rremove = 123,
+ Rstat = 125,
+ Rwstat = 127
+}C9rtype;
+
+/* Unique file id type. */
+typedef enum
+{+ C9qtdir = 1<<7,
+ C9qtappend = 1<<6,
+ C9qtexcl = 1<<5,
+ C9qtauth = 1<<3,
+ C9qttmp = 1<<2,
+ C9qtfile = 0
+}C9qt;
+
+/* Unique file id. */
+struct C9qid
+{+ uint64_t path;
+ uint32_t version;
+ C9qt type;
+};
+
+/*
+ * File stats. Version and muid are ignored on wstat. Dmdir bit
+ * change in mode won't work on wstat. Set any integer field to
+ * C9nochange to keep it unchanged on wstat. Set any string to NULL to
+ * keep it unchanged. Strings can be empty (""), but never NULL after+ * stat call.
+ */
+struct C9stat
+{+ C9qid qid; /* Same as qid[0]. */
+ uint64_t size; /* Size of the file (in bytes). */
+ char *name; /* Name of the file. */
+ char *uid; /* Owner of the file. */
+ char *gid; /* Group of the file. */
+ char *muid; /* The user who modified the file last. */
+ uint32_t mode; /* Permissions. See C9st* and C9perm. */
+ uint32_t atime; /* Last access time. */
+ uint32_t mtime; /* Last modification time. */
+};
+
+/* Response data. */
+struct C9r
+{+ union
+ {+ char *error;
+
+ struct
+ {+ uint8_t *data;
+ uint32_t size;
+ }read;
+
+ struct
+ {+ uint32_t size;
+ }write;
+
+ /* File stats (only valid if type is Rstat). */
+ C9stat stat;
+
+ /*
+ * Qid(s). qid[0] is valid for auth/attach/create/stat/open.
+ * More ids may be a result of a walk, see numqid.
+ */
+ C9qid qid[C9maxpathel];
+ };
+ C9rtype type; /* Response type. */
+
+ /*
+ * If not zero, is the maximum number of bytes that are guaranteed
+ * to be read or written atomically, without breaking into multiple
+ * messages.
+ */
+ uint32_t iounit;
+
+ int numqid; /* Number of valid unique ids in qid array. */
+ C9tag tag; /* Tag number. */
+};
+
+/* Request data. */
+struct C9t
+{+ C9ttype type;
+ C9tag tag;
+ union
+ {+ struct
+ {+ char *uname;
+ char *aname;
+ C9fid afid;
+ }attach;
+
+ struct
+ {+ char *uname;
+ char *aname;
+ C9fid afid;
+ }auth;
+
+ struct
+ {+ char *name;
+ uint32_t perm;
+ C9mode mode;
+ }create;
+
+ struct
+ {+ C9tag oldtag;
+ }flush;
+
+ struct
+ {+ C9mode mode;
+ }open;
+
+ struct
+ {+ uint64_t offset;
+ uint32_t size;
+ }read;
+
+ struct
+ {+ char *wname[C9maxpathel+1]; /* wname[16] is always NULL */
+ C9fid newfid;
+ }walk;
+
+ struct
+ {+ uint64_t offset;
+ uint8_t *data;
+ uint32_t size;
+ }write;
+
+ C9stat wstat;
+ };
+ C9fid fid;
+};
+
+enum
+{+ C9tagsbits = sizeof(uint32_t) * 8,
+};
+
+struct C9ctx
+{+ /*
+ * Should return a pointer to the data (exactly 'size' bytes) read.
+ * Set 'err' to non-zero and return NULL in case of error.
+ * 'err' set to zero (no error) should be used to return from c9process
+ * early (timeout on read to do non-blocking operations, for example).
+ */
+ uint8_t *(*read)(C9ctx *ctx, uint32_t size, int *err) __attribute__((nonnull(1, 3)));
+
+ /* Should return a buffer to store 'size' bytes. Nil means no memory. */
+ uint8_t *(*begin)(C9ctx *ctx, uint32_t size) __attribute__((nonnull(1)));
+
+ /*
+ * Marks the end of a message. Callback may decide if any accumulated
+ * messages should be sent to the server/client.
+ */
+ int (*end)(C9ctx *ctx) __attribute__((nonnull(1)));
+
+ /* Callback called every time a new R-message is received. */
+ void (*r)(C9ctx *ctx, C9r *r) __attribute__((nonnull(1, 2)));
+
+ /* Callback called every time a new T-message is received. */
+ void (*t)(C9ctx *ctx, C9t *t) __attribute__((nonnull(1, 2)));
+
+ /* Callback for error messages. */
+ void (*error)(C9ctx *ctx, const char *fmt, ...) __attribute__((nonnull(1), format(printf, 2, 3)));
+
+ /* Auxiliary data, can be used by any of above callbacks. */
+ struct C9aux *aux;
+
+ /* private stuff */
+ void *paux;
+ uint32_t msize;
+#ifndef C9_NO_CLIENT
+ uint32_t flush[C9maxflush];
+ uint32_t tags[C9maxtags/C9tagsbits];
+#endif
+ union
+ {+#ifndef C9_NO_CLIENT
+ C9tag lowfreetag;
+#endif
+#ifndef C9_NO_SERVER
+ uint16_t svflags;
+#endif
+ };
+};
+
+/* Parse one directory entry. */
+extern C9error c9parsedir(C9ctx *c, C9stat *stat, uint8_t **data, uint32_t *size) __attribute__((nonnull(1, 2, 3)));
+
+#ifndef C9_NO_CLIENT
+
+extern C9error c9version(C9ctx *c, C9tag *tag, uint32_t msize) __attribute__((nonnull(1, 2)));
+extern C9error c9auth(C9ctx *c, C9tag *tag, C9fid afid, const char *uname, const char *aname) __attribute__((nonnull(1, 2)));
+extern C9error c9flush(C9ctx *c, C9tag *tag, C9tag oldtag) __attribute__((nonnull(1, 2)));
+extern C9error c9attach(C9ctx *c, C9tag *tag, C9fid fid, C9fid afid, const char *uname, const char *aname) __attribute__((nonnull(1, 2)));
+extern C9error c9walk(C9ctx *c, C9tag *tag, C9fid fid, C9fid newfid, const char *path[]) __attribute__((nonnull(1, 2, 5)));
+extern C9error c9open(C9ctx *c, C9tag *tag, C9fid fid, C9mode mode) __attribute__((nonnull(1, 2)));
+extern C9error c9create(C9ctx *c, C9tag *tag, C9fid fid, const char *name, uint32_t perm, C9mode mode) __attribute__((nonnull(1, 2, 4)));
+extern C9error c9read(C9ctx *c, C9tag *tag, C9fid fid, uint64_t offset, uint32_t count) __attribute__((nonnull(1, 2)));
+extern C9error c9write(C9ctx *c, C9tag *tag, C9fid fid, uint64_t offset, const void *in, uint32_t count) __attribute__((nonnull(1, 2, 5)));
+extern C9error c9wrstr(C9ctx *c, C9tag *tag, C9fid fid, const char *s) __attribute__((nonnull(1, 2, 4)));
+extern C9error c9clunk(C9ctx *c, C9tag *tag, C9fid fid) __attribute__((nonnull(1, 2)));
+extern C9error c9remove(C9ctx *c, C9tag *tag, C9fid fid) __attribute__((nonnull(1, 2)));
+extern C9error c9stat(C9ctx *c, C9tag *tag, C9fid fid) __attribute__((nonnull(1, 2)));
+extern C9error c9wstat(C9ctx *c, C9tag *tag, C9fid fid, const C9stat *s) __attribute__((nonnull(1, 2, 4)));
+
+/*
+ * Wait until a response comes and process it. If the function returns
+ * any error, context must be treated as 'broken' and no subsequent calls
+ * should be made without reinitialization (c9version).
+ */
+extern C9error c9proc(C9ctx *c) __attribute__((nonnull(1)));
+
+#endif /* C9_NO_CLIENT */
+
+#ifndef C9_NO_SERVER
+
+extern C9error s9version(C9ctx *c) __attribute__((nonnull(1)));
+extern C9error s9auth(C9ctx *c, C9tag tag, const C9qid *aqid) __attribute__((nonnull(1, 3)));
+extern C9error s9error(C9ctx *c, C9tag tag, const char *err) __attribute__((nonnull(1)));
+extern C9error s9attach(C9ctx *c, C9tag tag, const C9qid *qid) __attribute__((nonnull(1, 3)));
+extern C9error s9flush(C9ctx *c, C9tag tag) __attribute__((nonnull(1)));
+extern C9error s9walk(C9ctx *c, C9tag tag, C9qid *qids[]) __attribute__((nonnull(1, 3)));
+extern C9error s9open(C9ctx *c, C9tag tag, const C9qid *qid, uint32_t iounit) __attribute__((nonnull(1, 3)));
+extern C9error s9create(C9ctx *c, C9tag tag, const C9qid *qid, uint32_t iounit) __attribute__((nonnull(1, 3)));
+extern C9error s9read(C9ctx *c, C9tag tag, const void *data, uint32_t size) __attribute__((nonnull(1, 3)));
+extern C9error s9readdir(C9ctx *c, C9tag tag, C9stat *st[], int *num, uint64_t *offset, uint32_t size) __attribute__((nonnull(1, 3, 4)));
+extern C9error s9write(C9ctx *c, C9tag tag, uint32_t size) __attribute__((nonnull(1)));
+extern C9error s9clunk(C9ctx *c, C9tag tag) __attribute__((nonnull(1)));
+extern C9error s9remove(C9ctx *c, C9tag tag) __attribute__((nonnull(1)));
+extern C9error s9stat(C9ctx *c, C9tag tag, const C9stat *s) __attribute__((nonnull(1, 3)));
+extern C9error s9wstat(C9ctx *c, C9tag tag) __attribute__((nonnull(1)));
+
+extern C9error s9proc(C9ctx *c) __attribute__((nonnull(1)));
+
+#endif /* C9_NO_SERVER */
--- a/nixos/README.md
+++ /dev/null
@@ -1,61 +1,0 @@
-# Read-only 9pex in NixOS
-
-```
-sudo mkdir -p /etc/nixos/pkgs
-sudo cp ninepex.nix /etc/nixos/pkgs/
-```
-
-And change `/etc/nixos/configuration.nix`:
-
-```
-{ config, pkgs, ... }:-
-let
- ninepex = pkgs.callPackage ./pkgs/ninepex.nix {};-in
-{-
-.................
-
- services.xinetd = {- enable = true;
- services = [
- {- name = "9pfs";
- port = 564;
- user = "none";
- server = "${ninepex}/bin/9pex";- serverArgs = "/home/9";
- flags = "KEEPALIVE REUSE";
- extraConfig = ''
- instances = UNLIMITED
- '';
- }
- ];
- };
-
-.................
-
- users.users.none = {- isNormalUser = false;
- isSystemUser = false;
- createHome = true;
- home = "/home/9";
- shell = "${pkgs.shadow}/bin/nologin";- };
-
-```
-
-Files go to `/home/9`. With `rsync` it can be done as so:
-
-```
-rsync -iCaR \
- --exclude='.git*' \
- --exclude='*.out' \
- --exclude='*.[0125678vqki]' \
- --exclude='[0125678vqki].*' \
- --delete-excluded --delete \
- --chown none:nogroup \
- dir1 dir2 dir3 \
- root@host:/home/9/
-```
--- a/nixos/ninepex.nix
+++ /dev/null
@@ -1,16 +1,0 @@
-{ stdenv }:-
-stdenv.mkDerivation rec {- name = "9pex";
- src = fetchGit {- url = "https://git.sr.ht/~ft/9pro";
- ref = "master";
- rev = "f9ddf46b12b9ee88e3b81f35f80e374722ca6f9d";
- };
-
- installPhase = ''
- ./build.sh
- mkdir -p "$out/bin"
- cp 9pex "$out/bin/"
- '';
-}
--- a/parg/.gitignore
+++ /dev/null
@@ -1,14 +1,0 @@
-*.o
-*.obj
-
-*.a
-*.lib
-
-*.so
-*.so.*
-*.dll
-
-*.exe
-
-/build/
-/doc/
--- a/parg/.travis.yml
+++ /dev/null
@@ -1,22 +1,0 @@
-language: c
-
-compiler: gcc
-
-sudo: false
-
-before_install:
- - pip install --user codecov
-
-before_script:
- - mkdir build
- - cd build
- - cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_COVERAGE=ON ..
-
-script: cmake --build . && ctest -V .
-
-after_success:
- - gcov CMakeFiles/parg.dir/parg.c.gcno -o CMakeFiles/parg.dir
- - codecov -X gcov
-
-notifications:
- email: false
--- a/parg/CMakeLists.txt
+++ /dev/null
@@ -1,56 +1,0 @@
-cmake_minimum_required(VERSION 2.8.6)
-
-project(parg C)
-
-include(CheckCCompilerFlag)
-include(CTest)
-
-option(BUILD_COVERAGE "Code coverage" OFF)
-
-message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")-
-function(_add_c_compiler_flags var)
- foreach(flag ${ARGN})- string(REGEX REPLACE "[^a-zA-Z0-9]+" "_" flag_var "CFLAG_${flag}")- check_c_compiler_flag("${flag}" ${flag_var})- if(${flag_var})- set(${var} "${${var}} ${flag}")- endif()
- endforeach()
- set(${var} "${${var}}" PARENT_SCOPE)-endfunction()
-
-if(MSVC)
- _add_c_compiler_flags(CMAKE_C_FLAGS "/analyze")
- add_definitions(/D_CRT_SECURE_NO_WARNINGS)
-elseif(CMAKE_COMPILER_IS_GNUCC)
- _add_c_compiler_flags(CMAKE_C_FLAGS
- -Wall
- -Wextra
- -pedantic
- -Wshadow
- -Wpointer-arith
- -Wcast-qual
- -Wcast-align
- -Wstrict-prototypes
- -Wmissing-prototypes
- )
-elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
- _add_c_compiler_flags(CMAKE_C_FLAGS "-Weverything;-pedantic")
-endif()
-
-if(BUILD_COVERAGE)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 --coverage")-endif()
-
-include_directories(${PROJECT_SOURCE_DIR})-
-add_library(parg parg.c parg.h)
-
-if(BUILD_TESTING)
- add_executable(test_parg test/test_parg.c test/greatest.h parg.h)
- target_link_libraries(test_parg parg)
-
- enable_testing()
- add_test(test_parg test_parg)
-endif()
--- a/parg/COPYING
+++ /dev/null
@@ -1,113 +1,0 @@
-CC0 1.0 Universal
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
-
- i. the right to reproduce, adapt, distribute, perform, display,
- communicate, and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
- likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
- subject to the limitations in paragraph 4(a), below;
- v. rights protecting the extraction, dissemination, use and reuse of data
- in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
- European Parliament and of the Council of 11 March 1996 on the legal
- protection of databases, and under any national implementation
- thereof, including any amended or successor version of such
- directive); and
-vii. other similar, equivalent or corresponding rights throughout the
- world based on applicable law or treaty, and any national
- implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason
-be judged legally invalid or ineffective under applicable law, then the
-Waiver shall be preserved to the maximum extent permitted taking into
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
- surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
- warranties of any kind concerning the Work, express, implied,
- statutory or otherwise, including without limitation warranties of
- title, merchantability, fitness for a particular purpose, non
- infringement, or the absence of latent or other defects, accuracy, or
- the present or absence of errors, whether or not discoverable, all to
- the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
- that may apply to the Work or any use thereof, including without
- limitation any person's Copyright and Related Rights in the Work.
- Further, Affirmer disclaims responsibility for obtaining any necessary
- consents, permissions or other rights required for any use of the
- Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
- party to this document and has no duty or obligation with respect to
- this CC0 or use of the Work.
-
-For more information, please see
-<http://creativecommons.org/publicdomain/zero/1.0/>
--- a/parg/Doxyfile
+++ /dev/null
@@ -1,10 +1,0 @@
-# Doxyfile 1.8.6
-PROJECT_NAME = "parg"
-OUTPUT_DIRECTORY = doc
-JAVADOC_AUTOBRIEF = YES
-TAB_SIZE = 8
-OPTIMIZE_OUTPUT_FOR_C = YES
-EXTRACT_ALL = YES
-INPUT = parg.h README.md
-GENERATE_LATEX = NO
-USE_MDFILE_AS_MAINPAGE = README.md
--- a/parg/README.md
+++ /dev/null
@@ -1,205 +1,0 @@
-
-[](https://travis-ci.org/jibsen/parg) [](http://codecov.io/github/jibsen/parg?branch=master)
-
-About
------
-
-Most command-line programs have to parse options, so there are a lot of
-different solutions to this problem. Some offer many features, while others
-are more basic.
-
-One of the simpler solutions for C is the [getopt][] function, and its
-extension `getopt_long`. They iterate over the options in `argv`, returning
-them one at a time on successive calls.
-
-One nice thing about them is that they are available on most Unix-like
-operating systems (and usually accompany GCC elsewhere, like Windows).
-Unfortunately, some implementation details vary between platforms.
-
-A potential question is what license the version you get when you include
-them is available under. Some are GPL, others LGPL. There are also ports of
-`getopt` that use more liberal licenses.
-
-`parg` is a parser for `argv` that works similarly to `getopt`, but does not
-aim to be a direct replacement. It attempts to make some choices about how to
-handle the extensions and idiosyncrasies of other `getopt` implementations,
-and document them.
-
-It consists of a single source and include file, written in portable ANSI C.
-It is made available under [CC0][].
-
-[getopt]: https://en.wikipedia.org/wiki/Getopt
-[CC0]: http://creativecommons.org/publicdomain/zero/1.0/
-
-
-Usage
------
-
-The include file `parg.h` contains documentation in the form of [doxygen][]
-comments. A configuration file is included, so you can simply run `doxygen`
-to generate documentation in HTML format.
-
-`parg` uses [CMake][] to generate build systems. To create one for the tools
-on your platform, and build `parg`, use something along the lines of:
-
-~~~sh
-mkdir build
-cd build
-cmake ..
-cmake --build .
-~~~
-
-You can also simply compile the source files and link them into your project.
-CMake just provides an easy way to build and test across various platforms and
-toolsets.
-
-[doxygen]: http://www.doxygen.org/
-[CMake]: http://www.cmake.org/
-
-
-Example
--------
-
-Here is an example that parses command-line options using `parg_getopt()`:
-
-~~~c
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "parg.h"
-
-int main(int argc, char *argv[])
-{- struct parg_state ps;
- int c;
-
- parg_init(&ps);
-
- while ((c = parg_getopt(&ps, argc, argv, "hs:v")) != -1) {- switch (c) {- case 1:
- printf("nonoption '%s'\n", ps.optarg);- break;
- case 'h':
- printf("Usage: testparg [-h] [-v] [-s STRING]\n");- return EXIT_SUCCESS;
- break;
- case 's':
- printf("option -s with argument '%s'\n", ps.optarg);- break;
- case 'v':
- printf("testparg 1.0.0\n");- return EXIT_SUCCESS;
- break;
- case '?':
- if (ps.optopt == 's') {- printf("option -s requires an argument\n");- }
- else {- printf("unknown option -%c\n", ps.optopt);- }
- return EXIT_FAILURE;
- break;
- default:
- printf("error: unhandled option -%c\n", c);- return EXIT_FAILURE;
- break;
- }
- }
-
- for (c = ps.optind; c < argc; ++c) {- printf("nonoption '%s'\n", argv[c]);- }
-
- return EXIT_SUCCESS;
-}
-~~~
-
-
-Comparison to `getopt`
-----------------------
-
-### Use of global variables
-
-`getopt` uses global variables to store its state between calls. `parg` uses
-a struct `parg_state`, which you must pass with each call.
-
-### Handling of nonoptions
-
-POSIX and BSD `getopt` return `-1` on the first nonoption argument. GNU
-`getopt` by default reorders `argv` (even though it is passed as const), so
-all options come first.
-
-`parg` does not change `argv`, and returns each nonoption as the option
-argument of an option with value `1` (like GNU `getopt`, if `optstring` were
-prefixed by '`-`').
-
-If you wish to process all options first, and have the nonoptions ordered at
-the end of `argv`, you can use `parg_reorder()`:
-
-~~~c
- optend = parg_reorder(argc, argv, optstring, NULL);
-
- while ((c = parg_getopt(&ps, optend, argv, optstring)) != -1) {- /* ... */
- }
-
- /* elements of argv[] from optend to argc are nonoptions */
-~~~
-
-### Value of `optind` on error
-
-When there are multiple short options in one argument, `getopt` does not
-increment `optind` until the last one is processed. This makes it harder to
-tell which argument an unknown option came from (if `a` is an unknown option,
-`-a` and `-ab` will return '`?`' with different values in `optind`).
-
-`parg` always increments the `optind` value in it's state so it points to the
-next `argv` element to be processed. So when `parg` returns '`?`' (or '`:`'),
-the element that contains the error is `argv[optind - 1]`.
-
-### Value of `optopt` on error
-
-With `getopt_long`, it varies what the values of `optopt` and `longindex` are
-when an error is found with option arguments of long options. Sometimes these
-values are not documented.
-
-`parg` sets `optopt` to `val` if `flag` is `NULL`, and `0` otherwise (which
-equals the return value on successful match), and `longindex` is set to the
-index of the entry in `longopts` that matched.
-
-### Return value on option argument error
-
-When the first character of `optstring` is '`:`', it varies what `getopt`
-returns on extraneous option arguments.
-
-In this case, `parg` returns '`?`' if no option match is found, and '`:`' if
-a match is found, but is missing a required argument, or has an extraneous
-argument.
-
-
-Alternatives
-------------
-
-Some ports of `getopt`:
-
- - [Free Getopt](http://freegetopt.sourceforge.net/)
- - [ya_getopt](http://github.com/kubo/ya_getopt/)
- - [getopt_port](http://github.com/kimgr/getopt_port/)
-
-Other command-line parsing libraries that support C:
-
- - [Gengetopt](http://www.gnu.org/software/gengetopt/)
- - [Argp](http://www.gnu.org/software/libc/manual/html_node/Argp.html)
- - [popt](http://en.wikipedia.org/wiki/Popt)
- - [argtable](http://argtable.sourceforge.net/)
- - [optlist](http://michael.dipperstein.com/optlist/)
- - [Arg_parser](http://www.nongnu.org/arg-parser/arg_parser.html)
- - [Gopt](http://www.purposeful.co.uk/software/gopt/)
- - [docopt](http://docopt.org/)
-
-A few C++ command-line parsing libraries:
-
- - [TCLAP](http://tclap.sourceforge.net/)
- - [program_options](http://www.boost.org/doc/libs/1_58_0/doc/html/program_options.html)
- - [CommandLine](http://llvm.org/docs/CommandLine.html)
--- a/parg/parg.c
+++ /dev/null
@@ -1,354 +1,0 @@
-/*
- * parg - parse argv
- *
- * Written in 2015-2016 by Joergen Ibsen
- *
- * To the extent possible under law, the author(s) have dedicated all
- * copyright and related and neighboring rights to this software to the
- * public domain worldwide. This software is distributed without any
- * warranty. <http://creativecommons.org/publicdomain/zero/1.0/>
- */
-
-#include "parg.h"
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * Check if state is at end of argv.
- */
-static int
-is_argv_end(const struct parg_state *ps, int argc, char *const argv[])
-{- return ps->optind >= argc || argv[ps->optind] == NULL;
-}
-
-/*
- * Match nextchar against optstring.
- */
-static int
-match_short(struct parg_state *ps, int argc, char *const argv[],
- const char *optstring)
-{- const char *p = strchr(optstring, *ps->nextchar);
-
- if (p == NULL) {- ps->optopt = *ps->nextchar++;
- return '?';
- }
-
- /* If no option argument, return option */
- if (p[1] != ':') {- return *ps->nextchar++;
- }
-
- /* If more characters, return as option argument */
- if (ps->nextchar[1] != '\0') {- ps->optarg = &ps->nextchar[1];
- ps->nextchar = NULL;
- return *p;
- }
-
- /* If option argument is optional, return option */
- if (p[2] == ':') {- return *ps->nextchar++;
- }
-
- /* Option argument required, so return next argv element */
- if (is_argv_end(ps, argc, argv)) {- ps->optopt = *ps->nextchar++;
- return optstring[0] == ':' ? ':' : '?';
- }
-
- ps->optarg = argv[ps->optind++];
- ps->nextchar = NULL;
- return *p;
-}
-
-/*
- * Match string at nextchar against longopts.
- */
-static int
-match_long(struct parg_state *ps, int argc, char *const argv[],
- const char *optstring,
- const struct parg_option *longopts, int *longindex)
-{- size_t len;
- int num_match = 0;
- int match = -1;
- int i;
-
- len = strcspn(ps->nextchar, "=");
-
- for (i = 0; longopts[i].name; ++i) {- if (strncmp(ps->nextchar, longopts[i].name, len) == 0) {- match = i;
- num_match++;
- /* Take if exact match */
- if (longopts[i].name[len] == '\0') {- num_match = 1;
- break;
- }
- }
- }
-
- /* Return '?' on no or ambiguous match */
- if (num_match != 1) {- ps->optopt = 0;
- ps->nextchar = NULL;
- return '?';
- }
-
- assert(match != -1);
-
- if (longindex) {- *longindex = match;
- }
-
- if (ps->nextchar[len] == '=') {- /* Option argument present, check if extraneous */
- if (longopts[match].has_arg == PARG_NOARG) {- ps->optopt = longopts[match].flag ? 0 : longopts[match].val;
- ps->nextchar = NULL;
- return optstring[0] == ':' ? ':' : '?';
- }
- else {- ps->optarg = &ps->nextchar[len + 1];
- }
- }
- else if (longopts[match].has_arg == PARG_REQARG) {- /* Option argument required, so return next argv element */
- if (is_argv_end(ps, argc, argv)) {- ps->optopt = longopts[match].flag ? 0 : longopts[match].val;
- ps->nextchar = NULL;
- return optstring[0] == ':' ? ':' : '?';
- }
-
- ps->optarg = argv[ps->optind++];
- }
-
- ps->nextchar = NULL;
-
- if (longopts[match].flag != NULL) {- *longopts[match].flag = longopts[match].val;
- return 0;
- }
-
- return longopts[match].val;
-}
-
-void
-parg_init(struct parg_state *ps)
-{- ps->optarg = NULL;
- ps->optind = 1;
- ps->optopt = '?';
- ps->nextchar = NULL;
-}
-
-int
-parg_getopt(struct parg_state *ps, int argc, char *const argv[],
- const char *optstring)
-{- return parg_getopt_long(ps, argc, argv, optstring, NULL, NULL);
-}
-
-int
-parg_getopt_long(struct parg_state *ps, int argc, char *const argv[],
- const char *optstring,
- const struct parg_option *longopts, int *longindex)
-{- assert(ps != NULL);
- assert(argv != NULL);
- assert(optstring != NULL);
-
- ps->optarg = NULL;
-
- if (argc < 2) {- return -1;
- }
-
- /* Advance to next element if needed */
- if (ps->nextchar == NULL || *ps->nextchar == '\0') {- if (is_argv_end(ps, argc, argv)) {- return -1;
- }
-
- ps->nextchar = argv[ps->optind++];
-
- /* Check for nonoption element (including '-') */
- if (ps->nextchar[0] != '-' || ps->nextchar[1] == '\0') {- ps->optarg = ps->nextchar;
- ps->nextchar = NULL;
- return 1;
- }
-
- /* Check for '--' */
- if (ps->nextchar[1] == '-') {- if (ps->nextchar[2] == '\0') {- ps->nextchar = NULL;
- return -1;
- }
-
- if (longopts != NULL) {- ps->nextchar += 2;
-
- return match_long(ps, argc, argv, optstring,
- longopts, longindex);
- }
- }
-
- ps->nextchar++;
- }
-
- /* Match nextchar */
- return match_short(ps, argc, argv, optstring);
-}
-
-/*
- * Reverse elements of `v` from `i` to `j`.
- */
-static void
-reverse(char *v[], int i, int j)
-{- while (j - i > 1) {- char *tmp = v[i];
- v[i] = v[j - 1];
- v[j - 1] = tmp;
- ++i;
- --j;
- }
-}
-
-/*
- * Reorder elements of `argv` with no special cases.
- *
- * This function assumes there is no `--` element, and the last element
- * is not an option missing a required argument.
- *
- * The algorithm is described here:
- * http://hardtoc.com/2016/11/07/reordering-arguments.html
- */
-static int
-parg_reorder_simple(int argc, char *argv[],
- const char *optstring,
- const struct parg_option *longopts)
-{- struct parg_state ps;
- int change;
- int l = 0;
- int m = 0;
- int r = 0;
-
- if (argc < 2) {- return argc;
- }
-
- do {- int nextind;
- int c;
-
- parg_init(&ps);
-
- nextind = ps.optind;
-
- /* Parse until end of argument */
- do {- c = parg_getopt_long(&ps, argc, argv, optstring, longopts, NULL);
- } while (ps.nextchar != NULL && *ps.nextchar != '\0');
-
- change = 0;
-
- do {- /* Find next non-option */
- for (l = nextind; c != 1 && c != -1;) {- l = ps.optind;
-
- do {- c = parg_getopt_long(&ps, argc, argv, optstring, longopts, NULL);
- } while (ps.nextchar != NULL && *ps.nextchar != '\0');
- }
-
- /* Find next option */
- for (m = l; c == 1;) {- m = ps.optind;
-
- do {- c = parg_getopt_long(&ps, argc, argv, optstring, longopts, NULL);
- } while (ps.nextchar != NULL && *ps.nextchar != '\0');
- }
-
- /* Find next non-option */
- for (r = m; c != 1 && c != -1;) {- r = ps.optind;
-
- do {- c = parg_getopt_long(&ps, argc, argv, optstring, longopts, NULL);
- } while (ps.nextchar != NULL && *ps.nextchar != '\0');
- }
-
- /* Find next option */
- for (nextind = r; c == 1;) {- nextind = ps.optind;
-
- do {- c = parg_getopt_long(&ps, argc, argv, optstring, longopts, NULL);
- } while (ps.nextchar != NULL && *ps.nextchar != '\0');
- }
-
- if (m < r) {- change = 1;
- reverse(argv, l, m);
- reverse(argv, m, r);
- reverse(argv, l, r);
- }
- } while (c != -1);
- } while (change != 0);
-
- return l + (r - m);
-}
-
-int
-parg_reorder(int argc, char *argv[],
- const char *optstring,
- const struct parg_option *longopts)
-{- struct parg_state ps;
- int lastind;
- int optend;
- int c;
-
- assert(argv != NULL);
- assert(optstring != NULL);
-
- if (argc < 2) {- return argc;
- }
-
- parg_init(&ps);
-
- /* Find end of normal arguments */
- do {- lastind = ps.optind;
-
- c = parg_getopt_long(&ps, argc, argv, optstring, longopts, NULL);
-
- /* Check for trailing option with error */
- if ((c == '?' || c == ':') && is_argv_end(&ps, argc, argv)) {- lastind = ps.optind - 1;
- break;
- }
- } while (c != -1);
-
- optend = parg_reorder_simple(lastind, argv, optstring, longopts);
-
- /* Rotate `--` or trailing option with error into position */
- if (lastind < argc) {- reverse(argv, optend, lastind);
- reverse(argv, optend, lastind + 1);
- ++optend;
- }
-
- return optend;
-}
--- a/parg/parg.h
+++ /dev/null
@@ -1,192 +1,0 @@
-/*
- * parg - parse argv
- *
- * Written in 2015-2016 by Joergen Ibsen
- *
- * To the extent possible under law, the author(s) have dedicated all
- * copyright and related and neighboring rights to this software to the
- * public domain worldwide. This software is distributed without any
- * warranty. <http://creativecommons.org/publicdomain/zero/1.0/>
- */
-
-#ifndef PARG_H_INCLUDED
-#define PARG_H_INCLUDED
-
-#ifdef __cplusplus
-extern "C" {-#endif
-
-#define PARG_VER_MAJOR 1 /**< Major version number */
-#define PARG_VER_MINOR 0 /**< Minor version number */
-#define PARG_VER_PATCH 2 /**< Patch version number */
-#define PARG_VER_STRING "1.0.2" /**< Version number as a string */
-
-/**
- * Structure containing state between calls to parser.
- *
- * @see parg_init
- */
-struct parg_state {- const char *optarg; /**< Pointer to option argument, if any */
- int optind; /**< Next index in argv to process */
- int optopt; /**< Option value resulting in error, if any */
- const char *nextchar; /**< Next character to process */
-};
-
-/**
- * Structure for supplying long options to `parg_getopt_long()`.
- *
- * @see parg_getopt_long
- */
-struct parg_option {- const char *name; /**< Name of option */
- int has_arg; /**< Option argument status */
- int *flag; /**< Pointer to flag variable */
- int val; /**< Value of option */
-};
-
-/**
- * Values for `has_arg` flag in `parg_option`.
- *
- * @see parg_option
- */
-typedef enum {- PARG_NOARG, /**< No argument */
- PARG_REQARG, /**< Required argument */
- PARG_OPTARG /**< Optional argument */
-} parg_arg_num;
-
-/**
- * Initialize `ps`.
- *
- * Must be called before using state with a parser.
- *
- * @see parg_state
- *
- * @param ps pointer to state
- */
-void
-parg_init(struct parg_state *ps);
-
-/**
- * Parse next short option in `argv`.
- *
- * Elements in `argv` that contain short options start with a single dash
- * followed by one or more option characters, and optionally an option
- * argument for the last option character. Examples are '`-d`', '`-ofile`',
- * and '`-dofile`'.
- *
- * Consecutive calls to this function match the command-line arguments in
- * `argv` against the short option characters in `optstring`.
- *
- * If an option character in `optstring` is followed by a colon, '`:`', the
- * option requires an argument. If it is followed by two colons, the option
- * may take an optional argument.
- *
- * If a match is found, `optarg` points to the option argument, if any, and
- * the value of the option character is returned.
- *
- * If a match is found, but is missing a required option argument, `optopt`
- * is set to the option character. If the first character in `optstring` is
- * '`:`', then '`:`' is returned, otherwise '`?`' is returned.
- *
- * If no option character in `optstring` matches a short option, `optopt`
- * is set to the option character, and '`?`' is returned.
- *
- * If an element of argv does not contain options (a nonoption element),
- * `optarg` points to the element, and `1` is returned.
- *
- * An element consisting of a single dash, '`-`', is returned as a nonoption.
- *
- * Parsing stops and `-1` is returned, when the end of `argv` is reached, or
- * if an element contains '`--`'.
- *
- * Works similarly to `getopt`, if `optstring` were prefixed by '`-`'.
- *
- * @param ps pointer to state
- * @param argc number of elements in `argv`
- * @param argv array of pointers to command-line arguments
- * @param optstring string containing option characters
- * @return option value on match, `1` on nonoption element, `-1` on end of
- * arguments, '`?`' on unmatched option, '`?`' or '`:`' on option argument
- * error
- */
-int
-parg_getopt(struct parg_state *ps, int argc, char *const argv[],
- const char *optstring);
-
-/**
- * Parse next long or short option in `argv`.
- *
- * Elements in `argv` that contain a long option start with two dashes
- * followed by a string, and optionally an equal sign and an option argument.
- * Examples are '`--help`' and '`--size=5`'.
- *
- * If no exact match is found, an unambiguous prefix of a long option will
- * match. For example, if '`foo`' and '`foobar`' are valid long options, then
- * '`--fo`' is ambiguous and will not match, '`--foo`' matches exactly, and
- * '`--foob`' is an unambiguous prefix and will match.
- *
- * If a long option match is found, and `flag` is `NULL`, `val` is returned.
- *
- * If a long option match is found, and `flag` is not `NULL`, `val` is stored
- * in the variable `flag` points to, and `0` is returned.
- *
- * If a long option match is found, but is missing a required option argument,
- * or has an option argument even though it takes none, `optopt` is set to
- * `val` if `flag` is `NULL`, and `0` otherwise. If the first character in
- * `optstring` is '`:`', then '`:`' is returned, otherwise '`?`' is returned.
- *
- * If `longindex` is not `NULL`, the index of the entry in `longopts` that
- * matched is stored there.
- *
- * If no long option in `longopts` matches a long option, '`?`' is returned.
- *
- * Handling of nonoptions and short options is like `parg_getopt()`.
- *
- * If no short options are required, an empty string, `""`, should be passed
- * as `optstring`.
- *
- * Works similarly to `getopt_long`, if `optstring` were prefixed by '`-`'.
- *
- * @see parg_getopt
- *
- * @param ps pointer to state
- * @param argc number of elements in `argv`
- * @param argv array of pointers to command-line arguments
- * @param optstring string containing option characters
- * @param longopts array of `parg_option` structures
- * @param longindex pointer to variable to store index of matching option in
- * @return option value on match, `0` for flag option, `1` on nonoption
- * element, `-1` on end of arguments, '`?`' on unmatched or ambiguous option,
- * '`?`' or '`:`' on option argument error
- */
-int
-parg_getopt_long(struct parg_state *ps, int argc, char *const argv[],
- const char *optstring,
- const struct parg_option *longopts, int *longindex);
-
-/**
- * Reorder elements of `argv` so options appear first.
- *
- * If there are no long options, `longopts` may be `NULL`.
- *
- * The return value can be used as `argc` parameter for `parg_getopt()` and
- * `parg_getopt_long()`.
- *
- * @param argc number of elements in `argv`
- * @param argv array of pointers to command-line arguments
- * @param optstring string containing option characters
- * @param longopts array of `parg_option` structures
- * @return index of first nonoption in `argv` on success, `-1` on error
- */
-int
-parg_reorder(int argc, char *argv[],
- const char *optstring,
- const struct parg_option *longopts);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* PARG_H_INCLUDED */
--- a/parg/test/greatest.h
+++ /dev/null
@@ -1,1035 +1,0 @@
-/*
- * Copyright (c) 2011-2016 Scott Vokes <vokes.s@gmail.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef GREATEST_H
-#define GREATEST_H
-
-#ifdef __cplusplus
-extern "C" {-#endif
-
-/* 1.2.1 */
-#define GREATEST_VERSION_MAJOR 1
-#define GREATEST_VERSION_MINOR 2
-#define GREATEST_VERSION_PATCH 1
-
-/* A unit testing system for C, contained in 1 file.
- * It doesn't use dynamic allocation or depend on anything
- * beyond ANSI C89.
- *
- * An up-to-date version can be found at:
- * https://github.com/silentbicycle/greatest/
- */
-
-
-/*********************************************************************
- * Minimal test runner template
- *********************************************************************/
-#if 0
-
-#include "greatest.h"
-
-TEST foo_should_foo(void) {- PASS();
-}
-
-static void setup_cb(void *data) {- printf("setup callback for each test case\n");-}
-
-static void teardown_cb(void *data) {- printf("teardown callback for each test case\n");-}
-
-SUITE(suite) {- /* Optional setup/teardown callbacks which will be run before/after
- * every test case. If using a test suite, they will be cleared when
- * the suite finishes. */
- SET_SETUP(setup_cb, voidp_to_callback_data);
- SET_TEARDOWN(teardown_cb, voidp_to_callback_data);
-
- RUN_TEST(foo_should_foo);
-}
-
-/* Add definitions that need to be in the test runner's main file. */
-GREATEST_MAIN_DEFS();
-
-/* Set up, run suite(s) of tests, report pass/fail/skip stats. */
-int run_tests(void) {- GREATEST_INIT(); /* init. greatest internals */
- /* List of suites to run (if any). */
- RUN_SUITE(suite);
-
- /* Tests can also be run directly, without using test suites. */
- RUN_TEST(foo_should_foo);
-
- GREATEST_PRINT_REPORT(); /* display results */
- return greatest_all_passed();
-}
-
-/* main(), for a standalone command-line test runner.
- * This replaces run_tests above, and adds command line option
- * handling and exiting with a pass/fail status. */
-int main(int argc, char **argv) {- GREATEST_MAIN_BEGIN(); /* init & parse command-line args */
- RUN_SUITE(suite);
- GREATEST_MAIN_END(); /* display results */
-}
-
-#endif
-/*********************************************************************/
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-/***********
- * Options *
- ***********/
-
-/* Default column width for non-verbose output. */
-#ifndef GREATEST_DEFAULT_WIDTH
-#define GREATEST_DEFAULT_WIDTH 72
-#endif
-
-/* FILE *, for test logging. */
-#ifndef GREATEST_STDOUT
-#define GREATEST_STDOUT stdout
-#endif
-
-/* Remove GREATEST_ prefix from most commonly used symbols? */
-#ifndef GREATEST_USE_ABBREVS
-#define GREATEST_USE_ABBREVS 1
-#endif
-
-/* Set to 0 to disable all use of setjmp/longjmp. */
-#ifndef GREATEST_USE_LONGJMP
-#define GREATEST_USE_LONGJMP 1
-#endif
-
-#if GREATEST_USE_LONGJMP
-#include <setjmp.h>
-#endif
-
-/* Set to 0 to disable all use of time.h / clock(). */
-#ifndef GREATEST_USE_TIME
-#define GREATEST_USE_TIME 1
-#endif
-
-#if GREATEST_USE_TIME
-#include <time.h>
-#endif
-
-/* Floating point type, for ASSERT_IN_RANGE. */
-#ifndef GREATEST_FLOAT
-#define GREATEST_FLOAT double
-#define GREATEST_FLOAT_FMT "%g"
-#endif
-
-/*********
- * Types *
- *********/
-
-/* Info for the current running suite. */
-typedef struct greatest_suite_info {- unsigned int tests_run;
- unsigned int passed;
- unsigned int failed;
- unsigned int skipped;
-
-#if GREATEST_USE_TIME
- /* timers, pre/post running suite and individual tests */
- clock_t pre_suite;
- clock_t post_suite;
- clock_t pre_test;
- clock_t post_test;
-#endif
-} greatest_suite_info;
-
-/* Type for a suite function. */
-typedef void (greatest_suite_cb)(void);
-
-/* Types for setup/teardown callbacks. If non-NULL, these will be run
- * and passed the pointer to their additional data. */
-typedef void (greatest_setup_cb)(void *udata);
-typedef void (greatest_teardown_cb)(void *udata);
-
-/* Type for an equality comparison between two pointers of the same type.
- * Should return non-0 if equal, otherwise 0.
- * UDATA is a closure value, passed through from ASSERT_EQUAL_T[m]. */
-typedef int greatest_equal_cb(const void *exp, const void *got, void *udata);
-
-/* Type for a callback that prints a value pointed to by T.
- * Return value has the same meaning as printf's.
- * UDATA is a closure value, passed through from ASSERT_EQUAL_T[m]. */
-typedef int greatest_printf_cb(const void *t, void *udata);
-
-/* Callbacks for an arbitrary type; needed for type-specific
- * comparisons via GREATEST_ASSERT_EQUAL_T[m].*/
-typedef struct greatest_type_info {- greatest_equal_cb *equal;
- greatest_printf_cb *print;
-} greatest_type_info;
-
-typedef struct greatest_memory_cmp_env {- const unsigned char *exp;
- const unsigned char *got;
- size_t size;
-} greatest_memory_cmp_env;
-
-/* Callbacks for string and raw memory types. */
-extern greatest_type_info greatest_type_info_string;
-extern greatest_type_info greatest_type_info_memory;
-
-typedef enum {- GREATEST_FLAG_FIRST_FAIL = 0x01,
- GREATEST_FLAG_LIST_ONLY = 0x02
-} greatest_flag_t;
-
-/* Struct containing all test runner state. */
-typedef struct greatest_run_info {- unsigned char flags;
- unsigned char verbosity;
- unsigned int tests_run; /* total test count */
-
- /* overall pass/fail/skip counts */
- unsigned int passed;
- unsigned int failed;
- unsigned int skipped;
- unsigned int assertions;
-
- /* currently running test suite */
- greatest_suite_info suite;
-
- /* info to print about the most recent failure */
- const char *fail_file;
- unsigned int fail_line;
- const char *msg;
-
- /* current setup/teardown hooks and userdata */
- greatest_setup_cb *setup;
- void *setup_udata;
- greatest_teardown_cb *teardown;
- void *teardown_udata;
-
- /* formatting info for ".....s...F"-style output */
- unsigned int col;
- unsigned int width;
-
- /* only run a specific suite or test */
- const char *suite_filter;
- const char *test_filter;
-
-#if GREATEST_USE_TIME
- /* overall timers */
- clock_t begin;
- clock_t end;
-#endif
-
-#if GREATEST_USE_LONGJMP
- jmp_buf jump_dest;
-#endif
-} greatest_run_info;
-
-struct greatest_report_t {- /* overall pass/fail/skip counts */
- unsigned int passed;
- unsigned int failed;
- unsigned int skipped;
- unsigned int assertions;
-};
-
-/* Global var for the current testing context.
- * Initialized by GREATEST_MAIN_DEFS(). */
-extern greatest_run_info greatest_info;
-
-/* Type for ASSERT_ENUM_EQ's ENUM_STR argument. */
-typedef const char *greatest_enum_str_fun(int value);
-
-/**********************
- * Exported functions *
- **********************/
-
-/* These are used internally by greatest. */
-void greatest_do_pass(const char *name);
-void greatest_do_fail(const char *name);
-void greatest_do_skip(const char *name);
-int greatest_pre_test(const char *name);
-void greatest_post_test(const char *name, int res);
-void greatest_usage(const char *name);
-int greatest_do_assert_equal_t(const void *exp, const void *got,
- greatest_type_info *type_info, void *udata);
-
-/* These are part of the public greatest API. */
-void GREATEST_SET_SETUP_CB(greatest_setup_cb *cb, void *udata);
-void GREATEST_SET_TEARDOWN_CB(greatest_teardown_cb *cb, void *udata);
-int greatest_all_passed(void);
-void greatest_set_test_filter(const char *name);
-void greatest_set_suite_filter(const char *name);
-void greatest_get_report(struct greatest_report_t *report);
-unsigned int greatest_get_verbosity(void);
-void greatest_set_verbosity(unsigned int verbosity);
-void greatest_set_flag(greatest_flag_t flag);
-
-
-/********************
-* Language Support *
-********************/
-
-/* If __VA_ARGS__ (C99) is supported, allow parametric testing
-* without needing to manually manage the argument struct. */
-#if __STDC_VERSION__ >= 19901L || _MSC_VER >= 1800
-#define GREATEST_VA_ARGS
-#endif
-
-
-/**********
- * Macros *
- **********/
-
-/* Define a suite. */
-#define GREATEST_SUITE(NAME) void NAME(void); void NAME(void)
-
-/* Declare a suite, provided by another compilation unit. */
-#define GREATEST_SUITE_EXTERN(NAME) void NAME(void)
-
-/* Start defining a test function.
- * The arguments are not included, to allow parametric testing. */
-#define GREATEST_TEST static enum greatest_test_res
-
-/* PASS/FAIL/SKIP result from a test. Used internally. */
-typedef enum greatest_test_res {- GREATEST_TEST_RES_PASS = 0,
- GREATEST_TEST_RES_FAIL = -1,
- GREATEST_TEST_RES_SKIP = 1
-} greatest_test_res;
-
-/* Run a suite. */
-#define GREATEST_RUN_SUITE(S_NAME) greatest_run_suite(S_NAME, #S_NAME)
-
-/* Run a test in the current suite. */
-#define GREATEST_RUN_TEST(TEST) \
- do { \- if (greatest_pre_test(#TEST) == 1) { \- enum greatest_test_res res = GREATEST_SAVE_CONTEXT(); \
- if (res == GREATEST_TEST_RES_PASS) { \- res = TEST(); \
- } \
- greatest_post_test(#TEST, res); \
- } else if (GREATEST_LIST_ONLY()) { \- fprintf(GREATEST_STDOUT, " %s\n", #TEST); \
- } \
- } while (0)
-
-/* Ignore a test, don't warn about it being unused. */
-#define GREATEST_IGNORE_TEST(TEST) (void)TEST
-
-/* Run a test in the current suite with one void * argument,
- * which can be a pointer to a struct with multiple arguments. */
-#define GREATEST_RUN_TEST1(TEST, ENV) \
- do { \- if (greatest_pre_test(#TEST) == 1) { \- int res = TEST(ENV); \
- greatest_post_test(#TEST, res); \
- } else if (GREATEST_LIST_ONLY()) { \- fprintf(GREATEST_STDOUT, " %s\n", #TEST); \
- } \
- } while (0)
-
-#ifdef GREATEST_VA_ARGS
-#define GREATEST_RUN_TESTp(TEST, ...) \
- do { \- if (greatest_pre_test(#TEST) == 1) { \- int res = TEST(__VA_ARGS__); \
- greatest_post_test(#TEST, res); \
- } else if (GREATEST_LIST_ONLY()) { \- fprintf(GREATEST_STDOUT, " %s\n", #TEST); \
- } \
- } while (0)
-#endif
-
-
-/* Check if the test runner is in verbose mode. */
-#define GREATEST_IS_VERBOSE() ((greatest_info.verbosity) > 0)
-#define GREATEST_LIST_ONLY() \
- (greatest_info.flags & GREATEST_FLAG_LIST_ONLY)
-#define GREATEST_FIRST_FAIL() \
- (greatest_info.flags & GREATEST_FLAG_FIRST_FAIL)
-#define GREATEST_FAILURE_ABORT() \
- (greatest_info.suite.failed > 0 && GREATEST_FIRST_FAIL())
-
-/* Message-less forms of tests defined below. */
-#define GREATEST_PASS() GREATEST_PASSm(NULL)
-#define GREATEST_FAIL() GREATEST_FAILm(NULL)
-#define GREATEST_SKIP() GREATEST_SKIPm(NULL)
-#define GREATEST_ASSERT(COND) \
- GREATEST_ASSERTm(#COND, COND)
-#define GREATEST_ASSERT_OR_LONGJMP(COND) \
- GREATEST_ASSERT_OR_LONGJMPm(#COND, COND)
-#define GREATEST_ASSERT_FALSE(COND) \
- GREATEST_ASSERT_FALSEm(#COND, COND)
-#define GREATEST_ASSERT_EQ(EXP, GOT) \
- GREATEST_ASSERT_EQm(#EXP " != " #GOT, EXP, GOT)
-#define GREATEST_ASSERT_EQ_FMT(EXP, GOT, FMT) \
- GREATEST_ASSERT_EQ_FMTm(#EXP " != " #GOT, EXP, GOT, FMT)
-#define GREATEST_ASSERT_IN_RANGE(EXP, GOT, TOL) \
- GREATEST_ASSERT_IN_RANGEm(#EXP " != " #GOT " +/- " #TOL, EXP, GOT, TOL)
-#define GREATEST_ASSERT_EQUAL_T(EXP, GOT, TYPE_INFO, UDATA) \
- GREATEST_ASSERT_EQUAL_Tm(#EXP " != " #GOT, EXP, GOT, TYPE_INFO, UDATA)
-#define GREATEST_ASSERT_STR_EQ(EXP, GOT) \
- GREATEST_ASSERT_STR_EQm(#EXP " != " #GOT, EXP, GOT)
-#define GREATEST_ASSERT_STRN_EQ(EXP, GOT, SIZE) \
- GREATEST_ASSERT_STRN_EQm(#EXP " != " #GOT, EXP, GOT, SIZE)
-#define GREATEST_ASSERT_MEM_EQ(EXP, GOT, SIZE) \
- GREATEST_ASSERT_MEM_EQm(#EXP " != " #GOT, EXP, GOT, SIZE)
-#define GREATEST_ASSERT_ENUM_EQ(EXP, GOT, ENUM_STR) \
- GREATEST_ASSERT_ENUM_EQm(#EXP " != " #GOT, EXP, GOT, ENUM_STR)
-
-/* The following forms take an additional message argument first,
- * to be displayed by the test runner. */
-
-/* Fail if a condition is not true, with message. */
-#define GREATEST_ASSERTm(MSG, COND) \
- do { \- greatest_info.assertions++; \
- if (!(COND)) { GREATEST_FAILm(MSG); } \- } while (0)
-
-/* Fail if a condition is not true, longjmping out of test. */
-#define GREATEST_ASSERT_OR_LONGJMPm(MSG, COND) \
- do { \- greatest_info.assertions++; \
- if (!(COND)) { GREATEST_FAIL_WITH_LONGJMPm(MSG); } \- } while (0)
-
-/* Fail if a condition is not false, with message. */
-#define GREATEST_ASSERT_FALSEm(MSG, COND) \
- do { \- greatest_info.assertions++; \
- if ((COND)) { GREATEST_FAILm(MSG); } \- } while (0)
-
-/* Fail if EXP != GOT (equality comparison by ==). */
-#define GREATEST_ASSERT_EQm(MSG, EXP, GOT) \
- do { \- greatest_info.assertions++; \
- if ((EXP) != (GOT)) { GREATEST_FAILm(MSG); } \- } while (0)
-
-/* Fail if EXP != GOT (equality comparison by ==).
- * Warning: EXP and GOT will be evaluated more than once on failure. */
-#define GREATEST_ASSERT_EQ_FMTm(MSG, EXP, GOT, FMT) \
- do { \- const char *greatest_FMT = ( FMT ); \
- greatest_info.assertions++; \
- if ((EXP) != (GOT)) { \- fprintf(GREATEST_STDOUT, "\nExpected: "); \
- fprintf(GREATEST_STDOUT, greatest_FMT, EXP); \
- fprintf(GREATEST_STDOUT, "\n Got: "); \
- fprintf(GREATEST_STDOUT, greatest_FMT, GOT); \
- fprintf(GREATEST_STDOUT, "\n"); \
- GREATEST_FAILm(MSG); \
- } \
- } while (0)
-
-/* Fail if EXP is not equal to GOT, printing enum IDs. */
-#define GREATEST_ASSERT_ENUM_EQm(MSG, EXP, GOT, ENUM_STR) \
- do { \- int greatest_EXP = (int)(EXP); \
- int greatest_GOT = (int)(GOT); \
- greatest_enum_str_fun *greatest_ENUM_STR = ENUM_STR; \
- if (greatest_EXP != greatest_GOT) { \- fprintf(GREATEST_STDOUT, "\nExpected: %s", \
- greatest_ENUM_STR(greatest_EXP)); \
- fprintf(GREATEST_STDOUT, "\n Got: %s\n", \
- greatest_ENUM_STR(greatest_GOT)); \
- GREATEST_FAILm(MSG); \
- } \
- } while (0) \
-
-/* Fail if GOT not in range of EXP +|- TOL. */
-#define GREATEST_ASSERT_IN_RANGEm(MSG, EXP, GOT, TOL) \
- do { \- GREATEST_FLOAT greatest_EXP = (EXP); \
- GREATEST_FLOAT greatest_GOT = (GOT); \
- GREATEST_FLOAT greatest_TOL = (TOL); \
- greatest_info.assertions++; \
- if ((greatest_EXP > greatest_GOT && \
- greatest_EXP - greatest_GOT > greatest_TOL) || \
- (greatest_EXP < greatest_GOT && \
- greatest_GOT - greatest_EXP > greatest_TOL)) { \- fprintf(GREATEST_STDOUT, \
- "\nExpected: " GREATEST_FLOAT_FMT \
- " +/- " GREATEST_FLOAT_FMT \
- "\n Got: " GREATEST_FLOAT_FMT \
- "\n", \
- greatest_EXP, greatest_TOL, greatest_GOT); \
- GREATEST_FAILm(MSG); \
- } \
- } while (0)
-
-/* Fail if EXP is not equal to GOT, according to strcmp. */
-#define GREATEST_ASSERT_STR_EQm(MSG, EXP, GOT) \
- do { \- GREATEST_ASSERT_EQUAL_Tm(MSG, EXP, GOT, \
- &greatest_type_info_string, NULL); \
- } while (0) \
-
-/* Fail if EXP is not equal to GOT, according to strcmp. */
-#define GREATEST_ASSERT_STRN_EQm(MSG, EXP, GOT, SIZE) \
- do { \- size_t size = SIZE; \
- GREATEST_ASSERT_EQUAL_Tm(MSG, EXP, GOT, \
- &greatest_type_info_string, &size); \
- } while (0) \
-
-/* Fail if EXP is not equal to GOT, according to memcmp. */
-#define GREATEST_ASSERT_MEM_EQm(MSG, EXP, GOT, SIZE) \
- do { \- greatest_memory_cmp_env env; \
- env.exp = (const unsigned char *)EXP; \
- env.got = (const unsigned char *)GOT; \
- env.size = SIZE; \
- GREATEST_ASSERT_EQUAL_Tm(MSG, env.exp, env.got, \
- &greatest_type_info_memory, &env); \
- } while (0) \
-
-/* Fail if EXP is not equal to GOT, according to a comparison
- * callback in TYPE_INFO. If they are not equal, optionally use a
- * print callback in TYPE_INFO to print them. */
-#define GREATEST_ASSERT_EQUAL_Tm(MSG, EXP, GOT, TYPE_INFO, UDATA) \
- do { \- greatest_type_info *type_info = (TYPE_INFO); \
- greatest_info.assertions++; \
- if (!greatest_do_assert_equal_t(EXP, GOT, \
- type_info, UDATA)) { \- if (type_info == NULL || type_info->equal == NULL) { \- GREATEST_FAILm("type_info->equal callback missing!"); \- } else { \- GREATEST_FAILm(MSG); \
- } \
- } \
- } while (0) \
-
-/* Pass. */
-#define GREATEST_PASSm(MSG) \
- do { \- greatest_info.msg = MSG; \
- return GREATEST_TEST_RES_PASS; \
- } while (0)
-
-/* Fail. */
-#define GREATEST_FAILm(MSG) \
- do { \- greatest_info.fail_file = __FILE__; \
- greatest_info.fail_line = __LINE__; \
- greatest_info.msg = MSG; \
- return GREATEST_TEST_RES_FAIL; \
- } while (0)
-
-/* Optional GREATEST_FAILm variant that longjmps. */
-#if GREATEST_USE_LONGJMP
-#define GREATEST_FAIL_WITH_LONGJMP() GREATEST_FAIL_WITH_LONGJMPm(NULL)
-#define GREATEST_FAIL_WITH_LONGJMPm(MSG) \
- do { \- greatest_info.fail_file = __FILE__; \
- greatest_info.fail_line = __LINE__; \
- greatest_info.msg = MSG; \
- longjmp(greatest_info.jump_dest, GREATEST_TEST_RES_FAIL); \
- } while (0)
-#endif
-
-/* Skip the current test. */
-#define GREATEST_SKIPm(MSG) \
- do { \- greatest_info.msg = MSG; \
- return GREATEST_TEST_RES_SKIP; \
- } while (0)
-
-/* Check the result of a subfunction using ASSERT, etc. */
-#define GREATEST_CHECK_CALL(RES) \
- do { \- enum greatest_test_res greatest_RES = RES; \
- if (greatest_RES != GREATEST_TEST_RES_PASS) { \- return greatest_RES; \
- } \
- } while (0) \
-
-#if GREATEST_USE_TIME
-#define GREATEST_SET_TIME(NAME) \
- NAME = clock(); \
- if (NAME == (clock_t) -1) { \- fprintf(GREATEST_STDOUT, \
- "clock error: %s\n", #NAME); \
- exit(EXIT_FAILURE); \
- }
-
-#define GREATEST_CLOCK_DIFF(C1, C2) \
- fprintf(GREATEST_STDOUT, " (%lu ticks, %.3f sec)", \
- (long unsigned int) (C2) - (long unsigned int)(C1), \
- (double)((C2) - (C1)) / (1.0 * (double)CLOCKS_PER_SEC))
-#else
-#define GREATEST_SET_TIME(UNUSED)
-#define GREATEST_CLOCK_DIFF(UNUSED1, UNUSED2)
-#endif
-
-#if GREATEST_USE_LONGJMP
-#define GREATEST_SAVE_CONTEXT() \
- /* setjmp returns 0 (GREATEST_TEST_RES_PASS) on first call */ \
- /* so the test runs, then RES_FAIL from FAIL_WITH_LONGJMP. */ \
- ((enum greatest_test_res)(setjmp(greatest_info.jump_dest)))
-#else
-#define GREATEST_SAVE_CONTEXT() \
- /*a no-op, since setjmp/longjmp aren't being used */ \
- GREATEST_TEST_RES_PASS
-#endif
-
-/* Include several function definitions in the main test file. */
-#define GREATEST_MAIN_DEFS() \
- \
-/* Is FILTER a subset of NAME? */ \
-static int greatest_name_match(const char *name, \
- const char *filter) { \- size_t offset = 0; \
- size_t filter_len = strlen(filter); \
- while (name[offset] != '\0') { \- if (name[offset] == filter[0]) { \- if (0 == strncmp(&name[offset], filter, filter_len)) { \- return 1; \
- } \
- } \
- offset++; \
- } \
- \
- return 0; \
-} \
- \
-int greatest_pre_test(const char *name) { \- if (!GREATEST_LIST_ONLY() \
- && (!GREATEST_FIRST_FAIL() || greatest_info.suite.failed == 0) \
- && (greatest_info.test_filter == NULL || \
- greatest_name_match(name, greatest_info.test_filter))) { \- GREATEST_SET_TIME(greatest_info.suite.pre_test); \
- if (greatest_info.setup) { \- greatest_info.setup(greatest_info.setup_udata); \
- } \
- return 1; /* test should be run */ \
- } else { \- return 0; /* skipped */ \
- } \
-} \
- \
-void greatest_post_test(const char *name, int res) { \- GREATEST_SET_TIME(greatest_info.suite.post_test); \
- if (greatest_info.teardown) { \- void *udata = greatest_info.teardown_udata; \
- greatest_info.teardown(udata); \
- } \
- \
- if (res <= GREATEST_TEST_RES_FAIL) { \- greatest_do_fail(name); \
- } else if (res >= GREATEST_TEST_RES_SKIP) { \- greatest_do_skip(name); \
- } else if (res == GREATEST_TEST_RES_PASS) { \- greatest_do_pass(name); \
- } \
- greatest_info.suite.tests_run++; \
- greatest_info.col++; \
- if (GREATEST_IS_VERBOSE()) { \- GREATEST_CLOCK_DIFF(greatest_info.suite.pre_test, \
- greatest_info.suite.post_test); \
- fprintf(GREATEST_STDOUT, "\n"); \
- } else if (greatest_info.col % greatest_info.width == 0) { \- fprintf(GREATEST_STDOUT, "\n"); \
- greatest_info.col = 0; \
- } \
- if (GREATEST_STDOUT == stdout) fflush(stdout); \
-} \
- \
-static void report_suite(void) { \- if (greatest_info.suite.tests_run > 0) { \- fprintf(GREATEST_STDOUT, \
- "\n%u test%s - %u passed, %u failed, %u skipped", \
- greatest_info.suite.tests_run, \
- greatest_info.suite.tests_run == 1 ? "" : "s", \
- greatest_info.suite.passed, \
- greatest_info.suite.failed, \
- greatest_info.suite.skipped); \
- GREATEST_CLOCK_DIFF(greatest_info.suite.pre_suite, \
- greatest_info.suite.post_suite); \
- fprintf(GREATEST_STDOUT, "\n"); \
- } \
-} \
- \
-static void update_counts_and_reset_suite(void) { \- greatest_info.setup = NULL; \
- greatest_info.setup_udata = NULL; \
- greatest_info.teardown = NULL; \
- greatest_info.teardown_udata = NULL; \
- greatest_info.passed += greatest_info.suite.passed; \
- greatest_info.failed += greatest_info.suite.failed; \
- greatest_info.skipped += greatest_info.suite.skipped; \
- greatest_info.tests_run += greatest_info.suite.tests_run; \
- memset(&greatest_info.suite, 0, sizeof(greatest_info.suite)); \
- greatest_info.col = 0; \
-} \
- \
-static void greatest_run_suite(greatest_suite_cb *suite_cb, \
- const char *suite_name) { \- if (greatest_info.suite_filter && \
- !greatest_name_match(suite_name, greatest_info.suite_filter)) { \- return; \
- } \
- update_counts_and_reset_suite(); \
- if (GREATEST_FIRST_FAIL() && greatest_info.failed > 0) { return; } \- fprintf(GREATEST_STDOUT, "\n* Suite %s:\n", suite_name); \
- GREATEST_SET_TIME(greatest_info.suite.pre_suite); \
- suite_cb(); \
- GREATEST_SET_TIME(greatest_info.suite.post_suite); \
- report_suite(); \
-} \
- \
-void greatest_do_pass(const char *name) { \- if (GREATEST_IS_VERBOSE()) { \- fprintf(GREATEST_STDOUT, "PASS %s: %s", \
- name, greatest_info.msg ? greatest_info.msg : ""); \
- } else { \- fprintf(GREATEST_STDOUT, "."); \
- } \
- greatest_info.suite.passed++; \
-} \
- \
-void greatest_do_fail(const char *name) { \- if (GREATEST_IS_VERBOSE()) { \- fprintf(GREATEST_STDOUT, \
- "FAIL %s: %s (%s:%u)", \
- name, greatest_info.msg ? greatest_info.msg : "", \
- greatest_info.fail_file, greatest_info.fail_line); \
- } else { \- fprintf(GREATEST_STDOUT, "F"); \
- greatest_info.col++; \
- /* add linebreak if in line of '.'s */ \
- if (greatest_info.col != 0) { \- fprintf(GREATEST_STDOUT, "\n"); \
- greatest_info.col = 0; \
- } \
- fprintf(GREATEST_STDOUT, "FAIL %s: %s (%s:%u)\n", \
- name, \
- greatest_info.msg ? greatest_info.msg : "", \
- greatest_info.fail_file, greatest_info.fail_line); \
- } \
- greatest_info.suite.failed++; \
-} \
- \
-void greatest_do_skip(const char *name) { \- if (GREATEST_IS_VERBOSE()) { \- fprintf(GREATEST_STDOUT, "SKIP %s: %s", \
- name, \
- greatest_info.msg ? \
- greatest_info.msg : "" ); \
- } else { \- fprintf(GREATEST_STDOUT, "s"); \
- } \
- greatest_info.suite.skipped++; \
-} \
- \
-int greatest_do_assert_equal_t(const void *exp, const void *got, \
- greatest_type_info *type_info, void *udata) { \- int eq = 0; \
- if (type_info == NULL || type_info->equal == NULL) { \- return 0; \
- } \
- eq = type_info->equal(exp, got, udata); \
- if (!eq) { \- if (type_info->print != NULL) { \- fprintf(GREATEST_STDOUT, "\nExpected: "); \
- (void)type_info->print(exp, udata); \
- fprintf(GREATEST_STDOUT, "\n Got: "); \
- (void)type_info->print(got, udata); \
- fprintf(GREATEST_STDOUT, "\n"); \
- } else { \- fprintf(GREATEST_STDOUT, \
- "GREATEST_ASSERT_EQUAL_T failure at %s:%u\n", \
- greatest_info.fail_file, \
- greatest_info.fail_line); \
- } \
- } \
- return eq; \
-} \
- \
-void greatest_usage(const char *name) { \- fprintf(GREATEST_STDOUT, \
- "Usage: %s [-hlfv] [-s SUITE] [-t TEST]\n" \
- " -h, --help print this Help\n" \
- " -l List suites and their tests, then exit\n" \
- " -f Stop runner after first failure\n" \
- " -v Verbose output\n" \
- " -s SUITE only run suites containing string SUITE\n" \
- " -t TEST only run tests containing string TEST\n", \
- name); \
-} \
- \
-static void greatest_parse_args(int argc, char **argv) { \- int i = 0; \
- for (i = 1; i < argc; i++) { \- if (0 == strncmp("-t", argv[i], 2)) { \- if (argc <= i + 1) { \- greatest_usage(argv[0]); \
- exit(EXIT_FAILURE); \
- } \
- greatest_info.test_filter = argv[i+1]; \
- i++; \
- } else if (0 == strncmp("-s", argv[i], 2)) { \- if (argc <= i + 1) { \- greatest_usage(argv[0]); \
- exit(EXIT_FAILURE); \
- } \
- greatest_info.suite_filter = argv[i+1]; \
- i++; \
- } else if (0 == strncmp("-f", argv[i], 2)) { \- greatest_info.flags |= GREATEST_FLAG_FIRST_FAIL; \
- } else if (0 == strncmp("-v", argv[i], 2)) { \- greatest_info.verbosity++; \
- } else if (0 == strncmp("-l", argv[i], 2)) { \- greatest_info.flags |= GREATEST_FLAG_LIST_ONLY; \
- } else if (0 == strncmp("-h", argv[i], 2) || \- 0 == strncmp("--help", argv[i], 6)) { \- greatest_usage(argv[0]); \
- exit(EXIT_SUCCESS); \
- } else if (0 == strncmp("--", argv[i], 2)) { \- break; \
- } else { \- fprintf(GREATEST_STDOUT, \
- "Unknown argument '%s'\n", argv[i]); \
- greatest_usage(argv[0]); \
- exit(EXIT_FAILURE); \
- } \
- } \
-} \
- \
-int greatest_all_passed(void) { return (greatest_info.failed == 0); } \- \
-void greatest_set_test_filter(const char *name) { \- greatest_info.test_filter = name; \
-} \
- \
-void greatest_set_suite_filter(const char *name) { \- greatest_info.suite_filter = name; \
-} \
- \
-void greatest_get_report(struct greatest_report_t *report) { \- if (report) { \- report->passed = greatest_info.passed; \
- report->failed = greatest_info.failed; \
- report->skipped = greatest_info.skipped; \
- report->assertions = greatest_info.assertions; \
- } \
-} \
- \
-unsigned int greatest_get_verbosity(void) { \- return greatest_info.verbosity; \
-} \
- \
-void greatest_set_verbosity(unsigned int verbosity) { \- greatest_info.verbosity = (unsigned char)verbosity; \
-} \
- \
-void greatest_set_flag(greatest_flag_t flag) { \- greatest_info.flags |= flag; \
-} \
- \
-void GREATEST_SET_SETUP_CB(greatest_setup_cb *cb, void *udata) { \- greatest_info.setup = cb; \
- greatest_info.setup_udata = udata; \
-} \
- \
-void GREATEST_SET_TEARDOWN_CB(greatest_teardown_cb *cb, \
- void *udata) { \- greatest_info.teardown = cb; \
- greatest_info.teardown_udata = udata; \
-} \
- \
-static int greatest_string_equal_cb(const void *exp, const void *got, \
- void *udata) { \- size_t *size = (size_t *)udata; \
- return (size != NULL \
- ? (0 == strncmp((const char *)exp, (const char *)got, *size)) \
- : (0 == strcmp((const char *)exp, (const char *)got))); \
-} \
- \
-static int greatest_string_printf_cb(const void *t, void *udata) { \- (void)udata; /* note: does not check \0 termination. */ \
- return fprintf(GREATEST_STDOUT, "%s", (const char *)t); \
-} \
- \
-greatest_type_info greatest_type_info_string = { \- greatest_string_equal_cb, \
- greatest_string_printf_cb, \
-}; \
- \
-static int greatest_memory_equal_cb(const void *exp, const void *got, \
- void *udata) { \- greatest_memory_cmp_env *env = (greatest_memory_cmp_env *)udata; \
- return (0 == memcmp(exp, got, env->size)); \
-} \
- \
-static int greatest_memory_printf_cb(const void *t, void *udata) { \- greatest_memory_cmp_env *env = (greatest_memory_cmp_env *)udata; \
- unsigned char *buf = (unsigned char *)t, diff_mark = ' '; \
- FILE *out = GREATEST_STDOUT; \
- size_t i, line_i, line_len = 0; \
- int len = 0; /* format hexdump with differences highlighted */ \
- for (i = 0; i < env->size; i+= line_len) { \- diff_mark = ' '; \
- line_len = env->size - i; \
- if (line_len > 16) { line_len = 16; } \- for (line_i = i; line_i < i + line_len; line_i++) { \- if (env->exp[line_i] != env->got[line_i]) diff_mark = 'X'; \
- } \
- len += fprintf(out, "\n%04x %c ", (unsigned int)i, diff_mark); \
- for (line_i = i; line_i < i + line_len; line_i++) { \- int m = env->exp[line_i] == env->got[line_i]; /* match? */ \
- len += fprintf(out, "%02x%c", buf[line_i], m ? ' ' : '<'); \
- } \
- for (line_i = 0; line_i < 16 - line_len; line_i++) { \- len += fprintf(out, " "); \
- } \
- fprintf(out, " "); \
- for (line_i = i; line_i < i + line_len; line_i++) { \- unsigned char c = buf[line_i]; \
- len += fprintf(out, "%c", isprint(c) ? c : '.'); \
- } \
- } \
- len += fprintf(out, "\n"); \
- return len; \
-} \
- \
-greatest_type_info greatest_type_info_memory = { \- greatest_memory_equal_cb, \
- greatest_memory_printf_cb, \
-}; \
- \
-greatest_run_info greatest_info
-
-/* Init internals. */
-#define GREATEST_INIT() \
- do { \- /* Suppress unused function warning if features aren't used */ \
- (void)greatest_run_suite; \
- (void)greatest_parse_args; \
- \
- memset(&greatest_info, 0, sizeof(greatest_info)); \
- greatest_info.width = GREATEST_DEFAULT_WIDTH; \
- GREATEST_SET_TIME(greatest_info.begin); \
- } while (0) \
-
-/* Handle command-line arguments, etc. */
-#define GREATEST_MAIN_BEGIN() \
- do { \- GREATEST_INIT(); \
- greatest_parse_args(argc, argv); \
- } while (0)
-
-/* Report passes, failures, skipped tests, the number of
- * assertions, and the overall run time. */
-#define GREATEST_PRINT_REPORT() \
- do { \- if (!GREATEST_LIST_ONLY()) { \- update_counts_and_reset_suite(); \
- GREATEST_SET_TIME(greatest_info.end); \
- fprintf(GREATEST_STDOUT, \
- "\nTotal: %u test%s", \
- greatest_info.tests_run, \
- greatest_info.tests_run == 1 ? "" : "s"); \
- GREATEST_CLOCK_DIFF(greatest_info.begin, \
- greatest_info.end); \
- fprintf(GREATEST_STDOUT, ", %u assertion%s\n", \
- greatest_info.assertions, \
- greatest_info.assertions == 1 ? "" : "s"); \
- fprintf(GREATEST_STDOUT, \
- "Pass: %u, fail: %u, skip: %u.\n", \
- greatest_info.passed, \
- greatest_info.failed, greatest_info.skipped); \
- } \
- } while (0)
-
-/* Report results, exit with exit status based on results. */
-#define GREATEST_MAIN_END() \
- do { \- GREATEST_PRINT_REPORT(); \
- return (greatest_all_passed() ? EXIT_SUCCESS : EXIT_FAILURE); \
- } while (0)
-
-/* Make abbreviations without the GREATEST_ prefix for the
- * most commonly used symbols. */
-#if GREATEST_USE_ABBREVS
-#define TEST GREATEST_TEST
-#define SUITE GREATEST_SUITE
-#define SUITE_EXTERN GREATEST_SUITE_EXTERN
-#define RUN_TEST GREATEST_RUN_TEST
-#define RUN_TEST1 GREATEST_RUN_TEST1
-#define RUN_SUITE GREATEST_RUN_SUITE
-#define IGNORE_TEST GREATEST_IGNORE_TEST
-#define ASSERT GREATEST_ASSERT
-#define ASSERTm GREATEST_ASSERTm
-#define ASSERT_FALSE GREATEST_ASSERT_FALSE
-#define ASSERT_EQ GREATEST_ASSERT_EQ
-#define ASSERT_EQ_FMT GREATEST_ASSERT_EQ_FMT
-#define ASSERT_IN_RANGE GREATEST_ASSERT_IN_RANGE
-#define ASSERT_EQUAL_T GREATEST_ASSERT_EQUAL_T
-#define ASSERT_STR_EQ GREATEST_ASSERT_STR_EQ
-#define ASSERT_STRN_EQ GREATEST_ASSERT_STRN_EQ
-#define ASSERT_MEM_EQ GREATEST_ASSERT_MEM_EQ
-#define ASSERT_ENUM_EQ GREATEST_ASSERT_ENUM_EQ
-#define ASSERT_FALSEm GREATEST_ASSERT_FALSEm
-#define ASSERT_EQm GREATEST_ASSERT_EQm
-#define ASSERT_EQ_FMTm GREATEST_ASSERT_EQ_FMTm
-#define ASSERT_IN_RANGEm GREATEST_ASSERT_IN_RANGEm
-#define ASSERT_EQUAL_Tm GREATEST_ASSERT_EQUAL_Tm
-#define ASSERT_STR_EQm GREATEST_ASSERT_STR_EQm
-#define ASSERT_STRN_EQm GREATEST_ASSERT_STRN_EQm
-#define ASSERT_MEM_EQm GREATEST_ASSERT_MEM_EQm
-#define ASSERT_ENUM_EQm GREATEST_ASSERT_ENUM_EQm
-#define PASS GREATEST_PASS
-#define FAIL GREATEST_FAIL
-#define SKIP GREATEST_SKIP
-#define PASSm GREATEST_PASSm
-#define FAILm GREATEST_FAILm
-#define SKIPm GREATEST_SKIPm
-#define SET_SETUP GREATEST_SET_SETUP_CB
-#define SET_TEARDOWN GREATEST_SET_TEARDOWN_CB
-#define CHECK_CALL GREATEST_CHECK_CALL
-
-#ifdef GREATEST_VA_ARGS
-#define RUN_TESTp GREATEST_RUN_TESTp
-#endif
-
-#if GREATEST_USE_LONGJMP
-#define ASSERT_OR_LONGJMP GREATEST_ASSERT_OR_LONGJMP
-#define ASSERT_OR_LONGJMPm GREATEST_ASSERT_OR_LONGJMPm
-#define FAIL_WITH_LONGJMP GREATEST_FAIL_WITH_LONGJMP
-#define FAIL_WITH_LONGJMPm GREATEST_FAIL_WITH_LONGJMPm
-#endif
-
-#endif /* USE_ABBREVS */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
--- a/parg/test/test_parg.c
+++ /dev/null
@@ -1,703 +1,0 @@
-/*
- * test_parg - parg unit test
- *
- * Written in 2015-2016 by Joergen Ibsen
- *
- * To the extent possible under law, the author(s) have dedicated all
- * copyright and related and neighboring rights to this software to the
- * public domain worldwide. This software is distributed without any
- * warranty. <http://creativecommons.org/publicdomain/zero/1.0/>
- */
-
-#include "parg.h"
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "greatest.h"
-
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-
-static const char *os_def = ":no::r:";
-
-static const struct parg_option po_def[] = {- { "noarg", PARG_NOARG, NULL, 'n' },- { "optarg", PARG_OPTARG, NULL, 'o' },- { "reqarg", PARG_REQARG, NULL, 'r' },- { "foo", PARG_NOARG, NULL, 'f' },- { "foobar", PARG_NOARG, NULL, 'b' },- { 0, 0, 0, 0 }-};
-
-/*
- * parg_getopt tests
- */
-
-TEST parg_getopt_app_only(void)
-{- struct parg_state ps;
- char *argv[] = { "app" };-
- parg_init(&ps);
-
- ASSERT_EQ(-1, parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(1, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_dash(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "-" };-
- parg_init(&ps);
-
- ASSERT_EQ(1, parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));
- ASSERT_EQ(argv[1], ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_double_dash(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "--" };-
- parg_init(&ps);
-
- ASSERT_EQ(-1, parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_nonopt(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "foo" };-
- parg_init(&ps);
-
- ASSERT_EQ(1, parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));
- ASSERT_EQ(argv[1], ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_no_match(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "-u" };-
- parg_init(&ps);
-
- ASSERT_EQ('?', parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));- ASSERT_EQ('u', ps.optopt);- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_noarg(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "-n" };-
- parg_init(&ps);
-
- ASSERT_EQ('n', parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_optarg_missing(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "-o" };-
- parg_init(&ps);
-
- ASSERT_EQ('o', parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_optarg_inline(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "-oarg" };-
- parg_init(&ps);
-
- ASSERT_EQ('o', parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));- ASSERT_EQ(&argv[1][2], ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_reqarg_missing(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "-r" };-
- parg_init(&ps);
-
- ASSERT_EQ(':', parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ('r', ps.optopt);- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_reqarg_inline(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "-rarg" };-
- parg_init(&ps);
-
- ASSERT_EQ('r', parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));- ASSERT_EQ(&argv[1][2], ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_reqarg_nextarg(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "-r", "arg" };-
- parg_init(&ps);
-
- ASSERT_EQ('r', parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));- ASSERT_EQ(argv[2], ps.optarg);
- ASSERT_EQ(3, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt(&ps, ARRAY_SIZE(argv), argv, os_def));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(3, ps.optind);
-
- PASS();
-}
-
-/*
- * parg_getopt_long tests
- */
-
-TEST parg_getopt_long_app_only(void)
-{- struct parg_state ps;
- char *argv[] = { "app" };- int li = -1;
-
- parg_init(&ps);
-
- ASSERT_EQ(-1, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(1, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_long_dash(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "-" };- int li = -1;
-
- parg_init(&ps);
-
- ASSERT_EQ(1, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));
- ASSERT_EQ(argv[1], ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_long_double_dash(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "--" };- int li = -1;
-
- parg_init(&ps);
-
- ASSERT_EQ(-1, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_long_nonopt(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "foo" };- int li = -1;
-
- parg_init(&ps);
-
- ASSERT_EQ(1, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));
- ASSERT_EQ(argv[1], ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_long_no_match(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "--unknown" };- int li = -1;
-
- parg_init(&ps);
-
- ASSERT_EQ('?', parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_long_flag(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "--flag" };- int li = -1;
- int flag = 0;
- struct parg_option po_flag[] = {- { "flag", PARG_NOARG, 0, 1 },- { 0, 0, 0, 0 }- };
-
- po_flag[0].flag = &flag;
-
- parg_init(&ps);
-
- ASSERT_EQ(0, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_flag, &li));
- ASSERT_EQ(0, li);
- ASSERT_EQ(1, flag);
- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_flag, &li));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_long_noarg(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "--noarg" };- int li = -1;
-
- parg_init(&ps);
-
- ASSERT_EQ('n', parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));- ASSERT_EQ(0, li);
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_long_noarg_inline(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "--noarg=arg" };- int li = -1;
-
- parg_init(&ps);
-
- ASSERT_EQ(':', parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));- ASSERT_EQ(0, li);
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ('n', ps.optopt);- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_long_optarg_missing(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "--optarg" };- int li = -1;
-
- parg_init(&ps);
-
- ASSERT_EQ('o', parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));- ASSERT_EQ(1, li);
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_long_optarg_inline(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "--optarg=arg" };- int li = -1;
-
- parg_init(&ps);
-
- ASSERT_EQ('o', parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));- ASSERT_EQ(1, li);
- ASSERT_EQ(&argv[1][9], ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_long_reqarg_missing(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "--reqarg" };- int li = -1;
-
- parg_init(&ps);
-
- ASSERT_EQ(':', parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));- ASSERT_EQ(2, li);
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ('r', ps.optopt);- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_long_reqarg_inline(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "--reqarg=arg" };- int li = -1;
-
- parg_init(&ps);
-
- ASSERT_EQ('r', parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));- ASSERT_EQ(2, li);
- ASSERT_EQ(&argv[1][9], ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_long_reqarg_nextarg(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "--reqarg", "arg" };- int li = -1;
-
- parg_init(&ps);
-
- ASSERT_EQ('r', parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));- ASSERT_EQ(2, li);
- ASSERT_EQ(argv[2], ps.optarg);
- ASSERT_EQ(3, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(3, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_long_prefix_ambiguous(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "--fo" };- int li = -1;
-
- parg_init(&ps);
-
- ASSERT_EQ('?', parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_long_prefix_exact(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "--foo" };- int li = -1;
-
- parg_init(&ps);
-
- ASSERT_EQ('f', parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));- ASSERT_EQ(3, li);
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-TEST parg_getopt_long_prefix_unambiguous(void)
-{- struct parg_state ps;
- char *argv[] = { "app", "--foob" };- int li = -1;
-
- parg_init(&ps);
-
- ASSERT_EQ('b', parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));- ASSERT_EQ(4, li);
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- ASSERT_EQ(-1, parg_getopt_long(&ps, ARRAY_SIZE(argv), argv, ":", po_def, &li));
- ASSERT_EQ(NULL, ps.optarg);
- ASSERT_EQ(2, ps.optind);
-
- PASS();
-}
-
-/*
- * parg_reorder tests
- */
-
-TEST parg_reorder_short(void)
-{- char *argv[] = {- "app", "first", "-r", "--", "foo", "-u", "bar", "-o", "--",
- "-n", "last"
- };
- char *argv_expected[] = {- "app", "-r", "--", "-u", "-o", "--", "first", "foo", "bar",
- "-n", "last"
- };
- size_t i;
-
- ASSERT_EQ(6, parg_reorder(ARRAY_SIZE(argv), argv, os_def, NULL));
-
- for (i = 0; i < ARRAY_SIZE(argv); ++i) {- ASSERT_STR_EQ(argv_expected[i], argv[i]);
- }
-
- PASS();
-}
-
-TEST parg_reorder_long(void)
-{- char *argv[] = {- "app", "first", "--reqarg", "--", "foo", "--unknown", "bar",
- "--optarg", "--", "--noarg", "last"
- };
- char *argv_expected[] = {- "app", "--reqarg", "--", "--unknown", "--optarg", "--",
- "first", "foo", "bar", "--noarg", "last"
- };
- size_t i;
-
- ASSERT_EQ(6, parg_reorder(ARRAY_SIZE(argv), argv, "", po_def));
-
- for (i = 0; i < ARRAY_SIZE(argv); ++i) {- ASSERT_STR_EQ(argv_expected[i], argv[i]);
- }
-
- PASS();
-}
-
-TEST parg_reorder_app_only(void)
-{- char *argv[] = { "app" };-
- ASSERT_EQ(1, parg_reorder(ARRAY_SIZE(argv), argv, os_def, NULL));
-
- PASS();
-}
-
-TEST parg_reorder_double_dash_last(void)
-{- char *argv[] = { "app", "foo", "-n", "--" };- char *argv_expected[] = { "app", "-n", "--", "foo" };- size_t i;
-
- ASSERT_EQ(3, parg_reorder(ARRAY_SIZE(argv), argv, os_def, NULL));
-
- for (i = 0; i < ARRAY_SIZE(argv); ++i) {- ASSERT_STR_EQ(argv_expected[i], argv[i]);
- }
-
- PASS();
-}
-
-TEST parg_reorder_missing_arg_last(void)
-{- char *argv[] = { "app", "foo", "-r" };- char *argv_expected[] = { "app", "-r", "foo" };- size_t i;
-
- ASSERT_EQ(2, parg_reorder(ARRAY_SIZE(argv), argv, os_def, NULL));
-
- for (i = 0; i < ARRAY_SIZE(argv); ++i) {- ASSERT_STR_EQ(argv_expected[i], argv[i]);
- }
-
- PASS();
-}
-
-SUITE(parg_getopt_tests)
-{- RUN_TEST(parg_getopt_app_only);
-
- RUN_TEST(parg_getopt_dash);
-
- RUN_TEST(parg_getopt_double_dash);
-
- RUN_TEST(parg_getopt_nonopt);
-
- RUN_TEST(parg_getopt_no_match);
-
- RUN_TEST(parg_getopt_noarg);
-
- RUN_TEST(parg_getopt_optarg_missing);
- RUN_TEST(parg_getopt_optarg_inline);
-
- RUN_TEST(parg_getopt_reqarg_missing);
- RUN_TEST(parg_getopt_reqarg_inline);
- RUN_TEST(parg_getopt_reqarg_nextarg);
-}
-
-SUITE(parg_getopt_long_tests)
-{- RUN_TEST(parg_getopt_long_app_only);
-
- RUN_TEST(parg_getopt_long_dash);
-
- RUN_TEST(parg_getopt_long_double_dash);
-
- RUN_TEST(parg_getopt_long_nonopt);
-
- RUN_TEST(parg_getopt_long_no_match);
-
- RUN_TEST(parg_getopt_long_flag);
-
- RUN_TEST(parg_getopt_long_noarg);
- RUN_TEST(parg_getopt_long_noarg_inline);
-
- RUN_TEST(parg_getopt_long_optarg_missing);
- RUN_TEST(parg_getopt_long_optarg_inline);
-
- RUN_TEST(parg_getopt_long_reqarg_missing);
- RUN_TEST(parg_getopt_long_reqarg_inline);
- RUN_TEST(parg_getopt_long_reqarg_nextarg);
-
- RUN_TEST(parg_getopt_long_prefix_ambiguous);
- RUN_TEST(parg_getopt_long_prefix_exact);
- RUN_TEST(parg_getopt_long_prefix_unambiguous);
-}
-
-SUITE(parg_reorder_tests)
-{- RUN_TEST(parg_reorder_short);
- RUN_TEST(parg_reorder_long);
-
- RUN_TEST(parg_reorder_app_only);
-
- RUN_TEST(parg_reorder_double_dash_last);
-
- RUN_TEST(parg_reorder_missing_arg_last);
-}
-
-GREATEST_MAIN_DEFS();
-
-int main(int argc, char *argv[])
-{- GREATEST_MAIN_BEGIN();
- RUN_SUITE(parg_getopt_tests);
- RUN_SUITE(parg_getopt_long_tests);
- RUN_SUITE(parg_reorder_tests);
- GREATEST_MAIN_END();
-}
--- /dev/null
+++ b/proto.c
@@ -1,0 +1,1164 @@
+#include <stdint.h>
+#include <string.h>
+#include "c9/proto.h"
+
+enum
+{+ Svver = 1<<0,
+};
+
+#define safestrlen(s) (s == NULL ? 0 : (uint32_t)strlen(s))
+#define maxread(c) (c->msize-4-4-1-2)
+#define maxwrite(c) maxread(c)
+
+static void
+w08(uint8_t **p, uint8_t x)
+{+ (*p)[0] = x;
+ *p += 1;
+}
+
+static void
+w16(uint8_t **p, uint16_t x)
+{+ (*p)[0] = x;
+ (*p)[1] = x>>8;
+ *p += 2;
+}
+
+static void
+w32(uint8_t **p, uint32_t x)
+{+ (*p)[0] = x;
+ (*p)[1] = x>>8;
+ (*p)[2] = x>>16;
+ (*p)[3] = x>>24;
+ *p += 4;
+}
+
+static void
+w64(uint8_t **p, uint64_t x)
+{+ (*p)[0] = x;
+ (*p)[1] = x>>8;
+ (*p)[2] = x>>16;
+ (*p)[3] = x>>24;
+ (*p)[4] = x>>32;
+ (*p)[5] = x>>40;
+ (*p)[6] = x>>48;
+ (*p)[7] = x>>56;
+ *p += 8;
+}
+
+static void
+wcs(uint8_t **p, const char *s, int len)
+{+ w16(p, len);
+ if(s != NULL){+ memmove(*p, s, len);
+ *p += len;
+ }
+}
+
+static uint8_t
+r08(uint8_t **p)
+{+ *p += 1;
+ return (*p)[-1];
+}
+
+static uint16_t
+r16(uint8_t **p)
+{+ *p += 2;
+ return (*p)[-2]<<0 | (*p)[-1]<<8;
+}
+
+static uint32_t
+r32(uint8_t **p)
+{+ *p += 4;
+ return (*p)[-4]<<0 | (*p)[-3]<<8 | (*p)[-2]<<16 | (*p)[-1]<<24;
+}
+
+static uint64_t
+r64(uint8_t **p)
+{+ uint64_t v;
+
+ v = r32(p);
+ v |= (uint64_t)r32(p)<<32;
+ return v;
+}
+
+#ifndef C9_NO_CLIENT
+
+static C9error
+newtag(C9ctx *c, C9ttype type, C9tag *tag)
+{+ uint32_t i;
+
+ if(type == Tversion){+ *tag = 0xffff;
+ return 0;
+ }
+
+ if(c->lowfreetag < C9maxtags){+ uint32_t d = c->lowfreetag / C9tagsbits, m = c->lowfreetag % C9tagsbits;
+ if((c->tags[d] & 1<<m) != 0){+ c->tags[d] &= ~(1<<m);
+ *tag = c->lowfreetag++;
+ return 0;
+ }
+ }
+
+ for(i = 0; i < (int)sizeof(c->tags)/sizeof(c->tags[0]); i++){+ uint32_t x, j;
+ if((x = c->tags[i]) == 0)
+ continue;
+ for(j = 0; j < C9tagsbits; j++){+ if((x & (1<<j)) != 0){+ c->tags[i] &= ~(1<<j);
+ *tag = i*C9tagsbits + j;
+ c->lowfreetag = *tag + 1;
+ return 0;
+ }
+ }
+ }
+
+ c->error(c, "newtag: no free tags");
+ return C9Etag;
+}
+
+static int
+freetag(C9ctx *c, C9tag tag)
+{+ if(tag != 0xffff){+ uint32_t d = tag / C9tagsbits, m = tag % C9tagsbits;
+ if(tag >= C9maxtags){+ c->error(c, "freetag: invalid tag %ud", (uint32_t)tag);
+ return -1;
+ }
+ if((c->tags[d] & 1<<m) != 0){+ c->error(c, "freetag: double free for tag %ud", (uint32_t)tag);
+ return -1;
+ }
+ if(c->lowfreetag > tag)
+ c->lowfreetag = tag;
+ c->tags[d] |= 1<<m;
+ }
+ return 0;
+}
+
+static uint8_t *
+T(C9ctx *c, uint32_t size, C9ttype type, C9tag *tag, C9error *err)
+{+ uint8_t *p = NULL;
+
+ if(size > c->msize-4-1-2){+ c->error(c, "T: invalid size %ud", size);
+ *err = C9Esize;
+ }else if((*err = newtag(c, type, tag)) == 0){+ size += 4+1+2;
+ if((p = c->begin(c, size)) == NULL){+ c->error(c, "T: no buffer for %ud bytes", size);
+ freetag(c, *tag);
+ *err = C9Ebuf;
+ }else{+ *err = 0;
+ w32(&p, size);
+ w08(&p, type);
+ w16(&p, *tag);
+ }
+ }
+ return p;
+}
+
+C9error
+c9version(C9ctx *c, C9tag *tag, uint32_t msize)
+{+ uint8_t *b;
+ C9error err;
+
+ if(msize < C9minmsize){+ c->error(c, "c9version: msize too small: %ud", msize);
+ return C9Einit;
+ }
+ memset(c->tags, 0xff, sizeof(c->tags));
+ memset(c->flush, 0xff, sizeof(c->flush));
+ c->lowfreetag = 0;
+ c->msize = msize;
+
+ if((b = T(c, 4+2+6, Tversion, tag, &err)) != NULL){+ w32(&b, msize);
+ wcs(&b, "9P2000", 6);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+c9auth(C9ctx *c, C9tag *tag, C9fid afid, const char *uname, const char *aname)
+{+ uint8_t *b;
+ uint32_t ulen = safestrlen(uname), alen = safestrlen(aname);
+ C9error err;
+
+ if(ulen > C9maxstr || alen > C9maxstr){+ c->error(c, "c9auth: string too long: %ud chars", ulen > alen ? ulen : alen);
+ return C9Estr;
+ }
+ if((b = T(c, 4+2+ulen+2+alen, Tauth, tag, &err)) != NULL){+ w32(&b, afid);
+ wcs(&b, uname, ulen);
+ wcs(&b, aname, alen);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+c9flush(C9ctx *c, C9tag *tag, C9tag oldtag)
+{+ uint8_t *b;
+ C9error err;
+ int i;
+
+ for(i = 0; i < C9maxflush && c->flush[i] != (uint32_t)~0; i++);
+ if(i == C9maxflush){+ c->error(c, "c9flush: no free flush slots");
+ return C9Eflush;
+ }
+ if((b = T(c, 2, Tflush, tag, &err)) != NULL){+ w16(&b, oldtag);
+ err = c->end(c);
+ if(err == 0)
+ c->flush[i] = (uint32_t)oldtag<<16 | *tag;
+ }
+ return err;
+}
+
+C9error
+c9attach(C9ctx *c, C9tag *tag, C9fid fid, C9fid afid, const char *uname, const char *aname)
+{+ uint32_t ulen = safestrlen(uname), alen = safestrlen(aname);
+ uint8_t *b;
+ C9error err;
+
+ if(ulen > C9maxstr || alen > C9maxstr){+ c->error(c, "c9attach: string too long: %ud chars", ulen > alen ? ulen : alen);
+ return C9Estr;
+ }
+ if((b = T(c, 4+4+2+ulen+2+alen, Tattach, tag, &err)) != NULL){+ w32(&b, fid);
+ w32(&b, afid);
+ wcs(&b, uname, ulen);
+ wcs(&b, aname, alen);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+c9walk(C9ctx *c, C9tag *tag, C9fid fid, C9fid newfid, const char *path[])
+{+ uint32_t i, j, sz;
+ uint32_t len[C9maxpathel];
+ uint8_t *b;
+ C9error err;
+
+ for(sz = i = 0; i < (int)sizeof(len)/sizeof(len[0]) && path[i] != NULL; i++){+ len[i] = safestrlen(path[i]);
+ if(len[i] == 0 || len[i] > C9maxstr){+ c->error(c, "c9walk: invalid path element: %ud chars", len[i]);
+ return C9Epath;
+ }
+ sz += 2 + len[i];
+ }
+ if(path[i] != NULL){+ c->error(c, "c9walk: invalid elements !(0 <= %ud <= %ud)", i, C9maxpathel);
+ return C9Epath;
+ }
+
+ if((b = T(c, 4+4+2+sz, Twalk, tag, &err)) != NULL){+ w32(&b, fid);
+ w32(&b, newfid);
+ w16(&b, i);
+ for(j = 0; j < i; j++)
+ wcs(&b, path[j], len[j]);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+c9open(C9ctx *c, C9tag *tag, C9fid fid, C9mode mode)
+{+ uint8_t *b;
+ C9error err;
+
+ if((b = T(c, 4+1, Topen, tag, &err)) != NULL){+ w32(&b, fid);
+ w08(&b, mode);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+c9create(C9ctx *c, C9tag *tag, C9fid fid, const char *name, uint32_t perm, C9mode mode)
+{+ uint32_t nlen = strlen(name);
+ uint8_t *b;
+ C9error err;
+
+ if(nlen == 0 || nlen > C9maxstr){+ c->error(c, "c9create: invalid name: %ud chars", nlen);
+ return C9Epath;
+ }
+ if((b = T(c, 4+2+nlen+4+1, Tcreate, tag, &err)) != NULL){+ w32(&b, fid);
+ wcs(&b, name, nlen);
+ w32(&b, perm);
+ w08(&b, mode);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+c9read(C9ctx *c, C9tag *tag, C9fid fid, uint64_t offset, uint32_t count)
+{+ uint8_t *b;
+ C9error err;
+
+ if((b = T(c, 4+8+4, Tread, tag, &err)) != NULL){+ w32(&b, fid);
+ w64(&b, offset);
+ w32(&b, count);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+c9write(C9ctx *c, C9tag *tag, C9fid fid, uint64_t offset, const void *in, uint32_t count)
+{+ uint8_t *b;
+ C9error err;
+
+ if((b = T(c, 4+8+4+count, Twrite, tag, &err)) != NULL){+ w32(&b, fid);
+ w64(&b, offset);
+ w32(&b, count);
+ memmove(b, in, count);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+c9wrstr(C9ctx *c, C9tag *tag, C9fid fid, const char *s)
+{+ return c9write(c, tag, fid, 0, s, strlen(s));
+}
+
+C9error
+c9clunk(C9ctx *c, C9tag *tag, C9fid fid)
+{+ uint8_t *b;
+ C9error err;
+
+ if((b = T(c, 4, Tclunk, tag, &err)) != NULL){+ w32(&b, fid);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+c9remove(C9ctx *c, C9tag *tag, C9fid fid)
+{+ uint8_t *b;
+ C9error err;
+
+ if((b = T(c, 4, Tremove, tag, &err)) != NULL){+ w32(&b, fid);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+c9stat(C9ctx *c, C9tag *tag, C9fid fid)
+{+ uint8_t *b;
+ C9error err;
+
+ if((b = T(c, 4, Tstat, tag, &err)) != NULL){+ w32(&b, fid);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+c9wstat(C9ctx *c, C9tag *tag, C9fid fid, const C9stat *s)
+{+ uint32_t nlen = safestrlen(s->name), ulen = safestrlen(s->uid), glen = safestrlen(s->gid);
+ uint32_t unusedsz = 2+4+13, statsz = unusedsz+4+4+4+8+2+nlen+2+ulen+2+glen+2;
+ uint8_t *b;
+ C9error err;
+
+ if(nlen == 0 || nlen > C9maxstr){+ c->error(c, "c9wstat: invalid name: %ud chars", nlen);
+ return C9Epath;
+ }
+ if(ulen > C9maxstr || glen > C9maxstr){+ c->error(c, "c9wstat: string too long: %ud chars", ulen > glen ? ulen : glen);
+ return C9Estr;
+ }
+ if((b = T(c, 4+2+2+statsz, Twstat, tag, &err)) != NULL){+ w32(&b, fid);
+ w16(&b, statsz+2);
+ w16(&b, statsz);
+ memset(b, 0xff, unusedsz); /* leave type(2), dev(4) and qid(13) unchanged */
+ b += unusedsz;
+ w32(&b, s->mode);
+ w32(&b, s->atime);
+ w32(&b, s->mtime);
+ w64(&b, s->size);
+ wcs(&b, s->name, nlen);
+ wcs(&b, s->uid, ulen);
+ wcs(&b, s->gid, glen);
+ wcs(&b, NULL, 0); /* muid unchanged */
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+c9proc(C9ctx *c)
+{+ uint32_t i, sz, cnt, msize;
+ uint8_t *b;
+ int err;
+ C9r r;
+
+ err = -1;
+ if((b = c->read(c, 4, &err)) == NULL){+ if(err != 0)
+ c->error(c, "c9proc: short read");
+ return err == 0 ? 0 : C9Epkt;
+ }
+
+ sz = r32(&b);
+ if(sz < 7 || sz > c->msize){+ c->error(c, "c9proc: invalid packet size !(7 <= %ud <= %ud)", sz, c->msize);
+ return C9Epkt;
+ }
+ sz -= 4;
+ err = -1;
+ if((b = c->read(c, sz, &err)) == NULL){+ if(err != 0)
+ c->error(c, "c9proc: short read");
+ return err == 0 ? 0 : C9Epkt;
+ }
+
+ r.type = r08(&b);
+ r.tag = r16(&b);
+ if(r.type != Rversion){+ if(r.tag >= C9maxtags){+ c->error(c, "c9proc: invalid tag %ud", (uint32_t)r.tag);
+ return C9Epkt;
+ }
+ if(freetag(c, r.tag) != 0)
+ return C9Etag;
+ }
+ sz -= 3;
+ r.numqid = 0;
+
+ switch(r.type){+ case Rread:
+ if(sz < 4 || (cnt = r32(&b)) > sz-4)
+ goto error;
+ r.read.data = b;
+ r.read.size = cnt;
+ c->r(c, &r);
+ break;
+
+ case Rwrite:
+ if(sz < 4 || (cnt = r32(&b)) > c->msize)
+ goto error;
+ r.write.size = cnt;
+ c->r(c, &r);
+ break;
+
+ case Rwalk:
+ if(sz < 2 || (cnt = r16(&b))*13 > sz-2)
+ goto error;
+ if(cnt > C9maxpathel){+ c->error(c, "c9proc: Rwalk !(%ud <= %ud)", cnt, C9maxpathel);
+ return C9Epath;
+ }
+ for(i = 0; i < cnt; i++){+ r.qid[i].type = r08(&b);
+ r.qid[i].version = r32(&b);
+ r.qid[i].path = r64(&b);
+ }
+ r.numqid = cnt;
+ c->r(c, &r);
+ break;
+
+ case Rstat:
+ b += 2; sz -= 2;
+ if((err = c9parsedir(c, &r.stat, &b, &sz)) != 0)
+ return err;
+ r.numqid = 1;
+ c->r(c, &r);
+ break;
+
+ case Rflush:
+ for(i = 0; i < C9maxflush; i++){+ if((c->flush[i] & 0xffff) == r.tag){+ freetag(c, c->flush[i]>>16);
+ c->flush[i] = 0xffffffff;
+ break;
+ }
+ }
+ /* fallthrough */
+ case Rclunk:
+ case Rremove:
+ case Rwstat:
+ c->r(c, &r);
+ break;
+
+ case Ropen:
+ case Rcreate:
+ if(sz < 17)
+ goto error;
+ r.qid[0].type = r08(&b);
+ r.qid[0].version = r32(&b);
+ r.qid[0].path = r64(&b);
+ r.iounit = r32(&b);
+ r.numqid = 1;
+ c->r(c, &r);
+ break;
+
+ case Rerror:
+ if(sz < 2 || (cnt = r16(&b)) > sz-2)
+ goto error;
+ r.error = memmove(b-1, b, cnt);
+ r.error[cnt] = 0;
+ c->r(c, &r);
+ break;
+
+ case Rauth:
+ case Rattach:
+ if(sz < 13)
+ goto error;
+ r.qid[0].type = r08(&b);
+ r.qid[0].version = r32(&b);
+ r.qid[0].path = r64(&b);
+ r.numqid = 1;
+ c->r(c, &r);
+ break;
+
+ case Rversion:
+ if(sz < 4+2 || (msize = r32(&b)) < C9minmsize || (cnt = r16(&b)) > sz-4-2)
+ goto error;
+ if(cnt < 6 || memcmp(b, "9P2000", 6) != 0){+ c->error(c, "invalid version");
+ return C9Ever;
+ }
+ if(msize < c->msize)
+ c->msize = msize;
+ c->r(c, &r);
+ break;
+
+ default:
+ goto error;
+ }
+ return 0;
+error:
+ c->error(c, "c9proc: invalid packet type %ud", r.type);
+ return C9Epkt;
+}
+
+#endif /* C9_NO_CLIENT */
+
+C9error
+c9parsedir(C9ctx *c, C9stat *stat, uint8_t **t, uint32_t *size)
+{+ uint8_t *b;
+ uint32_t cnt, sz;
+
+ sz = 0;
+ if(*size < 49 || (sz = r16(t)) < 47 || *size < 2+sz)
+ goto error;
+ *size -= 2+sz;
+ *t += 6; /* skip type(2) and dev(4) */
+ stat->qid.type = r08(t);
+ stat->qid.version = r32(t);
+ stat->qid.path = r64(t);
+ stat->mode = r32(t);
+ stat->atime = r32(t);
+ stat->mtime = r32(t);
+ stat->size = r64(t);
+ sz -= 39;
+ if((cnt = r16(t)) > sz-2)
+ goto error;
+ stat->name = (char*)*t; b = *t = *t+cnt; sz -= 2+cnt;
+ if(sz < 2 || (cnt = r16(t)) > sz-2)
+ goto error;
+ stat->uid = (char*)*t; *b = 0; b = *t = *t+cnt; sz -= 2+cnt;
+ if(sz < 2 || (cnt = r16(t)) > sz-2)
+ goto error;
+ stat->gid = (char*)*t; *b = 0; b = *t = *t+cnt; sz -= 2+cnt;
+ if(sz < 2 || (cnt = r16(t)) > sz-2)
+ goto error;
+ stat->muid = memmove(*t-1, *t, cnt); *b = stat->muid[cnt] = 0; *t = *t+cnt; sz -= 2+cnt;
+ *t += sz;
+ return 0;
+error:
+ c->error(c, "c9parsedir: invalid size: size=%ud sz=%ud", *size, sz);
+ return C9Epkt;
+}
+
+#ifndef C9_NO_SERVER
+
+static uint8_t *
+R(C9ctx *c, uint32_t size, C9rtype type, C9tag tag, C9error *err)
+{+ uint8_t *p = NULL;
+
+ if(size > c->msize-4-1-2){+ c->error(c, "R: invalid size %ud", size);
+ *err = C9Esize;
+ }else{+ size += 4+1+2;
+ if((p = c->begin(c, size)) == NULL){+ c->error(c, "R: no buffer for %ud bytes", size);
+ *err = C9Ebuf;
+ }else{+ *err = 0;
+ w32(&p, size);
+ w08(&p, type);
+ w16(&p, tag);
+ }
+ }
+ return p;
+}
+
+C9error
+s9version(C9ctx *c)
+{+ uint8_t *b;
+ C9error err;
+
+ if((b = R(c, 4+2+6, Rversion, 0xffff, &err)) != NULL){+ w32(&b, c->msize);
+ wcs(&b, "9P2000", 6);
+ err = c->end(c);
+ };
+ return err;
+}
+
+C9error
+s9auth(C9ctx *c, C9tag tag, const C9qid *aqid)
+{+ uint8_t *b;
+ C9error err;
+
+ if((b = R(c, 13, Rauth, tag, &err)) != NULL){+ w08(&b, aqid->type);
+ w32(&b, aqid->version);
+ w64(&b, aqid->path);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+s9error(C9ctx *c, C9tag tag, const char *ename)
+{+ uint32_t len = safestrlen(ename);
+ uint8_t *b;
+ C9error err;
+
+ if(len > C9maxstr){+ c->error(c, "s9error: invalid ename: %ud chars", len);
+ return C9Estr;
+ }
+ if((b = R(c, 2+len, Rerror, tag, &err)) != NULL){+ wcs(&b, ename, len);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+s9attach(C9ctx *c, C9tag tag, const C9qid *qid)
+{+ uint8_t *b;
+ C9error err;
+
+ if((b = R(c, 13, Rattach, tag, &err)) != NULL){+ w08(&b, qid->type);
+ w32(&b, qid->version);
+ w64(&b, qid->path);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+s9flush(C9ctx *c, C9tag tag)
+{+ C9error err;
+
+ if(R(c, 0, Rflush, tag, &err) != NULL)
+ err = c->end(c);
+ return err;
+}
+
+C9error
+s9walk(C9ctx *c, C9tag tag, C9qid *qids[])
+{+ uint32_t i, n;
+ uint8_t *b;
+ C9error err;
+
+ for(n = 0; n < C9maxpathel && qids[n] != NULL; n++);
+ if(n > C9maxpathel){+ c->error(c, "s9walk: invalid elements !(0 <= %ud <= %ud)", n, C9maxpathel);
+ return C9Epath;
+ }
+
+ if((b = R(c, 2+n*13, Rwalk, tag, &err)) != NULL){+ w16(&b, n);
+ for(i = 0; i < n; i++){+ w08(&b, qids[i]->type);
+ w32(&b, qids[i]->version);
+ w64(&b, qids[i]->path);
+ }
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+s9open(C9ctx *c, C9tag tag, const C9qid *qid, uint32_t iounit)
+{+ uint8_t *b;
+ C9error err;
+
+ if((b = R(c, 13+4, Ropen, tag, &err)) != NULL){+ w08(&b, qid->type);
+ w32(&b, qid->version);
+ w64(&b, qid->path);
+ w32(&b, iounit);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+s9create(C9ctx *c, C9tag tag, const C9qid *qid, uint32_t iounit)
+{+ uint8_t *b;
+ C9error err;
+
+ if((b = R(c, 13+4, Rcreate, tag, &err)) != NULL){+ w08(&b, qid->type);
+ w32(&b, qid->version);
+ w64(&b, qid->path);
+ w32(&b, iounit);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+s9read(C9ctx *c, C9tag tag, const void *data, uint32_t size)
+{+ uint8_t *b;
+ C9error err;
+
+ if((b = R(c, 4+size, Rread, tag, &err)) != NULL){+ w32(&b, size);
+ memmove(b, data, size);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+s9write(C9ctx *c, C9tag tag, uint32_t size)
+{+ uint8_t *b;
+ C9error err;
+
+ if((b = R(c, 4, Rwrite, tag, &err)) != NULL){+ w32(&b, size);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+s9readdir(C9ctx *c, C9tag tag, C9stat *st[], int *num, uint64_t *offset, uint32_t size)
+{+ uint8_t *b;
+ const C9stat *s;
+ uint32_t nlen, ulen, glen, mulen, m, n;
+ C9error err;
+ int i;
+
+ if(size > c->msize-4-1-2)
+ size = c->msize-4-1-2;
+
+ m = 0;
+ for(i = 0; i < *num; i++){+ s = st[i];
+ nlen = safestrlen(s->name);
+ ulen = safestrlen(s->uid);
+ glen = safestrlen(s->gid);
+ mulen = safestrlen(s->muid);
+
+ if(nlen == 0 || nlen > C9maxstr){+ c->error(c, "s9readdir: invalid name: %ud chars", nlen);
+ return C9Epath;
+ }
+ if(ulen > C9maxstr || glen > C9maxstr || mulen > C9maxstr){+ ulen = ulen > glen ? ulen : glen;
+ ulen = ulen > mulen ? ulen : mulen;
+ c->error(c, "s9readdir: string too long: %ud chars", ulen);
+ return C9Estr;
+ }
+
+ n = 2 + 2+4+13+4+4+4+8+2+nlen+2+ulen+2+glen+2+mulen;
+ if(4+m+n > size)
+ break;
+ m += n;
+ }
+
+ if((b = R(c, 4+m, Rread, tag, &err)) != NULL){+ *num = i;
+ w32(&b, m);
+ for(i = 0; i < *num; i++){+ s = st[i];
+ nlen = safestrlen(s->name);
+ ulen = safestrlen(s->uid);
+ glen = safestrlen(s->gid);
+ mulen = safestrlen(s->muid);
+ w16(&b, 2+4+13+4+4+4+8+2+nlen+2+ulen+2+glen+2+mulen);
+ w16(&b, 0xffff); /* type */
+ w32(&b, 0xffffffff); /* dev */
+ w08(&b, s->qid.type);
+ w32(&b, s->qid.version);
+ w64(&b, s->qid.path);
+ w32(&b, s->mode);
+ w32(&b, s->atime);
+ w32(&b, s->mtime);
+ w64(&b, s->size);
+ wcs(&b, s->name, nlen);
+ wcs(&b, s->uid, ulen);
+ wcs(&b, s->gid, glen);
+ wcs(&b, s->muid, mulen);
+ }
+ err = c->end(c);
+ if(err == 0)
+ *offset += m;
+ }
+ return err;
+}
+
+C9error
+s9clunk(C9ctx *c, C9tag tag)
+{+ C9error err;
+
+ if(R(c, 0, Rclunk, tag, &err) != NULL)
+ err = c->end(c);
+ return err;
+}
+
+C9error
+s9remove(C9ctx *c, C9tag tag)
+{+ C9error err;
+
+ if(R(c, 0, Rremove, tag, &err) != NULL)
+ err = c->end(c);
+ return err;
+}
+
+C9error
+s9stat(C9ctx *c, C9tag tag, const C9stat *s)
+{+ uint32_t nlen = safestrlen(s->name), ulen = safestrlen(s->uid);
+ uint32_t glen = safestrlen(s->gid), mulen = safestrlen(s->name);
+ uint32_t statsz = 2+4+13+4+4+4+8+2+nlen+2+ulen+2+glen+2+mulen;
+ uint8_t *b;
+ C9error err;
+
+ if(nlen == 0 || nlen > C9maxstr){+ c->error(c, "s9stat: invalid name: %ud chars", nlen);
+ return C9Epath;
+ }
+ if(ulen > C9maxstr || glen > C9maxstr || mulen > C9maxstr){+ ulen = ulen > glen ? ulen : glen;
+ ulen = ulen > mulen ? ulen : mulen;
+ c->error(c, "s9stat: string too long: %ud chars", ulen);
+ return C9Estr;
+ }
+
+ if((b = R(c, 2+2+statsz, Rstat, tag, &err)) != NULL){+ w16(&b, statsz+2);
+ w16(&b, statsz);
+ w16(&b, 0xffff); /* type */
+ w32(&b, 0xffffffff); /* dev */
+ w08(&b, s->qid.type);
+ w32(&b, s->qid.version);
+ w64(&b, s->qid.path);
+ w32(&b, s->mode);
+ w32(&b, s->atime);
+ w32(&b, s->mtime);
+ w64(&b, s->size);
+ wcs(&b, s->name, nlen);
+ wcs(&b, s->uid, ulen);
+ wcs(&b, s->gid, glen);
+ wcs(&b, s->muid, mulen);
+ err = c->end(c);
+ }
+ return err;
+}
+
+C9error
+s9wstat(C9ctx *c, C9tag tag)
+{+ C9error err;
+
+ if(R(c, 0, Rwstat, tag, &err) != NULL)
+ err = c->end(c);
+ return err;
+}
+
+C9error
+s9proc(C9ctx *c)
+{+ uint32_t i, sz, cnt, n, msize;
+ int readerr;
+ uint8_t *b;
+ C9error err;
+ C9t t;
+
+ readerr = -1;
+ if((b = c->read(c, 4, &readerr)) == NULL){+ if(readerr != 0)
+ c->error(c, "s9proc: short read");
+ return readerr == 0 ? 0 : C9Epkt;
+ }
+
+ sz = r32(&b);
+ if(sz < 7 || sz > c->msize){+ c->error(c, "s9proc: invalid packet size !(7 <= %ud <= %ud)", sz, c->msize);
+ return C9Epkt;
+ }
+ sz -= 4;
+ readerr = -1;
+ if((b = c->read(c, sz, &readerr)) == NULL){+ if(readerr != 0)
+ c->error(c, "s9proc: short read");
+ return readerr == 0 ? 0 : C9Epkt;
+ }
+
+ t.type = r08(&b);
+ t.tag = r16(&b);
+ sz -= 3;
+
+ if((c->svflags & Svver) == 0 && t.type != Tversion){+ c->error(c, "s9proc: expected Tversion, got %ud", t.type);
+ return C9Epkt;
+ }
+
+ switch(t.type){+ case Tread:
+ if(sz < 4+8+4)
+ goto error;
+ t.fid = r32(&b);
+ t.read.offset = r64(&b);
+ t.read.size = r32(&b);
+ if(t.read.size > maxread(c))
+ t.read.size = maxread(c);
+ c->t(c, &t);
+ break;
+
+ case Twrite:
+ if(sz < 4+8+4)
+ goto error;
+ t.fid = r32(&b);
+ t.write.offset = r64(&b);
+ if((t.write.size = r32(&b)) < sz-4-8-4)
+ goto error;
+ if(t.write.size > maxwrite(c))
+ t.write.size = maxwrite(c);
+ t.write.data = b;
+ c->t(c, &t);
+ break;
+
+ case Tclunk:
+ case Tstat:
+ case Tremove:
+ if(sz < 4)
+ goto error;
+ t.fid = r32(&b);
+ c->t(c, &t);
+ break;
+
+ case Twalk:
+ if(sz < 4+4+2)
+ goto error;
+ t.fid = r32(&b);
+ t.walk.newfid = r32(&b);
+ if((n = r16(&b)) > 16){+ c->error(c, "s9proc: Twalk !(%ud <= 16)", n);
+ return C9Epath;
+ }
+ sz -= 4+4+2;
+ if(n > 0){+ for(i = 0; i < n; i++){+ if(sz < 2 || (cnt = r16(&b)) > sz-2)
+ goto error;
+ if(cnt < 1){+ c->error(c, "s9proc: Twalk invalid element [%ud]", i);
+ return C9Epath;
+ }
+ b[-2] = 0;
+ t.walk.wname[i] = (char*)b;
+ b += cnt;
+ sz -= 2 + cnt;
+ }
+ memmove(t.walk.wname[i-1]-1, t.walk.wname[i-1], (char*)b - t.walk.wname[i-1]);
+ t.walk.wname[i-1]--;
+ b[-1] = 0;
+ }else
+ i = 0;
+ t.walk.wname[i] = NULL;
+ c->t(c, &t);
+ break;
+
+ case Topen:
+ if(sz < 4+1)
+ goto error;
+ t.fid = r32(&b);
+ t.open.mode = r08(&b);
+ c->t(c, &t);
+ break;
+
+ case Twstat:
+ if(sz < 4+2)
+ goto error;
+ t.fid = r32(&b);
+ if((cnt = r16(&b)) > sz-4)
+ goto error;
+ if((err = c9parsedir(c, &t.wstat, &b, &cnt)) != 0){+ c->error(c, "s9proc");
+ return err;
+ }
+ c->t(c, &t);
+ break;
+
+ case Tcreate:
+ if(sz < 4+2+4+1)
+ goto error;
+ t.fid = r32(&b);
+ if((cnt = r16(&b)) < 1 || cnt > sz-4-2-4-1)
+ goto error;
+ t.create.name = (char*)b;
+ b += cnt;
+ t.create.perm = r32(&b);
+ t.create.mode = r08(&b);
+ t.create.name[cnt] = 0;
+ c->t(c, &t);
+ break;
+
+ case Tflush:
+ if(sz < 2)
+ goto error;
+ t.flush.oldtag = r16(&b);
+ c->t(c, &t);
+ break;
+
+ case Tversion:
+ if(sz < 4+2 || (msize = r32(&b)) < C9minmsize || (cnt = r16(&b)) > sz-4-2)
+ goto error;
+ if(cnt < 6 || memcmp(b, "9P2000", 6) != 0){+ if((b = R(c, 4+2+7, Rversion, 0xffff, &err)) != NULL){+ w32(&b, 0);
+ wcs(&b, "unknown", 7);
+ err = c->end(c);
+ c->error(c, "s9proc: invalid version");
+ }
+ return C9Ever;
+ }
+ if(msize < c->msize)
+ c->msize = msize;
+ c->svflags |= Svver;
+ c->t(c, &t);
+ break;
+
+ case Tattach:
+ if(sz < 4+4+2+2)
+ goto error;
+ t.fid = r32(&b);
+ t.attach.afid = r32(&b);
+ cnt = r16(&b);
+ sz -= 4+4+2;
+ if(cnt+2 > sz)
+ goto error;
+ t.attach.uname = (char*)b;
+ b += cnt;
+ cnt = r16(&b);
+ b[-2] = 0;
+ sz -= cnt+2;
+ if(cnt > sz)
+ goto error;
+ memmove(b-1, b, cnt);
+ t.attach.aname = (char*)b-1;
+ t.attach.aname[cnt] = 0;
+ c->t(c, &t);
+ break;
+
+ case Tauth:
+ if(sz < 4+2+2)
+ goto error;
+ t.auth.afid = r32(&b);
+ cnt = r16(&b);
+ sz -= 4+2;
+ if(cnt+2 > sz)
+ goto error;
+ t.auth.uname = (char*)b;
+ b += cnt;
+ cnt = r16(&b);
+ b[-2] = 0;
+ sz -= cnt+2;
+ if(cnt > sz)
+ goto error;
+ memmove(b-1, b, cnt);
+ t.auth.aname = (char*)b-1;
+ t.auth.aname[cnt] = 0;
+ c->t(c, &t);
+ break;
+
+ default:
+ goto error;
+ }
+ return 0;
+error:
+ c->error(c, "s9proc: invalid packet (type=%ud)", t.type);
+ return C9Epkt;
+}
+
+#endif /* C9_NO_SERVER */
--- a/pull_subtree.sh
+++ /dev/null
@@ -1,2 +1,0 @@
-#!/bin/sh
-git subtree pull --prefix c9 git@git.sr.ht:~ft/c9 master --squash