Changeset 171 for trunk/dll/dircnrs.c

Timestamp:

May 28, 2005, 7:31:05 PM (20 years ago)

Author:

root

Message:

More large file formatting updates

File:

• trunk/dll/dircnrs.c (modified) (5 diffs)

trunk/dll/dircnrs.c

@@ -14 +14 @@
   24 May 05 SHL Rework Win_Error usage
   25 May 05 SHL Use ULONGLONG and CommaFmtULL
+  26 May 05 SHL More large file formatting updates
 
 ***********************************************************************/
@@ -701 +702 @@
 
         FSALLOCATE fsa;
-        CHAR       s[CCHMAXPATH * 2],tf[81],tb[81],szBuf[81];
+        CHAR s[CCHMAXPATH * 2];
+        CHAR tf[64];
+        CHAR tb[64];
+        CHAR szFree[64];
 
         DosError(FERR_DISABLEHARDERR);
         if(!DosQueryFSInfo(toupper(*dcd->directory) - '@',
-           FSIL_ALLOC,&fsa,sizeof(FSALLOCATE))) {
-          strcpy(szBuf,"  {");
-          CommaFmtULL(szBuf + 3,sizeof(szBuf) - 5,
+           FSIL_ALLOC,&fsa,sizeof(FSALLOCATE)))
+        {
+          CommaFmtULL(tb,sizeof(tb),
                       (ULONGLONG)fsa.cUnitAvail * (fsa.cSectorUnit * fsa.cbSector),
                       'K');
-          strcat(szBuf,GetPString(IDS_KFREETEXT));
-          strcat(szBuf,"}");
+          sprintf(szFree,"  {%s %s}",
+                  tb,GetPString(IDS_FREETEXT));
         }
         else
-          *szBuf = 0;
+          *szFree = 0;
         commafmt(tf,sizeof(tf),dcd->totalfiles);
         CommaFmtULL(tb,sizeof(tb),dcd->ullTotalBytes,' ');
-        if(!fMoreButtons)
-          sprintf(s," [%s / %sb]%s%s%s%s %s",tf,tb,
-                  szBuf,
+        if (!fMoreButtons)
+        {
+          sprintf(s," [%s / %s]%s%s%s%s %s",
+                  tf,tb,szFree,
                   (*dcd->mask.szMask || dcd->mask.antiattr ||
                    dcd->mask.attrFile != ALLATTRS) ? "  (" : NullStr,
@@ -729 +734 @@
                    dcd->mask.attrFile != ALLATTRS) ? ")" : NullStr,
                   dcd->directory);
+        }
         else
-          sprintf(s," [%s / %sb]%s %s",tf,tb,szBuf,
-                  dcd->directory);
-        if(dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent))
+        {
+          sprintf(s," [%s / %s]%s %s",
+                  tf,tb,szFree,dcd->directory);
+        }
+        if (dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent))
           WinSetWindowText(hwndStatus,s);
       }
@@ -1536 +1544 @@
                 if(!fMoreButtons)
                   sprintf(s,
-                          " %sb  %04u/%02u/%02u %02u:%02u:%02u  [%s]  %s",
+                          " %s  %04u/%02u/%02u %02u:%02u:%02u  [%s]  %s",
                           tb,
                           pci->date.year,
@@ -3499 +3507 @@
                       if(!fMoreButtons)
                       {
-                        sprintf(s," %sb  %04u/%02u/%02u %02u:%02u:%02u  [%s]  %s",
+                        sprintf(s," %s  %04u/%02u/%02u %02u:%02u:%02u  [%s]  %s",
                                 tb,pci->date.year,
                                 pci->date.month,pci->date.day,pci->time.hours,