X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tclmain.c;h=a238fbaaee2a312a9924d9a084ea72b3c2f2fb28;hb=0c66cddf6e923db676ed30691cd1d47b50db0d4a;hp=376e56feaa312bfac842d6e851733216a2e3ba8d;hpb=f25d0ab1672bff45ed845baf786f23aac60ca243;p=ir-tcl-moved-to-github.git

diff --git a/tclmain.c b/tclmain.c
index 376e56f..a238fba 100644
--- a/tclmain.c
+++ b/tclmain.c
@@ -5,7 +5,15 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: tclmain.c,v $
- * Revision 1.14  1995-09-21 13:11:53  adam
+ * Revision 1.16  1996-02-05 17:58:05  adam
+ * Ported ir-tcl to use the beta releases of tcl7.5/tk4.1.
+ *
+ * Revision 1.15  1996/01/10  09:18:45  adam
+ * PDU specific callbacks implemented: initRespnse, searchResponse,
+ *  presentResponse and scanResponse.
+ * Bug fix in the command line shell (tclmain.c) - discovered on OSF/1.
+ *
+ * Revision 1.14  1995/09/21  13:11:53  adam
  * Support of dynamic loading.
  * Test script uses load command if necessary.
  *
@@ -199,18 +207,18 @@ void tcl_mainloop (Tcl_Interp *interp, int interactive)
         {
             if (FD_ISSET (i, &fdset_tcl_r))
             {
-                assert (callback_table[i].r_handle);
-                (*callback_table[i].r_handle) (callback_table[i].obj);
+                if (callback_table[i].r_handle)
+                    (*callback_table[i].r_handle) (callback_table[i].obj);
             }
             if (FD_ISSET (i, &fdset_tcl_w))
             {
-                assert (callback_table[i].w_handle);
-                (*callback_table[i].w_handle) (callback_table[i].obj);
+                if (callback_table[i].w_handle)
+                    (*callback_table[i].w_handle) (callback_table[i].obj);
             }
             if (FD_ISSET (i, &fdset_tcl_x))
             {
-                assert (callback_table[i].x_handle);
-                (*callback_table[i].x_handle) (callback_table[i].obj);
+                if (callback_table[i].x_handle)
+                    (*callback_table[i].x_handle) (callback_table[i].obj);
             }
         }
         if (interactive && FD_ISSET(0, &fdset_tcl_r))
@@ -235,8 +243,14 @@ void tcl_mainloop (Tcl_Interp *interp, int interactive)
     }
 }
 
+#if IRTCL_GENERIC_FILES
+void ir_select_add (Tcl_File file, void *obj)
+{
+    int fd = (int) Tcl_GetFileInfo (file, NULL);
+#else
 void ir_select_add (int fd, void *obj)
 {
+#endif
     callback_table[fd].obj = obj;
     callback_table[fd].r_handle = ir_select_read;
     callback_table[fd].w_handle = NULL;
@@ -245,20 +259,38 @@ void ir_select_add (int fd, void *obj)
         max_fd = fd;
 }
 
+#if IRTCL_GENERIC_FILES
+void ir_select_add_write (Tcl_File file, void *obj)
+{
+    int fd = (int) Tcl_GetFileInfo (file, NULL);
+#else
 void ir_select_add_write (int fd, void *obj)
 {
+#endif
     callback_table[fd].w_handle = ir_select_write;
     if (fd > max_fd)
         max_fd = fd;
 }
 
+#if IRTCL_GENERIC_FILES
+void ir_select_remove_write (Tcl_File file, void *obj)
+{
+    int fd = (int) Tcl_GetFileInfo (file, NULL);
+#else
 void ir_select_remove_write (int fd, void *obj)
 {
+#endif
     callback_table[fd].w_handle = NULL;
 }
 
+#if IRTCL_GENERIC_FILES
+void ir_select_remove (Tcl_File file, void *obj)
+{
+    int fd = (int) Tcl_GetFileInfo (file, NULL);
+#else
 void ir_select_remove (int fd, void *obj)
 {
+#endif
     callback_table[fd].r_handle = NULL;
     callback_table[fd].w_handle = NULL;
     callback_table[fd].x_handle = NULL;