B, sam: remove sam srv file
No need for 2 programs doing the same job.
This commit is contained in:
parent
73db7a20f7
commit
1c30bd451e
4 changed files with 2 additions and 60 deletions
25
rc/bin/B
25
rc/bin/B
|
@ -16,27 +16,4 @@ if(test -f /mnt/plumb/edit || test -f /mnt/term/mnt/plumb/edit){
|
||||||
exit
|
exit
|
||||||
}
|
}
|
||||||
|
|
||||||
# using sam srv file
|
echo 'no plumber' >[1=2]
|
||||||
|
|
||||||
for(i)
|
|
||||||
switch($i){
|
|
||||||
case /*
|
|
||||||
files = ( $files $i )
|
|
||||||
case *
|
|
||||||
files = ( $files `{cleanname `{pwd}^/$i} )
|
|
||||||
}
|
|
||||||
|
|
||||||
if(test -f /mnt/term/srv/sam.$user) dest = /mnt/term/srv/sam.$user
|
|
||||||
if not if(test -f /srv/sam.$user) dest = /srv/sam.$user
|
|
||||||
if not {
|
|
||||||
echo B: can''''t find sam server file >[1=2]
|
|
||||||
exit open
|
|
||||||
}
|
|
||||||
|
|
||||||
switch($files){
|
|
||||||
case *:*
|
|
||||||
for(i in $files)
|
|
||||||
echo $i | sed 's/^/B /;s/:([0-9]+)$/\n\1/g' >> $dest
|
|
||||||
case *
|
|
||||||
echo B $files >> $dest
|
|
||||||
}
|
|
||||||
|
|
|
@ -43,8 +43,7 @@ initio(void)
|
||||||
threadexitsall("kbd");
|
threadexitsall("kbd");
|
||||||
}
|
}
|
||||||
hoststart();
|
hoststart();
|
||||||
if(plumbstart() < 0)
|
plumbstart();
|
||||||
extstart();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -147,39 +147,6 @@ extproc(void *argv)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
extstart(void)
|
|
||||||
{
|
|
||||||
char buf[32];
|
|
||||||
int fd;
|
|
||||||
static int p[2];
|
|
||||||
static void *arg[2];
|
|
||||||
|
|
||||||
if(pipe(p) < 0)
|
|
||||||
return;
|
|
||||||
sprint(exname, "/srv/sam.%s", getuser());
|
|
||||||
fd = create(exname, 1, 0600);
|
|
||||||
if(fd < 0){ /* assume existing guy is more important */
|
|
||||||
Err:
|
|
||||||
close(p[0]);
|
|
||||||
close(p[1]);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
sprint(buf, "%d", p[0]);
|
|
||||||
if(write(fd, buf, strlen(buf)) <= 0)
|
|
||||||
goto Err;
|
|
||||||
close(fd);
|
|
||||||
/*
|
|
||||||
* leave p[0] open so if the file is removed the event
|
|
||||||
* library won't get an error
|
|
||||||
*/
|
|
||||||
plumbc = chancreate(sizeof(int), 0);
|
|
||||||
arg[0] = plumbc;
|
|
||||||
arg[1] = &p[1];
|
|
||||||
proccreate(extproc, arg, STACK);
|
|
||||||
atexit(removeextern);
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
int
|
||||||
plumbformat(int i)
|
plumbformat(int i)
|
||||||
{
|
{
|
||||||
|
|
|
@ -103,7 +103,6 @@ void startnewfile(int, Text*);
|
||||||
void getmouse(void);
|
void getmouse(void);
|
||||||
void mouseunblock(void);
|
void mouseunblock(void);
|
||||||
void kbdblock(void);
|
void kbdblock(void);
|
||||||
void extstart(void);
|
|
||||||
void hoststart(void);
|
void hoststart(void);
|
||||||
int plumbstart(void);
|
int plumbstart(void);
|
||||||
int button(int but);
|
int button(int but);
|
||||||
|
|
Loading…
Reference in a new issue