From 4c151363b4ac3273854c6531a542d1547fcbc000 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Mon, 24 Aug 1998 04:46:53 +0000
Subject: [PATCH]         * Added a CtdlGotoRoom() function to the CitadelAPI.

---
 citadel/ChangeLog       |  3 +++
 citadel/citadelapi.c    | 35 ++++++++++++++++++++++++++---------
 citadel/ipcdef.h        |  3 +++
 citadel/techdoc/api.txt | 18 ++++++++++++++++++
 4 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 6c0e2614f..34ad3a0a2 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,6 @@
+Mon Aug 24 00:45:55 EDT 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
+	* Added a CtdlGotoRoom() function to the CitadelAPI.
+ 
 Sun Aug 23 21:47:00 EDT 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 	* sysoputil is finally dead!  Removed it from the build.
 	* Added userpurge.c server extension (initial implementation)
diff --git a/citadel/citadelapi.c b/citadel/citadelapi.c
index 36a287ed2..5f01e34f9 100644
--- a/citadel/citadelapi.c
+++ b/citadel/citadelapi.c
@@ -19,6 +19,7 @@ struct CtdlInternalList {
 
 struct CtdlServerHandle CtdlAppHandle;
 struct CtdlServInfo CtdlAppServInfo;
+struct CtdlRoomInfo CtdlCurrentRoom;
 int CtdlErrno = 0;
 
 void logoff(int exitcode) {
@@ -78,7 +79,7 @@ void CtdlInternalExtract(char *dest, char *source, int parmnum)
 	}
 
 /*
- * CtdlInternalExtractInt()  -  CtdlInternalExtract an int parm w/o supplying a buffer
+ * CtdlInternalExtractInt()  -  Extract an int parm w/o supplying a buffer
  */
 int CtdlInternalExtractInt(char *source, int parmnum)
 {
@@ -89,7 +90,7 @@ int CtdlInternalExtractInt(char *source, int parmnum)
 	}
 
 /*
- * CtdlInternalExtractLong()  -  CtdlInternalExtract an long parm w/o supplying a buffer
+ * CtdlInternalExtractLong()  -  Extract an long parm w/o supplying a buffer
  */
 long CtdlInternalExtractLong(char *source, long int parmnum)
 {
@@ -139,9 +140,11 @@ main(int argc, char *argv[])
 	if (argc < 3) exit(1);
 
 	/* Zeroing out the server handle neatly sets the values of
-	 * CtdlAppHandle to sane default values
+	 * CtdlAppHandle to sane default values.  This also holds true
+	 * for the CtdlCurrentRoom.
 	 */
 	bzero(&CtdlAppHandle, sizeof(struct CtdlServerHandle));
+	bzero(&CtdlCurrentRoom, sizeof(struct CtdlRoomInfo));
 
 	/* Now parse the command-line arguments fed to us by the server */
 	for (a=0; a<argc; ++a) switch(a) {
@@ -190,12 +193,8 @@ main(int argc, char *argv[])
 		serv_gets(buf);
 		}
 
-	sprintf(buf, "GOTO %s", CtdlAppHandle.InitialRoom);
-	serv_puts(buf);
-	serv_gets(buf);
-	if (buf[0] != '2') {
-		serv_puts("GOTO _BASEROOM_");
-		serv_gets(buf);
+	if (CtdlGotoRoom(CtdlAppHandle.InitialRoom) != 0) {
+		CtdlGotoRoom("_BASEROOM_");
 		}
 
 	/* Now do the loop. */
@@ -399,3 +398,21 @@ int CtdlForEachUser(int (*CallBack)(char *EachUser))  {
 
 	return(0);
 	}
+
+
+
+/*
+ * Goto a different room
+ */
+int CtdlGotoRoom(char *RoomName) {
+	char buf[256];
+
+	sprintf(buf, "GOTO %s", RoomName);
+	serv_puts(buf);
+	serv_gets(buf);
+	if (buf[0] != '2') {
+		CtdlErrno = atoi(buf);
+		return(CtdlErrno);
+		}
+	extract(&CtdlCurrentRoom.RoomName, &buf[4], 0);
+	}
diff --git a/citadel/ipcdef.h b/citadel/ipcdef.h
index f6365f4fa..5d8069f89 100644
--- a/citadel/ipcdef.h
+++ b/citadel/ipcdef.h
@@ -83,3 +83,6 @@ struct CtdlServerHandle {
 	int AssocClientSession;
 	};
 
+struct CtdlRoomInfo {
+	char RoomName[32];
+	};
diff --git a/citadel/techdoc/api.txt b/citadel/techdoc/api.txt
index bde1492d8..bfe9e5017 100644
--- a/citadel/techdoc/api.txt
+++ b/citadel/techdoc/api.txt
@@ -132,3 +132,21 @@ a user number which already exists, or which has not yet been assigned.
 on the system; the single argument passed to the function will be the name of
 the user being processed.
 
+ 
+ 
+ 
+  ROOM FUNCTIONS
+  --------------
+ 
+  extern struct CtdlRoomInfo CtdlCurrentRoom;
+ 
+  This structure contains information about the current room.
+ 
+ 
+ 
+ int CtdlGotoRoom(char *RoomName)
+ 
+ Goto any room to which the extension has access.  An extension with
+administrative or privileged access may enter any room on the system.  An
+extension running in the context of an ordinary user may enter any room to
+which the user has access.
-- 
2.39.2