o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more changes

Browse source
This commit is contained in:
rsc 2006-02-12 00:34:08 +00:00
parent 7e61af5124
commit a79cd7832f
10 changed files with 47 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/cmd/upas/common/common.h
View file

@ -75,5 +75,4 @@ extern int proc_wait(process*);
extern int proc_free(process*);
extern int proc_kill(process*);
/* tell compiler we're using a value so it won't complain */
#define USE(x) if(x)

26
src/cmd/upas/common/config.c
View file

@ -1,12 +1,12 @@
#include "common.h"
char *MAILROOT = "#9/mail";
char *UPASLOG = "#9/sys/log";
char *UPASLIB = "#9/mail/lib";
char *UPASBIN= "#9/bin/upas";
char *UPASTMP = "#9/mail/tmp";
char *SHELL = "#9/bin/rc";
char *POST = "#9/sys/lib/post/dispatch";
char *_MAILROOT = "#9/mail";
char *_UPASLOG = "#9/sys/log";
char *_UPASLIB = "#9/mail/lib";
char *_UPASBIN= "#9/bin/upas";
char *_UPASTMP = "#9/mail/tmp";
char *_SHELL = "#9/bin/rc";
char *_POST = "#9/sys/lib/post/dispatch";
int MBOXMODE = 0662;
@ -18,10 +18,10 @@ upasconfig(void)
if(did)
return;
did = 1;
MAILROOT = unsharp(MAILROOT);
UPASLOG = unsharp(UPASLOG);
UPASLIB = unsharp(UPASLIB);
UPASBIN = unsharp(UPASBIN);
SHELL = unsharp(SHELL);
POST = unsharp(POST);
_MAILROOT = unsharp(_MAILROOT);
_UPASLOG = unsharp(_UPASLOG);
_UPASLIB = unsharp(_UPASLIB);
_UPASBIN = unsharp(_UPASBIN);
_SHELL = unsharp(_SHELL);
_POST = unsharp(_POST);
}

23
src/cmd/upas/common/sys.h
View file

@ -21,16 +21,25 @@ struct Mlock {
/*
* from config.c - call upasconfig() before using
*/
extern char *MAILROOT; /* root of mail system */
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 char *_MAILROOT; /* root of mail system */
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 */
extern void upasconfig(void);
/* forgive me */
#define MAILROOT (upasconfig(), _MAILROOT)
#define UPASLOG (upasconfig(), _UPASLOG)
#define UPASLIB (upasconfig(), _UPASLIB)
#define UPASBIN (upasconfig(), _UPASBIN)
#define UPASTMP (upasconfig(), _UPASTMP)
#define SHELL (upasconfig(), _SHELL)
#define POST (upasconfig(), _POST)
/*
* files in libsys.c
*/