diff --git a/src/config/doveconf.c b/src/config/doveconf.c index ed7ad61004..0cc72e4239 100644 --- 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 1735288dc3..181c123856 100644 --- 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 b87fb69ae2..cd066cd255 100644 --- 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 aba00eaecc..5947c513ed 100644 --- 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 01a8193f77..4fe761debd 100644 --- 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 265bad7a5b..5baf04f543 100644 --- 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 62c373579d..b702a2a891 100644 --- 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 4780c876c6..6e53db7d01 100644 --- 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 add063923c..3a8ad5265a 100644 --- 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 064d9c950f..9761e6bcac 100644 --- 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 c78b095e10..45d6c9674a 100644 --- 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 879686a215..a7b71ff128 100644 --- 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 83aadf0381..dc65b00308 100644 --- 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 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 117d8d2516..d8d3e4ed87 100644 --- 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 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 efc9e780d3..fc7b72a7b2 100644 --- 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 d796024b26..3a466a4bfb 100644 --- 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 diff --git a/src/lmtp/main.c b/src/lmtp/main.c index 8485769363..2c11eb5d7b 100644 --- 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 542ac5e92e..de2cc24178 100644 --- 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 54bbc15eea..3ad7746fb1 100644 --- 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"