X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=comstack%2Fxmosi.c;h=ef4725339a0d3c30bad593d1962195f20164698f;hp=cad3978ba80d955ddda53686a4d35112cea43ec1;hb=2da1b7c395cd33f03bbb93919c88a4d0fb2de1ed;hpb=4ae699c927bc26f3550d1a8ca911e8d1fe75dbfc

diff --git a/comstack/xmosi.c b/comstack/xmosi.c
index cad3978..ef47253 100644
--- a/comstack/xmosi.c
+++ b/comstack/xmosi.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: xmosi.c,v $
- * Revision 1.9  1996-01-02 08:57:28  quinn
+ * Revision 1.14  1996-07-26 12:34:07  quinn
+ * Porting.
+ *
+ * Revision 1.13  1996/07/06  19:58:30  quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.12  1996/05/22  08:34:44  adam
+ * Added ifdef USE_XTIMOSI; so that 'make depend' works.
+ *
+ * Revision 1.11  1996/02/23 10:00:41  quinn
+ * WAIS Work
+ *
+ * Revision 1.10  1996/02/10  12:23:13  quinn
+ * Enablie inetd operations fro TCP/IP stack
+ *
+ * Revision 1.9  1996/01/02  08:57:28  quinn
  * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass
  *
  * Revision 1.8  1995/11/01  13:54:29  quinn
@@ -83,6 +98,7 @@
  *
  */
 
+#ifdef USE_XTIMOSI
 /*
  * Glue layer for Peter Furniss' xtimosi package.
  */
@@ -92,11 +108,16 @@
 #include <string.h>
 #include <assert.h>
 
+<<<<<<< 1.13
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+=======
+#define YNETINCLUDE
+#include <yconfig.h>
+>>>>>>> /tmp/T4a00144
 
 #include <comstack.h>
 #include <xmosi.h>
@@ -154,12 +175,15 @@ static int addopt(struct netbuf *optbuf, unsigned long level, unsigned long
     return 0;
 }
 
-COMSTACK mosi_type(int blocking, int protocol)
+COMSTACK mosi_type(int s, int blocking, int protocol)
 {
     COMSTACK r;
     mosi_state *state;
     int flags = O_RDWR;
 
+    if (s >= 0)
+	return 0;
+
     if (!(r = xmalloc(sizeof(*r))))
     	return 0;
     if (!(state = r->private = xmalloc(sizeof(*state))))
@@ -484,5 +508,7 @@ int mosi_close(COMSTACK h)
 
 char *mosi_addrstr(COMSTACK h)
 {
-    return "osi:[UNIMPLEMENTED";
+    return "osi:[UNIMPLEMENTED]";
 }
+
+#endif