summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-03-09 04:09:45 -0400
committerJune McEnroe <june@causal.agency>2020-03-09 04:09:45 -0400
commitc1717c5980c34ca0ce56f47b1433c0a0a7c67302 (patch)
treeb996aed9b142acca021c2f1274b37caf0b2634fe
parentImport /usr/src/usr.bin/printf from FreeBSD 12.1-RELEASE (diff)
downloadsrc-c1717c5980c34ca0ce56f47b1433c0a0a7c67302.tar.gz
src-c1717c5980c34ca0ce56f47b1433c0a0a7c67302.zip
Move bltin out of subdirectory
-rw-r--r--bin/1sh/bltin.h (renamed from bin/1sh/bltin/bltin.h)8
-rw-r--r--bin/1sh/echo.c (renamed from bin/1sh/bltin/echo.c)0
-rw-r--r--bin/1sh/kill.c2
-rw-r--r--bin/1sh/printf.c2
-rw-r--r--bin/1sh/test.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/bin/1sh/bltin/bltin.h b/bin/1sh/bltin.h
index 7121fee0..3d2cb4d3 100644
--- a/bin/1sh/bltin/bltin.h
+++ b/bin/1sh/bltin.h
@@ -41,11 +41,11 @@
  * routines to ash routines using defines.
  */
 
-#include "../shell.h"
-#include "../mystring.h"
+#include "shell.h"
+#include "mystring.h"
 #ifdef SHELL
-#include "../error.h"
-#include "../output.h"
+#include "error.h"
+#include "output.h"
 #include "builtins.h"
 #define FILE struct output
 #undef stdout
diff --git a/bin/1sh/bltin/echo.c b/bin/1sh/echo.c
index 2613955b..2613955b 100644
--- a/bin/1sh/bltin/echo.c
+++ b/bin/1sh/echo.c
diff --git a/bin/1sh/kill.c b/bin/1sh/kill.c
index 15dbc9d2..c176b5e5 100644
--- a/bin/1sh/kill.c
+++ b/bin/1sh/kill.c
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD: releng/12.1/bin/kill/kill.c 326025 2017-11-20 19:49:47Z pfg
 
 #ifdef SHELL
 #define main killcmd
-#include "bltin/bltin.h"
+#include "bltin.h"
 #endif
 
 static void nosig(const char *);
diff --git a/bin/1sh/printf.c b/bin/1sh/printf.c
index c18dc4f8..61a53aa9 100644
--- a/bin/1sh/printf.c
+++ b/bin/1sh/printf.c
@@ -68,7 +68,7 @@ static const char rcsid[] =
 
 #ifdef SHELL
 #define	main printfcmd
-#include "bltin/bltin.h"
+#include "bltin.h"
 #include "options.h"
 #endif
 
diff --git a/bin/1sh/test.c b/bin/1sh/test.c
index 313497b9..5cf4a424 100644
--- a/bin/1sh/test.c
+++ b/bin/1sh/test.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD: releng/12.1/bin/test/test.c 298232 2016-04-19 00:38:07Z arau
 
 #ifdef SHELL
 #define main testcmd
-#include "bltin/bltin.h"
+#include "bltin.h"
 #else
 #include <locale.h>