1 files changed, 39 insertions, 61 deletions

diff --git a/sys/src/cmd/upas/common/sys.h b/sys/src/cmd/upas/common/sys.h
index a50f27284..a860df15f 100644
--- a/sys/src/cmd/upas/common/sys.h
+++ b/sys/src/cmd/upas/common/sys.h
@@ -1,85 +1,63 @@
-/*
- * System dependent header files for research
- */
-
 #include <u.h>
 #include <libc.h>
-#include <regexp.h>
 #include <bio.h>
-#include "String.h"
 
 /*
  *  for the lock routines in libsys.c
  */
 typedef struct Mlock	Mlock;
 struct Mlock {
-	int fd;
-	int pid;
-	String *name;
+	int	fd;
+	int	pid;
+	char	name[Pathlen];
 };
 
 /*
  *  from config.c
  */
 extern char *MAILROOT;	/* root of mail system */
+extern char *SPOOL;	/* spool directory; for spam ctl */
 extern char *UPASLOG;	/* log directory */
 extern char *UPASLIB;	/* upas library directory */
 extern char *UPASBIN;	/* upas binary directory */
 extern char *UPASTMP;	/* temporary directory */
 extern char *SHELL;	/* path name of shell */
-extern char *POST;	/* path name of post server addresses */
-extern int MBOXMODE;	/* default mailbox protection mode */
 
-/*
- *  files in libsys.c
- */
-extern char	*sysname_read(void);
-extern char	*alt_sysname_read(void);
-extern char	*domainname_read(void);
-extern char	**sysnames_read(void);
-extern char	*getlog(void);
-extern char	*thedate(void);
-extern Biobuf	*sysopen(char*, char*, ulong);
-extern int	sysopentty(void);
-extern int	sysclose(Biobuf*);
-extern int	sysmkdir(char*, ulong);
-extern int	syschgrp(char*, char*);
-extern Mlock	*syslock(char *);
-extern void	sysunlock(Mlock *);
-extern void	syslockrefresh(Mlock *);
-extern int	e_nonexistent(void);
-extern int	e_locked(void);
-extern long	sysfilelen(Biobuf*);
-extern int	sysremove(char*);
-extern int	sysrename(char*, char*);
-extern int	sysexist(char*);
-extern int	sysisdir(char*);
-extern int	syskill(int);
-extern int	syskillpg(int);
-extern int	syscreate(char*, int, ulong);
-extern Mlock	*trylock(char *);
-extern void	exit(int);
-extern void	pipesig(int*);
-extern void	pipesigoff(void);
-extern int	holdon(void);
-extern void	holdoff(int);
-extern int	syscreatelocked(char*, int, int);
-extern int	sysopenlocked(char*, int);
-extern int	sysunlockfile(int);
-extern int	sysfiles(void);
-extern int 	become(char**, char*);
-extern int	sysdetach(void);
-extern int	sysdirreadall(int, Dir**);
-extern String	*username(String*);
-extern char*	remoteaddr(int, char*);
-extern int	creatembox(char*, char*);
-
-extern String	*readlock(String*);
-extern char	*homedir(char*);
-extern String	*mboxname(char*, String*);
-extern String	*deadletter(String*);
+enum {
+	Mboxmode	= 0622,
+};
 
 /*
- *  maximum size for a file path
+ *  files in libsys.c
  */
-#define MAXPATHLEN 128
+char	*sysname_read(void);
+char	*alt_sysname_read(void);
+char	*domainname_read(void);
+char	**sysnames_read(void);
+char	*getlog(void);
+char	*thedate(void);
+Biobuf	*sysopen(char*, char*, ulong);
+int	sysopentty(void);
+int	sysclose(Biobuf*);
+int	sysmkdir(char*, ulong);
+Mlock	*syslock(char *);
+void	sysunlock(Mlock *);
+void	syslockrefresh(Mlock *);
+int	sysrename(char*, char*);
+int	sysexist(char*);
+int	syskill(int);
+int	syskillpg(int);
+Mlock	*trylock(char *);
+void	pipesig(int*);
+void	pipesigoff(void);
+int	holdon(void);
+void	holdoff(int);
+int	syscreatelocked(char*, int, int);
+int	sysopenlocked(char*, int);
+int	sysunlockfile(int);
+int	sysfiles(void);
+int 	become(char**, char*);
+int	sysdetach(void);
+char	*username(char*);
+int	creatembox(char*, char*);
+int	createfolder(char*, char*);