Attachment 2749 Details for Bug 3372 – fixes users of this macro

[patch] fixes users of this macro

008_fix_xgetpw_macro.diff (text/plain), 1.97 KB, created by Daniel Stone on 2005-05-23 07:04:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Stone

Created: 2005-05-23 07:04:11 UTC

Size: 1.97 KB

patch

obsolete

>$Id$
>
>Fix the _XGetpwnam macro to be more consistent; this patch by Robert Millan.
>
>diff -ruN xc-old/lib/X11/GetDflt.c xc/lib/X11/GetDflt.c
>--- xc-old/lib/X11/GetDflt.c	2004-04-23 18:43:23.000000000 +0000
>+++ xc/lib/X11/GetDflt.c	2004-10-26 05:45:59.435420944 +0000
>@@ -126,10 +126,11 @@
> 	(void) strncpy(dest, ptr, len-1);
> 	dest[len-1] = '\0';
>     } else {
>+	struct passwd *dummy;
> 	if ((ptr = getenv("USER")))
>-	    pw = _XGetpwnam(ptr,pwparams);
>+	    pw = _XGetpwnam(ptr,pwparams,&dummy);
> 	else
>-	    pw = _XGetpwuid(getuid(),pwparams);
>+	    pw = _XGetpwuid(getuid(),pwparams,&dummy);
> 	if (pw != NULL) {
> 	    (void) strncpy(dest, pw->pw_dir, len-1);
> 	    dest[len-1] = '\0';
>diff -ruN xc-old/lib/Xp/XpJob.c xc/lib/Xp/XpJob.c
>--- xc-old/lib/Xp/XpJob.c	2004-04-23 18:43:46.000000000 +0000
>+++ xc/lib/Xp/XpJob.c	2004-10-26 05:50:19.246923592 +0000
>@@ -105,7 +105,8 @@
> 	_Xgetpwparams pwparams;
> #endif
> 	struct passwd *pw;
>-	pw = _XGetpwuid(getuid(),pwparams);
>+	struct passwd *dummy;
>+	pw = _XGetpwuid(getuid(),pwparams,&dummy);
> 
> 	if (pw && (PwName = pw->pw_name)) {
> #else
>diff -ruN xc-old/lib/Xt/Initialize.c xc/lib/Xt/Initialize.c
>--- xc-old/lib/Xt/Initialize.c	2004-04-23 18:43:52.000000000 +0000
>+++ xc/lib/Xt/Initialize.c	2004-10-26 05:51:16.445228128 +0000
>@@ -303,7 +303,8 @@
> 	(void) strncpy (dest, ptr, len-1);
> 	dest[len-1] = '\0';
>     } else {
>-	if ((pw = _XGetpwuid(getuid(),pwparams)) != NULL) {
>+	struct passwd *dummy;
>+	if ((pw = _XGetpwuid(getuid(),pwparams,&dummy)) != NULL) {
> 	    (void) strncpy (dest, pw->pw_name, len-1);
> 	    dest[len-1] = '\0';
> 	} else
>@@ -350,10 +351,11 @@
> 	(void) strncpy (dest, ptr, len-1);
> 	dest[len-1] = '\0';
>     } else {
>+	struct passwd *dummy;
> 	if ((ptr = getenv("USER")))
>-	    pw = _XGetpwnam(ptr,pwparams);
>+	    pw = _XGetpwnam(ptr,pwparams,&dumy);
> 	else
>- 	    pw = _XGetpwuid(getuid(),pwparams);
>+ 	    pw = _XGetpwuid(getuid(),pwparams,&dummy);
> 	if (pw != NULL) {
> 	    (void) strncpy (dest, pw->pw_dir, len-1);
> 	    dest[len-1] = '\0';

Actions: View | Splinter Review

Attachments on bug 3372: 2748 | 2749

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.