include internal headers with <...> in lib/ast/*.c

It turns out to deal with #1785, we will need to include internal headers this
way as well as external headers. 2ecb837a05be3d69971001708e7acccfd470ad97 should
have gone in this direction to begin with.

diff --git a/lib/ast/chresc.c b/lib/ast/chresc.c
index 1092cb4fee2145793fd083acf616234b725758cc..f69693dfb333211ae157d4f94fe9a6e024c9ce0f 100644 (file)
--- a/lib/ast/chresc.c
+++ b/lib/ast/chresc.c
@@ -20,7 +20,7 @@
  * p is updated to point to the next character in s
  */
 
-#include "ast.h"
+#include <ast/ast.h>
 
 int chresc(const char *s, char **p)
 {

diff --git a/lib/ast/chrtoi.c b/lib/ast/chrtoi.c
index b9d10457fda63a14b6020e37a038a85c0fd72f36..a4d70c16ff22096aa90b6b70e3f018aee7316f81 100644 (file)
--- a/lib/ast/chrtoi.c
+++ b/lib/ast/chrtoi.c
@@ -18,7 +18,7 @@
  * convert a 0 terminated character constant string to an int
  */
 
-#include "ast.h"
+#include <ast/ast.h>
 
 int chrtoi(const char *s)
 {

diff --git a/lib/ast/error.c b/lib/ast/error.c
index 6f3e9df9c8c622eecb19c844ce686112fef7f864..8e22edec6c2a005ecb5ecc6a8b8de886533ce7ca 100644 (file)
--- a/lib/ast/error.c
+++ b/lib/ast/error.c
@@ -23,8 +23,8 @@
 #endif
 #endif
 
-#include "ast.h"
-#include "error.h"
+#include <ast/ast.h>
+#include <ast/error.h>
 #include <string.h>
 #include <errno.h>
 

diff --git a/lib/ast/fmtbuf.c b/lib/ast/fmtbuf.c
index 5ea7f8ef3dbac05506c46666db72f80147eb8448..26a8d0affed9d82012bda258fb5d2d35bfc88ca0 100644 (file)
--- a/lib/ast/fmtbuf.c
+++ b/lib/ast/fmtbuf.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 
-#include "ast.h"
+#include <ast/ast.h>
 
 /*
  * return small format buffer chunk of size n

diff --git a/lib/ast/fmtesc.c b/lib/ast/fmtesc.c
index 5d1f3e78a9f3dfed18cae2d5381f89539f94eaae..109756059e67f0043e81f3a698615decc3446075 100644 (file)
--- a/lib/ast/fmtesc.c
+++ b/lib/ast/fmtesc.c
@@ -18,7 +18,7 @@
  * return string with expanded escape chars
  */
 
-#include "ast.h"
+#include <ast/ast.h>
 #include <string.h>
 #include <ctype.h>
 

diff --git a/lib/ast/pathaccess.c b/lib/ast/pathaccess.c
index 49941f04d6301b06f5f0c434708609aaf662346d..f5410eb9dbf98821cde2a7835b59b2b3424e9027 100644 (file)
--- a/lib/ast/pathaccess.c
+++ b/lib/ast/pathaccess.c
@@ -22,7 +22,7 @@
  * path returned in path buffer
  */
 
-#include "ast.h"
+#include <ast/ast.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #else

diff --git a/lib/ast/pathbin.c b/lib/ast/pathbin.c
index 53ad84ada38d18192a56f55984d748bc8b22b91b..ba7fdde7e4f304c06d1e5999a093a60b66424ba2 100644 (file)
--- a/lib/ast/pathbin.c
+++ b/lib/ast/pathbin.c
@@ -18,7 +18,7 @@
  * return current PATH
  */
 
-#include "ast.h"
+#include <ast/ast.h>
 
 char *pathbin(void)
 {

diff --git a/lib/ast/pathcanon.c b/lib/ast/pathcanon.c
index c20aea41db0ad056b174d5003cf77e4a62d54151..a9485faed15ba460fa3380858987fc557eeab556 100644 (file)
--- a/lib/ast/pathcanon.c
+++ b/lib/ast/pathcanon.c
@@ -32,9 +32,9 @@
  * will contain the components following the failure point
  */
 
-#include "ast.h"
+#include <ast/ast.h>
 #include <errno.h>
-#include "error.h"
+#include <ast/error.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>

diff --git a/lib/ast/pathcat.c b/lib/ast/pathcat.c
index f056cf1a78dc148e236b08f18fd2149e9b3b200f..5db0a2a1b111a40df1d968fe49d09828b653afd6 100644 (file)
--- a/lib/ast/pathcat.c
+++ b/lib/ast/pathcat.c
@@ -18,7 +18,7 @@
  * single dir support for pathaccess()
  */
 
-#include "ast.h"
+#include <ast/ast.h>
 
 char *pathcat(char *path, const char *dirs, int sep,
              const char *a, const char *b)

diff --git a/lib/ast/pathexists.c b/lib/ast/pathexists.c
index d40aea5341eb48e1120dd9d347570fc46ece81d9..58f7e81aac98323cfe19184e2722474bd65a82d0 100644 (file)
--- a/lib/ast/pathexists.c
+++ b/lib/ast/pathexists.c
@@ -22,8 +22,8 @@
  * in half by checking ENOTDIR vs. ENOENT
  */
 
-#include "ast.h"
-#include "error.h"
+#include <ast/ast.h>
+#include <ast/error.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/lib/ast/pathfind.c b/lib/ast/pathfind.c
index 6064c3b75bde96f487cff8cf068d564fed2591ea..991587b5851cb729dd6dda5641e99c631dff27ac 100644 (file)
--- a/lib/ast/pathfind.c
+++ b/lib/ast/pathfind.c
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "ast.h"
+#include <ast/ast.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #else

diff --git a/lib/ast/pathpath.c b/lib/ast/pathpath.c
index 84a1378dd4b3cdfa39a868c954958609bb21f871..6feb1e8821646d80c6a9db1a709a5f9c02218e58 100644 (file)
--- a/lib/ast/pathpath.c
+++ b/lib/ast/pathpath.c
@@ -25,7 +25,7 @@
  * if path==0 then the space is malloc'd
  */
 
-#include "ast.h"
+#include <ast/ast.h>
 #include <string.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/lib/ast/strcopy.c b/lib/ast/strcopy.c
index 40b8f4c7212b1314b0ee7df06ca8c56e3af01486..68497aee12c575c36a37264f492417249f47f053 100644 (file)
--- a/lib/ast/strcopy.c
+++ b/lib/ast/strcopy.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 
-#include "ast.h"
+#include <ast/ast.h>
 
 /*
  * copy t into s, return a pointer to the end of s ('\0')

diff --git a/lib/ast/stresc.c b/lib/ast/stresc.c
index b649af0b447348ee2f4a6ce2616415bd2f0891d1..aa0a59e6837f2ade30524f8507d2c4f015dde8b4 100644 (file)
--- a/lib/ast/stresc.c
+++ b/lib/ast/stresc.c
@@ -19,7 +19,7 @@
  * the length of the converted s is returned (may have imbedded \0's)
  */
 
-#include "ast.h"
+#include <ast/ast.h>
 
 int stresc(char *s)
 {

diff --git a/lib/ast/strmatch.c b/lib/ast/strmatch.c
index 5632678123bc2aa043ac3b26059c76de8c6596c1..d5aae016e7939c5d8677ab9104a9fa3cdaf05a72 100644 (file)
--- a/lib/ast/strmatch.c
+++ b/lib/ast/strmatch.c
@@ -51,9 +51,9 @@
  *       element size
  */
 
-#include "ast.h"
+#include <ast/ast.h>
 #include <ctype.h>
-#include "hashkey.h"
+#include <ast/hashkey.h>
 #include <string.h>
 
 #if _hdr_wchar && _lib_wctype && _lib_iswctype
@@ -120,7 +120,7 @@ static int iswblank(wint_t wc)
 #endif
 
 #if _DEBUG_MATCH
-#include "error.h"
+#include <ast/error.h>
 #endif
 
 #define MAXGROUP       10