diff options
| author | rsc <devnull@localhost> | 2004-03-25 23:03:57 +0000 |
|---|---|---|
| committer | rsc <devnull@localhost> | 2004-03-25 23:03:57 +0000 |
| commit | 8ad517944e46710ab832350c0dc3fc4e9239f7e2 (patch) | |
| tree | 7b99a1833e1b303719c2aac75e3f7e82482b42ab /src/cmd/plumb | |
| parent | cb27443abf3d6af6ab52377c71c843e619928433 (diff) | |
| download | plan9port-8ad517944e46710ab832350c0dc3fc4e9239f7e2.tar.gz plan9port-8ad517944e46710ab832350c0dc3fc4e9239f7e2.tar.bz2 plan9port-8ad517944e46710ab832350c0dc3fc4e9239f7e2.zip | |
Today's changes.
More changes.
Diffstat (limited to 'src/cmd/plumb')
| -rw-r--r-- | src/cmd/plumb/fsys.c | 1 | ||||
| -rw-r--r-- | src/cmd/plumb/plumber.c | 7 | ||||
| -rw-r--r-- | src/cmd/plumb/rules.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/cmd/plumb/fsys.c b/src/cmd/plumb/fsys.c index 4776d127..33a4458e 100644 --- a/src/cmd/plumb/fsys.c +++ b/src/cmd/plumb/fsys.c @@ -97,6 +97,7 @@ static Dirtab dir[NDIR] = static int ndir = NQID; static int srvfd; +#define clock plumbclock /* SunOS name clash */ static int clock; static Fid *fids[Nhash]; static QLock readlock; diff --git a/src/cmd/plumb/plumber.c b/src/cmd/plumb/plumber.c index 80a57af3..bf7afa3f 100644 --- a/src/cmd/plumb/plumber.c +++ b/src/cmd/plumb/plumber.c @@ -54,9 +54,10 @@ threadmain(int argc, char *argv[]) error("can't initialize $user or $home: %r"); if(plumbfile == nil){ sprint(buf, "%s/lib/plumbing", home); - if(access(buf, 0) < 0) - sprint(buf, "#9/plumb/initial.plumbing"); - plumbfile = estrdup(buf); + if(access(buf, 0) >= 0) + plumbfile = estrdup(buf); + else + plumbfile = unsharp("#9/plumb/initial.plumbing"); } fd = open(plumbfile, OREAD); diff --git a/src/cmd/plumb/rules.c b/src/cmd/plumb/rules.c index 689edf59..ab27787d 100644 --- a/src/cmd/plumb/rules.c +++ b/src/cmd/plumb/rules.c @@ -415,7 +415,7 @@ include(char *s) fd = open(t, OREAD); if(fd<0 && t[0]!='/' && strncmp(t, "./", 2)!=0 && strncmp(t, "../", 3)!=0){ snprint(buf, sizeof buf, "#9/plumb/%s", t); - t = buf; + t = unsharp(buf); fd = open(t, OREAD); } if(fd < 0) |