Interrupt handling for pipes

clicon · Jan 28, 2025 · d7a8bbd · d7a8bbd
1 parent fbd6e20
commit d7a8bbd
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/cligen_cvec.c b/cligen_cvec.c
@@ -228,7 +228,6 @@ cvec_add(cvec        *cvv,
         return NULL;
     }
     len = cvv->vr_len + 1;
-
     if ((cvv->vr_vec = realloc(cvv->vr_vec, len*sizeof(cg_var))) == NULL)
         return NULL;
     cvv->vr_len = len;

diff --git a/cligen_io.c b/cligen_io.c
@@ -291,10 +291,16 @@ cligen_output(FILE       *f,
         goto done;
     if (s != -1){
         if (write(s, inbuf, inbuflen) < 0){
-            perror("cligen_output write on pipe socket");
-            close(s);
-            cli_pipe_output_socket_set(-1);
-            goto done;
+            switch (errno){
+            case EPIPE:
+                break;
+            default:
+                perror("cligen_output write on pipe socket");
+                close(s);
+                cli_pipe_output_socket_set(-1);
+                goto done;
+                break;
+            }
         }
     }
     else{

diff --git a/cligen_read.c b/cligen_read.c
@@ -940,8 +940,14 @@ cligen_eval_pipe_post(cligen_handle h,
         /* Read until EOF */
         while (ret != 0) {
             if ((len = read(s, buf, 4096)) < 0){
-                perror("cli_pipe_exec_cb, read");
-                goto done;
+                switch (errno){
+                case ECONNRESET:
+                    break;
+                default:
+                    perror("cligen_eval_pipe_post, read");
+                    goto done;
+                    break;
+                }
             }
             if (len == 0)
                 break;

diff --git a/cligen_util.c b/cligen_util.c
@@ -67,8 +67,8 @@
  * @param[in]   cvv  cligen variable vector
  * @param[in]   name Name to set (or NULL)
  * @param[val]  val  String value
- * @retval  0  OK
- * @retval -1  Error
+ * @retval      0    OK
+ * @retval     -1    Error
  */
 int
 cvec_add_string(cvec       *cvv,