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

   DISKIO_SOUND_DEBUGGING = false;
-  DISKIO_SOUND_DELAY = 500;
+  DISKIO_SOUND_DELAY     = 500;
-  ASNEDIT_LINES = 10;
+  ASNEDIT_LINES          = 10;
-  DESCEDIT_LINES = 10;
+  DESCEDIT_LINES         = 10;
-  DESCEDIT_PADDING = 3;
+  DESCEDIT_PADDING       = 3;
+  ACTIONMENU_SIZE        = 5;
+  MAINMENU_WIDTH         = 15;
+  MAINMENU_HEIGHT        = 3;
+  MAINMENU_ALLOW_ESC     = false;
 procedure _WriteOidFile(filename: string; oid: POid);
 begin
   DrawStatusBar('Write file ' + filename + '...');
   WriteOidFile(filename, oid);
   DrawStatusBar(DEFAULT_STATUSBAR);
 end;
 function _ShowASNIds(subfile: string): string;
 var
-  coid: TOID;
+  childOID: POID;
   j, jmax: integer;
   sTmp: string;
 begin
   sTmp := '';
-  InitOidDef(@coid);
+  CreateOidDef(childOID);
-  _ReadOidFile(subfile, @coid);
+  _ReadOidFile(subfile, childOID);
-  jmax := ListCount(coid.ASNIds)-1;
+  jmax := ListCount(childOID^.ASNIds)-1;
   for j := 0 to jmax do
   begin
     if j = 0 then sTmp := sTmp + ' (';
-    sTmp := sTmp + ListGetElement(coid.ASNIds, j);
+    sTmp := sTmp + ListGetElement(childOID^.ASNIds, j);
     if j = jmax then
       sTmp := sTmp + ')'
     else
       sTmp := sTmp + ', ';
   end;
-  FreeOidDef(@coid);
+  FreeOidDef(childOID);
   _ShowASNIds := sTmp;
 end;
 function AsnAlreadyExisting(oid: POID; asnid: string): boolean;
 var
   asnList: PStringList;
   i: integer;
   x, y, w, h: integer;
   res: integer;
   sInput: string;
+  menuIdNew, menuIdSave, menuIdExit: integer;
 begin
   AsnEditor := false;
   repeat
-    InitList(asnList);
+    CreateList(asnList);
     for i := 0 to ListCount(oid^.ASNIds)-1 do
     begin
       ListAppend(asnList, ListGetElement(oid^.ASNIDs, i));
     end;
-    ListAppend(asnList, '<NEW>');
+    menuIdNew  := ListAppend(asnList, '<NEW>');
-    ListAppend(asnList, '<SAVE>');
+    menuIdSave := ListAppend(asnList, '<SAVE>');
-    ListAppend(asnList, '<CANCEL>');
+    menuIdExit := ListAppend(asnList, '<CANCEL>');
     DrawStatusBar(DEFAULT_STATUSBAR);
     x := SINGLE_LINE_BOX_PADDING;
     y := ScreenHeight div 2 - ASNEDIT_LINES div 2;
     w := ScreenWidth - (SINGLE_LINE_BOX_PADDING-1)*2;
     h := ASNEDIT_LINES;
     res := DrawSelectionList(x, y, w, h,
                              asnList, true,
                              'EDIT ASN.1 IDENTIFIERS',
 );
+    FreeList(asnList);
     (* Change double-border to thin-border *)
     DrawThinBorder(x-1, y-1, w+2, h+2);
     GoToXY(x+1, y-1);
     Write('EDIT ASN.1 IDENTIFIERS');
     if res = -1 then
     begin
       exit;
     end
