From 08b0e22e4e134f69587daebaba19933f12a44203 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Mon, 15 Jan 2018 14:14:29 +0000
Subject: [PATCH 3/3] dbus-spawn-unix: Rename from dbus-spawn

This file is the Unix counterpart of dbus-spawn-win.c, so it's less
confusing for it to have an indicative name.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 cmake/dbus/CMakeLists.txt                | 2 +-
 dbus/Makefile.am                         | 2 +-
 dbus/dbus-internals.c                    | 2 +-
 dbus/{dbus-spawn.c => dbus-spawn-unix.c} | 5 +----
 4 files changed, 4 insertions(+), 7 deletions(-)
 rename dbus/{dbus-spawn.c => dbus-spawn-unix.c} (99%)

diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
index 2fdd1128..8fdd4b94 100644
--- a/cmake/dbus/CMakeLists.txt
+++ b/cmake/dbus/CMakeLists.txt
@@ -227,7 +227,7 @@ else (WIN32)
 		${DBUS_DIR}/dbus-userdb.h
 	)
 	set (DBUS_UTIL_SOURCES ${DBUS_UTIL_SOURCES}
-		${DBUS_DIR}/dbus-spawn.c
+		${DBUS_DIR}/dbus-spawn-unix.c
 		${DBUS_DIR}/dbus-userdb-util.c
 		${DBUS_DIR}/dbus-sysdeps-util-unix.c
 	)
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index d4fe09f8..8f451f59 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -116,7 +116,7 @@ DBUS_SHARED_arch_sources = 			\
 DBUS_UTIL_arch_sources = 			\
 	dbus-sysdeps-util-unix.c		\
 	dbus-userdb-util.c			\
-	dbus-spawn.c
+	dbus-spawn-unix.c			\
 endif
 
 if HAVE_LINUX_EPOLL
diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c
index 126e3e4b..061c527b 100644
--- a/dbus/dbus-internals.c
+++ b/dbus/dbus-internals.c
@@ -447,7 +447,7 @@ _dbus_verbose_real (
 
 /**
  * Reinitializes the verbose logging code, used
- * as a hack in dbus-spawn.c so that a child
+ * as a hack in dbus-spawn-unix.c so that a child
  * process re-reads its pid
  *
  */
diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn-unix.c
similarity index 99%
rename from dbus/dbus-spawn.c
rename to dbus/dbus-spawn-unix.c
index 6fb75d3b..cea5a5f1 100644
--- a/dbus/dbus-spawn.c
+++ b/dbus/dbus-spawn-unix.c
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-spawn.c Wrapper around fork/exec
+/* dbus-spawn-unix.c — Wrapper around fork/exec
  *
  * Copyright (C) 2002, 2003, 2004  Red Hat, Inc.
  * Copyright (C) 2003 CodeFactory AB
@@ -24,9 +24,6 @@
 
 #include <config.h>
 
-/* It isn't obvious from its name, but this file is part of the Unix
- * system-dependent part of libdbus. Windows has a parallel
- * implementation in dbus-spawn-win.c. */
 #if defined(DBUS_WIN) || !defined(DBUS_UNIX)
 #error "This file only makes sense on Unix OSs"
 #endif
-- 
2.15.1