qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update to libSM 1.2.1

Browse Source
This commit is contained in:
matthieu 2012-03-04 19:03:26 +00:00
parent 5995f36226
commit ca91a8b3ac
30 changed files with 35972 additions and 21674 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/libSM/COPYING
View File

@ -1,3 +1,25 @@
Copyright (c) 2002, 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.
Copyright 1993, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its

834
lib/libSM/ChangeLog
View File

@ -1,3 +1,837 @@
commit b3d1f4896cab54717acd691b62b7fa3122a5fd8c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Mar 2 20:53:41 2012 -0800
libSM 1.2.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 6475d9eff0bfbb6446eff205fd52c5ba82c5819c
Author: Matt Dew <marcoz@osource.org>
Date: Wed Jan 11 20:33:41 2012 -0700
informaltable cleanup
On certain tables, add top and bottom borders to table
header and a bottom border to the table. This matches
what those tables in the old pdfs looked like.
the <?dbfo keep-together='always'> prevents tables from
splitting across pages. Useful for tiny tables.
Converting the colwidth to a floating point,
IE, 1* -> 1.0* cleans up these build errors:
WARNING: table-layout="fixed" and column-width unspecified
=> falling back to proportional-column-width(1)
Signed-off-by: Matt Dew <marcoz@osource.org>
commit 3ca545c7835b71b63f8c5a8f758b08418a65a5bb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 5 20:04:51 2011 -0800
unifdef -ULynx
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: James Cloos <cloos@jhcloos.com>
commit 4af9e4a71f7c07da86ef1940cba69e92b11ba337
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 19 11:33:30 2011 -0800
SmsInitialize: Mark vendor & release args as const char *
Needed to fix gcc -Wwrite-strings arguments in callers such as xsm.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: James Cloos <cloos@jhcloos.com>
commit e77dd2e4bc8227ebdab70b4233cb33ed690fa264
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 19 10:33:15 2011 -0800
Remove a bunch of unnecessary casts with malloc & free calls
With modern compilers and headers, they cause more problems than they
solve and just hide real issues.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: James Cloos <cloos@jhcloos.com>
commit 46f3ef4460aa2c1c2cba22897694a1cea572d506
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 19 10:23:24 2011 -0800
Replace malloc(strlen) + strcpy sets with strdup calls
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: James Cloos <cloos@jhcloos.com>
commit fb3ef5844d392f70cc6bd9b0d8770ca17bde1428
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 19 10:13:02 2011 -0800
Reindent IPv4 code to match IPv6 code
Takes care of the other block of code confusingly sharing indent levels
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: James Cloos <cloos@jhcloos.com>
commit 638496507882f0afe506fe294f68ad5290ef95db
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 19 10:07:32 2011 -0800
Move variable declarations to get rid of unnecessary scope brackets
Gets rid of one of the multiple levels of bracketing that confusingly
shared the same indent level.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: James Cloos <cloos@jhcloos.com>
commit 9f350d75a4553d8e2bc365f8de4110bb79ec7b32
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 19 10:01:50 2011 -0800
Move and rename temp[4] definition to reduce confusion with temp[256]
Both variables were locals in different scope levels of the same
function, leading to both confusing code and gcc -Wshadow warnings:
sm_genid.c: In function 'SmsGenerateClientID':
sm_genid.c:160:10: warning: declaration of 'temp' shadows a previous local
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: James Cloos <cloos@jhcloos.com>
commit 079de6fd4bd0423e20e472d7342f919eebce0517
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 19 09:52:17 2011 -0800
Use imdent to make multiple levels of nested #if easier to follow
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: James Cloos <cloos@jhcloos.com>
commit 79c785adf86ef06f09910b68019bc8a1e6fcb122
Author: Matt Dew <marcoz@osource.org>
Date: Tue Oct 4 22:42:05 2011 -0600
Cleanup IDs and links in doc
1 - fix the capitalization of the ID attributes to match either the
<title> or <funcdef> string it goes with.
2 - fix any <linkend>'s that were affected by 1.
3 - any <function> in the docs that has an actual funcdef,
will become an olink.
Signed-off-by: Matt Dew <marcoz@osource.org>
commit 4708d636de50281ab2c52c32b81b7ecb67657820
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Sep 16 22:03:00 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 44eecd93986368e71c404d8faa264a514bf88ab1
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Sep 14 14:59:27 2011 -0400
docs: fix author affiliation
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 7ed7ef36b7e1fdd29554db122e4eb07323e27dee
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Sep 12 16:54:45 2011 -0400
docs: use the &fullrelvers; entity to set X11 release information
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 7601182a252b44d0b04435f1eb4d574dfcf5fabb
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Sep 11 19:49:53 2011 -0400
docs: remove <productnumber> which is not used by default
This element is not rendered by default on the title. A template
customization is required to display it.
X Window System does not have a product number.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit cbca5fad657122d1a9f370d0640acb66ef80aaef
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Sep 8 20:00:00 2011 -0400
docbook.am: embed css styles inside the HTML HEAD element
Rather than referring to the external xorg.css stylesheet, embed the content
of the file in the html output produced. This is accomplished by using
version 1.10 of xorg-xhtml.xsl.
This makes the whole html docs tree much more relocatable.
In addition, it eliminates xorg.css as a runtime file which makes
xorg-sgml-doctools a build time only package.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit b88a9949fa6e1b12348541c6293535cc7ff931f4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Sep 7 10:31:04 2011 -0400
docbook.am: global maintenance update - entities, images and olinking
Adding support in libX11 for html chunking caused a reorg of docbook.am
as well as the xorg-sgml-doctools masterdb for olinking.
The parameter img.src.path is added for pdf images.
A searchpath to the root builddir is added for local entities, if present.
The docbook.am makefile hides all the details and is identical for
all 22 modules having DocBook documentation. It is included by a thin
Makefile.am which requires no docbook knowledge.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 64e002e55555205fdcdb9e6d78d6eadd4136cb7a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 12 17:54:50 2011 -0400
Install xml versions of specs even if HAVE_XMLTO is false
DocBook/XML input source is also a usefull output format that can be viewed
with an XML viewer or editor and by some O/S help system.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit bef231eefedae448255b705aa2f687f49e371b71
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 5 16:27:36 2011 -0400
Install target dbs alongside generated documents
This matches a change in xorg-sgml-docs whereby the masterdb will look for
the target dbs into the same location as the generated documents.
The target dbs are now installed alongside the generated documents.
Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which
has the potential of installing outside the package prefix and cause
distcheck to fail when user does not have write permission in this package.
Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11
commit f7473da7b1ff6a5295a145f808c327e655e574a9
Author: Matt Dew <marcoz@osource.org>
Date: Wed May 25 23:46:36 2011 -0600
add id attributes to funcsynopsis to allow other docs to olink to them.
Signed-off-by: Matt Dew <marcoz@osource.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit 8683bdd74d3e40c7db92efd25acf345f6331b252
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Feb 27 15:06:18 2011 -0500
Documentation: add Docbook external references support
When writing technical documentation, it is often necessary to cross
reference to other information. When that other information is not in the
current document, additional support is needed, namely <olink>.
A new feature with version 1.7 of xorg-sgml-doctools adds references to
other documents within or outside this package.
This patch adds technical support for this feature but does not change
the content of the documentation as seen by the end user.
Each book or article must generate a database containing the href
of sections that can be referred to from another document. This database
is installed in DATAROOTDIR/sgml/X11/dbs. There is a requirement that
the value of DATAROOTDIR for xorg-sgml-doctools and for the package
documentation is the same. This forms a virtual document tree.
This database is consulted by other documents while they are being generated
in order to fulfill the missing information for linking.
Refer to the xorg-sgml-doctools for further technical information.
Co-authored-by: Matt Dew <marcoz@osource.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 252f6d2add7c926cdcf0cea43da04f182720b0b4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Feb 25 09:04:45 2011 -0500
Docbook: change the book id to match the xml file basename
This is required for the up-coming external references support.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 2cd30c36c080217c20addf311510881c8eecf374
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Feb 2 19:25:52 2011 -0500
config: splitting SM and XTRANS compiler options is not required
Simplify configuration by using a single PKG_CHECK_MODULES statement.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 3c923881f415651d75434efd209003d602253437
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Feb 2 11:43:40 2011 -0500
config: comment, minor upgrade, quote and layout configure.ac
Group statements per section as per Autoconf standard layout
Quote statements where appropriate.
Autoconf recommends not using dnl instead of # for comments
Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit b29f5c9f3a728c5b7673cf54ad60d988b5dd93e7
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jan 27 22:05:40 2011 -0800
Bug 33390 - sm.pc: don't export a dependency on ice
https://bugs.freedesktop.org/show_bug.cgi?id=33390
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit fe43b6de5bb4423ce99d2df1ab37ea8ece39a9fa
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 28 16:07:07 2011 -0500
config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
This silences an Automake warning.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 57b6f700378a001e1aff9b83f6cb396c7c4a7368
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 28 14:59:04 2011 -0500
config: remove unrequired AC_HEADER_STDC
Autoconf says:
"This macro is obsolescent, as current systems have conforming
header files. New programs need not use this macro".
commit 8f9878c06e359d21715a3e4358895b589466bc46
Author: Paulo Zanoni <pzanoni@mandriva.com>
Date: Thu Dec 16 14:03:06 2010 -0200
Use docbookx.dtd version 4.3 for all docs
Signed-off-by: Paulo Zanoni <pzanoni@mandriva.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 6d093e2397ecdbbba044fe7ef2fd922c8c8261de
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Nov 21 11:19:45 2010 -0800
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Regroup AC statements under the Autoconf initialization section.
Regroup AM statements under the Automake initialization section.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit b8ef6cea0ccae4d88a9cb91cd836188ae781cda8
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Nov 21 11:17:25 2010 -0800
config: Remove unnecessary calls from configure.ac
AC_PROG_CC are provided by XORG_DEFAULT_OPTIONS now
PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 15dc32dd7b57315f9e319f3e346ba28a1e69c646
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Nov 21 11:16:14 2010 -0800
Sun's copyrights belong to Oracle now
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 8480764c94d15673c884b90c7a10bc86635dec63
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Nov 9 13:04:40 2010 -0500
config: HTML file generation: use the installed copy of xorg.css
Currenlty the xorg.css file is copied in each location
where a DocBook/XML file resides. This produces about
70 copies in the $(docdir) install tree.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit d2327760a52fdbcd3759211578e3663e00e4a31e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Oct 27 22:26:41 2010 -0700
libSM 1.2.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 784a330e337af16c1e385d0fbeee1e5369413656
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Oct 24 20:31:54 2010 -0700
SMlib.xml: Use <simplelist> instead of <synopsis> for lists of mask values
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 12af18dd9a731a816e7b074bbecaa5549bfdba31
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Oct 24 19:57:32 2010 -0700
SMlib.xml: Tag function names, parameters, constant values, etc.
Includes correcting <function> tags on things that aren't functions
as some stylesheets may add () after <function> tagged items so we
shouldn't use them for constants, variables, filenames, etc.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit ed9331e10babdd70da51134f0eaee8625a469ffe
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Oct 24 18:54:05 2010 -0700
SMlib.xml: Line wrapping & other whitespace cleanup
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 763b01e8e69d6132b3b4b57263f19de9de985f99
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 23 00:47:27 2010 -0700
xsmp.xml: add internal cross-reference links
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 506af19b86af2a7960a3bb5cf72287349012c869
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 23 00:43:28 2010 -0700
xsmp.xml: Use <synopsis> and related markup for protocol message definition
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 75443d72b4944391b809f429cc4cef2ffb76f7bf
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 23 00:10:01 2010 -0700
xsmp.xml: Use <errorname> instead of <function> for error names
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 2ed7704e7d4b0086edc8667a80780c6c51ba84cb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 22 23:52:15 2010 -0700
xsmp.xml: Restore note titles (example/rationale/advice)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 489566ca0e69ed6068fb4bdbaccd413ec2ee8319
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 22 23:39:54 2010 -0700
xsmp.xml: Clean up tables
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit c5b211d9a01438958546669f95a5215784348534
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 22 08:44:46 2010 -0700
xsmp.xml: Misc markup tag cleanups
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit a18973e643b0916a2f4bf6fb8fc29508429635bb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 22 08:34:49 2010 -0700
Coalesce copyright notices in xml docs
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit e3f357dbd39036766765e1de110a876adc2f8226
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 22 08:32:04 2010 -0700
xsmp.xml: Convert -> & <- to &rarr; & &larr;
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 29e2ac62cb6a152499d1b3f9fe871b1252f3c22f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 22 08:21:27 2010 -0700
xsmp.xml: Line wrapping & other whitespace cleanup
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit c83363e83a937ba2ddd99e732bfde5f8d39bd648
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 21 23:48:42 2010 -0700
SMlib.xml: fix a couple parameter list entries
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 862e2b220bc928d6ab2f3bb6159bc4be03914979
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 21 23:43:49 2010 -0700
SMlib.xml: misc markup cleanups
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 0b15c3773db651863dc8374d45095bc5aa53d41d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 21 23:16:14 2010 -0700
SMlib.xml: fix typo: SmProc -> SmProp
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit cd4739acb0c6d1bca2d3a7adc5c52324928a5561
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 21 22:55:04 2010 -0700
SMlib.xml: add internal cross-reference links
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 33a86926ae3a7ddcea817eda8c4b1aac7c518d10
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 21 16:31:08 2010 -0700
SMlib.xml: Convert remaining `` quotes to &ldquo; style
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 5abbdcde8a9ed3e489e2f9e5b9161dc9ebc5801f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 21 16:29:21 2010 -0700
SMlib.xml: Convert remaining literallayout tags to synopsis tags
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 62bc296fefd0465c1f3eef283f3bf0a43d132ef9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 21 16:17:09 2010 -0700
SMlib.xml: Convert function prototypes to <funcprototype> tags
Provides automatic ansifaction & better formatted output
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit ee77c1932c0cd2050371117c3724d66072cbdbee
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 21 15:43:33 2010 -0700
SMlib.xml: Remove some nroff macros left in tables by mistake
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 24e9d8a2a35452c67ba2e2e34857ce3691d9a22d
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:30:02 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit e0be9c9dfb60f21edb37ff77d766395aa57a96e4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 27 20:31:28 2010 -0400
doc: remove trailing spaces in DocBook XML docs
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 8c42c25b90b10b2c5f20c93ebd9cf1df622b009f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jun 25 21:43:08 2010 -0400
doc: replace groff input format with docbook xml format
Initial version of SMlib and xsmp docbook xml.
Requires util-macros 1.10
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit fd37bd0ac012e15bffad7e83d36b87ee3941d6f5
Author: Alexander Kabaev <kan@FreeBSD.org>
Date: Wed May 26 13:28:03 2010 -0400
Fix off by one error in SmsGenerateClientID when uuid_create is used
Fix apparent typo in SmsGenerateClientID which always leaves the
first byte of allocated id string uninitialized. If that byte
happens to be 0, SmsGenerateClientId appears to return an empty
string to the caller, instead of proper GUID in text form.
Reviewed-by: James CLoos <cloos@jhcloos.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit af7364c20d91615251b1ec2b19e0cb38e9094ba0
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Apr 22 07:42:30 2010 -0700
Update README now that docs are in this module, not xorg-docs
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 7464514f60ff7754e5c1e91d6913000fb5d366c9
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 14:53:48 2010 -0400
config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 39f4ed794168c824015754e451b4b191fddad643
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Feb 16 19:57:27 2010 -0500
doc: use HAVE_GROFF_MS to skip doc when 's.tmac' macros missing
This conditional is defined in XORG_WITH_GROFF macro.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 64f201ae65de7024bce0a85d6380ac158a3b5852
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Feb 16 14:41:22 2010 -0500
specs: change install cmd due to automake 1.11
docData_INSTALL is defined in 1.9 and 1.10 but not 1.11
Reported-by: Tobias Droste <tdroste@gmx.de>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 98f205119011c016ec902c69d882a26dd7185a43
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Feb 9 17:39:46 2010 -0500
doc: use $(mkdir_p) rather than $(MKDIR_P) due to automake 1.9.6
$(MKDIR_P) is not defined in automake 1.9.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit c22a324b4c1e1ac38b1c04656ecdcf9127343e8d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Feb 1 14:58:21 2010 -0500
doc: install generated images in $docdir
The html installed doc is incomplete without the generated images.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 844a1de311492a7666c60f39c6cbe23a5c3f22da
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Jan 30 14:11:36 2010 -0500
doc: use new macros to control doc generation
Namely XORG_WITH_GROFF for the groff generation tool
XORG_ENABLE_DOCS for the generation of all docs
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 626788435d4a49eeea9fa2382f7ec554a0b92197
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jan 26 16:32:00 2010 -0500
doc: clean-up generated html images
Generate images in /images as is the convention
Provide a base file name for images rather than process ID
Remove images directory when running make clean
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit b5af7f362e30b1bbde4eef4216385ae2b2ea1bee
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 14 21:00:53 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 0b2e5ca9da6b35f5cf98ac879601cf8083c72dde
Author: Rémi Cardona <remi@gentoo.org>
Date: Thu Dec 17 08:26:28 2009 +0100
require autoconf 2.60 because of $(docdir) use
Signed-off-by: Rémi Cardona <remi@gentoo.org>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 7f92faa03910bf74fbebefb5d543c09958fb3b28
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Nov 27 20:56:03 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
commit 802f5e2a67ef3d214a0560c36985f8fed3ab92f1
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Nov 11 18:56:57 2009 -0500
Update .gitignore for the /doc directory #24239
commit 7309ebe123d05955d81318bca5c58ee90b9887dd
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:10 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
commit 2fb04f8726ddf8ad0749a6b733ab87c5e1bc06dc
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 22:08:41 2009 -0400
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
ChangeLog filename is known to Automake and requires no further
coding in the makefile.
commit e88afa3327621f8eb00d920c45536e08b7bc1898
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 12:34:18 2009 -0400
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
commit d4e3653ff1eed208ea6f35158ad03da7729622b9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Nov 16 14:57:19 2009 -0800
Revert "Fix memory leak for SM_DeleteProperties"
This reverts commit 58aa8879e10b12e478ab14b90afd1001b4abd316.
Fixes gnome-session crashes due to double frees, as reported in
http://bugs.freedesktop.org/show_bug.cgi?id=24964
commit 41d5bb13119b36a7ce6a344372df1b788994e2c7
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 21 12:47:23 2009 -0700
This is not a GNU project, so declare it foreign.
On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
> On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
> > I noticed an INSTALL file in xlsclients and libXvMC today, and it
> > was quite annoying to work around since 'autoreconf -fvi' replaces
> > it and git wants to commit it. Should these files even be in git?
> > Can I nuke them for the betterment of humanity and since they get
> > created by autoreconf anyways?
>
> See https://bugs.freedesktop.org/show_bug.cgi?id=24206
As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
of the INSTALL file. It is also part of the 24206 solution.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 58aa8879e10b12e478ab14b90afd1001b4abd316
Author: Michael Jansen <kde@michael-jansen.biz>
Date: Wed Oct 14 11:01:46 2009 -0700
Fix memory leak for SM_DeleteProperties
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 6d43663bf01e055cfe713dccac39b651a0ccfacf
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sat Oct 10 00:37:41 2009 -0700
Move session management protocol docs from xorg-docs here too
Since we don't have a smproto package, but ship the protocol headers
in this module, might as well keep the protocol docs with the headers
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit b1363f9fa47e1564aa5e4fe822bd6a04b5a44954
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sat Oct 10 00:02:04 2009 -0700
Move docs from xorg-docs, use groff to format for installation
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit c8e29f4a18041c7a649f701a7cfdd37080d7c6f6
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 9 23:28:11 2009 -0700
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 7fc343e70202279fd3daa3adf789ca35b0ec8891
Author: Rémi Cardona <remi@gentoo.org>
Date: Fri Aug 14 11:20:34 2009 +0200
require libICE >= 1.0.5
During the ansification (commit 896aeb5dd128), 2 extern decls for
_IcePaMagicCookie1Proc and _IcePoMagicCookie1Proc were dropped from
sm_client.c and sm_manager.c. Both decls were added between libICE 1.0.4
and 1.0.5.
Signed-off-by: Rémi Cardona <remi@gentoo.org>
commit 82bbf42a2ba0401a8346505b1292ddb7b58f4507
Author: Rémi Cardona <remi@gentoo.org>
Date: Fri Aug 7 14:19:50 2009 +0200

