summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-01-10 19:47:32 -0500
committerJune McEnroe <june@causal.agency>2019-01-10 19:47:32 -0500
commit43e3a3bd9bd95c2d6cd23e4a0a6039bc87befbe1 (patch)
tree020a98949b560c9579fd710fec649a412f053344
parentImport /usr/src/usr.bin/printf/printf.c from FreeBSD 12.0-RELEASE (diff)
downloadsrc-43e3a3bd9bd95c2d6cd23e4a0a6039bc87befbe1.tar.gz
src-43e3a3bd9bd95c2d6cd23e4a0a6039bc87befbe1.zip
Move bltin out of subdirectory
-rw-r--r--bin/cash/bltin.h (renamed from bin/cash/bltin/bltin.h)8
-rw-r--r--bin/cash/echo.c (renamed from bin/cash/bltin/echo.c)0
-rw-r--r--bin/cash/kill.c2
-rw-r--r--bin/cash/printf.c2
-rw-r--r--bin/cash/test.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/bin/cash/bltin/bltin.h b/bin/cash/bltin.h
index f7de331a..e9adb878 100644
--- a/bin/cash/bltin/bltin.h
+++ b/bin/cash/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/cash/bltin/echo.c b/bin/cash/echo.c
index 78c146e9..78c146e9 100644
--- a/bin/cash/bltin/echo.c
+++ b/bin/cash/echo.c
diff --git a/bin/cash/kill.c b/bin/cash/kill.c
index f67626f9..9526f3d3 100644
--- a/bin/cash/kill.c
+++ b/bin/cash/kill.c
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD: releng/12.0/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/cash/printf.c b/bin/cash/printf.c
index d344197c..ad2959ab 100644
--- a/bin/cash/printf.c
+++ b/bin/cash/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/cash/test.c b/bin/cash/test.c
index 29572b43..e51391c2 100644
--- a/bin/cash/test.c
+++ b/bin/cash/test.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD: releng/12.0/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>