Changeset 1204 in kBuild for trunk/src/kash/miscbltin.c

Timestamp:

Oct 7, 2007 2:19:01 PM (17 years ago)

Author:

bird

Message:

Made miscbltin.c compile.

File:

• trunk/src/kash/miscbltin.c (modified) (8 diffs)

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
                 }
         }