diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-09-14 23:45:15 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-09-14 23:45:15 +0000 |
| commit | a7e18b15791831cb95fe053d2ed017adb8c3bf54 (patch) | |
| tree | 3ee7475f6ac05fa979ff561157cf645834156673 /bin | |
| parent | 19856cfaf3041e206445509d103c24ddb2782254 (diff) | |
rename internal uname() to euname() to avoid libc conflict
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/ps/extern.h | 4 | ||||
| -rw-r--r-- | bin/ps/keyword.c | 6 | ||||
| -rw-r--r-- | bin/ps/print.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/bin/ps/extern.h b/bin/ps/extern.h index df48dd51841..e4f622b4dda 100644 --- a/bin/ps/extern.h +++ b/bin/ps/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.10 2004/01/08 18:18:35 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.11 2004/09/14 23:45:14 deraadt Exp $ */ /* $NetBSD: extern.h,v 1.10 1995/05/21 13:38:27 mycroft Exp $ */ /*- @@ -77,7 +77,7 @@ void tsize(const struct kinfo_proc2 *, VARENT *); void dsize(const struct kinfo_proc2 *, VARENT *); void ssize(const struct kinfo_proc2 *, VARENT *); void ucomm(const struct kinfo_proc2 *, VARENT *); -void uname(const struct kinfo_proc2 *, VARENT *); +void euname(const struct kinfo_proc2 *, VARENT *); void vsize(const struct kinfo_proc2 *, VARENT *); void wchan(const struct kinfo_proc2 *, VARENT *); __END_DECLS diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index f32b46b0ab6..cef2b643a4c 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -1,4 +1,4 @@ -/* $OpenBSD: keyword.c,v 1.22 2004/06/11 01:32:13 deraadt Exp $ */ +/* $OpenBSD: keyword.c,v 1.23 2004/09/14 23:45:14 deraadt Exp $ */ /* $NetBSD: keyword.c,v 1.12.6.1 1996/05/30 21:25:13 cgd Exp $ */ /*- @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: keyword.c,v 1.22 2004/06/11 01:32:13 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: keyword.c,v 1.23 2004/09/14 23:45:14 deraadt Exp $"; #endif #endif /* not lint */ @@ -176,7 +176,7 @@ VAR var[] = { {"ucomm", "UCOMM", NULL, LJUST, ucomm, MAXCOMLEN}, UID("uid", "UID", pvar, POFF(p_uid)), {"upr", "UPR", NULL, 0, pvar, 3, 0, POFF(p_usrpri), UINT8, "d"}, - {"user", "USER", NULL, LJUST, uname, USERLEN}, + {"user", "USER", NULL, LJUST, euname, USERLEN}, {"usrpri", "", "upr"}, {"vsize", "", "vsz"}, {"vsz", "VSZ", NULL, 0, vsize, 5}, diff --git a/bin/ps/print.c b/bin/ps/print.c index eea52cdd025..258ec7cf185 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.32 2004/01/08 18:18:35 millert Exp $ */ +/* $OpenBSD: print.c,v 1.33 2004/09/14 23:45:14 deraadt Exp $ */ /* $NetBSD: print.c,v 1.27 1995/09/29 21:58:12 cgd Exp $ */ /*- @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94"; #else -static char rcsid[] = "$OpenBSD: print.c,v 1.32 2004/01/08 18:18:35 millert Exp $"; +static char rcsid[] = "$OpenBSD: print.c,v 1.33 2004/09/14 23:45:14 deraadt Exp $"; #endif #endif /* not lint */ @@ -258,7 +258,7 @@ pri(const struct kinfo_proc2 *kp, VARENT *ve) } void -uname(const struct kinfo_proc2 *kp, VARENT *ve) +euname(const struct kinfo_proc2 *kp, VARENT *ve) { VAR *v; |