Changeset 1214 for trunk/src/kash/miscbltin.c

Timestamp:

Oct 7, 2007, 10:39:58 PM (18 years ago)

Author:

bird

Message:

some more cleanup.

File:

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

trunk/src/kash/miscbltin.c

@@ -33 +33 @@
  */
 
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
+#if 0
 #ifndef lint
-#if 0
 static char sccsid[] = "@(#)miscbltin.c 8.4 (Berkeley) 5/4/95";
 #else
 __RCSID("$NetBSD: miscbltin.c,v 1.35 2005/03/19 14:22:50 dsl Exp $");
-#endif
 #endif /* not lint */
+#endif
 
 /*
@@ -49 +46 @@
 
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#ifndef _MSC_VER
-# include "mscfakes.h"
-#endif
 
 #include "shell.h"
@@ -68 +58 @@
 #include "miscbltin.h"
 #include "mystring.h"
+#include "shinstance.h"
 
 #undef rflag
@@ -359 +350 @@
 {
         int     c;
-        rlim_t val = 0;
+        shrlim_t val = 0;
         enum { SOFT = 0x1, HARD = 0x2 }
                         how = SOFT | HARD;
@@ -365 +356 @@
         int             set, all = 0;
         int             optc, what;
-        struct rlimit   limit;
+        shrlimit        limit;
 
         what = 'f';
@@ -397 +388 @@
                         val = RLIM_INFINITY;
                 else {
-                        val = (rlim_t) 0;
+                        val = (shrlim_t) 0;
 
                         while ((c = *p++) >= '0' && c <= '9')
                         {
                                 val = (val * 10) + (long)(c - '0');
-                                if (val < (rlim_t) 0)
+                                if (val < (shrlim_t) 0)
                                         break;
                         }
@@ -412 +403 @@
         if (all) {
                 for (l = limits; l->name; l++) {
-                        getrlimit(l->cmd, &limit);
+                        sh_getrlimit(psh, l->cmd, &limit);
                         if (how & SOFT)
                                 val = limit.rlim_cur;
@@ -430 +421 @@
         }
 
-        getrlimit(l->cmd, &limit);
+        sh_getrlimit(psh, l->cmd, &limit);
         if (set) {
                 if (how & HARD)
@@ -436 +427 @@
                 if (how & SOFT)
                         limit.rlim_cur = val;
-                if (setrlimit(l->cmd, &limit) < 0)
+                if (sh_setrlimit(psh, l->cmd, &limit) < 0)
                         error(psh, "error setting limit (%s)", strerror(errno));
         } else {