diff options
| author | Russ Cox <russcox@gmail.com> | 2009-09-25 01:43:54 -0400 |
|---|---|---|
| committer | Russ Cox <russcox@gmail.com> | 2009-09-25 01:43:54 -0400 |
| commit | daea2c7d501c3e825bede80992ade6b241efdce1 (patch) | |
| tree | 7b222116d5eb48265654660917dbd0b5be630fcc /src/cmd/acme/exec.c | |
| parent | 1961ee822320bdc107e55f10b2db1bfe8f70d382 (diff) | |
| download | plan9port-daea2c7d501c3e825bede80992ade6b241efdce1.tar.gz plan9port-daea2c7d501c3e825bede80992ade6b241efdce1.tar.bz2 plan9port-daea2c7d501c3e825bede80992ade6b241efdce1.zip | |
acme: correct modified message after initial load; more detail in
message
http://codereview.appspot.com/123051
Diffstat (limited to 'src/cmd/acme/exec.c')
| -rw-r--r-- | src/cmd/acme/exec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cmd/acme/exec.c b/src/cmd/acme/exec.c index 86c21d64..d24775df 100644 --- a/src/cmd/acme/exec.c +++ b/src/cmd/acme/exec.c @@ -644,14 +644,14 @@ putfile(File *f, int q0, int q1, Rune *namer, int nname) d = dirstat(name); if(d!=nil && runeeq(namer, nname, f->name, f->nname)){ /* f->mtime+1 because when talking over NFS it's often off by a second */ - if(f->dev!=d->dev || f->qidpath!=d->qid.path || f->mtime+1<d->mtime){ - f->dev = d->dev; - f->qidpath = d->qid.path; - f->mtime = d->mtime; + if(f->dev!=d->dev || f->qidpath!=d->qid.path || abs(f->mtime-d->mtime) > 1){ if(f->unread) warning(nil, "%s not written; file already exists\n", name); else - warning(nil, "%s modified%s%s since last read\n", name, d->muid[0]?" by ":"", d->muid); + warning(nil, "%s modified%s%s since last read\n\twas %t; now %t\n", name, d->muid[0]?" by ":"", d->muid, f->mtime, d->mtime); + f->dev = d->dev; + f->qidpath = d->qid.path; + f->mtime = d->mtime; goto Rescue1; } } |