d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Deduplicate some code in ulimit builtin.

Browse Source
This commit is contained in:
Jilles Tjoelker 2014-07-19 14:06:23 +00:00
parent 5a5f9d21dd
commit 2ef146f14c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=268873
1 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
bin/sh/miscbltin.c
View File

@ -411,12 +411,32 @@ static const struct limits limits[] = {
{ (char *) 0, (char *)0, 0, 0, '\0' }
};
enum limithow { SOFT = 0x1, HARD = 0x2 };
static void
printlimit(enum limithow how, const struct rlimit *limit,
const struct limits *l)
{
rlim_t val = 0;
if (how & SOFT)
val = limit->rlim_cur;
else if (how & HARD)
val = limit->rlim_max;
if (val == RLIM_INFINITY)
out1str("unlimited\n");
else
{
val /= l->factor;
out1fmt("%jd\n", (intmax_t)val);
}
}
int
ulimitcmd(int argc __unused, char **argv __unused)
{
rlim_t val = 0;
enum { SOFT = 0x1, HARD = 0x2 }
how = SOFT | HARD;
enum limithow how = SOFT | HARD;
const struct limits *l;
int set, all = 0;
int optc, what;
@ -475,10 +495,6 @@ ulimitcmd(int argc __unused, char **argv __unused)
char optbuf[40];
if (getrlimit(l->cmd, &limit) < 0)
error("can't get limit: %s", strerror(errno));
if (how & SOFT)
val = limit.rlim_cur;
else if (how & HARD)
val = limit.rlim_max;
if (l->units)
snprintf(optbuf, sizeof(optbuf),
@ -487,13 +503,7 @@ ulimitcmd(int argc __unused, char **argv __unused)
snprintf(optbuf, sizeof(optbuf),
"(-%c) ", l->option);
out1fmt("%-18s %18s ", l->name, optbuf);
if (val == RLIM_INFINITY)
out1str("unlimited\n");
else
{
val /= l->factor;
out1fmt("%jd\n", (intmax_t)val);
}
printlimit(how, &limit, l);
}
return 0;
}
@ -507,19 +517,7 @@ ulimitcmd(int argc __unused, char **argv __unused)
limit.rlim_max = val;
if (setrlimit(l->cmd, &limit) < 0)
error("bad limit: %s", strerror(errno));
} else {
if (how & SOFT)
val = limit.rlim_cur;
else if (how & HARD)
val = limit.rlim_max;
if (val == RLIM_INFINITY)
out1str("unlimited\n");
else
{
val /= l->factor;
out1fmt("%jd\n", (intmax_t)val);
}
}
} else
printlimit(how, &limit, l);
return 0;
}