Changeset 1916

Timestamp:

Nov 1, 2025, 7:30:47 PM (5 days ago)

Author:

Gregg Young

Message:

Fix easize so that EAs larger than 32767 show their actual size instead of 32767

Location:

trunk/dll

Files:

• autoview.c (modified) (1 diff)
• dirsize.c (modified) (3 diffs)
• droplist.c (modified) (2 diffs)
• eas.c (modified) (1 diff)
• eas.h (modified) (1 diff)
• filldir.c (modified) (3 diffs)
• grep.c (modified) (3 diffs)
• info.c (modified) (2 diffs)
• makelist.c (modified) (2 diffs)
• saveclip.c (modified) (2 diffs)
• seeall.c (modified) (1 diff)
• update.c (modified) (3 diffs)

trunk/dll/autoview.c

@@ -510 +510 @@
                     CommaFmtULL(szCmmaFmtFileSize,
                                 sizeof(szCmmaFmtFileSize),
-                                pffbFile->cbFile + CBLIST_TO_EASIZE(pffbFile->cbList),
+                                pffbFile->cbFile + pffbFile->cbList == 65535 ? GetLargeEASize(pffbFile->achName) : CBLIST_TO_EASIZE(pffbFile->cbList),
                                 ' ');
                     FDateFormat(szDate, pffbFile->fdateLastWrite);

trunk/dll/dirsize.c

@@ -100 +100 @@
 #include "pathutil.h"                   // AddBackslashToPath
 #include "tmrsvcs.h"
+#include "eas.h"                        // GetLargeEASize
 
 typedef struct
@@ -208 +209 @@
     if (!rc) {
       ullCurDirBytes = pffbArray->cbFile;
-      ullCurDirBytes += CBLIST_TO_EASIZE(pffbArray->cbList);
+      ullCurDirBytes += pffbArray->cbList == 65535 ? GetLargeEASize(pffbArray->achName) : CBLIST_TO_EASIZE(pffbArray->cbList);
     }
     else
@@ -289 +290 @@
               (pffbFile->achName[1] != '.' || pffbFile->achName[2])))) {
           ullCurDirBytes += pffbFile->cbFile;
-          ullCurDirBytes += CBLIST_TO_EASIZE(pffbFile->cbList) & 0x3ff;
+          ullCurDirBytes += (pffbFile->cbList == 65535 ? GetLargeEASize(pffbFile->achName) : CBLIST_TO_EASIZE(pffbFile->cbList)) & 0x3ff;
 
           if (*pchStopFlag)

trunk/dll/droplist.c

@@ -44 +44 @@
 
 #include "fortify.h"
+#include "eas.h"                        // GetLargeEASize
 
 static PSZ pszSrcFile = __FILE__;
@@ -446 +447 @@
 
         if (!DosQueryPathInfo(szFrom, FIL_QUERYEASIZEL, &fsa4, sizeof(fsa4)))
-          pcbFile[numfiles] = fsa4.cbFile + CBLIST_TO_EASIZE(fsa4.cbList);
+          pcbFile[numfiles] = fsa4.cbFile + fsa4.cbList == 65535 ? GetLargeEASize(szFrom) : CBLIST_TO_EASIZE(fsa4.cbList);
       }
       pulitemID[numfiles] = pDItem->ulItemID;

trunk/dll/eas.c

@@ -1488 +1488 @@
   DosPostEventSem(CompactSem);
 }
+#if 1
+ULONG  GetLargeEASize(PSZ filename)
+{
+  ULONG EASize = 0;
+  PDENA2 pdena;
+  ULONG ulEntry = 1, ulCount = 1;
+  int rc = 0;
+
+    pdena = xmalloc(65536 + 1024, pszSrcFile, __LINE__);
+    if (pdena) {
+      while ((rc = DosEnumAttribute(ENUMEA_REFTYPE_PATH,
+                                    filename,
+                                    ulEntry,
+                                    (PVOID)pdena,
+                                    (ULONG)65536,
+                                    &ulCount,
+                                    ENUMEA_LEVEL_NO_VALUE) == 0) && ulCount)
+      {
+        //GKY 10/10/25  name size term null EA data size  sizeofcbName & EAf(lag) sizeofcbValue sizeof next offset
+        EASize += (pdena->cbName) + pdena->cbValue + (sizeof(BYTE) * 2) + sizeof(USHORT) + sizeof(USHORT);
+        ulEntry += ulCount; //next entry
+      }
+      free(pdena);
+      DosPostEventSem(CompactSem);
+    }
+  return EASize;
+}
+
+#endif
 #pragma alloc_text(EAS,DisplayEAsProc,SaveEA,HexDumpEA,CheckEA,AddEAProc)
 #pragma alloc_text(EAS1,HexDump,GetFileEAs,Free_FEAList,GetLargeEASize)

