Blame

Date:
Message:
lib9: fix Mac warning R=rsc http://codereview.appspot.com/6749053
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 caade784 2012-10-20 rsc #elif defined(__APPLE__) 

 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 caade784 2012-10-20 rsc 	long off;

 26 caade784 2012-10-20 rsc 	return getdirentries(fd, (void*)buf, n, &off);

 27 caade784 2012-10-20 rsc }

 28 caade784 2012-10-20 rsc #elif defined(__FreeBSD__) || defined(__OpenBSD__)

 29 caade784 2012-10-20 rsc static int

 30 caade784 2012-10-20 rsc mygetdents(int fd, struct dirent *buf, int n)

 31 caade784 2012-10-20 rsc {

 32 d765c371 2012-06-27 0intro 	off_t off;

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

 34 d2c4ee9e 2003-11-24 devnull }

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

 36 64bcfff3 2003-11-25 devnull static int

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

 38 64bcfff3 2003-11-25 devnull {

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

 40 64bcfff3 2003-11-25 devnull }

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

 42 e6c837d6 2009-07-15 rsc static int

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

 44 e6c837d6 2009-07-15 rsc {

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

 46 e6c837d6 2009-07-15 rsc }

 47 669250d1 2003-12-03 devnull #endif

 48 d2c4ee9e 2003-11-24 devnull 

 49 d2c4ee9e 2003-11-24 devnull static int

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

 51 fd04aace 2003-11-23 devnull {

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

 53 fd04aace 2003-11-23 devnull 	int m;

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

 55 fd04aace 2003-11-23 devnull 

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

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

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

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

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

 61 fd04aace 2003-11-23 devnull 			break;

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

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

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

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

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

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

 68 fd04aace 2003-11-23 devnull 	}

 69 fd04aace 2003-11-23 devnull 	return m;

 70 fd04aace 2003-11-23 devnull }

 71 fd04aace 2003-11-23 devnull 

 72 fd04aace 2003-11-23 devnull static int

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

 74 fd04aace 2003-11-23 devnull {

 75 fd04aace 2003-11-23 devnull 	int oldwd;

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

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

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

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

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

 81 fd04aace 2003-11-23 devnull 

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

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

 84 fd04aace 2003-11-23 devnull 		return n;

 85 fd04aace 2003-11-23 devnull 

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

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

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

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

 90 fd04aace 2003-11-23 devnull 		

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

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

 93 1c8efa18 2003-12-04 devnull 

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

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

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

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

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

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

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

101 0a229052 2005-02-08 devnull 		else{

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

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

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

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

106 0a229052 2005-02-08 devnull 		}

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

108 fd04aace 2003-11-23 devnull 	}

109 fd04aace 2003-11-23 devnull 

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

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

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

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

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

115 fd04aace 2003-11-23 devnull 	}

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

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

118 fd04aace 2003-11-23 devnull 

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

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

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

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

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

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

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

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

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

128 2acd6fa6 2005-02-08 devnull 		}

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

130 fd04aace 2003-11-23 devnull 	}

131 fd04aace 2003-11-23 devnull 

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

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

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

135 fd04aace 2003-11-23 devnull 	return m;

136 fd04aace 2003-11-23 devnull }

137 fd04aace 2003-11-23 devnull 

138 fd04aace 2003-11-23 devnull long

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

140 fd04aace 2003-11-23 devnull {

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

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

143 fd04aace 2003-11-23 devnull 	int n;

144 fd04aace 2003-11-23 devnull 

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

146 fd04aace 2003-11-23 devnull 

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

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

149 fd04aace 2003-11-23 devnull 

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

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

152 fd04aace 2003-11-23 devnull 

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

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

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

156 fd04aace 2003-11-23 devnull 

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

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

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

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

161 fd04aace 2003-11-23 devnull 	}

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

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

164 fd04aace 2003-11-23 devnull 	return n;

165 fd04aace 2003-11-23 devnull }

166 fd04aace 2003-11-23 devnull 

167 fd04aace 2003-11-23 devnull 

168 fd04aace 2003-11-23 devnull long

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

170 fd04aace 2003-11-23 devnull {

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

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

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

174 fd04aace 2003-11-23 devnull 

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

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

177 fd04aace 2003-11-23 devnull 

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

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

180 fd04aace 2003-11-23 devnull 

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

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

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

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

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

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

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

188 fd04aace 2003-11-23 devnull 		}

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

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

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

192 fd04aace 2003-11-23 devnull 			break;

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

194 fd04aace 2003-11-23 devnull 	}

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

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

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

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

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

200 fd04aace 2003-11-23 devnull 	return ts;

201 fd04aace 2003-11-23 devnull }