Changeset 436 for trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc

Timestamp:

Oct 15, 2014, 10:44:36 AM (11 years ago)

Author:

dmik

Message:

icedtea-web: Use unnamed pipe instead of unix-style named pipe for debug console.

Similar to r368.

File:

• trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc (modified) (11 diffs)

trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc

@@ -173 +173 @@
 #endif
 
+#ifdef __OS2__
+int debug_pipe[2] = { -1 };
+#else
 // Applet viewer debug pipe name.
 gchar* debug_pipe_name = NULL;
+#endif
 
 // Applet viewer output watch source.
@@ -588 +592 @@
   initialize_debug();//should be already initialized, but...
   if (plugin_debug_to_console){
+#ifdef __OS2__
+    if (socketpair (AF_LOCAL, SOCK_STREAM, 0, debug_pipe) == -1)
+      {
+        PLUGIN_ERROR ("Failed to create debug pipe", strerror (errno));
+        np_error = NPERR_GENERIC_ERROR;
+        goto cleanup_debug_pipe;
+      }
+    PLUGIN_DEBUG ("ITNP_New: created debug fifo: %d/%d\n", debug_pipe [0], debug_pipe [1]);
+#else
     // debug_pipe_name
     debug_pipe_name = g_strdup_printf ("%s/%d-icedteanp-plugin-debug-to-appletviewer",
@@ -610 +623 @@
       }
     PLUGIN_DEBUG ("ITNP_New: created debug fifo: %s\n", debug_pipe_name);
+#endif
   }
 
@@ -622 +636 @@
   fcntl (in_pipe [0], F_SETFD, FD_CLOEXEC);
   fcntl (out_pipe [0], F_SETFD, FD_CLOEXEC);
+  if (plugin_debug_to_console)
+    fcntl (debug_pipe [0], F_SETFD, FD_CLOEXEC);
 #endif
 
@@ -630 +646 @@
   CLOSE_FD (in_pipe [1]);
   CLOSE_FD (out_pipe [1]);
+  if (plugin_debug_to_console)
+    CLOSE_FD (debug_pipe [1]);
 #endif
 
@@ -698 +716 @@
   // debug_to_appletviewer
   if (plugin_debug_to_console){
+#ifdef __OS2__
+    debug_to_appletviewer = g_io_channel_unix_new (debug_pipe [0]);
+#else
     debug_to_appletviewer = g_io_channel_new_file (debug_pipe_name,
                                                  "w", &channel_error);
+#endif
     if (!debug_to_appletviewer)
       {
@@ -754 +776 @@
   out_to_appletviewer = NULL;
 
+#ifdef __OS2__
+ cleanup_debug_pipe:
+  if (plugin_debug_to_console){
+    CLOSE_FD (debug_pipe [0]);
+    CLOSE_FD (debug_pipe [1]);
+  }
+#else
   if (plugin_debug_to_console){
     // cleanup_debug_pipe:
@@ -766 +795 @@
     debug_pipe_name = NULL;
   }
-
-
+#endif
 
   // cleanup_out_pipe:
@@ -1636 +1664 @@
   command_line.push_back(static_cast<std::ostringstream &>(std::ostringstream() << out_pipe[1]).str());
   command_line.push_back(static_cast<std::ostringstream &>(std::ostringstream() << in_pipe[1]).str());
+  if (plugin_debug_to_console)
+    command_line.push_back(static_cast<std::ostringstream &>(std::ostringstream() << debug_pipe[1]).str());
 #else
   command_line.push_back(out_pipe_name);
   command_line.push_back(in_pipe_name);
-#endif
   if (plugin_debug_to_console){
       command_line.push_back(debug_pipe_name);
   }
+#endif
 
   // Finished command line parameters
@@ -2440 +2470 @@
     out_to_appletviewer = NULL;
     // cleanup_debug_pipe:
+#ifdef __OS2__
+    CLOSE_FD (debug_pipe [0]);
+    CLOSE_FD (debug_pipe [1]);
+#else
     // Delete debug pipe.
     PLUGIN_DEBUG ("NP_Shutdown: deleting debug fifo: %s\n", debug_pipe_name);
@@ -2447 +2481 @@
     g_free (debug_pipe_name);
     debug_pipe_name = NULL;
+#endif
   }