lib: Rename abspath to path-util

diff --git a/src/config/doveconf.c b/src/config/doveconf.c
index ed7ad6100475829bab5e47cd298f3fb9d24bcf04..0cc72e423927281bd5f50e28ab6be98f676714f7 100644 (file)
--- a/src/config/doveconf.c
+++ b/src/config/doveconf.c
@@ -2,7 +2,7 @@
 
 #include "lib.h"
 #include "array.h"
-#include "abspath.h"
+#include "path-util.h"
 #include "module-dir.h"
 #include "env-util.h"
 #include "guid.h"

diff --git a/src/imap-urlauth/imap-urlauth.c b/src/imap-urlauth/imap-urlauth.c
index 1735288dc35e7f24550f2bd8715b9cd213e9f836..181c12385673e1622f312647c2611cceeb1c0867 100644 (file)
--- a/src/imap-urlauth/imap-urlauth.c
+++ b/src/imap-urlauth/imap-urlauth.c
@@ -49,7 +49,7 @@ The imap-urlauth service thus consists of three separate stages:
 #include "buffer.h"
 #include "istream.h"
 #include "ostream.h"
-#include "abspath.h"
+#include "path-util.h"
 #include "base64.h"
 #include "str.h"
 #include "process-title.h"

diff --git a/src/imap/main.c b/src/imap/main.c
index b87fb69ae24b43845b86330570e9aa85beb771f3..cd066cd255241b2fd1cc99e9447cd304db6a4620 100644 (file)
--- a/src/imap/main.c
+++ b/src/imap/main.c
@@ -4,7 +4,7 @@
 #include "ioloop.h"
 #include "istream.h"
 #include "ostream.h"
-#include "abspath.h"
+#include "path-util.h"
 #include "str.h"
 #include "base64.h"
 #include "process-title.h"

diff --git a/src/lda/main.c b/src/lda/main.c
index aba00eaeccbee563f84ffe71858a1f21c8e24627..5947c513ed4ea89f1ef683009e1544e72ff21b45 100644 (file)
--- a/src/lda/main.c
+++ b/src/lda/main.c
@@ -7,7 +7,7 @@
 #include "fd-set-nonblock.h"
 #include "istream.h"
 #include "istream-seekable.h"
-#include "abspath.h"
+#include "path-util.h"
 #include "safe-mkstemp.h"
 #include "eacces-error.h"
 #include "ipwd.h"

diff --git a/src/lib-http/test-http-payload.c b/src/lib-http/test-http-payload.c
index 01a8193f7726ef53748e95162db45fadbda1d68e..4fe761debdabe2eeba258cf3a01b40a9ed81796c 100644 (file)
--- a/src/lib-http/test-http-payload.c
+++ b/src/lib-http/test-http-payload.c
@@ -3,7 +3,7 @@
 #include "lib.h"
 #include "str.h"
 #include "llist.h"
-#include "abspath.h"
+#include "path-util.h"
 #include "hostpid.h"
 #include "ioloop.h"
 #include "istream.h"

diff --git a/src/lib-master/master-instance.c b/src/lib-master/master-instance.c
index 265bad7a5b13a6d4458f2d7e6ea691ca8bb388f1..5baf04f543408d818ae84258e1e974ac90bda708 100644 (file)
--- a/src/lib-master/master-instance.c
+++ b/src/lib-master/master-instance.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2013-2017 Dovecot authors, see the included COPYING file */
 
 #include "lib.h"
-#include "abspath.h"
+#include "path-util.h"
 #include "array.h"
 #include "istream.h"
 #include "ostream.h"

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index 62c373579da6f0729bdf8c5f2e9a9f34d44ee4c5..b702a2a8915a8cd80c7d076df6c98c773aa4cfea 100644 (file)
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -2,7 +2,7 @@
 
 #include "lib.h"
 #include "array.h"
-#include "abspath.h"
+#include "path-util.h"
 #include "istream.h"
 #include "write-full.h"
 #include "str.h"

diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index 4780c876c66571907c73149b8a2ceb5366be2096..6e53db7d019543027dd21fe8d2097d6ba399e394 100644 (file)
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -3,7 +3,7 @@
 #include "lib.h"
 #include "lib-signals.h"
 #include "ioloop.h"
-#include "abspath.h"
+#include "path-util.h"
 #include "array.h"
 #include "strescape.h"
 #include "env-util.h"

diff --git a/src/lib-storage/index/dbox-common/dbox-storage.c b/src/lib-storage/index/dbox-common/dbox-storage.c
index add063923cc8f9d63a7cd47304d83d80d4ec2253..3a8ad5265ab544f839e2b0440e143f42b2c07cb2 100644 (file)
--- a/src/lib-storage/index/dbox-common/dbox-storage.c
+++ b/src/lib-storage/index/dbox-common/dbox-storage.c
@@ -1,9 +1,8 @@
 /* Copyright (c) 2007-2017 Dovecot authors, see the included COPYING file */
 
 #include "lib.h"
-#include "abspath.h"
+#include "path-util.h"
 #include "ioloop.h"
-#include "abspath.h"
 #include "fs-api.h"
 #include "mkdir-parents.h"
 #include "unlink-old-files.h"

diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index 064d9c950f2a09333b68feb59d5ee6cbc9833f5f..9761e6bcac427307def4ae94d7dbb0f45b5b602d 100644 (file)
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -2,7 +2,7 @@
 
 #include "lib.h"
 #include "array.h"
-#include "abspath.h"
+#include "path-util.h"
 #include "ioloop.h"
 #include "mkdir-parents.h"
 #include "str.h"

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index c78b095e1056395b26f2a5081f636861aed8708b..45d6c9674a6995e632425008285021ef68ef67eb 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -11,7 +11,6 @@ $(srcdir)/unicodemap.c: unicodemap.pl UnicodeData.txt
        perl $(srcdir)/unicodemap.pl < UnicodeData.txt > $@
 
 liblib_la_SOURCES = \
