WebSVN – oidplus – Diff – /trunk_dos/OIDPLUS.PAS

 program OIDPLUS;
 (************************************************)
 (* OIDPLUS.PAS                                  *)
 (* Author:   Daniel Marschall                   *)
-(* Revision: 2022-02-14                         *)
+(* Revision: 2022-02-15                         *)
 (* License:  Apache 2.0                         *)
 (* This file contains:                          *)
 (* - "OIDplus for DOS" program                  *)
 (************************************************)
 uses
   Dos, Crt, StrList, VtsFuncs, VtsCui, OidFile, OidUtils;
 const
-  VERSIONINFO            = 'Revision: 2022-02-14';
+  VERSIONINFO            = 'Revision: 2022-02-15';
   DEFAULT_STATUSBAR      = '(C)2020-2022 ViaThinkSoft. Licensed under the terms of the Apache 2.0 license.';
   TITLEBAR_LEFT_TEXT     = 'OIDplus';
   DISKIO_SOUND_DEBUGGING = false;
   DISKIO_SOUND_DELAY     = 500;
   ASNEDIT_LINES          = 10;
   MAINMENU_HEIGHT        = 3;
   MAINMENU_ALLOW_ESC     = false;
   TREEVIEW_INDENT        = 0;
   TREEVIEW_INCLUDE_DESC  = true;
   TREEVIEW_WIDTH         = 80;
+  OID_EXTENSION          = '.OID';
+  TREEVIEW_FILENAME      = 'OIDTREE.TXT';
 procedure _Pause;
 var
   bakX, bakY: integer;
 begin
   iId: LongInt;
   sId: string;
 begin
   (* Put all found files into a list *)
   CreateList(list);
-  FindFirst('????????.OID', Archive, DirInfo);
+  FindFirst(RepeatStr('?',8)+OID_EXTENSION, Archive, DirInfo);
   while DosError = 0 do
   begin
     sId := Copy(DirInfo.Name, 1, 8);
     ListAppend(list, sId);
     FindNext(DirInfo);
   newOID^.Parent := oid^.FileId + oid^.DotNotation;
   if NumIdEditor(newOID, oid) and
      AsnEditor(newOID) and
      DescEditor(newOID) then
   begin
-    newfilename := newOID^.FileId + '.OID';
+    newfilename := newOID^.FileId + OID_EXTENSION;
     if _WriteOidFile(newfilename, newOID, true) then
     begin
       (* Add link to original file and enable the saving of it *)
       ListAppend(oid^.SubIds, newOID^.FileId + newOID^.DotNotation);
       NewOidEditor := true; (* request caller to save <oid> *)
   childOID: POID;
   filenameChild: string;
 begin
   for i := 0 to ListCount(oid^.SubIds)-1 do
   begin
-    filenameChild := FileIdPart(ListGetElement(oid^.SubIds, i)) + '.OID';
+    filenameChild := FileIdPart(ListGetElement(oid^.SubIds, i)) + OID_EXTENSION;
     if FileExists(filenameChild) then
     begin
       CreateOidDef(childOID);
-      if _ReadOidFile(filenameChild, childOID, false) then
+      if _ReadOidFile(filenameChild, childOID, false) and
+         (childOID^.Parent = oid^.FileId + oid^.DotNotation) then
       begin
         DeleteChildrenRecursive(childOID);
       end;
       FreeOidDef(childOID);
       DeleteFile(filenameChild);
   (* Remove all children and their files recursively *)
   DeleteChildrenRecursive(selfOID);
   (* Remove forward reference in parent OID *)
   (* (this is the most important part)      *)
-  filenameParent := FileIdPart(selfOID^.Parent) + '.OID';
+  filenameParent := FileIdPart(selfOID^.Parent) + OID_EXTENSION;
   if FileExists(filenameParent) then
   begin
     CreateOidDef(parentOID);
     if _ReadOidFile(filenameParent, parentOID, true) then
     begin
     end;
     FreeOidDef(parentOID);
   end;
   (* Delete own file *)
-  filenameSelf := selfOID^.FileId + '.OID';
+  filenameSelf := selfOID^.FileId + OID_EXTENSION;
   if FileExists(filenameSelf) then
   begin
     DeleteFile(filenameSelf);
   end;
 end;
       end;
     end;
     (* Now prepare the menu entries *)
-    CreateList(subsel);   (* Contains the human readable OID name *)
+    CreateList(subsel);   (* Contains the human-readable OID name *)
     CreateList(subfiles); (* Contains the file name               *)
     if oid^.Parent = '' then
     begin
       isRoot := true;
     end;
     if (oid^.Parent <> '') and not isRoot then
     begin
       sTmp := oid^.Parent;
