Deleted Added
sdiff udiff text old ( 8870 ) new ( 9817 )
full compact
uname.c (8870) uname.c (9817)
1/*-
2 * Copyright (c) 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 20 unchanged lines hidden (view full) ---

29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#if defined(LIBC_SCCS) && !defined(lint)
35/*static char sccsid[] = "From: @(#)uname.c 8.1 (Berkeley) 1/4/94";*/
36static const char rcsid[] =
1/*-
2 * Copyright (c) 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 20 unchanged lines hidden (view full) ---

29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#if defined(LIBC_SCCS) && !defined(lint)
35/*static char sccsid[] = "From: @(#)uname.c 8.1 (Berkeley) 1/4/94";*/
36static const char rcsid[] =
37 "$Id: uname.c,v 1.2 1994/10/13 20:31:19 wollman Exp $";
37 "$Id: uname.c,v 1.3 1995/05/30 05:40:29 rgrimes Exp $";
38#endif /* LIBC_SCCS and not lint */
39
40#include <sys/param.h>
41#include <sys/sysctl.h>
42#include <sys/utsname.h>
43#include <errno.h>
44
45int

--- 12 unchanged lines hidden (view full) ---

58 len = sizeof(name->sysname);
59 oerrno = errno;
60 if (sysctl(mib, 2, &name->sysname, &len, NULL, 0) == -1) {
61 if(errno == ENOMEM)
62 errno = oerrno;
63 else
64 rval = -1;
65 }
38#endif /* LIBC_SCCS and not lint */
39
40#include <sys/param.h>
41#include <sys/sysctl.h>
42#include <sys/utsname.h>
43#include <errno.h>
44
45int

--- 12 unchanged lines hidden (view full) ---

58 len = sizeof(name->sysname);
59 oerrno = errno;
60 if (sysctl(mib, 2, &name->sysname, &len, NULL, 0) == -1) {
61 if(errno == ENOMEM)
62 errno = oerrno;
63 else
64 rval = -1;
65 }
66 name->sysname[sizeof(name->sysname) - 1] = '\0';
66
67 mib[0] = CTL_KERN;
68 mib[1] = KERN_HOSTNAME;
69 len = sizeof(name->nodename);
70 oerrno = errno;
71 if (sysctl(mib, 2, &name->nodename, &len, NULL, 0) == -1) {
72 if(errno == ENOMEM)
73 errno = oerrno;
74 else
75 rval = -1;
76 }
67
68 mib[0] = CTL_KERN;
69 mib[1] = KERN_HOSTNAME;
70 len = sizeof(name->nodename);
71 oerrno = errno;
72 if (sysctl(mib, 2, &name->nodename, &len, NULL, 0) == -1) {
73 if(errno == ENOMEM)
74 errno = oerrno;
75 else
76 rval = -1;
77 }
78 name->nodename[sizeof(name->nodename) - 1] = '\0';
77
78 mib[0] = CTL_KERN;
79 mib[1] = KERN_OSRELEASE;
80 len = sizeof(name->release);
81 oerrno = errno;
82 if (sysctl(mib, 2, &name->release, &len, NULL, 0) == -1) {
83 if(errno == ENOMEM)
84 errno = oerrno;
85 else
86 rval = -1;
87 }
79
80 mib[0] = CTL_KERN;
81 mib[1] = KERN_OSRELEASE;
82 len = sizeof(name->release);
83 oerrno = errno;
84 if (sysctl(mib, 2, &name->release, &len, NULL, 0) == -1) {
85 if(errno == ENOMEM)
86 errno = oerrno;
87 else
88 rval = -1;
89 }
90 name->release[sizeof(name->release) - 1] = '\0';
88
89 /* The version may have newlines in it, turn them into spaces. */
90 mib[0] = CTL_KERN;
91 mib[1] = KERN_VERSION;
92 len = sizeof(name->version);
93 oerrno = errno;
94 if (sysctl(mib, 2, &name->version, &len, NULL, 0) == -1) {
95 if (errno == ENOMEM)
96 errno = oerrno;
97 else
98 rval = -1;
91
92 /* The version may have newlines in it, turn them into spaces. */
93 mib[0] = CTL_KERN;
94 mib[1] = KERN_VERSION;
95 len = sizeof(name->version);
96 oerrno = errno;
97 if (sysctl(mib, 2, &name->version, &len, NULL, 0) == -1) {
98 if (errno == ENOMEM)
99 errno = oerrno;
100 else
101 rval = -1;
99 } else {
100 for (p = name->version; len--; ++p) {
101 if (*p == '\n' || *p == '\t') {
102 if (len > 1)
103 *p = ' ';
104 else
105 *p = '\0';
106 }
102 }
103 name->version[sizeof(name->version) - 1] = '\0';
104 for (p = name->version; len--; ++p) {
105 if (*p == '\n' || *p == '\t') {
106 if (len > 1)
107 *p = ' ';
108 else
109 *p = '\0';
107 }
108 }
109
110 mib[0] = CTL_HW;
111 mib[1] = HW_MACHINE;
112 len = sizeof(name->machine);
113 oerrno = errno;
114 if (sysctl(mib, 2, &name->machine, &len, NULL, 0) == -1) {
115 if (errno == ENOMEM)
116 errno = oerrno;
117 else
118 rval = -1;
119 }
110 }
111 }
112
113 mib[0] = CTL_HW;
114 mib[1] = HW_MACHINE;
115 len = sizeof(name->machine);
116 oerrno = errno;
117 if (sysctl(mib, 2, &name->machine, &len, NULL, 0) == -1) {
118 if (errno == ENOMEM)
119 errno = oerrno;
120 else
121 rval = -1;
122 }
123 name->machine[sizeof(name->machine) - 1] = '\0';
120 return (rval);
121}
124 return (rval);
125}