From 4504df71178fe7a0eb8e7c37fa548b7c853a800f Mon Sep 17 00:00:00 2001 From: Michael Clark Date: Tue, 13 Mar 2007 08:26:20 +0000 Subject: [PATCH] =?utf8?q?=20=20*=20printbuf.c=20-=20C.=20Watford=20(chris?= =?utf8?q?topher=20dot=20watford=20at=20gmail=20dot=20com)=20=20=20=20=20A?= =?utf8?q?dded=20a=20Win32/Win64=20compliant=20implementation=20of=20vaspr?= =?utf8?q?intf=20=20=20*=20debug.c=20-=20C.=20Watford=20(christopher=20dot?= =?utf8?q?=20watford=20at=20gmail=20dot=20com)=20=20=20=20=20Removed=20usa?= =?utf8?q?ge=20of=20vsyslog=20on=20Win32/Win64=20systems,=20needs=20to=20b?= =?utf8?q?e=20handled=20=20=20=20=20by=20a=20configure=20script=20=20=20*?= =?utf8?q?=20json=5Fobject.c=20-=20C.=20Watford=20(christopher=20dot=20wat?= =?utf8?q?ford=20at=20gmail=20dot=20com)=20=20=20=20=20Added=20scope=20ope?= =?utf8?q?rator=20to=20wrap=20usage=20of=20json=5Fobject=5Fobject=5Fforeac?= =?utf8?q?h,=20this=20=20=20=20=20needs=20to=20be=20rethought=20to=20be=20?= =?utf8?q?more=20ANSI=20C=20friendly=20=20=20*=20json=5Fobject.h=20-=20C.?= =?utf8?q?=20Watford=20(christopher=20dot=20watford=20at=20gmail=20dot=20c?= =?utf8?q?om)=20=20=20=20=20Added=20Microsoft=20C=20friendly=20version=20o?= =?utf8?q?f=20json=5Fobject=5Fobject=5Fforeach=20=20=20*=20json=5Ftokener.?= =?utf8?q?c=20-=20C.=20Watford=20(christopher=20dot=20watford=20at=20gmail?= =?utf8?q?=20dot=20com)=20=20=20=20=20Added=20a=20Win32/Win64=20compliant?= =?utf8?q?=20implementation=20of=20strndup=20=20=20*=20json=5Futil.c=20-?= =?utf8?q?=20C.=20Watford=20(christopher=20dot=20watford=20at=20gmail=20do?= =?utf8?q?t=20com)=20=20=20=20=20Added=20cast=20and=20mask=20to=20suffice?= =?utf8?q?=20size=5Ft=20v.=20unsigned=20int=20conversion=20=20=20=20=20cor?= =?utf8?q?rectness=20=20=20*=20json=5Ftokener.c=20-=20sign=20reversal=20is?= =?utf8?q?sue=20on=20error=20info=20for=20nested=20object=20parse=20=20=20?= =?utf8?q?=20=20spotted=20by=20Johan=20Bj=EF=BF=BDrklund=20(johbjo09=20at?= =?utf8?q?=20kth.se)=20=20=20*=20json=5Fobject.c=20-=20escape=20"=20in=20j?= =?utf8?q?son=5Fescape=5Fstr=20=20=20*=20Change=20to=20automake=20and=20li?= =?utf8?q?btool=20to=20build=20shared=20and=20static=20library=20=20=20=20?= =?utf8?q?=20Michael=20Clark=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@4 327403b1-1117-474d-bef2-5cb71233fd97 --- AUTHORS | 2 + COPYING | 481 ++++++++++++++++++++++++++++++++++++++++++ ChangeLog | 24 +++ Doxyfile | 2 +- INSTALL | 229 ++++++++++++++++++++ Makefile | 40 ---- Makefile.am | 40 ++++ NEWS | 1 + README | 23 ++ README-WIN32.html | 63 ++++++ README.html | 70 +++--- arraylist.c | 18 +- bits.h | 19 +- config.h.in | 117 ++++++++++ config.h.win32 | 101 +++++++++ configure.in | 33 +++ debug.c | 50 +++-- debug.h | 8 +- json-c.vcproj | 179 ++++++++++++++++ json.pc.in | 11 + json_object.c | 58 +++-- json_object.h | 29 ++- json_object_private.h | 26 +++ json_tokener.c | 45 +++- json_tokener.h | 14 +- json_util.c | 56 ++++- json_util.h | 29 +++ linkhash.c | 25 ++- linkhash.h | 6 +- printbuf.c | 59 +++++- printbuf.h | 4 +- test1.c | 1 - 32 files changed, 1704 insertions(+), 159 deletions(-) create mode 100644 AUTHORS create mode 100644 COPYING create mode 100644 ChangeLog create mode 100644 INSTALL delete mode 100644 Makefile create mode 100644 Makefile.am create mode 100644 NEWS create mode 100644 README create mode 100644 README-WIN32.html create mode 100644 config.h.in create mode 100644 config.h.win32 create mode 100644 configure.in create mode 100644 json-c.vcproj create mode 100644 json.pc.in diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 00000000..38f2ce02 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,2 @@ +Michael Clark +C. Watford (christopher.watford@gmail.com) diff --git a/COPYING b/COPYING new file mode 100644 index 00000000..eb685a5e --- /dev/null +++ b/COPYING @@ -0,0 +1,481 @@ + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, 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 + + Appendix: 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. + + + Copyright (C) + + 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., 675 Mass Ave, Cambridge, MA 02139, 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. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 00000000..8f652d6a --- /dev/null +++ b/ChangeLog @@ -0,0 +1,24 @@ +0.2 + * printbuf.c - C. Watford (christopher.watford@gmail.com) + Added a Win32/Win64 compliant implementation of vasprintf + * debug.c - C. Watford (christopher.watford@gmail.com) + Removed usage of vsyslog on Win32/Win64 systems, needs to be handled + by a configure script + * json_object.c - C. Watford (christopher.watford@gmail.com) + Added scope operator to wrap usage of json_object_object_foreach, this + needs to be rethought to be more ANSI C friendly + * json_object.h - C. Watford (christopher.watford@gmail.com) + Added Microsoft C friendly version of json_object_object_foreach + * json_tokener.c - C. Watford (christopher.watford@gmail.com) + Added a Win32/Win64 compliant implementation of strndup + * json_util.c - C. Watford (christopher.watford@gmail.com) + Added cast and mask to suffice size_t v. unsigned int conversion + correctness + * json_tokener.c - sign reversal issue on error info for nested object parse + spotted by Johan Björklund (johbjo09 at kth.se) + * json_object.c - escape " in json_escape_str + * Change to automake and libtool to build shared and static library + Michael Clark + +0.1 + * initial release diff --git a/Doxyfile b/Doxyfile index a964501a..7e5f306d 100644 --- a/Doxyfile +++ b/Doxyfile @@ -23,7 +23,7 @@ PROJECT_NAME = json-c # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.1 +PROJECT_NUMBER = 0.2 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/INSTALL b/INSTALL new file mode 100644 index 00000000..a4b34144 --- /dev/null +++ b/INSTALL @@ -0,0 +1,229 @@ +Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software +Foundation, Inc. + + 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. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +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 +disabled by default to prevent problems with accidental use of stale +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 +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +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'. + +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. + + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + +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. + + 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 + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + 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 +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. + +Installation Names +================== + + By default, `make install' will install the package's files in +`/usr/local/bin', `/usr/local/man', etc. You can specify an +installation prefix other than `/usr/local' by giving `configure' the +option `--prefix=PATH'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +give `configure' the option `--exec-prefix=PATH', the package will use +PATH as the prefix for installing programs and libraries. +Documentation and other data files will still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=PATH' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + 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 +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +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. + +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 +`--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: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the `--target=TYPE' option to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +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'. +`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. +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 +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 +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +will cause the specified gcc to be used as the C compiler (unless it is +overridden in the site shell script). + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of the options to `configure', and exit. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/Makefile b/Makefile deleted file mode 100644 index f32694b9..00000000 --- a/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: Makefile,v 1.4 2004/07/22 01:37:44 mclark Exp $ - -CFLAGS += -g -Wall -std=gnu99 -D_GNU_SOURCE -D_REENTRANT -LDFLAGS += -LDLIBS += - -LIB_OBJS = debug.o \ - linkhash.o \ - printbuf.o \ - arraylist.o \ - json_object.o \ - json_tokener.o - -LIB_HDRS = debug.h \ - linkhash.h \ - printbuf.h \ - arraylist.h \ - json_object.h \ - json_tokener.h - -TESTS = test1 test2 - -all: tests - -tests: $(TESTS) -test1: test1.o $(LIB_OBJS) -test2: test2.o $(LIB_OBJS) - -clean: - rm -f *.o *~ $(TESTS) - -cex.o: cex.c cex.h -debug.o: debug.c debug.h -linkhash.o: linkhash.c linkhash.h -arraylist.o: arraylist.c arraylist.h -json_object.o: json_object.c $(LIB_HDRS) -json_tokener.o: json_tokener.c $(LIB_HDRS) -test1.o: test1.c $(LIB_HDRS) -test2.o: test2.c $(LIB_HDRS) - diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 00000000..9e86ccdb --- /dev/null +++ b/Makefile.am @@ -0,0 +1,40 @@ +AUTOMAKE_OPTIONS = 1.6 + +CFLAGS = -Wall -std=gnu99 -D_GNU_SOURCE -D_REENTRANT + +libjson_la_LIBADD = $(JSON_LIBS) + +lib_LTLIBRARIES = libjson.la + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = json.pc + +libjsonincludedir = $(includedir)/json +libjsoninclude_HEADERS = \ + json.h \ + bits.h \ + debug.h \ + linkhash.h \ + arraylist.h \ + json_util.h \ + json_object.h \ + json_tokener.h + +libjson_la_LDFLAGS = -version-info 0:1:0 + +libjson_la_SOURCES = \ + arraylist.c \ + debug.c \ + json_object.c \ + json_tokener.c \ + json_util.c \ + linkhash.c \ + printbuf.c + +check_PROGRAMS = test1 test2 + +test1_SOURCES = test1.c +test1_LDADD = $(lib_LTLIBRARIES) + +test2_SOURCES = test2.c +test2_LDADD = $(lib_LTLIBRARIES) diff --git a/NEWS b/NEWS new file mode 100644 index 00000000..41e843b5 --- /dev/null +++ b/NEWS @@ -0,0 +1 @@ +News diff --git a/README b/README new file mode 100644 index 00000000..93c02265 --- /dev/null +++ b/README @@ -0,0 +1,23 @@ +Building on Unix with gcc and autotools + +If checking out from CVS: + + cp /usr/share/libtool/ltmain.sh . + aclocal-1.6 + automake-1.6 --add-missing + autoconf + +Then configure, make, make install + + +Test programs + +To build the test programs run 'make check' + + +Linking to libjson + +If your system has pkgconfig then you can just add this to your makefile + +CFLAGS += $(shell pkg-config --cflags json) +LDFLAGS += $(shell pkg-config --libs json) diff --git a/README-WIN32.html b/README-WIN32.html new file mode 100644 index 00000000..c20fc837 --- /dev/null +++ b/README-WIN32.html @@ -0,0 +1,63 @@ + + + + JSON-C - A JSON implementation in C - Win32 specific notes + + + +

