diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2020-02-02 20:33:40 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2020-02-02 20:33:40 +0100 |
| commit | 04c4a9ca8b06e34a203f7ddacc2263cf2077e1aa (patch) | |
| tree | 30bac3b603775580da7d296925c6170d3e765cc4 /sys/src | |
| parent | be8cbcc8524cee8328bce97200f5d7e22abbb3da (diff) | |
| parent | 8ce18a6338b52a419841237e8f9b42847bdacba6 (diff) | |
merge
Diffstat (limited to 'sys/src')
| -rw-r--r-- | sys/src/cmd/acme/acme.c | 1 | ||||
| -rw-r--r-- | sys/src/cmd/walk.c | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/src/cmd/acme/acme.c b/sys/src/cmd/acme/acme.c index d5addedbd..608a28f71 100644 --- a/sys/src/cmd/acme/acme.c +++ b/sys/src/cmd/acme/acme.c @@ -316,7 +316,6 @@ acmeerrorproc(void *) buf[n] = '\0'; s = estrdup(buf); sendp(cerr, s); - free(s); } free(buf); } diff --git a/sys/src/cmd/walk.c b/sys/src/cmd/walk.c index 856cedc5f..cd83acca7 100644 --- a/sys/src/cmd/walk.c +++ b/sys/src/cmd/walk.c @@ -71,6 +71,10 @@ dofile(char *path, Dir *f, int pathonly) case 'q': Bprint(bout, "%ullx.%uld.%.2uhhx", f->qid.path, f->qid.vers, f->qid.type); break; case 's': Bprint(bout, "%lld", f->length); break; case 'x': Bprint(bout, "%ulo", f->mode); break; + + /* These two are slightly different, as they tell us about the fileserver instead of the file */ + case 'D': Bprint(bout, "%ud", f->dev); break; + case 'T': Bprint(bout, "%C", f->type); break; default: abort(); } @@ -238,9 +242,9 @@ main(int argc, char **argv) if((stfmt = s_reset(stfmt)) == nil) sysfatal("s_reset: %r"); s_append(stfmt, EARGF(usage())); - i = strspn(s_to_c(stfmt), "UGMamnpqsx"); + i = strspn(s_to_c(stfmt), "UGMamnpqsxDT"); if(i != s_len(stfmt)) - sysfatal("bad stfmt: %s\n", s_to_c(stfmt)); + sysfatal("bad stfmt: %s", s_to_c(stfmt)); break; default: usage(); |