-      subfile := FileIdPart(sTmp) + '.OID';
+      subfile := FileIdPart(sTmp) + OID_EXTENSION;
       if FileExists(subfile) then
       begin
         CreateOidDef(tmpOID);
-        if _ReadOidFile(subfile, tmpOID, true) then
+        if not _ReadOidFile(subfile, tmpOID, true) then
-          ListAppend(subsel, 'Go to parent ' + DotNotationPart(sTmp) + _ShowASNIds(tmpOID))
-        else
+        begin
           ListAppend(subsel, 'Go to parent ' + DotNotationPart(sTmp) + ' (READ ERROR)');
+          ListAppend(subfiles, 'ERROR: '+subfile+' Read error or file invalid');
+        end
+        else
+        begin
+          ListAppend(subsel, 'Go to parent ' + DotNotationPart(sTmp) + _ShowASNIds(tmpOID));
+          ListAppend(subfiles, subfile);
+        end;
         FreeOidDef(tmpOID);
       end
       else
       begin
         ListAppend(subsel, 'Go to parent ' + DotNotationPart(sTmp) + ' (FILE NOT FOUND)');
+        ListAppend(subfiles, 'ERROR: File '+subfile+' was not found');
       end;
-      ListAppend(subfiles, subfile);
     end;
     if isRoot then
     begin
       menuIdExit := ListAppend(subsel, 'Back to main menu');
     else menuIdExit := -99;
     for i := 0 to ListCount(oid^.SubIds)-1 do
     begin
       sTmp := ListGetElement(oid^.SubIds, i);
-      subfile := FileIdPart(sTmp) + '.OID';
+      subfile := FileIdPart(sTmp) + OID_EXTENSION;
       if FileExists(subfile) then
       begin
         CreateOidDef(tmpOID);
-        if _ReadOidFile(subfile, tmpOID, true) then
+        if not _ReadOidFile(subfile, tmpOID, true) then
-          ListAppend(subsel, 'Go to child  ' + DotNotationPart(sTmp) + _ShowASNIds(tmpOID))
-        else
+        begin
           ListAppend(subsel, 'Go to child  ' + DotNotationPart(sTmp) + ' (READ ERROR)');
+          ListAppend(subfiles, 'ERROR: Read error at file '+subfile+', or file is invalid.');
+        end
+        else if tmpOID^.Parent <> oid^.FileId + oid^.DotNotation then
+        begin
+          ListAppend(subsel, 'Go to child  ' + DotNotationPart(sTmp) + ' (BAD BACKREF)');
+          ListAppend(subfiles, 'ERROR: File '+subfile+' has a wrong back-reference.');
+        end
+        else
+        begin
+          ListAppend(subsel, 'Go to child  ' + DotNotationPart(sTmp) + _ShowASNIds(tmpOID));
+          ListAppend(subfiles, subfile);
+        end;
         FreeOidDef(tmpOID);
       end
       else
       begin
         ListAppend(subsel, 'Go to child  ' + DotNotationPart(sTmp) + ' (FILE NOT FOUND)');
+        ListAppend(subfiles, 'ERROR: File '+subfile+' was not found');
       end;
-      ListAppend(subfiles, subfile);
     end;
     if oid^.DotNotation <> '' then
     begin
       menuIdAsnEdit := ListAppend(subsel, 'Edit ASN.1 identifiers');
     end
     else if subselres = menuIdDelete then
     begin
       if _DeleteConfirmation then
       begin
-        sTmp := FileIdPart(oid^.Parent) + '.OID';
+        sTmp := FileIdPart(oid^.Parent) + OID_EXTENSION;
         DeleteOidRecursive(oid);
         if FileExists(sTmp) then
         begin
           filename := sTmp;
         end
         else
         begin
-          ShowMessage('Parent file ' + sTmp + ' not found', 'ERROR', true);
+          ShowMessage('Parent file ' + sTmp + ' was not found', 'ERROR', true);
           _Pause;
           exitRequest := true;
         end;
       end;
     end
       exitRequest := true;
     end
     else
     begin
       (* Normal OID *)
+      (* Above we already checked if the files are valild and existing *)
       sTmp := ListGetElement(subfiles, subselres);
-      if FileExists(sTmp) then
+      if Copy(sTmp, 1, Length('ERROR: ')) = 'ERROR: ' then
       begin
