Blame

Date:
Message:
lib9: fix dirread/stat mismatch on Snow Leopard http://codereview.appspot.com/116096
Actions:
History | Blob | Raw File
  1 fd04aace 2003-11-23 devnull #include <u.h>

  2 f7012583 2003-11-25 devnull #define NOPLAN9DEFINES

  3 fd04aace 2003-11-23 devnull #include <libc.h>

  4 fd04aace 2003-11-23 devnull #include <sys/stat.h>

  5 fd04aace 2003-11-23 devnull #include <dirent.h>

  6 fd04aace 2003-11-23 devnull 

  7 2acd6fa6 2005-02-08 devnull extern int _p9dir(struct stat*, struct stat*, char*, Dir*, char**, char*);

  8 fd04aace 2003-11-23 devnull 

  9 64bcfff3 2003-11-25 devnull #if defined(__linux__)

 10 fd04aace 2003-11-23 devnull static int

 11 64bcfff3 2003-11-25 devnull mygetdents(int fd, struct dirent *buf, int n)

 12 d2c4ee9e 2003-11-24 devnull {

 13 64bcfff3 2003-11-25 devnull 	off_t off;

 14 e95a7088 2003-12-09 devnull 	int nn;

 15 64bcfff3 2003-11-25 devnull 

 16 03480d73 2004-01-09 devnull 	/* This doesn't match the man page, but it works in Debian with a 2.2 kernel */

 17 64bcfff3 2003-11-25 devnull 	off = p9seek(fd, 0, 1);

 18 64bcfff3 2003-11-25 devnull 	nn = getdirentries(fd, (void*)buf, n, &off);

 19 64bcfff3 2003-11-25 devnull 	return nn;

 20 64bcfff3 2003-11-25 devnull }

 21 b7d8e86a 2006-06-26 devnull #elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)

 22 64bcfff3 2003-11-25 devnull static int

 23 64bcfff3 2003-11-25 devnull mygetdents(int fd, struct dirent *buf, int n)

 24 64bcfff3 2003-11-25 devnull {

 25 912fba95 2003-11-24 devnull 	long off;

 26 669250d1 2003-12-03 devnull 	return getdirentries(fd, (void*)buf, n, &off);

 27 d2c4ee9e 2003-11-24 devnull }

 28 b7d8e86a 2006-06-26 devnull #elif defined(__sun__) || defined(__NetBSD__)

 29 64bcfff3 2003-11-25 devnull static int

 30 64bcfff3 2003-11-25 devnull mygetdents(int fd, struct dirent *buf, int n)

 31 64bcfff3 2003-11-25 devnull {

 32 64bcfff3 2003-11-25 devnull 	return getdents(fd, (void*)buf, n);

 33 64bcfff3 2003-11-25 devnull }

 34 e6c837d6 2009-07-15 rsc #elif defined(__AIX__)

 35 e6c837d6 2009-07-15 rsc static int

 36 e6c837d6 2009-07-15 rsc mygetdents(int fd, struct dirent *buf, int n)

 37 e6c837d6 2009-07-15 rsc {

 38 e6c837d6 2009-07-15 rsc 	return getdirent(fd, (void*)buf, n);

 39 e6c837d6 2009-07-15 rsc }

 40 669250d1 2003-12-03 devnull #endif

 41 d2c4ee9e 2003-11-24 devnull 

 42 d2c4ee9e 2003-11-24 devnull static int

 43 fd04aace 2003-11-23 devnull countde(char *p, int n)

 44 fd04aace 2003-11-23 devnull {

 45 fd04aace 2003-11-23 devnull 	char *e;

 46 fd04aace 2003-11-23 devnull 	int m;

 47 fd04aace 2003-11-23 devnull 	struct dirent *de;

 48 fd04aace 2003-11-23 devnull 

 49 fd04aace 2003-11-23 devnull 	e = p+n;

 50 fd04aace 2003-11-23 devnull 	m = 0;

 51 fd04aace 2003-11-23 devnull 	while(p < e){

 52 fd04aace 2003-11-23 devnull 		de = (struct dirent*)p;

 53 fd04aace 2003-11-23 devnull 		if(de->d_reclen <= 4+2+2+1 || p+de->d_reclen > e)

 54 fd04aace 2003-11-23 devnull 			break;

 55 1c253ceb 2003-11-23 devnull 		if(de->d_name[0]=='.' && de->d_name[1]==0)

 56 1c253ceb 2003-11-23 devnull 			de->d_name[0] = 0;

 57 1c253ceb 2003-11-23 devnull 		else if(de->d_name[0]=='.' && de->d_name[1]=='.' && de->d_name[2]==0)

 58 1c253ceb 2003-11-23 devnull 			de->d_name[0] = 0;

 59 1c8efa18 2003-12-04 devnull 		m++;

 60 fd04aace 2003-11-23 devnull 		p += de->d_reclen;

 61 fd04aace 2003-11-23 devnull 	}

 62 fd04aace 2003-11-23 devnull 	return m;

 63 fd04aace 2003-11-23 devnull }

 64 fd04aace 2003-11-23 devnull 

 65 fd04aace 2003-11-23 devnull static int

 66 fd04aace 2003-11-23 devnull dirpackage(int fd, char *buf, int n, Dir **dp)

 67 fd04aace 2003-11-23 devnull {

 68 fd04aace 2003-11-23 devnull 	int oldwd;

 69 fd04aace 2003-11-23 devnull 	char *p, *str, *estr;

 70 fd04aace 2003-11-23 devnull 	int i, nstr, m;

 71 fd04aace 2003-11-23 devnull 	struct dirent *de;

 72 2acd6fa6 2005-02-08 devnull 	struct stat st, lst;

 73 fd04aace 2003-11-23 devnull 	Dir *d;

 74 fd04aace 2003-11-23 devnull 

 75 fd04aace 2003-11-23 devnull 	n = countde(buf, n);

 76 fd04aace 2003-11-23 devnull 	if(n <= 0)

 77 fd04aace 2003-11-23 devnull 		return n;

 78 fd04aace 2003-11-23 devnull 

 79 fd04aace 2003-11-23 devnull 	if((oldwd = open(".", O_RDONLY)) < 0)

 80 fd04aace 2003-11-23 devnull 		return -1;

 81 fd04aace 2003-11-23 devnull 	if(fchdir(fd) < 0)

 82 fd04aace 2003-11-23 devnull 		return -1;

 83 fd04aace 2003-11-23 devnull 		

 84 fd04aace 2003-11-23 devnull 	p = buf;

 85 fd04aace 2003-11-23 devnull 	nstr = 0;

 86 1c8efa18 2003-12-04 devnull 

 87 fd04aace 2003-11-23 devnull 	for(i=0; i<n; i++){

 88 fd04aace 2003-11-23 devnull 		de = (struct dirent*)p;

 89 46199d11 2005-02-08 devnull 		memset(&lst, 0, sizeof lst);

 90 1c8efa18 2003-12-04 devnull 		if(de->d_name[0] == 0)

 91 1c8efa18 2003-12-04 devnull 			/* nothing */ {}

 92 0a229052 2005-02-08 devnull 		else if(lstat(de->d_name, &lst) < 0)

 93 1c253ceb 2003-11-23 devnull 			de->d_name[0] = 0;

 94 0a229052 2005-02-08 devnull 		else{

 95 0a229052 2005-02-08 devnull 			st = lst;

 96 46199d11 2005-02-08 devnull 			if(S_ISLNK(lst.st_mode))

 97 0a229052 2005-02-08 devnull 				stat(de->d_name, &st);

 98 0a229052 2005-02-08 devnull 			nstr += _p9dir(&lst, &st, de->d_name, nil, nil, nil);

 99 0a229052 2005-02-08 devnull 		}

100 fd04aace 2003-11-23 devnull 		p += de->d_reclen;

101 fd04aace 2003-11-23 devnull 	}

102 fd04aace 2003-11-23 devnull 

103 fd04aace 2003-11-23 devnull 	d = malloc(sizeof(Dir)*n+nstr);

104 fd04aace 2003-11-23 devnull 	if(d == nil){

105 fd04aace 2003-11-23 devnull 		fchdir(oldwd);

106 fd04aace 2003-11-23 devnull 		close(oldwd);

107 fd04aace 2003-11-23 devnull 		return -1;

108 fd04aace 2003-11-23 devnull 	}

109 fd04aace 2003-11-23 devnull 	str = (char*)&d[n];

110 fd04aace 2003-11-23 devnull 	estr = str+nstr;

111 fd04aace 2003-11-23 devnull 

112 fd04aace 2003-11-23 devnull 	p = buf;

113 fd04aace 2003-11-23 devnull 	m = 0;

114 fd04aace 2003-11-23 devnull 	for(i=0; i<n; i++){

115 fd04aace 2003-11-23 devnull 		de = (struct dirent*)p;

116 46199d11 2005-02-08 devnull 		if(de->d_name[0] != 0 && lstat(de->d_name, &lst) >= 0){

117 2acd6fa6 2005-02-08 devnull 			st = lst;

118 2acd6fa6 2005-02-08 devnull 			if((lst.st_mode&S_IFMT) == S_IFLNK)

119 2acd6fa6 2005-02-08 devnull 				stat(de->d_name, &st);

120 2acd6fa6 2005-02-08 devnull 			_p9dir(&lst, &st, de->d_name, &d[m++], &str, estr);

121 2acd6fa6 2005-02-08 devnull 		}

122 fd04aace 2003-11-23 devnull 		p += de->d_reclen;

123 fd04aace 2003-11-23 devnull 	}

124 fd04aace 2003-11-23 devnull 

125 fd04aace 2003-11-23 devnull 	fchdir(oldwd);

126 fd04aace 2003-11-23 devnull 	close(oldwd);

127 fd04aace 2003-11-23 devnull 	*dp = d;

128 fd04aace 2003-11-23 devnull 	return m;

129 fd04aace 2003-11-23 devnull }