Windows specific notes for JSON-C

+

Please send Win32 bug reports to christopher.watford@gmail.com

+

Win32 Specific Changes:

+
    +
  • + Various functions have been redefined to their Win32 version (i.e. open + on win32 is _open)
    • +
  • + Implemented missing functions from MS's libc (i.e. vasprintf and strndup)
    • +
  • + Added code to allow Win64 support without integer resizing issues, this + probably makes it much nicer on 64bit machines everywhere (i.e. using ptrdiff_t + for pointer math)
    • +
+

Porting Changelog:

+
+
printbuf.c - C. Watford (christopher.watford@gmail.com)
+
+ Added a Win32/Win64 compliant implementation of vasprintf
+
debug.c - C. Watford (christopher.watford@gmail.com)
+
+ Removed usage of vsyslog on Win32/Win64 systems, needs to be handled + by a configure script
+
json_object.c - C. Watford (christopher.watford@gmail.com)
+
+ Added scope operator to wrap usage of json_object_object_foreach, this needs to be + rethought to be more ANSI C friendly
+
json_object.h - C. Watford (christopher.watford@gmail.com)
+
+ Added Microsoft C friendly version of json_object_object_foreach
+
json_tokener.c - C. Watford (christopher.watford@gmail.com)
+
+ Added a Win32/Win64 compliant implementation of strndup
+
json_util.c - C. Watford (christopher.watford@gmail.com)
+
+ Added cast and mask to suffice size_t v. unsigned int + conversion correctness
+
+

