gopher-validator rewrite in C - gopher-validator - Simple gopher menu validator.
(HTM) git clone git://bitreich.org/gopher-validator git://enlrupgkhuxnvlhsf6lc3fziv5h2hhfrinws65d7roiv6bfj7d652fid.onion/gopher-validator
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) Tags
(DIR) README
(DIR) LICENSE
---
(DIR) commit 5ca656215b1e77b7fef4dcf37cd6e429146b9426
(DIR) parent 668e42abfef42e56f315c54ad8aea639f02871ca
(HTM) Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Mon, 22 Jul 2019 18:54:33 +0200
gopher-validator rewrite in C
gopher-validator is now a client of it's own and validates more things
according to the official RFC spec. It does not depend on sacc anymore.
Diffstat:
M LICENSE | 685 +------------------------------
M Makefile | 84 ++++++++++++++++++-------------
A README | 13 +++++++++++++
A TODO | 1 +
D gopher-validator | 10 ----------
M gopher-validator.1 | 88 ++++++++++++++++++++-----------
A gopher-validator.c | 529 +++++++++++++++++++++++++++++++
7 files changed, 661 insertions(+), 749 deletions(-)
---
(DIR) diff --git a/LICENSE b/LICENSE
@@ -1,676 +1,15 @@
-© 2018 Christoph Lohmann <20h at r-36 dot net>
+ISC License
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
+Copyright (c) 2018-2019 Hiltjo Posthuma <hiltjo@codemadness.org>
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, 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
-them 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 prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If 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 convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU 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
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state 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 program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
(DIR) diff --git a/Makefile b/Makefile
@@ -1,47 +1,59 @@
-# gopher-validator - a tiny gopher validator
-# See LICENSE file for copyright and license details.
.POSIX:
+# paths
+PREFIX = /usr/local
+MANPREFIX = ${PREFIX}/man
+
+# compiler and linker
+CC = cc
+
NAME = gopher-validator
VERSION = 0.1
+BIN = ${NAME}
+SRC = ${BIN:=.c}
+OBJ = ${BIN:=.o}
+MAN1 = ${BIN:=.1}
+DOC = LICENSE README
-PREFIX = /usr/local
-BINDIR = ${PREFIX}/bin
-MANDIR = ${PREFIX}/share/man/man1
+# build static: useful in a chroot.
+#LDFLAGS += -static
+# Linux
+#CPPFLAGS += -D_DEFAULT_SOURCE
+
+all: ${BIN}
-all: info ${NAME}
+${BIN}: ${OBJ}
+ ${CC} -o $@ ${OBJ} ${LDFLAGS}
-info:
- @echo Just run make install.
+${OBJ}: Makefile
clean:
- @echo cleaning
- @rm -f ${NAME}-${VERSION}.tar.gz
-
-install: all
- @echo installing script to ${DESTDIR}${BINDIR}
- @mkdir -p "${DESTDIR}${BINDIR}"
- @cp -f ${NAME} "${DESTDIR}${BINDIR}"
- @chmod 755 "${DESTDIR}${BINDIR}/${NAME}"
- @echo installing manpage to "${DESTDIR}${MANDIR}"
- @mkdir -p "${DESTDIR}${MANDIR}"
- @cp -f ${NAME}.1 "${DESTDIR}${MANDIR}"
- @chmod 644 "${DESTDIR}${MANDIR}/${NAME}.1"
+ rm -f ${BIN} ${OBJ}
+
+install:
+ # installing executable files and scripts.
+ mkdir -p "${DESTDIR}${PREFIX}/bin"
+ cp -f ${BIN} "${DESTDIR}${PREFIX}/bin"
+ for f in ${BIN}; do chmod 755 "${DESTDIR}${PREFIX}/bin/$$f"; done
+ # installing manual pages for general commands: section 1.
+ mkdir -p "${DESTDIR}${MANPREFIX}/man1"
+ cp -f ${MAN1} "${DESTDIR}${MANPREFIX}/man1"
+ for m in ${MAN1}; do chmod 644 "${DESTDIR}${MANPREFIX}/man1/$$m"; done
uninstall:
- @echo removing executable file from ${DESTDIR}${BINDIR}
- @rm -f "${DESTDIR}${BINDIR}/${NAME}"
- @echo removing manpage from "${DESTDIR}${MANDIR}"
- @rm -f "${DESTDIR}${MANDIR}/${NAME}.8"
-
-dist: clean
- @echo creating dist tarball
- @mkdir -p ${NAME}-${VERSION}
- @cp -R README LICENSE Makefile ${NAME}.1 \
- ${NAME}-${VERSION}
- @tar -cf ${NAME}-${VERSION}.tar ${NAME}-${VERSION}
- @gzip ${NAME}-${VERSION}.tar
- @mv ${NAME}-${VERSION}.tar.gz ${NAME}-${VERSION}.tgz
- @rm -rf "${NAME}-${VERSION}"
-
-.PHONY: all info clean dist install uninstall
+ # removing executable files and scripts.
+ for f in ${BIN}; do rm -f "${DESTDIR}${PREFIX}/bin/$$f"; done
+ # removing manual pages.
+ for m in ${MAN1}; do rm -f "${DESTDIR}${MANPREFIX}/man1/$$m"; done
+
+dist:
+ rm -rf "${NAME}-${VERSION}"
+ mkdir -p "${NAME}-${VERSION}"
+ cp -f ${DOC} ${MAN1} ${SRC} Makefile "${NAME}-${VERSION}"
+ # make tarball
+ tar -cf - "${NAME}-${VERSION}" | \
+ gzip -c > "${NAME}-${VERSION}.tar.gz"
+ rm -rf "${NAME}-${VERSION}"
+
+
+.PHONY: all clean dist install uninstall
(DIR) diff --git a/README b/README
@@ -0,0 +1,13 @@
+gopher-validator
+----------------
+
+Validate Gopher directory and search types.
+
+
+Dependencies
+------------
+
+- C compiler.
+- libc + some BSD extensions (dprintf).
+- POSIX system.
+- make (optional).
(DIR) diff --git a/TODO b/TODO
@@ -0,0 +1 @@
+- allow CGI-mode for HTTP (add header), keep compatible with Gopher CGI.
(DIR) diff --git a/gopher-validator b/gopher-validator
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# See the LICENSE for licensing details.
-#
-
-result="$(sacc "$@" | grep "^!")" || printf "valid\n" && exit 0
-
-printf "Errors found\n%s\n" "${result}"
-exit 1
-
(DIR) diff --git a/gopher-validator.1 b/gopher-validator.1
@@ -1,43 +1,71 @@
-.Dd August 10, 2018
-.Dt GEOMYIDAE 1
+.Dd July 22, 2019
+.Dt GOPHER-VALIDATOR 1
.Os
-.
.Sh NAME
.Nm gopher-validator
.Nd a simple gopher validator
-.
.Sh SYNOPSIS
.Nm
-URL
-.
+.Op Ar url
.Sh DESCRIPTION
-.Bd -filled
.Nm
-is a simple script to validate gopher content served on some URI/selector in a
-gopher menu. The menu structure is defined in the RFC 1436 (Gopher).
+reads raw Gopher data from stdin.
+.Pp
+When an
+.Ar url
+is specified it retrieves the raw Gopher data from this url.
+.Pp
+When the environment variable
+.Ev QUERY_STRING
+is set the program runs in Command Gateway Interface (CGI) mode.
+It will use the content of this variable as if it was
+.Ar url .
+.Pp
.Nm
-is using sacc(1) as the gopher protocol implementation.
+validates Gopher data of directory (1) and search types (7).
+.Sh DIAGNOSTICS
+The following output format is used for the fatal, error and warning messages.
+These are prefixed with the following texts:
+.Bl -tag -width Ds
+.It Qq "fatal: "
+.Pp
+Fatal program errors such as connection errors.
+These messages are written to stderr, unless
+.Nm
+runs in CGI mode.
+.It Qq "error: "
+.Pp
+Gopher errors violating the RFC specification.
+These messages are written to stdout.
+.It Qq "warning: "
+.Pp
+Recommendations according to the RFC specification.
+These messages are written to stdout.
+.El
+.Pp
+If possible the messages are also prefixed with the output line number.
+.Sh EXIT STATUS
+When there is a fatal error the exitcode is 2.
+When there is any Gopher error the exitcode is 1.
+When there is no error (could still have a warning) the exitcode is 0.
+.Sh EXAMPLES
+.Bd -literal
+printf '\\r\\n' | nc codemadness.org 70 | gopher-validator
+.Ed
+.Bd -literal
+gopher-validator gopher://codemadness.org/1
.Ed
-.
-.Sh RETURN VALUES
-.Bd -filled
+.Sh SEE ALSO
+.Xr nc 1
+.Sh STANDARDS
+RFC1436 is followed as closely as possible.
+The only deviation is checking for UTF-8 instead of LATIN-1 text encoding,
+for now.
.Nm
-will return an exit status of 1 in case anything went wrong. It will write on
-stdout the error and lines found to be erroneous. If everything went right,
+uses the standard C library locale functions and respects the user locale
+environment.
+To check text encoding it is assumed
.Nm
-will return the string "valid" and an exit status of 0.
-.
-.Sh SEE ALSO
-sacc (1)
-.
+runs in the same locale environment as the server.
.Sh AUTHORS
-See LICENSE file for authors in the distribution.
-.
-.Sh LICENSE
-See LICENSE file for the license.
-.
-.Sh BUGS
-.Ss "Reporting Bugs"
-Report bugs to:
-.An "Christoph Lohmann" Aq 20h@R-36.net
-
+.An Hiltjo Posthuma Aq Mt hiltjo@codemadness.org
(DIR) diff --git a/gopher-validator.c b/gopher-validator.c
@@ -0,0 +1,529 @@
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
+#include <ctype.h>
+#include <errno.h>
+#include <locale.h>
+#include <limits.h>
+#include <netdb.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <wchar.h>
+#include <wctype.h>
+
+#define MAX_RESPONSETIMEOUT 10 /* timeout in seconds */
+
+#ifndef __OpenBSD__
+#define pledge(a,b) 0
+#endif
+
+struct uri {
+ char host[256];
+ char port[8];
+ char path[1024];
+};
+
+struct visited {
+ int _type;
+ char username[1024];
+ char path[1024];
+ char server[256];
+ char port[8];
+};
+
+/* check valid types with extension in path */
+struct {
+ const char *ext;
+ const char *allow;
+} types [] = {
+ { .ext = "md5", "0" },
+ { .ext = "md5sum", "0" },
+ { .ext = "sha1", "0" },
+ { .ext = "sha1sum", "0" },
+ { .ext = "sha256", "0" },
+ { .ext = "sha256sum", "0" },
+ { .ext = "sha512", "0" },
+ { .ext = "sha512sum", "0" },
+ { .ext = "asc", "0" },
+ { .ext = "rss", "0" },
+ { .ext = "xml", "0" },
+ { .ext = "txt", "0" },
+ { .ext = "json", "0" },
+ { .ext = "md", "0" },
+ { .ext = "c", "0" },
+ { .ext = "h", "0" },
+ { .ext = "sh", "0" },
+ { .ext = "go", "0" },
+ { .ext = "srt", "0" },
+ { .ext = "m3u", "0" },
+ { .ext = "htm", "0h" },
+ { .ext = "html", "0h" },
+ { .ext = "gph", "1" },
+ { .ext = "dcgi", "17" },
+ { .ext = "gif", "gI" },
+ { .ext = "jpg", "I" },
+ { .ext = "jpeg", "I" },
+ { .ext = "png", "I" },
+ { .ext = "doc", "9" },
+ { .ext = "pdf", "9" },
+ { .ext = "iso", "9" },
+ { .ext = "exe", "9" },
+ { .ext = "gz", "9" },
+ { .ext = "tgz", "9" },
+ { .ext = "bz2", "9" },
+ { .ext = "xz", "9" },
+ { .ext = "lzma", "9" },
+ { .ext = "wav", "9" },
+ { .ext = "mp3", "9" },
+ { .ext = "ogg", "9" },
+ { .ext = "avi", "9" },
+ { .ext = "mp4", "9" },
+ { .ext = "mkv", "9" },
+ { .ext = "ogv", "9" },
+};
+
+int exitcode = 0;
+FILE *errfp, *outfp;
+
+void
+die(const char *fmt, ...)
+{
+ va_list ap;
+
+ fputs("fatal: ", errfp);
+
+ va_start(ap, fmt);
+ vfprintf(errfp, fmt, ap);
+ va_end(ap);
+
+ exit(2);
+}
+
+void
+error(const char *fmt, ...)
+{
+ va_list ap;
+
+ fputs("error: ", outfp);
+
+ va_start(ap, fmt);
+ vfprintf(outfp, fmt, ap);
+ va_end(ap);
+
+ exitcode = 1;
+}
+
+void
+warning(const char *fmt, ...)
+{
+ va_list ap;
+
+ fputs("warning: ", outfp);
+
+ va_start(ap, fmt);
+ vfprintf(outfp, fmt, ap);
+ va_end(ap);
+}
+
+int
+edial(const char *host, const char *port)
+{
+ struct addrinfo hints, *res, *res0;
+ int error, save_errno, s;
+ const char *cause = NULL;
+ struct timeval timeout;
+
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_flags = AI_NUMERICSERV; /* numeric port only */
+ if ((error = getaddrinfo(host, port, &hints, &res0)))
+ die("%s: %s: %s:%s\n", __func__, gai_strerror(error), host, port);
+ s = -1;
+ for (res = res0; res; res = res->ai_next) {
+ s = socket(res->ai_family, res->ai_socktype,
+ res->ai_protocol);
+ if (s == -1) {
+ cause = "socket";
+ continue;
+ }
+
+ timeout.tv_sec = MAX_RESPONSETIMEOUT;
+ timeout.tv_usec = 0;
+ if (setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(timeout)) == -1)
+ die("%s: setsockopt: %s\n", __func__, strerror(errno));
+
+ timeout.tv_sec = MAX_RESPONSETIMEOUT;
+ timeout.tv_usec = 0;
+ if (setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout)) == -1)
+ die("%s: setsockopt: %s\n", __func__, strerror(errno));
+
+ if (connect(s, res->ai_addr, res->ai_addrlen) == -1) {
+ cause = "connect";
+ save_errno = errno;
+ close(s);
+ errno = save_errno;
+ s = -1;
+ continue;
+ }
+ break;
+ }
+ if (s == -1)
+ die("%s: %s: %s:%s\n", __func__, cause, host, port);
+ freeaddrinfo(res0);
+
+ return s;
+}
+
+void
+checkdir(FILE *fp)
+{
+ struct visited v;
+ char line[1024], *end, *s;
+ size_t linenr;
+ ssize_t n;
+ long long l;
+ int i, r, len, hasdotend = 0, c, primarytype = 0, wc, col;
+ wchar_t w;
+
+ if (pledge("stdio", NULL) == -1)
+ die("pledge: %s\n", strerror(errno));
+
+ for (linenr = 1; fgets(line, sizeof(line), fp); linenr++) {
+ n = strcspn(line, "\n");
+ if (line[n] != '\n')
+ die("%zu: line too long\n", linenr); /* fatal */
+ if (n && line[n] == '\n')
+ line[n] = '\0';
+ if (n && line[n - 1] == '\r')
+ line[--n] = '\0';
+ else
+ error("%zu: invalid line-ending, not CRLF (\\r\\n)\n", linenr);
+ if (n == 1 && line[0] == '.') {
+ hasdotend = 1;
+ break;
+ }
+
+ memset(&v, 0, sizeof(v));
+
+ v._type = line[0];
+
+ /* "username" */
+ i = 1;
+ len = strcspn(line + i, "\t");
+ if (len + 1 < sizeof(v.username)) {
+ memcpy(v.username, line + i, len);
+ v.username[len] = '\0';
+ } else {
+ error("%zu: username field too long\n", linenr);
+ continue;
+ }
+ if (line[i + len] == '\t') {
+ i += len + 1;
+ } else {
+ error("%zu: invalid line / field count\n", linenr);
+ continue;
+ }
+
+ /* selector / path */
+ len = strcspn(line + i, "\t");
+ if (len + 1 < sizeof(v.path)) {
+ memcpy(v.path, line + i, len);
+ v.path[len] = '\0';
+ } else {
+ error("%zu: path field too long\n", linenr);
+ continue;
+ }
+ if (line[i + len] == '\t') {
+ i += len + 1;
+ } else {
+ error("%zu: invalid line / field count\n", linenr);
+ continue;
+ }
+
+ /* server */
+ len = strcspn(line + i, "\t");
+ if (len + 1 < sizeof(v.server)) {
+ memcpy(v.server, line + i, len);
+ v.server[len] = '\0';
+ } else {
+ error("%zu: server field too long\n", linenr);
+ continue;
+ }
+ if (line[i + len] == '\t') {
+ i += len + 1;
+ } else {
+ error("%zu: invalid line / field count\n", linenr);
+ continue;
+ }
+
+ /* port */
+ len = strcspn(line + i, "\t");
+ if (len + 1 < sizeof(v.port)) {
+ memcpy(v.port, line + i, len);
+ v.port[len] = '\0';
+ } else {
+ error("%zu: port field too long\n", linenr);
+ continue;
+ }
+
+ /* check non-standard types */
+ c = v._type;
+ if (v._type == '+' && !primarytype)
+ error("%zu: mirror type used, but no previous type set\n", linenr);
+ if (v._type != '+')
+ primarytype = v._type;
+
+ if (!(isdigit(c) || c == 'g' || c == 'I' || c == 'T' || c == '+')) {
+ /* common-used */
+ if (c == 'i' || c == 'h') {
+#if 0
+ warning("%zu: non-standard, but common-used type: %c\n",
+ linenr, c);
+#endif
+ } else {
+ /* 3.8: "Characters '0' through 'Z' are reserved. Local
+ experiments should use other characters.
+ Machine-specific extensions are not encouraged." */
+ if (c >= '0' && c <= 'Z')
+ error("%zu: unknown / non-standard type: %c\n",
+ linenr, c);
+ }
+ }
+
+ /* check type with file extension */
+ if ((s = strrchr(v.path, '.')) && !strchr(s, '/')) {
+ s++;
+ for (i = 0; i < sizeof(types) / sizeof(*types); i++) {
+ if (primarytype == 'h' &&
+ !strncmp(v.path, "URL:", sizeof("URL:") - 1))
+ continue;
+
+ if (!strcasecmp(s, types[i].ext) &&
+ !strchr(types[i].allow, primarytype)) {
+ warning("%zu: invalid type '%c' for extension '%s', valid types: '%s'\n",
+ linenr, primarytype, types[i].ext, types[i].allow);
+ break;
+ }
+ }
+ }
+
+ /* check port, must be numeric and in range, port 0 is allowed:
+ "Appendix:
+ Note: Port corresponds the the TCP Port Number, its value should
+ be in the range [0..65535]; port 70 is officially assigned
+ to gopher." */
+
+ errno = 0;
+ l = strtoll(v.port, &end, 10);
+ if (errno || *end || l < 0 || l > 65535) {
+ error("%zu: invalid port: %s\n", linenr, v.port);
+ } else {
+#if 0
+ if (l != 70)
+ warning("%zu: non-standard gopher port: %lld, not 70\n",
+ linenr, l);
+#endif
+ }
+
+ /* RFC "Notes": "The Selector string should be no longer than
+ 255 characters." */
+ if ((len = strlen(v.path)) > 255)
+ error("%zu: selector should not be longer than 255 characters: %d bytes\n",
+ linenr, len);
+
+ /* decode UTF-8 (text-encoding is ASCII/Latin1 in the RFC, but
+ Latin1 sucks, recommend UTF-8 instead.
+ Check column length as recommended as described in the RFC
+ in section 3.9. */
+ s = v.username;
+ len = strlen(s);
+ col = 0;
+ for (i = 0; i < len; i += r) {
+ r = mbtowc(&w, &s[i], len - i < 4 ? len - i : 4);
+ if (r == 0)
+ break;
+ if (r == -1) {
+ warning("%zu:%d: username: first invalid byte, not UTF-8\n",
+ linenr, i);
+ break;
+ }
+ if ((wc = wcwidth(w)) == -1)
+ wc = 1;
+ col += (size_t)wc;
+
+ /* RFC "Notes": "It is *highly* recommended that the
+ User_Name field contain only printable characters". */
+ if (!iswprint(w)) {
+ error("%zu:%d: first non-printable character in username field\n",
+ linenr, i);
+ break;
+ }
+ }
+#if 0
+ /* instead of 70 check 79 */
+ if (col > 79)
+ warning("%zu: username column length is > 79 (%d), see section 3.9 of the RFC\n",
+ linenr, col);
+#endif
+
+ if (!strcmp(v.path, "..") || strstr(v.path, "../"))
+ warning("%zu: found ../ in path: don't use relative paths\n", linenr);
+ }
+ if (ferror(fp))
+ die("fgets: %s\n", strerror(errno));
+
+ if (!hasdotend)
+ error("no .\\r\\n end\n");
+}
+
+void
+checkremote(const char *server, const char *port, const char *path, const char *param)
+{
+ FILE *fp;
+ int fd, r;
+
+ fd = edial(server, port);
+
+ if (param[0])
+ r = dprintf(fd, "%s\t%s\r\n", path, param);
+ else
+ r = dprintf(fd, "%s\r\n", path);
+ if (r == -1)
+ die("write: %s\n", strerror(errno));
+
+ if (!(fp = fdopen(fd, "rb+")))
+ die("fdopen: %s\n", strerror(errno));
+ checkdir(fp);
+ fclose(fp);
+}
+
+int
+parseuri(const char *str, struct uri *u)
+{
+ const char *s, *e;
+
+ memset(u, 0, sizeof(struct uri));
+
+ s = str;
+
+ /* IPv6 */
+ if (*s == '[') {
+ s++;
+ e = strchr(s, ']');
+ if (!e || e - s + 1 >= sizeof(u->host))
+ return 0;
+ memcpy(u->host, s, e - s);
+ u->host[e - s] = '\0';
+ e++;
+ } else {
+ e = &s[strcspn(s, ":/")];
+ if (e - s + 1 >= sizeof(u->host))
+ return 0;
+ memcpy(u->host, s, e - s);
+ u->host[e - s] = '\0';
+ }
+
+ if (*e == ':') {
+ s = e + 1;
+ e = &s[strcspn(s, "/")];
+
+ if (e - s + 1 >= sizeof(u->port))
+ return 0;
+ memcpy(u->port, s, e - s);
+ u->port[e - s] = '\0';
+ }
+ if (*e && *e != '/')
+ return 0; /* invalid path */
+
+ s = e;
+ e = s + strlen(s);
+
+ if (e - s + 1 >= sizeof(u->path))
+ return 0;
+ memcpy(u->path, s, e - s);
+ u->path[e - s] = '\0';
+
+ return 1;
+}
+
+int
+main(int argc, char **argv)
+{
+ struct uri u;
+ const char *path, *uri = "", *param = "", *s;
+ int _type = '1';
+
+ setlocale(LC_CTYPE, "");
+
+ outfp = stdout;
+ errfp = stderr;
+
+ /* CGI-mode or stand-alone */
+ if ((s = getenv("QUERY_STRING"))) {
+ uri = s;
+ param = "";
+ errfp = stdout; /* output errors to stdout also in CGI mode */
+ } else {
+ switch (argc) {
+ case 3:
+ param = argv[2];
+ case 2:
+ uri = argv[1];
+ break;
+ case 1:
+ checkdir(stdin);
+ return exitcode;
+ default:
+ fprintf(errfp, "usage: %s [uri] [param]\n", argv[0]);
+ return 1;
+ }
+ }
+
+ if (pledge("stdio inet dns", NULL) == -1)
+ die("pledge: %s\n", strerror(errno));
+
+ if (!strncmp(uri, "gopher://", sizeof("gopher://") - 1))
+ uri += sizeof("gopher://") - 1;
+
+ if (!parseuri(uri, &u))
+ die("Invalid uri\n");
+ if (u.host[0] == '\0')
+ die("Invalid hostname\n");
+
+ if (u.path[0] == '\0')
+ memcpy(u.path, "/", 2);
+ if (u.port[0] == '\0')
+ memcpy(u.port, "70", 3);
+
+ path = u.path;
+ if (path[0] == '/') {
+ path++;
+ if (*path) {
+ _type = *path;
+ path++;
+ }
+ } else {
+ path = "";
+ }
+
+ switch (_type) {
+ case '1':
+ case '7':
+ break; /* handled below */
+ default: /* these types are not validated */
+ fprintf(errfp, "only types 1 (dir) and 7 (search) are validated\n");
+ return 1;
+ }
+
+ if (_type != '7')
+ param = "";
+
+ checkremote(u.host, u.port, path, param);
+
+ return exitcode;
+}