Differences From Artifact [0621210a4b]:
- File src/OFSystemInfo.m — part of check-in [09e7348b89] at 2023-08-28 23:15:11 on branch trunk — OFSystemInfo: Use cwd for paths on some consoles (user: js, size: 19856) [annotate] [blame] [check-ins using] [more...]
To Artifact [2ae1048a93]:
- File
src/OFSystemInfo.m
— part of check-in
[12e54c754f]
at
2023-10-01 20:23:52
on branch trunk
— OFSystemInfo: Check uname() return against -1
Some systems return a positive value, making it look like it failed when
it succeeded when checking != 0. (user: js, size: 19858) [annotate] [blame] [check-ins using] [more...]
| ︙ | ︙ | |||
156 157 158 159 160 161 162 | #elif defined(OF_DJGPP) operatingSystemName = [[OFString alloc] initWithCString: _os_flavor encoding: OFStringEncodingASCII]; #elif defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME) struct utsname name; | | | 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 | #elif defined(OF_DJGPP) operatingSystemName = [[OFString alloc] initWithCString: _os_flavor encoding: OFStringEncodingASCII]; #elif defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME) struct utsname name; if (uname(&name) == -1) return; operatingSystemName = [[OFString alloc] initWithCString: name.sysname encoding: [OFLocale encoding]]; #endif } |
| ︙ | ︙ | |||
253 254 255 256 257 258 259 |
initWithFormat: @"%u.%u", _osmajor, _osminor];
#elif defined(OF_WII) || defined(NINTENDO_3DS) || defined(OF_NINTENDO_DS) || \
defined(OF_PSP)
/* Intentionally nothing */
#elif defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME)
struct utsname name;
| | | 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 |
initWithFormat: @"%u.%u", _osmajor, _osminor];
#elif defined(OF_WII) || defined(NINTENDO_3DS) || defined(OF_NINTENDO_DS) || \
defined(OF_PSP)
/* Intentionally nothing */
#elif defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME)
struct utsname name;
if (uname(&name) == -1)
return;
operatingSystemVersion = [[OFString alloc]
initWithCString: name.release
encoding: [OFLocale encoding]];
#endif
}
|
| ︙ | ︙ |