stop using __u32 etc. uint32_t is there for a reason

[oweals/busybox.git] / shell / bbsh.c

diff --git a/shell/bbsh.c b/shell/bbsh.c
index 2194bdad63a28896a110493a3e9a364e70333a69..99e4f61fbe9986feb60792106d56dc984fae7c1b 100644 (file)
--- a/shell/bbsh.c
+++ b/shell/bbsh.c
@@ -36,7 +36,7 @@
   echo `echo hello#comment " woot` and more
 */
 
-#include <busybox.h>
+#include "busybox.h"
 
 // A single executable, its arguments, and other information we know about it.
 #define BBSH_FLAG_EXIT    1
@@ -119,7 +119,7 @@ static char *parse_pipeline(char *cmdline, struct pipeline *line)
                char *end;
 
                // Skip leading whitespace and detect end of line.
-               while (isspace(*start)) start++;
+               start = skip_whitespace(start);
                if (!*start || *start=='#') {
                        if (ENABLE_BBSH_JOBCTL) line->cmdlinelen = start-cmdline;
                        return 0;
@@ -203,7 +203,7 @@ int bbsh_main(int argc, char *argv[])
        char *command=NULL;
        FILE *f;
 
-       bb_getopt_ulflags(argc, argv, "c:", &command);
+       getopt32(argc, argv, "c:", &command);
 
        f = argv[optind] ? xfopen(argv[optind],"r") : NULL;
        if (command) handle(command);