emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

skill: use strtol_or_err to nice argument parsing

Browse Source 
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2011-10-18 21:38:15 +02:00
parent b260b11a3b
commit 723ce0dc74
2 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -63,8 +63,9 @@ top_LDADD = @NCURSES_LIBS@
watch_LDADD = @WATCH_NCURSES_LIBS@ watch_LDADD = @WATCH_NCURSES_LIBS@
endif endif
kill_SOURCES = skill.c kill_SOURCES = skill.c $(top_srcdir)/lib/strutils.c
snice_SOURCES = skill.c skill_SOURCES = skill.c $(top_srcdir)/lib/strutils.c
snice_SOURCES = skill.c $(top_srcdir)/lib/strutils.c
pkill_SOURCES = pgrep.c pkill_SOURCES = pgrep.c
sysconf_DATA = sysctl.conf sysconf_DATA = sysctl.conf

56
skill.c
View File

@ -8,10 +8,11 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details. * GNU Library General Public License for more details.
*/ */
#include <fcntl.h>
#include <pwd.h>
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h>
#include <limits.h>
#include <pwd.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -23,6 +24,7 @@
#include <unistd.h> #include <unistd.h>
#include "c.h" #include "c.h"
#include "strutils.h"
#include "nls.h" #include "nls.h"
#include "xalloc.h" #include "xalloc.h"
#include "proc/pwcache.h" #include "proc/pwcache.h"
@ -31,6 +33,8 @@
#include "proc/procps.h" /* char *user_from_uid(uid_t uid) */ #include "proc/procps.h" /* char *user_from_uid(uid_t uid) */
#include "proc/version.h" /* procps_version */ #include "proc/version.h" /* procps_version */
#define DEFAULT_NICE 4
struct run_time_conf_t { struct run_time_conf_t {
int fast; int fast;
int interactive; int interactive;
@ -325,7 +329,7 @@ static void __attribute__ ((__noreturn__)) skillsnice_usage(void)
/* kill */ /* kill */
static void __attribute__ ((__noreturn__)) static void __attribute__ ((__noreturn__))
kill_main(int argc, const char *restrict const *restrict argv, kill_main(int argc, char ** argv,
struct run_time_conf_t *run_time) struct run_time_conf_t *run_time)
{ {
const char *sigptr; const char *sigptr;
@ -433,9 +437,33 @@ static void _skillsnice_usage(int line)
/* common skill/snice argument parsing code */ /* common skill/snice argument parsing code */
int snice_prio_option(int *argc, char **argv)
{
int i = 1, nargs = *argc;
long prio = DEFAULT_NICE;
while (i < nargs) {
if ((argv[i][0] == '-' || argv[i][0] == '+')
&& isdigit(argv[i][1])) {
prio = strtol_or_err(argv[i],
_("failed to parse argument"));
if (prio < INT_MIN || INT_MAX < prio)
errx(EXIT_FAILURE,
_("priority %lu out of range"), prio);
nargs--;
if (nargs - i)
memmove(argv + i, argv + i + 1,
sizeof(char *) * (nargs - i));
} else
i++;
}
*argc = nargs;
return (int)prio;
}
#define NO_PRI_VAL ((int)0xdeafbeef) #define NO_PRI_VAL ((int)0xdeafbeef)
static void skillsnice_parse(int argc, static void skillsnice_parse(int argc,
const char *restrict const *restrict argv, char ** argv,
struct run_time_conf_t *run_time) struct run_time_conf_t *run_time)
{ {
int signo = -1; int signo = -1;
@ -445,6 +473,10 @@ static void skillsnice_parse(int argc,
const char *restrict argptr; const char *restrict argptr;
if (argc < 2) if (argc < 2)
skillsnice_usage(); skillsnice_usage();
if (program == PROG_SNICE)
prino = snice_prio_option(&argc, argv);
if (argc == 2 && argv[1][0] == '-') { if (argc == 2 && argv[1][0] == '-') {
if (!strcmp(argv[1], "-L")) { if (!strcmp(argv[1], "-L")) {
pretty_print_signals(); pretty_print_signals();
@ -479,18 +511,6 @@ static void skillsnice_parse(int argc,
continue; continue;
} }
} }
if (program == PROG_SNICE && prino == NO_PRI_VAL
&& (*argptr == '+' || *argptr == '-') && argptr[1]) {
long val;
char *endp;
val = strtol(argptr, &endp, 10);
if (!*endp && val <= 999 && val >= -999) {
prino = val;
if (!NEXTARG)
break;
continue;
}
}
/* If '-' found, collect any flags. (but lone "-" is a tty) */ /* If '-' found, collect any flags. (but lone "-" is a tty) */
if (*argptr == '-' && argptr[1]) { if (*argptr == '-' && argptr[1]) {
argptr++; argptr++;
@ -641,7 +661,7 @@ static void skillsnice_parse(int argc,
} }
/* OK, set up defaults */ /* OK, set up defaults */
if (prino == NO_PRI_VAL) if (prino == NO_PRI_VAL)
prino = 4; prino = DEFAULT_NICE;
if (signo < 0) if (signo < 0)
signo = SIGTERM; signo = SIGTERM;
if (run_time->noaction) { if (run_time->noaction) {
@ -656,7 +676,7 @@ static void skillsnice_parse(int argc,
} }
/* main body */ /* main body */
int main(int argc, const char *argv[]) int main(int argc, char ** argv)
{ {
struct run_time_conf_t run_time; struct run_time_conf_t run_time;
memset(&run_time, 0, sizeof(struct run_time_conf_t)); memset(&run_time, 0, sizeof(struct run_time_conf_t));