TempleOSTS_131005.ISO

TempleOS/Adam/LogIn.CPP

@@ -1,4 +1,4 @@
-#help_index "Task/Login"
+#help_index "Misc/Accts"
 
 //This is temporary until defined in $LK-A,"HOME/Adam3fSys.CPP"$.
 U0 UserStartUp()
@@ -21,32 +21,32 @@ U0 SrvStartUp()
     Preempt(ON);
 }
 
-U8 *PopUpSysAcctGet()
+U8 *PopUpSysAcct()
 {
   U8 *result,*st;
   CDoc *doc=DocNew;
-  CDirEntry	*tempm1=FilesFind("/TempleOS/Accts/*",FUF_RECURSE|FUF_JUST_DIRS|FUF_FLATTEN_TREE),
-		*tempm=tempm1;
-  DocPutS(doc,"$$CM+CX-LE,8$$");
+  CDirEntry	*tempde1=FilesFind("/TempleOS/Accts/*",FUF_RECURSE|FUF_JUST_DIRS|FUF_FLATTEN_TREE),
+		*tempde=tempde1;
+  DocPrint(doc,"$$CM+CX-LE,8$$");
   DocPutSprite(doc,$IB+BP,"<1>",1,"::/TempleOS/Demo/Graphics/Logo.CPP,1"$,"$$SP+SIF,\"\",%d$$");
-  DocPutS(doc,"$$CM+LX,0,14$$Select Account.\nCursor down and press <SPACE BAR>.\n");
-  while (tempm) {
-    if (*tempm->name!='.') {
-      st=tempm->full_name;
+  DocPrint(doc,"$$CM+LX,0,14$$Select Account.\nCursor down and press <SPACE BAR>.\n");
+  while (tempde) {
+    if (*tempde->name!='.') {
+      st=tempde->full_name;
       if (!StrNCmp(st+2,"/TempleOS/Accts/",10))
 	st+=12;
-      DocPrintF(doc,"$$CM+LX,2,3$$$$BT,\"%s\",%d$$",st,tempm);
+      DocPrint(doc,"$$CM+LX,2,3$$$$BT,\"%s\",%d$$",st,tempde);
     }
-    tempm=tempm->next;
+    tempde=tempde->next;
   }
-  DocPutS(doc,"\n\n\n\nLog-in as USER if you are new and get familiar\n"
+  DocPrint(doc,"\n\n\n\nLog-in as USER if you are new and get familiar\n"
 	    "before you try to install.\n");
-  do tempm=PopUpMenu(doc,DOF_WIN_MAX);
-  while (tempm<0);
+  do tempde=PopUpMenu(doc,DOF_WIN_MAX);
+  while (tempde<0);
 
   DocDel(doc);
-  result=AStrNew(tempm->full_name);
-  CDirLstDel(tempm1);
+  result=AStrNew(tempde->full_name);
+  DirLstDel(tempde1);
   return result;
 }
 
@@ -55,7 +55,7 @@ U0 SysLogin()
   U8 *st;
   if (!FileFind(sys_acct)||!StrCmp(sys_acct+2,"/TempleOS/Accts")) {
     st=sys_acct;
-    sys_acct=PopUpSysAcctGet;
+    sys_acct=PopUpSysAcct;
     Free(st);
   }
 }
@@ -84,10 +84,10 @@ public Bool AcctRegSetDftEntry(U8 *path,U8 *val,Bool is_adam_entry=FALSE)
   unlock_doc=DocLock(sys_registry_doc);
   if (!DocTreeFind(sys_registry_doc,path)) {
     DocTreeMake(sys_registry_doc,path);
-    DocPutS(sys_registry_doc,val);
+    DocPrint(sys_registry_doc,"%s",val);
     if (is_adam_entry) {
       if (Fs==adam_task)
-	ExePutS(val);
+	ExePrint("%s",val);
       else
 	Adam("%s",val);
     }
@@ -111,13 +111,13 @@ public Bool AcctRegWriteBranch(U8 *path,U8 *fmt,...)
 {
   Bool result,unlock_doc;
   CDocEntry *tree_branch,*start_indent,*end_indent;
-  U8 *buf=SPrintFJoin(NULL,fmt,argc,argv);
+  U8 *buf=SPrintJoin(NULL,fmt,argc,argv);
   AcctCacheRegistry;
   unlock_doc=DocLock(sys_registry_doc);
   if (result=DocTreeFind(sys_registry_doc,path,&tree_branch,&start_indent,&end_indent))
     DocCut(sys_registry_doc,tree_branch,end_indent);
   DocTreeMake(sys_registry_doc,path);
-  DocPutS(sys_registry_doc,buf);
+  DocPrint(sys_registry_doc,"%s",buf);
   if (IsDrvWritable(*sys_acct))
     DocWrite(sys_registry_doc);
   if (unlock_doc)
@@ -131,9 +131,9 @@ U0 AcctOneTimePopUp(I64 flag_num,U8 *msg)
   CDoc *doc=DocNew;
   CDocEntry *doc_e;
   if (!Bt(sys_msg_flags,flag_num)) {
-    if (msg) DocPutS(doc,msg);
-    doc_e=DocPutS(doc,"\n$$CB+LE,\"Do not show this msg again.\",1$$");
-    DocPutS(doc,"$$CM+CX,0,4$$$$BT,\"OKAY\",1$$\n");
+    if (msg) DocPrint(doc,"%s",msg);
+    doc_e=DocPrint(doc,"\n$$CB+LE,\"Do not show this msg again.\",1$$");
+    DocPrint(doc,"$$CM+CX,0,4$$$$BT,\"OKAY\",1$$\n");
     if (PopUpMenu(doc)==1 && doc_e->flags1&DOCEF1_CHECKED_COLLAPSED) {
       LBts(sys_msg_flags,flag_num);
       AcctRegWriteBranch("Adam/TempleOS/SysMsgFlags",
@@ -149,7 +149,7 @@ U0 RegistryInit()
   U8 buf[136];
   Bool version_present;
   AcctRegSetDftEntry("Adam/TempleOS/SysMsgFlags","sys_msg_flags[0]=0;\n",TRUE);
-  SPrintF(buf,"registry_version=%4.3f;\n",os_version);
+  SPrint(buf,"registry_version=%4.3f;\n",os_version);
   version_present=AcctRegSetDftEntry("Adam/TempleOS/SysRegVer",buf,TRUE);
   AcctRegExeBranch("Adam");
   if (registry_version!=os_version) {