win32: changes to mntent implementation

Make the structure returned by getmntent(3) static so it persists
after endmntent(3) closes the stream.  No current caller in the
WIN32 port needs this functionality but it's good to match the
documented behaviour.

Populate more fields of the mntent structure in find_mount_point().
This is required to support the df -t and -T flags recently added
upstream.

The static structures used here are allocated on demand.  Separate
static structures are used in each case because df iterates through
mounts calling statfs(2) on each and the WIN32 implementation of
statfs(2) calls find_mount_point().

1 files changed, 8 insertions, 15 deletions

diff --git a/libbb/find_mount_point.c b/libbb/find_mount_point.c
index edf734614..2464357c1 100644
--- a/libbb/find_mount_point.c
+++ b/libbb/find_mount_point.c
@@ -6,6 +6,9 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+#if ENABLE_PLATFORM_MINGW32
+# define MNTENT_PRIVATE
+#endif
 #include "libbb.h"
 #include <mntent.h>
 
@@ -25,13 +28,7 @@ struct mntent* FAST_FUNC find_mount_point(const char *name, int subdir_too)
         dev_t devno_of_name;
         bool block_dev;
 #else
-        static char mnt_fsname[4];
-        static char mnt_dir[4];
-        static char mnt_type[1];
-        static char mnt_opts[1];
-        static struct mntent my_mount_entry = {
-                mnt_fsname, mnt_dir, mnt_type, mnt_opts, 0, 0
-        };
+        static struct mntdata *data = NULL;
         char *current;
         const char *path;
         DWORD len;
@@ -105,15 +102,11 @@ struct mntent* FAST_FUNC find_mount_point(const char *name, int subdir_too)
         }
 
         if ( path && isalpha(path[0]) && path[1] == ':' ) {
-                mnt_fsname[0] = path[0];
-                mnt_fsname[1] = path[1];
-                mnt_fsname[2] = '\0';
-                mnt_dir[0] = path[0];
-                mnt_dir[1] = path[1];
-                mnt_dir[2] = '\\';
-                mnt_dir[3] = '\0';
+                if (data == NULL)
+                        data = xmalloc(sizeof(*data));
 
-                mountEntry = &my_mount_entry;
+                fill_mntdata(data, toupper(path[0]) - 'A');
+                mountEntry = &data->me;
         }
         free(current);
 #endif