diff options
| author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2017-10-16 16:22:44 +0200 |
|---|---|---|
| committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2017-10-16 16:22:44 +0200 |
| commit | 785d7b84cb48fbf6bd033a5fda7f58762fb2e284 (patch) | |
| tree | c2fcb789d0fbfe75e091b7cf53d793b0f27244db /src/cmd/acme/text.c | |
| parent | f19ec3797d11ebb3491c5b2b009ebca49b73f962 (diff) | |
| parent | 7e6c008b73156b24ed7b59f6f076b4cda914ec86 (diff) | |
| download | plan9port-785d7b84cb48fbf6bd033a5fda7f58762fb2e284.tar.gz plan9port-785d7b84cb48fbf6bd033a5fda7f58762fb2e284.tar.bz2 plan9port-785d7b84cb48fbf6bd033a5fda7f58762fb2e284.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cmd/acme/text.c')
| -rw-r--r-- | src/cmd/acme/text.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/cmd/acme/text.c b/src/cmd/acme/text.c index e82a3a30..61bc12d9 100644 --- a/src/cmd/acme/text.c +++ b/src/cmd/acme/text.c @@ -8,6 +8,7 @@ #include <frame.h> #include <fcall.h> #include <plumb.h> +#include <libsec.h> #include <complete.h> #include "dat.h" #include "fns.h" @@ -198,6 +199,7 @@ textload(Text *t, uint q0, char *file, int setqid) Dir *d, *dbuf; char *tmp; Text *u; + DigestState *h; if(t->ncache!=0 || t->file->b.nc || t->w==nil || t!=&t->w->body) error("text.load"); @@ -220,6 +222,7 @@ textload(Text *t, uint q0, char *file, int setqid) goto Rescue; } nulls = FALSE; + h = nil; if(d->qid.type & QTDIR){ /* this is checked in get() but it's possible the file changed underfoot */ if(t->file->ntext > 1){ @@ -264,9 +267,17 @@ textload(Text *t, uint q0, char *file, int setqid) }else{ t->w->isdir = FALSE; t->w->filemenu = TRUE; - q1 = q0 + fileload(t->file, q0, fd, &nulls); + if(q0 == 0) + h = sha1(nil, 0, nil, nil); + q1 = q0 + fileload(t->file, q0, fd, &nulls, h); } if(setqid){ + if(h != nil) { + sha1(nil, 0, t->file->sha1, h); + h = nil; + } else { + memset(t->file->sha1, 0, sizeof t->file->sha1); + } t->file->dev = d->dev; t->file->mtime = d->mtime; t->file->qidpath = d->qid.path; |