Attachment 16 Details for Bug 22 – Patch to use $HOME only as fallback

[patch] Patch to use $HOME only as fallback

fontconfig-2.1-gethome.patch (text/plain), 1.44 KB, created by Frederic Crozat on 2003-02-06 01:35:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Crozat

Created: 2003-02-06 01:35:38 UTC

Size: 1.44 KB

patch

obsolete

>--- fontconfig/src/fcstr.c.gethome	2002-09-01 00:17:32.000000000 +0200
>+++ fontconfig/src/fcstr.c	2003-01-08 18:26:11.000000000 +0100
>@@ -25,6 +25,7 @@
> #include <stdlib.h>
> #include <ctype.h>
> #include <string.h>
>+#include <pwd.h>
> #include "fcint.h"
> 
> FcChar8 *
>@@ -421,16 +422,38 @@
> }
> 
> FcChar8 *
>+FcStrGetHome (void)
>+{
>+	static FcChar8 * home;
>+
>+	if (!home) 
>+	{
>+	  struct passwd *pw;
>+	  pw = getpwuid(getuid());
>+	  if (pw) 
>+	  {
>+	    home = FcStrCopy (pw->pw_dir);
>+	  }
>+	  else {
>+	    /* fallback on $HOME */
>+	    home = (FcChar8 *) getenv ("HOME");
>+	  }
>+	}
>+	return FcStrCopy (home);
>+}
>+
>+FcChar8 *
> FcStrCopyFilename (const FcChar8 *s)
> {
>     FcChar8 *new;
>     
>     if (*s == '~')
>     {
>-	FcChar8	*home = (FcChar8 *) getenv ("HOME");
>-	int	size = strlen ((char *) home) + strlen ((char *) s);
>+	FcChar8	*home = FcStrGetHome ();
>+	int	size;
> 	if (!home)
> 	    return 0;
>+	size = strlen ((char *) home) + strlen ((char *) s);
> 	new = (FcChar8 *) malloc (size);
> 	if (!new)
> 	    return 0;
>@@ -632,6 +655,7 @@
>     return list->set->strs[list->n++];
> }
> 
>+
> void
> FcStrListDone (FcStrList *list)
> {
>--- fontconfig/src/fccfg.c.gethome	2002-09-01 00:17:32.000000000 +0200
>+++ fontconfig/src/fccfg.c	2003-01-08 18:22:58.000000000 +0100
>@@ -1367,7 +1367,7 @@
>     file = 0;
>     switch (*url) {
>     case '~':
>-	dir = (FcChar8 *) getenv ("HOME");
>+	dir = (FcChar8 *) FcStrGetHome();
> 	if (dir)
> 	    file = FcConfigFileExists (dir, url + 1);
> 	else

Actions: View | Splinter Review

Attachments on bug 22: 16

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.