Changeset 629 for trunk/src

Timestamp:

Nov 26, 2006, 12:47:02 PM (19 years ago)

Author:

bird

Message:

porting in progress.

Location:

trunk/src/ash

Files:

• Makefile.kmk (modified) (4 diffs)
• error.h (modified) (1 diff)
• eval.c (modified) (5 diffs)
• mkbuiltins (modified) (1 prop)
• mkinit.sh (modified) (1 prop)
• mknodes.sh (modified) (1 prop)
• mktokens (modified) (1 diff, 1 prop)
• nodetypes (modified) (1 prop)

trunk/src/ash/Makefile.kmk

@@ -2 +2 @@
 ## @file
 #
-# kBuild Makefile for ash.
+# kBuild Makefile for kmk_ash.
 #
-# Copyright (c) 2005 knut st. osmundsen <bird@anduin.net>
+# Copyright (c) 2005-2006 knut st. osmundsen <bird-src-spam@anduin.net>
 #
 
-PROGRAMS = ash
-INSTALLS = ash.man
+DEPTH = ../..
+include $(PATH_KBUILD)/header.kmk
 
-ash_TEMPLATE = bin
-ash_DEFS = lint SHELL SMALL
-ash_DEFS.os2 = EXEC_HASH_BANG_SCRIPT PC_OS2_LIBPATHS PC_PATH_SEP PC_DRIVE_LETTERS PC_EXE_EXTS
-ash_INCS = $(PATH_TARGET) . # (the last is because of error.h)
-ash_SOURCES = \
+#INSTALLS = ash.man
+
+PROGRAMS += kmk_ash
+kmk_ash_TEMPLATE = BIN
+kmk_ash_DEFS = lint SHELL SMALL
+kmk_ash_DEFS.win = PC_PATH_SEP PC_DRIVE_LETTERS PC_EXE_EXTS
+kmk_ash_DEFS.os2 = EXEC_HASH_BANG_SCRIPT PC_OS2_LIBPATHS PC_PATH_SEP PC_DRIVE_LETTERS PC_EXE_EXTS
+kmk_ash_INCS = $(PATH_TARGET) . # (the last is because of error.h)
+kmk_ash_SOURCES = \
         alias.c \
         cd.c \
@@ -45 +49 @@
         $(PATH_TARGET)/init.c \
         $(PATH_TARGET)/nodes.c
-ash_DEPS = \
+kmk_ash_DEPS = \
         $(PATH_TARGET)/arith.h \
         $(PATH_TARGET)/builtins.h \
         $(PATH_TARGET)/nodes.h \
         $(PATH_TARGET)/token.h
-ash_CLEAN = \
-        $(ash_DEPS)     \
+kmk_ash_CLEAN = \
+        $(kmk_ash_DEPS) \
         $(PATH_TARGET)/arith.c \
         $(PATH_TARGET)/arith_lex.c \
@@ -58 +62 @@
         $(PATH_TARGET)/nodes.c
 
-ash.man_TEMPLATE = usr.bin.man
-ash.man_SOURCES = \
+kmk_ash.man_TEMPLATE = usr.bin.man
+kmk_ash.man_SOURCES = \
         sh.1=>ash.1
 #ash.man_SYMLINKS = \
 #       ash.1.gz=>sh.1
 
-DEPTH = ..
-include $(PATH_KBUILD)/rules.kmk
+include $(PATH_KBUILD)/footer.kmk
+
+#
+# ATTENTION! ATTENTION! ATTENTION!
+#
+# Older ash versions has trouble with some of these scripts, great. 
+# Kudos to the NetBSD guys for this clever move. ;)
+#
+# So, when building for the frist time, setting BOOSTRAP_SHELL=/bin/bash is good idea.
+#
+BOOTSTRAP_SHELL ?= $(SHELL)
 
 $(PATH_TARGET)/arith.h $(PATH_TARGET)/arith.c: arith.y | $(call DIRDEP,$(PATH_TARGET))
@@ -75 +88 @@
         flex -8 -o$@ $^                     # 8-bit lex scanner for arithmetic
 
