diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-06-02 20:56:16 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-06-02 20:56:16 +0000 |
| commit | e15d7573a1263fb364d1678c3a46be47a8b5e5ea (patch) | |
| tree | 09e7b482b38ac571a01e936fb91df16dd1eeef42 /shell | |
| parent | ecae66ac16338d8cddb55e1782ebd8c5f670ff53 (diff) | |
| download | busybox-w32-e15d7573a1263fb364d1678c3a46be47a8b5e5ea.tar.gz busybox-w32-e15d7573a1263fb364d1678c3a46be47a8b5e5ea.tar.bz2 busybox-w32-e15d7573a1263fb364d1678c3a46be47a8b5e5ea.zip | |
- move #include busybox.h to the very top so we pull in the config
and eventual platform specific includes in early.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ash.c | 7 | ||||
| -rw-r--r-- | shell/cmdedit.c | 3 | ||||
| -rw-r--r-- | shell/hush.c | 3 | ||||
| -rw-r--r-- | shell/lash.c | 2 | ||||
| -rw-r--r-- | shell/msh.c | 2 |
5 files changed, 8 insertions, 9 deletions
diff --git a/shell/ash.c b/shell/ash.c index c8ccf19b5..5cdd7f006 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -44,11 +44,12 @@ | |||
| 44 | */ | 44 | */ |
| 45 | 45 | ||
| 46 | 46 | ||
| 47 | |||
| 48 | #define IFS_BROKEN | 47 | #define IFS_BROKEN |
| 49 | 48 | ||
| 50 | #define PROFILE 0 | 49 | #define PROFILE 0 |
| 51 | 50 | ||
| 51 | #include "busybox.h" | ||
| 52 | |||
| 52 | #ifdef DEBUG | 53 | #ifdef DEBUG |
| 53 | #define _GNU_SOURCE | 54 | #define _GNU_SOURCE |
| 54 | #endif | 55 | #endif |
| @@ -76,12 +77,10 @@ | |||
| 76 | #include <paths.h> | 77 | #include <paths.h> |
| 77 | #include <setjmp.h> | 78 | #include <setjmp.h> |
| 78 | #include <signal.h> | 79 | #include <signal.h> |
| 79 | #include <stdint.h> | 80 | /*#include <stdint.h>*/ |
| 80 | #include <time.h> | 81 | #include <time.h> |
| 81 | #include <fnmatch.h> | 82 | #include <fnmatch.h> |
| 82 | 83 | ||
| 83 | |||
| 84 | #include "busybox.h" | ||
| 85 | #include "pwd_.h" | 84 | #include "pwd_.h" |
| 86 | 85 | ||
| 87 | #ifdef CONFIG_ASH_JOB_CONTROL | 86 | #ifdef CONFIG_ASH_JOB_CONTROL |
diff --git a/shell/cmdedit.c b/shell/cmdedit.c index d0e642250..8b5b2b942 100644 --- a/shell/cmdedit.c +++ b/shell/cmdedit.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | 33 | ||
| 34 | #include "busybox.h" | ||
| 34 | #include <stdio.h> | 35 | #include <stdio.h> |
| 35 | #include <errno.h> | 36 | #include <errno.h> |
| 36 | #include <unistd.h> | 37 | #include <unistd.h> |
| @@ -41,8 +42,6 @@ | |||
| 41 | #include <signal.h> | 42 | #include <signal.h> |
| 42 | #include <limits.h> | 43 | #include <limits.h> |
| 43 | 44 | ||
| 44 | #include "busybox.h" | ||
| 45 | |||
| 46 | #include "../shell/cmdedit.h" | 45 | #include "../shell/cmdedit.h" |
| 47 | 46 | ||
| 48 | 47 | ||
diff --git a/shell/hush.c b/shell/hush.c index 0a46d125a..e3707380d 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
| @@ -77,6 +77,8 @@ | |||
| 77 | * | 77 | * |
| 78 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | 78 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
| 79 | */ | 79 | */ |
| 80 | |||
| 81 | #include "busybox.h" | ||
| 80 | #include <ctype.h> /* isalpha, isdigit */ | 82 | #include <ctype.h> /* isalpha, isdigit */ |
| 81 | #include <unistd.h> /* getpid */ | 83 | #include <unistd.h> /* getpid */ |
| 82 | #include <stdlib.h> /* getenv, atoi */ | 84 | #include <stdlib.h> /* getenv, atoi */ |
| @@ -97,7 +99,6 @@ | |||
| 97 | /* #define DEBUG_SHELL */ | 99 | /* #define DEBUG_SHELL */ |
| 98 | 100 | ||
| 99 | #if 1 | 101 | #if 1 |
| 100 | #include "busybox.h" | ||
| 101 | #include "cmdedit.h" | 102 | #include "cmdedit.h" |
| 102 | #else | 103 | #else |
| 103 | #define bb_applet_name "hush" | 104 | #define bb_applet_name "hush" |
diff --git a/shell/lash.c b/shell/lash.c index 8e8d45ae9..54408c97e 100644 --- a/shell/lash.c +++ b/shell/lash.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | //#define DEBUG_SHELL | 21 | //#define DEBUG_SHELL |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | #include "busybox.h" | ||
| 24 | #include <stdio.h> | 25 | #include <stdio.h> |
| 25 | #include <stdlib.h> | 26 | #include <stdlib.h> |
| 26 | #include <ctype.h> | 27 | #include <ctype.h> |
| @@ -33,7 +34,6 @@ | |||
| 33 | #include <unistd.h> | 34 | #include <unistd.h> |
| 34 | #include <getopt.h> | 35 | #include <getopt.h> |
| 35 | #include <termios.h> | 36 | #include <termios.h> |
| 36 | #include "busybox.h" | ||
| 37 | #include "cmdedit.h" | 37 | #include "cmdedit.h" |
| 38 | 38 | ||
| 39 | #ifdef CONFIG_LOCALE_SUPPORT | 39 | #ifdef CONFIG_LOCALE_SUPPORT |
diff --git a/shell/msh.c b/shell/msh.c index e47af795e..8bc769b6e 100644 --- a/shell/msh.c +++ b/shell/msh.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | * Original copyright notice is retained at the end of this file. | 27 | * Original copyright notice is retained at the end of this file. |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include "busybox.h" | ||
| 30 | #include <ctype.h> | 31 | #include <ctype.h> |
| 31 | #include <dirent.h> | 32 | #include <dirent.h> |
| 32 | #include <errno.h> | 33 | #include <errno.h> |
| @@ -46,7 +47,6 @@ | |||
| 46 | #include <sys/wait.h> | 47 | #include <sys/wait.h> |
| 47 | 48 | ||
| 48 | #include "cmdedit.h" | 49 | #include "cmdedit.h" |
| 49 | #include "busybox.h" | ||
| 50 | 50 | ||
| 51 | 51 | ||
| 52 | /* Conditional use of "register" keyword */ | 52 | /* Conditional use of "register" keyword */ |