important cvs taggage is now reported

aolserver · Oct 17, 2000 · 8aae828 · 8aae828
1 parent f13cf0f
commit 8aae828
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/include/ns.h b/include/ns.h
@@ -33,7 +33,7 @@
  * All the public types and function declarations for the core
  * AOLserver.
  *
- * $Header: /Users/dossy/Desktop/cvs/aolserver/include/ns.h,v 1.8 2000/10/13 18:10:30 jgdavidson Exp $
+ * $Header: /Users/dossy/Desktop/cvs/aolserver/include/ns.h,v 1.9 2000/10/17 20:12:03 kriston Exp $
  */
 
 #ifndef NS_H
@@ -873,6 +873,7 @@ NS_EXTERN int Ns_InfoShutdownPending(void);
 NS_EXTERN int Ns_InfoStarted(void);
 NS_EXTERN int Ns_InfoServersStarted(void);
 NS_EXTERN char *Ns_InfoLabel(void);
+NS_EXTERN char *Ns_InfoTag(void);
 NS_EXTERN void Ns_StopServer(char *server);
 
 /*

diff --git a/nscp/nscp.c b/nscp/nscp.c
@@ -35,7 +35,7 @@
  * Tcl commands.
  */
 
-static const char *RCSID = "@(#) $Header: /Users/dossy/Desktop/cvs/aolserver/nscp/nscp.c,v 1.11 2000/10/17 19:53:23 kriston Exp $, compiled: " __DATE__ " " __TIME__;
+static const char *RCSID = "@(#) $Header: /Users/dossy/Desktop/cvs/aolserver/nscp/nscp.c,v 1.12 2000/10/17 20:12:03 kriston Exp $, compiled: " __DATE__ " " __TIME__;
 
 #include "ns.h"
 
@@ -494,7 +494,7 @@ Login(SOCKET sock)
  if (ok) {
  Ns_Log(Notice, "nscp: logged in: '%s'", user);
  sprintf(msg, "\nWelcome to %s running at %s (pid %d)\n"
- "%s/%s (%s) for %s built on %s\nTag: %s\n",
+ "%s/%s (%s) for %s built on %s\nCVS Tag: %s\n",
  server, Ns_InfoNameOfExecutable(), Ns_InfoPid(),
  Ns_InfoServerName(), Ns_InfoServerVersion(), Ns_InfoLabel(),
  Ns_InfoPlatform(), Ns_InfoBuildDate(), Ns_InfoTag());

diff --git a/nsd/nsmain.c b/nsd/nsmain.c
@@ -33,7 +33,7 @@
  * AOLserver Ns_Main() startup routine.
  */
 
-static const char *RCSID = "@(#) $Header: /Users/dossy/Desktop/cvs/aolserver/nsd/nsmain.c,v 1.16 2000/10/17 19:53:23 kriston Exp $, compiled: " __DATE__ " " __TIME__;
+static const char *RCSID = "@(#) $Header: /Users/dossy/Desktop/cvs/aolserver/nsd/nsmain.c,v 1.17 2000/10/17 20:12:03 kriston Exp $, compiled: " __DATE__ " " __TIME__;
 
 #include "nsd.h"
 
@@ -324,14 +324,12 @@ Ns_Main(int argc, char **argv, Ns_ServerInitProc *initProc)
 
  }
  if (mode == 'V') {
- printf("AOLserver version %s\n", NSD_VERSION); 
+ printf("AOLserver/%s (%s)\n", NSD_VERSION, Ns_InfoLabel()); 
+ printf(" CVS Tag: %s\n", Ns_InfoTag());
  printf(" Built: %s\n", Ns_InfoBuildDate());
- printf(" Label: %s\n", Ns_InfoLabel());
- printf(" Tag: %s\n", Ns_InfoTag());
  printf(" Tcl version: %s\n", nsTclVersion);
  printf(" Thread library: %s\n", NsThreadLibName());
  printf(" Platform: %s\n", Ns_InfoPlatform());
- printf("\n\n Note: \"Tag:\" should resemble \"Label:\"\n\n");
  return 0;
  } else if (nsconf.config == NULL) {
  UsageError("required -c/-t <config> option not specified");