remove extra code Reference: /n/sources/patch/applied/slimsam Date: Sun Apr 3 13:25:00 CES 2005 --- /sys/src/cmd/sam/plan9.c Sun Apr 3 13:24:13 2005 +++ /sys/src/cmd/sam/plan9.c Sun Apr 3 13:24:08 2005 @@ -49,21 +49,6 @@ dprint("?warning: %s `%.*S'\n", s, a->n, a->s); } -char* -getuser(void) -{ - static char user[64]; - int fd; - - if(user[0] == 0){ - fd = open("/dev/user", 0); - if(fd<0 || read(fd, user, sizeof user-1)<=0) - strcpy(user, "none"); - close(fd); - } - return user; -} - int statfile(char *name, ulong *dev, uvlong *id, long *time, long *length, long *appendonly) { @@ -119,24 +104,6 @@ panicking = 1; rescue(); noted(NDFLT); -} - -int -newtmp(int num) -{ - int i, fd; - static char tempnam[30]; - - i = getpid(); - do - snprint(tempnam, sizeof tempnam, "%s/%d%.4s%dsam", TMPDIR, num, getuser(), i++); - while(access(tempnam, 0) == 0); - fd = create(tempnam, ORDWR|OCEXEC|ORCLOSE, 0000); - if(fd < 0){ - remove(tempnam); - fd = create(tempnam, ORDWR|OCEXEC|ORCLOSE, 0000); - } - return fd; } char* --- /sys/src/cmd/sam/sam.h Sun Apr 3 13:24:33 2005 +++ /sys/src/cmd/sam/sam.h Sun Apr 3 13:24:28 2005 @@ -273,7 +273,6 @@ void moveto(File*, Range); File *newfile(void); void nextmatch(File*, String*, Posn, int); -int newtmp(int); void notifyf(void*, char*); void panic(char*); void printposn(File*, int);