-       abspath.c \
        array.c \
        aqueue.c \
        askpass.c \
@@ -118,6 +117,7 @@ liblib_la_SOURCES = \
        ostream-null.c \
        ostream-rawlog.c \
        ostream-unix.c \
+       path-util.c \
        pkcs5.c \
        primes.c \
        printf-format-fix.c \
@@ -158,7 +158,6 @@ liblib_la_SOURCES = \
        write-full.c
 
 headers = \
-       abspath.h \
        aqueue.h \
        array.h \
        array-decl.h \
@@ -260,6 +259,7 @@ headers = \
        ostream-null.h \
        ostream-rawlog.h \
        ostream-unix.h \
+       path-util.h \
        pkcs5.h \
        primes.h \
        printf-format-fix.h \

diff --git a/src/lib/eacces-error.c b/src/lib/eacces-error.c
index 879686a215124e6729df96810116a1310a8f62fb..a7b71ff128a8561b4de3a67d77ab0a4a1008ca10 100644 (file)
--- a/src/lib/eacces-error.c
+++ b/src/lib/eacces-error.c
@@ -2,7 +2,7 @@
 
 #include "lib.h"
 #include "str.h"
-#include "abspath.h"
+#include "path-util.h"
 #include "ipwd.h"
 #include "restrict-access.h"
 #include "eacces-error.h"

diff --git a/src/lib/nfs-workarounds.c b/src/lib/nfs-workarounds.c
index 83aadf03812d837c70035bc173c2d65941bba90b..dc65b003087ca1fce26bb60a16f1cd274aba5f07 100644 (file)
--- a/src/lib/nfs-workarounds.c
+++ b/src/lib/nfs-workarounds.c
@@ -28,7 +28,6 @@
 */
 
 #include "lib.h"
-#include "abspath.h"
 #include "nfs-workarounds.h"
 
 #include <fcntl.h>

diff --git a/src/lib/abspath.c b/src/lib/path-util.c
similarity index 98%
rename from src/lib/abspath.c
rename to src/lib/path-util.c
index 117d8d2516368216864c3504794330d9ea0ac6bc..d8d3e4ed871f5d7db1be2c8fc8b49e47b394b8b3 100644 (file)
--- a/src/lib/abspath.c
+++ b/src/lib/path-util.c
@@ -2,7 +2,7 @@
 
 #include "lib.h"
 #include "str.h"
-#include "abspath.h"
+#include "path-util.h"
 
 #include <unistd.h>
 

diff --git a/src/lib/abspath.h b/src/lib/path-util.h
similarity index 95%
rename from src/lib/abspath.h
rename to src/lib/path-util.h
index efc9e780d3b29581862d7f6f4dab9dd3ad58d262..fc7b72a7b23bfb0e8e52e35356aa982930ab568a 100644 (file)
--- a/src/lib/abspath.h
+++ b/src/lib/path-util.h
@@ -1,5 +1,5 @@
-#ifndef ABSPATH_H
-#define ABSPATH_H
+#ifndef PATH_UTIL_H
+#define PATH_UTIL_H
 
 /* Returns path as absolute path. If it's not already absolute path,
    it's assumed to be relative to current working directory. */

diff --git a/src/lib/unlink-directory.c b/src/lib/unlink-directory.c
index d796024b26696b784c26c8ac15e11f35f6af4d22..3a466a4bfba5f1c90affcb7d67b7c28f3536de50 100644 (file)
--- a/src/lib/unlink-directory.c
+++ b/src/lib/unlink-directory.c
@@ -33,7 +33,7 @@
 #define _GNU_SOURCE /* for O_NOFOLLOW with Linux */
 
 #include "lib.h"
-#include "abspath.h"
+#include "path-util.h"
 #include "unlink-directory.h"
 
 #include <fcntl.h>

diff --git a/src/lmtp/main.c b/src/lmtp/main.c
index 848576936308a5913a3084210c67569d33aa90ba..2c11eb5d7b42e75698c15925819e01b2a9aa1444 100644 (file)
--- a/src/lmtp/main.c
+++ b/src/lmtp/main.c
@@ -4,7 +4,7 @@
 #include "array.h"
 #include "ioloop.h"
 #include "hostpid.h"
-#include "abspath.h"
+#include "path-util.h"
 #include "restrict-access.h"
 #include "fd-close-on-exec.h"
 #include "anvil-client.h"

diff --git a/src/master/main.c b/src/master/main.c
index 542ac5e92eab8bc1736208e8a87fecba56ff9955..de2cc241786e1ed8e4a15aabc6b3080bfc75fc25 100644 (file)
--- a/src/master/main.c
+++ b/src/master/main.c
@@ -8,7 +8,7 @@
 #include "write-full.h"
 #include "env-util.h"
 #include "hostpid.h"
-#include "abspath.h"
+#include "path-util.h"
 #include "ipwd.h"
 #include "str.h"
 #include "execv-const.h"

diff --git a/src/pop3/main.c b/src/pop3/main.c
index 54bbc15eea61c2770e40196159df8f9eba4da373..3ad7746fb1683857ff17a6148f192a54033f4a2c 100644 (file)
--- a/src/pop3/main.c
+++ b/src/pop3/main.c
@@ -5,7 +5,7 @@
 #include "buffer.h"
 #include "istream.h"
 #include "ostream.h"
-#include "abspath.h"
+#include "path-util.h"
 #include "base64.h"
 #include "str.h"
 #include "process-title.h"