fix kerberos

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

diff --git a/sync_pipe_write.c b/sync_pipe_write.c
index 8a5c65e38c7be4313eaf2506f252db41e00411dd..ea1a7927d061c18742568cf7603fc11f1840ce3c 100644 (file)
--- a/sync_pipe_write.c
+++ b/sync_pipe_write.c
@@ -4,37 +4,18 @@
  * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#include "config.h"
+#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 */
@@ -56,7 +37,7 @@ pipe_write_header(int pipe_fd, char indicator, int length)
     header[3] = (length >> 0) & 0xFF;
 
     /* write header */
-    return write(pipe_fd, header, sizeof header);
+    return ws_write(pipe_fd, header, sizeof header);
 }
 
 
@@ -87,7 +68,7 @@ pipe_write_block(int pipe_fd, char indicator, const char *msg)
     /* write value (if we have one) */
     if(len) {
         /*g_warning("write %d indicator: %c value len: %u msg: %s", pipe_fd, indicator, len, msg);*/
-        ret = write(pipe_fd, msg, len);
+        ret = ws_write(pipe_fd, msg, len);
         if(ret == -1) {
             return;
         }
@@ -109,3 +90,16 @@ sync_pipe_errmsg_to_parent(int pipe_fd, const char *error_msg,
     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:
+ */