Anonymous CVS

+

# export CVSROOT=:pserver:anoncvs@cvs.metaparadigm.com:/cvsroot
+ # cvs login
+ Logging in to :pserver:anoncvs@cvs.metaparadigm.com:2401/cvsroot
+ CVS password: <enter 'anoncvs'>
+ # cvs co json-c

+

Copyright Metaparadigm Pte. Ltd. 2004. Michael + Clark +

+

This program is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public (LGPL) License as published by the + Free Software Foundation; either version 2.1 of the License, or (at your + option) any later version.

+
+ + diff --git a/README.html b/README.html index 5b9a8dcb..840132ba 100644 --- a/README.html +++ b/README.html @@ -1,32 +1,38 @@ -

JSON-C - A JSON implementation in C

-

Latest release: json-c-0.1.tar.gz

- -

JSON-C implements a reference counting object model that allows you -to easily construct JSON objects in C, output them as JSON formatted strings -and parse JSON formatted strings back into the C representation of JSON -objects.

- -

Minimal documentation exists here, -Although you are probably better reading the example code in test1.c.

- -

JSON-C currently depends on some gcc 3.0+ features so can probably only be - compiled with gcc 3.0+. It also uses some specifc glibc functions such as - vasprintf. Patches welcome to port to other compilers / platforms.

- -

Please send bug reports to michael@metaparadigm.com

- -

Anonymous CVS

-

# export CVSROOT=:pserver:anoncvs@cvs.metaparadigm.com:/cvsroot
-# cvs login
-Logging in to :pserver:anoncvs@cvs.metaparadigm.com:2401/cvsroot
-CVS password: <enter 'anoncvs'>
-# cvs co json-c

- -

Copyright Metaparadigm Pte. Ltd. 2004. Michael Clark

- -

This program is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public (LGPL) -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version.

- -
+ + + + JSON-C - A JSON implementation in C + + + +

JSON-C - A JSON implementation in C

+

Latest release: json-c-0.2.tar.gz

+

JSON-C implements a reference counting object model that allows you to easily + construct JSON objects in C, output them as JSON formatted strings and parse + JSON formatted strings back into the C representation of JSON objects.

+

Minimal documentation exists here, + Although you are probably better reading the example code in test1.c.

+

To setup JSON-C to build on your system please run configure before + compiling. If you are on Win32 and are not using the VS project file, be sure + to rename config.h.win32 to config.h before building.

+

Win32 specific notes can be found here.

+

Please send bug reports to michael@metaparadigm.com

+

Please send Win32 bug reports to christopher.watford@gmail.com

+

Anonymous CVS

+

# export CVSROOT=:pserver:anoncvs@cvs.metaparadigm.com:/cvsroot
+ # cvs login
+ Logging in to :pserver:anoncvs@cvs.metaparadigm.com:2401/cvsroot
+ CVS password: <enter 'anoncvs'>
+ # cvs co json-c

+

Copyright Metaparadigm Pte. Ltd. 2004. Michael + Clark +

+

This program is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public (LGPL) License as published by the + Free Software Foundation; either version 2.1 of the License, or (at your + option) any later version.

