From c1a4bb030717f2d2d209ccd8ab898ab66fa16869 Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@systemlinux.org>
Date: Fri, 6 Jun 2008 14:54:37 +0200
Subject: [PATCH] Rename fd.[ch] to util.[ch].

It contains not only fd-related stuff.
---
 Makefile       | 4 ++--
 fsck.c         | 2 +-
 osl.c          | 2 +-
 fd.c => util.c | 4 ++--
 fd.h => util.h | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename fd.c => util.c (98%)
 rename fd.h => util.h (96%)

diff --git a/Makefile b/Makefile
index 24775a4..b42b1a9 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ prefix := /usr/local
 libdir := $(prefix)/lib
 includedir := $(prefix)/include
 
-objects := osl.o fd.o rbtree.o sha1.o
-fsck_objects := fsck.fsck.o osl.fsck.o fd.fsck.o rbtree.fsck.o sha1.fsck.o fsck.cmdline.o
+objects := osl.o util.o rbtree.o sha1.o
+fsck_objects := fsck.fsck.o osl.fsck.o util.fsck.o rbtree.fsck.o sha1.fsck.o fsck.cmdline.o
 headers := osl.h
 
 INSTALL := install
diff --git a/fsck.c b/fsck.c
index 6f13671..29c4e2c 100644
--- a/fsck.c
+++ b/fsck.c
@@ -15,7 +15,7 @@
 #include "log.h"
 #include "osl.h"
 #include "error.h"
-#include "fd.h"
+#include "util.h"
 #include "osl_core.h"
 #include "fsck.cmdline.h"
 
diff --git a/osl.c b/osl.c
index b9424e3..31b40c2 100644
--- a/osl.c
+++ b/osl.c
@@ -11,7 +11,7 @@
 #include "log.h"
 #include "osl.h"
 #include "error.h"
-#include "fd.h"
+#include "util.h"
 #include "osl_core.h"
 
 /* Taken from Drepper: How to write shared libraries, Appendix B. */
diff --git a/fd.c b/util.c
similarity index 98%
rename from fd.c
rename to util.c
index 0dc3f29..7bf74b0 100644
--- a/fd.c
+++ b/util.c
@@ -4,7 +4,7 @@
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file fd.c Helper functions for file descriptor handling. */
+/** \file util.c Helper functions needed by both libosl and oslfsck. */
 
 #include <sys/types.h>
 #include <dirent.h>
@@ -15,7 +15,7 @@
 #include "log.h"
 #include "osl.h"
 #include "error.h"
-#include "fd.h"
+#include "util.h"
 
 /**
  * Wrapper for the write system call.
diff --git a/fd.h b/util.h
similarity index 96%
rename from fd.h
rename to util.h
index 536e3c8..2e3c66f 100644
--- a/fd.h
+++ b/util.h
@@ -4,7 +4,7 @@
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file fd.h exported symbols from fd.c */
+/** \file util.h exported functions from util.c */
 
 int osl_open(const char *path, int flags, mode_t mode);
 int mmap_full_file(const char *filename, int open_mode, void **map,
-- 
2.39.2