Merge Sun's version of xscope in

Conversion to ANSI C
SysVR4 support
Conversion of networking code to use xtrans

1 files changed, 46 insertions, 9 deletions

diff --git a/scope.h b/scope.h
index 62b3189..cec14b2 100644
--- a/scope.h
+++ b/scope.h
@@ -1,6 +1,6 @@
 /* **********************************************
  *						*
- * header file for the Server spy scope           *
+ * header file for the Server spy scope         *
  *						*
  *	James Peterson, 1987			*
  * Copyright (C) 1987 MCC
@@ -23,9 +23,40 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *						*
+ *						*
+ * Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * 
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ *
  ********************************************** */
 
 #include <stdio.h>
+#ifdef SVR4
+#include <sys/filio.h>
+#endif /* SVR4 */
 
 #define Boolean short
 #define true 1
@@ -43,25 +74,31 @@ short   debuglevel;
 /*                                                */
 /* ********************************************** */
 
-Boolean NoExtensions	  /* Should we deny extensions exist ? */ ;
 short   Verbose		  /* quiet (0) or increasingly verbose  ( > 0) */ ;
-Boolean RequestSync;
+#ifdef RAW_MODE
+short	Raw		  /* raw data output only */ ;
+#else
+#define Raw 0
+#endif
 
 int     ScopePort;
 char   *ScopeHost;
 
 /* external function type declarations */
 
-extern char   *Malloc ();
+extern void   *Malloc (long n);
+#ifdef X_NOT_STDC_ENV
 extern char *strcpy();
-char   *ClientName ();
+extern char *sprintf();
+#else 
+#include <stdlib.h>
+#include <string.h>
+#endif
+extern char *ClientName();
 
 /* ********************************************** */
 /*                                                */
 /* ********************************************** */
 
-/* need to change the MaxFD to allow larger number of fd's */
-#define StaticMaxFD 32
-
-
 #include "fd.h"
+#include "proto.h"