diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1997-07-06 07:28:00 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-07-06 07:28:00 +0000 |
| commit | aa19b57f6091518fcdf3122551561a7a80f613e7 (patch) | |
| tree | 4705250b97aa081d1a81a0c0628efa1cb2ec63dd /sys/compat/hpux | |
| parent | 1377e1a824ff32aa9bf8b6d3f0eba50fa581801a (diff) | |
sync with NetBSD, 970705.
Diffstat (limited to 'sys/compat/hpux')
| -rw-r--r-- | sys/compat/hpux/hpux_compat.c | 10 | ||||
| -rw-r--r-- | sys/compat/hpux/hpux_file.c | 12 |
2 files changed, 8 insertions, 14 deletions
diff --git a/sys/compat/hpux/hpux_compat.c b/sys/compat/hpux/hpux_compat.c index 28bfa011be6..22a1f6280a0 100644 --- a/sys/compat/hpux/hpux_compat.c +++ b/sys/compat/hpux/hpux_compat.c @@ -1,5 +1,5 @@ -/* $OpenBSD: hpux_compat.c,v 1.9 1997/04/16 09:18:02 downsj Exp $ */ -/* $NetBSD: hpux_compat.c,v 1.31 1997/04/01 19:58:59 scottr Exp $ */ +/* $OpenBSD: hpux_compat.c,v 1.10 1997/07/06 07:27:59 downsj Exp $ */ +/* $NetBSD: hpux_compat.c,v 1.35 1997/05/08 16:19:48 mycroft Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -417,6 +417,7 @@ hpux_sys_utssys(p, v, retval) int error; struct hpux_utsname ut; extern char ostype[], hostname[], osrelease[], version[]; + extern char machine[]; switch (SCARG(uap, request)) { /* uname */ @@ -437,8 +438,8 @@ hpux_sys_utssys(p, v, retval) strncpy(ut.version, version, sizeof(ut.version)); ut.version[sizeof(ut.version) - 1] = '\0'; - /* Fill in machine-dependent part of uname. */ - hpux_cpu_uname(&ut); + strncpy(ut.machine, machine, sizeof(ut.machine)); + ut.machine[sizeof(ut.machine) - 1] = '\0'; error = copyout((caddr_t)&ut, (caddr_t)SCARG(uap, uts), sizeof(ut)); @@ -1189,7 +1190,6 @@ hpux_sys_getaccess(p, v, retval) *retval |= R_OK; if (vn_writechk(vp) == 0 && VOP_ACCESS(vp, VWRITE, cred, p) == 0) *retval |= W_OK; - /* XXX we return X_OK for root on VREG even if not */ if (VOP_ACCESS(vp, VEXEC, cred, p) == 0) *retval |= X_OK; vput(vp); diff --git a/sys/compat/hpux/hpux_file.c b/sys/compat/hpux/hpux_file.c index 4c59f528e43..e38b32897a9 100644 --- a/sys/compat/hpux/hpux_file.c +++ b/sys/compat/hpux/hpux_file.c @@ -1,8 +1,8 @@ -/* $OpenBSD: hpux_file.c,v 1.5 1997/04/16 09:18:05 downsj Exp $ */ -/* $NetBSD: hpux_file.c,v 1.4 1997/04/01 19:59:01 scottr Exp $ */ +/* $OpenBSD: hpux_file.c,v 1.6 1997/07/06 07:27:59 downsj Exp $ */ +/* $NetBSD: hpux_file.c,v 1.5 1997/04/27 21:40:48 thorpej Exp $ */ /* - * Copyright (c) 1995 Jason R. Thorpe. All rights reserved. + * Copyright (c) 1995, 1997 Jason R. Thorpe. All rights reserved. * Copyright (c) 1988 University of Utah. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -571,12 +571,6 @@ bsd_to_hpux_stat(sb, hsb) hsb->hst_old_uid = (u_short)sb->st_uid; hsb->hst_old_gid = (u_short)sb->st_gid; - /* - * Call machine-dependent stat conversion. Is it just me - * who thinks HP-UX device semantics are strange?! - */ - hpux_cpu_bsd_to_hpux_stat(sb, hsb); - if (sb->st_size < (off_t)(((off_t)1) << 32)) hsb->hst_size = (long)sb->st_size; else |