2010-11-28 03:43:12 +01:00
|
|
|
/**
|
|
|
|
* @file
|
|
|
|
*
|
|
|
|
* @section DESCRIPTION
|
|
|
|
*
|
|
|
|
* These functions provide a portable implementation of the common (but not
|
|
|
|
* yet universal) asprintf & vasprintf routines to allocate a buffer big
|
|
|
|
* enough to sprintf the arguments to. The XNF variants terminate the server
|
|
|
|
* if the allocation fails.
|
|
|
|
*/
|
2005-01-14 13:17:10 +01:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2004 Alexander Gottwald
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
|
|
* to deal in the Software without restriction, including without limitation
|
|
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
|
|
* DEALINGS IN THE SOFTWARE.
|
|
|
|
*
|
|
|
|
* Except as contained in this notice, the name(s) of the above copyright
|
|
|
|
* holders shall not be used in advertising or otherwise to promote the sale,
|
|
|
|
* use or other dealings in this Software without prior written authorization.
|
|
|
|
*/
|
2010-11-28 03:43:12 +01:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
|
|
* to deal in the Software without restriction, including without limitation
|
|
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice (including the next
|
|
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
|
|
* Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
|
|
* DEALINGS IN THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
2005-07-03 09:02:09 +02:00
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
|
|
#include <dix-config.h>
|
|
|
|
#endif
|
|
|
|
|
2005-04-20 14:25:48 +02:00
|
|
|
#include <X11/Xos.h>
|
2005-07-03 10:53:54 +02:00
|
|
|
#include "os.h"
|
2004-12-03 12:57:42 +01:00
|
|
|
#include <stdarg.h>
|
|
|
|
#include <stdio.h>
|
2011-10-12 02:37:44 +02:00
|
|
|
#include <errno.h>
|
|
|
|
#include <string.h>
|
2005-02-03 10:58:47 +01:00
|
|
|
|
2010-11-28 03:43:12 +01:00
|
|
|
#ifdef asprintf
|
2012-03-21 20:55:09 +01:00
|
|
|
#undef asprintf
|
2010-11-28 03:43:12 +01:00
|
|
|
#endif
|
|
|
|
#ifdef vasprintf
|
2012-03-21 20:55:09 +01:00
|
|
|
#undef vasprintf
|
2010-11-28 03:43:12 +01:00
|
|
|
#endif
|
|
|
|
|
2005-02-03 10:58:47 +01:00
|
|
|
#ifndef va_copy
|
2012-03-21 20:55:09 +01:00
|
|
|
#ifdef __va_copy
|
|
|
|
#define va_copy __va_copy
|
|
|
|
#else
|
|
|
|
#error "no working va_copy was found"
|
|
|
|
#endif
|
2005-02-03 10:58:47 +01:00
|
|
|
#endif
|
2010-11-28 03:43:12 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Varargs sprintf that allocates a string buffer the right size for
|
|
|
|
* the pattern & data provided and prints the requested data to it.
|
|
|
|
*
|
|
|
|
* @param ret Pointer to which the newly allocated buffer is written
|
|
|
|
* (contents undefined on error)
|
|
|
|
* @param format printf style format string
|
|
|
|
* @param va variable argument list
|
|
|
|
* @return size of allocated buffer, or -1 on error.
|
|
|
|
*/
|
|
|
|
int
|
2012-03-21 20:55:09 +01:00
|
|
|
Xvasprintf(char **ret, const char *_X_RESTRICT_KYWD format, va_list va)
|
2004-12-03 12:57:42 +01:00
|
|
|
{
|
2010-11-28 03:43:12 +01:00
|
|
|
#ifdef HAVE_VASPRINTF
|
|
|
|
return vasprintf(ret, format, va);
|
|
|
|
#else
|
2004-12-03 12:57:42 +01:00
|
|
|
int size;
|
|
|
|
va_list va2;
|
|
|
|
|
|
|
|
va_copy(va2, va);
|
|
|
|
size = vsnprintf(NULL, 0, format, va2);
|
|
|
|
va_end(va2);
|
|
|
|
|
2010-11-28 03:43:12 +01:00
|
|
|
*ret = malloc(size + 1);
|
|
|
|
if (*ret == NULL)
|
|
|
|
return -1;
|
2004-12-03 12:57:42 +01:00
|
|
|
|
2010-11-28 03:43:12 +01:00
|
|
|
vsnprintf(*ret, size + 1, format, va);
|
2010-12-10 01:08:24 +01:00
|
|
|
(*ret)[size] = 0;
|
2010-11-28 03:43:12 +01:00
|
|
|
return size;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef HAVE_VASPRINTF
|
2012-03-21 20:55:09 +01:00
|
|
|
#define vasprintf Xvasprintf
|
2010-11-28 03:43:12 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/**
|
|
|
|
* sprintf that allocates a string buffer the right size for
|
|
|
|
* the pattern & data provided and prints the requested data to it.
|
|
|
|
*
|
|
|
|
* @param ret Pointer to which the newly allocated buffer is written
|
|
|
|
* (contents undefined on error)
|
|
|
|
* @param format printf style format string
|
|
|
|
* @param ... arguments for specified format
|
|
|
|
* @return size of allocated buffer, or -1 on error.
|
|
|
|
*/
|
|
|
|
int
|
2012-03-21 20:55:09 +01:00
|
|
|
Xasprintf(char **ret, const char *_X_RESTRICT_KYWD format, ...)
|
2010-11-28 03:43:12 +01:00
|
|
|
{
|
|
|
|
int size;
|
|
|
|
va_list va;
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2010-11-28 03:43:12 +01:00
|
|
|
va_start(va, format);
|
|
|
|
size = vasprintf(ret, format, va);
|
|
|
|
va_end(va);
|
|
|
|
return size;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Varargs sprintf that allocates a string buffer the right size for
|
|
|
|
* the pattern & data provided and prints the requested data to it.
|
|
|
|
* On failure, issues a FatalError message and aborts the server.
|
|
|
|
*
|
|
|
|
* @param ret Pointer to which the newly allocated buffer is written
|
|
|
|
* (contents undefined on error)
|
|
|
|
* @param format printf style format string
|
|
|
|
* @param va variable argument list
|
|
|
|
* @return size of allocated buffer
|
|
|
|
*/
|
|
|
|
int
|
2012-03-21 20:55:09 +01:00
|
|
|
XNFvasprintf(char **ret, const char *_X_RESTRICT_KYWD format, va_list va)
|
2010-11-28 03:43:12 +01:00
|
|
|
{
|
|
|
|
int size = vasprintf(ret, format, va);
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2010-11-28 03:43:12 +01:00
|
|
|
if ((size == -1) || (*ret == NULL)) {
|
2012-03-21 20:55:09 +01:00
|
|
|
FatalError("XNFvasprintf failed: %s", strerror(errno));
|
2010-11-28 03:43:12 +01:00
|
|
|
}
|
|
|
|
return size;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* sprintf that allocates a string buffer the right size for
|
|
|
|
* the pattern & data provided and prints the requested data to it.
|
|
|
|
* On failure, issues a FatalError message and aborts the server.
|
|
|
|
*
|
|
|
|
* @param ret Pointer to which the newly allocated buffer is written
|
|
|
|
* (contents undefined on error)
|
|
|
|
* @param format printf style format string
|
|
|
|
* @param ... arguments for specified format
|
|
|
|
* @return size of allocated buffer
|
|
|
|
*/
|
|
|
|
int
|
2012-03-21 20:55:09 +01:00
|
|
|
XNFasprintf(char **ret, const char *_X_RESTRICT_KYWD format, ...)
|
2010-11-28 03:43:12 +01:00
|
|
|
{
|
|
|
|
int size;
|
|
|
|
va_list va;
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2010-11-28 03:43:12 +01:00
|
|
|
va_start(va, format);
|
|
|
|
size = XNFvasprintf(ret, format, va);
|
|
|
|
va_end(va);
|
|
|
|
return size;
|
|
|
|
}
|
|
|
|
|
2012-04-18 11:51:51 +02:00
|
|
|
/**
|
|
|
|
* Varargs snprintf that returns the actual number of bytes (excluding final
|
|
|
|
* '\0') that were copied into the buffer.
|
|
|
|
* This is opposed to the normal sprintf() usually returns the number of bytes
|
|
|
|
* that would have been written.
|
|
|
|
*
|
|
|
|
* @param s buffer to copy into
|
|
|
|
* @param n size of buffer s
|
|
|
|
* @param format printf style format string
|
|
|
|
* @param va variable argument list
|
|
|
|
* @return number of bytes actually copied, excluding final '\0'
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
Xvscnprintf(char *s, int n, const char *format, va_list args)
|
|
|
|
{
|
|
|
|
int x;
|
|
|
|
if (n == 0)
|
|
|
|
return 0;
|
|
|
|
x = vsnprintf(s, n , format, args);
|
|
|
|
return (x >= n) ? (n - 1) : x;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* snprintf that returns the actual number of bytes (excluding final '\0') that
|
|
|
|
* were copied into the buffer.
|
|
|
|
* This is opposed to the normal sprintf() usually returns the number of bytes
|
|
|
|
* that would have been written.
|
|
|
|
*
|
|
|
|
* @param s buffer to copy into
|
|
|
|
* @param n size of buffer s
|
|
|
|
* @param format printf style format string
|
|
|
|
* @param ... arguments for specified format
|
|
|
|
* @return number of bytes actually copied, excluding final '\0'
|
|
|
|
*/
|
|
|
|
int Xscnprintf(char *s, int n, const char *format, ...)
|
|
|
|
{
|
|
|
|
int x;
|
|
|
|
va_list ap;
|
|
|
|
va_start(ap, format);
|
|
|
|
x = Xvscnprintf(s, n, format, ap);
|
|
|
|
va_end(ap);
|
|
|
|
return x;
|
|
|
|
}
|
|
|
|
|
2010-11-28 03:43:12 +01:00
|
|
|
/* Old api, now deprecated, may be removed in the future */
|
|
|
|
char *
|
|
|
|
Xvprintf(const char *format, va_list va)
|
|
|
|
{
|
|
|
|
char *ret;
|
|
|
|
|
|
|
|
if (vasprintf(&ret, format, va) == -1)
|
2012-03-21 20:55:09 +01:00
|
|
|
ret = NULL;
|
2010-11-28 03:43:12 +01:00
|
|
|
|
2004-12-03 12:57:42 +01:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
char *
|
|
|
|
Xprintf(const char *format, ...)
|
2004-12-03 12:57:42 +01:00
|
|
|
{
|
|
|
|
char *ret;
|
|
|
|
va_list va;
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2004-12-03 12:57:42 +01:00
|
|
|
va_start(va, format);
|
2010-11-28 03:43:12 +01:00
|
|
|
if (vasprintf(&ret, format, va) == -1)
|
2012-03-21 20:55:09 +01:00
|
|
|
ret = NULL;
|
2004-12-03 12:57:42 +01:00
|
|
|
va_end(va);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
char *
|
2004-12-03 12:57:42 +01:00
|
|
|
XNFvprintf(const char *format, va_list va)
|
|
|
|
{
|
|
|
|
char *ret;
|
|
|
|
|
2010-11-28 03:43:12 +01:00
|
|
|
XNFvasprintf(&ret, format, va);
|
2004-12-03 12:57:42 +01:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
char *
|
|
|
|
XNFprintf(const char *format, ...)
|
2004-12-03 12:57:42 +01:00
|
|
|
{
|
|
|
|
char *ret;
|
|
|
|
va_list va;
|
2012-03-21 20:55:09 +01:00
|
|
|
|
2004-12-03 12:57:42 +01:00
|
|
|
va_start(va, format);
|
2010-11-28 03:43:12 +01:00
|
|
|
XNFvasprintf(&ret, format, va);
|
2004-12-03 12:57:42 +01:00
|
|
|
va_end(va);
|
|
|
|
return ret;
|
|
|
|
}
|