Changeset 481 for trunk/src/sh_sub.c

Timestamp:

Jul 18, 2015, 5:06:52 PM (9 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

• trunk/src/sh_sub.c (modified) (7 diffs)

trunk/src/sh_sub.c

@@ -83 +83 @@
       close (child2parent[0]);
 
-      /* fprintf(stderr, "FIXME kill_sub %d\n", (int) sh_child_pid); */
-
       /* Let's be rude. */
       kill(sh_child_pid, SIGKILL);
@@ -210 +208 @@
 
           sh_child_pid = res;
-
-          /* fprintf(stderr, "FIXME create_sub %d\n", (int) sh_child_pid); */
         }
       else
@@ -252 +248 @@
 static ssize_t sh_sub_write(int fd, const void *buf, size_t count)
 {
-  char * mbuf = (char *) buf;
+  const char * mbuf = (const char *) buf;
   ssize_t rcount;
   int ttl = 5; /* 0, 1, 9, 81, 729 millisec */
@@ -296 +292 @@
   do {
 
-    /* fprintf(stderr, "FIXME wait_com polling..\n"); */
-
     do {
       ret = poll(&fds, 1, -1);
@@ -305 +299 @@
       {
         ret = sh_sub_read(parent2child[0], &inbuf, sizeof(inbuf));
-
-        /*
-        fprintf(stderr, "FIXME wait_com stat %s (%s)\n",
-                inbuf.path, (inbuf.command == SH_COM_LSTAT) ? "lstat" : "stat");
-        */
 
         if (ret == 0)
@@ -328 +317 @@
             outbuf.errnum = errno;
 
-            /* fprintf(stderr, "FIXME wait_com writing..\n"); */
-
             ret = sh_sub_write(child2parent[1], &outbuf, sizeof(outbuf));
             if (ret < 0)
               {
-                /* fprintf(stderr, "FIXME wait_com return 1\n"); */
                 return;
               }
@@ -339 +325 @@
         else /* sh_sub_read() < 0 */
           {
-            /* fprintf(stderr, "FIXME wait_com return 2\n"); */
             return;
           }
       }
-    
-    /* fprintf(stderr, "FIXME wait_com next..\n"); */
-
   } while (1 == 1);
 }