summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Src/parse.c22
-rw-r--r--Src/utils.c19
3 files changed, 25 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 647b5c0f4..70e41c133 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2001-06-09 Bart Schaefer <schaefer@zsh.org>
+ * 14827: Src/parse.c, Src/utils.c: Move zwcstat() to parse.c
+ where it can be wrapped in #ifdef USE_MMAP.
+
* 14824: Test/comptest: Avoid echotc (improvement on 14792).
2001-06-08 Clint Adams <clint@zsh.org>
diff --git a/Src/parse.c b/Src/parse.c
index ea0dffdef..09e60ead2 100644
--- a/Src/parse.c
+++ b/Src/parse.c
@@ -2775,6 +2775,24 @@ build_cur_dump(char *nam, char *dump, char **names, int match, int map,
static FuncDump dumps;
+/**/
+static int
+zwcstat(char *filename, struct stat *buf, FuncDump dumps)
+{
+ FuncDump f;
+
+ if (stat(filename, buf)) {
+#ifdef HAVE_FSTAT
+ for (f = dumps; f; f = f->next) {
+ if (!strncmp(filename, f->filename, strlen(f->filename)) &&
+ !fstat(f->fd, buf))
+ return 0;
+ }
+#endif
+ return 1;
+ } else return 0;
+}
+
/* Load a dump file (i.e. map it). */
static void
@@ -2830,6 +2848,10 @@ load_dump_file(char *dump, struct stat *sbuf, int other, int len)
d->filename = ztrdup(dump);
}
+#else
+
+#define zwcstat(f, b, d) stat(f, b)
+
#endif
/* Try to load a function from one of the possible wordcode files for it.
diff --git a/Src/utils.c b/Src/utils.c
index 9ef3ec88c..6bede2e43 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -3829,22 +3829,3 @@ mailstat(char *path, struct stat *st)
return 0;
}
#endif
-
-/**/
-mod_export int
-zwcstat(char *filename, struct stat *buf, FuncDump dumps)
-{
- FuncDump f;
-
- if (stat(filename, buf)) {
-#ifdef HAVE_FSTAT
- for (f = dumps; f; f = f->next) {
- if (!strncmp(filename, f->filename, strlen(f->filename)) &&
- !fstat(f->fd, buf))
- return 0;
- }
-#endif
- return 1;
- } else return 0;
-
-}