mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-11-19 21:44:11 +01:00
Code

12827: dynamically allocate 'file' in mailstat

Browse Source
This commit is contained in:
Clint Adams 2000-09-18 03:52:59 +00:00
parent 2d9e68f3cb
commit 64d591dbac
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2000-09-18 Clint Adams <schizo@debian.org>
* 12827: Src/utils.c: dynamically allocate 'file' in mailstat.
2000-09-17 Clint Adams <schizo@debian.org>
* unposted: Src/system.h, Src/utils.c: define mailstat()

38
Src/utils.c
View File

@ -3789,8 +3789,8 @@ mailstat(char *path, struct stat *st)
struct stat st_ret, st_tmp;
static struct stat st_new_last, st_ret_last;
char dir[PATH_MAX * 2];
char file[PATH_MAX * 2];
int i, l;
char *file;
int i;
time_t atime = 0, mtime = 0;
/* First see if it's a directory. */
@ -3832,28 +3832,26 @@ mailstat(char *path, struct stat *st)
return 0;
}
st_new_last = st_tmp;
/* Loop over new/ and cur/ */
for (i = 0; i < 2; i++) {
sprintf(dir, "%s/%s", path, i ? "cur" : "new");
sprintf(file, "%s/", dir);
l = strlen(file);
sprintf(dir, "%s/%s", path, i ? "cur" : "new");
if ((dd = opendir(dir)) == NULL)
return 0;
return 0;
while ((fn = readdir(dd)) != NULL) {
if (fn->d_name[0] == '.' ||
strlen(fn->d_name) + l >= sizeof(file))
continue;
strcpy(file + l, fn->d_name);
if (stat(file, &st_tmp) != 0)
continue;
st_ret.st_size += st_tmp.st_size;
st_ret.st_blocks++;
if (st_tmp.st_atime != st_tmp.st_mtime &&
st_tmp.st_atime > atime)
atime = st_tmp.st_atime;
if (st_tmp.st_mtime > mtime)
mtime = st_tmp.st_mtime;
if (fn->d_name[0] == '.')
continue;
file = zhtricat(dir, "/", fn->d.name);
if (stat(file, &st_tmp) != 0)
continue;
st_ret.st_size += st_tmp.st_size;
st_ret.st_blocks++;
if (st_tmp.st_atime != st_tmp.st_mtime &&
st_tmp.st_atime > atime)
atime = st_tmp.st_atime;
if (st_tmp.st_mtime > mtime)
mtime = st_tmp.st_mtime;
}
closedir(dd);
}