From 3658a796b6013d2129c0895e9cb994fcdc9662ef Mon Sep 17 00:00:00 2001 From: _ov4 Date: Tue, 11 Aug 2026 18:16:16 +0800 Subject: Initial commit --- .gitignore | 69 +++++++ LICENSE | 661 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 730 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0ba1c63 --- /dev/null +++ b/.gitignore @@ -0,0 +1,69 @@ +# Prerequisites +*.d + +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Linker files +*.ilk + +# Debugger Files +*.pdb + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll +*.so.* + + +# Fortran module files +*.mod +*.smod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app + +# Build directories +build/ +Build/ +build-*/ + +# CMake generated files +CMakeFiles/ +CMakeCache.txt +cmake_install.cmake +Makefile +install_manifest.txt +compile_commands.json + +# Temporary files +*.tmp +*.log +*.bak +*.swp + +# vcpkg +vcpkg_installed/ + +# debug information files +*.dwo + +# test output & cache +Testing/ +.cache/ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0ad25db --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are 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. + + 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. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + 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 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 work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero 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 Affero 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 Affero 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 Affero 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. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + 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 AGPL, see +. -- cgit v1.3.1-4-g156e From 9d8cd99dfa156fa48801aa8bc7821c62d023fe80 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Tue, 11 Aug 2026 10:33:39 +0000 Subject: init --- README | 22 +++ myint.c | 36 +++++ myspin.c | 24 +++ mysplit.c | 35 +++++ mystop.c | 36 +++++ sdriver.pl | 210 +++++++++++++++++++++++++ trace01.txt | 5 + trace02.txt | 5 + trace03.txt | 5 + trace04.txt | 5 + trace05.txt | 11 ++ trace06.txt | 8 + trace07.txt | 14 ++ trace08.txt | 14 ++ trace09.txt | 20 +++ trace10.txt | 22 +++ trace11.txt | 12 ++ trace12.txt | 17 ++ trace13.txt | 23 +++ trace14.txt | 47 ++++++ trace15.txt | 46 ++++++ trace16.txt | 16 ++ tsh.c | 509 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tshref | Bin 0 -> 19278 bytes 24 files changed, 1142 insertions(+) create mode 100644 README create mode 100644 myint.c create mode 100644 myspin.c create mode 100644 mysplit.c create mode 100644 mystop.c create mode 100755 sdriver.pl create mode 100644 trace01.txt create mode 100644 trace02.txt create mode 100644 trace03.txt create mode 100644 trace04.txt create mode 100644 trace05.txt create mode 100644 trace06.txt create mode 100644 trace07.txt create mode 100644 trace08.txt create mode 100644 trace09.txt create mode 100644 trace10.txt create mode 100644 trace11.txt create mode 100644 trace12.txt create mode 100644 trace13.txt create mode 100644 trace14.txt create mode 100644 trace15.txt create mode 100644 trace16.txt create mode 100644 tsh.c create mode 100755 tshref diff --git a/README b/README new file mode 100644 index 0000000..a5add38 --- /dev/null +++ b/README @@ -0,0 +1,22 @@ +################ +CS:APP Shell Lab +################ + +Files: + +Makefile # Compiles your shell program and runs the tests +README # This file +tsh.c # The shell program that you will write and hand in +tshref # The reference shell binary. + +# The remaining files are used to test your shell +sdriver.pl # The trace-driven shell driver +trace*.txt # The 15 trace files that control the shell driver +tshref.out # Example output of the reference shell on all 15 traces + +# Little C programs that are called by the trace files +myspin.c # Takes argument and spins for seconds +mysplit.c # Forks a child that spins for seconds +mystop.c # Spins for seconds and sends SIGTSTP to itself +myint.c # Spins for seconds and sends SIGINT to itself + diff --git a/myint.c b/myint.c new file mode 100644 index 0000000..ea5bee1 --- /dev/null +++ b/myint.c @@ -0,0 +1,36 @@ +/* + * myint.c - Another handy routine for testing your tiny shell + * + * usage: myint + * Sleeps for seconds and sends SIGINT to itself. + * + */ +#include +#include +#include +#include +#include +#include + +int main(int argc, char **argv) +{ + int i, secs; + pid_t pid; + + if (argc != 2) { + fprintf(stderr, "Usage: %s \n", argv[0]); + exit(0); + } + secs = atoi(argv[1]); + + for (i=0; i < secs; i++) + sleep(1); + + pid = getpid(); + + if (kill(pid, SIGINT) < 0) + fprintf(stderr, "kill (int) error"); + + exit(0); + +} diff --git a/myspin.c b/myspin.c new file mode 100644 index 0000000..08c3e0c --- /dev/null +++ b/myspin.c @@ -0,0 +1,24 @@ +/* + * myspin.c - A handy program for testing your tiny shell + * + * usage: myspin + * Sleeps for seconds in 1-second chunks. + * + */ +#include +#include +#include + +int main(int argc, char **argv) +{ + int i, secs; + + if (argc != 2) { + fprintf(stderr, "Usage: %s \n", argv[0]); + exit(0); + } + secs = atoi(argv[1]); + for (i=0; i < secs; i++) + sleep(1); + exit(0); +} diff --git a/mysplit.c b/mysplit.c new file mode 100644 index 0000000..9ac016e --- /dev/null +++ b/mysplit.c @@ -0,0 +1,35 @@ +/* + * mysplit.c - Another handy routine for testing your tiny shell + * + * usage: mysplit + * Fork a child that spins for seconds in 1-second chunks. + */ +#include +#include +#include +#include +#include +#include + +int main(int argc, char **argv) +{ + int i, secs; + + if (argc != 2) { + fprintf(stderr, "Usage: %s \n", argv[0]); + exit(0); + } + secs = atoi(argv[1]); + + + if (fork() == 0) { /* child */ + for (i=0; i < secs; i++) + sleep(1); + exit(0); + } + + /* parent waits for child to terminate */ + wait(NULL); + + exit(0); +} diff --git a/mystop.c b/mystop.c new file mode 100644 index 0000000..12eee5f --- /dev/null +++ b/mystop.c @@ -0,0 +1,36 @@ +/* + * mystop.c - Another handy routine for testing your tiny shell + * + * usage: mystop + * Sleeps for seconds and sends SIGTSTP to itself. + * + */ +#include +#include +#include +#include +#include +#include + +int main(int argc, char **argv) +{ + int i, secs; + pid_t pid; + + if (argc != 2) { + fprintf(stderr, "Usage: %s \n", argv[0]); + exit(0); + } + secs = atoi(argv[1]); + + for (i=0; i < secs; i++) + sleep(1); + + pid = getpid(); + + if (kill(-pid, SIGTSTP) < 0) + fprintf(stderr, "kill (tstp) error"); + + exit(0); + +} diff --git a/sdriver.pl b/sdriver.pl new file mode 100755 index 0000000..852bf3d --- /dev/null +++ b/sdriver.pl @@ -0,0 +1,210 @@ +#!/usr/bin/perl +#!/usr/local/bin/perl +use Getopt::Std; +use FileHandle; +use IPC::Open2; + +####################################################################### +# sdriver.pl - Shell driver +# +# Copyright (c) 2002, R. Bryant and D. O'Hallaron, All rights reserved. +# May not be used, modified, or copied without permission. +# +# The driver runs a student's shell program as a child, sends +# commands and signals to the child as directed by a trace file, +# and captures and displays the output produced by the child. +# +# Tracefile format: +# +# The tracefile consists of text lines that are either blank lines, +# comment lines, driver commands, or shell commands. Blank lines are +# ignored. Comment lines begin with "#" and are echo'd without change +# to stdout. Driver commands are intepreted by the driver and are not +# passed to the child shell. All other lines are shell commands and +# are passed without modification to the shell, which reads them on +# stdin. Output produced by the child on stdout/stderr is read by +# the parent and printed on its stdout. +# +# Driver commands: +# TSTP Send a SIGTSTP signal to the child +# INT Send a SIGINT signal to the child +# QUIT Send a SIGQUIT signal to the child +# KILL Send a SIGKILL signal to the child +# CLOSE Close Writer (sends EOF signal to child) +# WAIT Wait() for child to terminate +# SLEEP Sleep for seconds +# +###################################################################### + +# +# usage - print help message and terminate +# +sub usage +{ + printf STDERR "$_[0]\n"; + printf STDERR "Usage: $0 [-hv] -t -s -a \n"; + printf STDERR "Options:\n"; + printf STDERR " -h Print this message\n"; + printf STDERR " -v Be more verbose\n"; + printf STDERR " -t Trace file\n"; + printf STDERR " -s Shell program to test\n"; + printf STDERR " -a Shell arguments\n"; + printf STDERR " -g Generate output for autograder\n"; + die "\n" ; +} + +# Parse the command line arguments +getopts('hgvt:s:a:'); +if ($opt_h) { + usage(); +} +if (!$opt_t) { + usage("Missing required -t argument"); +} +if (!$opt_s) { + usage("Missing required -s argument"); +} +$verbose = $opt_v; +$infile = $opt_t; +$shellprog = $opt_s; +$shellargs = $opt_a; +$grade = $opt_g; + +# Make sure the input script exists and is readable +-e $infile + or die "$0: ERROR: $infile not found\n"; +-r $infile + or die "$0: ERROR: $infile is not readable\n"; + +# Make sure the shell program exists and is executable +-e $shellprog + or die "$0: ERROR: $shellprog not found\n"; +-x $shellprog + or die "$0: ERROR: $shellprog is not executable\n"; + + +# Open the input script +open INFILE, $infile + or die "$0: ERROR: Couldn't open input file $infile: $!\n"; + +# +# Fork a child, run the shell in it, and connect the parent +# and child with a pair of unidirectional pipes: +# parent:Writer -> child:stdin +# child:stdout -> parent:Reader +# +$pid = open2(\*Reader, \*Writer, "$shellprog $shellargs"); +Writer->autoflush(); + +# The autograder will want to know the child shell's pid +if ($grade) { + print ("pid=$pid\n"); +} + +# +# Parent reads a trace file, sends commands to the child shell. +# +while () { + $line = $_; + chomp($line); + + # Comment line + if ($line =~ /^#/) { + print "$line\n"; + } + + # Blank line + elsif ($line =~ /^\s*$/) { + if ($verbose) { + print "$0: Ignoring blank line\n"; + } + } + + # Send SIGTSTP (ctrl-z) + elsif ($line =~ /TSTP/) { + if ($verbose) { + print "$0: Sending SIGTSTP signal to process $pid\n"; + } + kill 'TSTP', $pid; + } + + # Send SIGINT (ctrl-c) + elsif ($line =~ /INT/) { + if ($verbose) { + print "$0: Sending SIGINT signal to process $pid\n"; + } + kill 'INT', $pid; + } + + # Send SIGQUIT (whenever we need graceful termination) + elsif ($line =~ /QUIT/) { + if ($verbose) { + print "$0: Sending SIGQUIT signal to process $pid\n"; + } + kill 'QUIT', $pid; + } + + # Send SIGKILL + elsif ($line =~ /KILL/) { + if ($verbose) { + print "$0: Sending SIGKILL signal to process $pid\n"; + } + kill 'KILL', $pid; + } + + # Close pipe (sends EOF notification to child) + elsif ($line =~ /CLOSE/) { + if ($verbose) { + print "$0: Closing output end of pipe to child $pid\n"; + } + close Writer; + } + + # Wait for child to terminate + elsif ($line =~ /WAIT/) { + if ($verbose) { + print "$0: Waiting for child $pid\n"; + } + wait; + if ($verbose) { + print "$0: Child $pid reaped\n"; + } + } + + # Sleep + elsif ($line =~ /SLEEP (\d+)/) { + if ($verbose) { + print "$0: Sleeping $1 secs\n"; + } + sleep $1; + } + + # Unknown input + else { + if ($verbose) { + print "$0: Sending :$line: to child $pid\n"; + } + print Writer "$line\n"; + } +} + +# +# Parent echoes the output produced by the child. +# +close Writer; +if ($verbose) { + print "$0: Reading data from child $pid\n"; +} +while ($line = ) { + print $line; +} +close Reader; + +# Finally, parent reaps child +wait; + +if ($verbose) { + print "$0: Shell terminated\n"; +} + +exit; diff --git a/trace01.txt b/trace01.txt new file mode 100644 index 0000000..9c8561e --- /dev/null +++ b/trace01.txt @@ -0,0 +1,5 @@ +# +# trace01.txt - Properly terminate on EOF. +# +CLOSE +WAIT diff --git a/trace02.txt b/trace02.txt new file mode 100644 index 0000000..e97643b --- /dev/null +++ b/trace02.txt @@ -0,0 +1,5 @@ +# +# trace02.txt - Process builtin quit command. +# +quit +WAIT diff --git a/trace03.txt b/trace03.txt new file mode 100644 index 0000000..be8869c --- /dev/null +++ b/trace03.txt @@ -0,0 +1,5 @@ +# +# trace03.txt - Run a foreground job. +# +/bin/echo tsh> quit +quit diff --git a/trace04.txt b/trace04.txt new file mode 100644 index 0000000..554df0e --- /dev/null +++ b/trace04.txt @@ -0,0 +1,5 @@ +# +# trace04.txt - Run a background job. +# +/bin/echo -e tsh> ./myspin 1 \046 +./myspin 1 & diff --git a/trace05.txt b/trace05.txt new file mode 100644 index 0000000..03c1876 --- /dev/null +++ b/trace05.txt @@ -0,0 +1,11 @@ +# +# trace05.txt - Process jobs builtin command. +# +/bin/echo -e tsh> ./myspin 2 \046 +./myspin 2 & + +/bin/echo -e tsh> ./myspin 3 \046 +./myspin 3 & + +/bin/echo tsh> jobs +jobs diff --git a/trace06.txt b/trace06.txt new file mode 100644 index 0000000..bfa3890 --- /dev/null +++ b/trace06.txt @@ -0,0 +1,8 @@ +# +# trace06.txt - Forward SIGINT to foreground job. +# +/bin/echo -e tsh> ./myspin 4 +./myspin 4 + +SLEEP 2 +INT diff --git a/trace07.txt b/trace07.txt new file mode 100644 index 0000000..259a285 --- /dev/null +++ b/trace07.txt @@ -0,0 +1,14 @@ +# +# trace07.txt - Forward SIGINT only to foreground job. +# +/bin/echo -e tsh> ./myspin 4 \046 +./myspin 4 & + +/bin/echo -e tsh> ./myspin 5 +./myspin 5 + +SLEEP 2 +INT + +/bin/echo tsh> jobs +jobs diff --git a/trace08.txt b/trace08.txt new file mode 100644 index 0000000..49be19f --- /dev/null +++ b/trace08.txt @@ -0,0 +1,14 @@ +# +# trace08.txt - Forward SIGTSTP only to foreground job. +# +/bin/echo -e tsh> ./myspin 4 \046 +./myspin 4 & + +/bin/echo -e tsh> ./myspin 5 +./myspin 5 + +SLEEP 2 +TSTP + +/bin/echo tsh> jobs +jobs diff --git a/trace09.txt b/trace09.txt new file mode 100644 index 0000000..340d998 --- /dev/null +++ b/trace09.txt @@ -0,0 +1,20 @@ +# +# trace09.txt - Process bg builtin command +# +/bin/echo -e tsh> ./myspin 4 \046 +./myspin 4 & + +/bin/echo -e tsh> ./myspin 5 +./myspin 5 + +SLEEP 2 +TSTP + +/bin/echo tsh> jobs +jobs + +/bin/echo tsh> bg %2 +bg %2 + +/bin/echo tsh> jobs +jobs diff --git a/trace10.txt b/trace10.txt new file mode 100644 index 0000000..e7de996 --- /dev/null +++ b/trace10.txt @@ -0,0 +1,22 @@ +# +# trace10.txt - Process fg builtin command. +# +/bin/echo -e tsh> ./myspin 4 \046 +./myspin 4 & + +SLEEP 1 +/bin/echo tsh> fg %1 +fg %1 + +SLEEP 1 +TSTP + +/bin/echo tsh> jobs +jobs + +/bin/echo tsh> fg %1 +fg %1 + +/bin/echo tsh> jobs +jobs + diff --git a/trace11.txt b/trace11.txt new file mode 100644 index 0000000..d2f8663 --- /dev/null +++ b/trace11.txt @@ -0,0 +1,12 @@ +# +# trace11.txt - Forward SIGINT to every process in foreground process group +# +/bin/echo -e tsh> ./mysplit 4 +./mysplit 4 + +SLEEP 2 +INT + +/bin/echo tsh> /bin/ps a +/bin/ps a + diff --git a/trace12.txt b/trace12.txt new file mode 100644 index 0000000..88455e3 --- /dev/null +++ b/trace12.txt @@ -0,0 +1,17 @@ +# +# trace12.txt - Forward SIGTSTP to every process in foreground process group +# +/bin/echo -e tsh> ./mysplit 4 +./mysplit 4 + +SLEEP 2 +TSTP + +/bin/echo tsh> jobs +jobs + +/bin/echo tsh> /bin/ps a +/bin/ps a + + + diff --git a/trace13.txt b/trace13.txt new file mode 100644 index 0000000..d734cbc --- /dev/null +++ b/trace13.txt @@ -0,0 +1,23 @@ +# +# trace13.txt - Restart every stopped process in process group +# +/bin/echo -e tsh> ./mysplit 4 +./mysplit 4 + +SLEEP 2 +TSTP + +/bin/echo tsh> jobs +jobs + +/bin/echo tsh> /bin/ps a +/bin/ps a + +/bin/echo tsh> fg %1 +fg %1 + +/bin/echo tsh> /bin/ps a +/bin/ps a + + + diff --git a/trace14.txt b/trace14.txt new file mode 100644 index 0000000..8086580 --- /dev/null +++ b/trace14.txt @@ -0,0 +1,47 @@ +# +# trace14.txt - Simple error handling +# +/bin/echo tsh> ./bogus +./bogus + +/bin/echo -e tsh> ./myspin 4 \046 +./myspin 4 & + +/bin/echo tsh> fg +fg + +/bin/echo tsh> bg +bg + +/bin/echo tsh> fg a +fg a + +/bin/echo tsh> bg a +bg a + +/bin/echo tsh> fg 9999999 +fg 9999999 + +/bin/echo tsh> bg 9999999 +bg 9999999 + +/bin/echo tsh> fg %2 +fg %2 + +/bin/echo tsh> fg %1 +fg %1 + +SLEEP 2 +TSTP + +/bin/echo tsh> bg %2 +bg %2 + +/bin/echo tsh> bg %1 +bg %1 + +/bin/echo tsh> jobs +jobs + + + diff --git a/trace15.txt b/trace15.txt new file mode 100644 index 0000000..2cc780e --- /dev/null +++ b/trace15.txt @@ -0,0 +1,46 @@ +# +# trace15.txt - Putting it all together +# + +/bin/echo tsh> ./bogus +./bogus + +/bin/echo tsh> ./myspin 10 +./myspin 10 + +SLEEP 2 +INT + +/bin/echo -e tsh> ./myspin 3 \046 +./myspin 3 & + +/bin/echo -e tsh> ./myspin 4 \046 +./myspin 4 & + +/bin/echo tsh> jobs +jobs + +/bin/echo tsh> fg %1 +fg %1 + +SLEEP 2 +TSTP + +/bin/echo tsh> jobs +jobs + +/bin/echo tsh> bg %3 +bg %3 + +/bin/echo tsh> bg %1 +bg %1 + +/bin/echo tsh> jobs +jobs + +/bin/echo tsh> fg %1 +fg %1 + +/bin/echo tsh> quit +quit + diff --git a/trace16.txt b/trace16.txt new file mode 100644 index 0000000..822ba14 --- /dev/null +++ b/trace16.txt @@ -0,0 +1,16 @@ +# +# trace16.txt - Tests whether the shell can handle SIGTSTP and SIGINT +# signals that come from other processes instead of the terminal. +# + +/bin/echo tsh> ./mystop 2 +./mystop 2 + +SLEEP 3 + +/bin/echo tsh> jobs +jobs + +/bin/echo tsh> ./myint 2 +./myint 2 + diff --git a/tsh.c b/tsh.c new file mode 100644 index 0000000..7c2ea8d --- /dev/null +++ b/tsh.c @@ -0,0 +1,509 @@ +/* + * tsh - A tiny shell program with job control + * + * + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Misc manifest constants */ +#define MAXLINE 1024 /* max line size */ +#define MAXARGS 128 /* max args on a command line */ +#define MAXJOBS 16 /* max jobs at any point in time */ +#define MAXJID 1<<16 /* max job ID */ + +/* Job states */ +#define UNDEF 0 /* undefined */ +#define FG 1 /* running in foreground */ +#define BG 2 /* running in background */ +#define ST 3 /* stopped */ + +/* + * Jobs states: FG (foreground), BG (background), ST (stopped) + * Job state transitions and enabling actions: + * FG -> ST : ctrl-z + * ST -> FG : fg command + * ST -> BG : bg command + * BG -> FG : fg command + * At most 1 job can be in the FG state. + */ + +/* Global variables */ +extern char **environ; /* defined in libc */ +char prompt[] = "tsh> "; /* command line prompt (DO NOT CHANGE) */ +int verbose = 0; /* if true, print additional output */ +int nextjid = 1; /* next job ID to allocate */ +char sbuf[MAXLINE]; /* for composing sprintf messages */ + +struct job_t { /* The job struct */ + pid_t pid; /* job PID */ + int jid; /* job ID [1, 2, ...] */ + int state; /* UNDEF, BG, FG, or ST */ + char cmdline[MAXLINE]; /* command line */ +}; +struct job_t jobs[MAXJOBS]; /* The job list */ +/* End global variables */ + + +/* Function prototypes */ + +/* Here are the functions that you will implement */ +void eval(char *cmdline); +int builtin_cmd(char **argv); +void do_bgfg(char **argv); +void waitfg(pid_t pid); + +void sigchld_handler(int sig); +void sigtstp_handler(int sig); +void sigint_handler(int sig); + +/* Here are helper routines that we've provided for you */ +int parseline(const char *cmdline, char **argv); +void sigquit_handler(int sig); + +void clearjob(struct job_t *job); +void initjobs(struct job_t *jobs); +int maxjid(struct job_t *jobs); +int addjob(struct job_t *jobs, pid_t pid, int state, char *cmdline); +int deletejob(struct job_t *jobs, pid_t pid); +pid_t fgpid(struct job_t *jobs); +struct job_t *getjobpid(struct job_t *jobs, pid_t pid); +struct job_t *getjobjid(struct job_t *jobs, int jid); +int pid2jid(pid_t pid); +void listjobs(struct job_t *jobs); + +void usage(void); +void unix_error(char *msg); +void app_error(char *msg); +typedef void handler_t(int); +handler_t *Signal(int signum, handler_t *handler); + +/* + * main - The shell's main routine + */ +int main(int argc, char **argv) +{ + char c; + char cmdline[MAXLINE]; + int emit_prompt = 1; /* emit prompt (default) */ + + /* Redirect stderr to stdout (so that driver will get all output + * on the pipe connected to stdout) */ + dup2(1, 2); + + /* Parse the command line */ + while ((c = getopt(argc, argv, "hvp")) != EOF) { + switch (c) { + case 'h': /* print help message */ + usage(); + break; + case 'v': /* emit additional diagnostic info */ + verbose = 1; + break; + case 'p': /* don't print a prompt */ + emit_prompt = 0; /* handy for automatic testing */ + break; + default: + usage(); + } + } + + /* Install the signal handlers */ + + /* These are the ones you will need to implement */ + Signal(SIGINT, sigint_handler); /* ctrl-c */ + Signal(SIGTSTP, sigtstp_handler); /* ctrl-z */ + Signal(SIGCHLD, sigchld_handler); /* Terminated or stopped child */ + + /* This one provides a clean way to kill the shell */ + Signal(SIGQUIT, sigquit_handler); + + /* Initialize the job list */ + initjobs(jobs); + + /* Execute the shell's read/eval loop */ + while (1) { + + /* Read command line */ + if (emit_prompt) { + printf("%s", prompt); + fflush(stdout); + } + if ((fgets(cmdline, MAXLINE, stdin) == NULL) && ferror(stdin)) + app_error("fgets error"); + if (feof(stdin)) { /* End of file (ctrl-d) */ + fflush(stdout); + exit(0); + } + + /* Evaluate the command line */ + eval(cmdline); + fflush(stdout); + fflush(stdout); + } + + exit(0); /* control never reaches here */ +} + +/* + * eval - Evaluate the command line that the user has just typed in + * + * If the user has requested a built-in command (quit, jobs, bg or fg) + * then execute it immediately. Otherwise, fork a child process and + * run the job in the context of the child. If the job is running in + * the foreground, wait for it to terminate and then return. Note: + * each child process must have a unique process group ID so that our + * background children don't receive SIGINT (SIGTSTP) from the kernel + * when we type ctrl-c (ctrl-z) at the keyboard. +*/ +void eval(char *cmdline) +{ + return; +} + +/* + * parseline - Parse the command line and build the argv array. + * + * Characters enclosed in single quotes are treated as a single + * argument. Return true if the user has requested a BG job, false if + * the user has requested a FG job. + */ +int parseline(const char *cmdline, char **argv) +{ + static char array[MAXLINE]; /* holds local copy of command line */ + char *buf = array; /* ptr that traverses command line */ + char *delim; /* points to first space delimiter */ + int argc; /* number of args */ + int bg; /* background job? */ + + strcpy(buf, cmdline); + buf[strlen(buf)-1] = ' '; /* replace trailing '\n' with space */ + while (*buf && (*buf == ' ')) /* ignore leading spaces */ + buf++; + + /* Build the argv list */ + argc = 0; + if (*buf == '\'') { + buf++; + delim = strchr(buf, '\''); + } + else { + delim = strchr(buf, ' '); + } + + while (delim) { + argv[argc++] = buf; + *delim = '\0'; + buf = delim + 1; + while (*buf && (*buf == ' ')) /* ignore spaces */ + buf++; + + if (*buf == '\'') { + buf++; + delim = strchr(buf, '\''); + } + else { + delim = strchr(buf, ' '); + } + } + argv[argc] = NULL; + + if (argc == 0) /* ignore blank line */ + return 1; + + /* should the job run in the background? */ + if ((bg = (*argv[argc-1] == '&')) != 0) { + argv[--argc] = NULL; + } + return bg; +} + +/* + * builtin_cmd - If the user has typed a built-in command then execute + * it immediately. + */ +int builtin_cmd(char **argv) +{ + return 0; /* not a builtin command */ +} + +/* + * do_bgfg - Execute the builtin bg and fg commands + */ +void do_bgfg(char **argv) +{ + return; +} + +/* + * waitfg - Block until process pid is no longer the foreground process + */ +void waitfg(pid_t pid) +{ + return; +} + +/***************** + * Signal handlers + *****************/ + +/* + * sigchld_handler - The kernel sends a SIGCHLD to the shell whenever + * a child job terminates (becomes a zombie), or stops because it + * received a SIGSTOP or SIGTSTP signal. The handler reaps all + * available zombie children, but doesn't wait for any other + * currently running children to terminate. + */ +void sigchld_handler(int sig) +{ + return; +} + +/* + * sigint_handler - The kernel sends a SIGINT to the shell whenver the + * user types ctrl-c at the keyboard. Catch it and send it along + * to the foreground job. + */ +void sigint_handler(int sig) +{ + return; +} + +/* + * sigtstp_handler - The kernel sends a SIGTSTP to the shell whenever + * the user types ctrl-z at the keyboard. Catch it and suspend the + * foreground job by sending it a SIGTSTP. + */ +void sigtstp_handler(int sig) +{ + return; +} + +/********************* + * End signal handlers + *********************/ + +/*********************************************** + * Helper routines that manipulate the job list + **********************************************/ + +/* clearjob - Clear the entries in a job struct */ +void clearjob(struct job_t *job) { + job->pid = 0; + job->jid = 0; + job->state = UNDEF; + job->cmdline[0] = '\0'; +} + +/* initjobs - Initialize the job list */ +void initjobs(struct job_t *jobs) { + int i; + + for (i = 0; i < MAXJOBS; i++) + clearjob(&jobs[i]); +} + +/* maxjid - Returns largest allocated job ID */ +int maxjid(struct job_t *jobs) +{ + int i, max=0; + + for (i = 0; i < MAXJOBS; i++) + if (jobs[i].jid > max) + max = jobs[i].jid; + return max; +} + +/* addjob - Add a job to the job list */ +int addjob(struct job_t *jobs, pid_t pid, int state, char *cmdline) +{ + int i; + + if (pid < 1) + return 0; + + for (i = 0; i < MAXJOBS; i++) { + if (jobs[i].pid == 0) { + jobs[i].pid = pid; + jobs[i].state = state; + jobs[i].jid = nextjid++; + if (nextjid > MAXJOBS) + nextjid = 1; + strcpy(jobs[i].cmdline, cmdline); + if(verbose){ + printf("Added job [%d] %d %s\n", jobs[i].jid, jobs[i].pid, jobs[i].cmdline); + } + return 1; + } + } + printf("Tried to create too many jobs\n"); + return 0; +} + +/* deletejob - Delete a job whose PID=pid from the job list */ +int deletejob(struct job_t *jobs, pid_t pid) +{ + int i; + + if (pid < 1) + return 0; + + for (i = 0; i < MAXJOBS; i++) { + if (jobs[i].pid == pid) { + clearjob(&jobs[i]); + nextjid = maxjid(jobs)+1; + return 1; + } + } + return 0; +} + +/* fgpid - Return PID of current foreground job, 0 if no such job */ +pid_t fgpid(struct job_t *jobs) { + int i; + + for (i = 0; i < MAXJOBS; i++) + if (jobs[i].state == FG) + return jobs[i].pid; + return 0; +} + +/* getjobpid - Find a job (by PID) on the job list */ +struct job_t *getjobpid(struct job_t *jobs, pid_t pid) { + int i; + + if (pid < 1) + return NULL; + for (i = 0; i < MAXJOBS; i++) + if (jobs[i].pid == pid) + return &jobs[i]; + return NULL; +} + +/* getjobjid - Find a job (by JID) on the job list */ +struct job_t *getjobjid(struct job_t *jobs, int jid) +{ + int i; + + if (jid < 1) + return NULL; + for (i = 0; i < MAXJOBS; i++) + if (jobs[i].jid == jid) + return &jobs[i]; + return NULL; +} + +/* pid2jid - Map process ID to job ID */ +int pid2jid(pid_t pid) +{ + int i; + + if (pid < 1) + return 0; + for (i = 0; i < MAXJOBS; i++) + if (jobs[i].pid == pid) { + return jobs[i].jid; + } + return 0; +} + +/* listjobs - Print the job list */ +void listjobs(struct job_t *jobs) +{ + int i; + + for (i = 0; i < MAXJOBS; i++) { + if (jobs[i].pid != 0) { + printf("[%d] (%d) ", jobs[i].jid, jobs[i].pid); + switch (jobs[i].state) { + case BG: + printf("Running "); + break; + case FG: + printf("Foreground "); + break; + case ST: + printf("Stopped "); + break; + default: + printf("listjobs: Internal error: job[%d].state=%d ", + i, jobs[i].state); + } + printf("%s", jobs[i].cmdline); + } + } +} +/****************************** + * end job list helper routines + ******************************/ + + +/*********************** + * Other helper routines + ***********************/ + +/* + * usage - print a help message + */ +void usage(void) +{ + printf("Usage: shell [-hvp]\n"); + printf(" -h print this message\n"); + printf(" -v print additional diagnostic information\n"); + printf(" -p do not emit a command prompt\n"); + exit(1); +} + +/* + * unix_error - unix-style error routine + */ +void unix_error(char *msg) +{ + fprintf(stdout, "%s: %s\n", msg, strerror(errno)); + exit(1); +} + +/* + * app_error - application-style error routine + */ +void app_error(char *msg) +{ + fprintf(stdout, "%s\n", msg); + exit(1); +} + +/* + * Signal - wrapper for the sigaction function + */ +handler_t *Signal(int signum, handler_t *handler) +{ + struct sigaction action, old_action; + + action.sa_handler = handler; + sigemptyset(&action.sa_mask); /* block sigs of type being handled */ + action.sa_flags = SA_RESTART; /* restart syscalls if possible */ + + if (sigaction(signum, &action, &old_action) < 0) + unix_error("Signal error"); + return (old_action.sa_handler); +} + +/* + * sigquit_handler - The driver program can gracefully terminate the + * child shell by sending it a SIGQUIT signal. + */ +void sigquit_handler(int sig) +{ + printf("Terminating after receipt of SIGQUIT signal\n"); + exit(1); +} + + + diff --git a/tshref b/tshref new file mode 100755 index 0000000..d7e2108 Binary files /dev/null and b/tshref differ -- cgit v1.3.1-4-g156e From 79e61d7dbf5bf5e28fdae5e8a2aa40d9e80b96cb Mon Sep 17 00:00:00 2001 From: _ov4 Date: Tue, 11 Aug 2026 11:14:13 +0000 Subject: cc --- .gitignore | 2 +- Makefile | 103 +++++++++++++ tsh.c | 509 ------------------------------------------------------------- tsh.cc | 509 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 613 insertions(+), 510 deletions(-) create mode 100644 Makefile delete mode 100644 tsh.c create mode 100644 tsh.cc diff --git a/.gitignore b/.gitignore index 0ba1c63..f152158 100644 --- a/.gitignore +++ b/.gitignore @@ -48,7 +48,7 @@ build-*/ CMakeFiles/ CMakeCache.txt cmake_install.cmake -Makefile +#Makefile install_manifest.txt compile_commands.json diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..7e3c0ea --- /dev/null +++ b/Makefile @@ -0,0 +1,103 @@ +# Makefile for the CS:APP Shell Lab + +TEAM = NOBODY +VERSION = 1 +HANDINDIR = /afs/cs/academic/class/15213-f02/L5/handin +DRIVER = ./sdriver.pl +TSH = ./tsh +TSHREF = ./tshref +TSHARGS = "-p" +CXX = g++ +CXXFLAGS = -std=c++17 -Wall -Wno-write-strings -O2 +CC = gcc +CFLAGS = -Wall -O2 +FILES = $(TSH) ./myspin ./mysplit ./mystop ./myint + +all: $(FILES) + +$(TSH): tsh.cc + $(CXX) $(CXXFLAGS) -o $@ $< + +################## +# Handin your work +################## +handin: + cp tsh.cc $(HANDINDIR)/$(TEAM)-$(VERSION)-tsh.cc + + +################## +# Regression tests +################## + +# Run tests using the student's shell program +test01: + $(DRIVER) -t trace01.txt -s $(TSH) -a $(TSHARGS) +test02: + $(DRIVER) -t trace02.txt -s $(TSH) -a $(TSHARGS) +test03: + $(DRIVER) -t trace03.txt -s $(TSH) -a $(TSHARGS) +test04: + $(DRIVER) -t trace04.txt -s $(TSH) -a $(TSHARGS) +test05: + $(DRIVER) -t trace05.txt -s $(TSH) -a $(TSHARGS) +test06: + $(DRIVER) -t trace06.txt -s $(TSH) -a $(TSHARGS) +test07: + $(DRIVER) -t trace07.txt -s $(TSH) -a $(TSHARGS) +test08: + $(DRIVER) -t trace08.txt -s $(TSH) -a $(TSHARGS) +test09: + $(DRIVER) -t trace09.txt -s $(TSH) -a $(TSHARGS) +test10: + $(DRIVER) -t trace10.txt -s $(TSH) -a $(TSHARGS) +test11: + $(DRIVER) -t trace11.txt -s $(TSH) -a $(TSHARGS) +test12: + $(DRIVER) -t trace12.txt -s $(TSH) -a $(TSHARGS) +test13: + $(DRIVER) -t trace13.txt -s $(TSH) -a $(TSHARGS) +test14: + $(DRIVER) -t trace14.txt -s $(TSH) -a $(TSHARGS) +test15: + $(DRIVER) -t trace15.txt -s $(TSH) -a $(TSHARGS) +test16: + $(DRIVER) -t trace16.txt -s $(TSH) -a $(TSHARGS) + +# Run the tests using the reference shell program +rtest01: + $(DRIVER) -t trace01.txt -s $(TSHREF) -a $(TSHARGS) +rtest02: + $(DRIVER) -t trace02.txt -s $(TSHREF) -a $(TSHARGS) +rtest03: + $(DRIVER) -t trace03.txt -s $(TSHREF) -a $(TSHARGS) +rtest04: + $(DRIVER) -t trace04.txt -s $(TSHREF) -a $(TSHARGS) +rtest05: + $(DRIVER) -t trace05.txt -s $(TSHREF) -a $(TSHARGS) +rtest06: + $(DRIVER) -t trace06.txt -s $(TSHREF) -a $(TSHARGS) +rtest07: + $(DRIVER) -t trace07.txt -s $(TSHREF) -a $(TSHARGS) +rtest08: + $(DRIVER) -t trace08.txt -s $(TSHREF) -a $(TSHARGS) +rtest09: + $(DRIVER) -t trace09.txt -s $(TSHREF) -a $(TSHARGS) +rtest10: + $(DRIVER) -t trace10.txt -s $(TSHREF) -a $(TSHARGS) +rtest11: + $(DRIVER) -t trace11.txt -s $(TSHREF) -a $(TSHARGS) +rtest12: + $(DRIVER) -t trace12.txt -s $(TSHREF) -a $(TSHARGS) +rtest13: + $(DRIVER) -t trace13.txt -s $(TSHREF) -a $(TSHARGS) +rtest14: + $(DRIVER) -t trace14.txt -s $(TSHREF) -a $(TSHARGS) +rtest15: + $(DRIVER) -t trace15.txt -s $(TSHREF) -a $(TSHARGS) +rtest16: + $(DRIVER) -t trace16.txt -s $(TSHREF) -a $(TSHARGS) + + +# clean up +clean: + rm -f $(FILES) *.o *~ diff --git a/tsh.c b/tsh.c deleted file mode 100644 index 7c2ea8d..0000000 --- a/tsh.c +++ /dev/null @@ -1,509 +0,0 @@ -/* - * tsh - A tiny shell program with job control - * - * - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* Misc manifest constants */ -#define MAXLINE 1024 /* max line size */ -#define MAXARGS 128 /* max args on a command line */ -#define MAXJOBS 16 /* max jobs at any point in time */ -#define MAXJID 1<<16 /* max job ID */ - -/* Job states */ -#define UNDEF 0 /* undefined */ -#define FG 1 /* running in foreground */ -#define BG 2 /* running in background */ -#define ST 3 /* stopped */ - -/* - * Jobs states: FG (foreground), BG (background), ST (stopped) - * Job state transitions and enabling actions: - * FG -> ST : ctrl-z - * ST -> FG : fg command - * ST -> BG : bg command - * BG -> FG : fg command - * At most 1 job can be in the FG state. - */ - -/* Global variables */ -extern char **environ; /* defined in libc */ -char prompt[] = "tsh> "; /* command line prompt (DO NOT CHANGE) */ -int verbose = 0; /* if true, print additional output */ -int nextjid = 1; /* next job ID to allocate */ -char sbuf[MAXLINE]; /* for composing sprintf messages */ - -struct job_t { /* The job struct */ - pid_t pid; /* job PID */ - int jid; /* job ID [1, 2, ...] */ - int state; /* UNDEF, BG, FG, or ST */ - char cmdline[MAXLINE]; /* command line */ -}; -struct job_t jobs[MAXJOBS]; /* The job list */ -/* End global variables */ - - -/* Function prototypes */ - -/* Here are the functions that you will implement */ -void eval(char *cmdline); -int builtin_cmd(char **argv); -void do_bgfg(char **argv); -void waitfg(pid_t pid); - -void sigchld_handler(int sig); -void sigtstp_handler(int sig); -void sigint_handler(int sig); - -/* Here are helper routines that we've provided for you */ -int parseline(const char *cmdline, char **argv); -void sigquit_handler(int sig); - -void clearjob(struct job_t *job); -void initjobs(struct job_t *jobs); -int maxjid(struct job_t *jobs); -int addjob(struct job_t *jobs, pid_t pid, int state, char *cmdline); -int deletejob(struct job_t *jobs, pid_t pid); -pid_t fgpid(struct job_t *jobs); -struct job_t *getjobpid(struct job_t *jobs, pid_t pid); -struct job_t *getjobjid(struct job_t *jobs, int jid); -int pid2jid(pid_t pid); -void listjobs(struct job_t *jobs); - -void usage(void); -void unix_error(char *msg); -void app_error(char *msg); -typedef void handler_t(int); -handler_t *Signal(int signum, handler_t *handler); - -/* - * main - The shell's main routine - */ -int main(int argc, char **argv) -{ - char c; - char cmdline[MAXLINE]; - int emit_prompt = 1; /* emit prompt (default) */ - - /* Redirect stderr to stdout (so that driver will get all output - * on the pipe connected to stdout) */ - dup2(1, 2); - - /* Parse the command line */ - while ((c = getopt(argc, argv, "hvp")) != EOF) { - switch (c) { - case 'h': /* print help message */ - usage(); - break; - case 'v': /* emit additional diagnostic info */ - verbose = 1; - break; - case 'p': /* don't print a prompt */ - emit_prompt = 0; /* handy for automatic testing */ - break; - default: - usage(); - } - } - - /* Install the signal handlers */ - - /* These are the ones you will need to implement */ - Signal(SIGINT, sigint_handler); /* ctrl-c */ - Signal(SIGTSTP, sigtstp_handler); /* ctrl-z */ - Signal(SIGCHLD, sigchld_handler); /* Terminated or stopped child */ - - /* This one provides a clean way to kill the shell */ - Signal(SIGQUIT, sigquit_handler); - - /* Initialize the job list */ - initjobs(jobs); - - /* Execute the shell's read/eval loop */ - while (1) { - - /* Read command line */ - if (emit_prompt) { - printf("%s", prompt); - fflush(stdout); - } - if ((fgets(cmdline, MAXLINE, stdin) == NULL) && ferror(stdin)) - app_error("fgets error"); - if (feof(stdin)) { /* End of file (ctrl-d) */ - fflush(stdout); - exit(0); - } - - /* Evaluate the command line */ - eval(cmdline); - fflush(stdout); - fflush(stdout); - } - - exit(0); /* control never reaches here */ -} - -/* - * eval - Evaluate the command line that the user has just typed in - * - * If the user has requested a built-in command (quit, jobs, bg or fg) - * then execute it immediately. Otherwise, fork a child process and - * run the job in the context of the child. If the job is running in - * the foreground, wait for it to terminate and then return. Note: - * each child process must have a unique process group ID so that our - * background children don't receive SIGINT (SIGTSTP) from the kernel - * when we type ctrl-c (ctrl-z) at the keyboard. -*/ -void eval(char *cmdline) -{ - return; -} - -/* - * parseline - Parse the command line and build the argv array. - * - * Characters enclosed in single quotes are treated as a single - * argument. Return true if the user has requested a BG job, false if - * the user has requested a FG job. - */ -int parseline(const char *cmdline, char **argv) -{ - static char array[MAXLINE]; /* holds local copy of command line */ - char *buf = array; /* ptr that traverses command line */ - char *delim; /* points to first space delimiter */ - int argc; /* number of args */ - int bg; /* background job? */ - - strcpy(buf, cmdline); - buf[strlen(buf)-1] = ' '; /* replace trailing '\n' with space */ - while (*buf && (*buf == ' ')) /* ignore leading spaces */ - buf++; - - /* Build the argv list */ - argc = 0; - if (*buf == '\'') { - buf++; - delim = strchr(buf, '\''); - } - else { - delim = strchr(buf, ' '); - } - - while (delim) { - argv[argc++] = buf; - *delim = '\0'; - buf = delim + 1; - while (*buf && (*buf == ' ')) /* ignore spaces */ - buf++; - - if (*buf == '\'') { - buf++; - delim = strchr(buf, '\''); - } - else { - delim = strchr(buf, ' '); - } - } - argv[argc] = NULL; - - if (argc == 0) /* ignore blank line */ - return 1; - - /* should the job run in the background? */ - if ((bg = (*argv[argc-1] == '&')) != 0) { - argv[--argc] = NULL; - } - return bg; -} - -/* - * builtin_cmd - If the user has typed a built-in command then execute - * it immediately. - */ -int builtin_cmd(char **argv) -{ - return 0; /* not a builtin command */ -} - -/* - * do_bgfg - Execute the builtin bg and fg commands - */ -void do_bgfg(char **argv) -{ - return; -} - -/* - * waitfg - Block until process pid is no longer the foreground process - */ -void waitfg(pid_t pid) -{ - return; -} - -/***************** - * Signal handlers - *****************/ - -/* - * sigchld_handler - The kernel sends a SIGCHLD to the shell whenever - * a child job terminates (becomes a zombie), or stops because it - * received a SIGSTOP or SIGTSTP signal. The handler reaps all - * available zombie children, but doesn't wait for any other - * currently running children to terminate. - */ -void sigchld_handler(int sig) -{ - return; -} - -/* - * sigint_handler - The kernel sends a SIGINT to the shell whenver the - * user types ctrl-c at the keyboard. Catch it and send it along - * to the foreground job. - */ -void sigint_handler(int sig) -{ - return; -} - -/* - * sigtstp_handler - The kernel sends a SIGTSTP to the shell whenever - * the user types ctrl-z at the keyboard. Catch it and suspend the - * foreground job by sending it a SIGTSTP. - */ -void sigtstp_handler(int sig) -{ - return; -} - -/********************* - * End signal handlers - *********************/ - -/*********************************************** - * Helper routines that manipulate the job list - **********************************************/ - -/* clearjob - Clear the entries in a job struct */ -void clearjob(struct job_t *job) { - job->pid = 0; - job->jid = 0; - job->state = UNDEF; - job->cmdline[0] = '\0'; -} - -/* initjobs - Initialize the job list */ -void initjobs(struct job_t *jobs) { - int i; - - for (i = 0; i < MAXJOBS; i++) - clearjob(&jobs[i]); -} - -/* maxjid - Returns largest allocated job ID */ -int maxjid(struct job_t *jobs) -{ - int i, max=0; - - for (i = 0; i < MAXJOBS; i++) - if (jobs[i].jid > max) - max = jobs[i].jid; - return max; -} - -/* addjob - Add a job to the job list */ -int addjob(struct job_t *jobs, pid_t pid, int state, char *cmdline) -{ - int i; - - if (pid < 1) - return 0; - - for (i = 0; i < MAXJOBS; i++) { - if (jobs[i].pid == 0) { - jobs[i].pid = pid; - jobs[i].state = state; - jobs[i].jid = nextjid++; - if (nextjid > MAXJOBS) - nextjid = 1; - strcpy(jobs[i].cmdline, cmdline); - if(verbose){ - printf("Added job [%d] %d %s\n", jobs[i].jid, jobs[i].pid, jobs[i].cmdline); - } - return 1; - } - } - printf("Tried to create too many jobs\n"); - return 0; -} - -/* deletejob - Delete a job whose PID=pid from the job list */ -int deletejob(struct job_t *jobs, pid_t pid) -{ - int i; - - if (pid < 1) - return 0; - - for (i = 0; i < MAXJOBS; i++) { - if (jobs[i].pid == pid) { - clearjob(&jobs[i]); - nextjid = maxjid(jobs)+1; - return 1; - } - } - return 0; -} - -/* fgpid - Return PID of current foreground job, 0 if no such job */ -pid_t fgpid(struct job_t *jobs) { - int i; - - for (i = 0; i < MAXJOBS; i++) - if (jobs[i].state == FG) - return jobs[i].pid; - return 0; -} - -/* getjobpid - Find a job (by PID) on the job list */ -struct job_t *getjobpid(struct job_t *jobs, pid_t pid) { - int i; - - if (pid < 1) - return NULL; - for (i = 0; i < MAXJOBS; i++) - if (jobs[i].pid == pid) - return &jobs[i]; - return NULL; -} - -/* getjobjid - Find a job (by JID) on the job list */ -struct job_t *getjobjid(struct job_t *jobs, int jid) -{ - int i; - - if (jid < 1) - return NULL; - for (i = 0; i < MAXJOBS; i++) - if (jobs[i].jid == jid) - return &jobs[i]; - return NULL; -} - -/* pid2jid - Map process ID to job ID */ -int pid2jid(pid_t pid) -{ - int i; - - if (pid < 1) - return 0; - for (i = 0; i < MAXJOBS; i++) - if (jobs[i].pid == pid) { - return jobs[i].jid; - } - return 0; -} - -/* listjobs - Print the job list */ -void listjobs(struct job_t *jobs) -{ - int i; - - for (i = 0; i < MAXJOBS; i++) { - if (jobs[i].pid != 0) { - printf("[%d] (%d) ", jobs[i].jid, jobs[i].pid); - switch (jobs[i].state) { - case BG: - printf("Running "); - break; - case FG: - printf("Foreground "); - break; - case ST: - printf("Stopped "); - break; - default: - printf("listjobs: Internal error: job[%d].state=%d ", - i, jobs[i].state); - } - printf("%s", jobs[i].cmdline); - } - } -} -/****************************** - * end job list helper routines - ******************************/ - - -/*********************** - * Other helper routines - ***********************/ - -/* - * usage - print a help message - */ -void usage(void) -{ - printf("Usage: shell [-hvp]\n"); - printf(" -h print this message\n"); - printf(" -v print additional diagnostic information\n"); - printf(" -p do not emit a command prompt\n"); - exit(1); -} - -/* - * unix_error - unix-style error routine - */ -void unix_error(char *msg) -{ - fprintf(stdout, "%s: %s\n", msg, strerror(errno)); - exit(1); -} - -/* - * app_error - application-style error routine - */ -void app_error(char *msg) -{ - fprintf(stdout, "%s\n", msg); - exit(1); -} - -/* - * Signal - wrapper for the sigaction function - */ -handler_t *Signal(int signum, handler_t *handler) -{ - struct sigaction action, old_action; - - action.sa_handler = handler; - sigemptyset(&action.sa_mask); /* block sigs of type being handled */ - action.sa_flags = SA_RESTART; /* restart syscalls if possible */ - - if (sigaction(signum, &action, &old_action) < 0) - unix_error("Signal error"); - return (old_action.sa_handler); -} - -/* - * sigquit_handler - The driver program can gracefully terminate the - * child shell by sending it a SIGQUIT signal. - */ -void sigquit_handler(int sig) -{ - printf("Terminating after receipt of SIGQUIT signal\n"); - exit(1); -} - - - diff --git a/tsh.cc b/tsh.cc new file mode 100644 index 0000000..7c2ea8d --- /dev/null +++ b/tsh.cc @@ -0,0 +1,509 @@ +/* + * tsh - A tiny shell program with job control + * + * + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Misc manifest constants */ +#define MAXLINE 1024 /* max line size */ +#define MAXARGS 128 /* max args on a command line */ +#define MAXJOBS 16 /* max jobs at any point in time */ +#define MAXJID 1<<16 /* max job ID */ + +/* Job states */ +#define UNDEF 0 /* undefined */ +#define FG 1 /* running in foreground */ +#define BG 2 /* running in background */ +#define ST 3 /* stopped */ + +/* + * Jobs states: FG (foreground), BG (background), ST (stopped) + * Job state transitions and enabling actions: + * FG -> ST : ctrl-z + * ST -> FG : fg command + * ST -> BG : bg command + * BG -> FG : fg command + * At most 1 job can be in the FG state. + */ + +/* Global variables */ +extern char **environ; /* defined in libc */ +char prompt[] = "tsh> "; /* command line prompt (DO NOT CHANGE) */ +int verbose = 0; /* if true, print additional output */ +int nextjid = 1; /* next job ID to allocate */ +char sbuf[MAXLINE]; /* for composing sprintf messages */ + +struct job_t { /* The job struct */ + pid_t pid; /* job PID */ + int jid; /* job ID [1, 2, ...] */ + int state; /* UNDEF, BG, FG, or ST */ + char cmdline[MAXLINE]; /* command line */ +}; +struct job_t jobs[MAXJOBS]; /* The job list */ +/* End global variables */ + + +/* Function prototypes */ + +/* Here are the functions that you will implement */ +void eval(char *cmdline); +int builtin_cmd(char **argv); +void do_bgfg(char **argv); +void waitfg(pid_t pid); + +void sigchld_handler(int sig); +void sigtstp_handler(int sig); +void sigint_handler(int sig); + +/* Here are helper routines that we've provided for you */ +int parseline(const char *cmdline, char **argv); +void sigquit_handler(int sig); + +void clearjob(struct job_t *job); +void initjobs(struct job_t *jobs); +int maxjid(struct job_t *jobs); +int addjob(struct job_t *jobs, pid_t pid, int state, char *cmdline); +int deletejob(struct job_t *jobs, pid_t pid); +pid_t fgpid(struct job_t *jobs); +struct job_t *getjobpid(struct job_t *jobs, pid_t pid); +struct job_t *getjobjid(struct job_t *jobs, int jid); +int pid2jid(pid_t pid); +void listjobs(struct job_t *jobs); + +void usage(void); +void unix_error(char *msg); +void app_error(char *msg); +typedef void handler_t(int); +handler_t *Signal(int signum, handler_t *handler); + +/* + * main - The shell's main routine + */ +int main(int argc, char **argv) +{ + char c; + char cmdline[MAXLINE]; + int emit_prompt = 1; /* emit prompt (default) */ + + /* Redirect stderr to stdout (so that driver will get all output + * on the pipe connected to stdout) */ + dup2(1, 2); + + /* Parse the command line */ + while ((c = getopt(argc, argv, "hvp")) != EOF) { + switch (c) { + case 'h': /* print help message */ + usage(); + break; + case 'v': /* emit additional diagnostic info */ + verbose = 1; + break; + case 'p': /* don't print a prompt */ + emit_prompt = 0; /* handy for automatic testing */ + break; + default: + usage(); + } + } + + /* Install the signal handlers */ + + /* These are the ones you will need to implement */ + Signal(SIGINT, sigint_handler); /* ctrl-c */ + Signal(SIGTSTP, sigtstp_handler); /* ctrl-z */ + Signal(SIGCHLD, sigchld_handler); /* Terminated or stopped child */ + + /* This one provides a clean way to kill the shell */ + Signal(SIGQUIT, sigquit_handler); + + /* Initialize the job list */ + initjobs(jobs); + + /* Execute the shell's read/eval loop */ + while (1) { + + /* Read command line */ + if (emit_prompt) { + printf("%s", prompt); + fflush(stdout); + } + if ((fgets(cmdline, MAXLINE, stdin) == NULL) && ferror(stdin)) + app_error("fgets error"); + if (feof(stdin)) { /* End of file (ctrl-d) */ + fflush(stdout); + exit(0); + } + + /* Evaluate the command line */ + eval(cmdline); + fflush(stdout); + fflush(stdout); + } + + exit(0); /* control never reaches here */ +} + +/* + * eval - Evaluate the command line that the user has just typed in + * + * If the user has requested a built-in command (quit, jobs, bg or fg) + * then execute it immediately. Otherwise, fork a child process and + * run the job in the context of the child. If the job is running in + * the foreground, wait for it to terminate and then return. Note: + * each child process must have a unique process group ID so that our + * background children don't receive SIGINT (SIGTSTP) from the kernel + * when we type ctrl-c (ctrl-z) at the keyboard. +*/ +void eval(char *cmdline) +{ + return; +} + +/* + * parseline - Parse the command line and build the argv array. + * + * Characters enclosed in single quotes are treated as a single + * argument. Return true if the user has requested a BG job, false if + * the user has requested a FG job. + */ +int parseline(const char *cmdline, char **argv) +{ + static char array[MAXLINE]; /* holds local copy of command line */ + char *buf = array; /* ptr that traverses command line */ + char *delim; /* points to first space delimiter */ + int argc; /* number of args */ + int bg; /* background job? */ + + strcpy(buf, cmdline); + buf[strlen(buf)-1] = ' '; /* replace trailing '\n' with space */ + while (*buf && (*buf == ' ')) /* ignore leading spaces */ + buf++; + + /* Build the argv list */ + argc = 0; + if (*buf == '\'') { + buf++; + delim = strchr(buf, '\''); + } + else { + delim = strchr(buf, ' '); + } + + while (delim) { + argv[argc++] = buf; + *delim = '\0'; + buf = delim + 1; + while (*buf && (*buf == ' ')) /* ignore spaces */ + buf++; + + if (*buf == '\'') { + buf++; + delim = strchr(buf, '\''); + } + else { + delim = strchr(buf, ' '); + } + } + argv[argc] = NULL; + + if (argc == 0) /* ignore blank line */ + return 1; + + /* should the job run in the background? */ + if ((bg = (*argv[argc-1] == '&')) != 0) { + argv[--argc] = NULL; + } + return bg; +} + +/* + * builtin_cmd - If the user has typed a built-in command then execute + * it immediately. + */ +int builtin_cmd(char **argv) +{ + return 0; /* not a builtin command */ +} + +/* + * do_bgfg - Execute the builtin bg and fg commands + */ +void do_bgfg(char **argv) +{ + return; +} + +/* + * waitfg - Block until process pid is no longer the foreground process + */ +void waitfg(pid_t pid) +{ + return; +} + +/***************** + * Signal handlers + *****************/ + +/* + * sigchld_handler - The kernel sends a SIGCHLD to the shell whenever + * a child job terminates (becomes a zombie), or stops because it + * received a SIGSTOP or SIGTSTP signal. The handler reaps all + * available zombie children, but doesn't wait for any other + * currently running children to terminate. + */ +void sigchld_handler(int sig) +{ + return; +} + +/* + * sigint_handler - The kernel sends a SIGINT to the shell whenver the + * user types ctrl-c at the keyboard. Catch it and send it along + * to the foreground job. + */ +void sigint_handler(int sig) +{ + return; +} + +/* + * sigtstp_handler - The kernel sends a SIGTSTP to the shell whenever + * the user types ctrl-z at the keyboard. Catch it and suspend the + * foreground job by sending it a SIGTSTP. + */ +void sigtstp_handler(int sig) +{ + return; +} + +/********************* + * End signal handlers + *********************/ + +/*********************************************** + * Helper routines that manipulate the job list + **********************************************/ + +/* clearjob - Clear the entries in a job struct */ +void clearjob(struct job_t *job) { + job->pid = 0; + job->jid = 0; + job->state = UNDEF; + job->cmdline[0] = '\0'; +} + +/* initjobs - Initialize the job list */ +void initjobs(struct job_t *jobs) { + int i; + + for (i = 0; i < MAXJOBS; i++) + clearjob(&jobs[i]); +} + +/* maxjid - Returns largest allocated job ID */ +int maxjid(struct job_t *jobs) +{ + int i, max=0; + + for (i = 0; i < MAXJOBS; i++) + if (jobs[i].jid > max) + max = jobs[i].jid; + return max; +} + +/* addjob - Add a job to the job list */ +int addjob(struct job_t *jobs, pid_t pid, int state, char *cmdline) +{ + int i; + + if (pid < 1) + return 0; + + for (i = 0; i < MAXJOBS; i++) { + if (jobs[i].pid == 0) { + jobs[i].pid = pid; + jobs[i].state = state; + jobs[i].jid = nextjid++; + if (nextjid > MAXJOBS) + nextjid = 1; + strcpy(jobs[i].cmdline, cmdline); + if(verbose){ + printf("Added job [%d] %d %s\n", jobs[i].jid, jobs[i].pid, jobs[i].cmdline); + } + return 1; + } + } + printf("Tried to create too many jobs\n"); + return 0; +} + +/* deletejob - Delete a job whose PID=pid from the job list */ +int deletejob(struct job_t *jobs, pid_t pid) +{ + int i; + + if (pid < 1) + return 0; + + for (i = 0; i < MAXJOBS; i++) { + if (jobs[i].pid == pid) { + clearjob(&jobs[i]); + nextjid = maxjid(jobs)+1; + return 1; + } + } + return 0; +} + +/* fgpid - Return PID of current foreground job, 0 if no such job */ +pid_t fgpid(struct job_t *jobs) { + int i; + + for (i = 0; i < MAXJOBS; i++) + if (jobs[i].state == FG) + return jobs[i].pid; + return 0; +} + +/* getjobpid - Find a job (by PID) on the job list */ +struct job_t *getjobpid(struct job_t *jobs, pid_t pid) { + int i; + + if (pid < 1) + return NULL; + for (i = 0; i < MAXJOBS; i++) + if (jobs[i].pid == pid) + return &jobs[i]; + return NULL; +} + +/* getjobjid - Find a job (by JID) on the job list */ +struct job_t *getjobjid(struct job_t *jobs, int jid) +{ + int i; + + if (jid < 1) + return NULL; + for (i = 0; i < MAXJOBS; i++) + if (jobs[i].jid == jid) + return &jobs[i]; + return NULL; +} + +/* pid2jid - Map process ID to job ID */ +int pid2jid(pid_t pid) +{ + int i; + + if (pid < 1) + return 0; + for (i = 0; i < MAXJOBS; i++) + if (jobs[i].pid == pid) { + return jobs[i].jid; + } + return 0; +} + +/* listjobs - Print the job list */ +void listjobs(struct job_t *jobs) +{ + int i; + + for (i = 0; i < MAXJOBS; i++) { + if (jobs[i].pid != 0) { + printf("[%d] (%d) ", jobs[i].jid, jobs[i].pid); + switch (jobs[i].state) { + case BG: + printf("Running "); + break; + case FG: + printf("Foreground "); + break; + case ST: + printf("Stopped "); + break; + default: + printf("listjobs: Internal error: job[%d].state=%d ", + i, jobs[i].state); + } + printf("%s", jobs[i].cmdline); + } + } +} +/****************************** + * end job list helper routines + ******************************/ + + +/*********************** + * Other helper routines + ***********************/ + +/* + * usage - print a help message + */ +void usage(void) +{ + printf("Usage: shell [-hvp]\n"); + printf(" -h print this message\n"); + printf(" -v print additional diagnostic information\n"); + printf(" -p do not emit a command prompt\n"); + exit(1); +} + +/* + * unix_error - unix-style error routine + */ +void unix_error(char *msg) +{ + fprintf(stdout, "%s: %s\n", msg, strerror(errno)); + exit(1); +} + +/* + * app_error - application-style error routine + */ +void app_error(char *msg) +{ + fprintf(stdout, "%s\n", msg); + exit(1); +} + +/* + * Signal - wrapper for the sigaction function + */ +handler_t *Signal(int signum, handler_t *handler) +{ + struct sigaction action, old_action; + + action.sa_handler = handler; + sigemptyset(&action.sa_mask); /* block sigs of type being handled */ + action.sa_flags = SA_RESTART; /* restart syscalls if possible */ + + if (sigaction(signum, &action, &old_action) < 0) + unix_error("Signal error"); + return (old_action.sa_handler); +} + +/* + * sigquit_handler - The driver program can gracefully terminate the + * child shell by sending it a SIGQUIT signal. + */ +void sigquit_handler(int sig) +{ + printf("Terminating after receipt of SIGQUIT signal\n"); + exit(1); +} + + + -- cgit v1.3.1-4-g156e From 6f9caa47bc538cf7c893ad2548a29904ff54e2e8 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Tue, 11 Aug 2026 11:21:00 +0000 Subject: git ignore --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index f152158..59c0d35 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,10 @@ vcpkg_installed/ # test output & cache Testing/ .cache/ + +.vscode/ +myint +myspin +mysplit +mystop +tsh -- cgit v1.3.1-4-g156e From 879205d80a109d09396c936f98e31a559a2fc6f1 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Tue, 11 Aug 2026 11:50:10 +0000 Subject: finished trace02 --- tsh.cc | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/tsh.cc b/tsh.cc index 7c2ea8d..e9e77c3 100644 --- a/tsh.cc +++ b/tsh.cc @@ -12,6 +12,11 @@ #include #include #include +#include +#include +#include + +using namespace std; /* Misc manifest constants */ #define MAXLINE 1024 /* max line size */ @@ -56,7 +61,7 @@ struct job_t jobs[MAXJOBS]; /* The job list */ /* Here are the functions that you will implement */ void eval(char *cmdline); -int builtin_cmd(char **argv); +int builtin_cmd(char *c_str); void do_bgfg(char **argv); void waitfg(pid_t pid); @@ -85,6 +90,11 @@ void app_error(char *msg); typedef void handler_t(int); handler_t *Signal(int signum, handler_t *handler); +// built-in commands +void builtin_command_quit(); + +vector builtin_cmd_list = {"QUIT", "WAIT", "quit"}; + /* * main - The shell's main routine */ @@ -165,6 +175,24 @@ int main(int argc, char **argv) */ void eval(char *cmdline) { + char arg[MAXARGS][MAXLINE]; + char *argv[MAXARGS]; + for (int i = 0 ; i < MAXARGS; i++) + { + argv[i] = &arg[i][0]; + } + parseline(cmdline, argv); + + if (builtin_cmd(argv[0])) + { + // TODO + cout << "built-in" << endl; + if (strcmp(argv[0], "quit") == 0) builtin_command_quit(); + else return; + } + + + return; } @@ -229,8 +257,12 @@ int parseline(const char *cmdline, char **argv) * builtin_cmd - If the user has typed a built-in command then execute * it immediately. */ -int builtin_cmd(char **argv) +int builtin_cmd(char *c_str) { + string s(c_str); + for (auto c : builtin_cmd_list) + if (c == s) + return 1; return 0; /* not a builtin command */ } @@ -506,4 +538,7 @@ void sigquit_handler(int sig) } - +void builtin_command_quit() +{ + exit(0); +} -- cgit v1.3.1-4-g156e From 7f96fb8c3993821a5fcc7cab6a92323a8f610878 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Tue, 11 Aug 2026 11:50:26 +0000 Subject: fix --- tsh.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsh.cc b/tsh.cc index e9e77c3..8f98711 100644 --- a/tsh.cc +++ b/tsh.cc @@ -93,7 +93,7 @@ handler_t *Signal(int signum, handler_t *handler); // built-in commands void builtin_command_quit(); -vector builtin_cmd_list = {"QUIT", "WAIT", "quit"}; +vector builtin_cmd_list = {"quit"}; /* * main - The shell's main routine -- cgit v1.3.1-4-g156e From 8042c2d1d4d233516eb4fb790be88590ae62243e Mon Sep 17 00:00:00 2001 From: _ov4 Date: Tue, 11 Aug 2026 12:56:53 +0000 Subject: ok - simple sigchld_handler - simple eval --- tsh.cc | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/tsh.cc b/tsh.cc index 8f98711..06cfa2c 100644 --- a/tsh.cc +++ b/tsh.cc @@ -182,6 +182,8 @@ void eval(char *cmdline) argv[i] = &arg[i][0]; } parseline(cmdline, argv); + + if (argv[0] == NULL) return; if (builtin_cmd(argv[0])) { @@ -191,7 +193,28 @@ void eval(char *cmdline) else return; } - + sigset_t mask_sigchld, prev_mask, mask_all; + sigaddset(&mask_sigchld, SIGCHLD); + sigfillset(&mask_all); + + sigprocmask(SIG_BLOCK, &mask_sigchld, &prev_mask); + + pid_t pid = fork(); + if (pid == 0) // child + { + execve(argv[0], argv, NULL); + char msg[] = "log: command not found\n"; + write(STDOUT_FILENO, msg, strlen(msg)); + exit(-1); // if no command is found + } + + // parent + job_t job; + sigprocmask(SIG_SETMASK, &mask_all, NULL); + addjob(&job, pid, FG, cmdline); + sigprocmask(SIG_SETMASK, &prev_mask, NULL); + + return; } @@ -295,6 +318,21 @@ void waitfg(pid_t pid) */ void sigchld_handler(int sig) { + constexpr int numlen = 20; + int errno_backup = errno; + int status, pid; + char msg[] = "sig chld, pid: ", num[numlen]; + write(STDOUT_FILENO, msg, strlen(msg)); + + while ((pid = waitpid(-1, &status, WNOHANG)) > 0) + { + // deletejob(NULL, pid); + sprintf(num, "%d\n", pid); + write(STDOUT_FILENO, num, strlen(num)); + } + + + errno = errno_backup; return; } -- cgit v1.3.1-4-g156e From d0c40a95b3fa1a487e573161591e358ba3a87b92 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Tue, 11 Aug 2026 13:23:41 +0000 Subject: helper --- util.h | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 util.h diff --git a/util.h b/util.h new file mode 100644 index 0000000..7fd874d --- /dev/null +++ b/util.h @@ -0,0 +1,85 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace ov4 { + +const int DECIMAL = 10; +const int LENGTH = 20; + +void atomic_print(char *s) +{ + write(STDOUT_FILENO, s, strlen(s)); +} + +void atomic_print(int x) +{ + char msg[LENGTH]; + itoa(x, msg, DECIMAL); + atomic_print(msg); +} + +void reverse(char str[], int length) +{ + int start = 0; + int end = length - 1; + while (start < end) { + char temp = str[start]; + str[start] = str[end]; + str[end] = temp; + end--; + start++; + } +} + + +char* itoa(int num, char* str, int base) +{ + int i = 0; + bool isNegative = false; + + /* Handle 0 explicitly, otherwise empty string is + * printed for 0 */ + if (num == 0) { + str[i++] = '0'; + str[i] = '\0'; + return str; + } + + // In standard itoa(), negative numbers are handled + // only with base 10. Otherwise numbers are + // considered unsigned. + if (num < 0 && base == 10) { + isNegative = true; + num = -num; + } + + // Process individual digits + while (num != 0) { + int rem = num % base; + str[i++] = (rem > 9) ? (rem - 10) + 'a' : rem + '0'; + num = num / base; + } + + // If number is negative, append '-' + if (isNegative) + str[i++] = '-'; + + str[i] = '\0'; // Append string terminator + + // Reverse the string + reverse(str, i); + + return str; +} + +} -- cgit v1.3.1-4-g156e From 46e4e11e1e30c1bcc05335df829a792d657ea781 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Tue, 11 Aug 2026 13:27:46 +0000 Subject: update --- tsh.cc | 10 +++++----- util.h | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tsh.cc b/tsh.cc index 06cfa2c..fc9b34f 100644 --- a/tsh.cc +++ b/tsh.cc @@ -15,8 +15,10 @@ #include #include #include +#include "util.h" using namespace std; +using ov4::atomic_print; /* Misc manifest constants */ #define MAXLINE 1024 /* max line size */ @@ -318,17 +320,15 @@ void waitfg(pid_t pid) */ void sigchld_handler(int sig) { - constexpr int numlen = 20; int errno_backup = errno; int status, pid; - char msg[] = "sig chld, pid: ", num[numlen]; + char msg[] = "sig chld, pid: "; write(STDOUT_FILENO, msg, strlen(msg)); while ((pid = waitpid(-1, &status, WNOHANG)) > 0) { - // deletejob(NULL, pid); - sprintf(num, "%d\n", pid); - write(STDOUT_FILENO, num, strlen(num)); + deletejob(NULL, pid); + atomic_print(pid); } diff --git a/util.h b/util.h index 7fd874d..4ede5bd 100644 --- a/util.h +++ b/util.h @@ -13,6 +13,11 @@ namespace ov4 { +void atomic_print(char *s); +void atomic_print(int x); +void reverse(char str[], int length); +char* itoa(int num, char* str, int base); + const int DECIMAL = 10; const int LENGTH = 20; -- cgit v1.3.1-4-g156e From 7295ec259b56c7fb789bbc5491265d62635626bf Mon Sep 17 00:00:00 2001 From: _ov4 Date: Tue, 11 Aug 2026 13:28:46 +0000 Subject: never again --- util.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util.h b/util.h index 4ede5bd..a7f06ba 100644 --- a/util.h +++ b/util.h @@ -1,3 +1,5 @@ +#pragma once + #include #include #include -- cgit v1.3.1-4-g156e From 52c77e35d0fc60de1ed4348534f36c84c3fb86d5 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Tue, 11 Aug 2026 13:38:15 +0000 Subject: fix --- tsh.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tsh.cc b/tsh.cc index fc9b34f..fbcdeeb 100644 --- a/tsh.cc +++ b/tsh.cc @@ -95,7 +95,7 @@ handler_t *Signal(int signum, handler_t *handler); // built-in commands void builtin_command_quit(); -vector builtin_cmd_list = {"quit"}; +vector builtin_cmd_list = {"quit", "fg", "bg", "jobs"}; /* * main - The shell's main routine @@ -192,7 +192,8 @@ void eval(char *cmdline) // TODO cout << "built-in" << endl; if (strcmp(argv[0], "quit") == 0) builtin_command_quit(); - else return; + else if (strcmp(argv[0], "jobs") == 0) listjobs(jobs); + return; } sigset_t mask_sigchld, prev_mask, mask_all; @@ -211,9 +212,8 @@ void eval(char *cmdline) } // parent - job_t job; sigprocmask(SIG_SETMASK, &mask_all, NULL); - addjob(&job, pid, FG, cmdline); + addjob(jobs, pid, FG, cmdline); sigprocmask(SIG_SETMASK, &prev_mask, NULL); @@ -327,7 +327,7 @@ void sigchld_handler(int sig) while ((pid = waitpid(-1, &status, WNOHANG)) > 0) { - deletejob(NULL, pid); + deletejob(jobs, pid); atomic_print(pid); } -- cgit v1.3.1-4-g156e From c906f26020816deb5810e7f4ed79770c39f10362 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Tue, 11 Aug 2026 14:43:51 +0000 Subject: ok --- tsh.cc | 55 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/tsh.cc b/tsh.cc index fbcdeeb..fc96296 100644 --- a/tsh.cc +++ b/tsh.cc @@ -65,7 +65,7 @@ struct job_t jobs[MAXJOBS]; /* The job list */ void eval(char *cmdline); int builtin_cmd(char *c_str); void do_bgfg(char **argv); -void waitfg(pid_t pid); +void waitfg(sigset_t prev); void sigchld_handler(int sig); void sigtstp_handler(int sig); @@ -183,7 +183,7 @@ void eval(char *cmdline) { argv[i] = &arg[i][0]; } - parseline(cmdline, argv); + int ground = parseline(cmdline, argv); if (argv[0] == NULL) return; @@ -196,26 +196,55 @@ void eval(char *cmdline) return; } - sigset_t mask_sigchld, prev_mask, mask_all; - sigaddset(&mask_sigchld, SIGCHLD); + sigset_t mask_sigchld, mask_all, prev, prev_all; + sigemptyset(&mask_sigchld); sigfillset(&mask_all); + sigaddset(&mask_sigchld, SIGCHLD); - sigprocmask(SIG_BLOCK, &mask_sigchld, &prev_mask); + // block SIGCHLD + sigprocmask(SIG_BLOCK, &mask_sigchld, &prev); pid_t pid = fork(); if (pid == 0) // child { + sigprocmask(SIG_UNBLOCK, &mask_sigchld, NULL); + pid = getpid(); + setpgid(pid, pid); + execve(argv[0], argv, NULL); - char msg[] = "log: command not found\n"; - write(STDOUT_FILENO, msg, strlen(msg)); + + atomic_print("log: command not found\n"); exit(-1); // if no command is found } // parent - sigprocmask(SIG_SETMASK, &mask_all, NULL); - addjob(jobs, pid, FG, cmdline); - sigprocmask(SIG_SETMASK, &prev_mask, NULL); + // mask_sigchld = only SIGCHLD + // mask_all = all signals + // prev = oldest + // prev_all = oldest but with SIGCHLD blocked + + // block all to add jobs + sigprocmask(SIG_SETMASK, &mask_all, &prev_all); + + if (!ground) // foreground + { + addjob(jobs, pid, FG, cmdline); + // unblock all expect SIGCHILD + sigprocmask(SIG_SETMASK, &prev_all, NULL); + // we still leave SIGCHLD to be unblocked within waitfg() + waitfg(prev); + // and then unblock SIGCHLD + sigprocmask(SIG_SETMASK, &prev, NULL); + } + else // background + { + addjob(jobs, pid, BG, cmdline); + // unblock to oldest + sigprocmask(SIG_SETMASK, &prev, NULL); + } + + return; @@ -302,8 +331,12 @@ void do_bgfg(char **argv) /* * waitfg - Block until process pid is no longer the foreground process */ -void waitfg(pid_t pid) +void waitfg(sigset_t prev) { + clog << "waiting for pid "<< fgpid(jobs) << endl; + while (fgpid(jobs) != 0) + sigsuspend(&prev); + clog << "finished fg " << fgpid(jobs) << endl; return; } -- cgit v1.3.1-4-g156e From 6e773674901a3b73abff74ad89dce4a6b9c02cd9 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Tue, 11 Aug 2026 14:46:08 +0000 Subject: bg --- tsh.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/tsh.cc b/tsh.cc index fc96296..494a154 100644 --- a/tsh.cc +++ b/tsh.cc @@ -242,6 +242,7 @@ void eval(char *cmdline) addjob(jobs, pid, BG, cmdline); // unblock to oldest sigprocmask(SIG_SETMASK, &prev, NULL); + cout << "[" << pid2jid(pid) << "] (" << pid << ") " << cmdline << endl; } -- cgit v1.3.1-4-g156e From 5182cddfc8e1f4c1ab80d90dedbf4fc95b71c3c2 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Tue, 11 Aug 2026 14:50:51 +0000 Subject: be respectful to the original authors --- tsh.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tsh.cc b/tsh.cc index 494a154..61537a3 100644 --- a/tsh.cc +++ b/tsh.cc @@ -65,7 +65,7 @@ struct job_t jobs[MAXJOBS]; /* The job list */ void eval(char *cmdline); int builtin_cmd(char *c_str); void do_bgfg(char **argv); -void waitfg(sigset_t prev); +void waitfg(pid_t pid); void sigchld_handler(int sig); void sigtstp_handler(int sig); @@ -233,7 +233,8 @@ void eval(char *cmdline) // unblock all expect SIGCHILD sigprocmask(SIG_SETMASK, &prev_all, NULL); // we still leave SIGCHLD to be unblocked within waitfg() - waitfg(prev); + // this pid is USELESS!!! + waitfg(0); // and then unblock SIGCHLD sigprocmask(SIG_SETMASK, &prev, NULL); } @@ -332,8 +333,13 @@ void do_bgfg(char **argv) /* * waitfg - Block until process pid is no longer the foreground process */ -void waitfg(sigset_t prev) +void waitfg(pid_t pid) { + sigset_t prev; + // get current blocked signals + sigprocmask(0, NULL, &prev); + // remove SIGCHILD + sigdelset(&prev, SIGCHLD); clog << "waiting for pid "<< fgpid(jobs) << endl; while (fgpid(jobs) != 0) sigsuspend(&prev); -- cgit v1.3.1-4-g156e From c2d1c8f63504c5ca65c127d6dba4cd7e39399066 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Wed, 12 Aug 2026 12:22:23 +0000 Subject: Forward SIGINT to foreground job. --- tsh.cc | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/tsh.cc b/tsh.cc index 61537a3..f6027ae 100644 --- a/tsh.cc +++ b/tsh.cc @@ -85,6 +85,7 @@ struct job_t *getjobpid(struct job_t *jobs, pid_t pid); struct job_t *getjobjid(struct job_t *jobs, int jid); int pid2jid(pid_t pid); void listjobs(struct job_t *jobs); +bool job_suspend(struct job_t *jobs, pid_t pid); void usage(void); void unix_error(char *msg); @@ -233,8 +234,7 @@ void eval(char *cmdline) // unblock all expect SIGCHILD sigprocmask(SIG_SETMASK, &prev_all, NULL); // we still leave SIGCHLD to be unblocked within waitfg() - // this pid is USELESS!!! - waitfg(0); + waitfg(pid); // and then unblock SIGCHLD sigprocmask(SIG_SETMASK, &prev, NULL); } @@ -341,9 +341,14 @@ void waitfg(pid_t pid) // remove SIGCHILD sigdelset(&prev, SIGCHLD); clog << "waiting for pid "<< fgpid(jobs) << endl; + job_t *j = getjobpid(jobs, pid); while (fgpid(jobs) != 0) sigsuspend(&prev); - clog << "finished fg " << fgpid(jobs) << endl; + clog << "finished fg " << endl; + if ((j->state == ST)) + { + cout << "[" << j->jid << "] (" << pid << ") Stopped " << j->cmdline << endl; + } return; } @@ -362,11 +367,13 @@ void sigchld_handler(int sig) { int errno_backup = errno; int status, pid; - char msg[] = "sig chld, pid: "; - write(STDOUT_FILENO, msg, strlen(msg)); + atomic_print("SIGCHLD\n"); while ((pid = waitpid(-1, &status, WNOHANG)) > 0) { + atomic_print("pid: "); + atomic_print(pid); + atomic_print("\n"); deletejob(jobs, pid); atomic_print(pid); } @@ -383,6 +390,11 @@ void sigchld_handler(int sig) */ void sigint_handler(int sig) { + int pid = fgpid(jobs); + if (pid != 0) + { + kill(-pid, SIGINT); + } return; } @@ -393,6 +405,16 @@ void sigint_handler(int sig) */ void sigtstp_handler(int sig) { + int pid = fgpid(jobs); + if (pid != 0) + { + kill(-pid, SIGTSTP); + sigset_t mask_all, prev; + sigfillset(&mask_all); + sigprocmask(SIG_SETMASK, &mask_all, &prev); + job_suspend(jobs, pid); + sigprocmask(SIG_SETMASK, &prev, NULL); + } return; } @@ -620,3 +642,16 @@ void builtin_command_quit() { exit(0); } + +// return true if suspended, otherwise false +bool job_suspend(struct job_t *jobs, pid_t pid) { + int i; + + for (i = 0; i < MAXJOBS; i++) + if (jobs[i].pid == pid) + { + jobs[i].state = ST; + return true; + } + return false; +} -- cgit v1.3.1-4-g156e From 1caf88d333dd6a2b0aff719994dd6c47708c0c76 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Wed, 12 Aug 2026 12:33:58 +0000 Subject: helper --- .gitignore | 1 + Makefile | 2 +- output.c | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 output.c diff --git a/.gitignore b/.gitignore index 59c0d35..d448e21 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ myspin mysplit mystop tsh +output diff --git a/Makefile b/Makefile index 7e3c0ea..051dbaa 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ CXX = g++ CXXFLAGS = -std=c++17 -Wall -Wno-write-strings -O2 CC = gcc CFLAGS = -Wall -O2 -FILES = $(TSH) ./myspin ./mysplit ./mystop ./myint +FILES = $(TSH) ./myspin ./mysplit ./mystop ./myint ./output all: $(FILES) diff --git a/output.c b/output.c new file mode 100644 index 0000000..bba2760 --- /dev/null +++ b/output.c @@ -0,0 +1,21 @@ +#include +#include +#include + +int main(int argc, char **argv) +{ + int i, secs; + + if (argc != 2) { + fprintf(stderr, "Usage: %s \n", argv[0]); + exit(0); + } + secs = atoi(argv[1]); + for (i=0; i < secs; i++) + { + printf("%d\n", i); + fflush(stdout); + sleep(1); + } + exit(0); +} -- cgit v1.3.1-4-g156e From 049686036731edead73f35692c4cf6005e0a3c85 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Wed, 12 Aug 2026 12:36:29 +0000 Subject: logger --- util.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util.h b/util.h index a7f06ba..0f5d153 100644 --- a/util.h +++ b/util.h @@ -13,6 +13,8 @@ #include #include +#define LOG !(ov4::GLOBAL_DEBUG && ov4::DEBUG) ? (void)0 : ov4::LogVoidify() & std::clog + namespace ov4 { void atomic_print(char *s); -- cgit v1.3.1-4-g156e From 8f0464de722ae5007915e9db56d4dca806b01f7f Mon Sep 17 00:00:00 2001 From: _ov4 Date: Wed, 12 Aug 2026 12:37:43 +0000 Subject: update --- util.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util.h b/util.h index 0f5d153..9d939f9 100644 --- a/util.h +++ b/util.h @@ -22,6 +22,9 @@ void atomic_print(int x); void reverse(char str[], int length); char* itoa(int num, char* str, int base); +constexpr bool GLOBAL_DEBUG = false; +bool DEBUG = false; // verbose mode + const int DECIMAL = 10; const int LENGTH = 20; -- cgit v1.3.1-4-g156e From c97a162e8c60aa20a1de02cd828db8f35bd53085 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Wed, 12 Aug 2026 14:06:28 +0000 Subject: bg/fg --- tsh.cc | 35 +++++++++++++++++++++++++++++++++++ util.h | 5 +++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/tsh.cc b/tsh.cc index f6027ae..985c083 100644 --- a/tsh.cc +++ b/tsh.cc @@ -96,6 +96,8 @@ handler_t *Signal(int signum, handler_t *handler); // built-in commands void builtin_command_quit(); +inline int block_all(sigset_t *prev); + vector builtin_cmd_list = {"quit", "fg", "bg", "jobs"}; /* @@ -194,6 +196,9 @@ void eval(char *cmdline) cout << "built-in" << endl; if (strcmp(argv[0], "quit") == 0) builtin_command_quit(); else if (strcmp(argv[0], "jobs") == 0) listjobs(jobs); + else if (strcmp(argv[0], "fg") == 0) do_bgfg(argv); + else if (strcmp(argv[0], "bg") == 0) do_bgfg(argv); + else cerr << "built-in but not supported" << endl; return; } @@ -327,6 +332,29 @@ int builtin_cmd(char *c_str) */ void do_bgfg(char **argv) { + if (strcmp(argv[0], "fg") == 0) + { + LOG << "fg" << endl; + int jid = atoi(argv[1]); + sigset_t prev; + block_all(&prev); + job_t *j = getjobjid(jobs, jid); + j->state = FG; + kill(-(j->pid), SIGCONT); + sigprocmask(SIG_SETMASK, &prev, NULL); + waitfg(j->pid); + } else if (strcmp(argv[0], "bg") == 0) + { + LOG << "bg" << endl; + int jid = atoi(argv[1]); + sigset_t prev; + block_all(&prev); + job_t *j = getjobjid(jobs, jid); + j->state = BG; + kill(-(j->pid), SIGCONT); + sigprocmask(SIG_SETMASK, &prev, NULL); + } else + cerr << "not fg/bg" << endl; return; } @@ -655,3 +683,10 @@ bool job_suspend(struct job_t *jobs, pid_t pid) { } return false; } + +inline int block_all(sigset_t *prev) +{ + sigset_t set; + sigfillset(&set); + return sigprocmask(SIG_SETMASK, &set, prev); +} diff --git a/util.h b/util.h index 9d939f9..072f65e 100644 --- a/util.h +++ b/util.h @@ -22,8 +22,9 @@ void atomic_print(int x); void reverse(char str[], int length); char* itoa(int num, char* str, int base); -constexpr bool GLOBAL_DEBUG = false; -bool DEBUG = false; // verbose mode +constexpr bool GLOBAL_DEBUG = true; +bool DEBUG = true; // verbose mode, can be enabled on demand using something like -v +struct LogVoidify { void operator&(std::ostream&) const {} }; const int DECIMAL = 10; const int LENGTH = 20; -- cgit v1.3.1-4-g156e From ddbd21e8804071e794fb1264d2cfa095971870c5 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Thu, 13 Aug 2026 11:03:16 +0000 Subject: bg/fg --- tsh.cc | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/tsh.cc b/tsh.cc index 985c083..6800e4d 100644 --- a/tsh.cc +++ b/tsh.cc @@ -332,30 +332,38 @@ int builtin_cmd(char *c_str) */ void do_bgfg(char **argv) { - if (strcmp(argv[0], "fg") == 0) + if ((strcmp(argv[0], "fg") == 0) || (strcmp(argv[0], "bg") == 0)) { - LOG << "fg" << endl; - int jid = atoi(argv[1]); - sigset_t prev; - block_all(&prev); - job_t *j = getjobjid(jobs, jid); - j->state = FG; - kill(-(j->pid), SIGCONT); - sigprocmask(SIG_SETMASK, &prev, NULL); - waitfg(j->pid); - } else if (strcmp(argv[0], "bg") == 0) - { - LOG << "bg" << endl; - int jid = atoi(argv[1]); + int x; + job_t *j = nullptr; sigset_t prev; + if (argv[1][0] == '%') // jid provided + { + x = atoi(argv[1]); // eat % + j = getjobjid(jobs, x); + } else { // pid + x = atoi(argv[0]); + j = getjobpid(jobs, x); + } + block_all(&prev); - job_t *j = getjobjid(jobs, jid); - j->state = BG; - kill(-(j->pid), SIGCONT); - sigprocmask(SIG_SETMASK, &prev, NULL); - } else + if (strcmp(argv[0], "fg") == 0) // fg + { + LOG << "fg" << endl; + j->state = FG; + kill(-(j->pid), SIGCONT); + sigprocmask(SIG_SETMASK, &prev, NULL); + waitfg(j->pid); + } else // bg + { + LOG << "bg" << endl; + j->state = BG; + kill(-(j->pid), SIGCONT); + sigprocmask(SIG_SETMASK, &prev, NULL); + } + } + else cerr << "not fg/bg" << endl; - return; } /* -- cgit v1.3.1-4-g156e From 29843465a2621fc1dcb28ca5c4c6684c9f75930e Mon Sep 17 00:00:00 2001 From: _ov4 Date: Thu, 13 Aug 2026 11:15:11 +0000 Subject: simple error check --- tsh.cc | 24 ++++++++++++++++++++++-- util.h | 11 ++++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/tsh.cc b/tsh.cc index 6800e4d..ebf4d6a 100644 --- a/tsh.cc +++ b/tsh.cc @@ -19,6 +19,7 @@ using namespace std; using ov4::atomic_print; +using ov4::isnum; /* Misc manifest constants */ #define MAXLINE 1024 /* max line size */ @@ -339,11 +340,30 @@ void do_bgfg(char **argv) sigset_t prev; if (argv[1][0] == '%') // jid provided { - x = atoi(argv[1]); // eat % + if (!isnum(&argv[1][1])) + { + cerr << ((strcmp(argv[0], "fg") == 0) ? "fg" : "bg") << ": argument must be a PID or %jobid" << endl; + return; + } + x = atoi(&argv[1][1]); // eat % j = getjobjid(jobs, x); + if (j == nullptr) + { + cerr << argv[1] << ": No such job" << endl; + } } else { // pid - x = atoi(argv[0]); + if (!isnum(&argv[1][1])) + { + cerr << ((strcmp(argv[0], "fg") == 0) ? "fg" : "bg") << ": argument must be a PID or %jobid" << endl; + return; + } + x = atoi(&argv[1][0]); j = getjobpid(jobs, x); + if (j == nullptr) + { + cerr << argv[1] << ": No such process" << endl; + return; + } } block_all(&prev); diff --git a/util.h b/util.h index 072f65e..1477d3b 100644 --- a/util.h +++ b/util.h @@ -19,6 +19,7 @@ namespace ov4 { void atomic_print(char *s); void atomic_print(int x); +bool isnum(char *s); void reverse(char str[], int length); char* itoa(int num, char* str, int base); @@ -27,7 +28,7 @@ bool DEBUG = true; // verbose mode, can be enabled on demand using something lik struct LogVoidify { void operator&(std::ostream&) const {} }; const int DECIMAL = 10; -const int LENGTH = 20; +const int LENGTH = 25; void atomic_print(char *s) { @@ -54,6 +55,14 @@ void reverse(char str[], int length) } } +bool isnum(char *s) +{ + for (int i = 0; s[i] != 0; i++) + if (!isdigit(s[i])) + return false; + return true; +} + char* itoa(int num, char* str, int base) { -- cgit v1.3.1-4-g156e From a687c62a8d53ded7b50a64d3c3b7eeb07800af30 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Thu, 13 Aug 2026 12:18:06 +0000 Subject: fix --- tsh.cc | 49 +++++++++++++++++++++++++++++++------------------ util.h | 14 +++++++++++++- 2 files changed, 44 insertions(+), 19 deletions(-) diff --git a/tsh.cc b/tsh.cc index ebf4d6a..bc550ab 100644 --- a/tsh.cc +++ b/tsh.cc @@ -19,6 +19,7 @@ using namespace std; using ov4::atomic_print; +using ov4::atomic_debug; using ov4::isnum; /* Misc manifest constants */ @@ -193,8 +194,7 @@ void eval(char *cmdline) if (builtin_cmd(argv[0])) { - // TODO - cout << "built-in" << endl; + LOG << "built-in" << endl; if (strcmp(argv[0], "quit") == 0) builtin_command_quit(); else if (strcmp(argv[0], "jobs") == 0) listjobs(jobs); else if (strcmp(argv[0], "fg") == 0) do_bgfg(argv); @@ -249,7 +249,7 @@ void eval(char *cmdline) addjob(jobs, pid, BG, cmdline); // unblock to oldest sigprocmask(SIG_SETMASK, &prev, NULL); - cout << "[" << pid2jid(pid) << "] (" << pid << ") " << cmdline << endl; + cout << "[" << pid2jid(pid) << "] (" << pid << ") " << cmdline; } @@ -338,6 +338,11 @@ void do_bgfg(char **argv) int x; job_t *j = nullptr; sigset_t prev; + if (argv[1] == nullptr) + { + cerr << ((strcmp(argv[0], "fg") == 0) ? "fg" : "bg") << " command requires PID or %jobid argument" << endl; + return; + } if (argv[1][0] == '%') // jid provided { if (!isnum(&argv[1][1])) @@ -350,9 +355,10 @@ void do_bgfg(char **argv) if (j == nullptr) { cerr << argv[1] << ": No such job" << endl; + return; } } else { // pid - if (!isnum(&argv[1][1])) + if (!isnum(&argv[1][0])) { cerr << ((strcmp(argv[0], "fg") == 0) ? "fg" : "bg") << ": argument must be a PID or %jobid" << endl; return; @@ -361,7 +367,7 @@ void do_bgfg(char **argv) j = getjobpid(jobs, x); if (j == nullptr) { - cerr << argv[1] << ": No such process" << endl; + cerr << "(" << argv[1] << "): No such process" << endl; return; } } @@ -396,11 +402,11 @@ void waitfg(pid_t pid) sigprocmask(0, NULL, &prev); // remove SIGCHILD sigdelset(&prev, SIGCHLD); - clog << "waiting for pid "<< fgpid(jobs) << endl; + LOG << "waiting for pid "<< fgpid(jobs) << endl; job_t *j = getjobpid(jobs, pid); while (fgpid(jobs) != 0) sigsuspend(&prev); - clog << "finished fg " << endl; + LOG << "finished fg " << endl; if ((j->state == ST)) { cout << "[" << j->jid << "] (" << pid << ") Stopped " << j->cmdline << endl; @@ -423,15 +429,27 @@ void sigchld_handler(int sig) { int errno_backup = errno; int status, pid; - atomic_print("SIGCHLD\n"); + atomic_debug("SIGCHLD\n"); - while ((pid = waitpid(-1, &status, WNOHANG)) > 0) + while ((pid = waitpid(-1, &status, WNOHANG | WUNTRACED)) > 0) { - atomic_print("pid: "); - atomic_print(pid); - atomic_print("\n"); + if (WIFSTOPPED(status)) + { + atomic_debug("suspended pid: "); + atomic_debug(pid); + atomic_debug("\n"); + sigset_t prev; + block_all(&prev); + job_suspend(jobs, pid); + sigprocmask(SIG_SETMASK, &prev, nullptr); + return; + } + atomic_debug("terminated pid: "); + atomic_debug(pid); + sigset_t prev; + block_all(&prev); deletejob(jobs, pid); - atomic_print(pid); + sigprocmask(SIG_SETMASK, &prev, nullptr); } @@ -465,11 +483,6 @@ void sigtstp_handler(int sig) if (pid != 0) { kill(-pid, SIGTSTP); - sigset_t mask_all, prev; - sigfillset(&mask_all); - sigprocmask(SIG_SETMASK, &mask_all, &prev); - job_suspend(jobs, pid); - sigprocmask(SIG_SETMASK, &prev, NULL); } return; } diff --git a/util.h b/util.h index 1477d3b..05eb118 100644 --- a/util.h +++ b/util.h @@ -19,12 +19,14 @@ namespace ov4 { void atomic_print(char *s); void atomic_print(int x); +void atomic_debug(char *s); +void atomic_debug(int x); bool isnum(char *s); void reverse(char str[], int length); char* itoa(int num, char* str, int base); constexpr bool GLOBAL_DEBUG = true; -bool DEBUG = true; // verbose mode, can be enabled on demand using something like -v +bool DEBUG = false; // verbose mode, can be enabled on demand using something like -v struct LogVoidify { void operator&(std::ostream&) const {} }; const int DECIMAL = 10; @@ -55,6 +57,16 @@ void reverse(char str[], int length) } } +void atomic_debug(char *s) +{ + if (DEBUG && GLOBAL_DEBUG) atomic_print(s); +} + +void atomic_debug(int x) +{ + if (DEBUG && GLOBAL_DEBUG) atomic_print(x); +} + bool isnum(char *s) { for (int i = 0; s[i] != 0; i++) -- cgit v1.3.1-4-g156e From cecc4c3f7d79c480409e584e6b26aebedae8a758 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Thu, 13 Aug 2026 12:39:11 +0000 Subject: ok --- tsh.cc | 11 +++++++---- util.h | 27 +++++++++++++++++---------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/tsh.cc b/tsh.cc index bc550ab..198dde0 100644 --- a/tsh.cc +++ b/tsh.cc @@ -215,12 +215,12 @@ void eval(char *cmdline) if (pid == 0) // child { sigprocmask(SIG_UNBLOCK, &mask_sigchld, NULL); - pid = getpid(); - setpgid(pid, pid); + setpgid(0, 0); execve(argv[0], argv, NULL); - atomic_print("log: command not found\n"); + atomic_print(cmdline, true); + atomic_print(": Command not found\n"); exit(-1); // if no command is found } @@ -409,7 +409,10 @@ void waitfg(pid_t pid) LOG << "finished fg " << endl; if ((j->state == ST)) { - cout << "[" << j->jid << "] (" << pid << ") Stopped " << j->cmdline << endl; + cout << "Job [" << j->jid << "] (" << pid << ") stopped by signal 20" << endl; + } else if (getjobpid(jobs, pid) == nullptr) + { + cout << "Job [" << j->jid << "] (" << pid << ") terminated by signal 2" << endl; } return; } diff --git a/util.h b/util.h index 05eb118..26dab12 100644 --- a/util.h +++ b/util.h @@ -17,13 +17,13 @@ namespace ov4 { -void atomic_print(char *s); +void atomic_print(char*, bool); void atomic_print(int x); -void atomic_debug(char *s); -void atomic_debug(int x); -bool isnum(char *s); -void reverse(char str[], int length); -char* itoa(int num, char* str, int base); +void atomic_debug(char*, bool); +void atomic_debug(int); +bool isnum(char*); +void reverse(char[], int); +char *itoa(int, char*, int); constexpr bool GLOBAL_DEBUG = true; bool DEBUG = false; // verbose mode, can be enabled on demand using something like -v @@ -32,8 +32,15 @@ struct LogVoidify { void operator&(std::ostream&) const {} }; const int DECIMAL = 10; const int LENGTH = 25; -void atomic_print(char *s) +void atomic_print(char *s, bool ignore_wrap = false) { + if (ignore_wrap) + for (int i = 0; s[i] != 0; i++) + if (s[i] == '\n') + { + write(STDOUT_FILENO, s, i); + return; + } write(STDOUT_FILENO, s, strlen(s)); } @@ -57,9 +64,9 @@ void reverse(char str[], int length) } } -void atomic_debug(char *s) +void atomic_debug(char *s, bool ignore_wrap = false) { - if (DEBUG && GLOBAL_DEBUG) atomic_print(s); + if (DEBUG && GLOBAL_DEBUG) atomic_print(s, ignore_wrap); } void atomic_debug(int x) @@ -76,7 +83,7 @@ bool isnum(char *s) } -char* itoa(int num, char* str, int base) +char *itoa(int num, char* str, int base) { int i = 0; bool isNegative = false; -- cgit v1.3.1-4-g156e From 901c816ab47a4893da41471a943123406f1c0662 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Thu, 13 Aug 2026 13:33:38 +0000 Subject: final perhaps --- tsh.cc | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/tsh.cc b/tsh.cc index 198dde0..72263e0 100644 --- a/tsh.cc +++ b/tsh.cc @@ -372,6 +372,7 @@ void do_bgfg(char **argv) } } + block_all(&prev); if (strcmp(argv[0], "fg") == 0) // fg { @@ -386,6 +387,9 @@ void do_bgfg(char **argv) j->state = BG; kill(-(j->pid), SIGCONT); sigprocmask(SIG_SETMASK, &prev, NULL); + // cmdline has nerd '\n' at the end + // so just flush + cout << "[" << j->jid << "] (" << j->pid << ") " << j->cmdline << flush; } } else @@ -403,17 +407,9 @@ void waitfg(pid_t pid) // remove SIGCHILD sigdelset(&prev, SIGCHLD); LOG << "waiting for pid "<< fgpid(jobs) << endl; - job_t *j = getjobpid(jobs, pid); while (fgpid(jobs) != 0) sigsuspend(&prev); LOG << "finished fg " << endl; - if ((j->state == ST)) - { - cout << "Job [" << j->jid << "] (" << pid << ") stopped by signal 20" << endl; - } else if (getjobpid(jobs, pid) == nullptr) - { - cout << "Job [" << j->jid << "] (" << pid << ") terminated by signal 2" << endl; - } return; } @@ -436,6 +432,28 @@ void sigchld_handler(int sig) while ((pid = waitpid(-1, &status, WNOHANG | WUNTRACED)) > 0) { + if (WIFSIGNALED(status) | WIFSTOPPED(status)) + { + int jid = pid2jid(pid); + atomic_print("Job ["); + atomic_print(jid); + atomic_print("] ("); + atomic_print(pid); + atomic_print(") "); + if (WTERMSIG(status) == SIGINT) + atomic_print("terminated"); + else if (WIFSTOPPED(status)) + atomic_print("stopped"); + else + atomic_print("idk"); + atomic_print(" by signal "); + if (WIFSTOPPED(status)) + atomic_print(20); + else + atomic_print(WTERMSIG(status)); + atomic_print("\n"); + } + if (WIFSTOPPED(status)) { atomic_debug("suspended pid: "); -- cgit v1.3.1-4-g156e From c2bb9d17b85acec2130c7d49a253cba839aebd2a Mon Sep 17 00:00:00 2001 From: _ov4 Date: Thu, 13 Aug 2026 13:44:36 +0000 Subject: reverse engineering --- tshref.c | 675 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 675 insertions(+) create mode 100644 tshref.c diff --git a/tshref.c b/tshref.c new file mode 100644 index 0000000..0afb216 --- /dev/null +++ b/tshref.c @@ -0,0 +1,675 @@ +// reverse engineering of tshref +// ft. CSAPP 3e + +/* + * tsh - A tiny shell program with job control + * + * + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Misc manifest constants */ +#define MAXLINE 1024 /* max line size */ +#define MAXARGS 128 /* max args on a command line */ +#define MAXJOBS 16 /* max jobs at any point in time */ +#define MAXJID 1<<16 /* max job ID */ + +/* Job states */ +#define UNDEF 0 /* undefined */ +#define FG 1 /* running in foreground */ +#define BG 2 /* running in background */ +#define ST 3 /* stopped */ + +/* + * Jobs states: FG (foreground), BG (background), ST (stopped) + * Job state transitions and enabling actions: + * FG -> ST : ctrl-z + * ST -> FG : fg command + * ST -> BG : bg command + * BG -> FG : fg command + * At most 1 job can be in the FG state. + */ + +/* Global variables */ +extern char **environ; /* defined in libc */ +char prompt[] = "tsh> "; /* command line prompt (DO NOT CHANGE) */ +int verbose = 0; /* if true, print additional output */ +int nextjid = 1; /* next job ID to allocate */ +char sbuf[MAXLINE]; /* for composing sprintf messages */ + +struct job_t { /* The job struct */ + pid_t pid; /* job PID */ + int jid; /* job ID [1, 2, ...] */ + int state; /* UNDEF, BG, FG, or ST */ + char cmdline[MAXLINE]; /* command line */ +}; +struct job_t jobs[MAXJOBS]; /* The job list */ +/* End global variables */ + + +/* Function prototypes */ + +/* Here are the functions that you will implement */ +void eval(char *cmdline); +int builtin_cmd(char **argv); +void do_bgfg(char **argv); +void waitfg(pid_t pid); + +void sigchld_handler(int sig); +void sigtstp_handler(int sig); +void sigint_handler(int sig); + +/* Here are helper routines that we've provided for you */ +int parseline(const char *cmdline, char **argv); +void sigquit_handler(int sig); + +void clearjob(struct job_t *job); +void initjobs(struct job_t *jobs); +int maxjid(struct job_t *jobs); +int addjob(struct job_t *jobs, pid_t pid, int state, char *cmdline); +int deletejob(struct job_t *jobs, pid_t pid); +pid_t fgpid(struct job_t *jobs); +struct job_t *getjobpid(struct job_t *jobs, pid_t pid); +struct job_t *getjobjid(struct job_t *jobs, int jid); +int pid2jid(pid_t pid); +void listjobs(struct job_t *jobs); + +void usage(void); +void unix_error(char *msg); +void app_error(char *msg); +typedef void handler_t(int); +handler_t *Signal(int signum, handler_t *handler); + +/* + * main - The shell's main routine + */ +int main(int argc, char **argv) +{ + char c; + char cmdline[MAXLINE]; + int emit_prompt = 1; /* emit prompt (default) */ + + /* Redirect stderr to stdout (so that driver will get all output + * on the pipe connected to stdout) */ + dup2(1, 2); + + /* Parse the command line */ + while ((c = getopt(argc, argv, "hvp")) != EOF) { + switch (c) { + case 'h': /* print help message */ + usage(); + break; + case 'v': /* emit additional diagnostic info */ + verbose = 1; + break; + case 'p': /* don't print a prompt */ + emit_prompt = 0; /* handy for automatic testing */ + break; + default: + usage(); + } + } + + /* Install the signal handlers */ + + /* These are the ones you will need to implement */ + Signal(SIGINT, sigint_handler); /* ctrl-c */ + Signal(SIGTSTP, sigtstp_handler); /* ctrl-z */ + Signal(SIGCHLD, sigchld_handler); /* Terminated or stopped child */ + + /* This one provides a clean way to kill the shell */ + Signal(SIGQUIT, sigquit_handler); + + /* Initialize the job list */ + initjobs(jobs); + + /* Execute the shell's read/eval loop */ + while (1) { + + /* Read command line */ + if (emit_prompt) { + printf("%s", prompt); + fflush(stdout); + } + if ((fgets(cmdline, MAXLINE, stdin) == NULL) && ferror(stdin)) + app_error("fgets error"); + if (feof(stdin)) { /* End of file (ctrl-d) */ + fflush(stdout); + exit(0); + } + + /* Evaluate the command line */ + eval(cmdline); + fflush(stdout); + fflush(stdout); + } + + exit(0); /* control never reaches here */ +} + +/* + * eval - Evaluate the command line that the user has just typed in + * + * If the user has requested a built-in command (quit, jobs, bg or fg) + * then execute it immediately. Otherwise, fork a child process and + * run the job in the context of the child. If the job is running in + * the foreground, wait for it to terminate and then return. Note: + * each child process must have a unique process group ID so that our + * background children don't receive SIGINT (SIGTSTP) from the kernel + * when we type ctrl-c (ctrl-z) at the keyboard. +*/ +void eval(char *cmdline) +{ + char *argv[MAXARGS]; + int bg; + pid_t pid; + sigset_t mask; + + bg = parseline(cmdline, argv); + if (argv[0] == NULL) + return; + + if (builtin_cmd(argv)) + return; + + if (sigemptyset(&mask) < 0) + unix_error("sigemptyset error"); + if (sigaddset(&mask, SIGCHLD) != 0 || + sigaddset(&mask, SIGINT) != 0 || + sigaddset(&mask, SIGTSTP) != 0) + unix_error("sigaddset error"); + if (sigprocmask(SIG_BLOCK, &mask, NULL) < 0) + unix_error("sigprocmask error"); + + if ((pid = fork()) < 0) + unix_error("fork error"); + + if (pid == 0) { + sigprocmask(SIG_UNBLOCK, &mask, NULL); + if (setpgid(0, 0) < 0) + unix_error("setpgid error"); + if (execve(argv[0], argv, environ) < 0) { + printf("%s: Command not found\n", argv[0]); + exit(0); + } + } + + addjob(jobs, pid, bg ? BG : FG, cmdline); + sigprocmask(SIG_UNBLOCK, &mask, NULL); + + if (bg) + printf("[%d] (%d) %s", pid2jid(pid), pid, cmdline); + else + waitfg(pid); +} + +/* + * parseline - Parse the command line and build the argv array. + * + * Characters enclosed in single quotes are treated as a single + * argument. Return true if the user has requested a BG job, false if + * the user has requested a FG job. + */ +int parseline(const char *cmdline, char **argv) +{ + static char array[MAXLINE]; /* holds local copy of command line */ + char *buf = array; /* ptr that traverses command line */ + char *delim; /* points to first space delimiter */ + int argc; /* number of args */ + int bg; /* background job? */ + + strcpy(buf, cmdline); + buf[strlen(buf)-1] = ' '; /* replace trailing '\n' with space */ + while (*buf && (*buf == ' ')) /* ignore leading spaces */ + buf++; + + /* Build the argv list */ + argc = 0; + if (*buf == '\'') { + buf++; + delim = strchr(buf, '\''); + } + else { + delim = strchr(buf, ' '); + } + + while (delim) { + argv[argc++] = buf; + *delim = '\0'; + buf = delim + 1; + while (*buf && (*buf == ' ')) /* ignore spaces */ + buf++; + + if (*buf == '\'') { + buf++; + delim = strchr(buf, '\''); + } + else { + delim = strchr(buf, ' '); + } + } + argv[argc] = NULL; + + if (argc == 0) /* ignore blank line */ + return 1; + + /* should the job run in the background? */ + if ((bg = (*argv[argc-1] == '&')) != 0) { + argv[--argc] = NULL; + } + return bg; +} + +/* + * builtin_cmd - If the user has typed a built-in command then execute + * it immediately. + */ +int builtin_cmd(char **argv) +{ + if (!strcmp(argv[0], "quit")) + exit(0); + + if (!strcmp(argv[0], "jobs")) { + listjobs(jobs); + return 1; + } + + if (!strcmp(argv[0], "bg") || !strcmp(argv[0], "fg")) { + do_bgfg(argv); + return 1; + } + + if (!strcmp(argv[0], "&")) + return 1; + + return 0; +} + +/* + * do_bgfg - Execute the builtin bg and fg commands + */ +void do_bgfg(char **argv) +{ + struct job_t *job = NULL; + long id; + + if (argv[1] == NULL) { + printf("%s command requires PID or %%jobid argument\n", argv[0]); + return; + } + + if (isdigit(argv[1][0])) { + id = strtol(argv[1], NULL, 10); + job = getjobpid(jobs, (pid_t)id); + if (id <= 0 || job == NULL) { + printf("(%ld): No such process\n", id); + return; + } + } else if (argv[1][0] == '%') { + id = strtol(argv[1] + 1, NULL, 10); + job = getjobjid(jobs, (int)id); + if (id <= 0 || job == NULL) { + printf("%s: No such job\n", argv[1]); + return; + } + } else { + printf("%s: argument must be a PID or %%jobid\n", argv[0]); + return; + } + + if (!strcmp(argv[0], "bg")) { + if (kill(-job->pid, SIGCONT) < 0) + unix_error("kill (SIGCONT)"); + job->state = BG; + printf("[%d] (%d) %s", job->jid, job->pid, job->cmdline); + } else if (!strcmp(argv[0], "fg")) { + if (kill(-job->pid, SIGCONT) < 0) + unix_error("kill (SIGCONT)"); + job->state = FG; + waitfg(job->pid); + } else { + printf("do_bgfg: Internal error: argv[0]=%s\n", argv[0]); + exit(0); + } +} + +/* + * waitfg - Block until process pid is no longer the foreground process + */ +void waitfg(pid_t pid) +{ + struct job_t *job; + + if (pid <= 0) + return; + + job = getjobpid(jobs, pid); + if (job == NULL) + return; + + while (job->pid == pid && job->state == FG) + sleep(1); + + if (verbose) + printf("waitfg: Process (%d) no longer the fg process\n", pid); +} + +/***************** + * Signal handlers + *****************/ + +/* + * sigchld_handler - The kernel sends a SIGCHLD to the shell whenever + * a child job terminates (becomes a zombie), or stops because it + * received a SIGSTOP or SIGTSTP signal. The handler reaps all + * available zombie children, but doesn't wait for any other + * currently running children to terminate. + */ +void sigchld_handler(int sig) +{ + pid_t pid; + int status; + + if (verbose) + printf("sigchld_handler: entering\n"); + + while ((pid = waitpid(-1, &status, WNOHANG | WUNTRACED)) > 0) { + if (WIFSTOPPED(status)) { + struct job_t *job = getjobpid(jobs, pid); + if (job == NULL) { + printf("Job (%d) not found\n", pid); + return; + } + job->state = ST; + fprintf(stdout, "Job [%d] (%d) stopped by signal %d\n", + pid2jid(pid), pid, WSTOPSIG(status)); + } else if (WIFSIGNALED(status)) { + int jid = pid2jid(pid); + deletejob(jobs, pid); + fprintf(stdout, "Job [%d] (%d) terminated by signal %d\n", + jid, pid, WTERMSIG(status)); + } else if (WIFEXITED(status)) { + deletejob(jobs, pid); + } + } + + if (pid < 0 && errno != ECHILD) + unix_error("waitpid error"); + + if (verbose) + printf("sigchld_handler: exiting\n"); +} + +/* + * sigint_handler - The kernel sends a SIGINT to the shell whenver the + * user types ctrl-c at the keyboard. Catch it and send it along + * to the foreground job. + */ +void sigint_handler(int sig) +{ + pid_t pid; + + if (verbose) + printf("sigint_handler: entering\n"); + + pid = fgpid(jobs); + if (pid > 0) { + if (kill(-pid, SIGINT) < 0) + unix_error("kill (SIGINT) error"); + } + + if (verbose) + printf("sigint_handler: exiting\n"); +} + +/* + * sigtstp_handler - The kernel sends a SIGTSTP to the shell whenever + * the user types ctrl-z at the keyboard. Catch it and suspend the + * foreground job by sending it a SIGTSTP. + */ +void sigtstp_handler(int sig) +{ + pid_t pid; + + if (verbose) + printf("sigtstp_handler: entering\n"); + + pid = fgpid(jobs); + if (pid > 0) { + if (kill(-pid, SIGTSTP) < 0) + unix_error("kill (SIGTSTP)"); + } + + if (verbose) + printf("sigtstp_handler: exiting\n"); +} + +/********************* + * End signal handlers + *********************/ + +/*********************************************** + * Helper routines that manipulate the job list + **********************************************/ + +/* clearjob - Clear the entries in a job struct */ +void clearjob(struct job_t *job) { + job->pid = 0; + job->jid = 0; + job->state = UNDEF; + job->cmdline[0] = '\0'; +} + +/* initjobs - Initialize the job list */ +void initjobs(struct job_t *jobs) { + int i; + + for (i = 0; i < MAXJOBS; i++) + clearjob(&jobs[i]); +} + +/* maxjid - Returns largest allocated job ID */ +int maxjid(struct job_t *jobs) +{ + int i, max=0; + + for (i = 0; i < MAXJOBS; i++) + if (jobs[i].jid > max) + max = jobs[i].jid; + return max; +} + +/* addjob - Add a job to the job list */ +int addjob(struct job_t *jobs, pid_t pid, int state, char *cmdline) +{ + int i; + + if (pid < 1) + return 0; + + for (i = 0; i < MAXJOBS; i++) { + if (jobs[i].pid == 0) { + jobs[i].pid = pid; + jobs[i].state = state; + jobs[i].jid = nextjid++; + if (nextjid > MAXJOBS) + nextjid = 1; + strcpy(jobs[i].cmdline, cmdline); + if(verbose){ + printf("Added job [%d] %d %s\n", jobs[i].jid, jobs[i].pid, jobs[i].cmdline); + } + return 1; + } + } + printf("Tried to create too many jobs\n"); + return 0; +} + +/* deletejob - Delete a job whose PID=pid from the job list */ +int deletejob(struct job_t *jobs, pid_t pid) +{ + int i; + + if (pid < 1) + return 0; + + for (i = 0; i < MAXJOBS; i++) { + if (jobs[i].pid == pid) { + clearjob(&jobs[i]); + nextjid = maxjid(jobs)+1; + return 1; + } + } + return 0; +} + +/* fgpid - Return PID of current foreground job, 0 if no such job */ +pid_t fgpid(struct job_t *jobs) { + int i; + + for (i = 0; i < MAXJOBS; i++) + if (jobs[i].state == FG) + return jobs[i].pid; + return 0; +} + +/* getjobpid - Find a job (by PID) on the job list */ +struct job_t *getjobpid(struct job_t *jobs, pid_t pid) { + int i; + + if (pid < 1) + return NULL; + for (i = 0; i < MAXJOBS; i++) + if (jobs[i].pid == pid) + return &jobs[i]; + return NULL; +} + +/* getjobjid - Find a job (by JID) on the job list */ +struct job_t *getjobjid(struct job_t *jobs, int jid) +{ + int i; + + if (jid < 1) + return NULL; + for (i = 0; i < MAXJOBS; i++) + if (jobs[i].jid == jid) + return &jobs[i]; + return NULL; +} + +/* pid2jid - Map process ID to job ID */ +int pid2jid(pid_t pid) +{ + int i; + + if (pid < 1) + return 0; + for (i = 0; i < MAXJOBS; i++) + if (jobs[i].pid == pid) { + return jobs[i].jid; + } + return 0; +} + +/* listjobs - Print the job list */ +void listjobs(struct job_t *jobs) +{ + int i; + + for (i = 0; i < MAXJOBS; i++) { + if (jobs[i].pid != 0) { + printf("[%d] (%d) ", jobs[i].jid, jobs[i].pid); + switch (jobs[i].state) { + case BG: + printf("Running "); + break; + case FG: + printf("Foreground "); + break; + case ST: + printf("Stopped "); + break; + default: + printf("listjobs: Internal error: job[%d].state=%d ", + i, jobs[i].state); + } + printf("%s", jobs[i].cmdline); + } + } +} +/****************************** + * end job list helper routines + ******************************/ + + +/*********************** + * Other helper routines + ***********************/ + +/* + * usage - print a help message + */ +void usage(void) +{ + printf("Usage: shell [-hvp]\n"); + printf(" -h print this message\n"); + printf(" -v print additional diagnostic information\n"); + printf(" -p do not emit a command prompt\n"); + exit(1); +} + +/* + * unix_error - unix-style error routine + */ +void unix_error(char *msg) +{ + fprintf(stdout, "%s: %s\n", msg, strerror(errno)); + exit(1); +} + +/* + * app_error - application-style error routine + */ +void app_error(char *msg) +{ + fprintf(stdout, "%s\n", msg); + exit(1); +} + +/* + * Signal - wrapper for the sigaction function + */ +handler_t *Signal(int signum, handler_t *handler) +{ + struct sigaction action, old_action; + + action.sa_handler = handler; + sigemptyset(&action.sa_mask); /* block sigs of type being handled */ + action.sa_flags = SA_RESTART; /* restart syscalls if possible */ + + if (sigaction(signum, &action, &old_action) < 0) + unix_error("Signal error"); + return (old_action.sa_handler); +} + +/* + * sigquit_handler - The driver program can gracefully terminate the + * child shell by sending it a SIGQUIT signal. + */ +void sigquit_handler(int sig) +{ + printf("Terminating after receipt of SIGQUIT signal\n"); + exit(1); +} + + + -- cgit v1.3.1-4-g156e From 2bd8d169a0e9bc6d413c1ed7338cf410929f7104 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Thu, 13 Aug 2026 13:55:42 +0000 Subject: update --- tshref.c | 97 ++++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 61 insertions(+), 36 deletions(-) diff --git a/tshref.c b/tshref.c index 0afb216..e0d15bd 100644 --- a/tshref.c +++ b/tshref.c @@ -182,9 +182,11 @@ void eval(char *cmdline) if (sigemptyset(&mask) < 0) unix_error("sigemptyset error"); - if (sigaddset(&mask, SIGCHLD) != 0 || - sigaddset(&mask, SIGINT) != 0 || - sigaddset(&mask, SIGTSTP) != 0) + if (sigaddset(&mask, SIGCHLD) != 0) + unix_error("sigaddset error"); + if (sigaddset(&mask, SIGINT) != 0) + unix_error("sigaddset error"); + if (sigaddset(&mask, SIGTSTP) != 0) unix_error("sigaddset error"); if (sigprocmask(SIG_BLOCK, &mask, NULL) < 0) unix_error("sigprocmask error"); @@ -202,7 +204,11 @@ void eval(char *cmdline) } } - addjob(jobs, pid, bg ? BG : FG, cmdline); + if (bg) + addjob(jobs, pid, BG, cmdline); + else + addjob(jobs, pid, FG, cmdline); + sigprocmask(SIG_UNBLOCK, &mask, NULL); if (bg) @@ -290,7 +296,7 @@ int builtin_cmd(char **argv) if (!strcmp(argv[0], "&")) return 1; - return 0; + return 0; /* not a builtin command */ } /* @@ -298,8 +304,8 @@ int builtin_cmd(char **argv) */ void do_bgfg(char **argv) { - struct job_t *job = NULL; - long id; + struct job_t *job; + int id; if (argv[1] == NULL) { printf("%s command requires PID or %%jobid argument\n", argv[0]); @@ -308,35 +314,37 @@ void do_bgfg(char **argv) if (isdigit(argv[1][0])) { id = strtol(argv[1], NULL, 10); - job = getjobpid(jobs, (pid_t)id); - if (id <= 0 || job == NULL) { - printf("(%ld): No such process\n", id); + if (id <= 0 || (job = getjobpid(jobs, id)) == NULL) { + printf("(%d): No such process\n", id); return; } - } else if (argv[1][0] == '%') { - id = strtol(argv[1] + 1, NULL, 10); - job = getjobjid(jobs, (int)id); - if (id <= 0 || job == NULL) { + } + else if (argv[1][0] == '%') { + id = strtol(&argv[1][1], NULL, 10); + if (id <= 0 || (job = getjobjid(jobs, id)) == NULL) { printf("%s: No such job\n", argv[1]); return; } - } else { + } + else { printf("%s: argument must be a PID or %%jobid\n", argv[0]); return; } if (!strcmp(argv[0], "bg")) { if (kill(-job->pid, SIGCONT) < 0) - unix_error("kill (SIGCONT)"); + unix_error("kill (bg) error"); job->state = BG; printf("[%d] (%d) %s", job->jid, job->pid, job->cmdline); - } else if (!strcmp(argv[0], "fg")) { + } + else if (!strcmp(argv[0], "fg")) { if (kill(-job->pid, SIGCONT) < 0) - unix_error("kill (SIGCONT)"); + unix_error("kill (fg) error"); job->state = FG; waitfg(job->pid); - } else { - printf("do_bgfg: Internal error: argv[0]=%s\n", argv[0]); + } + else { + printf("do_bgfg: Internal error\n"); exit(0); } } @@ -375,34 +383,49 @@ void waitfg(pid_t pid) */ void sigchld_handler(int sig) { - pid_t pid; int status; + pid_t pid; + int jid; + struct job_t *job; if (verbose) printf("sigchld_handler: entering\n"); while ((pid = waitpid(-1, &status, WNOHANG | WUNTRACED)) > 0) { if (WIFSTOPPED(status)) { - struct job_t *job = getjobpid(jobs, pid); + job = getjobpid(jobs, pid); if (job == NULL) { - printf("Job (%d) not found\n", pid); + printf("Lost track of (%d)\n", pid); return; } job->state = ST; fprintf(stdout, "Job [%d] (%d) stopped by signal %d\n", pid2jid(pid), pid, WSTOPSIG(status)); - } else if (WIFSIGNALED(status)) { - int jid = pid2jid(pid); - deletejob(jobs, pid); + } + else if (WIFSIGNALED(status)) { + jid = pid2jid(pid); + if (deletejob(jobs, pid) && verbose) + printf("sigchld_handler: Job [%d] (%d) deleted\n", jid, pid); fprintf(stdout, "Job [%d] (%d) terminated by signal %d\n", jid, pid, WTERMSIG(status)); - } else if (WIFEXITED(status)) { - deletejob(jobs, pid); + } + else if (WIFEXITED(status)) { + jid = pid2jid(pid); + if (deletejob(jobs, pid) && verbose) + printf("sigchld_handler: Job [%d] (%d) deleted\n", jid, pid); + if (verbose) + printf("sigchld_handler: Job [%d] (%d) terminates OK (status %d)\n", + jid, pid, WEXITSTATUS(status)); + } + else { + unix_error("waitpid error"); } } - if (pid < 0 && errno != ECHILD) - unix_error("waitpid error"); + if (pid != 0) { + if (pid != -1 || errno != ECHILD) + unix_error("sigchld_handler wait error"); + } if (verbose) printf("sigchld_handler: exiting\n"); @@ -420,10 +443,11 @@ void sigint_handler(int sig) if (verbose) printf("sigint_handler: entering\n"); - pid = fgpid(jobs); - if (pid > 0) { + if ((pid = fgpid(jobs)) > 0) { if (kill(-pid, SIGINT) < 0) - unix_error("kill (SIGINT) error"); + unix_error("kill (sigint) error"); + if (verbose) + printf("sigint_handler: Job (%d) killed\n", pid); } if (verbose) @@ -442,10 +466,11 @@ void sigtstp_handler(int sig) if (verbose) printf("sigtstp_handler: entering\n"); - pid = fgpid(jobs); - if (pid > 0) { + if ((pid = fgpid(jobs)) > 0) { if (kill(-pid, SIGTSTP) < 0) - unix_error("kill (SIGTSTP)"); + unix_error("kill (tstp) error"); + if (verbose) + printf("sigtstp_handler: Job [%d] (%d) stopped\n", pid2jid(pid), pid); } if (verbose) -- cgit v1.3.1-4-g156e From 0d4e2b4a3b229e19677ba98d5de0346dc7c8b2c3 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Thu, 13 Aug 2026 14:10:56 +0000 Subject: errno restore --- tsh.cc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tsh.cc b/tsh.cc index 72263e0..9253c8f 100644 --- a/tsh.cc +++ b/tsh.cc @@ -485,11 +485,17 @@ void sigchld_handler(int sig) */ void sigint_handler(int sig) { + int errno_backup = errno; + + int pid = fgpid(jobs); if (pid != 0) { kill(-pid, SIGINT); } + + + errno = errno_backup; return; } @@ -500,11 +506,17 @@ void sigint_handler(int sig) */ void sigtstp_handler(int sig) { + int errno_backup = errno; + + int pid = fgpid(jobs); if (pid != 0) { kill(-pid, SIGTSTP); } + + + errno = errno_backup; return; } -- cgit v1.3.1-4-g156e From 972fbd8cfce4e3b5bad2f119ba13585b73172f17 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Thu, 13 Aug 2026 14:41:32 +0000 Subject: fix --- tsh.cc | 61 +++++++++++++++++++++++-------------------------------------- 1 file changed, 23 insertions(+), 38 deletions(-) diff --git a/tsh.cc b/tsh.cc index 9253c8f..6c291ab 100644 --- a/tsh.cc +++ b/tsh.cc @@ -122,6 +122,7 @@ int main(int argc, char **argv) usage(); break; case 'v': /* emit additional diagnostic info */ + ov4::DEBUG = true; verbose = 1; break; case 'p': /* don't print a prompt */ @@ -203,21 +204,16 @@ void eval(char *cmdline) return; } - sigset_t mask_sigchld, mask_all, prev, prev_all; - sigemptyset(&mask_sigchld); - sigfillset(&mask_all); - sigaddset(&mask_sigchld, SIGCHLD); - - // block SIGCHLD - sigprocmask(SIG_BLOCK, &mask_sigchld, &prev); + sigset_t prev; + block_all(&prev); pid_t pid = fork(); if (pid == 0) // child { - sigprocmask(SIG_UNBLOCK, &mask_sigchld, NULL); + sigprocmask(SIG_SETMASK, &prev, NULL); setpgid(0, 0); - execve(argv[0], argv, NULL); + execve(argv[0], argv, environ); atomic_print(cmdline, true); atomic_print(": Command not found\n"); @@ -226,33 +222,22 @@ void eval(char *cmdline) // parent - // mask_sigchld = only SIGCHLD - // mask_all = all signals - // prev = oldest - // prev_all = oldest but with SIGCHLD blocked - - // block all to add jobs - sigprocmask(SIG_SETMASK, &mask_all, &prev_all); - if (!ground) // foreground { addjob(jobs, pid, FG, cmdline); - // unblock all expect SIGCHILD - sigprocmask(SIG_SETMASK, &prev_all, NULL); - // we still leave SIGCHLD to be unblocked within waitfg() + sigset_t prev_with_sigchld_blocked = prev; + sigaddset(&prev_with_sigchld_blocked, SIGCHLD); + sigprocmask(SIG_SETMASK, &prev_with_sigchld_blocked, NULL); waitfg(pid); - // and then unblock SIGCHLD sigprocmask(SIG_SETMASK, &prev, NULL); } else // background { addjob(jobs, pid, BG, cmdline); - // unblock to oldest sigprocmask(SIG_SETMASK, &prev, NULL); cout << "[" << pid2jid(pid) << "] (" << pid << ") " << cmdline; } - return; @@ -401,14 +386,13 @@ void do_bgfg(char **argv) */ void waitfg(pid_t pid) { - sigset_t prev; + sigset_t prev_with_sigchld_unblocked; // get current blocked signals - sigprocmask(0, NULL, &prev); - // remove SIGCHILD - sigdelset(&prev, SIGCHLD); + sigprocmask(0, NULL, &prev_with_sigchld_unblocked); + sigdelset(&prev_with_sigchld_unblocked, SIGCHLD); LOG << "waiting for pid "<< fgpid(jobs) << endl; while (fgpid(jobs) != 0) - sigsuspend(&prev); + sigsuspend(&prev_with_sigchld_unblocked); LOG << "finished fg " << endl; return; } @@ -440,7 +424,7 @@ void sigchld_handler(int sig) atomic_print("] ("); atomic_print(pid); atomic_print(") "); - if (WTERMSIG(status) == SIGINT) + if (!WIFSTOPPED(status) && WTERMSIG(status) == SIGINT) atomic_print("terminated"); else if (WIFSTOPPED(status)) atomic_print("stopped"); @@ -448,7 +432,7 @@ void sigchld_handler(int sig) atomic_print("idk"); atomic_print(" by signal "); if (WIFSTOPPED(status)) - atomic_print(20); + atomic_print(WSTOPSIG(status)); else atomic_print(WTERMSIG(status)); atomic_print("\n"); @@ -463,14 +447,15 @@ void sigchld_handler(int sig) block_all(&prev); job_suspend(jobs, pid); sigprocmask(SIG_SETMASK, &prev, nullptr); - return; } - atomic_debug("terminated pid: "); - atomic_debug(pid); - sigset_t prev; - block_all(&prev); - deletejob(jobs, pid); - sigprocmask(SIG_SETMASK, &prev, nullptr); + else { + atomic_debug("terminated pid: "); + atomic_debug(pid); + sigset_t prev; + block_all(&prev); + deletejob(jobs, pid); + sigprocmask(SIG_SETMASK, &prev, nullptr); + } } @@ -494,7 +479,7 @@ void sigint_handler(int sig) kill(-pid, SIGINT); } - + errno = errno_backup; return; } -- cgit v1.3.1-4-g156e From 97179bb75cbfc43d94a10a34410a8f9752090aaa Mon Sep 17 00:00:00 2001 From: _ov4 Date: Thu, 13 Aug 2026 14:51:00 +0000 Subject: update --- autograder/sdriver.pl | 210 +++++++++++++++++++++++++++++++++++++++++++++++++ autograder/trace01.txt | 5 ++ autograder/trace02.txt | 5 ++ autograder/trace03.txt | 5 ++ autograder/trace04.txt | 5 ++ autograder/trace05.txt | 11 +++ autograder/trace06.txt | 8 ++ autograder/trace07.txt | 14 ++++ autograder/trace08.txt | 14 ++++ autograder/trace09.txt | 20 +++++ autograder/trace10.txt | 22 ++++++ autograder/trace11.txt | 12 +++ autograder/trace12.txt | 17 ++++ autograder/trace13.txt | 23 ++++++ autograder/trace14.txt | 47 +++++++++++ autograder/trace15.txt | 46 +++++++++++ autograder/trace16.txt | 16 ++++ sdriver.pl | 210 ------------------------------------------------- trace01.txt | 5 -- trace02.txt | 5 -- trace03.txt | 5 -- trace04.txt | 5 -- trace05.txt | 11 --- trace06.txt | 8 -- trace07.txt | 14 ---- trace08.txt | 14 ---- trace09.txt | 20 ----- trace10.txt | 22 ------ trace11.txt | 12 --- trace12.txt | 17 ---- trace13.txt | 23 ------ trace14.txt | 47 ----------- trace15.txt | 46 ----------- trace16.txt | 16 ---- tsh.cc | 10 ++- 35 files changed, 488 insertions(+), 482 deletions(-) create mode 100755 autograder/sdriver.pl create mode 100644 autograder/trace01.txt create mode 100644 autograder/trace02.txt create mode 100644 autograder/trace03.txt create mode 100644 autograder/trace04.txt create mode 100644 autograder/trace05.txt create mode 100644 autograder/trace06.txt create mode 100644 autograder/trace07.txt create mode 100644 autograder/trace08.txt create mode 100644 autograder/trace09.txt create mode 100644 autograder/trace10.txt create mode 100644 autograder/trace11.txt create mode 100644 autograder/trace12.txt create mode 100644 autograder/trace13.txt create mode 100644 autograder/trace14.txt create mode 100644 autograder/trace15.txt create mode 100644 autograder/trace16.txt delete mode 100755 sdriver.pl delete mode 100644 trace01.txt delete mode 100644 trace02.txt delete mode 100644 trace03.txt delete mode 100644 trace04.txt delete mode 100644 trace05.txt delete mode 100644 trace06.txt delete mode 100644 trace07.txt delete mode 100644 trace08.txt delete mode 100644 trace09.txt delete mode 100644 trace10.txt delete mode 100644 trace11.txt delete mode 100644 trace12.txt delete mode 100644 trace13.txt delete mode 100644 trace14.txt delete mode 100644 trace15.txt delete mode 100644 trace16.txt diff --git a/autograder/sdriver.pl b/autograder/sdriver.pl new file mode 100755 index 0000000..852bf3d --- /dev/null +++ b/autograder/sdriver.pl @@ -0,0 +1,210 @@ +#!/usr/bin/perl +#!/usr/local/bin/perl +use Getopt::Std; +use FileHandle; +use IPC::Open2; + +####################################################################### +# sdriver.pl - Shell driver +# +# Copyright (c) 2002, R. Bryant and D. O'Hallaron, All rights reserved. +# May not be used, modified, or copied without permission. +# +# The driver runs a student's shell program as a child, sends +# commands and signals to the child as directed by a trace file, +# and captures and displays the output produced by the child. +# +# Tracefile format: +# +# The tracefile consists of text lines that are either blank lines, +# comment lines, driver commands, or shell commands. Blank lines are +# ignored. Comment lines begin with "#" and are echo'd without change +# to stdout. Driver commands are intepreted by the driver and are not +# passed to the child shell. All other lines are shell commands and +# are passed without modification to the shell, which reads them on +# stdin. Output produced by the child on stdout/stderr is read by +# the parent and printed on its stdout. +# +# Driver commands: +# TSTP Send a SIGTSTP signal to the child +# INT Send a SIGINT signal to the child +# QUIT Send a SIGQUIT signal to the child +# KILL Send a SIGKILL signal to the child +# CLOSE Close Writer (sends EOF signal to child) +# WAIT Wait() for child to terminate +# SLEEP Sleep for seconds +# +###################################################################### + +# +# usage - print help message and terminate +# +sub usage +{ + printf STDERR "$_[0]\n"; + printf STDERR "Usage: $0 [-hv] -t -s -a \n"; + printf STDERR "Options:\n"; + printf STDERR " -h Print this message\n"; + printf STDERR " -v Be more verbose\n"; + printf STDERR " -t Trace file\n"; + printf STDERR " -s Shell program to test\n"; + printf STDERR " -a Shell arguments\n"; + printf STDERR " -g Generate output for autograder\n"; + die "\n" ; +} + +# Parse the command line arguments +getopts('hgvt:s:a:'); +if ($opt_h) { + usage(); +} +if (!$opt_t) { + usage("Missing required -t argument"); +} +if (!$opt_s) { + usage("Missing required -s argument"); +} +$verbose = $opt_v; +$infile = $opt_t; +$shellprog = $opt_s; +$shellargs = $opt_a; +$grade = $opt_g; + +# Make sure the input script exists and is readable +-e $infile + or die "$0: ERROR: $infile not found\n"; +-r $infile + or die "$0: ERROR: $infile is not readable\n"; + +# Make sure the shell program exists and is executable +-e $shellprog + or die "$0: ERROR: $shellprog not found\n"; +-x $shellprog + or die "$0: ERROR: $shellprog is not executable\n"; + + +# Open the input script +open INFILE, $infile + or die "$0: ERROR: Couldn't open input file $infile: $!\n"; + +# +# Fork a child, run the shell in it, and connect the parent +# and child with a pair of unidirectional pipes: +# parent:Writer -> child:stdin +# child:stdout -> parent:Reader +# +$pid = open2(\*Reader, \*Writer, "$shellprog $shellargs"); +Writer->autoflush(); + +# The autograder will want to know the child shell's pid +if ($grade) { + print ("pid=$pid\n"); +} + +# +# Parent reads a trace file, sends commands to the child shell. +# +while () { + $line = $_; + chomp($line); + + # Comment line + if ($line =~ /^#/) { + print "$line\n"; + } + + # Blank line + elsif ($line =~ /^\s*$/) { + if ($verbose) { + print "$0: Ignoring blank line\n"; + } + } + + # Send SIGTSTP (ctrl-z) + elsif ($line =~ /TSTP/) { + if ($verbose) { + print "$0: Sending SIGTSTP signal to process $pid\n"; + } + kill 'TSTP', $pid; + } + + # Send SIGINT (ctrl-c) + elsif ($line =~ /INT/) { + if ($verbose) { + print "$0: Sending SIGINT signal to process $pid\n"; + } + kill 'INT', $pid; + } + + # Send SIGQUIT (whenever we need graceful termination) + elsif ($line =~ /QUIT/) { + if ($verbose) { + print "$0: Sending SIGQUIT signal to process $pid\n"; + } + kill 'QUIT', $pid; + } + + # Send SIGKILL + elsif ($line =~ /KILL/) { + if ($verbose) { + print "$0: Sending SIGKILL signal to process $pid\n"; + } + kill 'KILL', $pid; + } + + # Close pipe (sends EOF notification to child) + elsif ($line =~ /CLOSE/) { + if ($verbose) { + print "$0: Closing output end of pipe to child $pid\n"; + } + close Writer; + } + + # Wait for child to terminate + elsif ($line =~ /WAIT/) { + if ($verbose) { + print "$0: Waiting for child $pid\n"; + } + wait; + if ($verbose) { + print "$0: Child $pid reaped\n"; + } + } + + # Sleep + elsif ($line =~ /SLEEP (\d+)/) { + if ($verbose) { + print "$0: Sleeping $1 secs\n"; + } + sleep $1; + } + + # Unknown input + else { + if ($verbose) { + print "$0: Sending :$line: to child $pid\n"; + } + print Writer "$line\n"; + } +} + +# +# Parent echoes the output produced by the child. +# +close Writer; +if ($verbose) { + print "$0: Reading data from child $pid\n"; +} +while ($line = ) { + print $line; +} +close Reader; + +# Finally, parent reaps child +wait; + +if ($verbose) { + print "$0: Shell terminated\n"; +} + +exit; diff --git a/autograder/trace01.txt b/autograder/trace01.txt new file mode 100644 index 0000000..9c8561e --- /dev/null +++ b/autograder/trace01.txt @@ -0,0 +1,5 @@ +# +# trace01.txt - Properly terminate on EOF. +# +CLOSE +WAIT diff --git a/autograder/trace02.txt b/autograder/trace02.txt new file mode 100644 index 0000000..e97643b --- /dev/null +++ b/autograder/trace02.txt @@ -0,0 +1,5 @@ +# +# trace02.txt - Process builtin quit command. +# +quit +WAIT diff --git a/autograder/trace03.txt b/autograder/trace03.txt new file mode 100644 index 0000000..be8869c --- /dev/null +++ b/autograder/trace03.txt @@ -0,0 +1,5 @@ +# +# trace03.txt - Run a foreground job. +# +/bin/echo tsh> quit +quit diff --git a/autograder/trace04.txt b/autograder/trace04.txt new file mode 100644 index 0000000..554df0e --- /dev/null +++ b/autograder/trace04.txt @@ -0,0 +1,5 @@ +# +# trace04.txt - Run a background job. +# +/bin/echo -e tsh> ./myspin 1 \046 +./myspin 1 & diff --git a/autograder/trace05.txt b/autograder/trace05.txt new file mode 100644 index 0000000..03c1876 --- /dev/null +++ b/autograder/trace05.txt @@ -0,0 +1,11 @@ +# +# trace05.txt - Process jobs builtin command. +# +/bin/echo -e tsh> ./myspin 2 \046 +./myspin 2 & + +/bin/echo -e tsh> ./myspin 3 \046 +./myspin 3 & + +/bin/echo tsh> jobs +jobs diff --git a/autograder/trace06.txt b/autograder/trace06.txt new file mode 100644 index 0000000..bfa3890 --- /dev/null +++ b/autograder/trace06.txt @@ -0,0 +1,8 @@ +# +# trace06.txt - Forward SIGINT to foreground job. +# +/bin/echo -e tsh> ./myspin 4 +./myspin 4 + +SLEEP 2 +INT diff --git a/autograder/trace07.txt b/autograder/trace07.txt new file mode 100644 index 0000000..259a285 --- /dev/null +++ b/autograder/trace07.txt @@ -0,0 +1,14 @@ +# +# trace07.txt - Forward SIGINT only to foreground job. +# +/bin/echo -e tsh> ./myspin 4 \046 +./myspin 4 & + +/bin/echo -e tsh> ./myspin 5 +./myspin 5 + +SLEEP 2 +INT + +/bin/echo tsh> jobs +jobs diff --git a/autograder/trace08.txt b/autograder/trace08.txt new file mode 100644 index 0000000..49be19f --- /dev/null +++ b/autograder/trace08.txt @@ -0,0 +1,14 @@ +# +# trace08.txt - Forward SIGTSTP only to foreground job. +# +/bin/echo -e tsh> ./myspin 4 \046 +./myspin 4 & + +/bin/echo -e tsh> ./myspin 5 +./myspin 5 + +SLEEP 2 +TSTP + +/bin/echo tsh> jobs +jobs diff --git a/autograder/trace09.txt b/autograder/trace09.txt new file mode 100644 index 0000000..340d998 --- /dev/null +++ b/autograder/trace09.txt @@ -0,0 +1,20 @@ +# +# trace09.txt - Process bg builtin command +# +/bin/echo -e tsh> ./myspin 4 \046 +./myspin 4 & + +/bin/echo -e tsh> ./myspin 5 +./myspin 5 + +SLEEP 2 +TSTP + +/bin/echo tsh> jobs +jobs + +/bin/echo tsh> bg %2 +bg %2 + +/bin/echo tsh> jobs +jobs diff --git a/autograder/trace10.txt b/autograder/trace10.txt new file mode 100644 index 0000000..e7de996 --- /dev/null +++ b/autograder/trace10.txt @@ -0,0 +1,22 @@ +# +# trace10.txt - Process fg builtin command. +# +/bin/echo -e tsh> ./myspin 4 \046 +./myspin 4 & + +SLEEP 1 +/bin/echo tsh> fg %1 +fg %1 + +SLEEP 1 +TSTP + +/bin/echo tsh> jobs +jobs + +/bin/echo tsh> fg %1 +fg %1 + +/bin/echo tsh> jobs +jobs + diff --git a/autograder/trace11.txt b/autograder/trace11.txt new file mode 100644 index 0000000..d2f8663 --- /dev/null +++ b/autograder/trace11.txt @@ -0,0 +1,12 @@ +# +# trace11.txt - Forward SIGINT to every process in foreground process group +# +/bin/echo -e tsh> ./mysplit 4 +./mysplit 4 + +SLEEP 2 +INT + +/bin/echo tsh> /bin/ps a +/bin/ps a + diff --git a/autograder/trace12.txt b/autograder/trace12.txt new file mode 100644 index 0000000..88455e3 --- /dev/null +++ b/autograder/trace12.txt @@ -0,0 +1,17 @@ +# +# trace12.txt - Forward SIGTSTP to every process in foreground process group +# +/bin/echo -e tsh> ./mysplit 4 +./mysplit 4 + +SLEEP 2 +TSTP + +/bin/echo tsh> jobs +jobs + +/bin/echo tsh> /bin/ps a +/bin/ps a + + + diff --git a/autograder/trace13.txt b/autograder/trace13.txt new file mode 100644 index 0000000..d734cbc --- /dev/null +++ b/autograder/trace13.txt @@ -0,0 +1,23 @@ +# +# trace13.txt - Restart every stopped process in process group +# +/bin/echo -e tsh> ./mysplit 4 +./mysplit 4 + +SLEEP 2 +TSTP + +/bin/echo tsh> jobs +jobs + +/bin/echo tsh> /bin/ps a +/bin/ps a + +/bin/echo tsh> fg %1 +fg %1 + +/bin/echo tsh> /bin/ps a +/bin/ps a + + + diff --git a/autograder/trace14.txt b/autograder/trace14.txt new file mode 100644 index 0000000..8086580 --- /dev/null +++ b/autograder/trace14.txt @@ -0,0 +1,47 @@ +# +# trace14.txt - Simple error handling +# +/bin/echo tsh> ./bogus +./bogus + +/bin/echo -e tsh> ./myspin 4 \046 +./myspin 4 & + +/bin/echo tsh> fg +fg + +/bin/echo tsh> bg +bg + +/bin/echo tsh> fg a +fg a + +/bin/echo tsh> bg a +bg a + +/bin/echo tsh> fg 9999999 +fg 9999999 + +/bin/echo tsh> bg 9999999 +bg 9999999 + +/bin/echo tsh> fg %2 +fg %2 + +/bin/echo tsh> fg %1 +fg %1 + +SLEEP 2 +TSTP + +/bin/echo tsh> bg %2 +bg %2 + +/bin/echo tsh> bg %1 +bg %1 + +/bin/echo tsh> jobs +jobs + + + diff --git a/autograder/trace15.txt b/autograder/trace15.txt new file mode 100644 index 0000000..2cc780e --- /dev/null +++ b/autograder/trace15.txt @@ -0,0 +1,46 @@ +# +# trace15.txt - Putting it all together +# + +/bin/echo tsh> ./bogus +./bogus + +/bin/echo tsh> ./myspin 10 +./myspin 10 + +SLEEP 2 +INT + +/bin/echo -e tsh> ./myspin 3 \046 +./myspin 3 & + +/bin/echo -e tsh> ./myspin 4 \046 +./myspin 4 & + +/bin/echo tsh> jobs +jobs + +/bin/echo tsh> fg %1 +fg %1 + +SLEEP 2 +TSTP + +/bin/echo tsh> jobs +jobs + +/bin/echo tsh> bg %3 +bg %3 + +/bin/echo tsh> bg %1 +bg %1 + +/bin/echo tsh> jobs +jobs + +/bin/echo tsh> fg %1 +fg %1 + +/bin/echo tsh> quit +quit + diff --git a/autograder/trace16.txt b/autograder/trace16.txt new file mode 100644 index 0000000..822ba14 --- /dev/null +++ b/autograder/trace16.txt @@ -0,0 +1,16 @@ +# +# trace16.txt - Tests whether the shell can handle SIGTSTP and SIGINT +# signals that come from other processes instead of the terminal. +# + +/bin/echo tsh> ./mystop 2 +./mystop 2 + +SLEEP 3 + +/bin/echo tsh> jobs +jobs + +/bin/echo tsh> ./myint 2 +./myint 2 + diff --git a/sdriver.pl b/sdriver.pl deleted file mode 100755 index 852bf3d..0000000 --- a/sdriver.pl +++ /dev/null @@ -1,210 +0,0 @@ -#!/usr/bin/perl -#!/usr/local/bin/perl -use Getopt::Std; -use FileHandle; -use IPC::Open2; - -####################################################################### -# sdriver.pl - Shell driver -# -# Copyright (c) 2002, R. Bryant and D. O'Hallaron, All rights reserved. -# May not be used, modified, or copied without permission. -# -# The driver runs a student's shell program as a child, sends -# commands and signals to the child as directed by a trace file, -# and captures and displays the output produced by the child. -# -# Tracefile format: -# -# The tracefile consists of text lines that are either blank lines, -# comment lines, driver commands, or shell commands. Blank lines are -# ignored. Comment lines begin with "#" and are echo'd without change -# to stdout. Driver commands are intepreted by the driver and are not -# passed to the child shell. All other lines are shell commands and -# are passed without modification to the shell, which reads them on -# stdin. Output produced by the child on stdout/stderr is read by -# the parent and printed on its stdout. -# -# Driver commands: -# TSTP Send a SIGTSTP signal to the child -# INT Send a SIGINT signal to the child -# QUIT Send a SIGQUIT signal to the child -# KILL Send a SIGKILL signal to the child -# CLOSE Close Writer (sends EOF signal to child) -# WAIT Wait() for child to terminate -# SLEEP Sleep for seconds -# -###################################################################### - -# -# usage - print help message and terminate -# -sub usage -{ - printf STDERR "$_[0]\n"; - printf STDERR "Usage: $0 [-hv] -t -s -a \n"; - printf STDERR "Options:\n"; - printf STDERR " -h Print this message\n"; - printf STDERR " -v Be more verbose\n"; - printf STDERR " -t Trace file\n"; - printf STDERR " -s Shell program to test\n"; - printf STDERR " -a Shell arguments\n"; - printf STDERR " -g Generate output for autograder\n"; - die "\n" ; -} - -# Parse the command line arguments -getopts('hgvt:s:a:'); -if ($opt_h) { - usage(); -} -if (!$opt_t) { - usage("Missing required -t argument"); -} -if (!$opt_s) { - usage("Missing required -s argument"); -} -$verbose = $opt_v; -$infile = $opt_t; -$shellprog = $opt_s; -$shellargs = $opt_a; -$grade = $opt_g; - -# Make sure the input script exists and is readable --e $infile - or die "$0: ERROR: $infile not found\n"; --r $infile - or die "$0: ERROR: $infile is not readable\n"; - -# Make sure the shell program exists and is executable --e $shellprog - or die "$0: ERROR: $shellprog not found\n"; --x $shellprog - or die "$0: ERROR: $shellprog is not executable\n"; - - -# Open the input script -open INFILE, $infile - or die "$0: ERROR: Couldn't open input file $infile: $!\n"; - -# -# Fork a child, run the shell in it, and connect the parent -# and child with a pair of unidirectional pipes: -# parent:Writer -> child:stdin -# child:stdout -> parent:Reader -# -$pid = open2(\*Reader, \*Writer, "$shellprog $shellargs"); -Writer->autoflush(); - -# The autograder will want to know the child shell's pid -if ($grade) { - print ("pid=$pid\n"); -} - -# -# Parent reads a trace file, sends commands to the child shell. -# -while () { - $line = $_; - chomp($line); - - # Comment line - if ($line =~ /^#/) { - print "$line\n"; - } - - # Blank line - elsif ($line =~ /^\s*$/) { - if ($verbose) { - print "$0: Ignoring blank line\n"; - } - } - - # Send SIGTSTP (ctrl-z) - elsif ($line =~ /TSTP/) { - if ($verbose) { - print "$0: Sending SIGTSTP signal to process $pid\n"; - } - kill 'TSTP', $pid; - } - - # Send SIGINT (ctrl-c) - elsif ($line =~ /INT/) { - if ($verbose) { - print "$0: Sending SIGINT signal to process $pid\n"; - } - kill 'INT', $pid; - } - - # Send SIGQUIT (whenever we need graceful termination) - elsif ($line =~ /QUIT/) { - if ($verbose) { - print "$0: Sending SIGQUIT signal to process $pid\n"; - } - kill 'QUIT', $pid; - } - - # Send SIGKILL - elsif ($line =~ /KILL/) { - if ($verbose) { - print "$0: Sending SIGKILL signal to process $pid\n"; - } - kill 'KILL', $pid; - } - - # Close pipe (sends EOF notification to child) - elsif ($line =~ /CLOSE/) { - if ($verbose) { - print "$0: Closing output end of pipe to child $pid\n"; - } - close Writer; - } - - # Wait for child to terminate - elsif ($line =~ /WAIT/) { - if ($verbose) { - print "$0: Waiting for child $pid\n"; - } - wait; - if ($verbose) { - print "$0: Child $pid reaped\n"; - } - } - - # Sleep - elsif ($line =~ /SLEEP (\d+)/) { - if ($verbose) { - print "$0: Sleeping $1 secs\n"; - } - sleep $1; - } - - # Unknown input - else { - if ($verbose) { - print "$0: Sending :$line: to child $pid\n"; - } - print Writer "$line\n"; - } -} - -# -# Parent echoes the output produced by the child. -# -close Writer; -if ($verbose) { - print "$0: Reading data from child $pid\n"; -} -while ($line = ) { - print $line; -} -close Reader; - -# Finally, parent reaps child -wait; - -if ($verbose) { - print "$0: Shell terminated\n"; -} - -exit; diff --git a/trace01.txt b/trace01.txt deleted file mode 100644 index 9c8561e..0000000 --- a/trace01.txt +++ /dev/null @@ -1,5 +0,0 @@ -# -# trace01.txt - Properly terminate on EOF. -# -CLOSE -WAIT diff --git a/trace02.txt b/trace02.txt deleted file mode 100644 index e97643b..0000000 --- a/trace02.txt +++ /dev/null @@ -1,5 +0,0 @@ -# -# trace02.txt - Process builtin quit command. -# -quit -WAIT diff --git a/trace03.txt b/trace03.txt deleted file mode 100644 index be8869c..0000000 --- a/trace03.txt +++ /dev/null @@ -1,5 +0,0 @@ -# -# trace03.txt - Run a foreground job. -# -/bin/echo tsh> quit -quit diff --git a/trace04.txt b/trace04.txt deleted file mode 100644 index 554df0e..0000000 --- a/trace04.txt +++ /dev/null @@ -1,5 +0,0 @@ -# -# trace04.txt - Run a background job. -# -/bin/echo -e tsh> ./myspin 1 \046 -./myspin 1 & diff --git a/trace05.txt b/trace05.txt deleted file mode 100644 index 03c1876..0000000 --- a/trace05.txt +++ /dev/null @@ -1,11 +0,0 @@ -# -# trace05.txt - Process jobs builtin command. -# -/bin/echo -e tsh> ./myspin 2 \046 -./myspin 2 & - -/bin/echo -e tsh> ./myspin 3 \046 -./myspin 3 & - -/bin/echo tsh> jobs -jobs diff --git a/trace06.txt b/trace06.txt deleted file mode 100644 index bfa3890..0000000 --- a/trace06.txt +++ /dev/null @@ -1,8 +0,0 @@ -# -# trace06.txt - Forward SIGINT to foreground job. -# -/bin/echo -e tsh> ./myspin 4 -./myspin 4 - -SLEEP 2 -INT diff --git a/trace07.txt b/trace07.txt deleted file mode 100644 index 259a285..0000000 --- a/trace07.txt +++ /dev/null @@ -1,14 +0,0 @@ -# -# trace07.txt - Forward SIGINT only to foreground job. -# -/bin/echo -e tsh> ./myspin 4 \046 -./myspin 4 & - -/bin/echo -e tsh> ./myspin 5 -./myspin 5 - -SLEEP 2 -INT - -/bin/echo tsh> jobs -jobs diff --git a/trace08.txt b/trace08.txt deleted file mode 100644 index 49be19f..0000000 --- a/trace08.txt +++ /dev/null @@ -1,14 +0,0 @@ -# -# trace08.txt - Forward SIGTSTP only to foreground job. -# -/bin/echo -e tsh> ./myspin 4 \046 -./myspin 4 & - -/bin/echo -e tsh> ./myspin 5 -./myspin 5 - -SLEEP 2 -TSTP - -/bin/echo tsh> jobs -jobs diff --git a/trace09.txt b/trace09.txt deleted file mode 100644 index 340d998..0000000 --- a/trace09.txt +++ /dev/null @@ -1,20 +0,0 @@ -# -# trace09.txt - Process bg builtin command -# -/bin/echo -e tsh> ./myspin 4 \046 -./myspin 4 & - -/bin/echo -e tsh> ./myspin 5 -./myspin 5 - -SLEEP 2 -TSTP - -/bin/echo tsh> jobs -jobs - -/bin/echo tsh> bg %2 -bg %2 - -/bin/echo tsh> jobs -jobs diff --git a/trace10.txt b/trace10.txt deleted file mode 100644 index e7de996..0000000 --- a/trace10.txt +++ /dev/null @@ -1,22 +0,0 @@ -# -# trace10.txt - Process fg builtin command. -# -/bin/echo -e tsh> ./myspin 4 \046 -./myspin 4 & - -SLEEP 1 -/bin/echo tsh> fg %1 -fg %1 - -SLEEP 1 -TSTP - -/bin/echo tsh> jobs -jobs - -/bin/echo tsh> fg %1 -fg %1 - -/bin/echo tsh> jobs -jobs - diff --git a/trace11.txt b/trace11.txt deleted file mode 100644 index d2f8663..0000000 --- a/trace11.txt +++ /dev/null @@ -1,12 +0,0 @@ -# -# trace11.txt - Forward SIGINT to every process in foreground process group -# -/bin/echo -e tsh> ./mysplit 4 -./mysplit 4 - -SLEEP 2 -INT - -/bin/echo tsh> /bin/ps a -/bin/ps a - diff --git a/trace12.txt b/trace12.txt deleted file mode 100644 index 88455e3..0000000 --- a/trace12.txt +++ /dev/null @@ -1,17 +0,0 @@ -# -# trace12.txt - Forward SIGTSTP to every process in foreground process group -# -/bin/echo -e tsh> ./mysplit 4 -./mysplit 4 - -SLEEP 2 -TSTP - -/bin/echo tsh> jobs -jobs - -/bin/echo tsh> /bin/ps a -/bin/ps a - - - diff --git a/trace13.txt b/trace13.txt deleted file mode 100644 index d734cbc..0000000 --- a/trace13.txt +++ /dev/null @@ -1,23 +0,0 @@ -# -# trace13.txt - Restart every stopped process in process group -# -/bin/echo -e tsh> ./mysplit 4 -./mysplit 4 - -SLEEP 2 -TSTP - -/bin/echo tsh> jobs -jobs - -/bin/echo tsh> /bin/ps a -/bin/ps a - -/bin/echo tsh> fg %1 -fg %1 - -/bin/echo tsh> /bin/ps a -/bin/ps a - - - diff --git a/trace14.txt b/trace14.txt deleted file mode 100644 index 8086580..0000000 --- a/trace14.txt +++ /dev/null @@ -1,47 +0,0 @@ -# -# trace14.txt - Simple error handling -# -/bin/echo tsh> ./bogus -./bogus - -/bin/echo -e tsh> ./myspin 4 \046 -./myspin 4 & - -/bin/echo tsh> fg -fg - -/bin/echo tsh> bg -bg - -/bin/echo tsh> fg a -fg a - -/bin/echo tsh> bg a -bg a - -/bin/echo tsh> fg 9999999 -fg 9999999 - -/bin/echo tsh> bg 9999999 -bg 9999999 - -/bin/echo tsh> fg %2 -fg %2 - -/bin/echo tsh> fg %1 -fg %1 - -SLEEP 2 -TSTP - -/bin/echo tsh> bg %2 -bg %2 - -/bin/echo tsh> bg %1 -bg %1 - -/bin/echo tsh> jobs -jobs - - - diff --git a/trace15.txt b/trace15.txt deleted file mode 100644 index 2cc780e..0000000 --- a/trace15.txt +++ /dev/null @@ -1,46 +0,0 @@ -# -# trace15.txt - Putting it all together -# - -/bin/echo tsh> ./bogus -./bogus - -/bin/echo tsh> ./myspin 10 -./myspin 10 - -SLEEP 2 -INT - -/bin/echo -e tsh> ./myspin 3 \046 -./myspin 3 & - -/bin/echo -e tsh> ./myspin 4 \046 -./myspin 4 & - -/bin/echo tsh> jobs -jobs - -/bin/echo tsh> fg %1 -fg %1 - -SLEEP 2 -TSTP - -/bin/echo tsh> jobs -jobs - -/bin/echo tsh> bg %3 -bg %3 - -/bin/echo tsh> bg %1 -bg %1 - -/bin/echo tsh> jobs -jobs - -/bin/echo tsh> fg %1 -fg %1 - -/bin/echo tsh> quit -quit - diff --git a/trace16.txt b/trace16.txt deleted file mode 100644 index 822ba14..0000000 --- a/trace16.txt +++ /dev/null @@ -1,16 +0,0 @@ -# -# trace16.txt - Tests whether the shell can handle SIGTSTP and SIGINT -# signals that come from other processes instead of the terminal. -# - -/bin/echo tsh> ./mystop 2 -./mystop 2 - -SLEEP 3 - -/bin/echo tsh> jobs -jobs - -/bin/echo tsh> ./myint 2 -./myint 2 - diff --git a/tsh.cc b/tsh.cc index 6c291ab..a0d425c 100644 --- a/tsh.cc +++ b/tsh.cc @@ -363,9 +363,15 @@ void do_bgfg(char **argv) { LOG << "fg" << endl; j->state = FG; + + sigset_t prev_with_sigchld_blocked = prev; + sigaddset(&prev_with_sigchld_blocked, SIGCHLD); + sigprocmask(SIG_SETMASK, &prev_with_sigchld_blocked, NULL); kill(-(j->pid), SIGCONT); - sigprocmask(SIG_SETMASK, &prev, NULL); + waitfg(j->pid); + + sigprocmask(SIG_SETMASK, &prev, NULL); } else // bg { LOG << "bg" << endl; @@ -388,7 +394,7 @@ void waitfg(pid_t pid) { sigset_t prev_with_sigchld_unblocked; // get current blocked signals - sigprocmask(0, NULL, &prev_with_sigchld_unblocked); + sigprocmask(0, nullptr, &prev_with_sigchld_unblocked); sigdelset(&prev_with_sigchld_unblocked, SIGCHLD); LOG << "waiting for pid "<< fgpid(jobs) << endl; while (fgpid(jobs) != 0) -- cgit v1.3.1-4-g156e From b17e1ff84557511a3cc0782c3e2ef102aad9d671 Mon Sep 17 00:00:00 2001 From: _ov4 Date: Thu, 13 Aug 2026 15:10:05 +0000 Subject: fix --- tsh.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tsh.cc b/tsh.cc index a0d425c..cc643ba 100644 --- a/tsh.cc +++ b/tsh.cc @@ -367,7 +367,12 @@ void do_bgfg(char **argv) sigset_t prev_with_sigchld_blocked = prev; sigaddset(&prev_with_sigchld_blocked, SIGCHLD); sigprocmask(SIG_SETMASK, &prev_with_sigchld_blocked, NULL); - kill(-(j->pid), SIGCONT); + if (kill(-(j->pid), SIGCONT) < 0) + { + cerr << "Cannot continue process " << j->pid; + sigprocmask(SIG_SETMASK, &prev, NULL); + return; + } waitfg(j->pid); @@ -422,7 +427,7 @@ void sigchld_handler(int sig) while ((pid = waitpid(-1, &status, WNOHANG | WUNTRACED)) > 0) { - if (WIFSIGNALED(status) | WIFSTOPPED(status)) + if (WIFSIGNALED(status) || WIFSTOPPED(status)) { int jid = pid2jid(pid); atomic_print("Job ["); -- cgit v1.3.1-4-g156e From 1ffed57168ffaa8bec0dfda56b4b0b8dc957b11a Mon Sep 17 00:00:00 2001 From: _ov4 Date: Thu, 13 Aug 2026 15:38:45 +0000 Subject: fixed race --- tsh.cc | 49 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/tsh.cc b/tsh.cc index cc643ba..c004564 100644 --- a/tsh.cc +++ b/tsh.cc @@ -58,6 +58,9 @@ struct job_t { /* The job struct */ char cmdline[MAXLINE]; /* command line */ }; struct job_t jobs[MAXJOBS]; /* The job list */ + +vector builtin_cmd_list = {"quit", "fg", "bg", "jobs"}; +sigset_t BLOCK_HANDLER; /* End global variables */ @@ -98,15 +101,17 @@ handler_t *Signal(int signum, handler_t *handler); // built-in commands void builtin_command_quit(); -inline int block_all(sigset_t *prev); +inline int block_all(sigset_t*); +inline int block_handler(sigset_t*); -vector builtin_cmd_list = {"quit", "fg", "bg", "jobs"}; +void init(); /* * main - The shell's main routine */ int main(int argc, char **argv) { + init(); char c; char cmdline[MAXLINE]; int emit_prompt = 1; /* emit prompt (default) */ @@ -191,7 +196,7 @@ void eval(char *cmdline) } int ground = parseline(cmdline, argv); - if (argv[0] == NULL) return; + if (argv[0] == nullptr) return; if (builtin_cmd(argv[0])) { @@ -210,7 +215,7 @@ void eval(char *cmdline) pid_t pid = fork(); if (pid == 0) // child { - sigprocmask(SIG_SETMASK, &prev, NULL); + sigprocmask(SIG_SETMASK, &prev, nullptr); setpgid(0, 0); execve(argv[0], argv, environ); @@ -422,6 +427,10 @@ void waitfg(pid_t pid) void sigchld_handler(int sig) { int errno_backup = errno; + + sigset_t prev; + block_handler(&prev); + int status, pid; atomic_debug("SIGCHLD\n"); @@ -454,21 +463,22 @@ void sigchld_handler(int sig) atomic_debug("suspended pid: "); atomic_debug(pid); atomic_debug("\n"); - sigset_t prev; - block_all(&prev); + sigset_t prev_inner; + block_all(&prev_inner); job_suspend(jobs, pid); - sigprocmask(SIG_SETMASK, &prev, nullptr); + sigprocmask(SIG_SETMASK, &prev_inner, nullptr); } else { atomic_debug("terminated pid: "); atomic_debug(pid); - sigset_t prev; - block_all(&prev); + sigset_t prev_inner; + block_all(&prev_inner); deletejob(jobs, pid); - sigprocmask(SIG_SETMASK, &prev, nullptr); + sigprocmask(SIG_SETMASK, &prev_inner, nullptr); } } + sigprocmask(SIG_SETMASK, &prev, nullptr); errno = errno_backup; return; @@ -483,6 +493,8 @@ void sigint_handler(int sig) { int errno_backup = errno; + sigset_t prev; + block_handler(&prev); int pid = fgpid(jobs); if (pid != 0) @@ -490,6 +502,7 @@ void sigint_handler(int sig) kill(-pid, SIGINT); } + sigprocmask(SIG_SETMASK, &prev, nullptr); errno = errno_backup; return; @@ -504,6 +517,8 @@ void sigtstp_handler(int sig) { int errno_backup = errno; + sigset_t prev; + block_handler(&prev); int pid = fgpid(jobs); if (pid != 0) @@ -511,6 +526,7 @@ void sigtstp_handler(int sig) kill(-pid, SIGTSTP); } + sigprocmask(SIG_SETMASK, &prev, nullptr); errno = errno_backup; return; @@ -760,3 +776,16 @@ inline int block_all(sigset_t *prev) sigfillset(&set); return sigprocmask(SIG_SETMASK, &set, prev); } + +inline int block_handler(sigset_t *prev) +{ + return sigprocmask(SIG_BLOCK, &BLOCK_HANDLER, prev); +} + +void init() +{ + sigemptyset(&BLOCK_HANDLER); + sigaddset(&BLOCK_HANDLER, SIGINT); + sigaddset(&BLOCK_HANDLER, SIGTSTP); + sigaddset(&BLOCK_HANDLER, SIGCHLD); +} -- cgit v1.3.1-4-g156e