This is the biggest "visibility" patch. Instead of doing a "export" symbol on demand, export everything in the sdk, so that if some module fails due to an unresolved symbol, it is because it is using a symbol not in the sdk. Most exported symbols shouldn't really be made visible, neither advertised in the sdk, as they are only used by a single shared object. Symbols in the sdk (or referenced in sdk macros), but not defined anywhere include: XkbBuildCoreState() XkbInitialMap XkbXIUnsupported XkbCheckActionVMods() XkbSendCompatNotify() XkbDDXFakePointerButton() XkbDDXApplyConfig() _XkbStrCaseCmp() _XkbErrMessages[] _XkbErrCode _XkbErrLocation _XkbErrData XkbAccessXDetailText() XkbNKNDetailMaskText() XkbLookupGroupAndLevel() XkbInitAtoms() XkbGetOrderedDrawables() XkbFreeOrderedDrawables() XkbConvertXkbComponents() XkbWriteXKBSemantics() XkbWriteXKBLayout() XkbWriteXKBKeymap() XkbWriteXKBFile() XkbWriteCFile() XkbWriteXKMFile() XkbWriteToServer() XkbMergeFile() XkmFindTOCEntry() XkmReadFileSection() XkmReadFileSectionName() InitExtInput() xf86CheckButton() xf86SwitchCoreDevice() RamDacSetGamma() RamDacRestoreDACValues() xf86Bpp xf86ConfigPix24 xf86MouseCflags[] xf86SupportedMouseTypes[] xf86NumMouseTypes xf86ChangeBusIndex() xf86EntityEnter() xf86EntityLeave() xf86WrapperInit() xf86RingBell() xf86findOptionBoolean() xf86debugListOptions() LoadSubModuleLocal() LoaderSymbolLocal() getInt10Rec() xf86CurrentScreen xf86ReallocatePciResources() xf86NewSerialNumber() xf86RandRSetInitialMode() fbCompositeSolidMask_nx1xn fbCompositeSolidMask_nx8888x0565C fbCompositeSolidMask_nx8888x8888C fbCompositeSolidMask_nx8x0565 fbCompositeSolidMask_nx8x0888 fbCompositeSolidMask_nx8x8888 fbCompositeSrc_0565x0565 fbCompositeSrc_8888x0565 fbCompositeSrc_8888x0888 fbCompositeSrc_8888x8888 fbCompositeSrcAdd_1000x1000 fbCompositeSrcAdd_8000x8000 fbCompositeSrcAdd_8888x8888 fbGeneration fbIn fbOver fbOver24 fbOverlayGeneration fbRasterizeEdges fbRestoreAreas fbSaveAreas composeFunctions VBEBuildVbeModeList() VBECalcVbeModeIndex() TIramdac3030CalculateMNPForClock() shadowBufPtr shadowFindBuf() miRRGetScreenInfo() RRSetScreenConfig() RRModePruneUnused() PixmanImageFromPicture() extern int miPointerGetMotionEvents() miClipPicture() miRasterizeTriangle() fbPush1toN() fbInitializeBackingStore() ddxBeforeReset() SetupSprite() InitSprite() DGADeliverEvent() SPECIAL CASES o defined as _X_INTERNAL xf86NewInputDevice() o defined as static fbGCPrivateKey fbOverlayScreenPrivateKey fbScreenPrivateKey fbWinPrivateKey o defined in libXfont.so, but declared in xorg/dixfont.h GetGlyphs() QueryGlyphExtents() QueryTextExtents() ParseGlyphCachingMode() InitGlyphCaching() SetGlyphCachingMode()
219 lines
5.9 KiB
C
219 lines
5.9 KiB
C
/*
|
|
* Copyright (c) 1997 Metro Link Incorporated
|
|
*
|
|
* 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 X CONSORTIUM 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 of the Metro Link shall not be
|
|
* used in advertising or otherwise to promote the sale, use or other dealings
|
|
* in this Software without prior written authorization from Metro Link.
|
|
*
|
|
*/
|
|
/*
|
|
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
|
|
*
|
|
* 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 COPYRIGHT HOLDER(S) OR AUTHOR(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 of the copyright holder(s)
|
|
* and author(s) shall not be used in advertising or otherwise to promote
|
|
* the sale, use or other dealings in this Software without prior written
|
|
* authorization from the copyright holder(s) and author(s).
|
|
*/
|
|
|
|
|
|
/* View/edit this file with tab stops set to 4 */
|
|
|
|
#ifdef HAVE_XORG_CONFIG_H
|
|
#include <xorg-config.h>
|
|
#endif
|
|
|
|
#include "xf86Parser.h"
|
|
#include "xf86tokens.h"
|
|
#include "Configint.h"
|
|
|
|
#include <unistd.h>
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
#include <signal.h>
|
|
#include <errno.h>
|
|
|
|
#if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
|
|
#define HAS_SAVED_IDS_AND_SETEUID
|
|
#endif
|
|
#if defined(WIN32)
|
|
#define HAS_NO_UIDS
|
|
#endif
|
|
|
|
#ifdef HAS_NO_UIDS
|
|
#define doWriteConfigFile xf86writeConfigFile
|
|
#define Local /**/
|
|
#else
|
|
#define Local static
|
|
#endif
|
|
|
|
Local int
|
|
doWriteConfigFile (const char *filename, XF86ConfigPtr cptr)
|
|
{
|
|
FILE *cf;
|
|
|
|
if ((cf = fopen (filename, "w")) == NULL)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
if (cptr->conf_comment)
|
|
fprintf (cf, "%s\n", cptr->conf_comment);
|
|
|
|
xf86printLayoutSection (cf, cptr->conf_layout_lst);
|
|
|
|
if (cptr->conf_files != NULL)
|
|
{
|
|
fprintf (cf, "Section \"Files\"\n");
|
|
xf86printFileSection (cf, cptr->conf_files);
|
|
fprintf (cf, "EndSection\n\n");
|
|
}
|
|
|
|
if (cptr->conf_modules != NULL)
|
|
{
|
|
fprintf (cf, "Section \"Module\"\n");
|
|
xf86printModuleSection (cf, cptr->conf_modules);
|
|
fprintf (cf, "EndSection\n\n");
|
|
}
|
|
|
|
xf86printVendorSection (cf, cptr->conf_vendor_lst);
|
|
|
|
xf86printServerFlagsSection (cf, cptr->conf_flags);
|
|
|
|
xf86printInputSection (cf, cptr->conf_input_lst);
|
|
|
|
xf86printVideoAdaptorSection (cf, cptr->conf_videoadaptor_lst);
|
|
|
|
xf86printModesSection (cf, cptr->conf_modes_lst);
|
|
|
|
xf86printMonitorSection (cf, cptr->conf_monitor_lst);
|
|
|
|
xf86printDeviceSection (cf, cptr->conf_device_lst);
|
|
|
|
xf86printScreenSection (cf, cptr->conf_screen_lst);
|
|
|
|
xf86printDRISection (cf, cptr->conf_dri);
|
|
|
|
xf86printExtensionsSection (cf, cptr->conf_extensions);
|
|
|
|
fclose(cf);
|
|
return 1;
|
|
}
|
|
|
|
#ifndef HAS_NO_UIDS
|
|
|
|
_X_EXPORT int
|
|
xf86writeConfigFile (const char *filename, XF86ConfigPtr cptr)
|
|
{
|
|
int ret;
|
|
|
|
#if !defined(HAS_SAVED_IDS_AND_SETEUID)
|
|
int pid, p;
|
|
int status;
|
|
void (*csig)(int);
|
|
#else
|
|
int ruid, euid;
|
|
#endif
|
|
|
|
if (getuid() != geteuid())
|
|
{
|
|
|
|
#if !defined(HAS_SAVED_IDS_AND_SETEUID)
|
|
/* Need to fork to change ruid without loosing euid */
|
|
#ifdef SIGCHLD
|
|
csig = signal(SIGCHLD, SIG_DFL);
|
|
#endif
|
|
switch ((pid = fork()))
|
|
{
|
|
case -1:
|
|
ErrorF("xf86writeConfigFile(): fork failed (%s)\n",
|
|
strerror(errno));
|
|
return 0;
|
|
case 0: /* child */
|
|
if (setuid(getuid()) == -1)
|
|
FatalError("xf86writeConfigFile(): "
|
|
"setuid failed(%s)\n",
|
|
strerror(errno));
|
|
ret = doWriteConfigFile(filename, cptr);
|
|
exit(ret);
|
|
break;
|
|
default: /* parent */
|
|
do
|
|
{
|
|
p = waitpid(pid, &status, 0);
|
|
} while (p == -1 && errno == EINTR);
|
|
}
|
|
#ifdef SIGCHLD
|
|
signal(SIGCHLD, csig);
|
|
#endif
|
|
if (p != -1 && WIFEXITED(status) && WEXITSTATUS(status) == 0)
|
|
return 1; /* success */
|
|
else
|
|
return 0;
|
|
|
|
#else /* HAS_SAVED_IDS_AND_SETEUID */
|
|
|
|
ruid = getuid();
|
|
euid = geteuid();
|
|
|
|
if (seteuid(ruid) == -1)
|
|
{
|
|
ErrorF("xf86writeConfigFile(): seteuid(%d) failed (%s)\n",
|
|
ruid, strerror(errno));
|
|
return 0;
|
|
}
|
|
ret = doWriteConfigFile(filename, cptr);
|
|
|
|
if (seteuid(euid) == -1)
|
|
{
|
|
ErrorF("xf86writeConfigFile(): seteuid(%d) failed (%s)\n",
|
|
euid, strerror(errno));
|
|
}
|
|
return ret;
|
|
|
|
#endif /* HAS_SAVED_IDS_AND_SETEUID */
|
|
|
|
}
|
|
else
|
|
{
|
|
return doWriteConfigFile(filename, cptr);
|
|
}
|
|
}
|
|
|
|
#endif /* !HAS_NO_UIDS */
|