From 6b72fefafbec9a647f1ac8df49be59e2e8965a4e Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 13 Dec 2015 08:31:16 +0100
Subject: [PATCH] include: Factor fnameat.h out of prototypes.h

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
---
 include/fnameat.h           | 41 +++++++++++++++++++++++++++++++++++++
 include/prototypes.h        |  3 +--
 src/lib/common/conftab.c    |  1 +
 src/lib/common/emp_config.c |  1 +
 src/lib/gen/fnameat.c       |  4 +++-
 5 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 include/fnameat.h

diff --git a/include/fnameat.h b/include/fnameat.h
new file mode 100644
index 000000000..5bd91c29f
--- /dev/null
+++ b/include/fnameat.h
@@ -0,0 +1,41 @@
+/*
+ *  Empire - A multi-player, client/server Internet based war game.
+ *  Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
+ *
+ *  Empire 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ *  ---
+ *
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
+ *
+ *  ---
+ *
+ *  fnameat.h: Interpret file names relative to a directory
+ *
+ *  Known contributors to this file:
+ *     Markus Armbruster, 2015
+ */
+
+#ifndef FNAMEAT_H
+#define FNAMEAT_H
+
+#include <stdio.h>
+
+extern char *fnameat(const char *, const char *);
+extern FILE *fopenat(const char *, const char *, const char *);
+
+#endif
diff --git a/include/prototypes.h b/include/prototypes.h
index 5760a29c4..6fca449d3 100644
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -287,8 +287,7 @@ extern int demandupdatecheck(void);
 /* disassoc.c */
 extern int disassoc(void);
 /* fnameat.c */
-extern char *fnameat(const char *, const char *);
-extern FILE *fopenat(const char *, const char *, const char *);
+/* in fnameat.h */
 /* fsize.c */
 extern int fsize(int);
 extern int blksize(int);
diff --git a/src/lib/common/conftab.c b/src/lib/common/conftab.c
index 9a743d285..2c5d48e34 100644
--- a/src/lib/common/conftab.c
+++ b/src/lib/common/conftab.c
@@ -35,6 +35,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include "file.h"
+#include "fnameat.h"
 #include "optlist.h"
 #include "prototypes.h"
 #include "xdump.h"
diff --git a/src/lib/common/emp_config.c b/src/lib/common/emp_config.c
index ff698ff6a..d084e3a1f 100644
--- a/src/lib/common/emp_config.c
+++ b/src/lib/common/emp_config.c
@@ -50,6 +50,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "fnameat.h"
 #include "misc.h"
 #include "optlist.h"
 #include "prototypes.h"
diff --git a/src/lib/gen/fnameat.c b/src/lib/gen/fnameat.c
index 181b74ab6..d970372c9 100644
--- a/src/lib/gen/fnameat.c
+++ b/src/lib/gen/fnameat.c
@@ -33,7 +33,9 @@
 #include <config.h>
 
 #include <errno.h>
-#include "prototypes.h"
+#include <stdlib.h>
+#include <string.h>
+#include "fnameat.h"
 
 static int fname_is_abs(const char *);
 
-- 
2.43.0