-$(PATH_TARGET)/builtins.h $(PATH_TARGET)/builtins.c: mkbuiltins shell.h builtins.def | $(call DIRDEP,$(PATH_TARGET))
-        $+ $(dir $@)
+$(PATH_TARGET)/builtins.h $(PATH_TARGET)/builtins.c: $(PATH_CURRENT)/mkbuiltins shell.h builtins.def | $(call DIRDEP,$(PATH_TARGET))
+        $(BOOTSTRAP_SHELL) $+ $(dir $@)
         [ -f $(PATH_TARGET)/builtins.h ]
 
-$(PATH_TARGET)/nodes.h $(PATH_TARGET)/nodes.c: mknodes.sh nodetypes nodes.c.pat | $(call DIRDEP,$(PATH_TARGET))
-        $+ $(dir $@)
+$(PATH_TARGET)/nodes.h $(PATH_TARGET)/nodes.c: $(PATH_CURRENT)/mknodes.sh nodetypes nodes.c.pat | $(call DIRDEP,$(PATH_TARGET))
+        $(BOOTSTRAP_SHELL) $+ $(dir $@)
         [ -f $(dir $@)/nodes.h ]
 
-$(PATH_TARGET)/token.h: mktokens | $(call DIRDEP,$(PATH_TARGET))
-        $+
+$(PATH_TARGET)/token.h: $(PATH_CURRENT)/mktokens | $(call DIRDEP,$(PATH_TARGET))
+        $(BOOTSTRAP_SHELL) $+
         $(MV) token.h $@
 
-$(PATH_TARGET)/init.c: mkinit.sh $(filter-out $(PATH_TARGET)/%,$(ash_SOURCES)) | $(call DIRDEP,$(PATH_TARGET))
-        $+
+$(PATH_TARGET)/init.c: $(PATH_CURRENT)/mkinit.sh $(filter-out $(PATH_TARGET)/%,$(kmk_ash_SOURCES)) | $(call DIRDEP,$(PATH_TARGET))
+        $(BOOTSTRAP_SHELL) $+
         $(MV) init.c $@
 

trunk/src/ash/error.h

@@ -112 +112 @@
  */
 
-#if defined(BSD) && !defined(__SVR4)
+#if defined(BSD) && !defined(__SVR4) && !defined(__GLIBC__) && !defined(__KLIBC__)
 #define setjmp(jmploc)  _setjmp(jmploc)
 #define longjmp(jmploc, val)    _longjmp(jmploc, val)

trunk/src/ash/eval.c

@@ -51 +51 @@
 #include <sys/types.h>
 #include <sys/wait.h>
+#ifdef HAVE_SYSCTL_H
 #include <sys/sysctl.h>
+#endif
 
 /*
@@ -604 +606 @@
 syspath(void)
 {
+#ifdef CTL_USER
         static char *sys_path = NULL;
         static int mib[] = {CTL_USER, USER_CS_PATH};
+#endif 
 #ifdef PC_PATH_SEP
         static char def_path[] = "PATH=/usr/bin;/bin;/usr/sbin;/sbin";
@@ -611 +615 @@
         static char def_path[] = "PATH=/usr/bin:/bin:/usr/sbin:/sbin";
 #endif
+#ifdef CTL_USER
         size_t len;
 
@@ -625 +630 @@
         }
         return sys_path;
+#else
+    return def_path;
+#endif 
 }
 
@@ -1009 +1017 @@
                         optptr = NULL;
                         /* and getopt */
+#if defined(__FreeBSD__) || defined(__EMX__) || defined(__APPLE__)
                         optreset = 1;
                         optind = 1;
+#else
+                        optind = 0; /* init */
+#endif
+
                         exitstatus = cmdentry.u.bltin(argc, argv);
                 } else {

trunk/src/ash/mktokens

@@ -38 +38 @@
 # error messages.
 
+if [ -z "$TMPDIR" ]; then
+    TMPDIR="/tmp"
+    export TMPDIR
+fi
 F="$TMPDIR/ka$$"
 echo $F