summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--[-rwxr-xr-x]rc/bin/inst/tzsetup0
-rw-r--r--[-rwxr-xr-x]rc/bin/nietzsche0
-rw-r--r--[-rwxr-xr-x]rc/bin/nusbrc0
-rw-r--r--[-rwxr-xr-x]sys/doc/cleanps0
-rw-r--r--[-rwxr-xr-x]sys/doc/mkdirlist0
-rw-r--r--[-rwxr-xr-x]sys/doc/mkfilelist0
-rw-r--r--[-rwxr-xr-x]sys/doc/prfile0
-rw-r--r--sys/src/cmd/abaco/urls.c15
-rw-r--r--sys/src/cmd/file.c2
9 files changed, 9 insertions, 8 deletions
diff --git a/rc/bin/inst/tzsetup b/rc/bin/inst/tzsetup
index 92c06a45c..92c06a45c 100755..100644
--- a/rc/bin/inst/tzsetup
+++ b/rc/bin/inst/tzsetup
diff --git a/rc/bin/nietzsche b/rc/bin/nietzsche
index caced3c70..caced3c70 100755..100644
--- a/rc/bin/nietzsche
+++ b/rc/bin/nietzsche
diff --git a/rc/bin/nusbrc b/rc/bin/nusbrc
index a9efcf8a6..a9efcf8a6 100755..100644
--- a/rc/bin/nusbrc
+++ b/rc/bin/nusbrc
diff --git a/sys/doc/cleanps b/sys/doc/cleanps
index 67f87b655..67f87b655 100755..100644
--- a/sys/doc/cleanps
+++ b/sys/doc/cleanps
diff --git a/sys/doc/mkdirlist b/sys/doc/mkdirlist
index dfd7a21c3..dfd7a21c3 100755..100644
--- a/sys/doc/mkdirlist
+++ b/sys/doc/mkdirlist
diff --git a/sys/doc/mkfilelist b/sys/doc/mkfilelist
index 3c8a11128..3c8a11128 100755..100644
--- a/sys/doc/mkfilelist
+++ b/sys/doc/mkfilelist
diff --git a/sys/doc/prfile b/sys/doc/prfile
index 04fd23b2a..04fd23b2a 100755..100644
--- a/sys/doc/prfile
+++ b/sys/doc/prfile
diff --git a/sys/src/cmd/abaco/urls.c b/sys/src/cmd/abaco/urls.c
index 9386cb164..7a58a81f0 100644
--- a/sys/src/cmd/abaco/urls.c
+++ b/sys/src/cmd/abaco/urls.c
@@ -59,16 +59,15 @@ getattr(int conn, char *s)
char buf[BUFSIZE];
int fd, n;
+ n = 0;
snprint(buf, sizeof(buf), "%s/%d/%s", webmountpt, conn, s);
fd = open(buf, OREAD);
- if(fd < 0)
- error("can't open attr file");
-
- n = read(fd, buf, sizeof(buf)-1);
- if(n < 0)
- error("can't read");
-
- close(fd);
+ if(fd >= 0){
+ n = read(fd, buf, sizeof(buf)-1);
+ if(n < 0)
+ n = 0;
+ close(fd);
+ }
buf[n] = '\0';
return (Runestr){runesmprint("%s", buf), n};
}
diff --git a/sys/src/cmd/file.c b/sys/src/cmd/file.c
index 5d1547840..17a1d4859 100644
--- a/sys/src/cmd/file.c
+++ b/sys/src/cmd/file.c
@@ -834,6 +834,8 @@ struct FILE_STRING
"subject=/C=", "pem certificate with header", -1, "text/plain",
"process snapshot ", "process snapshot", -1, "application/snapfs",
"d8:announce", "torrent file", 11, "application/x-bittorrent",
+ "[playlist]", "playlist", 10, "application/x-scpls",
+ "#EXTM3U", "playlist", 7, "audio/x-mpegurl",
0,0,0,0
};