public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin] Cygwin: Fix building of utils testsuite
@ 2020-12-02 15:32 Jon TURNEY
0 siblings, 0 replies; only message in thread
From: Jon TURNEY @ 2020-12-02 15:32 UTC (permalink / raw)
To: cygwin-cvs
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=0d0f06416a155de1025e289c56e800de092750c4
commit 0d0f06416a155de1025e289c56e800de092750c4
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Nov 30 16:58:02 2020 +0000
Cygwin: Fix building of utils testsuite
Avoid referencing undefined max_mount_entry.
Diff:
---
winsup/utils/path.cc | 4 ++++
winsup/utils/path.h | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/winsup/utils/path.cc b/winsup/utils/path.cc
index d8c208123..4c1bb4029 100644
--- a/winsup/utils/path.cc
+++ b/winsup/utils/path.cc
@@ -824,8 +824,10 @@ vcygpath (const char *cwd, const char *s, va_list v)
size_t max_len = 0;
mnt_t *m, *match = NULL;
+#ifndef TESTSUITE
if (!max_mount_entry)
read_mounts ();
+#endif
char *path;
if (s[0] == '.' && isslash (s[1]))
s += 2;
@@ -912,8 +914,10 @@ extern "C" FILE *
setmntent (const char *, const char *)
{
m = mount_table;
+#ifndef TESTSUITE
if (!max_mount_entry)
read_mounts ();
+#endif
return NULL;
}
diff --git a/winsup/utils/path.h b/winsup/utils/path.h
index af5deeba6..a1840a003 100644
--- a/winsup/utils/path.h
+++ b/winsup/utils/path.h
@@ -24,8 +24,8 @@ bool from_fstab_line (mnt_t *m, char *line, bool user);
#ifndef TESTSUITE
extern mnt_t mount_table[255];
-#endif
extern int max_mount_entry;
+#endif
#ifndef SYMLINK_MAX
#define SYMLINK_MAX 4095 /* PATH_MAX - 1 */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-12-02 15:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-02 15:32 [newlib-cygwin] Cygwin: Fix building of utils testsuite Jon TURNEY
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).