From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jturney@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2201)
 id 5F1E8395C809; Wed,  2 Dec 2020 15:32:25 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5F1E8395C809
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Jon TURNEY <jturney@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: Fix building of utils testsuite
X-Act-Checkin: newlib-cygwin
X-Git-Author: Jon Turney <jon.turney@dronecode.org.uk>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: aec6479820fee5f71d50930bf0dde2bbf386bd4b
X-Git-Newrev: 0d0f06416a155de1025e289c56e800de092750c4
Message-Id: <20201202153225.5F1E8395C809@sourceware.org>
Date: Wed,  2 Dec 2020 15:32:25 +0000 (GMT)
X-BeenThere: cygwin-cvs@cygwin.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Cygwin core component git logs <cygwin-cvs.cygwin.com>
List-Unsubscribe: <https://cygwin.com/mailman/options/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=unsubscribe>
List-Archive: <https://cygwin.com/pipermail/cygwin-cvs/>
List-Help: <mailto:cygwin-cvs-request@cygwin.com?subject=help>
List-Subscribe: <https://cygwin.com/mailman/listinfo/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=subscribe>
X-List-Received-Date: Wed, 02 Dec 2020 15:32:25 -0000

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 */