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

merge

Browse source
This commit is contained in:
Russ Cox 2007-11-27 15:39:06 -05:00
commit 83ab7d8896
21 changed files with 239 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib9/_p9dir.c
View file

@ -252,7 +252,7 @@ _p9dir(struct stat *lst, struct stat *st, char *name, Dir *d, char **str, char *
close(fd);
}
#endif
#if defined(__FreeBSD__)
#if defined(DIOCGMEDIASIZE)
if(isdisk(st)){
int fd;
off_t mediasize;

5
src/lib9/getns.c
View file

@ -42,6 +42,11 @@ nsfromdisplay(void)
if(strcmp(p, ".0") == 0)
*p = 0;
}
/* turn /tmp/launch/:0 into _tmp_launch_:0 (OS X 10.5) */
for(p=disp; *p; p++)
if(*p == '/')
*p = '_';
p = smprint("/tmp/ns.%s.%s", getuser(), disp);
free(disp);