diff options
| author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
|---|---|---|
| committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
| commit | 02d7aa8915f9c3a3288dab01f321eb94ba219e3b (patch) | |
| tree | f053238978479e408a2b83571443e132f30586ab /src/cmd/9660/cdrdwr.c | |
| parent | c0c9d8f883dfd3a7f5a74499d91bb95884b15873 (diff) | |
| parent | 3d1382b98a502d0c34d5ba2c462396acc515016e (diff) | |
| download | plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.gz plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.bz2 plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cmd/9660/cdrdwr.c')
| -rw-r--r-- | src/cmd/9660/cdrdwr.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/cmd/9660/cdrdwr.c b/src/cmd/9660/cdrdwr.c index 757bfcd9..786b798f 100644 --- a/src/cmd/9660/cdrdwr.c +++ b/src/cmd/9660/cdrdwr.c @@ -125,7 +125,7 @@ opencd(char *file, Cdinfo info) } /* lowercase because of isostring */ - if(strstr(cd->iso.systemid, "iso9660") == nil + if(strstr(cd->iso.systemid, "iso9660") == nil && strstr(cd->iso.systemid, "utf8") == nil) { werrstr("unknown systemid %s", cd->iso.systemid); free(cd); @@ -133,7 +133,7 @@ opencd(char *file, Cdinfo info) close(xfd); return nil; } - + if(strstr(cd->iso.systemid, "plan 9")) cd->flags |= CDplan9; if(strstr(cd->iso.systemid, "iso9660")) @@ -307,7 +307,7 @@ parsedesc(Voldesc *v, Cvoldesc *cv, char *(*string)(uchar*, int)) v->biblio = string(cv->biblio, sizeof cv->biblio); v->notice = string(cv->notice, sizeof cv->notice); } - + static int readisodesc(Cdimg *cd, Voldesc *v) { @@ -629,4 +629,3 @@ Clinelen(Cdimg *cd) { return Blinelen(&cd->brd); } - |