diff options
| author | rsc <devnull@localhost> | 2006-02-12 00:34:08 +0000 |
|---|---|---|
| committer | rsc <devnull@localhost> | 2006-02-12 00:34:08 +0000 |
| commit | a79cd7832f0154b7099bdeda5f9fbff6402d6760 (patch) | |
| tree | 96ee47d45125d551f535d94256cbfcb323a23295 /src/cmd/upas/common | |
| parent | 7e61af5124e3843a8934da4e6be5e8fdc58d99dd (diff) | |
| download | plan9port-a79cd7832f0154b7099bdeda5f9fbff6402d6760.tar.gz plan9port-a79cd7832f0154b7099bdeda5f9fbff6402d6760.tar.bz2 plan9port-a79cd7832f0154b7099bdeda5f9fbff6402d6760.zip | |
more changes
Diffstat (limited to 'src/cmd/upas/common')
| -rw-r--r-- | src/cmd/upas/common/common.h | 3 | ||||
| -rw-r--r-- | src/cmd/upas/common/config.c | 26 | ||||
| -rw-r--r-- | src/cmd/upas/common/sys.h | 23 |
3 files changed, 30 insertions, 22 deletions
diff --git a/src/cmd/upas/common/common.h b/src/cmd/upas/common/common.h index d1e93841..acb155f5 100644 --- a/src/cmd/upas/common/common.h +++ b/src/cmd/upas/common/common.h @@ -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) + diff --git a/src/cmd/upas/common/config.c b/src/cmd/upas/common/config.c index 21b34a12..cde9e986 100644 --- a/src/cmd/upas/common/config.c +++ b/src/cmd/upas/common/config.c @@ -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); } diff --git a/src/cmd/upas/common/sys.h b/src/cmd/upas/common/sys.h index 50691558..dd4cd6fe 100644 --- a/src/cmd/upas/common/sys.h +++ b/src/cmd/upas/common/sys.h @@ -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 */ |