Changeset 1556

Timestamp:

Apr 26, 2016, 5:15:04 PM (9 years ago)

Author:

Silvan Scherrer

Message:

cups: remove the EOF workaround, as done proper now, enable the select() hack, as needed in the admin interface

Location:

cups/trunk

Files:

• cgi-bin/var.c (modified) (3 diffs)
• scheduler/client.c (modified) (1 diff)
• scheduler/select.c (modified) (1 diff)

cups/trunk/cgi-bin/var.c ¶

@@ -779 +779 @@
   while (fgets(line, sizeof(line), stdin))
   {
-#ifdef __OS2__
-    if (!strcmp(line, "\r\n") || !strcmp(line, "\n"))
-#else
     if (!strcmp(line, "\r\n"))
-#endif
     {
      /*
@@ -828 +824 @@
         ptr = line;
 
-#ifdef __OS2__
-        while ((ch = getchar()) != EOF && ch != '\n')
-#else
         while ((ch = getchar()) != EOF)
-#endif
         {
           *ptr++ = (char)ch;
@@ -873 +865 @@
         end = line + sizeof(line) - 1;
 
-#ifdef __OS2__
-        while ((ch = getchar()) != EOF && ch != '\n')
-#else
         while ((ch = getchar()) != EOF)
-#endif
         {
           if (ptr < end)

cups/trunk/scheduler/client.c ¶

@@ -2110 +2110 @@
   if (con->filename)
   {
+#ifdef __OS2__
+    fd = open(con->filename, O_RDONLY | O_BINARY);
+#else
     fd = open(con->filename, O_RDONLY);
+#endif
 
     if (fd < 0)

cups/trunk/scheduler/select.c ¶

@@ -618 +618 @@
                   NULL);
 
-#if 0 // #ifdef __EMX__ // @todo I doubt this part is needed 
-  /* libc's select() is flaky - pause 0.5 second and retry */   
-  if (nfds == -1) {
+#ifdef __OS2__
+  /* libc's select() is flaky - pause 0.5 second and retry
+   * @todo see why this is really needed
+   * my findings are, that it's only needed when gutenprint is installed
+   * somehow a cupsdPipeCommand needs very long to fork() execv() and so
+   * the socket isn't ready */
+  if (nfds == -1)
+  {
+    cupsdLogMessage(CUPSD_LOG_WARN, "cupsdDoSelect: select() returned %d... pause and retry select()",
+                  nfds);
     usleep(500000);
-    cupsdLogMessage(CUPSD_LOG_INFO, "cupsdDoSelect: select() returned %d... pause and retry select()",
+    if (timeout >= 0 && timeout < 86400)
+    {
+      stimeout.tv_sec  = timeout;
+      stimeout.tv_usec = 0;
+      nfds = select(maxfd, &cupsd_current_input, &cupsd_current_output, NULL,
+                  &stimeout);
+    }
+    else
+      nfds = select(maxfd, &cupsd_current_input, &cupsd_current_output, NULL,
+                  NULL);
+  }
+
+  if (nfds == -1)
+  {
+
+    cupsdLogMessage(CUPSD_LOG_WARN, "cupsdDoSelect: select() returned %d (2nd failure)... pause and setting socket to non-blocking mode",
                   nfds);
-  if (timeout >= 0 && timeout < 86400)
-  {
-    stimeout.tv_sec  = timeout;
-    stimeout.tv_usec = 0;
-    nfds = select(maxfd, &cupsd_current_input, &cupsd_current_output, NULL,
+    /* fcntl O_NONBLOCK doesn't always succeed on OS/2 - force the socket to be non-blocking */
+    char dontblock =1;
+    os2_ioctl(maxfd, FIONBIO, &dontblock,sizeof(dontblock));
+
+    usleep(500000);
+    if (timeout >= 0 && timeout < 86400)
+    {
+      stimeout.tv_sec  = timeout;
+      stimeout.tv_usec = 0;
+      nfds = select(maxfd, &cupsd_current_input, &cupsd_current_output, NULL,
                   &stimeout);
-  }
-  else
-    nfds = select(maxfd, &cupsd_current_input, &cupsd_current_output, NULL,
+    }
+    else
+      nfds = select(maxfd, &cupsd_current_input, &cupsd_current_output, NULL,
                   NULL);
-                }
-
-  if (nfds == -1) {
-
-
-  /* fcntl O_NONBLOCK doesn't always succeed on OS/2 - force the socket to be non-blocking */
-  char dontblock =1;
-  cupsdLogMessage(CUPSD_LOG_INFO, "cupsdDoSelect: select() returned %d (2nd failure)... setting socket to non-blocking mode",
+  }
+
+  if (nfds == -1)
+  {
+    cupsdLogMessage(CUPSD_LOG_WARN, "cupsdDoSelect: select() returned %d (3rd failure)... pause and retry select()",
                   nfds);
-  os2_ioctl(maxfd, FIONBIO, &dontblock,sizeof(dontblock));
-
-  usleep(500000);
-  cupsdLogMessage(CUPSD_LOG_INFO, "cupsdDoSelect: select() returned %d (2nd failure)... pause and retry select()",
-                  nfds);
-  if (timeout >= 0 && timeout < 86400)
-  {
-    stimeout.tv_sec  = timeout;
-    stimeout.tv_usec = 0;
-    nfds = select(maxfd, &cupsd_current_input, &cupsd_current_output, NULL,
+    usleep(500000);
+    if (timeout >= 0 && timeout < 86400)
+    {
+      stimeout.tv_sec  = timeout;
+      stimeout.tv_usec = 0;
+      nfds = select(maxfd, &cupsd_current_input, &cupsd_current_output, NULL,
                   &stimeout);
-  }
-  else
-    nfds = select(maxfd, &cupsd_current_input, &cupsd_current_output, NULL,
+    }
+    else
+      nfds = select(maxfd, &cupsd_current_input, &cupsd_current_output, NULL,
                   NULL);
-                }
-
-  if (nfds == -1) {
-    usleep(500000);
-    cupsdLogMessage(CUPSD_LOG_INFO, "cupsdDoSelect: select() returned %d (3rd failure)... pause and retry select()",
-                  nfds);
-  if (timeout >= 0 && timeout < 86400)
-  {
-    stimeout.tv_sec  = timeout;
-    stimeout.tv_usec = 0;
-    nfds = select(maxfd, &cupsd_current_input, &cupsd_current_output, NULL,
-                  &stimeout);
-  }
-  else
-    nfds = select(maxfd, &cupsd_current_input, &cupsd_current_output, NULL,
-                  NULL);
-                }
-
+  }
 #endif