Attachment 1587 Details for Bug 2123 – Patch to fix uname return value checks

[patch] Patch to fix uname return value checks

uname-patch (text/plain), 1.42 KB, created by Alan Coopersmith on 2004-12-22 00:20:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Coopersmith

Created: 2004-12-22 00:20:18 UTC

Size: 1.42 KB

patch

obsolete

>--- cvs-ro/xc/programs/Xserver/hw/xfree86/common/xf86Init.c	Tue Nov 30 15:44:53 2004
>+++ cvs-rw/xc/programs/Xserver/hw/xfree86/common/xf86Init.c	Tue Dec 21 15:21:49 2004
>@@ -1765,7 +1765,11 @@
>   {
>     struct utsname name;
> 
>-    if (uname(&name) == 0) {
>+    /* Linux & BSD state that 0 is success, SysV (including Solaris, HP-UX,
>+       and Irix) and Single Unix Spec 3 just say that non-negative is success.
>+       All agree that failure is represented by a negative number.
>+     */
>+    if (uname(&name) >= 0) {
>       ErrorF("Current Operating System: %s %s %s %s %s\n",
> 	name.sysname, name.nodename, name.release, name.version, name.machine);
>     }
>--- cvs-ro/xc/lib/Xmu/CvtStdSel.c	Fri Apr 23 11:43:45 2004
>+++ cvs-rw/xc/lib/Xmu/CvtStdSel.c	Tue Dec 21 15:22:44 2004
>@@ -114,7 +114,7 @@
> #ifdef USE_UNAME
> 	struct utsname utss;
> 
>-	if (uname (&utss) == 0) {
>+	if (uname (&utss) >= 0) {
> 	    char *os_name;
> 	    int len = strlen(utss.sysname) + 1;
> #ifndef hpux				/* because of hostname length crock */
>--- cvs-ro/xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c	Fri Apr 23 12:54:08 2004
>+++ cvs-rw/xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c	Tue Dec 21 15:22:19 2004
>@@ -166,7 +166,7 @@
> #elif defined(sun)
>     struct utsname buffer;
> 
>-    if ((uname(&buffer) == 0) && !strcmp(buffer.machine, "sun4u"))
>+    if ((uname(&buffer) >= 0) && !strcmp(buffer.machine, "sun4u"))
> 	promP1275 = TRUE;
>     else
> 	promP1275 = FALSE;

Flags:

alan.coopersmith: 6.8-branch?

Actions: View | Splinter Review

Attachments on bug 2123: 1587

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.