~mdw
/
sgt
/
agedu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
After incrementing an unsigned char value, don't cast it back to
[sgt/agedu]
/
du.c
diff --git
a/du.c
b/du.c
index
e49b0d3
..
6d26c34
100644
(file)
--- a/
du.c
+++ b/
du.c
@@
-6,7
+6,7
@@
#include "du.h"
#include "alloc.h"
#include "du.h"
#include "alloc.h"
-#if !defined __linux__ || defined HAVE_FDOPENDIR
+#if !defined __linux__ ||
!defined O_NOATIME ||
defined HAVE_FDOPENDIR
#ifdef HAVE_DIRENT_H
# include <dirent.h>
#ifdef HAVE_DIRENT_H
# include <dirent.h>
@@
-170,15
+170,25
@@
static int str_cmp(const void *av, const void *bv)
}
static void du_recurse(char **path, size_t pathlen, size_t *pathsize,
}
static void du_recurse(char **path, size_t pathlen, size_t *pathsize,
- gotdata_fn_t gotdata, err_fn_t err, void *gotdata_ctx)
+ gotdata_fn_t gotdata, err_fn_t err, void *gotdata_ctx,
+ int toplevel)
{
const char *name;
dirhandle d;
STRUCT_STAT st;
char **names;
size_t i, nnames, namesize;
{
const char *name;
dirhandle d;
STRUCT_STAT st;
char **names;
size_t i, nnames, namesize;
+ int statret;
- if (LSTAT(*path, &st) < 0) {
+ /*
+ * Special case: at the very top of the scan, we follow a
+ * symlink.
+ */
+ if (toplevel)
+ statret = STAT(*path, &st);
+ else
+ statret = LSTAT(*path, &st);
+ if (statret < 0) {
err(gotdata_ctx, "%s: lstat: %s\n", *path, strerror(errno));
return;
}
err(gotdata_ctx, "%s: lstat: %s\n", *path, strerror(errno));
return;
}
@@
-231,7
+241,7
@@
static void du_recurse(char **path, size_t pathlen, size_t *pathsize,
sprintf(*path + pathlen, "/%s", names[i]);
}
sprintf(*path + pathlen, "/%s", names[i]);
}
- du_recurse(path, newpathlen, pathsize, gotdata, err, gotdata_ctx);
+ du_recurse(path, newpathlen, pathsize, gotdata, err, gotdata_ctx
, 0
);
sfree(names[i]);
}
sfree(names[i]);
}
@@
-249,5
+259,5
@@
void du(const char *inpath, gotdata_fn_t gotdata, err_fn_t err,
path = snewn(pathsize, char);
strcpy(path, inpath);
path = snewn(pathsize, char);
strcpy(path, inpath);
- du_recurse(&path, pathlen, &pathsize, gotdata, err, gotdata_ctx);
+ du_recurse(&path, pathlen, &pathsize, gotdata, err, gotdata_ctx
, 1
);
}
}