decrypt

[metze/wireshark/wip.git] / sync_pipe_write.c

diff --git a/sync_pipe_write.c b/sync_pipe_write.c
index 337e0414b4aec305df1a63f0f532285fd4ae0337..ea1a7927d061c18742568cf7603fc11f1840ce3c 100644 (file)
--- a/sync_pipe_write.c
+++ b/sync_pipe_write.c
@@ -1,52 +1,29 @@
 /* sync_pipe_write.c
- *
- * $Id$
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
 
 #include <string.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef _WIN32
-#include <io.h>
-#endif
-
 #include <glib.h>
 
+#include <wsutil/file_util.h>
+
 #include "sync_pipe.h"
-#include "log.h"
 
 /****************************************************************************************************************/
 /* sync_pipe handling */
 
 
 /* write a single message header to the recipient pipe */
-int
-pipe_write_header(int pipe, char indicator, int length)
+ssize_t
+pipe_write_header(int pipe_fd, char indicator, int length)
 {
     guchar header[1+3]; /* indicator + 3-byte len */
 
@@ -60,56 +37,69 @@ pipe_write_header(int pipe, char indicator, int length)
     header[3] = (length >> 0) & 0xFF;
 
     /* write header */
-    return write(pipe, header, sizeof header);
+    return ws_write(pipe_fd, header, sizeof header);
 }
 
 
-/* write a message to the recipient pipe in the standard format 
-   (3 digit message length (excluding length and indicator field), 
+/* write a message to the recipient pipe in the standard format
+   (3 digit message length (excluding length and indicator field),
    1 byte message indicator and the rest is the message).
    If msg is NULL, the message has only a length and indicator. */
 void
-pipe_write_block(int pipe, char indicator, const char *msg)
+pipe_write_block(int pipe_fd, char indicator, const char *msg)
 {
-    int ret;
-    size_t len;
+    ssize_t ret;
+    int len;
 
-    /*g_warning("write %d enter", pipe);*/
+    /*g_warning("write %d enter", pipe_fd);*/
 
     if(msg != NULL) {
-        len = strlen(msg) + 1;    /* including the terminating '\0'! */
+        len = (int) strlen(msg) + 1;    /* including the terminating '\0'! */
     } else {
         len = 0;
     }
 
     /* write header (indicator + 3-byte len) */
-    ret = pipe_write_header(pipe, indicator, len);
+    ret = pipe_write_header(pipe_fd, indicator, len);
     if(ret == -1) {
         return;
     }
 
     /* write value (if we have one) */
     if(len) {
-        /*g_warning("write %d indicator: %c value len: %u msg: %s", pipe, indicator, len, msg);*/
-        ret = write(pipe, msg, len);
+        /*g_warning("write %d indicator: %c value len: %u msg: %s", pipe_fd, indicator, len, msg);*/
+        ret = ws_write(pipe_fd, msg, len);
         if(ret == -1) {
             return;
         }
     } else {
-        /*g_warning("write %d indicator: %c no value", pipe, indicator);*/
+        /*g_warning("write %d indicator: %c no value", pipe_fd, indicator);*/
     }
 
-    /*g_warning("write %d leave", pipe);*/
+    /*g_warning("write %d leave", pipe_fd);*/
 }
 
 
 void
-sync_pipe_errmsg_to_parent(int pipe, const char *error_msg,
+sync_pipe_errmsg_to_parent(int pipe_fd, const char *error_msg,
                            const char *secondary_error_msg)
 {
 
     /* first write a "master header" with the length of the two messages plus their "slave headers" */
-    pipe_write_header(pipe, SP_ERROR_MSG, strlen(error_msg) + 1 + 4 + strlen(secondary_error_msg) + 1 + 4);
-    pipe_write_block(pipe, SP_ERROR_MSG, error_msg);
-    pipe_write_block(pipe, SP_ERROR_MSG, secondary_error_msg);
+    pipe_write_header(pipe_fd, SP_ERROR_MSG, (int) (strlen(error_msg) + 1 + 4 + strlen(secondary_error_msg) + 1 + 4));
+    pipe_write_block(pipe_fd, SP_ERROR_MSG, error_msg);
+    pipe_write_block(pipe_fd, SP_ERROR_MSG, secondary_error_msg);
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */