diff options
| author | Charles.Forsyth <devnull@localhost> | 2008-01-09 22:46:18 +0000 |
|---|---|---|
| committer | Charles.Forsyth <devnull@localhost> | 2008-01-09 22:46:18 +0000 |
| commit | 85620a8011570830a70e5c3b9394ea740655da33 (patch) | |
| tree | c6edcbe7a66c062c7ba888a08f16f6ce2724fbe5 | |
| parent | 38b761e890b1497089b6d623ae8bee952d1b8cc0 (diff) | |
20080109
| -rw-r--r-- | appl/acme/ecmd.b | 4 | ||||
| -rw-r--r-- | appl/cmd/cddb.b | 1 | ||||
| -rw-r--r-- | dis/acme/ecmd.dis | bin | 15427 -> 15443 bytes | |||
| -rw-r--r-- | dis/cddb.dis | bin | 4483 -> 4483 bytes | |||
| -rw-r--r-- | emu/port/sysfile.c | 2 | ||||
| -rw-r--r-- | include/version.h | 2 | ||||
| -rw-r--r-- | man/2/wait | 4 | ||||
| -rw-r--r-- | os/port/sysfile.c | 2 |
8 files changed, 9 insertions, 6 deletions
diff --git a/appl/acme/ecmd.b b/appl/acme/ecmd.b index b85b5bb1..c31643f1 100644 --- a/appl/acme/ecmd.b +++ b/appl/acme/ecmd.b @@ -448,8 +448,10 @@ move(f: ref File, addr2: Address) }else if(addr.r.q0 >= addr2.r.q1){ copy(f, addr2); elogdelete(f, addr.r.q0, addr.r.q1); + }else if(addr.r.q0==addr2.r.q0 && addr.r.q1==addr2.r.q1){ + ; # move to self; no-op }else - error("move overlaps itself"); + editerror("move overlaps itself"); } m_cmd(t: ref Text, cp: ref Cmd): int diff --git a/appl/cmd/cddb.b b/appl/cmd/cddb.b index 6265ba24..5d88725b 100644 --- a/appl/cmd/cddb.b +++ b/appl/cmd/cddb.b @@ -112,6 +112,7 @@ cddbfilltoc(t: ref Toc): int return died(p); categ = hd tl fl; id = hd tl tl fl; + 210 or # exact matches 211 => # close matches if((p = getline(bin)) == nil) return died(nil); diff --git a/dis/acme/ecmd.dis b/dis/acme/ecmd.dis Binary files differindex ceeef6ea..1285f17f 100644 --- a/dis/acme/ecmd.dis +++ b/dis/acme/ecmd.dis diff --git a/dis/cddb.dis b/dis/cddb.dis Binary files differindex 7227eebb..91cb1085 100644 --- a/dis/cddb.dis +++ b/dis/cddb.dis diff --git a/emu/port/sysfile.c b/emu/port/sysfile.c index db7a06eb..8159ae2d 100644 --- a/emu/port/sysfile.c +++ b/emu/port/sysfile.c @@ -1077,7 +1077,7 @@ kiounit(int fd) Chan *c; int n; - c = fdtochan(up->env->fgrp, fd, ORDWR, 0, 1); + c = fdtochan(up->env->fgrp, fd, -1, 0, 1); if(waserror()){ cclose(c); return 0; /* n.b. */ diff --git a/include/version.h b/include/version.h index a82ea214..60a285ba 100644 --- a/include/version.h +++ b/include/version.h @@ -1 +1 @@ -#define VERSION "Fourth Edition (20071227)" +#define VERSION "Fourth Edition (20080109)" @@ -64,12 +64,12 @@ file open on it allows, for instance, a process to use .B alt -to exchange data with a process but also watch for to exit (for good or ill). +to exchange data with a process but also see it exit (for good or ill). It starts a monitor process that applies .B read to .I fd -and send the resulting tuple on a channel. +and sends each resulting tuple on a channel. It returns a tuple .BI ( pid\f5,\fP\ c ) where diff --git a/os/port/sysfile.c b/os/port/sysfile.c index 1ff0fe5f..702470b6 100644 --- a/os/port/sysfile.c +++ b/os/port/sysfile.c @@ -1113,7 +1113,7 @@ kiounit(int fd) Chan *c; int n; - c = fdtochan(up->env->fgrp, fd, ORDWR, 0, 1); + c = fdtochan(up->env->fgrp, fd, -1, 0, 1); if(waserror()){ cclose(c); return 0; /* n.b. */ |