mount enumeration (#141)

Author: adamyg

mcwin32/ChangeLog.txt

@@ -1,8 +1,10 @@
-Fri May 15 11:47:09 2025 adamy
+Thu May 22 14:03:24 2025 adamy
 
 	* build-235
 
-		o network drive interaction (#141)
+		o improve command-line locale/utf-8 support (#147)
+		o screen buffer save/restore (#143)
+		o network drive enumeration (#141)
 
 Wed May 14 10:50:13 2025 adamy
 

mcwin32/libw32/termemu_vio.c

@@ -3004,7 +3004,8 @@ vio_restore_lines(int top, int bottom, int to)
 
     assert(to >= -1);
 
-    if (NULL == state->image) return;           // uninitialised
+    if (NULL == state || NULL == state->image)  // uninitialised
+        return;
 
     // Size arena
     vio_size(console, &rows, &cols);
@@ -3067,7 +3068,8 @@ vio_restore(void)
         vio.chandle : GetStdHandle(STD_OUTPUT_HANDLE));
     int rows = 0, cols = 0;
 
-    if (NULL == vio_state.alt.image) return;    // uninitialised
+    if (NULL == vio_state.alt.image)            // uninitialised
+        return;
 
     // Size arena
     vio_size(console, &rows, &cols);

mcwin32/src/volinfo/README.md

@@ -0,0 +1,34 @@
+
+# volinfo - volume information
+
+A test framework which simulates the existing drive mapping emulation logic, analyses access times, and reports the corresponding delays.
+
+Facilitates the diagnosis and testing of the mounted system file interface, illuminating any access issues/bottle necks.
+
+## Usage
+
+```
+volinfo [options] [attributes] <operation>
+
+   Query disk information using on the following operations:
+
+Operations:
+   volumes -           Iterate by volume enumeration.
+   network -           Iterate by network enumeration.
+   drives -            Iterate published drive letters.
+   all -               All available methods.
+
+Attributes:
+   --volumeinfo        Volume information.
+   --drivetype         Drive type.
+   --attributes        Attributes.
+   --freespace         Free space.
+   --statfs            statfs, all attributes.
+
+Options:
+   --time              Access timestamps.
+   --verbose           Additional info.
+   --netconnected      Network status (default: connected).
+   or --netremembered.
+   --help
+```

mcwin32/src/volinfo/volinfo.c

@@ -49,6 +49,8 @@ static void OutputW(const wchar_t *, ...);
 
 static int otimestamp       = 0;
 static int overbose         = 0;
+static int onetconnected    = 1;
+
 static int ovolumeinfo      = 0;
 static int odrivetype       = 0;
 static int oattributes      = 0;
@@ -78,6 +80,11 @@ main(int argc, char *argv[])
                 } else if ((val = IsOption(option, "--verbose")) != NULL) {
                         overbose = 1;
 
+                } else if ((val = IsOption(option, "--netconnected")) != NULL) {
+                        onetconnected = 1;
+                } else if ((val = IsOption(option, "--netremembered")) != NULL) {
+                        onetconnected = 0;
+
                 } else if ((val = IsOption(option, "--volumeinfo")) != NULL) {
                         ovolumeinfo = 1;
                 } else if ((val = IsOption(option, "--drivetype")) != NULL) {
@@ -285,14 +292,18 @@ static void  NetworkDisplayStruct(unsigned i, LPNETRESOURCEW lpnrLocal);
 static BOOL WINAPI
 EnumNetworkFunc(LPNETRESOURCEW lpnr)
 {
+        const DWORD dwScope = (onetconnected ? RESOURCE_CONNECTED : RESOURCE_REMEMBERED);
+                // CONNECTED -  Open connections.
+                // REMEMBERED - PERSISTED, aka are connected at log-on.
+
         DWORD cbBuffer = 16384;                     // buffer size
         DWORD dwResult, dwResultEnum;
         DWORD cEntries = (DWORD)-1;                 // enumerate all possible entries
         LPNETRESOURCEW lpnrLocal = NULL;            // pointer to enumerated structures
         HANDLE hEnum = NULL;
 
         // Enumerate all currently connected resources.
-        dwResult = WNetOpenEnumW(RESOURCE_CONNECTED, RESOURCETYPE_DISK, 0, lpnr, &hEnum);
+        dwResult = WNetOpenEnumW(dwScope, RESOURCETYPE_DISK, 0, lpnr, &hEnum);
         if (dwResult != NO_ERROR) {
                 OutputA("WnetOpenEnum: failure %u\n", (unsigned)dwResult);
                 return FALSE;
@@ -679,21 +690,23 @@ Usage(void)
             "   Query disk information using on the following operations:\n" \
             "\n" \
             "Operations:\n" \
-            "   volumes -       iterate by volume enumeration.\n" \
-            "   network -       iterate by network enumeration.\n" \
-            "   drives -        iterate published drive letters.\n" \
-            "   all -           all available methods.\n" \
+            "   volumes -           Iterate by volume enumeration.\n" \
+            "   network -           Iterate by network enumeration.\n" \
+            "   drives -            Iterate published drive letters.\n" \
+            "   all -               All available methods.\n" \
             "\n" \
             "Attributes:\n" \
-            "   --volumeinfo    Volume information.\n" \
-            "   --drivetype     Drive type.\n" \
-            "   --attributes    Attributes.\n" \
-            "   --freespace     Free space.\n" \
-            "   --statfs        statfs, all attributes.\n" \
+            "   --volumeinfo        Volume information.\n" \
+            "   --drivetype         Drive type.\n" \
+            "   --attributes        Attributes.\n" \
+            "   --freespace         Free space.\n" \
+            "   --statfs            statfs, all attributes.\n" \
             "\n" \
             "Options:\n" \
-            "   --time          Access timestamps.\n" \
-            "   --verbose       Additional info.\n" \
+            "   --time              Access timestamps.\n" \
+            "   --verbose           Additional info.\n" \
+            "   --netconnected      Network status (default: connected).\n" \
+            "   or --netremembered.\n" \
             "   --help\n" \
             "\n");
 }
@@ -733,4 +746,3 @@ OutputW(const wchar_t *fmt, ...)
 }
 
 //end
-