| -rw-r--r-- | .gitignore | 16 | ||||
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | COPYING | 482 | ||||
| -rw-r--r-- | Makefile.am | 17 | ||||
| -rw-r--r-- | README | 72 | ||||
| -rwxr-xr-x | autogen.sh | 8 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | database.c | 144 | ||||
| -rw-r--r-- | gconf-cut-and-paste.c | 332 | ||||
| -rw-r--r-- | gconf-defaults-hack.c | 394 | ||||
| -rw-r--r-- | gconf-defaults-hack.doap | 17 | ||||
| -rw-r--r-- | gconf-defaults-hack.h | 69 | ||||
| -rw-r--r-- | hippo-sqlite-utils.c | 269 | ||||
| -rw-r--r-- | hippo-sqlite-utils.h | 74 | ||||
| -rw-r--r-- | rebuild.c | 395 |
15 files changed, 2302 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..35148a5 --- a/dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +.deps +.libs +aclocal.m4 +autom4te.cache/ +ChangeLog +config.* +configure +depcomp +install-sh +INSTALL +libtool +ltmain.sh +missing +Makefile +Makefile.in +NEWS @@ -0,0 +1 @@ +Owen Taylor <otaylor@redhat.com> @@ -0,0 +1,482 @@ + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if +you distribute copies of the library, or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, so that any problems introduced by others will not reflect on +the original authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also compile or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + c) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the source code distributed need not include anything that is normally +distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Library General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307 USA. + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..526a84d --- a/dev/null +++ b/Makefile.am @@ -0,0 +1,17 @@ +AM_CPPFLAGS = \ + $(GCONF_DEFAULTS_HACK_CFLAGS) \ + -DSYSCONFDIR="\"$(sysconfdir)\"" + +lib_LTLIBRARIES = libgconf-defaults-hack.la + +libgconf_defaults_hack_la_SOURCES = \ + database.c \ + hippo-sqlite-utils.c \ + hippo-sqlite-utils.h \ + gconf-cut-and-paste.c \ + gconf-defaults-hack.c \ + gconf-defaults-hack.h \ + rebuild.c + +libgconf_defaults_hack_la_LDFLAGS = -avoid-version +libgconf_defaults_hack_la_LIBADD = $(GCONF_DEFAULTS_HACK_LIBS) @@ -0,0 +1,72 @@ +gconf-defaults-hack +=================== + +This is a small LD_PRELOAD library designed to fix problems with GConf +defaults when running with a partial install of some GNOME components +into a non-system directory. + +Namely: + + - At make install time, schemas are installed in $sysconfdir/gconf/schemas + - Schema installation into the system defaults database in /etc fails + - When we run apps, they talk to the system copy of gconfd which is looking + in /etc/ for defaults. + +What the LD_PRELOAD library does is override libgconf functions so that +if a lookup from gconfd totally fails - no entry for the user, no entry +from the installed schemas - then it looks in $sysconfdir/gconf/schemas +(or the directory given by GCONF_DEFAULTS_SCHEMAS_DIR) and sees if it +can extract a default from there. + +To avoid parsing a lot of XML files every time the application is executed, +the extracted values are cached in a SQLite database. If the schemas +dir is writable by the user, the database is stored in + + $schemadir/.gconfdefaults.sqlite + +Otherwise the database is stored in: + + $home/.gconfdefaults.<mangled version $schemadir>.sqlite + +Notes: + + * Performance was not the primary consideration here; for each + application, the first time a default lookup is triggered, it needs to look + at the modification times for all schema files in $schemadir to see + if the database needs to be rebuilt. If the set of locally built modules + is large, this could take a measurable amount of time. + + * One issue of setting a LD_PRELOAD in a .jhbuildrc is that the library + and dependencies will get loaded into *every* process, including /bin/sh, + gcc, etc, slowing down the build. + + * Because the defaults lookup is last-resort measure, if the same schemas + are installed on the system with *different* default values, the system + default values will be preferred. In general, default values shouldn't change + very often. + + * This doesn't help for cases where schemas are actually needed; in particular, + gconf-editor won't have any access to the documentation for the schemas. + You could imagine a more sophisticated version of this library that provided + the schemas as well, but that's would be considerably more code. + +Usage +===== + +Using gconf-defaults-hack with JHBuild: + + A) Add gconf-defaults-hack to your moduleset + B) Add to your ~/.jhbuildrc + + os.environ['GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL'] = '1' + addpath('LD_PRELOAD', os.path.join(prefix, "lib", "libgconf-defaults-hack.so")) + +Legal +===== + +gconf-defaults-hack is Copyright 1999-2009 Red Hat, Inc, and licensed +under the terms of the GNU Library General License, version 2 or +later. See the file COPYING for details. + +Owen Taylor +7 June 2009 diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..9fd4a8d --- a/dev/null +++ b/autogen.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +(cd `dirname $0`; + touch ChangeLog NEWS && + autoreconf --install --symlink && + autoreconf && + ./configure --enable-maintainer-mode $@ +) diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..4857b95 --- a/dev/null +++ b/configure.ac @@ -0,0 +1,12 @@ +AC_INIT(gconf-defaults-hack, 0.1) + +AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip]) +AM_MAINTAINER_MODE + +AC_DISABLE_STATIC +AC_PROG_CC +AM_PROG_LIBTOOL + +PKG_CHECK_MODULES(GCONF_DEFAULTS_HACK, glib-2.0 gconf-2.0 sqlite3) + +AC_OUTPUT([Makefile]) diff --git a/database.c b/database.c new file mode 100644 index 0000000..4f18606 --- a/dev/null +++ b/database.c @@ -0,0 +1,144 @@ +/* -*- indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* Store GConf defaults in a SQLite database + * Copyright (C) 2009 Red Hat Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ +#include "gconf-defaults-hack.h" +#include "hippo-sqlite-utils.h" + +struct _GConfDefaultsHackDatabase +{ + sqlite3 *db; +}; + +GConfDefaultsHackDatabase * +gconf_defaults_hack_database_open (const char *filename) +{ + GConfDefaultsHackDatabase *database; + int sqlite_result; + sqlite3 *db; + + sqlite_result = sqlite3_open(filename, &db); + + if (sqlite_result != SQLITE_OK) + { + g_warning ("Could not open GConf defaults cache %s: %s", + filename, sqlite3_errmsg (db)); + sqlite3_close (db); + return NULL; + } + + database = g_new0 (GConfDefaultsHackDatabase, 1); + database->db = db; + + return database; +} + +void +gconf_defaults_hack_database_close (GConfDefaultsHackDatabase *database) +{ + sqlite3_close (database->db); + g_free (database); +} + +void +gconf_defaults_hack_database_begin_transaction (GConfDefaultsHackDatabase *database) +{ + hippo_sqlite_execute_sql (database->db, + "BEGIN TRANSACTION", + NULL); +} + +void +gconf_defaults_hack_database_commit (GConfDefaultsHackDatabase *database) +{ + hippo_sqlite_execute_sql (database->db, + "COMMIT", + NULL); +} + +void +gconf_defaults_hack_database_clear (GConfDefaultsHackDatabase *database) +{ + hippo_sqlite_execute_sql (database->db, + "DROP TABLE IF EXISTS Defaults", + NULL); + hippo_sqlite_execute_sql (database->db, + "CREATE TABLE Defaults (" + "key TEXT UNIQUE," + "type TEXT," + "list_type TEXT," + "car_type TEXT," + "cdr_type TEXT," + "default_value TEXT" + ")", + NULL); +} + +GConfDefaultsHackEntry * +gconf_defaults_hack_database_get (GConfDefaultsHackDatabase *database, + const char *key) +{ + GConfDefaultsHackEntry entry = { 0 }; + + if (!hippo_sqlite_execute_sql_single_result (database->db, + "SELECT " + "type, list_type, car_type, cdr_type, default_value " + "FROM Defaults WHERE key = :key", + "s:key", key, + NULL, + "sssss", + &entry.type, + &entry.list_type, + &entry.car_type, + &entry.cdr_type, + &entry.default_value)) + return NULL; + + return g_slice_dup (GConfDefaultsHackEntry, &entry); +} + +void +gconf_defaults_hack_database_put (GConfDefaultsHackDatabase *database, + const char *key, + GConfDefaultsHackEntry *entry) +{ + if (!hippo_sqlite_execute_sql (database->db, + "INSERT OR IGNORE into Defaults " + "(key, type, list_type, car_type, cdr_type, default_value) " + "VALUES (:key, :type, :list_type, :car_type, :cdr_type, :default_value)", + "s:key", key, + "s:type", entry->type, + "s:list_type", entry->list_type, + "s:car_type", entry->car_type, + "s:cdr_type", entry->cdr_type, + "s:default_value", entry->default_value, + NULL)) + g_print("%s\n", key); +} + +void +gconf_defaults_hack_entry_free (GConfDefaultsHackEntry *entry) +{ + g_free (entry->type); + g_free (entry->list_type); + g_free (entry->car_type); + g_free (entry->cdr_type); + g_free (entry->default_value); + + g_slice_free (GConfDefaultsHackEntry, entry); +} diff --git a/gconf-cut-and-paste.c b/gconf-cut-and-paste.c new file mode 100644 index 0000000..baa5d19 --- a/dev/null +++ b/gconf-cut-and-paste.c @@ -0,0 +1,332 @@ +/* Cut and paste of Code from GConf for parsing lists and pairs + * + * GConf + * Copyright (C) 1999, 2000, 2002 Red Hat Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + * Changes: + * + * - Renamed functions to be gconf_defaults_hack_* + * - Replaced gconf_error_new with g_set_error() + */ + +#include <string.h> + +#include "gconf-defaults-hack.h" + +#define _(x) x + +GConfValue* +gconf_defaults_hack_value_new_list_from_string(GConfValueType list_type, + const gchar* str, + GError** err) +{ + int i, len; + gboolean escaped, pending_chars; + GString *string; + GConfValue* value; + GSList *list; + + g_return_val_if_fail(list_type != GCONF_VALUE_LIST, NULL); + g_return_val_if_fail(list_type != GCONF_VALUE_PAIR, NULL); + + if (!g_utf8_validate (str, -1, NULL)) + { + g_set_error (err, GCONF_ERROR, GCONF_ERROR_PARSE_ERROR, + _("Text contains invalid UTF-8")); + return NULL; + } + + if (str[0] != '[') + { + g_set_error(err, GCONF_ERROR, GCONF_ERROR_PARSE_ERROR, + _("Didn't understand `%s' (list must start with a '[')"), + str); + return NULL; + } + + len = strlen(str); + + /* Note: by now len is sure to be 1 or larger, so len-1 will never be + * negative */ + if (str[len-1] != ']') + { + g_set_error(err, GCONF_ERROR, + GCONF_ERROR_PARSE_ERROR, + _("Didn't understand `%s' (list must end with a ']')"), + str); + return NULL; + } + + if (strstr(str, "[]")) + { + value = gconf_value_new(GCONF_VALUE_LIST); + gconf_value_set_list_type(value, list_type); + + return value; + } + + escaped = FALSE; + pending_chars = FALSE; + list = NULL; + string = g_string_new(NULL); + + for (i = 1; str[i] != '\0'; i++) + { + if ( ! escaped && + (str[i] == ',' || + str[i] == ']')) + { + GConfValue* val; + val = gconf_value_new_from_string(list_type, string->str, err); + + if (err && *err != NULL) + { + /* Free values so far */ + g_slist_foreach(list, (GFunc)gconf_value_free, NULL); + g_slist_free(list); + + g_string_free(string, TRUE); + + return NULL; + } + + g_string_assign(string, ""); + list = g_slist_prepend(list, val); + if (str[i] == ']' && + i != len-1) + { + /* Free values so far */ + g_slist_foreach(list, (GFunc)gconf_value_free, NULL); + g_slist_free(list); + + g_string_free(string, TRUE); + + g_set_error(err, GCONF_ERROR, GCONF_ERROR_PARSE_ERROR, + _("Didn't understand `%s' (extra unescaped ']' found inside list)"), + str); + return NULL; + } + pending_chars = FALSE; + } + else if ( ! escaped && str[i] == '\\') + { + escaped = TRUE; + pending_chars = TRUE; + } + else + { + g_string_append_c(string, str[i]); + escaped = FALSE; + pending_chars = TRUE; + } + } + + g_string_free(string, TRUE); + + if (pending_chars) + { + /* Free values so far */ + g_slist_foreach(list, (GFunc)gconf_value_free, NULL); + g_slist_free(list); + + g_string_free(string, TRUE); + + g_set_error(err, GCONF_ERROR, GCONF_ERROR_PARSE_ERROR, + _("Didn't understand `%s' (extra trailing characters)"), + str); + return NULL; + } + + /* inverse list as we were prepending to it */ + list = g_slist_reverse(list); + + value = gconf_value_new(GCONF_VALUE_LIST); + gconf_value_set_list_type(value, list_type); + + gconf_value_set_list_nocopy(value, list); + + return value; +} + +GConfValue* +gconf_defaults_hack_value_new_pair_from_string(GConfValueType car_type, + GConfValueType cdr_type, + const gchar* str, + GError** err) +{ + int i, len; + int elem; + gboolean escaped, pending_chars; + GString *string; + GConfValue* value; + GConfValue* car; + GConfValue* cdr; + + g_return_val_if_fail(car_type != GCONF_VALUE_LIST, NULL); + g_return_val_if_fail(car_type != GCONF_VALUE_PAIR, NULL); + g_return_val_if_fail(cdr_type != GCONF_VALUE_LIST, NULL); + g_return_val_if_fail(cdr_type != GCONF_VALUE_PAIR, NULL); + + if (!g_utf8_validate (str, -1, NULL)) + { + g_set_error (err, GCONF_ERROR, GCONF_ERROR_PARSE_ERROR, + _("Text contains invalid UTF-8")); + return NULL; + } + + if (str[0] != '(') + { + g_set_error(err, GCONF_ERROR, GCONF_ERROR_PARSE_ERROR, + _("Didn't understand `%s' (pair must start with a '(')"), + str); + return NULL; + } + + len = strlen(str); + + /* Note: by now len is sure to be 1 or larger, so len-1 will never be + * negative */ + if (str[len-1] != ')') + { + g_set_error(err, GCONF_ERROR, GCONF_ERROR_PARSE_ERROR, + _("Didn't understand `%s' (pair must end with a ')')"), + str); + return NULL; + } + + escaped = FALSE; + pending_chars = FALSE; + car = cdr = NULL; + string = g_string_new(NULL); + elem = 0; + + for (i = 1; str[i] != '\0'; i++) + { + if ( ! escaped && + (str[i] == ',' || + str[i] == ')')) + { + if ((str[i] == ')' && elem != 1) || + (elem > 1)) + { + /* Free values so far */ + if (car) + gconf_value_free(car); + if (cdr) + gconf_value_free(cdr); + + g_string_free(string, TRUE); + + g_set_error(err, GCONF_ERROR, GCONF_ERROR_PARSE_ERROR, + _("Didn't understand `%s' (wrong number of elements)"), + str); + return NULL; + } + + if (elem == 0) + car = gconf_value_new_from_string(car_type, string->str, err); + else if (elem == 1) + cdr = gconf_value_new_from_string(cdr_type, string->str, err); + + elem ++; + + if (err && *err != NULL) + { + /* Free values so far */ + if (car) + gconf_value_free(car); + if (cdr) + gconf_value_free(cdr); + + g_string_free(string, TRUE); + + return NULL; + } + + g_string_assign(string, ""); + + if (str[i] == ')' && + i != len-1) + { + /* Free values so far */ + if (car) + gconf_value_free(car); + if (cdr) + gconf_value_free(cdr); + + g_string_free(string, TRUE); + + if (err) + g_set_error(err, GCONF_ERROR, GCONF_ERROR_PARSE_ERROR, + _("Didn't understand `%s' (extra unescaped ')' found inside pair)"), + str); + return NULL; + } + pending_chars = FALSE; + } + else if ( ! escaped && str[i] == '\\') + { + escaped = TRUE; + pending_chars = TRUE; + } + else + { + g_string_append_c(string, str[i]); + escaped = FALSE; + pending_chars = TRUE; + } + } + + g_string_free(string, TRUE); + + if (pending_chars) + { + /* Free values so far */ + if (car) + gconf_value_free(car); + if (cdr) + gconf_value_free(cdr); + + if (err) + g_set_error(err, GCONF_ERROR, GCONF_ERROR_PARSE_ERROR, + _("Didn't understand `%s' (extra trailing characters)"), + str); + return NULL; + } + + if (elem != 2) + { + /* Free values so far */ + if (car) + gconf_value_free(car); + if (cdr) + gconf_value_free(cdr); + + if (err) + g_set_error(err, GCONF_ERROR, GCONF_ERROR_PARSE_ERROR, + _("Didn't understand `%s' (wrong number of elements)"), + str); + return NULL; + } + + value = gconf_value_new(GCONF_VALUE_PAIR); + gconf_value_set_car_nocopy(value, car); + gconf_value_set_cdr_nocopy(value, cdr); + + return value; +} diff --git a/gconf-defaults-hack.c b/gconf-defaults-hack.c new file mode 100644 index 0000000..6174702 --- a/dev/null +++ b/gconf-defaults-hack.c @@ -0,0 +1,394 @@ +/* -*- indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* LD_PRELOAD functions to make libgconf read defaults out of local schemas + * Copyright (C) 2009 Red Hat Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ +#define _GNU_SOURCE /* for RTLD_NEXT */ +#include <dlfcn.h> +#include <string.h> +#include <sys/stat.h> +#include <unistd.h> +#include "gconf-defaults-hack.h" + +gboolean +gconf_defaults_hack_verbose (void) +{ + static int verbose = -1; + + if (verbose < 0) + { + const char *str = g_getenv ("GCONF_DEFAULTS_VERBOSE"); + verbose = (str && str[0]); + } + + return verbose; +} + +GConfValueType +gconf_defaults_hack_value_type_from_string (const char *str) +{ + if (str == NULL) + return GCONF_VALUE_INVALID; + + switch (str[0]) + { + case 'b': + if (strcmp (str, "bool") == 0) + return GCONF_VALUE_BOOL; + break; + case 'f': + if (strcmp (str, "float") == 0) + return GCONF_VALUE_FLOAT; + break; + case 'i': + if (strcmp (str, "int") == 0) + return GCONF_VALUE_INT; + break; + case 'l': + if (strcmp (str, "list") == 0) + return GCONF_VALUE_LIST; + break; + case 'p': + if (strcmp (str, "pair") == 0) + return GCONF_VALUE_PAIR; + break; + case 's': + if (strcmp (str, "string") == 0) + return GCONF_VALUE_STRING; + break; + } + + return GCONF_VALUE_INVALID; +} + +static time_t +get_mtime (const char *filename) +{ + struct stat st; + + if (stat (filename, &st) == 0) + { + return st.st_mtime; + } + else + return (time_t)-1; +} + +static time_t +get_dir_mtime (const char *dir_filename) +{ + GDir *dir = NULL; + GError *error = NULL; + time_t mtime; + + dir = g_dir_open (dir_filename, 0, &error); + if (!dir) + { + g_error_free (error); + return (time_t)-1; + } + + mtime = get_mtime (dir_filename); + + while (TRUE) + { + char *filename; + const char *name = g_dir_read_name (dir); + time_t file_mtime; + if (!name) + break; + + if (!g_str_has_suffix (name, ".schemas")) + continue; + + filename = g_build_filename (dir_filename, name, NULL); + file_mtime = get_mtime (filename); + if (file_mtime != (time_t)-1 && file_mtime > mtime) + mtime = file_mtime; + + g_free (filename); + } + + g_dir_close (dir); + + return mtime; +} + +static GConfDefaultsHackDatabase * +open_database (void) +{ + GConfDefaultsHackDatabase *database = NULL; + const char *schemas_dir; + gboolean schemas_dir_writable; + char *db_file; + time_t db_mtime; + time_t dir_mtime; + + schemas_dir = g_getenv ("GCONF_DEFAULTS_SCHEMAS_DIR"); + if (schemas_dir == NULL) + schemas_dir = SYSCONFDIR "/gconf/schemas"; + + schemas_dir_writable = access (schemas_dir, W_OK) == 0; + if (schemas_dir_writable) + { + db_file = g_build_filename (schemas_dir, ".gconfdefaults.sqlite", NULL); + } + else + { + GString *tmp = g_string_new (".gconfdefaults."); + const char *p; + gboolean last_was_slash = FALSE; + + for (p = schemas_dir; *p; p++) + { + if (*p == '/') + { + if (!last_was_slash) + g_string_append_c (tmp, '_'); + last_was_slash = TRUE; + } + else + { + if (*p == '_') + g_string_append (tmp, "__"); + else + g_string_append_c (tmp, *p); + last_was_slash = FALSE; + } + } + g_string_append (tmp, ".sqlite"); + + db_file = g_build_filename (g_get_home_dir(), tmp->str, NULL); + g_string_free (tmp, TRUE); + } + + if (gconf_defaults_hack_verbose ()) + { + g_printerr("gconf-defaults-hack: schemas_dir=%s, db_file=%s\n", + schemas_dir, db_file); + } + + db_mtime = get_mtime (db_file); + dir_mtime = get_dir_mtime (schemas_dir); + + if (dir_mtime != (time_t)-1) + { + database = gconf_defaults_hack_database_open (db_file); + + if (database && + (db_mtime == (time_t)-1 || db_mtime < dir_mtime)) + { + if (gconf_defaults_hack_verbose ()) + g_printerr ("Rebuilding database: db_mtime=%ld, dir_mtime=%ld\n", + (long)db_mtime, (long)dir_mtime); + + gconf_defaults_hack_rebuild_database (database, schemas_dir); + } + } + + g_free (db_file); + + return database; +} + +static GConfDefaultsHackDatabase * +get_database (void) +{ + static GConfDefaultsHackDatabase *database; + static gboolean initialized = FALSE; + + if (!initialized) + { + initialized = TRUE; + database = open_database (); + } + + return database; +} + +static GConfValueType +validate_element_type (const char *str, + GError **error) +{ + GConfValueType type; + + if (str == NULL) + { + g_set_error (error, GCONF_ERROR, GCONF_ERROR_CORRUPT, + "Missing element type in defaults database"); + return GCONF_VALUE_INVALID; + } + + type = gconf_defaults_hack_value_type_from_string (str); + if (type == GCONF_VALUE_INVALID || + type == GCONF_VALUE_LIST || + type == GCONF_VALUE_PAIR) + { + g_set_error (error, GCONF_ERROR, GCONF_ERROR_CORRUPT, + "Bad element type '%s' in defaults database", str); + return GCONF_VALUE_INVALID; + } + + return type; +} + +static GConfValue * +get_default_from_database (const char *key, + GError **error) +{ + GConfDefaultsHackDatabase *database = get_database (); + GConfDefaultsHackEntry *entry; + GConfValue *value = NULL; + GConfValueType type; + + if (database == NULL) + goto out; + + entry = gconf_defaults_hack_database_get (database, key); + if (!entry) + goto out; + + if (entry->default_value == NULL) + { + g_set_error (error, GCONF_ERROR, GCONF_ERROR_CORRUPT, + "Defaults database entry is missing a value"); + goto out; + } + + type = gconf_defaults_hack_value_type_from_string (entry->type); + switch (type) + { + case GCONF_VALUE_INVALID: + case GCONF_VALUE_SCHEMA: + g_set_error (error, GCONF_ERROR, GCONF_ERROR_CORRUPT, + "Bad type '%s' in defaults database", + entry->type ? entry->type : "<none>"); + break; + case GCONF_VALUE_STRING: + case GCONF_VALUE_INT: + case GCONF_VALUE_FLOAT: + case GCONF_VALUE_BOOL: + value = gconf_value_new_from_string (type, entry->default_value, error); + break; + case GCONF_VALUE_LIST: + { + GConfValueType list_type; + + list_type = validate_element_type (entry->list_type, error); + if (list_type == GCONF_VALUE_INVALID) + break; + + value = gconf_defaults_hack_value_new_list_from_string (list_type, + entry->default_value, + error); + } + case GCONF_VALUE_PAIR: + { + GConfValueType car_type; + GConfValueType cdr_type; + + car_type = validate_element_type (entry->car_type, error); + if (car_type == GCONF_VALUE_INVALID) + break; + + cdr_type = validate_element_type (entry->cdr_type, error); + if (cdr_type == GCONF_VALUE_INVALID) + break; + + value = gconf_defaults_hack_value_new_pair_from_string (car_type, cdr_type, + entry->default_value, + error); + } + } + + out: + if (entry) + gconf_defaults_hack_entry_free (entry); + + return value; +} + +GConfValue * +gconf_engine_get_fuller (GConfEngine *conf, + const gchar *key, + const gchar *locale, + gboolean use_schema_default, + gboolean *is_default_p, + gboolean *is_writable_p, + gchar **schema_name_p, + GError **err) +{ + static GConfValue * (*next) (GConfEngine *conf, + const gchar *key, + const gchar *locale, + gboolean use_schema_default, + gboolean *is_default_p, + gboolean *is_writable_p, + gchar **schema_name_p, + GError **err); + GConfValue *result; + + if (next == NULL) + next = dlsym (RTLD_NEXT, "gconf_engine_get_fuller"); + + result = (*next) (conf, key, locale, use_schema_default, + is_default_p, is_writable_p, schema_name_p, err); + + if (result != NULL || + !use_schema_default || + conf != gconf_engine_get_default ()) + return result; + + g_clear_error (err); + + result = get_default_from_database (key, err); + if (result) + { + if (is_default_p) + *is_default_p = TRUE; + if (is_writable_p) + *is_writable_p = TRUE; /* A guess */ + if (schema_name_p) + *schema_name_p = g_strconcat ("/schemas/", key, NULL); /* probably right... */ + } + + return result; +} + +GConfValue* +gconf_engine_get_default_from_schema (GConfEngine* conf, + const gchar* key, + GError** err) +{ + static GConfValue* (*next) (GConfEngine* conf, + const gchar* key, + GError** err); + GConfValue *result; + + if (next == NULL) + next = dlsym (RTLD_NEXT, "gconf_engine_get_default_from_schema"); + + result = (*next) (conf, key, err); + + if (result != NULL || + conf != gconf_engine_get_default ()) + return result; + + g_clear_error (err); + + return get_default_from_database (key, err); +} diff --git a/gconf-defaults-hack.doap b/gconf-defaults-hack.doap new file mode 100644 index 0000000..aadff9b --- a/dev/null +++ b/gconf-defaults-hack.doap @@ -0,0 +1,17 @@ +<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" + xmlns:foaf="http://xmlns.com/foaf/0.1/" + xmlns:gnome="http://api.gnome.org/doap-extensions#" + xmlns="http://usefulinc.com/ns/doap#"> + + <name xml:lang="en">gconf-defaults-hack</name> + <shortdesc xml:lang="en">LD_PRELOAD library to fix GConf defaults</shortdesc> + + <maintainer> + <foaf:Person> + <foaf:name>Owen Taylor</foaf:name> + <foaf:mbox rdf:resource="mailto:otaylor@redhat.com" /> + <gnome:userid>otaylor</gnome:userid> + </foaf:Person> + </maintainer> +</Project> diff --git a/gconf-defaults-hack.h b/gconf-defaults-hack.h new file mode 100644 index 0000000..9c7fcfc --- a/dev/null +++ b/gconf-defaults-hack.h @@ -0,0 +1,69 @@ +/* -*- indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* LD_PRELOAD functions to make libgconf read defaults out of local schemas + * Copyright (C) 2009 Red Hat Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ +#ifndef __GCONF_DEFAULTS_HACK_H__ +#define __GCONF_DEFAULTS_HACK_H__ + +#include <gconf/gconf.h> +#include <glib.h> + +typedef struct _GConfDefaultsHackDatabase GConfDefaultsHackDatabase; +typedef struct _GConfDefaultsHackEntry GConfDefaultsHackEntry; + +struct _GConfDefaultsHackEntry +{ + char *type; + char *list_type; + char *car_type; + char *cdr_type; + char *default_value; +}; + + +/* gconf-defaults-hack.c */ +gboolean gconf_defaults_hack_verbose (void); +GConfValueType gconf_defaults_hack_value_type_from_string (const char *str); + +/* gconf-cut-and-paste.c */ +GConfValue *gconf_defaults_hack_value_new_list_from_string (GConfValueType list_type, + const gchar *str, + GError **err); +GConfValue *gconf_defaults_hack_value_new_pair_from_string (GConfValueType car_type, + GConfValueType cdr_type, + const gchar *str, + GError **err); + +/* database.c */ +GConfDefaultsHackDatabase *gconf_defaults_hack_database_open (const char *filename); +void gconf_defaults_hack_database_close (GConfDefaultsHackDatabase *database); +void gconf_defaults_hack_database_begin_transaction (GConfDefaultsHackDatabase *database); +void gconf_defaults_hack_database_commit (GConfDefaultsHackDatabase *database); +void gconf_defaults_hack_database_clear (GConfDefaultsHackDatabase *database); +GConfDefaultsHackEntry * gconf_defaults_hack_database_get (GConfDefaultsHackDatabase *database, + const char *key); +void gconf_defaults_hack_database_put (GConfDefaultsHackDatabase *database, + const char *key, + GConfDefaultsHackEntry *entry); +void gconf_defaults_hack_entry_free (GConfDefaultsHackEntry *entry); + +/* rebuild.c */ +void gconf_defaults_hack_rebuild_database (GConfDefaultsHackDatabase *database, + const char *schemas_dir); + +#endif /* __GCONF_DEFAULTS_HACK_H__ */ diff --git a/hippo-sqlite-utils.c b/hippo-sqlite-utils.c new file mode 100644 index 0000000..6af54d1 --- a/dev/null +++ b/hippo-sqlite-utils.c @@ -0,0 +1,269 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ +/* Utility functions for convenient use of sqlite + * Copyright (C) 2007, 2008 Red Hat Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ +#include <stdarg.h> +#include <string.h> + +#include "hippo-sqlite-utils.h" + +gboolean +hippo_sqlite_bind_sql_parameters(sqlite3 *db, + sqlite3_stmt *stmt, + va_list *vap) +{ + while (TRUE) { + const char *spec = va_arg(*vap, const char *); + const char *colon; + int index; + int sql_result; + + if (spec == NULL) + break; + + colon = strchr(spec, ':'); + + if (colon == NULL || *(colon + 1) == '\0' || colon != spec + 1) { + g_warning("Parameter specification %s should be <type_char>:<name>", spec); + return FALSE; + } + + index = sqlite3_bind_parameter_index(stmt, colon); + if (index == 0) { + g_warning("Parameter '%s' not found", colon); + return FALSE; + } + + switch (*spec) { + case 'i': + { + int value = va_arg(*vap, int); + sql_result = sqlite3_bind_int(stmt, index, value); + break; + } + case 'l': + { + gint64 value = va_arg(*vap, gint64); + sql_result = sqlite3_bind_int64(stmt, index, value); + break; + } + case 'f': + { + double value = va_arg(*vap, double); + sql_result = sqlite3_bind_double(stmt, index, value); + break; + } + case 's': + { + const char *value = va_arg(*vap, const char *); + if (value) + sql_result = sqlite3_bind_text(stmt, index, g_strdup(value), strlen(value), (void(*)(void*))g_free); + else + sql_result = SQLITE_OK; + break; + } + default: + g_warning("Unknown type character '%c'", *spec); + return FALSE; + } + + if (sql_result != SQLITE_OK) { + g_warning("Error binding parameter '%s': %s'", colon, sqlite3_errmsg(db)); + return FALSE; + } + } + + return TRUE; +} + +gboolean +hippo_sqlite_get_row_datav(sqlite3_stmt *stmt, + va_list *vap) +{ + const char *types = va_arg(*vap, const char *); + const char *p; + GSList *to_free = NULL; + + if (types == NULL) + return TRUE; + + if ((int)strlen(types) > sqlite3_column_count(stmt)) { + g_warning("Got %d columns from query, expected at least %d", sqlite3_column_count(stmt), + (int) strlen(types)); + goto error; + } + + for (p = types; *p; p++) { + switch (*p) { + case 'i': + { + int *l = va_arg(*vap, int *); + *l = sqlite3_column_int(stmt, p - types); + break; + } + case 'l': + { + gint64 *l = va_arg(*vap, gint64 *); + *l = sqlite3_column_int64(stmt, p - types); + break; + } + case 'f': + { + double *l = va_arg(*vap, double *); + *l = sqlite3_column_double(stmt, p - types); + break; + } + case 's': + { + char **l = va_arg(*vap, char **); + const unsigned char *value = sqlite3_column_text(stmt, p - types); + *l = g_strdup((const char *)value); + to_free = g_slist_prepend(to_free, *l); + break; + } + default: + g_warning("Unknown type character '%c'", *p); + goto error; + } + } + + return TRUE; + + error: + g_slist_foreach(to_free, (GFunc)g_free, NULL); + return FALSE; +} + +gboolean +hippo_sqlite_get_row_data(sqlite3_stmt *stmt, + ...) +{ + gboolean result; + va_list vap; + + va_start(vap, stmt); + result = hippo_sqlite_get_row_datav(stmt, &vap); + va_end(vap); + + return result; +} + +sqlite3_stmt * +hippo_sqlite_prepare_sqlv(sqlite3 *db, + const char *sql, + va_list *vap) +{ + sqlite3_stmt *stmt; + + if (sqlite3_prepare(db, sql, -1, &stmt, NULL) != SQLITE_OK) { + g_warning("Failed to prepare SQL command %s: %s\n", sql, sqlite3_errmsg(db)); + return FALSE; + } + + if (!hippo_sqlite_bind_sql_parameters(db, stmt, vap)) { + sqlite3_finalize(stmt); + return NULL; + } + + return stmt; +} + +sqlite3_stmt * +hippo_sqlite_prepare_sql(sqlite3 *db, + const char *sql, + ...) +{ + va_list vap; + sqlite3_stmt *stmt; + + va_start(vap, sql); + stmt = hippo_sqlite_prepare_sqlv(db, sql, &vap); + va_end(vap); + + return stmt; +} + +gboolean +hippo_sqlite_execute_sql(sqlite3 *db, + const char *sql, + ...) +{ + sqlite3_stmt *stmt; + int sql_result; + gboolean result = FALSE; + va_list vap; + + va_start(vap, sql); + stmt = hippo_sqlite_prepare_sqlv(db, sql, &vap); + va_end(vap); + + if (stmt == NULL) + return FALSE; + + sql_result = sqlite3_step(stmt); + if (sql_result != SQLITE_DONE && sql_result != SQLITE_ROW) { + g_warning("Failed to execute SQL command: %s\n", sqlite3_errmsg(db)); + goto out; + } + + result = TRUE; + + out: + sqlite3_finalize(stmt); + return result; +} + +gboolean +hippo_sqlite_execute_sql_single_result(sqlite3 *db, + const char *sql, + ...) +{ + sqlite3_stmt *stmt; + int sql_result; + gboolean result = FALSE; + va_list vap; + + va_start(vap, sql); + + stmt = hippo_sqlite_prepare_sqlv(db, sql, &vap); + if (stmt == NULL) + goto out; + + sql_result = sqlite3_step(stmt); + if (sql_result != SQLITE_DONE && sql_result != SQLITE_ROW) { + g_warning("Failed to execute SQL command: %s\n", sqlite3_errmsg(db)); + goto out; + } + + if (sql_result != SQLITE_ROW) { + goto out; + } + + if (!hippo_sqlite_get_row_datav(stmt, &vap)) + goto out; + + result = TRUE; + + out: + va_end(vap); + + if (stmt) + sqlite3_finalize(stmt); + + return result; +} diff --git a/hippo-sqlite-utils.h b/hippo-sqlite-utils.h new file mode 100644 index 0000000..ac6b26b --- a/dev/null +++ b/hippo-sqlite-utils.h @@ -0,0 +1,74 @@ +/* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */ +/* Utility functions for convenient use of sqlite + * Copyright (C) 2007, 2008 Red Hat Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ +#ifndef __HIPPO_SQLITE_UTILS_H__ +#define __HIPPO_SQLITE_UTILS_H__ + +#include <glib.h> +#include <sqlite3.h> + +/* LOCAL CHANGE: Re-namespace to avoid any conflict if the same functions + * are present in the application we are LD_PRELOADED in. + */ +#define hippo_sqlite_bind_sql_parameters _gcdh_hippo_sqlite_bind_sql_parameters +#define hippo_sqlite_get_row_datav _gcdh_hippo_sqlite_get_row_datav +#define hippo_sqlite_get_row_data _gcdh_hippo_sqlite_get_row_data +#define hippo_sqlite_prepare_sqlv _gcdh_hippo_sqlite_prepare_sqlv +#define hippo_sqlite_prepare_sql _gcdh_hippo_sqlite_prepare_sql +#define hippo_sqlite_execute_sql _gcdh_hippo_sqlite_execute_sql +#define hippo_sqlite_execute_sql_single_result _gcdh_hippo_sqlite_execute_sql_single_result + +G_BEGIN_DECLS + +gboolean +hippo_sqlite_bind_sql_parameters(sqlite3 *db, + sqlite3_stmt *stmt, + va_list *vap); + +gboolean +hippo_sqlite_get_row_datav(sqlite3_stmt *stmt, + va_list *vap); + +gboolean +hippo_sqlite_get_row_data(sqlite3_stmt *stmt, + ...); + +sqlite3_stmt * +hippo_sqlite_prepare_sqlv(sqlite3 *db, + const char *sql, + va_list *vap); + +sqlite3_stmt * +hippo_sqlite_prepare_sql(sqlite3 *db, + const char *sql, + ...); + +gboolean +hippo_sqlite_execute_sql(sqlite3 *db, + const char *sql, + ...); + +gboolean +hippo_sqlite_execute_sql_single_result(sqlite3 *db, + const char *sql, + ...); + +G_END_DECLS + +#endif /* __HIPPO_SQLITE_UTILS_H__ */ diff --git a/rebuild.c b/rebuild.c new file mode 100644 index 0000000..7b605bd --- a/dev/null +++ b/rebuild.c @@ -0,0 +1,395 @@ +/* -*- indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* Parse defaults out of schema files and store in database + * Copyright (C) 2009 Red Hat Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ +#include <stdarg.h> +#include <string.h> +#include <stdarg.h> + +#include "gconf-defaults-hack.h" + +typedef struct _SchemaParseState SchemaParseState; + +typedef enum { + SCHEMA_LEAF_NONE, + SCHEMA_LEAF_APPLYTO, + SCHEMA_LEAF_DEFAULT, + SCHEMA_LEAF_CAR_TYPE, + SCHEMA_LEAF_CDR_TYPE, + SCHEMA_LEAF_LIST_TYPE, + SCHEMA_LEAF_TYPE +} SchemaLeafElement; + +struct _SchemaParseState +{ + GConfDefaultsHackDatabase *database; + const char *filename; + gboolean in_schema; + SchemaLeafElement leaf_element; + char *applyto; + GConfDefaultsHackEntry entry; + GString *text; +}; + +static void +schema_parser_start_element (GMarkupParseContext *context, + const gchar *element_name, + const gchar **attribute_names, + const gchar **attribute_values, + gpointer user_data, + GError **error) +{ + SchemaParseState *state = user_data; + + if (state->leaf_element != SCHEMA_LEAF_NONE) + { + g_set_error (error, + G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, + "contents inside a what should be a leaf element"); + return; + } + + if (state->in_schema) + { + switch (element_name[0]) + { + case 'a': + if (strcmp (element_name, "applyto") == 0 && state->applyto == NULL) + state->leaf_element = SCHEMA_LEAF_APPLYTO; + break; + case 'c': + if (strcmp (element_name, "car_type") == 0 && state->entry.car_type == NULL) + state->leaf_element = SCHEMA_LEAF_CAR_TYPE; + else if (strcmp (element_name, "cdr_type") == 0 && state->entry.cdr_type == NULL) + state->leaf_element = SCHEMA_LEAF_CDR_TYPE; + break; + case 'd': + if (strcmp (element_name, "default") == 0 && state->entry.default_value == NULL) + state->leaf_element = SCHEMA_LEAF_DEFAULT; + break; + case 'l': + if (strcmp (element_name, "list_type") == 0 && state->entry.list_type == NULL) + state->leaf_element = SCHEMA_LEAF_LIST_TYPE; + break; + case 's': + if (strcmp (element_name, "schema") == 0) + { + g_set_error (error, + G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, + "nested <schema/> elements"); + return; + } + break; + case 't': + if (strcmp (element_name, "type") == 0 && state->entry.type == NULL) + state->leaf_element = SCHEMA_LEAF_TYPE; + break; + } + } + else + { + if (strcmp (element_name, "schema") == 0) + state->in_schema = TRUE; + } +} + +static char * +steal_text (SchemaParseState *state) +{ + if (state->text) + { + char *result = g_string_free (state->text, FALSE); + result = g_strstrip (result); + state->text = NULL; + + return result; + } + else + return NULL; +} + +static void skip (GMarkupParseContext *context, + SchemaParseState *state, + const char *format, + ...) G_GNUC_PRINTF (3, 4); + +static void +skip (GMarkupParseContext *context, + SchemaParseState *state, + const char *format, + ...) +{ + if (gconf_defaults_hack_verbose ()) + { + char *error_str; + va_list vap; + int line_number; + + va_start (vap, format); + error_str = g_strdup_vprintf (format, vap); + va_end (vap); + + g_markup_parse_context_get_position (context, &line_number, NULL); + + if (state->applyto) + g_printerr ("%s:%d (%s): %s\n", + state->filename, line_number, state->applyto, error_str); + else + g_printerr ("%s:%d: %s\n", + state->filename, line_number, error_str); + + g_free (error_str); + } +} + +static void +output (GMarkupParseContext *context, + SchemaParseState *state) +{ + gconf_defaults_hack_database_put (state->database, + state->applyto, + &state->entry); +} + +static gboolean +validate_element_type (const char *str) +{ + GConfValueType type = gconf_defaults_hack_value_type_from_string (str); + if (type == GCONF_VALUE_INVALID || + type == GCONF_VALUE_LIST || + type == GCONF_VALUE_PAIR) + return FALSE; + + return TRUE; +} + +static void +validate_and_output (GMarkupParseContext *context, + SchemaParseState *state) +{ + if (state->applyto == NULL) + skip (context, state, "No applyto"); + else if (state->entry.default_value == NULL) + skip (context, state, "No default"); + else if (state->entry.type == NULL) + skip (context, state, "No type"); + else + { + GConfValueType type = gconf_defaults_hack_value_type_from_string (state->entry.type); + if (type == GCONF_VALUE_INVALID) + { + skip (context, state, "bad type '%s'", state->entry.type); + } + else if (type == GCONF_VALUE_LIST) + { + if (state->entry.list_type == NULL) + skip (context, state, "list without list_type"); + else if (!validate_element_type (state->entry.list_type)) + skip (context, state, "bad list_type '%s'", state->entry.type); + else + output (context, state); + } + else if (type == GCONF_VALUE_PAIR) + { + if (state->entry.car_type == NULL) + skip (context, state, "pair without car_type"); + else if (state->entry.cdr_type == NULL) + skip (context, state, "pair without cdr_type"); + else if (!validate_element_type (state->entry.car_type)) + skip (context, state, "bad car_type '%s'", state->entry.car_type); + else if (!validate_element_type (state->entry.cdr_type)) + skip (context, state, "bad cdr_type '%s'", state->entry.cdr_type); + else + output (context, state); + } + else + { + output (context, state); + } + } +} + +static void +schema_parser_end_element (GMarkupParseContext *context, + const gchar *element_name, + gpointer user_data, + GError **error) +{ + SchemaParseState *state = user_data; + + if (state->leaf_element != SCHEMA_LEAF_NONE) + { + switch (state->leaf_element) + { + case SCHEMA_LEAF_APPLYTO: + state->applyto = steal_text (state); + break; + case SCHEMA_LEAF_CAR_TYPE: + state->entry.car_type = steal_text (state); + break; + case SCHEMA_LEAF_CDR_TYPE: + state->entry.cdr_type = steal_text (state); + break; + case SCHEMA_LEAF_DEFAULT: + state->entry.default_value = steal_text (state); + break; + case SCHEMA_LEAF_LIST_TYPE: + state->entry.list_type = steal_text (state); + break; + case SCHEMA_LEAF_TYPE: + state->entry.type = steal_text (state); + break; + case SCHEMA_LEAF_NONE: + g_assert_not_reached (); + break; + } + + state->leaf_element = SCHEMA_LEAF_NONE; + } + else if (state->in_schema) + { + if (strcmp (element_name, "schema") == 0) + { + validate_and_output (context, state); + + g_free (state->applyto); + state->applyto = NULL; + g_free (state->entry.car_type); + state->entry.car_type = NULL; + g_free (state->entry.cdr_type); + state->entry.cdr_type = NULL; + g_free (state->entry.default_value); + state->entry.default_value = NULL; + g_free (state->entry.list_type); + state->entry.list_type = NULL; + g_free (state->entry.type); + state->entry.type = NULL; + + state->in_schema = FALSE; + } + } +} + +static void +schema_parser_text (GMarkupParseContext *context, + const gchar *text, + gsize text_len, + gpointer user_data, + GError **error) +{ + SchemaParseState *state = user_data; + + if (state->leaf_element != SCHEMA_LEAF_NONE) + { + if (!state->text) + state->text = g_string_new (NULL); + + g_string_append_len (state->text, text, text_len); + } +} + +static GMarkupParser schema_parser = { + schema_parser_start_element, + schema_parser_end_element, + schema_parser_text, + NULL, /* passthrough */ + NULL /* error */ +}; + +static void +parse_schema_file (GConfDefaultsHackDatabase *database, + const char *filename) +{ + GMarkupParseContext *context = NULL; + SchemaParseState state = { 0 }; + char *contents = NULL; + gsize len; + GError *error = NULL; + + state.database = database; + state.filename = filename; + + if (!g_file_get_contents (filename, &contents, &len, &error)) + goto out; + + context = g_markup_parse_context_new (&schema_parser, 0, + &state, NULL); + + if (!g_markup_parse_context_parse (context, contents, len, &error)) + goto out; + + if (!g_markup_parse_context_end_parse (context, &error)) + goto out; + + out: + if (state.text) + g_string_free (state.text, TRUE); + + if (contents != NULL) + g_free (contents); + + if (context != NULL) + g_markup_parse_context_free (context); + + if (error != NULL) + { + g_printerr ("Cannot parse schema file %s: %s\n", filename, error->message); + g_error_free (error); + } +} + +void +gconf_defaults_hack_rebuild_database (GConfDefaultsHackDatabase *database, + const char *schemas_dir) +{ + GDir *dir = NULL; + GError *error = NULL; + + dir = g_dir_open (schemas_dir, 0, &error); + if (!dir) + { + g_printerr ("Cannot read schema directory %s: %s\n", schemas_dir, error->message); + g_error_free (error); + + goto out; + } + + gconf_defaults_hack_database_clear (database); + gconf_defaults_hack_database_begin_transaction (database); + + while (TRUE) + { + char *filename; + const char *name = g_dir_read_name (dir); + if (!name) + break; + + if (!g_str_has_suffix (name, ".schemas")) + continue; + + filename = g_build_filename (schemas_dir, name, NULL); + parse_schema_file (database, filename); + g_free (filename); + } + + gconf_defaults_hack_database_commit (database); + + out: + if (dir) + g_dir_close (dir); +} |