Changeset 632 in kBuild for trunk/src/ash

Timestamp:

Nov 26, 2006 1:46:21 PM (18 years ago)

Author:

bird

Message:

MSC hacking.

Location:

trunk/src/ash

Files:

• Makefile.kmk (modified) (4 diffs)
• bltin/kill.c (modified) (1 diff)
• bltin/test.c (modified) (2 diffs)
• error.c (modified) (1 diff)
• error.h (modified) (1 diff)
• win (added)
• win/err.c (copied) (copied from trunk/src/gmake/kmkbuiltin/err.c )
• win/err.h (copied) (copied from trunk/src/gmake/kmkbuiltin/err.h )
• win/getopt.h (copied) (copied from trunk/src/gmake/getopt.h )
• win/mscfakes.c (copied) (copied from trunk/src/gmake/kmkbuiltin/mscfakes.c )
• win/mscfakes.h (copied) (copied from trunk/src/gmake/kmkbuiltin/mscfakes.h ) (3 diffs)
• win/paths.h (added)
• win/pwd.h (added)
• win/strings.h (added)
• win/sys (added)
• win/sys/cdefs.h (added)
• win/sys/fcntl.h (added)
• win/sys/ioctl.h (added)
• win/sys/param.h (added)
• win/sys/resource.h (added)
• win/sys/time.h (added)
• win/sys/times.h (added)
• win/sys/wait.h (added)
• win/termios.h (added)
• win/unistd.h (added)

trunk/src/ash/Makefile.kmk

@@ -17 +17 @@
 kmk_ash_DEFS.linux = BSD
 kmk_ash_DEFS.win = \
-        PC_PATH_SEP PC_DRIVE_LETTERS PC_EXE_EXTS
+        BSD 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_INCS.win = win
 kmk_ash_SOURCES = \
         alias.c \
@@ -57 +58 @@
         strlcpy.c \
         setmode.c
+#kmk_ash_SOURCES.win = \
+#       win/mscfakes.c
+
 kmk_ash_DEPS = \
         $(PATH_TARGET)/arith.h \
@@ -75 +79 @@
 #ash.man_SYMLINKS = \
 #       ash.1.gz=>sh.1
+
+
+
+ifeq ($(filter-out nt win win32 win64,$(BUILD_TARGET)),)
+
+#
+# Use the pregenerated code.
+#
+kmk_ash_DEPS :=
+
+define def_copy_generated
+$(PATH_TARGET)/$(src): generated/$(src)
+        $$(RM) -f $$@
+        $$(CP) -f $$^ $$@
+kmk_ash_DEPS += $(PATH_TARGET)/$(src)
+endef
+
+$(foreach src, arith.h arith.c arith_lex.c builtins.h builtins.c nodes.h nodes.c token.h init.c,\
+$(eval $(def_copy_generated)))
+
+include $(PATH_KBUILD)/footer.kmk
+
+else
 
 include $(PATH_KBUILD)/footer.kmk
@@ -112 +139 @@
         $(MV) init.c $@
 
+endif

trunk/src/ash/bltin/kill.c

@@ -224 +224 @@
         }
 #else
+#ifndef _MSC_VER
 #warning TIOCGWINSZ is not present.
+#endif 
 #endif
 #ifndef HAVE_SYS_SIGNAME

trunk/src/ash/bltin/test.c

@@ -361 +361 @@
                 return S_ISDIR(s.st_mode);
         case FILCDEV:
+#ifdef S_ISCHR
                 return S_ISCHR(s.st_mode);
+#else
+        return 0;
+#endif 
         case FILBDEV:
+#ifdef S_ISBLK
                 return S_ISBLK(s.st_mode);
+#else
+        return 0;
+#endif 
         case FILFIFO:
+#ifdef S_ISFIFO
                 return S_ISFIFO(s.st_mode);
+#else
+        return 0;
+#endif 
         case FILSOCK:
+#ifdef S_ISSOCK
                 return S_ISSOCK(s.st_mode);
+#else
+        return 0;
+#endif 
         case FILSYM:
                 return S_ISLNK(s.st_mode);
@@ -375 +391 @@
                 return (s.st_mode & S_ISGID) != 0;
         case FILSTCK:
+#ifdef S_ISVTX
                 return (s.st_mode & S_ISVTX) != 0;
+#else
+        return 0;
+#endif 
         case FILGZ:
                 return s.st_size > (off_t)0;

trunk/src/ash/error.c

@@ -315 +315 @@
         { ENXIO,        ALL,    "no such device or address" },
         { EROFS,        ALL,    "read-only file system" },
+#ifdef ETXTBSY
         { ETXTBSY,      ALL,    "text busy" },
+#endif
 #ifdef EAGAIN
         { EAGAIN,       E_EXEC, "not enough memory" },

trunk/src/ash/error.h

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

trunk/src/ash/win/mscfakes.h

@@ -31 +31 @@
 #include <direct.h>
 #include <time.h>
+#include <fcntl.h>
+#include <limits.h>
 #undef setmode
-#include "getopt.h"
+//#include "getopt.h"
+
+#if !defined(__GNUC__) && !defined(__attribute__)
+#define __attribute__(a)
+#endif 
+
+typedef int pid_t;
 
 #define S_ISDIR(m)  (((m) & _S_IFMT) == _S_IFDIR)
@@ -115 +123 @@
 #define mkfifo(path, mode) -1
 #define mknod(path, mode, devno) -1
+#define pipe(v) _pipe(v,0,0)
 int mkstemp(char *temp);
 #define readlink(link, buf, size) -1
 #define reallocf(old, size) realloc(old, size)
+#define strcasecmp stricmp
+#define strncasecmp strnicmp
 #if _MSC_VER < 1400
 int snprintf(char *buf, size_t size, const char *fmt, ...);
@@ -127 +138 @@
 int utimes(const char *pszPath, const struct timeval *paTimes);
 int writev(int fd, const struct iovec *vector, int count);
+#define F_DUPFD 0
+#define F_GETFD 1
+#define F_SETFD 2
+#define F_GETFL 3
+#define F_SETFL 4
+#define FD_CLOEXEC 1
+#define O_NONBLOCK 0 /// @todo
+#define EWOULDBLOCK 512
+int fcntl (int, int, ...);
+
+/* signal hacks */
+typedef struct sigset 
+{   
+    unsigned long __bitmap[1]; 
+} sigset_t;
+int     sigprocmask(int, const sigset_t *, sigset_t *);
+#define SIG_BLOCK           1
+#define SIG_UNBLOCK         2
+#define SIG_SETMASK         3
+
+#define SIGTTIN 0
+#define SIGTSTP 0
+#define SIGTTOU 0
+#define SIGCONT 0
+#define SIGPIPE 0
+#define SIGQUIT 0
+#define SIGHUP 0
+#ifndef NSIG
+#define NSIG 32
+#endif 
+extern const char *const sys_siglist[NSIG];
+
+int     kill(pid_t, int);
+int     sigaction(int, const struct sigaction *, struct sigaction *);
+//int   sigaddset(sigset_t *, int);
+//int   sigdelset(sigset_t *, int);
+int     sigemptyset(sigset_t *);
+//int   sigfillset(sigset_t *);
+//int   sigismember(const sigset_t *, int);
+//int   sigpending(sigset_t *);
+//int   sigsuspend(const sigset_t *);
+//int   sigwait(const sigset_t *, int *);
 
 #endif /* _MSC_VER */