130 fd04aace 2003-11-23 devnull 

131 fd04aace 2003-11-23 devnull long

132 fd04aace 2003-11-23 devnull dirread(int fd, Dir **dp)

133 fd04aace 2003-11-23 devnull {

134 fd04aace 2003-11-23 devnull 	char *buf;

135 fd04aace 2003-11-23 devnull 	struct stat st;

136 fd04aace 2003-11-23 devnull 	int n;

137 fd04aace 2003-11-23 devnull 

138 fd04aace 2003-11-23 devnull 	*dp = 0;

139 fd04aace 2003-11-23 devnull 

140 fd04aace 2003-11-23 devnull 	if(fstat(fd, &st) < 0)

141 fd04aace 2003-11-23 devnull 		return -1;

142 fd04aace 2003-11-23 devnull 

143 fd04aace 2003-11-23 devnull 	if(st.st_blksize < 8192)

144 fd04aace 2003-11-23 devnull 		st.st_blksize = 8192;

145 fd04aace 2003-11-23 devnull 

146 fd04aace 2003-11-23 devnull 	buf = malloc(st.st_blksize);

147 fd04aace 2003-11-23 devnull 	if(buf == nil)

148 fd04aace 2003-11-23 devnull 		return -1;

149 fd04aace 2003-11-23 devnull 

150 912fba95 2003-11-24 devnull 	n = mygetdents(fd, (void*)buf, st.st_blksize);

151 fd04aace 2003-11-23 devnull 	if(n < 0){

152 fd04aace 2003-11-23 devnull 		free(buf);

153 fd04aace 2003-11-23 devnull 		return -1;

154 fd04aace 2003-11-23 devnull 	}

155 fd04aace 2003-11-23 devnull 	n = dirpackage(fd, buf, n, dp);

156 fd04aace 2003-11-23 devnull 	free(buf);

157 fd04aace 2003-11-23 devnull 	return n;

158 fd04aace 2003-11-23 devnull }