-    else if res = ListCount(oid^.ASNIDs) then
+    else if res = menuIdNew then
     begin
       (* "NEW" item was selected *)
       sInput := '';
       repeat
         if QueryVal(sInput,
           end;
         end
         else break;
       until false;
     end
-    else if res = ListCount(oid^.ASNIDs)+1 then
+    else if res = menuIdSave then
     begin
       (* "SAVE" item was selected *)
       AsnEditor := true;
       Exit;
     end
-    else if res = ListCount(oid^.ASNIDs)+2 then
+    else if res = menuIdExit then
     begin
       (* "CANCEL" item was selected *)
       AsnEditor := false;
       Exit;
     end
   list: PStringList;
   iId: LongInt;
   sId: string;
 begin
   (* Put all found files into a list *)
-  InitList(list);
+  CreateList(list);
   FindFirst('????????.OID', Archive, DirInfo);
   while DosError = 0 do
   begin
     sId := Copy(DirInfo.Name, 1, 8);
     ListAppend(list, sId);
   else
     searchDotNotation := parentOID^.DotNotation + '.' + sInput;
   for i := 0 to ListCount(parentOID^.SubIds)-1 do
   begin
     sTmp := ListGetElement(parentOID^.SubIds, i);
-    Delete(sTmp, 1, 8);
-    if sTmp = searchDotNotation then
+    if DotNotationPart(sTmp) = searchDotNotation then
     begin
       NumIdAlreadyExisting := true;
       exit;
     end;
   end;
 end;
 function NewOidEditor(oid: POID): boolean;
 var
   newfilename: string;
-  newoid: TOID;
+  newOID: POID;
 begin
   NewOidEditor := false;
-  InitOidDef(@newoid);
+  CreateOidDef(newOID);
-  newoid.FileId := NextPossibleFileID;
+  newOID^.FileId := NextPossibleFileID;
-  newoid.Parent := oid^.FileId + oid^.DotNotation;
+  newOID^.Parent := oid^.FileId + oid^.DotNotation;
-  if NumIdEditor(@newoid, oid) and
+  if NumIdEditor(newOID, oid) and
-     AsnEditor(@newoid) and
+     AsnEditor(newOID) and
-     DescEditor(@newoid) then
+     DescEditor(newOID) then
   begin
-    newfilename := newoid.FileId + '.OID';
+    newfilename := newOID^.FileId + '.OID';
-    _WriteOidFile(newfilename, @newoid);
+    _WriteOidFile(newfilename, newOID);
     (* Add link to original file and enable the saving of it *)
-    ListAppend(oid^.SubIds, newoid.FileId + newoid.DotNotation);
+    ListAppend(oid^.SubIds, newOID^.FileId + newOID^.DotNotation);
     NewOidEditor := true; (* request caller to save @oid *)
   end;
-  FreeOidDef(@newoid);
+  FreeOidDef(newOID);
 end;
 procedure DeleteChildrenRecursive(oid: POID);
 var
   i: integer;
-  childOID: TOID;
+  childOID: POID;
   filenameChild: string;
 begin
   for i := 0 to ListCount(oid^.SubIds)-1 do
   begin
-    filenameChild := Copy(ListGetElement(oid^.SubIds, i), 1, 8) + '.OID';
+    filenameChild := FileIdPart(ListGetElement(oid^.SubIds, i)) + '.OID';
-    InitOidDef(@childOID);
+    CreateOidDef(childOID);
-    _ReadOidFile(filenameChild, @childOID);
+    _ReadOidFile(filenameChild, childOID);
-    DeleteChildrenRecursive(@childOID);
+    DeleteChildrenRecursive(childOID);
-    FreeOidDef(@childOID);
+    FreeOidDef(childOID);
     DeleteFile(filenameChild);
   end;
   ListClear(oid^.SubIds);
 end;
 procedure DeleteOidRecursive(selfOID: POID);
 var
   i: integer;
-  parentOID: TOID;
+  parentOID: POID;
   filenameSelf, filenameParent: string;
   fileIdToDelete: string;
+  sTmp: string;
 begin
   (* Remove all children and their files recursively *)
   DeleteChildrenRecursive(selfOID);
   (* Remove forward reference in parent OID *)
-  filenameParent := Copy(selfOID^.Parent, 1, 8)+'.OID';
+  filenameParent := FileIdPart(selfOID^.Parent) + '.OID';
-  InitOidDef(@parentOID);
+  CreateOidDef(parentOID);
-  _ReadOidFile(filenameParent, @parentOID);
+  _ReadOidFile(filenameParent, parentOID);
-  for i := 0 to ListCount(parentOID.SubIds)-1 do
+  for i := 0 to ListCount(parentOID^.SubIds)-1 do
   begin
-    if Copy(ListGetElement(parentOID.SubIds, i), 1, 8) = selfOID^.FileId then
+    sTmp := ListGetElement(parentOID^.SubIds, i);
+    if FileIdPart(sTmp) = selfOID^.FileId then
     begin
-      ListDeleteElement(parentOID.SubIds, i);
+      ListDeleteElement(parentOID^.SubIds, i);
-      _WriteOidFile(filenameParent, @parentOID);
+      _WriteOidFile(filenameParent, parentOID);
       break;
     end;
   end;
-  FreeOidDef(@parentOID);
+  FreeOidDef(parentOID);
   (* Delete own file *)
   fileIdToDelete := selfOID^.FileId;
   filenameSelf := fileIdToDelete+'.OID';
   DeleteFile(filenameSelf);
 end;
+function _DeleteConfirmation: boolean;
+var
+  sc: Char;
+begin
+  repeat
+    ShowMessage('Are you sure you want to delete this OID? (Y/N)', 'DELETE OID', true);
+    DrawStatusBar('Y = Yes; N = No');
+    sc := ReadKey;
+    if sc = #0 then
+    begin
+      (* Extended key. Nothing we care about. *)
+      ReadKey;
+      continue;
+    end;
+    if UpCase(sc) = 'Y' then
+    begin
+      _DeleteConfirmation := true;
+      break;
+    end;
+    if UpCase(sc) = 'N' then
+    begin
+      _DeleteConfirmation := false;
+      break;
+    end;
+  until false;
+end;
 procedure DisplayOIDFile(filename: string);
-const
-  ID_EXIT     = '?EXIT';
-  ID_ASNEDIT  = '?ASN1';
-  ID_DESCEDIT = '?DESC';
-  ID_ADDCHILD = '?ADDC';
-  ID_DELETE   = '?DELE';
-  NAVBAR_SIZE = 5;
 var
   isRoot: boolean;
-  f: Text;
-  line, cmd: string;
-  oid: TOID;
+  oid: POID;
   i, menuX, menuY: integer;
   linesLeft, linesRequired: integer;
   sTmp, subfile: string;
-  sAsn: string;
   subsel, subfiles: PStringList;
   subselres: integer;
-  sTmp1: string;
+  exitRequest: boolean;
+  menuIdExit, menuIdAsnEdit, menuIdDescEdit, menuIdAdd, menuIdDelete: integer;
 begin
+  exitRequest := false;
   repeat
-    InitOidDef(@oid);
+    CreateOidDef(oid);
-    _ReadOidFile(filename, @oid);
+    _ReadOidFile(filename, oid);
     (* Print OID information *)
     ClrScr;
-    if oid.DotNotation = '' then
+    if oid^.DotNotation = '' then
       DrawTitleBar('OID ROOT')
     else
-      DrawTitleBar('OID ' + oid.DotNotation);
+      DrawTitleBar('OID ' + oid^.DotNotation);
     GotoXY(ScreenWidth-Length(filename)+1,1);
     TextBackground(White);
     TextColor(Black);
     WriteLn(filename);
     TextBackground(Black);
     TextColor(White);
     DrawStatusBar(DEFAULT_STATUSBAR);
     GotoXY(1,2);
-    if oid.DotNotation <> '' then
+    if oid^.DotNotation <> '' then
     begin
       WriteLn('Dot-Notation:');
-      WriteLn(oid.DotNotation);
+      WriteLn(oid^.DotNotation);
       WriteLn('');
     end;
-    if Trim(oid.Description) <> '' then
+    if Trim(oid^.Description) <> '' then
     begin
       WriteLn('Description:');
-      WriteLn(oid.Description);
+      WriteLn(oid^.Description);
       WriteLn('');
     end;
     menuX := WhereX + 1;
-    menuY := ScreenHeight - NAVBAR_SIZE - 1;
+    menuY := ScreenHeight - ACTIONMENU_SIZE - 1;
-    if ListCount(oid.ASNIDs) > 0 then
+    if ListCount(oid^.ASNIDs) > 0 then
     begin
       linesLeft := menuY - WhereY - 1;
-      linesRequired := 1 + ListCount(oid.ASNIds);
+      linesRequired := 1 + ListCount(oid^.ASNIds);
       if LinesLeft < LinesRequired then
       begin
         (* Compact display of ASN.1 identifiers *)
         Write('ASN.1-Identifiers: ');
-        for i := 0 to ListCount(oid.ASNIds)-1 do
+        for i := 0 to ListCount(oid^.ASNIds)-1 do
         begin
           if i > 0 then Write(', ');
-          Write(ListGetElement(oid.ASNIds, i));
+          Write(ListGetElement(oid^.ASNIds, i));
         end;
         WriteLn('');
       end
       else
       begin
         (* Long display of ASN.1 identifiers *)
         WriteLn('ASN.1-Identifiers:');
-        for i := 0 to ListCount(oid.ASNIds)-1 do
+        for i := 0 to ListCount(oid^.ASNIds)-1 do
         begin
-          WriteLn('- '+ListGetElement(oid.ASNIds, i));
+          WriteLn('- '+ListGetElement(oid^.ASNIds, i));
         end;
         WriteLn('');
       end;
     end;
     (* Now prepare the menu entries *)
-    InitList(subsel);
+    CreateList(subsel);
-    InitList(subfiles);
+    CreateList(subfiles);
-    sTmp := oid.Parent;
-    if sTmp = '' then
+    if oid^.Parent = '' then
     begin
       isRoot := true;
     end
     else
     begin
-      Delete(sTmp, 1, 8);
-      isRoot := sTmp = oid.DotNotation;
+      isRoot := DotNotationPart(oid^.Parent) = oid^.DotNotation;
     end;
-    if (oid.Parent <> '') and not isRoot then
+    if (oid^.Parent <> '') and not isRoot then
     begin
-      sTmp := oid.Parent;
+      sTmp := oid^.Parent;
-      subfile := Copy(sTmp, 1, 8)+'.OID';
+      subfile := FileIdPart(sTmp) + '.OID';
-      Delete(sTmp, 1, 8);
-      sTmp := sTmp + _ShowASNIds(subfile);
-      ListAppend(subsel, 'Go to parent ' + sTmp);
+      ListAppend(subsel, 'Go to parent ' + DotNotationPart(sTmp) + _ShowASNIds(subfile));
       ListAppend(subfiles, subfile);
     end;
     if isRoot then
     begin
-      ListAppend(subsel, 'Back to main menu');
+      menuIdExit := ListAppend(subsel, 'Back to main menu');
-      ListAppend(subfiles, ID_EXIT);
+      ListAppend(subfiles, '');
-    end;
+    end
+    else menuIdExit := -99;
-    for i := 0 to ListCount(oid.SubIds)-1 do
+    for i := 0 to ListCount(oid^.SubIds)-1 do
     begin
-      sTmp := ListGetElement(oid.SubIds, i);
+      sTmp := ListGetElement(oid^.SubIds, i);
-      subfile := Copy(sTmp, 1, 8)+'.OID';
+      subfile := FileIdPart(sTmp) + '.OID';
-      Delete(sTmp, 1, 8);
-      sTmp := sTmp + _ShowASNIds(subfile);
-      ListAppend(subsel, 'Go to child  ' + sTmp);
+      ListAppend(subsel, 'Go to child  ' + DotNotationPart(sTmp) + _ShowASNIds(subfile));
       ListAppend(subfiles, subfile);
     end;
-    if oid.DotNotation <> '' then
+    if oid^.DotNotation <> '' then
     begin
-      ListAppend(subsel, 'Edit ASN.1 identifiers');
+      menuIdAsnEdit := ListAppend(subsel, 'Edit ASN.1 identifiers');
-      ListAppend(subfiles, ID_ASNEDIT);
+      ListAppend(subfiles, '');
-    end;
+    end
+    else menuIdAsnEdit := -99;
-    ListAppend(subsel, 'Edit description');
+    menuIdDescEdit := ListAppend(subsel, 'Edit description');
-    ListAppend(subfiles, ID_DESCEDIT);
+    ListAppend(subfiles, '');
-    ListAppend(subsel, 'Add child');
+    menuIdAdd := ListAppend(subsel, 'Add child');
-    ListAppend(subfiles, ID_ADDCHILD);
+    ListAppend(subfiles, '');
     if not isRoot then
     begin
-      ListAppend(subsel, 'Delete OID');
+      menuIdDelete := ListAppend(subsel, 'Delete OID');
-      ListAppend(subfiles, ID_DELETE);
+      ListAppend(subfiles, '');
-    end;
+    end
+    else menuIdDelete := -99;
     (* Show menu *)
     subselres := DrawSelectionList(menuX, menuY,
                                    ScreenWidth-2,
-                                   NAVBAR_SIZE,
+                                   ACTIONMENU_SIZE,
                                    subsel,
                                    true,
                                    'SELECT ACTION',
 );
     (* Process user selection *)
     if subselres = -1 then
     begin
-      exit;
+      exitRequest := true;
     end
-    else
-    begin
-      sTmp1 := ListGetElement(subfiles, subselres);
-      if sTmp1 = ID_ASNEDIT then
+    else if subselres = menuIdAsnEdit then
-      begin
+    begin
-        if AsnEditor(@oid) then
+      if AsnEditor(oid) then
-          _WriteOidFile(filename, @oid);
+        _WriteOidFile(filename, oid);
-      end
+    end
-      else if sTmp1 = ID_DESCEDIT then
+    else if subselres = menuIdDescEdit then
-      begin
+    begin
-        if DescEditor(@oid) then
+      if DescEditor(oid) then
-          _WriteOidFile(filename, @oid);
+        _WriteOidFile(filename, oid);
-      end
+    end
-      else if sTmp1 = ID_ADDCHILD then
+    else if subselres = menuIdAdd then
-      begin
-        if NewOidEditor(@oid) then
-        begin
+    begin
+      if NewOidEditor(oid) then
-          _WriteOidFile(filename, @oid);
+        _WriteOidFile(filename, oid);
-        end;
-      end
+    end
-      else if sTmp1 = ID_DELETE then
+    else if subselres = menuIdDelete then
-      begin
+    begin
-        ShowMessage('Are you sure you want to delete this OID?', 'DELETE OID', true);
-        DrawStatusBar('Y = Yes; any other key = No');
-        if UpCase(ReadKey) = 'Y' then
+      if _DeleteConfirmation then
-        begin
+      begin
-          filename := Copy(oid.Parent,1,8)+'.OID';
+        filename := FileIdPart(oid^.Parent) + '.OID';
-          DeleteOidRecursive(@oid);
+        DeleteOidRecursive(oid);
-        end;
+      end;
-      end
+    end
-      else if sTmp1 = ID_EXIT then
+    else if subselres = menuIdExit then
-      begin
+    begin
-        exit;
+      exitRequest := true;
-      end
+    end
-      else
+    else
-      begin
+    begin
-        filename := sTmp1;
+      (* Normal OID *)
-      end;
+      filename := ListGetElement(subfiles, subselres);
     end;
     FreeList(subsel);
     FreeList(subfiles);
-    FreeOidDef(@oid);
+    FreeOidDef(oid);
-  until false;
+  until exitRequest;
 end;
 procedure CreateInitOIDFile(filename: string);
 var
-  oid: TOID;
+  oid: POID;
 begin
-  InitOidDef(@oid);
+  CreateOidDef(oid);
-  oid.Description := 'This is the root of the OID tree.' +#13#10 +
+  oid^.Description := 'This is the root of the OID tree.' +#13#10 +
-                     #13#10 +
+                      #13#10 +
-                     'Valid subsequent arcs are per definition:' + #13#10 +
+                      'Valid subsequent arcs are per definition:' + #13#10 +
-                     '- 0 (itu-t)' + #13#10 +
+                      '- 0 (itu-t)' + #13#10 +
-                     '- 1 (iso)' + #13#10 +
+                      '- 1 (iso)' + #13#10 +
-                     '- 2 (joint-iso-itu-t)';
+                      '- 2 (joint-iso-itu-t)';
-  oid.FileId      := '00000000';
+  oid^.FileId      := '00000000';
-  oid.DotNotation := '';
+  oid^.DotNotation := '';
-  oid.Parent      := '00000000';
+  oid^.Parent      := '00000000';
-  _WriteOidFile(filename, @oid);
+  _WriteOidFile(filename, oid);
-  FreeOidDef(@oid);
+  FreeOidDef(oid);
 end;
 procedure OP_ManageOIDs;
+var
+  initFile: string;
 begin
   ClrScr;
   DrawTitleBar('Manage Object Identifiers');
   DrawStatusBar('');
+  initFile := ZeroPad(0, 8) + '.OID';
-  if not FileExists('00000000.OID') then
+  if not FileExists(initFile) then
   begin
-    CreateInitOIDFile('00000000.OID');
+    CreateInitOIDFile(initFile);
   end;
-  DisplayOIDFile('00000000.OID');
+  DisplayOIDFile(initFile);
 end;
 procedure OP_ManageRAs;
 begin
   ClrScr;
   DrawTitleBar('Manage Registration Authorities');
   DrawStatusBar('');
   (* TODO: Implement "Manage RAs" feature *)
-  ShowMessage('This feature has not yet been implemented!', 'NOTICE', true);
-  _Pause;
 end;
 procedure OP_ReturnToMSDOS;
 begin
   ClrScr;
 end;
 procedure OP_MainMenu;
-const
-  MenuWidth = 15;
-  MenuHeight = 3;
 var
   menu: PStringList;
   menuRes, menuLeft, menuTop: integer;
+  menuIdOID, menuIdRA, menuIdExit: integer;
 begin
   repeat
     ClrScr;
     DrawTitleBar('Welcome to OIDplus for DOS');
     DrawStatusBar(DEFAULT_STATUSBAR);
     GoToXY(ScreenWidth-Length(VERSIONINFO), ScreenHeight-1);
     Write(VERSIONINFO);
-    InitList(menu);
+    CreateList(menu);
-    ListAppend(menu, 'Manage OIDs');
+    menuIdOID  := ListAppend(menu, 'Manage OIDs');
-    ListAppend(menu, 'Manage RAs');
+    menuIdRA   := -99; (*ListAppend(menu, 'Manage RAs');*)
-    ListAppend(menu, 'Return to DOS');
+    menuIdExit := ListAppend(menu, 'Return to DOS');
-    menuLeft := round(ScreenWidth/2 -MenuWidth/2);
+    menuLeft := round(ScreenWidth/2 -MAINMENU_WIDTH/2);
-    menuTop  := round(ScreenHeight/2-MenuHeight/2);
+    menuTop  := round(ScreenHeight/2-MAINMENU_HEIGHT/2);
-    menuRes  := DrawSelectionList(menuLeft, menuTop, MenuWidth, MenuHeight, menu, true, 'MAIN MENU', 2);
+    menuRes  := DrawSelectionList(menuLeft, menuTop,
+                                  MAINMENU_WIDTH, MAINMENU_HEIGHT,
+                                  menu, true, 'MAIN MENU', 2);
     FreeList(menu);
-    if menuRes = 0 then
+    if menuRes = menuIdOID then
     begin
       OP_ManageOIDs;
-    end;
+    end
-    if menuRes = 1 then
+    else if menuRes = menuIdRA then
     begin
       OP_ManageRAs;
     end;
-  until (menuRes = 2) or (menuRes = -1);
+  until (menuRes = menuIdExit) or (MAINMENU_ALLOW_ESC and (menuRes = -1));
   OP_ReturnToMSDOS;
 end;
 begin

Subversion Repositories oidplus

oidplus/trunk_dos/OIDPLUS.PAS – Rev 734 → 735