Changeset 211

Timestamp:

Mar 11, 2017, 2:48:09 PM (8 years ago)

Author:

Valery V. Sedletski

Message:

util: Rename again diskinfo -> f32parts, remove diskdump from packages.

Location:

trunk/src

Files:

• doc/message.txt (modified) (1 diff)
• makefile.mk (modified) (4 diffs)
• ufat32/chkdsk.c (modified) (2 diffs)
• ufat32/fatfunc.c (modified) (1 diff)
• ufat32/init.c16 (added)
• ufat32/makefile.wcc (modified) (1 diff)
• ufat32/os2.c (modified) (1 diff)
• ufat32/ufat32.c (modified) (3 diffs)
• ufat32/win32.c (modified) (1 diff)
• util/makefile.wcc (modified) (4 diffs)

trunk/src/doc/message.txt ¶

@@ -302 +302 @@
 LOG02436|2436  /|%s is fragmented |{}
 LOG02437|2437  /|CHKDSK was unable to recover a lost chain. SYS%4.4u |{}
+LOG02438|2438  /| | |Directory of %s (%lu clusters) | | |{}
+LOG02439|2439  /|This has been corrected |{}
+LOG02440|2440  /|%lu lost clusters found in %lu chains |{}
+LOG02441|2441  /|Warning!  Not enough memory is available for CHKDSK|to recover all lost data. |{}
+LOG02442|2442  /|The system detected lost data on disk %s. |{}
+LOG02443|2443  /|CHKDSK placed recovered data in file %s. |{}
+LOG02444|2444  /|CHKDSK corrected an allocation error for the file %s. |{}
 

trunk/src/makefile.mk ¶

@@ -27 +27 @@
 util     = &
  cachef32.exe &
- diskdump.exe &
- diskinfo.exe &
+ f32parts.exe &
  f32mon.exe   &
  f32stat.exe  &
@@ -55 +54 @@
 sym      = &
  boot\fat32.sym dll\ufat32.sym &
- cachef32.sym diskdump.sym diskinfo.sym f32mon.sym &
+ cachef32.sym f32parts.sym f32mon.sym &
  f32stat.sym f32chk.sym fat32chk.sym fat32fmt.sym fat32sys.sym
 
@@ -70 +69 @@
  $(p)os2\dll\ufat32.dll $(p)os2\dll\ufat32.sym &
  $(p)os2\cachef32.exe $(p)os2\cachef32.sym &
- $(p)os2\diskdump.exe $(p)os2\diskdump.sym &
- $(p)os2\diskinfo.exe $(p)os2\diskinfo.sym &
+ $(p)os2\f32parts.exe $(p)os2\f32parts.sym &
  $(p)os2\f32mon.exe $(p)os2\f32mon.sym &
  $(p)os2\f32stat.exe $(p)os2\f32stat.sym &
@@ -122 +120 @@
 
 .SUFFIXES:
-.SUFFIXES: .flt .ifs .dll .exe .lib .lnk .ols .obc .obd .obj .cpp .c .h .asm .sym .map .wmp .inf .ipf .bmp
+.SUFFIXES: .flt .ifs .dll .exe .lib .lnk .ols .obc .obd .obj .cpp .c .c16 .h .asm .sym .map .wmp .inf .ipf .bmp
 
 all: $(BLDROOT)\bld.flg $(PROJ_BLD)\makefile.wcc dirs copy targets &

trunk/src/ufat32/chkdsk.c ¶

@@ -166 +166 @@
             case 'H':
             case '?':
+               // show help
+               usage(rgArgv[0]);
+               exit(0);
                break;
             default :
@@ -461 +464 @@
       }
 