+        Delete(sTmp, 1, Length('ERROR: '));
+        ShowMessage(sTmp, 'ERROR', true);
-        filename := sTmp;
+        _Pause;
       end
       else
       begin
-        ShowMessage('File ' + sTmp + ' not found', 'ERROR', true);
-        _Pause;
+        filename := sTmp;
       end;
     end;
     FreeList(subsel);
     FreeList(subfiles);
 function _GetRootFile(ShowErrorMessage: boolean): string;
 var
   rootFile: string;
 begin
-  rootFile := ZeroPad(0, 8) + '.OID';
+  rootFile := ZeroPad(0, 8) + OID_EXTENSION;
   _GetRootFile := rootFile;
   if not FileExists(rootFile) then
   begin
     if not CreateRootOIDFile(rootFile, ShowErrorMessage) then
     begin
   end;
   for i := 1 to Length(sTmp) do
   begin
     if (sTmp[i]=#13) or (sTmp[i]=#10) then sTmp[i] := ' ';
   end;
-  if Length(sTmp) > TREEVIEW_WIDTH then
-  begin
-    sTmp := Copy(sTmp, 1, TREEVIEW_WIDTH-3) + '...';
+  sTmp := TrimLineToWidth(sTmp, TREEVIEW_WIDTH);
-  end;
   _GetTreeViewLine := sTmp;
 end;
 procedure _RecTreeExport(oid: POID; var F: Text; indent: integer);
 var
   (* Recursively call children *)
   for i := 0 to ListCount(oid^.SubIds)-1 do
   begin
     sTmp := ListGetElement(oid^.SubIds, i);
     CreateOidDef(suboid);
-    childFilename := FileIdPart(sTmp) + '.OID';
+    childFilename := FileIdPart(sTmp) + OID_EXTENSION;
     if not FileExists(childFilename) then
     begin
-      sTmp := 'ERROR: ' + childFilename + ' FILE MISSING (CONTAINS ' + DotNotationPart(sTmp) + ')!';
+      sTmp := 'ERROR: MISSING ' + childFilename + ' (SHALL CONTAIN ' + DotNotationPart(sTmp) + ')!';
       sTmp := TrimLineToWidth(sTmp, TREEVIEW_WIDTH);
       WriteLn(F, sTmp);
     end
     else if not _ReadOidFile(childFilename, suboid, false) then
     begin
-      sTmp := 'ERROR: ' + childFilename + ' READ ERROR (CONTAINS ' + DotNotationPart(sTmp) + ')!';
+      sTmp := 'ERROR: READ ERROR AT ' + childFilename + ' (SHALL CONTAIN ' + DotNotationPart(sTmp) + ')!';
+      sTmp := TrimLineToWidth(sTmp, TREEVIEW_WIDTH);
+      WriteLn(F, sTmp);
+    end
+    else if suboid^.Parent <> oid^.FileId + oid^.DotNotation then
+    begin
+      (* This can happen if a file is missing, and then another OID gets this filename since the number seems to be free *)
+      sTmp := 'ERROR: BAD BACKREF AT ' + childFilename + ' (SHALL CONTAIN ' + DotNotationPart(sTmp) + ')!';
       sTmp := TrimLineToWidth(sTmp, TREEVIEW_WIDTH);
       WriteLn(F, sTmp);
     end
     else
     begin
   begin
     DrawStatusBar(DEFAULT_STATUSBAR);
     Exit;
   end;
-  Assign(F, 'OIDTREE.TXT');
+  Assign(F, TREEVIEW_FILENAME);
   {$I-}
   Rewrite(F);
   {$I+}
   if IoResult <> 0 then
   begin
     (* Can happen if disk is read-only (Runtime Error 150) *)
-    ShowMessage('Cannot open OIDTREE.TXT for writing.', 'ERROR', true);
+    ShowMessage('Cannot open '+TREEVIEW_FILENAME+' for writing.', 'ERROR', true);
     _Pause;
     DrawStatusBar(DEFAULT_STATUSBAR);
     Exit;
   end;
   Close(F);
   DrawStatusBar(DEFAULT_STATUSBAR);
   if res then
   begin
-    ShowMessage('TreeView successfully exported as OIDTREE.TXT', 'TREEVIEW EXPORT', true);
+    ShowMessage('TreeView successfully exported as '+TREEVIEW_FILENAME, 'TREEVIEW EXPORT', true);
     _Pause;
   end;
 end;
 procedure OP_MainMenu;

Subversion Repositories oidplus

oidplus/trunk_dos/OIDPLUS.PAS – Rev 743 → 744