trunk/dll/eas.h

@@ -32 +32 @@
 HOLDFEA *GetFileEAs(CHAR * filename, BOOL ishandle, BOOL silentfail);
 VOID HexDump(HWND hwnd, CHAR * value, ULONG cbValue);
+ULONG GetLargeEASize(PSZ filename);
 
 #endif // EAS_H

trunk/dll/filldir.c

@@ -172 +172 @@
 #include "pathutil.h"                   // AddBackslashToPath
 #include "tmrsvcs.h"                    // ITIMER_DESC
+#include "eas.h"                        // GetLargeEASize
 
 // Data definitions
@@ -620 +621 @@
   pci->crtime.minutes = pffb->ftimeCreation.minutes;
   pci->crtime.hours = pffb->ftimeCreation.hours;
-  pci->easize = CBLIST_TO_EASIZE(pffb->cbList);
+  if (pffb->cbList < 65535)
+    pci->easize = CBLIST_TO_EASIZE(pffb->cbList);
+  else
+    pci->easize = GetLargeEASize(pci->pszFileName);
   pci->cbFile = pffb->cbFile;
   pci->attrFile = pffb->attrFile;
@@ -782 +786 @@
   pci->crtime.minutes = pfsa4->ftimeCreation.minutes;
   pci->crtime.hours = pfsa4->ftimeCreation.hours;
-  pci->easize = CBLIST_TO_EASIZE(pfsa4->cbList);
+  if (pfsa4->cbList < 65535)
+    pci->easize = CBLIST_TO_EASIZE(pfsa4->cbList);
+  else
+    pci->easize = GetLargeEASize(pszFileName);
   pci->cbFile = pfsa4->cbFile;
   pci->attrFile = pfsa4->attrFile;

trunk/dll/grep.c

@@ -81 +81 @@
 #include "sortcnr.h"                    // SortCollectorCnr
 #include "collect.h"
+#include "eas.h"                        // GetLargeEASize
 
 static VOID DoAllSubdirs(GREP *grep,
@@ -871 +872 @@
       }
 
-      grep->insertedbytes += pffb->cbFile + CBLIST_TO_EASIZE(pffb->cbList);
+      grep->insertedbytes += pffb->cbFile + pffb->cbList == 65535 ? GetLargeEASize(pffb->achName) : CBLIST_TO_EASIZE(pffb->cbList);
       grep->toinsert++;
       // 07 Oct 09 SHL honor sync updates
@@ -913 +914 @@
     ULONG adjsize;
 
