Changeset 187

Timestamp:

Feb 12, 2017, 11:42:05 PM (8 years ago)

Author:

Valery V. Sedletski

Message:

CHKDSK: Make UFAT32.DLL silent if we're doing autocheck and FS is clean.

Location:

trunk/src/ufat32

Files:

• chkdsk.c (modified) (5 diffs)
• fatfunc.c (modified) (3 diffs)
• format.c (modified) (1 diff)
• recover.c (modified) (2 diffs)

trunk/src/ufat32/chkdsk.c ¶

@@ -80 +80 @@
 USHORT MakeDirEntry(PCDINFO pCD, ULONG ulDirCluster, PDIRENTRY pNew, PSZ pszName);
 BOOL DeleteFatChain(PCDINFO pCD, ULONG ulCluster);
-BOOL LoadTranslateTable(VOID);
+BOOL LoadTranslateTable(BOOL fSilent);
 VOID GetFirstInfo( PBOOL pFirstInfo );
 VOID GetCaseConversion( PUCHAR pCase );
@@ -180 +180 @@
    f32Parms.fEAS = TRUE;
 
-   LoadTranslateTable();
-
-   TranslateInitDBCSEnv();
-
-   CaseConversionInit();
-
-   fToFile = OutputToFile();
-
    pCD = (PCDINFO)malloc(sizeof(CDINFO));
    if (!pCD)
       return ERROR_NOT_ENOUGH_MEMORY;
    memset(pCD, 0, sizeof (CDINFO));
-
-   printf("(UFAT32.DLL version %s compiled on " __DATE__ ")\n", FAT32_VERSION);
 
    for (iArg = 1; iArg < iArgc; iArg++)
@@ -232 +222 @@
       }
 
+   LoadTranslateTable(pCD->fAutoCheck);
+
+   TranslateInitDBCSEnv();
+
+   CaseConversionInit();
+
+   fToFile = OutputToFile();
+
    ulDataSize = sizeof(f32Parms);
    //rc = DosFSCtl(
@@ -661 +659 @@
       p--;
    *p = 0;
-   if( p > szString )
-      show_message("The volume label is %s.", 1375, 1, TYPE_STRING, szString);
-
-   sprintf(szString, "%4.4X-%4.4X",
-      HIUSHORT(pCD->BootSect.ulVolSerial), LOUSHORT(pCD->BootSect.ulVolSerial));
-   show_message("The Volume Serial Number is %s.", 1243, 1, TYPE_STRING, szString);
+
    if (pCD->BootSect.bpb.MediaDescriptor != 0xF8)
       {
@@ -675 +668 @@
 
    pCD->fCleanOnBoot = GetDiskStatus(pCD);
+
+   if (! pCD->fAutoCheck || ! pCD->fCleanOnBoot)
+      {
+      printf("(UFAT32.DLL version %s compiled on " __DATE__ ")\n", FAT32_VERSION);
+
+      if( p > szString )
+         show_message("The volume label is %s.", 1375, 1, TYPE_STRING, szString);
+
+      sprintf(szString, "%4.4X-%4.4X",
+         HIUSHORT(pCD->BootSect.ulVolSerial), LOUSHORT(pCD->BootSect.ulVolSerial));
+      show_message("The Volume Serial Number is %s.", 1243, 1, TYPE_STRING, szString);
+      }
 
    if (pCD->fAutoRecover && pCD->fCleanOnBoot)

trunk/src/ufat32/fatfunc.c ¶

@@ -152 +152 @@
 VOID GetFirstInfo( PBOOL pFirstInfo );
 VOID SetUni2NLS( USHORT usPage, USHORT usChar, USHORT usCode );
-BOOL LoadTranslateTable(VOID);
+BOOL LoadTranslateTable(BOOL fSilent);
 VOID GetCaseConversion( PUCHAR pCase );
 BOOL UpdateFSInfo(PCDINFO pCD);
@@ -2129 +2129 @@
 *
 ******************************************************************/
-BOOL LoadTranslateTable(VOID)
+BOOL LoadTranslateTable(BOOL fSilent)
 {
     APIRET rc;
@@ -2404 +2404 @@
 
    f32Parms.ulCurCP = rgCP[0];
-   //if( !fSilent )
+   if( ! fSilent )
        printf("FAT32: Unicode translate table for CP %lu loaded.\n", rgCP[0]);
    rc = TRUE;

trunk/src/ufat32/format.c ¶

@@ -486 +486 @@
                  "    ... \n"
                  "  128 - use 128 sectors per cluster (64K clusters)\n"
+                 "/P is specified by PM fromtends\n"
                  "/V:<volume label>\n"
                  "/R:<reserved sectors>\n"

trunk/src/ufat32/recover.c ¶

@@ -18 +18 @@
 ULONG FindPathCluster(PCDINFO pCD, ULONG ulCluster, PSZ pszPath, PDIRENTRY pDirEntry, PSZ pszFullName);
 USHORT RecoverChain2(PCDINFO pCD, ULONG ulCluster, PBYTE pData, USHORT cbData);
-BOOL LoadTranslateTable(VOID);
+BOOL LoadTranslateTable(BOOL fSilent);
 
 BOOL DoRecover(PCDINFO pCD, char *pszFilename);
@@ -38 +38 @@
    int i;
 
-   LoadTranslateTable();
+   LoadTranslateTable(0);
 
    pCD = (PCDINFO)malloc(sizeof(CDINFO));