plan9port

commit ffcafb8c4b9ed1f6e17891ab00ec2818f5af032f
parent 941c9f36a9230690989f495313a399af5192ef5c
Author: rsc <devnull@localhost>
Date:   Sat, 11 Oct 2003 02:45:55 +0000

Various tweaks.  The implementation of notify, create, etc.
should really be in lib9.

Diffstat:
M
src/cmd/sam/sam.c
 | 
6
+++++-
M
src/cmd/sam/sam.h
 | 
5
+++++
M
src/cmd/sam/unix.c
 | 
11
++++++-----

3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/cmd/sam/sam.c b/src/cmd/sam/sam.c
@@ -33,7 +33,10 @@ Rune	baddir[] = { '<', 'b', 'a', 'd', 'd', 'i', 'r', '>', '\n'};
 
 void	usage(void);
 
-int main(int argc, char *argv[])
+extern int notify(void(*)(void*,char*));
+
+int
+main(int argc, char *argv[])
 {
 	int i;
 	String *t;
@@ -126,6 +129,7 @@ int main(int argc, char *argv[])
 	cmdloop();
 	trytoquit();	/* if we already q'ed, quitok will be TRUE */
 	exits(0);
+	return 0;
 }
 
 void
diff --git a/src/cmd/sam/sam.h b/src/cmd/sam/sam.h
@@ -404,3 +404,8 @@ void	outlong(long);
 void	outvlong(void*);
 void	outsend(void);
 void	outflush(void);
+
+
+extern int create(char*, int, ulong);
+extern int perror(char*);
+extern int remove(char*);
diff --git a/src/cmd/sam/unix.c b/src/cmd/sam/unix.c
@@ -27,10 +27,10 @@ Rune *right[]= { r1, r2, r3, 0};
 #define TMPDIRNAME "/tmp"
 #endif
 #ifndef SHNAME
-#define SHNAME "rc"
+#define SHNAME "sh"
 #endif
 #ifndef SHPATHNAME
-#define SHPATHNAME "/bin/rc"
+#define SHPATHNAME "/bin/sh"
 #endif
 #ifndef RXNAME
 #define RXNAME "ssh"
@@ -137,7 +137,7 @@ hup(int sig)
 }
 
 int
-notify (void(*f)(void *, char *))
+notify(void(*f)(void *, char *))
 {
         signal(SIGINT, SIG_IGN);
         signal(SIGPIPE, SIG_IGN);  // XXX - bpipeok?
@@ -249,7 +249,8 @@ int errstr(char *buf, int size)
 }                       
 */
                     
-int create(char *name, int omode, int perm)
+int
+create(char *name, int omode, ulong perm)
 {
     int mode;
     int fd; 
@@ -272,7 +273,7 @@ int create(char *name, int omode, int perm)
 }
 
 /* SHOULD BE ELSEWHERE */
-#ifdef __APPLE__
+#if 0	/* needed on old __APPLE__ */
 #include <lib9.h>
 
 Lock plk;