+
+ + diff --git a/arraylist.c b/arraylist.c index 854d1306..be93e263 100644 --- a/arraylist.c +++ b/arraylist.c @@ -1,5 +1,5 @@ /* - * $Id: arraylist.c,v 1.2 2004/07/21 01:24:33 mclark Exp $ + * $Id: arraylist.c,v 1.3 2005/06/14 22:41:51 mclark Exp $ * * Copyright Metaparadigm Pte. Ltd. 2004. * Michael Clark @@ -16,14 +16,20 @@ * */ -#include -#include -#include +#include "config.h" + +#if STDC_HEADERS +# include +# include +#endif /* STDC_HEADERS */ + +#if HAVE_STRINGS_H +# include +#endif /* HAVE_STRINGS_H */ #include "bits.h" #include "arraylist.h" - struct array_list* array_list_new(array_list_free_fn *free_fn) { @@ -66,7 +72,7 @@ static int array_list_expand_internal(struct array_list *this, int max) new_size = max(this->size << 1, max); if(!(t = realloc(this->array, new_size*sizeof(void*)))) return -1; this->array = t; - bzero(this->array + this->size, (new_size-this->size)*sizeof(void*)); + (void)memset(this->array + this->size, 0, (new_size-this->size)*sizeof(void*)); this->size = new_size; return 0; } diff --git a/bits.h b/bits.h index 39b25d7f..41e65923 100644 --- a/bits.h +++ b/bits.h @@ -1,5 +1,5 @@ /* - * $Id: bits.h,v 1.3 2004/07/21 10:10:22 mclark Exp $ + * $Id: bits.h,v 1.4 2005/06/14 22:41:51 mclark Exp $ * * Copyright Metaparadigm Pte. Ltd. 2004. * Michael Clark @@ -19,20 +19,35 @@ #ifndef _bits_h_ #define _bits_h_ +#include "config.h" + +#if STDC_HEADERS +# include +#endif /* STDC_HEADERS */ + +/* CAW: wrapped in ifndef's to make win32 compliant +** this fails to take over GCC specifics, but this +** seems to be unimportant. + */ + +#ifndef min #define min(x,y) ({ \ typeof(x) _x = (x); \ typeof(y) _y = (y); \ (void) (&_x == &_y); \ _x < _y ? _x : _y; }) +#endif +#ifndef max #define max(x,y) ({ \ typeof(x) _x = (x); \ typeof(y) _y = (y); \ (void) (&_x == &_y); \ _x > _y ? _x : _y; }) +#endif #define hexdigit(x) (((x) <= '9') ? (x) - '0' : ((x) & 7) + 9) #define error_ptr(error) ((void*)error) -#define is_error(ptr) ((unsigned long)ptr > (unsigned long)-4000L) +#define is_error(ptr) ((ptrdiff_t)ptr < (ptrdiff_t)-4000L) #endif diff --git a/config.h.in b/config.h.in new file mode 100644 index 00000000..83ab7973 --- /dev/null +++ b/config.h.in @@ -0,0 +1,117 @@ +/* config.h.in. Generated from configure.in by autoheader. */ + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +#undef HAVE_DOPRNT + +/* Define to 1 if you have the header file. */ +#undef HAVE_FCNTL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIMITS_H + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#undef HAVE_MALLOC + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `open' function. */ +#undef HAVE_OPEN + +/* Define to 1 if your system has a GNU libc compatible `realloc' function, + and to 0 otherwise. */ +#undef HAVE_REALLOC + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDARG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `strerror' function. */ +#undef HAVE_STRERROR + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strncasecmp' function. */ +#undef HAVE_STRNCASECMP + +/* Define to 1 if you have the `strndup' function. */ +#undef HAVE_STRNDUP + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYSLOG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the `vasprintf' function. */ +#undef HAVE_VASPRINTF + +/* Define to 1 if you have the `vprintf' function. */ +#undef HAVE_VPRINTF + +/* Define to 1 if you have the `vsnprintf' function. */ +#undef HAVE_VSNPRINTF + +/* Define to 1 if you have the `vsyslog' function. */ +#undef HAVE_VSYSLOG + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Version number of package */ +#undef VERSION + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define to rpl_malloc if the replacement function should be used. */ +#undef malloc + +/* Define to rpl_realloc if the replacement function should be used. */ +#undef realloc + +/* Define to `unsigned' if does not define. */ +#undef size_t diff --git a/config.h.win32 b/config.h.win32 new file mode 100644 index 00000000..878d6c3d --- /dev/null +++ b/config.h.win32 @@ -0,0 +1,101 @@ +/* + * $Id: config.h.win32,v 1.1 2005/06/14 22:41:51 mclark Exp $ + * + * Copyright Metaparadigm Pte. Ltd. 2004. + * Michael Clark + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public (LGPL) + * License as published by the Free Software Foundation; either + * version 2.1 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 + * Lesser General Public License for more details: http://www.gnu.org/ + * + */ + +/* config.h.win32 Generated by configure. */ + +#define PACKAGE_STRING "JSON C Library 0.2" +#define PACKAGE_BUGREPORT "michael@metaparadigm.com" +#define PACKAGE_NAME "JSON C Library" +#define PACKAGE_TARNAME "json-c" +#define PACKAGE_VERSION "0.2" + +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +/* #undef HAVE_DOPRNT */ + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#define HAVE_MALLOC 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `open' function. */ +#undef HAVE_OPEN + +/* Define to 1 if your system has a GNU libc compatible `realloc' function, + and to 0 otherwise. */ +#define HAVE_REALLOC 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strdup' function. */ +#undef HAVE_STRNDUP + +/* Define to 1 if you have the header file. */ +#define HAVE_STDARG_H 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYSLOG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the `vprintf' function. */ +#undef HAVE_VPRINTF + +/* Define to 1 if you have the `vsyslog' function. */ +#undef HAVE_VSYSLOG + +/* Define to 1 if you have the `strncasecmp' function. */ +#undef HAVE_STRNCASECMP + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 diff --git a/configure.in b/configure.in new file mode 100644 index 00000000..4f7ec9d1 --- /dev/null +++ b/configure.in @@ -0,0 +1,33 @@ +AC_PREREQ(2.52) + +# Process this file with autoconf to produce a configure script. +AC_INIT([JSON C Library], 0.2, [michael@metaparadigm.com], [json-c]) + +AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) + +# Checks for programs. + +# Checks for libraries. + +# Checks for header files. +AM_CONFIG_HEADER(config.h) +AC_HEADER_STDC +AC_CHECK_HEADERS(fcntl.h limits.h strings.h syslog.h unistd.h [sys/param.h] stdarg.h) + +# Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_TYPE_SIZE_T + +# Checks for library functions. +AC_FUNC_VPRINTF +AC_FUNC_MEMCMP +AC_FUNC_MALLOC +AC_FUNC_REALLOC +AC_CHECK_FUNCS(strndup strerror vsnprintf vasprintf open vsyslog strncasecmp) + +AM_PROG_LIBTOOL + +AC_OUTPUT([ +Makefile +json.pc +]) diff --git a/debug.c b/debug.c index 6ae1ca3c..a4d12f17 100644 --- a/debug.c +++ b/debug.c @@ -1,5 +1,5 @@ /* - * $Id: debug.c,v 1.3 2004/08/07 03:11:38 mclark Exp $ + * $Id: debug.c,v 1.4 2005/06/14 22:41:51 mclark Exp $ * * Copyright Metaparadigm Pte. Ltd. 2004. * Michael Clark @@ -16,17 +16,27 @@ * */ +#include "config.h" + #include #include #include #include -#include -#include + +#if HAVE_SYSLOG_H +# include +#endif /* HAVE_SYSLOG_H */ + +#if HAVE_UNISTD_H +# include +#endif /* HAVE_UNISTD_H */ + +#if HAVE_SYS_PARAM_H #include +#endif /* HAVE_SYS_PARAM_H */ #include "debug.h" - static int _syslog = 0; static int _debug = 0; @@ -42,8 +52,12 @@ void mc_abort(const char *msg, ...) { va_list ap; va_start(ap, msg); - if(_syslog) vsyslog(LOG_ERR, msg, ap); - else vprintf(msg, ap); +#if HAVE_VSYSLOG + if(_syslog) { + vsyslog(LOG_ERR, msg, ap); + } else +#endif + vprintf(msg, ap); exit(1); } @@ -53,8 +67,12 @@ void mc_debug(const char *msg, ...) va_list ap; if(_debug) { va_start(ap, msg); - if(_syslog) vsyslog(LOG_DEBUG, msg, ap); - else vprintf(msg, ap); +#if HAVE_VSYSLOG + if(_syslog) { + vsyslog(LOG_DEBUG, msg, ap); + } else +#endif + vprintf(msg, ap); } } @@ -62,14 +80,22 @@ void mc_error(const char *msg, ...) { va_list ap; va_start(ap, msg); - if(_syslog) vsyslog(LOG_ERR, msg, ap); - else vfprintf(stderr, msg, ap); +#if HAVE_VSYSLOG + if(_syslog) { + vsyslog(LOG_ERR, msg, ap); + } else +#endif + vfprintf(stderr, msg, ap); } void mc_info(const char *msg, ...) { va_list ap; va_start(ap, msg); - if(_syslog) vsyslog(LOG_INFO, msg, ap); - else vfprintf(stderr, msg, ap); +#if HAVE_VSYSLOG + if(_syslog) { + vsyslog(LOG_INFO, msg, ap); + } else +#endif + vfprintf(stderr, msg, ap); } diff --git a/debug.h b/debug.h index a52e62a1..581b76d2 100644 --- a/debug.h +++ b/debug.h @@ -1,5 +1,5 @@ /* - * $Id: debug.h,v 1.2 2004/07/21 01:24:33 mclark Exp $ + * $Id: debug.h,v 1.3 2005/06/14 22:41:51 mclark Exp $ * * Copyright Metaparadigm Pte. Ltd. 2004. * Michael Clark @@ -19,7 +19,13 @@ #ifndef _DEBUG_H_ #define _DEBUG_H_ +#include "config.h" + +#if HAVE_STRERROR #define errstr strerror(errno) +#else /* !HAVE_STRERROR */ +#define errstr +#endif /* HAVE_STRERROR */ extern void mc_set_debug(int debug); extern int mc_get_debug(); diff --git a/json-c.vcproj b/json-c.vcproj new file mode 100644 index 00000000..0b887544 --- /dev/null +++ b/json-c.vcproj @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/json.pc.in b/json.pc.in new file mode 100644 index 00000000..b3d140be --- /dev/null +++ b/json.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: json +Description: JSON implementation in C +Version: @VERSION@ +Requires: +Libs: -L${libdir} -ljson +Cflags: -I${includedir}/json diff --git a/json_object.c b/json_object.c index a7b0c1de..b88aa4d6 100644 --- a/json_object.c +++ b/json_object.c @@ -1,5 +1,5 @@ /* - * $Id: json_object.c,v 1.10 2004/08/07 03:12:43 mclark Exp $ + * $Id: json_object.c,v 1.13 2005/06/14 22:41:51 mclark Exp $ * * Copyright Metaparadigm Pte. Ltd. 2004. * Michael Clark @@ -16,6 +16,8 @@ * */ +#include "config.h" + #include #include #include @@ -26,9 +28,9 @@ #include "arraylist.h" #include "json_object.h" #include "json_object_private.h" +#include "json_tokener.h" - -/* #define REFCOUNT_DEBUG */ +/* #define REFCOUNT_DEBUG 1 */ char *json_number_chars = "0123456789.+-e"; char *json_hex_chars = "0123456789abcdef"; @@ -43,7 +45,7 @@ static char* json_type_name[] = { "array", "string", }; -#endif +#endif /* REFCOUNT_DEBUG */ static void json_object_generic_delete(struct json_object* this); static struct json_object* json_object_new(enum json_type o_type); @@ -75,7 +77,7 @@ static void json_object_fini() { mc_debug("json_object_fini: freeing object table\n"); lh_table_free(json_object_table); } -#endif +#endif /* REFCOUNT_DEBUG */ /* string escaping */ @@ -91,12 +93,14 @@ static int json_escape_str(struct printbuf *pb, char *str) case '\n': case '\r': case '\t': + case '"': if(pos - start_offset > 0) printbuf_memappend(pb, str + start_offset, pos - start_offset); if(c == '\b') printbuf_memappend(pb, "\\b", 2); else if(c == '\n') printbuf_memappend(pb, "\\n", 2); else if(c == '\r') printbuf_memappend(pb, "\\r", 2); else if(c == '\t') printbuf_memappend(pb, "\\t", 2); + else if(c == '"') printbuf_memappend(pb, "\\\"", 2); start_offset = ++pos; break; default: @@ -143,7 +147,7 @@ static void json_object_generic_delete(struct json_object* this) mc_debug("json_object_delete_%s: %p\n", json_type_name[this->o_type], this); lh_table_delete(json_object_table, this); -#endif +#endif /* REFCOUNT_DEBUG */ printbuf_free(this->_pb); free(this); } @@ -158,7 +162,7 @@ static struct json_object* json_object_new(enum json_type o_type) #ifdef REFCOUNT_DEBUG lh_table_insert(json_object_table, this, this); mc_debug("json_object_new_%s: %p\n", json_type_name[this->o_type], this); -#endif +#endif /* REFCOUNT_DEBUG */ return this; } @@ -197,16 +201,21 @@ static int json_object_object_to_json_string(struct json_object* this, struct printbuf *pb) { int i=0; + struct json_object_iter iter; sprintbuf(pb, "{"); - json_object_object_foreach(this, key, val) { - if(i) sprintbuf(pb, ","); - sprintbuf(pb, " \""); - json_escape_str(pb, key); - sprintbuf(pb, "\": "); - if(val == NULL) sprintbuf(pb, "null"); - else val->_to_json_string(val, pb); - i++; - } + + /* CAW: scope operator to make ANSI correctness */ + /* CAW: switched to json_object_object_foreachC which uses an iterator struct */ + json_object_object_foreachC(this, iter) { + if(i) sprintbuf(pb, ","); + sprintbuf(pb, " \""); + json_escape_str(pb, iter.key); + sprintbuf(pb, "\": "); + if(iter.val == NULL) sprintbuf(pb, "null"); + else iter.val->_to_json_string(iter.val, pb); + i++; + } + return sprintbuf(pb, " }"); } @@ -324,7 +333,7 @@ int json_object_get_int(struct json_object *this) case json_type_int: return this->o.c_int; case json_type_double: - return this->o.c_double; + return (int)this->o.c_double; case json_type_boolean: return this->o.c_boolean; case json_type_string: @@ -426,13 +435,16 @@ char* json_object_get_string(struct json_object *this) static int json_object_array_to_json_string(struct json_object* this, struct printbuf *pb) { + int i; sprintbuf(pb, "["); - for(int i=0; i < json_object_array_length(this); i++) { - if(i) sprintbuf(pb, ", "); - else sprintbuf(pb, " "); - struct json_object *val = json_object_array_get_idx(this, i); - if(val == NULL) sprintbuf(pb, "null"); - else val->_to_json_string(val, pb); + for(i=0; i < json_object_array_length(this); i++) { + struct json_object *val; + if(i) { sprintbuf(pb, ", "); } + else { sprintbuf(pb, " "); } + + val = json_object_array_get_idx(this, i); + if(val == NULL) { sprintbuf(pb, "null"); } + else { val->_to_json_string(val, pb); } } return sprintbuf(pb, " ]"); } diff --git a/json_object.h b/json_object.h index 9fc9bd0f..0f32ead5 100644 --- a/json_object.h +++ b/json_object.h @@ -1,5 +1,5 @@ /* - * $Id: json_object.h,v 1.8 2004/08/07 04:21:27 mclark Exp $ + * $Id: json_object.h,v 1.9 2005/06/14 22:41:51 mclark Exp $ * * Copyright Metaparadigm Pte. Ltd. 2004. * Michael Clark @@ -19,6 +19,8 @@ #ifndef _json_object_h_ #define _json_object_h_ +#include "config.h" + #define JSON_OBJECT_DEF_HASH_ENTIRES 16 #undef FALSE @@ -37,6 +39,7 @@ struct printbuf; struct lh_table; struct array_list; struct json_object; +struct json_object_iter; /* supported object types */ @@ -143,14 +146,30 @@ extern struct json_object* json_object_object_get(struct json_object* this, extern void json_object_object_del(struct json_object* this, char *key); /** Iterate through all keys and values of an object - * @param this the json_object instance + * @param obj the json_object instance * @param key the local name for the char* key variable defined in the body * @param val the local name for the json_object* object variable defined in the body */ -#define json_object_object_foreach(obj,key,val) \ -char *key; struct json_object *val; \ -for(struct lh_entry *entry = json_object_get_object(obj)->head; ({ if(entry) { key = (char*)entry->k; val = (struct json_object*)entry->v; } ; entry; }); entry = entry->next ) +#if defined(__GNUC__) && !defined(__STRICT_ANSI__) + +# define json_object_object_foreach(obj,key,val) \ + char *key; struct json_object *val; \ + for(struct lh_entry *entry = json_object_get_object(obj)->head; ({ if(entry) { key = (char*)entry->k; val = (struct json_object*)entry->v; } ; entry; }); entry = entry->next ) + +#else /* ANSI C or MSC */ +# define json_object_object_foreach(obj,key,val) \ + char *key; struct json_object *val; struct lh_entry *entry; \ + for(entry = json_object_get_object(obj)->head; (entry ? (key = (char*)entry->k, val = (struct json_object*)entry->v, entry) : 0); entry = entry->next) + +#endif /* defined(__GNUC__) && !defined(__STRICT_ANSI__) */ + +/** Iterate through all keys and values of an object (ANSI C Safe) + * @param obj the json_object instance + * @param iter the object iterator + */ +#define json_object_object_foreachC(obj,iter) \ + for(iter.entry = json_object_get_object(obj)->head; (iter.entry ? (iter.key = (char*)iter.entry->k, iter.val = (struct json_object*)iter.entry->v, iter.entry) : 0); iter.entry = iter.entry->next) /* Array type methods */ diff --git a/json_object_private.h b/json_object_private.h index 91ce99c7..45481442 100644 --- a/json_object_private.h +++ b/json_object_private.h @@ -1,3 +1,21 @@ +/* + * $Id: json_object_private.h,v 1.3 2005/06/14 22:41:51 mclark Exp $ + * + * Copyright Metaparadigm Pte. Ltd. 2004. + * Michael Clark + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public (LGPL) + * License as published by the Free Software Foundation; either + * version 2.1 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 + * Lesser General Public License for more details: http://www.gnu.org/ + * + */ + #ifndef _json_object_private_h_ #define _json_object_private_h_ @@ -22,4 +40,12 @@ struct json_object } o; }; +/* CAW: added for ANSI C iteration correctness */ +struct json_object_iter +{ + char *key; + struct json_object *val; + struct lh_entry *entry; +}; + #endif diff --git a/json_tokener.c b/json_tokener.c index bb65381c..668d749a 100644 --- a/json_tokener.c +++ b/json_tokener.c @@ -1,5 +1,5 @@ /* - * $Id: json_tokener.c,v 1.10 2004/07/27 00:42:31 mclark Exp $ + * $Id: json_tokener.c,v 1.14 2005/06/14 22:41:51 mclark Exp $ * * Copyright Metaparadigm Pte. Ltd. 2004. * Michael Clark @@ -16,6 +16,8 @@ * */ +#include "config.h" + #include #include #include @@ -28,7 +30,6 @@ #include "json_object.h" #include "json_tokener.h" - static struct json_object* json_tokener_do_parse(struct json_tokener *this); struct json_object* json_tokener_parse(char * s) @@ -44,6 +45,27 @@ struct json_object* json_tokener_parse(char * s) return obj; } +#if !HAVE_STRNDUP +/* CAW: compliant version of strndup() */ +char* strndup(const char* str, size_t n) +{ + if(str) { + size_t len = strlen(str); + size_t nn = min(len,n); + char* s = (char*)malloc(sizeof(char) * (nn + 1)); + + if(s) { + memcpy(s, str, nn); + s[nn] = '\0'; + } + + return s; + } + + return NULL; +} +#endif + static struct json_object* json_tokener_do_parse(struct json_tokener *this) { enum json_tokener_state state, saved_state; @@ -52,11 +74,11 @@ static struct json_object* json_tokener_do_parse(struct json_tokener *this) char *obj_field_name = NULL; char quote_char; int deemed_double, start_offset; + char c; state = json_tokener_state_eatws; saved_state = json_tokener_state_start; - char c; do { c = this->source[this->pos]; switch(state) { @@ -105,7 +127,20 @@ static struct json_object* json_tokener_do_parse(struct json_tokener *this) state = json_tokener_state_boolean; start_offset = this->pos++; break; - case '0' ... '9': +#if defined(__GNUC__) + case '0' ... '9': +#else + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': +#endif case '-': deemed_double = 0; state = json_tokener_state_number; @@ -422,5 +457,5 @@ static struct json_object* json_tokener_do_parse(struct json_tokener *this) mc_debug("json_tokener_do_parse: error=%d state=%d char=%c\n", err, state, c); json_object_put(current); - return error_ptr(-err); + return error_ptr((ptrdiff_t)-err); } diff --git a/json_tokener.h b/json_tokener.h index c39577d3..9bdf2387 100644 --- a/json_tokener.h +++ b/json_tokener.h @@ -1,5 +1,5 @@ /* - * $Id: json_tokener.h,v 1.5 2004/07/22 01:20:05 mclark Exp $ + * $Id: json_tokener.h,v 1.6 2005/06/14 22:41:51 mclark Exp $ * * Copyright Metaparadigm Pte. Ltd. 2004. * Michael Clark @@ -19,6 +19,7 @@ #ifndef _json_tokener_h_ #define _json_tokener_h_ +#include "config.h" #include "json_object.h" enum json_tokener_error { @@ -65,6 +66,17 @@ struct json_tokener struct printbuf *pb; }; +#if !HAVE_STRNCASECMP && defined(_MSC_VER) + /* MSC has the version as _strnicmp */ +# define strncasecmp _strnicmp +#elif !HAVE_STRNCASECMP +# error You do not have strncasecmp on your system. +#endif /* HAVE_STRNCASECMP */ + +#if !HAVE_STRNDUP + char* strndup(const char* str, size_t n); +#endif /* !HAVE_STRNDUP */ + extern struct json_object* json_tokener_parse(char *s); #endif diff --git a/json_util.c b/json_util.c index 483644ec..07abd89f 100644 --- a/json_util.c +++ b/json_util.c @@ -1,11 +1,50 @@ +/* + * $Id: json_util.c,v 1.2 2005/06/14 22:41:51 mclark Exp $ + * + * Copyright Metaparadigm Pte. Ltd. 2004. + * Michael Clark + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public (LGPL) + * License as published by the Free Software Foundation; either + * version 2.1 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 + * Lesser General Public License for more details: http://www.gnu.org/ + * + */ + +#include "config.h" + #include #include +#include #include #include -#include + +#if HAVE_SYS_TYPES_H #include +#endif /* HAVE_SYS_TYPES_H */ + +#if HAVE_SYS_STAT_H #include +#endif /* HAVE_SYS_STAT_H */ + +#if HAVE_FCNTL_H #include +#endif /* HAVE_FCNTL_H */ + +#if HAVE_UNISTD_H +# include +#endif /* HAVE_UNISTD_H */ + +#ifdef WIN32 +# define WIN32_LEAN_AND_MEAN +# include +# include +#endif /* defined(WIN32) */ #include "bits.h" #include "debug.h" @@ -14,7 +53,6 @@ #include "json_tokener.h" #include "json_util.h" - struct json_object* json_object_from_file(char *filename) { struct printbuf *pb; @@ -49,7 +87,8 @@ struct json_object* json_object_from_file(char *filename) int json_object_to_file(char *filename, struct json_object *obj) { char *json_str; - int fd, ret, wpos, wsize; + int fd, ret; + unsigned int wpos, wsize; if(!obj) { mc_error("json_object_to_file: object is null\n"); @@ -61,8 +100,11 @@ int json_object_to_file(char *filename, struct json_object *obj) filename, strerror(errno)); return -1; } - if(!(json_str = json_object_to_json_string(obj))) return -1; - wsize = strlen(json_str); + + if(!(json_str = json_object_to_json_string(obj))) { return -1; } + + + wsize = (unsigned int)(strlen(json_str) & UINT_MAX); /* CAW: probably unnecessary, but the most 64bit safe */ wpos = 0; while(wpos < wsize) { if((ret = write(fd, json_str + wpos, wsize-wpos)) < 0) { @@ -71,7 +113,9 @@ int json_object_to_file(char *filename, struct json_object *obj) filename, strerror(errno)); return -1; } - wpos += ret; + + /* because of the above check for ret < 0, we can safely cast and add */ + wpos += (unsigned int)ret; } close(fd); diff --git a/json_util.h b/json_util.h index 32a04283..39154196 100644 --- a/json_util.h +++ b/json_util.h @@ -1,8 +1,37 @@ +/* + * $Id: json_util.h,v 1.2 2005/06/14 22:41:51 mclark Exp $ + * + * Copyright Metaparadigm Pte. Ltd. 2004. + * Michael Clark + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public (LGPL) + * License as published by the Free Software Foundation; either + * version 2.1 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 + * Lesser General Public License for more details: http://www.gnu.org/ + * + */ + #ifndef _json_util_h_ #define _json_util_h_ +#include "config.h" + +#ifdef WIN32 +# define WIN32_LEAN_AND_MEAN +# include +# include +#endif + #include "json_object.h" +#if !HAVE_OPEN && defined(WIN32) +# define open _open +#endif #define JSON_FILE_BUF_SIZE 4096 diff --git a/linkhash.c b/linkhash.c index b67eee7b..81abc48b 100644 --- a/linkhash.c +++ b/linkhash.c @@ -1,5 +1,5 @@ /* - * $Id: linkhash.c,v 1.2 2004/07/21 01:24:33 mclark Exp $ + * $Id: linkhash.c,v 1.3 2005/06/14 22:41:51 mclark Exp $ * * Copyright Metaparadigm Pte. Ltd. 2004. * Michael Clark @@ -16,14 +16,17 @@ * */ +#include "config.h" + #include #include #include #include +#include +#include #include "linkhash.h" - void lh_abort(const char *msg, ...) { va_list ap; @@ -32,19 +35,17 @@ void lh_abort(const char *msg, ...) exit(1); } - unsigned long lh_ptr_hash(void *k) { - return ((long)k * LH_PRIME) >> 4; + /* CAW: refactored to be 64bit nice */ + return (unsigned long)((((ptrdiff_t)k * LH_PRIME) >> 4) & ULONG_MAX); } - int lh_ptr_equal(void *k1, void *k2) { return (k1 == k2); } - unsigned long lh_char_hash(void *k) { unsigned int h = 0; @@ -55,13 +56,11 @@ unsigned long lh_char_hash(void *k) return h; } - int lh_char_equal(void *k1, void *k2) { return (strcmp((char*)k1, (char*)k2) == 0); } - struct lh_table* lh_table_new(int size, char *name, lh_entry_free_fn *free_fn, lh_hash_fn *hash_fn, @@ -84,21 +83,18 @@ struct lh_table* lh_table_new(int size, char *name, return t; } - struct lh_table* lh_kchar_table_new(int size, char *name, lh_entry_free_fn *free_fn) { return lh_table_new(size, name, free_fn, lh_char_hash, lh_char_equal); } - struct lh_table* lh_kptr_table_new(int size, char *name, lh_entry_free_fn *free_fn) { return lh_table_new(size, name, free_fn, lh_ptr_hash, lh_ptr_equal); } - void lh_table_resize(struct lh_table *t, int new_size) { struct lh_table *new_t; @@ -119,7 +115,6 @@ void lh_table_resize(struct lh_table *t, int new_size) free(new_t); } - void lh_table_free(struct lh_table *t) { struct lh_entry *c; @@ -193,7 +188,11 @@ void* lh_table_lookup(struct lh_table *t, void *k) int lh_table_delete_entry(struct lh_table *t, struct lh_entry *e) { - int n = e - t->table; + ptrdiff_t n = (ptrdiff_t)(e - t->table); /* CAW: fixed to be 64bit nice, still need the crazy negative case... */ + + /* CAW: this is bad, really bad, maybe stack goes other direction on this machine... */ + if(n < 0) { return -2; } + if(t->table[n].k == LH_EMPTY || t->table[n].k == LH_FREED) return -1; t->count--; if(t->free_fn) t->free_fn(e); diff --git a/linkhash.h b/linkhash.h index c61e4196..d6be31d3 100644 --- a/linkhash.h +++ b/linkhash.h @@ -1,5 +1,5 @@ /* - * $Id: linkhash.h,v 1.3 2004/08/07 03:29:47 mclark Exp $ + * $Id: linkhash.h,v 1.4 2005/06/14 22:41:51 mclark Exp $ * * Copyright Metaparadigm Pte. Ltd. 2004. * Michael Clark @@ -19,6 +19,8 @@ #ifndef _linkhash_h_ #define _linkhash_h_ +#include "config.h" + /** * golden prime used in hash functions */ @@ -34,10 +36,8 @@ */ #define LH_FREED (void*)-2 - struct lh_entry; - /** * callback function prototypes */ diff --git a/printbuf.c b/printbuf.c index 76c04e4f..7e70fb0d 100644 --- a/printbuf.c +++ b/printbuf.c @@ -1,5 +1,5 @@ /* - * $Id: printbuf.c,v 1.3 2004/08/07 03:12:21 mclark Exp $ + * $Id: printbuf.c,v 1.4 2005/06/14 22:41:51 mclark Exp $ * * Copyright Metaparadigm Pte. Ltd. 2004. * Michael Clark @@ -16,16 +16,22 @@ * */ +#include "config.h" + #include #include -#include #include +#if HAVE_STDARG_H +# include +#else /* !HAVE_STDARG_H */ +# error Not enough var arg support! +#endif /* HAVE_STDARG_H */ + #include "bits.h" #include "debug.h" #include "printbuf.h" - struct printbuf* printbuf_new() { struct printbuf *p; @@ -46,11 +52,11 @@ int printbuf_memappend(struct printbuf *p, char *buf, int size) char *t; if(p->size - p->bpos <= size) { int new_size = max(p->size * 2, p->bpos + size + 8); -#if 0 +#ifdef PRINTBUF_DEBUG mc_debug("printbuf_memappend: realloc " "bpos=%d wrsize=%d old_size=%d new_size=%d\n", p->bpos, size, p->size, new_size); -#endif +#endif /* PRINTBUF_DEBUG */ if(!(t = realloc(p->buf, new_size))) return -1; p->size = new_size; p->buf = t; @@ -61,6 +67,46 @@ int printbuf_memappend(struct printbuf *p, char *buf, int size) return size; } +#if !HAVE_VSNPRINTF && defined(WIN32) +# define vsnprintf _vsnprintf +#elif !HAVE_VSNPRINTF /* !HAVE_VSNPRINTF */ +# error Need vsnprintf! +#endif /* !HAVE_VSNPRINTF && defined(WIN32) */ + +#if !HAVE_VASPRINTF +/* CAW: compliant version of vasprintf */ +static int vasprintf(char **buf, const char *fmt, va_list ap) +{ +#ifndef WIN32 + static char _T_emptybuffer = '\0'; +#endif /* !defined(WIN32) */ + int chars; + char *b; + + if(!buf) { return -1; } + +#ifdef WIN32 + chars = _vscprintf(fmt, ap)+1; +#else /* !defined(WIN32) */ + /* CAW: RAWR! We have to hope to god here that vsnprintf doesn't overwrite + our buffer like on some 64bit sun systems.... but hey, its time to move on */ + chars = vsnprintf(&_T_emptybuffer, 0, fmt, ap)+1; + if(chars < 0) { chars *= -1; } /* CAW: old glibc versions have this problem */ +#endif /* defined(WIN32) */ + + b = (char*)malloc(sizeof(char)*chars); + if(!b) { return -1; } + + if((chars = vsprintf(b, fmt, ap)) < 0) + { + free(b); + } else { + *buf = b; + } + + return chars; +} +#endif /* !HAVE_VASPRINTF */ int sprintbuf(struct printbuf *p, const char *msg, ...) { @@ -76,7 +122,7 @@ int sprintbuf(struct printbuf *p, const char *msg, ...) /* if string is greater than stack buffer, then use dynamic string with vasprintf. Note: some implementation of vsnprintf return -1 if output is truncated whereas some return the number of bytes that - would have been writeen - this code handles both cases. */ + would have been writen - this code handles both cases. */ if(size == -1 || size > 127) { int ret; va_start(ap, msg); @@ -90,7 +136,6 @@ int sprintbuf(struct printbuf *p, const char *msg, ...) } } - void printbuf_reset(struct printbuf *p) { p->buf[0] = '\0'; diff --git a/printbuf.h b/printbuf.h index 6a9568f7..6f43a0ec 100644 --- a/printbuf.h +++ b/printbuf.h @@ -1,5 +1,5 @@ /* - * $Id: printbuf.h,v 1.2 2004/07/21 01:24:33 mclark Exp $ + * $Id: printbuf.h,v 1.3 2005/06/14 22:41:51 mclark Exp $ * * Copyright Metaparadigm Pte. Ltd. 2004. * Michael Clark @@ -19,6 +19,8 @@ #ifndef _printbuf_h_ #define _printbuf_h_ +#undef PRINTBUF_DEBUG + struct printbuf { char *buf; int bpos; diff --git a/test1.c b/test1.c index b65a7cdb..2376d4a8 100644 --- a/test1.c +++ b/test1.c @@ -4,7 +4,6 @@ #include "json.h" - int main(int argc, char **argv) { struct json_object *my_string, *my_int, *my_object, *my_array; -- 2.47.2