From 690c43cba67a8519421b8d1d3cdaa5b22831dac2 Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 15 Aug 2020 09:46:54 -0700
Subject: [PATCH] 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.
---
 lib/ast/chresc.c     | 2 +-
 lib/ast/chrtoi.c     | 2 +-
 lib/ast/error.c      | 4 ++--
 lib/ast/fmtbuf.c     | 2 +-
 lib/ast/fmtesc.c     | 2 +-
 lib/ast/pathaccess.c | 2 +-
 lib/ast/pathbin.c    | 2 +-
 lib/ast/pathcanon.c  | 4 ++--
 lib/ast/pathcat.c    | 2 +-
 lib/ast/pathexists.c | 4 ++--
 lib/ast/pathfind.c   | 2 +-
 lib/ast/pathpath.c   | 2 +-
 lib/ast/strcopy.c    | 2 +-
 lib/ast/stresc.c     | 2 +-
 lib/ast/strmatch.c   | 6 +++---
 15 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/ast/chresc.c b/lib/ast/chresc.c
index 1092cb4fe..f69693dfb 100644
--- 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 b9d10457f..a4d70c16f 100644
--- 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 6f3e9df9c..8e22edec6 100644
--- 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 5ea7f8ef3..26a8d0aff 100644
--- 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 5d1f3e78a..109756059 100644
--- 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 49941f04d..f5410eb9d 100644
--- 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 53ad84ada..ba7fdde7e 100644
--- 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 c20aea41d..a9485faed 100644
--- 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 f056cf1a7..5db0a2a1b 100644
--- 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 d40aea534..58f7e81aa 100644
--- 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 6064c3b75..991587b58 100644
--- 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 84a1378dd..6feb1e882 100644
--- 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 40b8f4c72..68497aee1 100644
--- 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 b649af0b4..aa0a59e68 100644
--- 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 563267812..d5aae016e 100644
--- 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
-- 
2.40.0