Changeset 1204 for trunk/src

Timestamp:

Oct 7, 2007, 4:19:01 PM (18 years ago)

Author:

bird

Message:

Made miscbltin.c compile.

Location:

trunk/src/kash

Files:

• Makefile.kmk (modified) (1 diff)
• miscbltin.c (modified) (8 diffs)
• win/mscfakes.h (modified) (1 diff)
• win/sys/resource.h (modified) (2 diffs)

trunk/src/kash/Makefile.kmk

@@ -47 +47 @@
         exec.c \
         expand.c \
+        miscbltin.c \
         \
         jobs.c \
-        miscbltin.c \
         parser.c \
         redir.c \

trunk/src/kash/miscbltin.c

@@ -48 +48 @@
  */
 
-#include <sys/types.h>          /* quad_t */
-#include <sys/param.h>          /* BSD4_4 */
+#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -57 +56 @@
 #include <ctype.h>
 #include <errno.h>
+#ifndef _MSC_VER
+# include "mscfakes.h"
+#endif
 
 #include "shell.h"
@@ -89 +91 @@
 
 int
-readcmd(int argc, char **argv)
+readcmd(shinstance *psh, int argc, char **argv)
 {
         char **ap;
@@ -107 +109 @@
         while ((i = nextopt(psh, "p:r")) != '\0') {
                 if (i == 'p')
-                        prompt = optionarg;
+                        prompt = psh->optionarg;
                 else
                         rflag = 1;
@@ -214 +216 @@
 
 int
-umaskcmd(int argc, char **argv)
+umaskcmd(shinstance *psh, int argc, char **argv)
 {
         char *ap;
@@ -354 +356 @@
 
 int
-ulimitcmd(int argc, char **argv)
+ulimitcmd(shinstance *psh, int argc, char **argv)
 {
         int     c;
@@ -418 +420 @@
                         out1fmt(psh, "%-20s ", l->name);
                         if (val == RLIM_INFINITY)
-                                out1fmt("unlimited\n");
+                                out1fmt(psh, "unlimited\n");
                         else
                         {
                                 val /= l->factor;
-#ifdef BSD4_4
                                 out1fmt(psh, "%lld\n", (long long) val);
-#else
-                                out1fmt(psh, "%ld\n", (long) val);
-#endif
                         }
                 }
@@ -451 +449 @@
                 {
                         val /= l->factor;
-#ifdef BSD4_4
                         out1fmt(psh, "%lld\n", (long long) val);
-#else
-                        out1fmt(psh, "%ld\n", (long) val);
-#endif
                 }
         }

trunk/src/kash/win/mscfakes.h

@@ -197 +197 @@
 //int   sigwait(const sigset_t *, int *);
 int     siginterrupt(int, int);
+#undef setmode
+void *  setmode(const char *p);
+mode_t  getmode(const void *bbox, mode_t omode);
 
 #endif /* _MSC_VER */

trunk/src/kash/win/sys/resource.h

@@ -101 +101 @@
 #define RLIM_NLIMITS    12              /* number of resource limits */ /* bird: was 11 */
 
-#define RLIM_INFINITY   (((rlim_t)1 << 63) - 1)
+#define RLIM_INFINITY   (0x7fffffffffffffffLL)
 /* XXX Missing: RLIM_SAVED_MAX, RLIM_SAVED_CUR */
 
@@ -135 +135 @@
 /* XXX 2nd arg to [gs]etpriority() should be an id_t */
 //int   getpriority(int, /*int*/ id_t);         /* bird: SuS uses id_t */
-//int   getrlimit(int, struct rlimit *);
+int     getrlimit(int, struct rlimit *);
 int     getrusage(int, struct rusage *);
 //int   setpriority(int, /*int*/ id_t, int);    /* bird: SuS uses id_t */