df: display origin of mapped drive

When a drive is mapped to a network share or a path display the
mapping in the 'Filesystem' column of df's output.

Since this changes the mnt_fsname field of the mntent structure
a slight alteration is needed to print_all_cwd() in ash.

Revert the change in commit a8c63f25b that enabled FEATURE_DF_FANCY
in the default configuration.  None of the additional options is
very useful.

See GitHub issue #164.

4 files changed, 12 insertions, 4 deletions

diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index 656a0ab7c..c3ba17a46 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -234,7 +234,7 @@ CONFIG_DD=y
 CONFIG_FEATURE_DD_IBS_OBS=y
 CONFIG_FEATURE_DD_STATUS=y
 CONFIG_DF=y
-CONFIG_FEATURE_DF_FANCY=y
+# CONFIG_FEATURE_DF_FANCY is not set
 CONFIG_DIRNAME=y
 CONFIG_DOS2UNIX=y
 CONFIG_UNIX2DOS=y
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index 8db906466..721420c06 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -234,7 +234,7 @@ CONFIG_DD=y
 CONFIG_FEATURE_DD_IBS_OBS=y
 CONFIG_FEATURE_DD_STATUS=y
 CONFIG_DF=y
-CONFIG_FEATURE_DF_FANCY=y
+# CONFIG_FEATURE_DF_FANCY is not set
 CONFIG_DIRNAME=y
 CONFIG_DOS2UNIX=y
 CONFIG_UNIX2DOS=y
diff --git a/shell/ash.c b/shell/ash.c
index 8a3c3ae35..68512799e 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -3185,7 +3185,8 @@ print_all_cwd(void)
         mnt = setmntent(bb_path_mtab_file, "r");
         if (mnt) {
                 while ((entry=getmntent(mnt)) != NULL) {
-                        if (get_drive_cwd(entry->mnt_fsname, buffer, PATH_MAX) != NULL)
+                        entry->mnt_dir[2] = '\0';
+                        if (get_drive_cwd(entry->mnt_dir, buffer, PATH_MAX) != NULL)
                                 out1fmt("%s\n", buffer);
                 }
                 endmntent(mnt);
diff --git a/win32/mntent.c b/win32/mntent.c
index 6d6ba319f..7ab51239d 100644
--- a/win32/mntent.c
+++ b/win32/mntent.c
@@ -8,7 +8,7 @@ struct mntdata {
         DWORD flags;
         int index;
         struct mntent me;
-        char mnt_fsname[4];
+        char mnt_fsname[PATH_MAX];
         char mnt_dir[4];
         char mnt_type[100];
         char mnt_opts[4];
@@ -33,6 +33,7 @@ struct mntent *getmntent(FILE *stream)
         struct mntdata *data = (struct mntdata *)stream;
         struct mntent *entry;
         UINT drive_type;
+        char buf[PATH_MAX];
 
         data->me.mnt_fsname = data->mnt_fsname;
         data->me.mnt_dir = data->mnt_dir;
@@ -63,6 +64,12 @@ struct mntent *getmntent(FILE *stream)
                                         continue;
                                 }
 
+                                if (realpath(data->mnt_dir, buf) != NULL) {
+                                        if (isalpha(buf[0]) && strcmp(buf+1, ":/") == 0)
+                                                buf[2] = '\0';
+                                        strcpy(data->mnt_fsname, buf);
+                                }
+
                                 entry = &data->me;
                                 break;
                         }