diff options
| -rw-r--r-- | bin/mt/mt.c | 16 | ||||
| -rw-r--r-- | bin/ps/extern.h | 4 | ||||
| -rw-r--r-- | bin/ps/keyword.c | 4 | ||||
| -rw-r--r-- | bin/ps/print.c | 4 | ||||
| -rw-r--r-- | bin/systrace/policy.c | 8 |
5 files changed, 18 insertions, 18 deletions
diff --git a/bin/mt/mt.c b/bin/mt/mt.c index eb08970629f..5eba7eff09c 100644 --- a/bin/mt/mt.c +++ b/bin/mt/mt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mt.c,v 1.37 2015/12/06 12:00:16 tobias Exp $ */ +/* $OpenBSD: mt.c,v 1.38 2015/12/30 14:59:10 tedu Exp $ */ /* $NetBSD: mt.c,v 1.14.2.1 1996/05/27 15:12:11 mrg Exp $ */ /* @@ -83,8 +83,8 @@ void printreg(char *, u_int, char *); void status(struct mtget *); void usage(void); -int _rmtopendev(char *path, int oflags, int dflags, char **realpath); -int _rmtmtioctop(int fd, struct mtop *com); +int _rmtopendev(char *path, int oflags, int dflags, char **realp); +int _rmtmtioctop(int fd, struct mtop *cmd); struct mtget *_rmtstatus(int fd); void _rmtclose(void); @@ -93,23 +93,23 @@ extern char *__progname; char *host = NULL; /* remote host (if any) */ int -_rmtopendev(char *path, int oflags, int dflags, char **realpath) +_rmtopendev(char *path, int oflags, int dflags, char **realp) { #ifdef RMT if (host) return rmtopen(path, oflags); #endif - return opendev(path, oflags, dflags, realpath); + return opendev(path, oflags, dflags, realp); } int -_rmtmtioctop(int fd, struct mtop *com) +_rmtmtioctop(int fd, struct mtop *cmd) { #ifdef RMT if (host) - return rmtioctl(com->mt_op, com->mt_count); + return rmtioctl(cmd->mt_op, cmd->mt_count); #endif - return ioctl(fd, MTIOCTOP, com); + return ioctl(fd, MTIOCTOP, cmd); } struct mtget * diff --git a/bin/ps/extern.h b/bin/ps/extern.h index 1ec30ccc3ee..1a7e63ddb27 100644 --- a/bin/ps/extern.h +++ b/bin/ps/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.17 2015/06/29 15:03:33 bluhm Exp $ */ +/* $OpenBSD: extern.h,v 1.18 2015/12/30 14:59:10 tedu Exp $ */ /* $NetBSD: extern.h,v 1.10 1995/05/21 13:38:27 mycroft Exp $ */ /*- @@ -72,7 +72,7 @@ void rssize(const struct kinfo_proc *, VARENT *); void runame(const struct kinfo_proc *, VARENT *); void showkey(void); void started(const struct kinfo_proc *, VARENT *); -void state(const struct kinfo_proc *, VARENT *); +void printstate(const struct kinfo_proc *, VARENT *); void tdev(const struct kinfo_proc *, VARENT *); void tname(const struct kinfo_proc *, VARENT *); void tsize(const struct kinfo_proc *, VARENT *); diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index 3cc32e3e6b0..2941c72375a 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -1,4 +1,4 @@ -/* $OpenBSD: keyword.c,v 1.42 2015/01/16 06:39:32 deraadt Exp $ */ +/* $OpenBSD: keyword.c,v 1.43 2015/12/30 14:59:10 tedu Exp $ */ /* $NetBSD: keyword.c,v 1.12.6.1 1996/05/30 21:25:13 cgd Exp $ */ /*- @@ -167,7 +167,7 @@ VAR var[] = { {"ssiz", "SSIZ", NULL, 0, ssize, 4}, {"start", "STARTED", NULL, LJUST|USER, started, 8}, {"stat", "", "state"}, - {"state", "STAT", NULL, LJUST|NLIST, state, 5}, + {"state", "STAT", NULL, LJUST|NLIST, printstate, 5}, GID("svgid", "SVGID", pvar, POFF(p_svgid)), UID("svuid", "SVUID", pvar, POFF(p_svuid)), {"tdev", "TDEV", NULL, 0, tdev, 4}, diff --git a/bin/ps/print.c b/bin/ps/print.c index d8cb7806c58..1d6319de322 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.64 2015/10/25 15:26:53 czarkoff Exp $ */ +/* $OpenBSD: print.c,v 1.65 2015/12/30 14:59:10 tedu Exp $ */ /* $NetBSD: print.c,v 1.27 1995/09/29 21:58:12 cgd Exp $ */ /*- @@ -212,7 +212,7 @@ logname(const struct kinfo_proc *kp, VARENT *ve) #define pgtok(a) (((unsigned long long)(a)*getpagesize())/1024) void -state(const struct kinfo_proc *kp, VARENT *ve) +printstate(const struct kinfo_proc *kp, VARENT *ve) { int flag; char *cp, state = '\0'; diff --git a/bin/systrace/policy.c b/bin/systrace/policy.c index f76f114253c..a933b9ee4ca 100644 --- a/bin/systrace/policy.c +++ b/bin/systrace/policy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: policy.c,v 1.35 2015/01/16 00:19:12 deraadt Exp $ */ +/* $OpenBSD: policy.c,v 1.36 2015/12/30 14:59:10 tedu Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * All rights reserved. @@ -346,16 +346,16 @@ systrace_modifypolicy(int fd, int policynr, const char *name, short action) } char * -systrace_policyfilename(char *dirname, const char *name) +systrace_policyfilename(char *dir, const char *name) { static char file[2*PATH_MAX]; const char *p; int i, plen; - if (strlen(name) + strlen(dirname) + 1 >= sizeof(file)) + if (strlen(name) + strlen(dir) + 1 >= sizeof(file)) return (NULL); - strlcpy(file, dirname, sizeof(file)); + strlcpy(file, dir, sizeof(file)); i = strlen(file); file[i++] = '/'; plen = i; |