143
lib/libSM/INSTALL
View File

@ -1,16 +1,19 @@
Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
Software Foundation, Inc.
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006, 2007, 2008 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
These are generic installation instructions.
Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@ -23,9 +26,9 @@ debugging `configure').
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
the results of its tests to speed up reconfiguring. (Caching is
the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
cache files.)
cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@ -35,20 +38,17 @@ some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You only need
`configure.ac' if you want to change it or regenerate `configure' using
a newer version of `autoconf'.
`configure' by a program called `autoconf'. You need `configure.ac' if
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system. If you're
using `csh' on an old version of System V, you might need to type
`sh ./configure' instead to prevent `csh' from trying to execute
`configure' itself.
`./configure' to configure the package for your system.
Running `configure' takes awhile. While running, it prints some
messages telling which features it is checking for.
Running `configure' might take a while. While running, it prints
some messages telling which features it is checking for.
2. Type `make' to compile the package.
@ -67,42 +67,57 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came
with the distribution.
6. Often, you can also type `make uninstall' to remove the installed
files again.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that the
`configure' script does not know about. Run `./configure --help' for
details on some of the pertinent environment variables.
Some systems require unusual options for compilation or linking that
the `configure' script does not know about. Run `./configure --help'
for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
If you have to use a `make' that does not support the `VPATH'
variable, you have to compile the package for one architecture at a
time in the source code directory. After you have installed the
package for one architecture, use `make distclean' before reconfiguring
for another architecture.
With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
On MacOS X 10.5 and later systems, you can create libraries and
executables that work on multiple system types--known as "fat" or
"universal" binaries--by specifying multiple `-arch' options to the
compiler but only a single `-arch' option to the preprocessor. Like
this:
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
CPP="gcc -E" CXXCPP="g++ -E"
This is not guaranteed to produce working output in all cases, you
may have to build one architecture at a time and combine the results
using the `lipo' tool if you have problems.
Installation Names
==================
By default, `make install' installs the package's commands under
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
@ -125,7 +140,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Some packages pay attention to `--enable-FEATURE' options to
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@ -137,14 +152,36 @@ find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Particular systems
==================
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
CC is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
./configure CC="cc -Ae"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
to try
./configure CC="cc"
and if that doesn't work, try
./configure CC="cc -nodtk"
Specifying the System Type
==========================
There may be some features `configure' cannot figure out automatically,
but needs to determine by the type of machine the package will run on.
Usually, assuming the package is built to be run on the _same_
architectures, `configure' can figure that out, but if it prints a
message saying it cannot guess the machine type, give it the
There may be some features `configure' cannot figure out
automatically, but needs to determine by the type of machine the package
will run on. Usually, assuming the package is built to be run on the
_same_ architectures, `configure' can figure that out, but if it prints
a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@ -170,9 +207,9 @@ eventually be run) with `--host=TYPE'.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share, you
can create a site shell script called `config.site' that gives default
values for variables like `CC', `cache_file', and `prefix'.
If you want to set default values for `configure' scripts to share,
you can create a site shell script called `config.site' that gives
default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@ -181,7 +218,7 @@ A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@ -190,21 +227,29 @@ them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script). Here is a another example:
overridden in the site shell script).
/bin/bash ./configure CONFIG_SHELL=/bin/bash
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
an Autoconf bug. Until the bug is fixed you can use this workaround:
Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
configuration-related scripts to be executed by `/bin/bash'.
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
`configure' recognizes the following options to control how it operates.
`configure' recognizes the following options to control how it
operates.
`--help'
`-h'
Print a summary of the options to `configure', and exit.
Print a summary of all of the options to `configure', and exit.
`--help=short'
`--help=recursive'
Print a summary of the options unique to this package's
`configure', and exit. The `short' variant lists options used
only in the top level, while the `recursive' variant lists options
also present in any nested packages.
`--version'
`-V'
@ -231,6 +276,16 @@ configuration-related scripts to be executed by `/bin/bash'.
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`--prefix=DIR'
Use DIR as the installation prefix. *Note Installation Names::
for more details, including other options available for fine-tuning
the installation locations.
`--no-create'
`-n'
Run the configure checks, but stop before creating any output
files.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.

12
lib/libSM/Makefile.am
View File

@ -1,14 +1,16 @@
SUBDIRS=src
SUBDIRS=src doc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = sm.pc
EXTRA_DIST = sm.pc.in ChangeLog
MAINTAINERCLEANFILES = ChangeLog
MAINTAINERCLEANFILES = ChangeLog INSTALL
.PHONY: ChangeLog
.PHONY: ChangeLog INSTALL
INSTALL:
$(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog
dist-hook: ChangeLog INSTALL

89
lib/libSM/Makefile.in
View File

@ -23,9 +23,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
@ -80,15 +80,22 @@ am__remove_distdir = \
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@ -96,41 +103,67 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@
ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
FOP = @FOP@
GREP = @GREP@
HAVE_FOP_FALSE = @HAVE_FOP_FALSE@
HAVE_FOP_TRUE = @HAVE_FOP_TRUE@
HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@
HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@
HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@
HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBUUID_CFLAGS = @LIBUUID_CFLAGS@
LIBUUID_LIBS = @LIBUUID_LIBS@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -145,19 +178,22 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SM_CFLAGS = @SM_CFLAGS@
SM_LIBS = @SM_LIBS@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
VERSION = @VERSION@
WITH_LIBUUID_FALSE = @WITH_LIBUUID_FALSE@
WITH_LIBUUID_TRUE = @WITH_LIBUUID_TRUE@
XTRANS_CFLAGS = @XTRANS_CFLAGS@
XTRANS_LIBS = @XTRANS_LIBS@
XMLTO = @XMLTO@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
XORG_SGML_PATH = @XORG_SGML_PATH@
XSLTPROC = @XSLTPROC@
XSL_STYLESHEET = @XSL_STYLESHEET@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -171,7 +207,6 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@ -199,11 +234,10 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
SUBDIRS = src
SUBDIRS = src doc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = sm.pc
EXTRA_DIST = sm.pc.in ChangeLog
MAINTAINERCLEANFILES = ChangeLog
MAINTAINERCLEANFILES = ChangeLog INSTALL
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@ -214,15 +248,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
cd $(srcdir) && $(AUTOMAKE) --gnu \
echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
cd $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
$(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@ -668,12 +702,15 @@ uninstall-info: uninstall-info-recursive
uninstall-pkgconfigDATA
.PHONY: ChangeLog
.PHONY: ChangeLog INSTALL
INSTALL:
$(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog
dist-hook: ChangeLog INSTALL
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

5
lib/libSM/README
View File

@ -1,10 +1,5 @@
libSM - X Session Management Library
Documentation for this API can be found in the SMlib document in the
doc/xorg-docs module of the X distribution, also available online at:
http://xorg.freedesktop.org/releases/X11R7.0/doc/PDF/SMlib.pdf
All questions regarding this software should be directed at the
Xorg mailing list:

11489
lib/libSM/aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

4
lib/libSM/config.h.in
View File

@ -48,6 +48,10 @@
/* Support os-specific local connections */
#undef LOCALCONN
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
/* Name of package */
#undef PACKAGE

28087
lib/libSM/configure vendored
View File

File diff suppressed because it is too large Load Diff

63
lib/libSM/configure.ac
View File

@ -1,46 +1,36 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
AC_INIT([libSM],
1.1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libSM)
# Initialize Autoconf
AC_PREREQ(2.60)
AC_INIT([libSM], [1.2.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libSM])
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2])
AC_CONFIG_HEADERS([config.h])
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.2)
AM_CONFIG_HEADER([config.h])
# Checks for programs.
# Initialize libtool
AC_PROG_LIBTOOL
AC_PROG_CC
XORG_CWARNFLAGS
# Checks for pkg-config packages
PKG_CHECK_MODULES(SM, ice xproto)
SM_CFLAGS="$CWARNFLAGS $SM_CFLAGS"
AC_SUBST(SM_CFLAGS)
AC_SUBST(SM_LIBS)
# Require xorg-macros minimum of 1.12 for DocBook external references
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.12)
XORG_DEFAULT_OPTIONS
XORG_ENABLE_DOCS
XORG_WITH_XMLTO(0.0.22)
XORG_WITH_FOP
XORG_WITH_XSLTPROC
XORG_CHECK_SGML_DOCTOOLS(1.8)
PKG_CHECK_MODULES(XTRANS, xtrans)
AC_SUBST(XTRANS_CFLAGS)
AC_SUBST(XTRANS_LIBS)
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(SM, [ice >= 1.0.5] xproto xtrans)
# Needed to check for TCP & IPv6 support and set flags appropriately
XTRANS_CONNECTION_FLAGS
AC_ARG_WITH(libuuid, AC_HELP_STRING([--with-libuuid], [Build with libuuid support for client IDs]))
AC_ARG_WITH(libuuid, AS_HELP_STRING([--with-libuuid], [Build with libuuid support for client IDs]))
AC_CHECK_FUNCS([uuid_create], [], [
if test x"$with_libuuid" != xno && test x"$have_system_uuid" != xyes; then
@ -53,9 +43,8 @@ AC_CHECK_FUNCS([uuid_create], [], [
AM_CONDITIONAL(WITH_LIBUUID, test x"$HAVE_LIBUUID" = xyes)
XORG_RELEASE_VERSION
XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
sm.pc])
AC_CONFIG_FILES([Makefile
doc/Makefile
src/Makefile
sm.pc])
AC_OUTPUT

13
lib/libSM/doc/Makefile.am Normal file
View File

@ -0,0 +1,13 @@
if ENABLE_DOCS
# Main DocBook/XML files (DOCTYPE book)
docbook = SMlib.xml xsmp.xml
# The location where the DocBook/XML files and their generated formats are installed
shelfdir = $(docdir)
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
endif ENABLE_DOCS

518
lib/libSM/doc/Makefile.in Normal file
View File

@ -0,0 +1,518 @@
# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@SET_MAKE@
#
# Generate output formats for a single DocBook/XML with/without chapters
#
# Variables set by the calling Makefile:
# shelfdir: the location where the docs/specs are installed. Typically $(docdir)
# docbook: the main DocBook/XML file, no chapters, appendix or image files
# chapters: all files pulled in by an XInclude statement and images.
#
#
# This makefile is intended for Users Documentation and Functional Specifications.
# Do not use for Developer Documentation which is not installed and does not require olink.
# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393
# for an explanation on documents classification.
#
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(top_srcdir)/docbook.am
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html)
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt)
@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.pdf) \
@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.ps)
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(docbook:.xml=.pdf.db)
subdir = doc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
am__dist_shelf_DATA_DIST = SMlib.xml xsmp.xml
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"
dist_shelfDATA_INSTALL = $(INSTALL_DATA)
shelfDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_shelf_DATA) $(shelf_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@
ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
FOP = @FOP@
GREP = @GREP@
HAVE_FOP_FALSE = @HAVE_FOP_FALSE@
HAVE_FOP_TRUE = @HAVE_FOP_TRUE@
HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@
HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@
HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@
HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBUUID_CFLAGS = @LIBUUID_CFLAGS@
LIBUUID_LIBS = @LIBUUID_LIBS@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SM_CFLAGS = @SM_CFLAGS@
SM_LIBS = @SM_LIBS@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
VERSION = @VERSION@
WITH_LIBUUID_FALSE = @WITH_LIBUUID_FALSE@
WITH_LIBUUID_TRUE = @WITH_LIBUUID_TRUE@
XMLTO = @XMLTO@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
XORG_SGML_PATH = @XORG_SGML_PATH@
XSLTPROC = @XSLTPROC@
XSL_STYLESHEET = @XSL_STYLESHEET@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
# Main DocBook/XML files (DOCTYPE book)
@ENABLE_DOCS_TRUE@docbook = SMlib.xml xsmp.xml
# The location where the DocBook/XML files and their generated formats are installed
@ENABLE_DOCS_TRUE@shelfdir = $(docdir)
# DocBook/XML generated output formats to be installed
@ENABLE_DOCS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \
@ENABLE_DOCS_TRUE@ $(am__append_3) $(am__append_4)
# DocBook/XML file with chapters, appendix and images it includes
@ENABLE_DOCS_TRUE@dist_shelf_DATA = $(docbook) $(chapters)
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_SEARCHPATH_FLAGS = \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(XORG_SGML_PATH)/X11" \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --searchpath "$(abs_top_builddir)"
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_OLINK_FLAGS = \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)"
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_HTML_FLAGS = \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_STYLESHEET_FLAGS) \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_HTML_OLINK_FLAGS)
@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/
@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_PDF_OLINK_FLAGS = \
@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \
@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam current.docid="$(<:.xml=)"
@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@XMLTO_FO_FLAGS = \
@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_SEARCHPATH_FLAGS) \
@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_STYLESHEET_FLAGS) \
@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_FO_IMAGEPATH_FLAGS) \
@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(XMLTO_PDF_OLINK_FLAGS)
# Generate documents cross-reference target databases
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_SEARCHPATH_FLAGS = \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(XORG_SGML_PATH)/X11" \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --path "$(abs_top_builddir)"
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_OLINK_FLAGS = \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam targets.filename "$@" \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam olink.base.uri "$(@:.db=)"
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_HTML_FLAGS = \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLT_PDF_FLAGS = \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_SEARCHPATH_FLAGS) \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(XSLT_OLINK_FLAGS) \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude \
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(STYLESHEET_SRCDIR)/xorg-fo.xsl
@ENABLE_DOCS_TRUE@CLEANFILES = $(shelf_DATA)
all: all-am
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docbook.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
&& exit 0; \
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --foreign doc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
distclean-libtool:
-rm -f libtool
uninstall-info-am:
install-dist_shelfDATA: $(dist_shelf_DATA)
@$(NORMAL_INSTALL)
test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)"
@list='$(dist_shelf_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(dist_shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \
$(dist_shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \
done
uninstall-dist_shelfDATA:
@$(NORMAL_UNINSTALL)
@list='$(dist_shelf_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \
rm -f "$(DESTDIR)$(shelfdir)/$$f"; \
done
install-shelfDATA: $(shelf_DATA)
@$(NORMAL_INSTALL)
test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)"
@list='$(shelf_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(shelfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(shelfdir)/$$f'"; \
$(shelfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(shelfdir)/$$f"; \
done
uninstall-shelfDATA:
@$(NORMAL_UNINSTALL)
@list='$(shelf_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \
rm -f "$(DESTDIR)$(shelfdir)/$$f"; \
done
tags: TAGS
TAGS:
ctags: CTAGS
CTAGS:
distdir: $(DISTFILES)
$(mkdir_p) $(distdir)/..
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
$(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
if test -d $$d/$$file; then \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-rm -f Makefile
distclean-am: clean-am distclean-generic distclean-libtool
dvi: dvi-am
dvi-am:
html: html-am
info: info-am
info-am:
install-data-am: install-dist_shelfDATA install-shelfDATA
install-exec-am:
install-info: install-info-am
install-man:
installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
pdf: pdf-am
pdf-am:
ps: ps-am
ps-am:
uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \
uninstall-shelfDATA
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dist_shelfDATA \
install-exec install-exec-am install-info install-info-am \
install-man install-shelfDATA install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters)
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $<
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@%.txt: %.xml $(chapters)
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $<
@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.pdf: %.xml $(chapters)
@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $<
@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@%.ps: %.xml $(chapters)
@ENABLE_DOCS_TRUE@@HAVE_FOP_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $<
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.html.db: %.xml $(chapters)
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $<
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@%.pdf.db: %.xml $(chapters)
@ENABLE_DOCS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $<
# Generate DocBook/XML output formats with or without stylesheets
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

3230
lib/libSM/doc/SMlib.xml Normal file
View File

File diff suppressed because it is too large Load Diff

2499
lib/libSM/doc/xsmp.xml Normal file
View File

File diff suppressed because it is too large Load Diff

105
lib/libSM/docbook.am Normal file
View File

@ -0,0 +1,105 @@
#
# Generate output formats for a single DocBook/XML with/without chapters
#
# Variables set by the calling Makefile:
# shelfdir: the location where the docs/specs are installed. Typically $(docdir)
# docbook: the main DocBook/XML file, no chapters, appendix or image files
# chapters: all files pulled in by an XInclude statement and images.
#
#
# This makefile is intended for Users Documentation and Functional Specifications.
# Do not use for Developer Documentation which is not installed and does not require olink.
# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393
# for an explanation on documents classification.
#
# DocBook/XML generated output formats to be installed
shelf_DATA =
# DocBook/XML file with chapters, appendix and images it includes
dist_shelf_DATA = $(docbook) $(chapters)
if HAVE_XMLTO
if HAVE_STYLESHEETS
XMLTO_SEARCHPATH_FLAGS = \
--searchpath "$(XORG_SGML_PATH)/X11" \
--searchpath "$(abs_top_builddir)"
XMLTO_HTML_OLINK_FLAGS = \
--stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \
--stringparam current.docid="$(<:.xml=)"
XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
XMLTO_HTML_FLAGS = \
$(XMLTO_SEARCHPATH_FLAGS) \
$(XMLTO_HTML_STYLESHEET_FLAGS) \
$(XMLTO_HTML_OLINK_FLAGS)
shelf_DATA += $(docbook:.xml=.html)
%.html: %.xml $(chapters)
$(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $<
if HAVE_XMLTO_TEXT
shelf_DATA += $(docbook:.xml=.txt)
%.txt: %.xml $(chapters)
$(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $<
endif HAVE_XMLTO_TEXT
if HAVE_FOP
XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/
XMLTO_PDF_OLINK_FLAGS = \
--stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \
--stringparam current.docid="$(<:.xml=)"
XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
XMLTO_FO_FLAGS = \
$(XMLTO_SEARCHPATH_FLAGS) \
$(XMLTO_FO_STYLESHEET_FLAGS) \
$(XMLTO_FO_IMAGEPATH_FLAGS) \
$(XMLTO_PDF_OLINK_FLAGS)
shelf_DATA += $(docbook:.xml=.pdf)
%.pdf: %.xml $(chapters)
$(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $<
shelf_DATA += $(docbook:.xml=.ps)
%.ps: %.xml $(chapters)
$(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $<
endif HAVE_FOP
# Generate documents cross-reference target databases
if HAVE_XSLTPROC
XSLT_SEARCHPATH_FLAGS = \
--path "$(XORG_SGML_PATH)/X11" \
--path "$(abs_top_builddir)"
XSLT_OLINK_FLAGS = \
--stringparam targets.filename "$@" \
--stringparam collect.xref.targets "only" \
--stringparam olink.base.uri "$(@:.db=)"
XSLT_HTML_FLAGS = \
$(XSLT_SEARCHPATH_FLAGS) \
$(XSLT_OLINK_FLAGS) \
--nonet --xinclude \
$(STYLESHEET_SRCDIR)/xorg-xhtml.xsl
XSLT_PDF_FLAGS = \
$(XSLT_SEARCHPATH_FLAGS) \
$(XSLT_OLINK_FLAGS) \
--nonet --xinclude \
$(STYLESHEET_SRCDIR)/xorg-fo.xsl
shelf_DATA += $(docbook:.xml=.html.db)
%.html.db: %.xml $(chapters)
$(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $<
shelf_DATA += $(docbook:.xml=.pdf.db)
%.pdf.db: %.xml $(chapters)
$(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $<
endif HAVE_XSLTPROC
endif HAVE_STYLESHEETS
endif HAVE_XMLTO
CLEANFILES = $(shelf_DATA)

2
lib/libSM/include/X11/SM/SM.h
View File

@ -1,5 +1,3 @@
/* $Xorg: SM.h,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */
/*
Copyright 1993, 1998 The Open Group

8
lib/libSM/include/X11/SM/SMlib.h
View File

@ -1,5 +1,3 @@
/* $Xorg: SMlib.h,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */
/*
Copyright 1993, 1998 The Open Group
@ -170,7 +168,7 @@ typedef struct {
typedef Status (*SmsRegisterClientProc) (
SmsConn /* smsConn */,
SmPointer /* managerData */,
char * /* previousId */
char * /* previousId */
);
typedef void (*SmsInteractRequestProc) (
@ -447,8 +445,8 @@ extern IceConn SmcGetIceConnection (
);
extern Status SmsInitialize (
char * /* vendor */,
char * /* release */,
const char * /* vendor */,
const char * /* release */,
SmsNewClientProc /* newClientProc */,
SmPointer /* managerData */,
IceHostBasedAuthProc /* hostBasedAuthProc */,

2
lib/libSM/include/X11/SM/SMproto.h
View File

@ -1,5 +1,3 @@
/* $Xorg: SMproto.h,v 1.5 2001/02/09 02:03:30 xorgcvs Exp $ */
/*
Copyright 1993, 1998 The Open Group

10127
lib/libSM/ltmain.sh
View File

File diff suppressed because it is too large Load Diff

4
lib/libSM/sm.pc.in
View File

@ -6,7 +6,7 @@ includedir=@includedir@
Name: SM
Description: X Session Management Library
Version: @PACKAGE_VERSION@
Requires: ice xproto
Requires.private: ice
Requires:
Requires.private: ice xproto
Cflags: -I${includedir}
Libs: -L${libdir} -lSM

5
lib/libSM/src/Makefile.am
View File

@ -1,6 +1,7 @@
lib_LTLIBRARIES=libSM.la
AM_CFLAGS= -I${top_srcdir}/include $(SM_CFLAGS) $(XTRANS_CFLAGS)
AM_CPPFLAGS = -I${top_srcdir}/include
AM_CFLAGS = $(CWARNFLAGS) $(SM_CFLAGS)
if WITH_LIBUUID
AM_CFLAGS += $(LIBUUID_CFLAGS) -DHAVE_LIBUUID
@ -8,7 +9,7 @@ endif
libSM_la_LDFLAGS = -version-number 6:0:1 -no-undefined
libSM_la_LIBADD = $(SM_LIBS) $(XTRANS_LIBS)
libSM_la_LIBADD = $(SM_LIBS)
if WITH_LIBUUID
libSM_la_LIBADD += $(LIBUUID_LIBS)

81
lib/libSM/src/Makefile.in
View File

@ -24,9 +24,9 @@ pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
install_sh_PROGRAM = ${SHELL} $(install_sh) -c
install_sh_SCRIPT = ${SHELL} $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
@ -60,8 +60,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
@WITH_LIBUUID_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
libSM_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_2)
libSM_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
am_libSM_la_OBJECTS = sm_auth.lo sm_client.lo sm_error.lo sm_genid.lo \
sm_manager.lo sm_misc.lo sm_process.lo
libSM_la_OBJECTS = $(am_libSM_la_OBJECTS)
@ -84,14 +83,20 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@ -99,41 +104,67 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_DOCS_FALSE = @ENABLE_DOCS_FALSE@
ENABLE_DOCS_TRUE = @ENABLE_DOCS_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
FOP = @FOP@
GREP = @GREP@
HAVE_FOP_FALSE = @HAVE_FOP_FALSE@
HAVE_FOP_TRUE = @HAVE_FOP_TRUE@
HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@
HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@
HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
HAVE_XSLTPROC_FALSE = @HAVE_XSLTPROC_FALSE@
HAVE_XSLTPROC_TRUE = @HAVE_XSLTPROC_TRUE@
INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBUUID_CFLAGS = @LIBUUID_CFLAGS@
LIBUUID_LIBS = @LIBUUID_LIBS@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -148,19 +179,22 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SM_CFLAGS = @SM_CFLAGS@
SM_LIBS = @SM_LIBS@
STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
VERSION = @VERSION@
WITH_LIBUUID_FALSE = @WITH_LIBUUID_FALSE@
WITH_LIBUUID_TRUE = @WITH_LIBUUID_TRUE@
XTRANS_CFLAGS = @XTRANS_CFLAGS@
XTRANS_LIBS = @XTRANS_LIBS@
XMLTO = @XMLTO@
XORG_MAN_PAGE = @XORG_MAN_PAGE@
XORG_SGML_PATH = @XORG_SGML_PATH@
XSLTPROC = @XSLTPROC@
XSL_STYLESHEET = @XSL_STYLESHEET@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -174,7 +208,6 @@ build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@ -203,10 +236,10 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
lib_LTLIBRARIES = libSM.la
AM_CFLAGS = -I${top_srcdir}/include $(SM_CFLAGS) $(XTRANS_CFLAGS) \
$(am__append_1)
AM_CPPFLAGS = -I${top_srcdir}/include
AM_CFLAGS = $(CWARNFLAGS) $(SM_CFLAGS) $(am__append_1)
libSM_la_LDFLAGS = -version-number 6:0:1 -no-undefined
libSM_la_LIBADD = $(SM_LIBS) $(XTRANS_LIBS) $(am__append_2)
libSM_la_LIBADD = $(SM_LIBS) $(am__append_2)
libSM_la_SOURCES = \
SMlibint.h \
sm_auth.c \
@ -236,9 +269,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu src/Makefile
$(AUTOMAKE) --foreign src/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \

13
lib/libSM/src/SMlibint.h
View File

@ -1,5 +1,3 @@
/* $Xorg: SMlibint.h,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */
/*
Copyright 1993, 1998 The Open Group
@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/lib/SM/SMlibint.h,v 1.3 2001/07/29 05:01:11 tsi Exp $ */
/*
* Author: Ralph Mor, X Consortium
@ -239,7 +236,7 @@ in this Software without prior written authorization from The Open Group.
#define EXTRACT_ARRAY8(_pBuf, _swap, _len, _array8) \
{ \
EXTRACT_CARD32 (_pBuf, _swap, _len); \
_array8 = (char *) malloc (_len + 1); \
_array8 = malloc (_len + 1); \
memcpy (_array8, _pBuf, _len); \
_array8[_len] = '\0'; \
_pBuf += _len + PAD64 (4 + _len); \
@ -249,7 +246,7 @@ in this Software without prior written authorization from The Open Group.
{ \
CARD32 _len; \
EXTRACT_CARD32 (_pBuf, _swap, _len); \
_string = (char *) malloc (_len + 1); \
_string = malloc (_len + 1); \
memcpy (_string, _pBuf, _len); \
_string[_len] = '\0'; \
_pBuf += _len + PAD64 (4 + _len); \
@ -260,15 +257,15 @@ in this Software without prior written authorization from The Open Group.
int _i, _j; \
EXTRACT_CARD32 (_pBuf, _swap, _count); \
_pBuf += 4; \
_props = (SmProp **) malloc (_count * sizeof (SmProp *)); \
_props = malloc (_count * sizeof (SmProp *)); \
for (_i = 0; _i < _count; _i++) \
{ \
_props[_i] = (SmProp *) malloc (sizeof (SmProp)); \
_props[_i] = malloc (sizeof (SmProp)); \
EXTRACT_ARRAY8_AS_STRING (_pBuf, _swap, _props[_i]->name); \
EXTRACT_ARRAY8_AS_STRING (_pBuf, _swap, _props[_i]->type); \
EXTRACT_CARD32 (_pBuf, _swap, _props[_i]->num_vals); \
_pBuf += 4; \
_props[_i]->vals = (SmPropValue *) malloc ( \
_props[_i]->vals = malloc ( \
_props[_i]->num_vals * sizeof (SmPropValue)); \
for (_j = 0; _j < _props[_i]->num_vals; _j++) \
{ \

3
lib/libSM/src/sm_auth.c
View File

@ -1,5 +1,3 @@
/* $Xorg: sm_auth.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */
/*
Copyright 1993, 1998 The Open Group
@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86$ */
/*
* Author: Ralph Mor, X Consortium

32
lib/libSM/src/sm_client.c
View File

@ -138,7 +138,7 @@ SmcOpenConnection(char *networkIdsList, SmPointer context,
return (NULL);
}
if ((smcConn = (SmcConn) malloc (sizeof (struct _SmcConn))) == NULL)
if ((smcConn = malloc (sizeof (struct _SmcConn))) == NULL)
{
if (errorStringRet && errorLength > 0) {
strncpy (errorStringRet, "Can't malloc", errorLength);
@ -158,7 +158,7 @@ SmcOpenConnection(char *networkIdsList, SmPointer context,
setupstat == IceProtocolSetupIOError)
{
IceCloseConnection (iceConn);
free ((char *) smcConn);
free (smcConn);
return (NULL);
}
else if (setupstat == IceProtocolAlreadyActive)
@ -169,7 +169,7 @@ SmcOpenConnection(char *networkIdsList, SmPointer context,
* may not already have XSMP active on it.
*/
free ((char *) smcConn);
free (smcConn);
if (errorStringRet && errorLength > 0) {
strncpy (errorStringRet, "Internal error in IceOpenConnection",
errorLength);
@ -235,7 +235,7 @@ SmcOpenConnection(char *networkIdsList, SmPointer context,
}
free (smcConn->vendor);
free (smcConn->release);
free ((char *) smcConn);
free (smcConn);
return (NULL);
}
@ -249,10 +249,7 @@ SmcOpenConnection(char *networkIdsList, SmPointer context,
*clientIdRet = reply.client_id;
smcConn->client_id = (char *) malloc (
strlen (*clientIdRet) + 1);
strcpy (smcConn->client_id, *clientIdRet);
smcConn->client_id = strdup (*clientIdRet);
}
else
{
@ -308,7 +305,7 @@ SmcCloseConnection(SmcConn smcConn, int count, char **reasonMsgs)
pData += 4;
for (i = 0; i < count; i++)
STORE_ARRAY8 (pData, strlen (reasonMsgs[i]), reasonMsgs[i]);
STORE_ARRAY8 (pData, strlen (reasonMsgs[i]), reasonMsgs[i]);
IceFlush (iceConn);
@ -333,13 +330,13 @@ SmcCloseConnection(SmcConn smcConn, int count, char **reasonMsgs)
while (ptr)
{
next = ptr->next;
free ((char *) ptr);
free (ptr);
ptr = next;
}
}
free ((char *) smcConn);
free (smcConn);
if (closeStatus == IceClosedNow)
statusRet = SmcClosedNow;
@ -408,7 +405,7 @@ SmcDeleteProperties(SmcConn smcConn, int numProps, char **propNames)
pData += 4;
for (i = 0; i < numProps; i++)
STORE_ARRAY8 (pData, strlen (propNames[i]), propNames[i]);
STORE_ARRAY8 (pData, strlen (propNames[i]), propNames[i]);
IceFlush (iceConn);
}
@ -422,8 +419,7 @@ SmcGetProperties(SmcConn smcConn, SmcPropReplyProc propReplyProc,
IceConn iceConn = smcConn->iceConn;
_SmcPropReplyWait *wait, *ptr;
if ((wait = (_SmcPropReplyWait *) malloc (
sizeof (_SmcPropReplyWait))) == NULL)
if ((wait = malloc (sizeof (_SmcPropReplyWait))) == NULL)
{
return (0);
}
@ -457,8 +453,7 @@ SmcInteractRequest(SmcConn smcConn, int dialogType,
smInteractRequestMsg *pMsg;
_SmcInteractWait *wait, *ptr;
if ((wait = (_SmcInteractWait *) malloc (
sizeof (_SmcInteractWait))) == NULL)
if ((wait = malloc (sizeof (_SmcInteractWait))) == NULL)
{
return (0);
}
@ -537,8 +532,7 @@ SmcRequestSaveYourselfPhase2(SmcConn smcConn,
wait = smcConn->phase2_wait;
else
{
if ((wait = (_SmcPhase2Wait *) malloc (
sizeof (_SmcPhase2Wait))) == NULL)
if ((wait = malloc (sizeof (_SmcPhase2Wait))) == NULL)
{
return (0);
}

11
lib/libSM/src/sm_error.c
View File

@ -1,5 +1,3 @@
/* $Xorg: sm_error.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */
/*
Copyright 1993, 1998 The Open Group
@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/lib/SM/sm_error.c,v 1.2 2001/10/28 03:32:29 tsi Exp $ */
/*
* Author: Ralph Mor, X Consortium
@ -276,12 +273,12 @@ _SmsDefaultErrorHandler(SmsConn smsConn, Bool swap, int offendingMinorOpcode,
/*
/*
* This procedure sets the Smc error handler to be the specified
* routine. If NULL is passed in the default error handler is restored.
* The function's return value is the previous error handler.
*/
SmcErrorHandler
SmcSetErrorHandler(SmcErrorHandler handler)
{
@ -297,12 +294,12 @@ SmcSetErrorHandler(SmcErrorHandler handler)
/*
/*
* This procedure sets the Sms error handler to be the specified
* routine. If NULL is passed in the default error handler is restored.
* The function's return value is the previous error handler.
*/
SmsErrorHandler
SmsSetErrorHandler(SmsErrorHandler handler)
{

177
lib/libSM/src/sm_genid.c
View File

@ -1,7 +1,30 @@
/*
Copyright (c) 2002, 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.
*/
/*
Copyright 1993, 1998 The Open Group
Copyright 2002 Sun Microsystems, Inc.
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
@ -30,15 +53,15 @@ in this Software without prior written authorization from The Open Group.
*/
#ifdef WIN32
#define _WILLWINSOCK_
# define _WILLWINSOCK_
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
# include <config.h>
#endif
#include <X11/SM/SMlib.h>
#include "SMlibint.h"
#ifdef XTHREADS
#include <X11/Xthreads.h>
# include <X11/Xthreads.h>
#endif
#include <stdio.h>
@ -47,39 +70,35 @@ in this Software without prior written authorization from The Open Group.
#ifndef WIN32
#if defined(TCPCONN) || defined(STREAMSCONN)
#ifndef Lynx
#include <sys/socket.h>
#else
#include <socket.h>
#endif
#include <netinet/in.h>
#include <arpa/inet.h>
#define XOS_USE_NO_LOCKING
#define X_INCLUDE_NETDB_H
#include <X11/Xos_r.h>
#endif
# if defined(TCPCONN) || defined(STREAMSCONN)
# include <sys/socket.h>
# include <netinet/in.h>
# include <arpa/inet.h>
# define XOS_USE_NO_LOCKING
# define X_INCLUDE_NETDB_H
# include <X11/Xos_r.h>
# endif
#else /* WIN32 */
#include <X11/Xwinsock.h>
#include <X11/Xw32defs.h>
#define X_INCLUDE_NETDB_H
#define XOS_USE_MTSAFE_NETDBAPI
#include <X11/Xos_r.h>
# include <X11/Xwinsock.h>
# include <X11/Xw32defs.h>
# define X_INCLUDE_NETDB_H
# define XOS_USE_MTSAFE_NETDBAPI
# include <X11/Xos_r.h>
#endif /* WIN32 */
#ifdef MNX_TCPCONN
#include <net/gen/netdb.h>
# include <net/gen/netdb.h>
#define TCPCONN
# define TCPCONN
#endif
#if defined(HAVE_UUID_CREATE)
#include <uuid.h>
# include <uuid.h>
#elif defined(HAVE_LIBUUID)
#include <uuid/uuid.h>
# include <uuid/uuid.h>
#endif
@ -98,7 +117,7 @@ SmsGenerateClientID(SmsConn smsConn)
if ((id = malloc (strlen (temp) + 2)) != NULL)
{
id[1] = '2';
id[0] = '2';
strcpy (id+1, temp);
}
@ -116,45 +135,45 @@ SmsGenerateClientID(SmsConn smsConn)
temp[1] = '\0';
uuid_unparse_lower(uuid, &temp[1]);
if ((id = malloc (strlen (temp) + 1)) != NULL)
strcpy (id, temp);
id = strdup (temp);
return id;
#else
#if defined(TCPCONN) || defined(STREAMSCONN)
# if defined(TCPCONN) || defined(STREAMSCONN)
static const char hex[] = "0123456789abcdef";
char hostname[256];
char address[64], *addr_ptr = address;
char temp[256];
char *id;
static int sequence = 0;
char* inet_addr;
char *ptr1;
unsigned char decimal[4];
int i, len;
struct in_addr *haddr = NULL;
# if defined(IPv6) && defined(AF_INET6)
struct addrinfo *ai, *first_ai;
# endif
if (gethostname (hostname, sizeof (hostname)))
return (NULL);
{
char* inet_addr;
char temp[4], *ptr1, *ptr2;
unsigned char decimal[4];
int i, len;
struct in_addr *haddr = NULL;
#if defined(IPv6) && defined(AF_INET6)
struct addrinfo *ai, *first_ai;
# if defined(IPv6) && defined(AF_INET6)
if (getaddrinfo(hostname,NULL,NULL,&ai) != 0)
return NULL;
for (first_ai = ai; ai != NULL; ai = ai->ai_next) {
if ( (ai->ai_family == AF_INET) || (ai->ai_family == AF_INET6) )
if ( (ai->ai_family == AF_INET) || (ai->ai_family == AF_INET6) )
break;
}
if (ai == NULL) {
freeaddrinfo(first_ai);
return NULL;
}
}
if (ai->ai_family == AF_INET6) {
unsigned char *cp = (unsigned char *) &((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr.s6_addr;
*addr_ptr++ = '6'; /* IPv6 address code */
for (i = 0 ; i < 16 ; i++) {
@ -166,51 +185,52 @@ SmsGenerateClientID(SmsConn smsConn)
} else { /* Fall through to IPv4 address handling */
haddr = &((struct sockaddr_in *)ai->ai_addr)->sin_addr;
#else
#ifdef XTHREADS_NEEDS_BYNAMEPARAMS
_Xgethostbynameparams hparams;
#endif
struct hostent *hostp;
# else
# ifdef XTHREADS_NEEDS_BYNAMEPARAMS
_Xgethostbynameparams hparams;
# endif
struct hostent *hostp;
if ((hostp = _XGethostbyname (hostname,hparams)) != NULL)
haddr = (struct in_addr *)(hostp->h_addr);
else
return NULL;
#endif
if ((hostp = _XGethostbyname (hostname,hparams)) != NULL)
haddr = (struct in_addr *)(hostp->h_addr);
else
return NULL;
# endif
inet_addr = inet_ntoa (*haddr);
for (i = 0, ptr1 = inet_addr; i < 3; i++)
{
ptr2 = strchr (ptr1, '.');
len = ptr2 - ptr1;
if (!ptr2 || len > 3) {
#if defined(IPv6) && defined(AF_INET6)
freeaddrinfo(first_ai);
#endif
return (NULL);
inet_addr = inet_ntoa (*haddr);
for (i = 0, ptr1 = inet_addr; i < 3; i++)
{
char temp4[4];
char *ptr2 = strchr (ptr1, '.');
len = ptr2 - ptr1;
if (!ptr2 || len > 3) {
# if defined(IPv6) && defined(AF_INET6)
freeaddrinfo(first_ai);
# endif
return (NULL);
}
strncpy (temp4, ptr1, len);
temp4[len] = '\0';
decimal[i] = atoi (temp4);
ptr1 = ptr2 + 1;
}
strncpy (temp, ptr1, len);
temp[len] = '\0';
decimal[i] = atoi (temp);
ptr1 = ptr2 + 1;
}
decimal[3] = atoi (ptr1);
decimal[3] = atoi (ptr1);
*addr_ptr++ = '1';
*addr_ptr++ = '1';
for (i = 0; i < 4; i++) {
*addr_ptr++ = hex[decimal[i] >> 4];
*addr_ptr++ = hex[decimal[i] & 0x0f];
}
for (i = 0; i < 4; i++) {
*addr_ptr++ = hex[decimal[i] >> 4];
*addr_ptr++ = hex[decimal[i] & 0x0f];
}
*addr_ptr++ = '\0';
*addr_ptr++ = '\0';
#if defined(IPv6) && defined(AF_INET6)
# if defined(IPv6) && defined(AF_INET6)
}
freeaddrinfo(first_ai);
#endif
}
# endif
sprintf (temp, "1%s%.13ld%.10ld%.4d", address, (long)time((Time_t*)0),
(long)getpid(), sequence);
@ -218,12 +238,11 @@ SmsGenerateClientID(SmsConn smsConn)
if (++sequence > 9999)
sequence = 0;
if ((id = malloc (strlen (temp) + 1)) != NULL)
strcpy (id, temp);
id = strdup (temp);
return (id);
#else
# else
return (NULL);
#endif
# endif
#endif
}

17
lib/libSM/src/sm_manager.c
View File

@ -1,6 +1,3 @@
/* $XdotOrg: $ */
/* $Xorg: sm_manager.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */
/*
Copyright 1993, 1998 The Open Group
@ -71,12 +68,11 @@ _SmsProtocolSetupProc (IceConn iceConn,
* Allocate new SmsConn.
*/
if ((smsConn = (SmsConn) malloc (sizeof (struct _SmsConn))) == NULL)
if ((smsConn = malloc (sizeof (struct _SmsConn))) == NULL)
{
const char *str = "Memory allocation failed";
if ((*failureReasonRet = (char *) malloc (strlen (str) + 1)) != NULL)
strcpy (*failureReasonRet, str);
*failureReasonRet = strdup (str);
return (0);
}
@ -114,7 +110,8 @@ _SmsProtocolSetupProc (IceConn iceConn,
Status
SmsInitialize(char *vendor, char *release, SmsNewClientProc newClientProc,
SmsInitialize(const char *vendor, const char *release,
SmsNewClientProc newClientProc,
SmPointer managerData, IceHostBasedAuthProc hostBasedAuthProc,
int errorLength, char *errorStringRet)
{
@ -190,13 +187,11 @@ SmsRegisterClientReply(SmsConn smsConn, char *clientId)
smRegisterClientReplyMsg *pMsg;
char *pData;
if ((smsConn->client_id = (char *) malloc (strlen (clientId) + 1)) == NULL)
if ((smsConn->client_id = strdup (clientId)) == NULL)
{
return (0);
}
strcpy (smsConn->client_id, clientId);
extra = ARRAY8_BYTES (strlen (clientId));
IceGetHeaderExtra (iceConn, _SmsOpcode, SM_RegisterClientReply,
@ -341,5 +336,5 @@ SmsCleanUp(SmsConn smsConn)
if (smsConn->client_id)
free (smsConn->client_id);
free ((char *) smsConn);
free (smsConn);
}

34
lib/libSM/src/sm_misc.c
View File

@ -1,5 +1,3 @@
/* $Xorg: sm_misc.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */
/*
Copyright 1993, 1998 The Open Group
@ -56,11 +54,11 @@ SmFreeProperty(SmProp *prop)
{
for (i = 0; i < prop->num_vals; i++)
if (prop->vals[i].value)
free ((char *) prop->vals[i].value);
free ((char *) prop->vals);
free (prop->vals[i].value);
free (prop->vals);
}
free ((char *) prop);
free (prop);
}
}
@ -79,7 +77,7 @@ SmFreeReasons(int count, char **reasonMsgs)
for (i = 0; i < count; i++)
free (reasonMsgs[i]);
free ((char *) reasonMsgs);
free (reasonMsgs);
}
}
@ -106,33 +104,21 @@ SmcProtocolRevision(SmcConn smcConn)
char *
SmcVendor(SmcConn smcConn)
{
char *string = (char *) malloc (strlen (smcConn->vendor) + 1);
strcpy (string, smcConn->vendor);
return (string);
return strdup(smcConn->vendor);
}
char *
SmcRelease(SmcConn smcConn)
{
char *string = (char *) malloc (strlen (smcConn->release) + 1);
strcpy (string, smcConn->release);
return (string);
return strdup(smcConn->release);
}
char *
SmcClientID(SmcConn smcConn)
{
char *clientId = (char *) malloc (strlen (smcConn->client_id) + 1);
strcpy (clientId, smcConn->client_id);
return (clientId);
return strdup(smcConn->client_id);
}
@ -165,11 +151,7 @@ SmsProtocolRevision(SmsConn smsConn)
char *
SmsClientID(SmsConn smsConn)
{
char *clientId = (char *) malloc (strlen (smsConn->client_id) + 1);
strcpy (clientId, smsConn->client_id);
return (clientId);
return strdup(smsConn->client_id);
}

17
lib/libSM/src/sm_process.c
View File

@ -1,5 +1,3 @@
/* $Xorg: sm_process.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */
/*
Copyright 1993, 1998 The Open Group
@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86$ */
/*
* Author: Ralph Mor, X Consortium
@ -155,7 +152,7 @@ _SmcProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
{
smRegisterClientReplyMsg *pMsg;
char *pData, *pStart;
_SmcRegisterClientReply *reply =
_SmcRegisterClientReply *reply =
(_SmcRegisterClientReply *) (replyWait->reply);
#if 0 /* No-op */
@ -270,7 +267,7 @@ _SmcProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
(*smcConn->phase2_wait->phase2_proc) (smcConn,
smcConn->phase2_wait->client_data);
free ((char *) smcConn->phase2_wait);
free (smcConn->phase2_wait);
smcConn->phase2_wait = NULL;
}
break;
@ -293,7 +290,7 @@ _SmcProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
(*smcConn->interact_waits->interact_proc) (smcConn,
smcConn->interact_waits->client_data);
free ((char *) smcConn->interact_waits);
free (smcConn->interact_waits);
smcConn->interact_waits = next;
}
break;
@ -396,7 +393,7 @@ _SmcProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
(*smcConn->prop_reply_waits->prop_reply_proc) (smcConn,
smcConn->prop_reply_waits->client_data, numProps, props);
free ((char *) smcConn->prop_reply_waits);
free (smcConn->prop_reply_waits);
smcConn->prop_reply_waits = next;
IceDisposeCompleteMessage (iceConn, pStart);
@ -755,7 +752,7 @@ _SmsProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
pData = pStart + 8;
reasonMsgs = (char **) malloc (count * sizeof (char *));
reasonMsgs = malloc (count * sizeof (char *));
for (i = 0; i < count; i++)
EXTRACT_ARRAY8_AS_STRING (pData, swap, reasonMsgs[i]);
@ -773,7 +770,7 @@ _SmsProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
char *pData, *pStart;
SmProp **props = NULL;
int numProps;
#if 0 /* No-op */
CHECK_AT_LEAST_SIZE (iceConn, _SmsOpcode, opcode,
length, SIZEOF (smSetPropertiesMsg), IceFatalToProtocol);
@ -842,7 +839,7 @@ _SmsProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
pData = pStart + 8;
propNames = (char **) malloc (count * sizeof (char *));
propNames = malloc (count * sizeof (char *));
for (i = 0; i < count; i++)
EXTRACT_ARRAY8_AS_STRING (pData, swap, propNames[i]);