-    adjsize = pffb->cbFile + (grep->searchEAs ? CBLIST_TO_EASIZE(pffb->cbList) : 0);
+    adjsize = pffb->cbFile + (grep->searchEAs ? (pffb->cbList == 65535 ? GetLargeEASize(pffb->achName) : CBLIST_TO_EASIZE(pffb->cbList)) : 0);
     if (grep->greaterthan) {
       if (adjsize < grep->greaterthan)

trunk/dll/info.c

@@ -81 +81 @@
 #include "wrappers.h"                   // xDosFindFirst
 #include "fortify.h"
+#include "eas.h"                        // GetLargeEASize
 
 // Data definitions
@@ -737 +738 @@
                     sizeof(szCmmaFmtFileSize), fs.cbFile, ' ');
         CommaFmtULL(szCmmaFmtEASize,
-                    sizeof(szCmmaFmtEASize), CBLIST_TO_EASIZE(fs.cbList), ' ');
+                    sizeof(szCmmaFmtEASize), fs.cbList == 65535 ? GetLargeEASize(pfs->szFileName) : CBLIST_TO_EASIZE(fs.cbList), ' ');
         CommaFmtULL(szCmmaFmtFileEASize,
                     sizeof(szCmmaFmtFileEASize),
-                    fs.cbFile + CBLIST_TO_EASIZE(fs.cbList),
+                    fs.cbFile + fs.cbList == 65535 ? GetLargeEASize(pfs->szFileName) : CBLIST_TO_EASIZE(fs.cbList),
                     ' ');
         CommaFmtULL(szCmmaFmtFileEASizeK,
                     sizeof(szCmmaFmtFileEASizeK),
-                    fs.cbFile + CBLIST_TO_EASIZE(fs.cbList),
+                    fs.cbFile + fs.cbList == 65535 ? GetLargeEASize(pfs->szFileName) : CBLIST_TO_EASIZE(fs.cbList),
                     'K');
         sprintf(s,

trunk/dll/makelist.c

@@ -39 +39 @@
 #include "fortify.h"                    // 06 May 08 SHL
 #include "tmrsvcs.h"                    // ITIMER_DESC
+#include "eas.h"                        // GetLargeEASize
 
 static PSZ pszSrcFile = __FILE__;
@@ -150 +151 @@
     pfl->crtime = ffb4->ftimeCreation;
     pfl->cbFile = ffb4->cbFile;
-    pfl->easize = CBLIST_TO_EASIZE(ffb4->cbList);
+    //Need to account for snapshot file but since cbList is a ulong and will always be even the fact they can exceed
+    //65535 doesn't matter. 31 Oct 25 GKY
+    pfl->easize = ffb4->cbList == 65535 ? GetLargeEASize(ffb4->achName) : CBLIST_TO_EASIZE(ffb4->cbList);
     strcpy(pfl->fname, string);
     (*list)[*pnumfiles] = pfl;

trunk/dll/saveclip.c

@@ -67 +67 @@
 #include "dirs.h"                       // save_dir2
 #include "fortify.h"
+#include "eas.h"                        // GetLargeEASize
 
 static PSZ pszSrcFile = __FILE__;
@@ -961 +962 @@
                       break;
                     case 'E':
-                      fprintf(fp, "%-5u", CBLIST_TO_EASIZE(ffb4.cbList));
+                      fprintf(fp, "%-5u", 65535 ? GetLargeEASize(ffb4.achName) : CBLIST_TO_EASIZE(ffb4.cbList));
                       break;
                     case 'e':
-                      fprintf(fp, "%u", CBLIST_TO_EASIZE(ffb4.cbList));
+                      fprintf(fp, "%u", 65535 ? GetLargeEASize(ffb4.achName) : CBLIST_TO_EASIZE(ffb4.cbList));
                       break;
                     case 'd':

trunk/dll/seeall.c

@@ -815 +815 @@
                                             &fs4, sizeof(fs4)) &&
                           !(fs4.attrFile & FILE_DIRECTORY) &&
-                          // fixme to use CBLIST_TO_EASIZE?
+                          // fixme to use CBLIST_TO_EASIZE? No as it understates the size of EA > 32K
                           fs4.cbFile + fs4.cbList <= ullFreeBytes) {
                         // Swap with failing item

trunk/dll/update.c

@@ -51 +51 @@
 #include "misc.h"                       // PostMsg
 #include "fortify.h"
+#include "eas.h"                        // GetLargeEASize
 
 #ifdef PMPRINTF
@@ -142 +143 @@
       if ((!fForceUpper && !fForceLower && strcmp(pci->pszFileName, filename)) ||
           pci->cbFile != ffb.cbFile || pci->attrFile != ffb.attrFile ||
-          pci->easize != CBLIST_TO_EASIZE(ffb.cbList) || pci->date.day !=
+          pci->easize != 65535 ? GetLargeEASize(filename) : CBLIST_TO_EASIZE(ffb.cbList) || pci->date.day !=
           ffb.fdateLastWrite.day || pci->date.month != ffb.fdateLastWrite.month ||
           pci->date.year != ffb.fdateLastWrite.year + 1980 || pci->time.seconds !=
@@ -405 +406 @@
                strcmp(pci->pszFileName, filename[x])) ||
               pci->cbFile != ffb.cbFile || pci->attrFile != ffb.attrFile ||
-              pci->easize != CBLIST_TO_EASIZE(ffb.cbList) ||
+              pci->easize != 65535 ? GetLargeEASize(filename[x]) : CBLIST_TO_EASIZE(ffb.cbList) ||
               pci->date.day != ffb.fdateLastWrite.day ||
               pci->date.month != ffb.fdateLastWrite.month ||