-   show_message("\n%1 bytes total disk spaceî\n", 0, 1361, 1,
+   show_message("\n%1 bytes total disk space.\n", 0, 1361, 1,
       TYPE_DOUBLE, (DOUBLE)pCD->ulTotalClusters * pCD->ulClusterSize);
    if (pCD->ulBadClusters)

trunk/src/ufat32/fatfunc.c ¶

@@ -1961 +1961 @@
       if (pszOldFile)
          {
-         if (pszFile)
-            strcpy(pszOldFileName, pszOldFile);
+         strcpy(pszOldFileName, pszOldFile);
 
          ulOldCluster = FindPathCluster(pCD, ulDirCluster, pszOldFileName, &OldOldEntry, NULL);

trunk/src/ufat32/makefile.wcc ¶

@@ -88 +88 @@
      sys
  @%append $[*.lnk IMPORT &
-     DOSSETSIGHANDLER DOSCALLS.14
+     DOSSETSIGHANDLER DOSCALLS.14, &
+     DOSSETVEC DOSCALLS.89
  @%append $[*.lnk LIBPATH $(%WATCOM)\lib386;$(%WATCOM)\lib386\os2
  @%append $[*.lnk LIB os2386,clib3s,math3s

trunk/src/ufat32/os2.c ¶

@@ -792 +792 @@
              {
              double arg = va_arg(va, double);
-             printf(",%lf", arg);
+             printf(",%12.0lf", arg);
              }
           else if (usType == TYPE_STRING)

trunk/src/ufat32/ufat32.c ¶

@@ -11 +11 @@
 int sys(int argc, char *argv[], char *envp[]);
 
-int show_message (char *pszMsg, unsigned short usLogMsg, unsigned short usMsg, unsigned short usNumFields, ...);
 void cleanup(void);
 
@@ -169 +168 @@
 }
 
-// the 16-bit exception handler
+// the 16-bit signal handler
 void _Far16 _Pascal _loadds HANDLER(USHORT x, USHORT iSignal)
 {
@@ -178 +177 @@
    exit(1);
 }
+
+// 16-bit exception handler
+int _Far16 _Pascal _loadds HANDLER2(void)
+{
+   printf("\n\nException has caught\n");
+
+   // remount disk for changes to take effect
+   cleanup();
+   exit(1);
+
+   return 0;
+}

trunk/src/ufat32/win32.c ¶

@@ -757 +757 @@
              {
              double arg = va_arg(va, double);
-             printf(",%lf", arg);
+             printf(",%%12.0lf", arg);
              }
           else if (usType == TYPE_STRING)

trunk/src/util/makefile.wcc ¶

@@ -15 +15 @@
 OBJS5=$(PROJ_BLD)\diskdump.obj
 
-TARGETS=$(BINROOT)\os2\f32stat.exe $(BINROOT)\os2\f32mon.exe $(BINROOT)\os2\diskinfo.exe  &
+TARGETS=$(BINROOT)\os2\f32stat.exe $(BINROOT)\os2\f32mon.exe $(BINROOT)\os2\f32parts.exe  &
         $(BINROOT)\os2\cachef32.exe $(BINROOT)\os2\diskdump.exe $(BINROOT)\os2\diskdump.sym $(BINROOT)\os2\cachef32.sym &
-        $(BINROOT)\os2\diskinfo.sym $(BINROOT)\os2\f32mon.sym $(BINROOT)\os2\f32stat.sym
+        $(BINROOT)\os2\f32parts.sym $(BINROOT)\os2\f32mon.sym $(BINROOT)\os2\f32stat.sym
 DIRS=..\include
 
 SYS=os2v2
 
-#diskinf0.c: fat32def.h fat32.h
-#diskinf1.c: fat32def.h fat32.h
-#diskinf2.c: fat32def.h fat32.h
-#monitor.c:  fat32def.h
-#cachef32.c: fat32def.h
-#f32stat.c:  fat32def.h
+#diskinf0.c: ..\include\fat32def.h ..\include\fat32.h
+#diskinf1.c: ..\include\fat32def.h ..\include\fat32.h
+#diskinf2.c: ..\include\fat32def.h ..\include\fat32.h
+#monitor.c:  ..\include\fat32def.h
+#cachef32.c: ..\include\fat32def.h
+#f32stat.c:  ..\include\fat32def.h
 
 $(BINROOT)\os2\f32stat.exe:
@@ -33 +33 @@
 $(BINROOT)\os2\f32mon.exe:
 
-$(BINROOT)\os2\diskinfo.exe:
+$(BINROOT)\os2\f32parts.exe:
 
 $(BINROOT)\os2\cachef32.exe:
@@ -43 +43 @@
 $(BINROOT)\os2\cachef32.sym:
 
-$(BINROOT)\os2\diskinfo.sym:
+$(BINROOT)\os2\f32parts.sym:
 
 $(BINROOT)\os2\f32mon.sym:
@@ -61 +61 @@
  @for %e in ($<) do @%append $^@ FILE %e
 
-$(PROJ_BLD)\diskinfo.ols: $(OBJS4)
+$(PROJ_BLD)\f32parts.ols: $(OBJS4)
  @%create $^@
  @for %e in ($<) do @%append $^@ FILE %e