159 fd04aace 2003-11-23 devnull 

160 fd04aace 2003-11-23 devnull 

161 fd04aace 2003-11-23 devnull long

162 fd04aace 2003-11-23 devnull dirreadall(int fd, Dir **d)

163 fd04aace 2003-11-23 devnull {

164 fd04aace 2003-11-23 devnull 	uchar *buf, *nbuf;

165 fd04aace 2003-11-23 devnull 	long n, ts;

166 fd04aace 2003-11-23 devnull 	struct stat st;

167 fd04aace 2003-11-23 devnull 

168 fd04aace 2003-11-23 devnull 	if(fstat(fd, &st) < 0)

169 fd04aace 2003-11-23 devnull 		return -1;

170 fd04aace 2003-11-23 devnull 

171 fd04aace 2003-11-23 devnull 	if(st.st_blksize < 8192)

172 fd04aace 2003-11-23 devnull 		st.st_blksize = 8192;

173 fd04aace 2003-11-23 devnull 

174 fd04aace 2003-11-23 devnull 	buf = nil;

175 fd04aace 2003-11-23 devnull 	ts = 0;

176 fd04aace 2003-11-23 devnull 	for(;;){

177 fd04aace 2003-11-23 devnull 		nbuf = realloc(buf, ts+st.st_blksize);

178 fd04aace 2003-11-23 devnull 		if(nbuf == nil){

179 fd04aace 2003-11-23 devnull 			free(buf);

180 fd04aace 2003-11-23 devnull 			return -1;

181 fd04aace 2003-11-23 devnull 		}

182 fd04aace 2003-11-23 devnull 		buf = nbuf;

183 912fba95 2003-11-24 devnull 		n = mygetdents(fd, (void*)(buf+ts), st.st_blksize);

184 fd04aace 2003-11-23 devnull 		if(n <= 0)

185 fd04aace 2003-11-23 devnull 			break;

186 fd04aace 2003-11-23 devnull 		ts += n;

187 fd04aace 2003-11-23 devnull 	}

188 fd04aace 2003-11-23 devnull 	if(ts >= 0)

189 8ad51794 2004-03-25 devnull 		ts = dirpackage(fd, (char*)buf, ts, d);

190 fd04aace 2003-11-23 devnull 	free(buf);

191 fd04aace 2003-11-23 devnull 	if(ts == 0 && n < 0)

192 fd04aace 2003-11-23 devnull 		return -1;

193 fd04aace 2003-11-23 devnull 	return ts;

194 fd04aace 2003-11-23 devnull }