Changeset 630 in kBuild for trunk/src/ash

Timestamp:

Nov 26, 2006 12:24:22 PM (18 years ago)

Author:

bird

Message:

Made it build on linux.

Location:

trunk/src/ash

Files:

• Makefile.kmk (modified) (2 diffs)
• bltin/kill.c (modified) (4 diffs)
• bltin/test.c (modified) (1 diff)
• setmode.c (copied) (copied from trunk/src/gmake/kmkbuiltin/setmode.c )
• strlcpy.c (copied) (copied from trunk/src/gmake/kmkbuiltin/strlcpy.c )
• sys_signame.c (added)
• trap.c (modified) (4 diffs)

trunk/src/ash/Makefile.kmk

@@ -15 +15 @@
 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_DEFS.linux = BSD
+kmk_ash_DEFS.win = \
+        PC_PATH_SEP PC_DRIVE_LETTERS PC_EXE_EXTS
+kmk_ash_DEFS.os2 = \
+        HAVE_SYS_SIGNAME HAVE_SYSCTL_H HAVE_SETPROGNAME \
+        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 = \
@@ -49 +53 @@
         $(PATH_TARGET)/init.c \
         $(PATH_TARGET)/nodes.c
+kmk_ash_SOURCES.linux = \
+        sys_signame.c \
+        strlcpy.c \
+        setmode.c
 kmk_ash_DEPS = \
         $(PATH_TARGET)/arith.h \

trunk/src/ash/bltin/kill.c

@@ -56 +56 @@
 #include <sys/ioctl.h>
 
+#ifndef HAVE_SYS_SIGNAME
+extern void init_sys_signame(void);
+extern char sys_signame[NSIG][16];
+#endif 
+
 #ifdef SHELL            /* sh (aka ash) builtin */
 #define main killcmd
@@ -98 +103 @@
                         if (numsig <= 0 || numsig >= NSIG)
                                 nosig(*argv);
+#ifndef HAVE_SYS_SIGNAME
+                        init_sys_signame();
+#endif 
                         printf("%s\n", sys_signame[numsig]);
                         exit(0);
@@ -179 +187 @@
 {
         int n;
-
+#ifndef HAVE_SYS_SIGNAME
+        init_sys_signame();
+#endif 
         if (strncasecmp(sig, "sig", 3) == 0)
                 sig += 3;
@@ -216 +226 @@
 #warning TIOCGWINSZ is not present.
 #endif
+#ifndef HAVE_SYS_SIGNAME
+    init_sys_signame();
+#endif 
 
         for (len = 0, sig = 1; sig < NSIG; sig++) {

trunk/src/ash/bltin/test.c

@@ -190 +190 @@
         int res;
 
+#ifdef HAVE_SETPROGNAME
         setprogname(argv[0]);
+#endif 
         if (strcmp(argv[0], "[") == 0) {
                 if (strcmp(argv[--argc], "]"))

trunk/src/ash/trap.c

@@ -61 +61 @@
 #include "var.h"
 
+#ifndef HAVE_SYS_SIGNAME
+extern void init_sys_signame(void);
+extern char sys_signame[NSIG][16];
+#endif 
 
 /*
@@ -101 +105 @@
                 p += 3;
 
+#ifndef HAVE_SYS_SIGNAME
+        init_sys_signame();
+#endif 
         for (i = 0; i < NSIG; ++i)
                 if (strcasecmp (p, sys_signame[i]) == 0)
@@ -116 +123 @@
 
         out1str("EXIT ");
+#ifndef HAVE_SYS_SIGNAME
+        init_sys_signame();
+#endif 
 
         for (n = 1; n < NSIG; n++) {
@@ -136 +146 @@
         char **ap;
         int signo;
+#ifndef HAVE_SYS_SIGNAME
+        init_sys_signame();
+#endif 
 
         if (argc <= 1) {