[PATCH lib/libXfont] Provide a dummy readlink on WIN32

Alan Coopersmith alan.coopersmith at oracle.com
Mon Oct 22 08:25:33 PDT 2012


On 10/22/12 08:07 AM, Jon TURNEY wrote:
> From: Ryan Pavlik <rpavlik at iastate.edu>
> 
> Provide a dummy readlink, which just returns the supplied path name, on WIN32
> 
> Signed-off-by: Ryan Pavlik <rpavlik at iastate.edu>
> Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>
> ---
>  src/fontfile/catalogue.c |    9 +++++++++
>  1 files changed, 9 insertions(+), 0 deletions(-)
> 
> diff --git a/src/fontfile/catalogue.c b/src/fontfile/catalogue.c
> index 8029b28..7ec06f2 100644
> --- a/src/fontfile/catalogue.c
> +++ b/src/fontfile/catalogue.c
> @@ -37,6 +37,15 @@ static const char CataloguePrefix[] = "catalogue:";
>  
>  static int CatalogueFreeFPE (FontPathElementPtr fpe);
>  
> +#ifdef WIN32
> +static int readlink(const char *path, char*buf, size_t bufsiz)
> +{
> +    /* Silly no-op implementation */
> +    strncpy(buf, path, bufsiz);

Don't you want a buf[bufsiz - 1] = '\0' after that, just in case
the caller passed something either not null terminated or too long
to fit the null byte in the buf?

> +    return strlen(buf);
> +}
> +#endif
> +
>  static int
>  CatalogueNameCheck (char *name)
>  {


-- 
	-Alan Coopersmith-              alan.coopersmith at oracle.com
	 Oracle Solaris Engineering - http://blogs.oracle.com/alanc


More information about the xorg-devel mailing list