diff options
| author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
|---|---|---|
| committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
| commit | 02d7aa8915f9c3a3288dab01f321eb94ba219e3b (patch) | |
| tree | f053238978479e408a2b83571443e132f30586ab /src/cmd/upas/common | |
| parent | c0c9d8f883dfd3a7f5a74499d91bb95884b15873 (diff) | |
| parent | 3d1382b98a502d0c34d5ba2c462396acc515016e (diff) | |
| download | plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.gz plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.bz2 plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cmd/upas/common')
| -rw-r--r-- | src/cmd/upas/common/common.h | 4 | ||||
| -rw-r--r-- | src/cmd/upas/common/config.c | 2 | ||||
| -rw-r--r-- | src/cmd/upas/common/libsys.c | 8 | ||||
| -rw-r--r-- | src/cmd/upas/common/process.c | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/src/cmd/upas/common/common.h b/src/cmd/upas/common/common.h index 7a26dea1..0fae80f8 100644 --- a/src/cmd/upas/common/common.h +++ b/src/cmd/upas/common/common.h @@ -18,7 +18,7 @@ enum Elemlen= 28, Errlen= 128, Pathlen= 256, - + RetryCode = 2 }; @@ -76,5 +76,3 @@ extern process *proc_start(char*, stream*, stream*, stream*, int, char*); extern int proc_wait(process*); extern int proc_free(process*); extern int proc_kill(process*); - - diff --git a/src/cmd/upas/common/config.c b/src/cmd/upas/common/config.c index 8d1e7a02..97ce9cc2 100644 --- a/src/cmd/upas/common/config.c +++ b/src/cmd/upas/common/config.c @@ -14,7 +14,7 @@ void upasconfig(void) { static int did; - + if(did) return; did = 1; diff --git a/src/cmd/upas/common/libsys.c b/src/cmd/upas/common/libsys.c index b439cfde..2ed19494 100644 --- a/src/cmd/upas/common/libsys.c +++ b/src/cmd/upas/common/libsys.c @@ -198,7 +198,7 @@ trylock(char *path) free(l); return 0; } - + /* fork process to keep lock alive */ switch(l->pid = rfork(RFPROC)){ default: @@ -470,7 +470,7 @@ sysnames_read(void) for(p=h->h_aliases; *p; p++) ; - + namev = malloc((2+p-h->h_aliases)*sizeof namev[0]); if(namev == 0) return 0; @@ -709,7 +709,7 @@ mboxpath(char *path, char *user, String *to, int dot) { char *dir; String *s; - + if (dot || *path=='/' || strncmp(path, "./", 2) == 0 || strncmp(path, "../", 3) == 0) { to = s_append(to, path); @@ -801,7 +801,7 @@ remoteaddr(int fd, char *dir) { char *raddr; NetConnInfo *nci; - + if((nci = getnetconninfo(dir, fd)) == nil) return nil; raddr = strdup(nci->raddr); diff --git a/src/cmd/upas/common/process.c b/src/cmd/upas/common/process.c index 56725a88..f593d551 100644 --- a/src/cmd/upas/common/process.c +++ b/src/cmd/upas/common/process.c @@ -18,7 +18,7 @@ instream(void) return 0; } rv->fp = &rv->bb; - rv->fd = pfd[0]; + rv->fd = pfd[0]; return rv; } |