Placate the Sun monster.
diff --git a/src/cmd/9660/dump9660.c b/src/cmd/9660/dump9660.c
index 320e56d..95bba37 100644
--- a/src/cmd/9660/dump9660.c
+++ b/src/cmd/9660/dump9660.c
@@ -201,7 +201,7 @@
checknames(&iroot, isbadiso9660);
convertnames(&iroot, struprcpy);
} else
- convertnames(&iroot, (void *) strcpy);
+ convertnames(&iroot, (char* (*)(char*, char*))strcpy);
// isoabstract = findconform(&iroot, abstract);
// isobiblio = findconform(&iroot, biblio);
@@ -215,7 +215,7 @@
// jnotice = findconform(&jroot, notice);
checknames(&jroot, isbadjoliet);
- convertnames(&jroot, (void *) strcpy);
+ convertnames(&jroot, (char* (*)(char*, char*))strcpy);
dsort(&jroot, jolietcmp);
}
@@ -301,14 +301,14 @@
* Write dump tree at end. We assume the name characters
* are all conforming, so everything is already sorted properly.
*/
- convertnames(&idumproot, (info.flags & CDconform) ? (void *) struprcpy : (void *) strcpy);
+ convertnames(&idumproot, (info.flags & CDconform) ? struprcpy : (char* (*)(char*, char*)) strcpy);
if(cd->nulldump) {
r = walkdirec(&idumproot, dumpname);
assert(r != nil);
copybutname(r, &iroot);
}
if(cd->flags & CDjoliet) {
- convertnames(&jdumproot, (void *) strcpy);
+ convertnames(&jdumproot, (char* (*)(char*, char*))strcpy);
if(cd->nulldump) {
r = walkdirec(&jdumproot, dumpname);
assert(r != nil);
diff --git a/src/cmd/9660/unix.c b/src/cmd/9660/unix.c
index 99332af..f060c10 100644
--- a/src/cmd/9660/unix.c
+++ b/src/cmd/9660/unix.c
@@ -41,7 +41,7 @@
//xd->symlink = atom(d->symlink);
xd->symlink = atom("symlink"); // XXX: rsc
}
-};
+}
void
fdtruncate(int fd, ulong size)
diff --git a/src/cmd/9term/SunOS.c b/src/cmd/9term/SunOS.c
index 12f64b8..4c85918 100644
--- a/src/cmd/9term/SunOS.c
+++ b/src/cmd/9term/SunOS.c
@@ -67,7 +67,7 @@
if(debug) fprint(2, "israw %c%c\n",
ttmode.c_lflag&ICANON ? 'c' : '-',
ttmode.c_lflag&ECHO ? 'e' : '-');
- return (ttmode.c_lflag&(ICANON|ECHO));
+ return (ttmode.c_lflag&ICANON && ttmode.c_lflags&ECHO);
}
int
