diff --git a/Source/Images/d_zsdos/u0/ROMWBW.TXT b/Source/Images/d_zsdos/u0/ROMWBW.TXT index a8151798..d0c811f2 100644 --- a/Source/Images/d_zsdos/u0/ROMWBW.TXT +++ b/Source/Images/d_zsdos/u0/ROMWBW.TXT @@ -135,6 +135,55 @@ distribution as possible. use with BackGrounder II software which is not included. Refer to the ZSDOS Manual for information on implementing BackGrounder II if desired. + + +== ZSDOS 1.1 Files == + +The following files came from the official ZSDOS distribution. These +are generall documented in the "ZSDOS Manual.pdf" document in the Doc +directory of the RomWBW distribution. Note that some of the files +included in the ZSDOS distribution are not listed below because they +have been superseded by more recent versions listed in other sections +below. For example, ZXD is not listed here, but a more recent version is +included and documented in the General Purpose Applications section +below. + +BGPATCH.HEX - Patches BackGrounder II for ZSDOS 1.1 compatibility +CLOCKS.DAT - Library of clock drivers +COPY.CFG - ZCNFG configuration file for COPY +COPY.COM - Enhanced file copy tool +COPY.UPD - Document describing updates to COPY program +DATSWEEP.COM - File management utility w/ date/time stamp awareness +DSCONFIG.COM - Program to configure DATSWEEP +FA16.CFG - ZCNFG configuration file for FILEATTR +FA16.DOC - Documentation for FILEATTR +FA16A.FOR - Summary of FILEATTR program version 16a +FA16CFG.TXT - Document describes FILEATTR configuration options +FILEATTR.COM - Set and/or display file attributes +FILEDATE.CFG - ZCNFG configuration fie for FILEDATE +FILEDATE.COM - Date/time stamping aware disk directory utility +INITDIR.CFG - ZCNFG configuration file for INITDIR +INITDIR.COM - Prepare disk for P2DOS date/time stamping +LDDS.COM - Load DateStamper date/time stamping resident extension +LDNZT.COM - Load NZT date/time stamping resident extension +LDP2D.COM - Load P2DOS date/time stamping resident extension +PUTBG.COM - Updated replacement for BackGrounder II PUTBG program +PUTDS.COM - Prepare disk for DateStamper date/time stamping +RELOG.COM - Clear fixed disk login vector in ZSDOS (see manual) +SETTERM.COM - Terminal configuration utility for DATSWEEP & DSCONFIG +SETUPZST.COM - Creates customized date/time stamping resident extensions +STAMPS.DAT - Library of available date/time stamping modules for SETUPZST +TD.CFG - ZCNFG configuration file for TD +TD.COM - Read and set system real-time clock +TERMBASE.DAT - Library of terminals used by SETTERM +TESTCLOK.COM - Test a selected clock driver +ZCAL.COM - Display a small one-month calendar to the screen +ZCNFG.COM - Configuration tool for programs with .CFG files +ZCNFG24.CFG - ZCNFG configuration file for ZCNFG +ZPATH.COM - Set or display ZSDOS and ZCPR search paths +ZSCONFIG.COM - Dynamically sets many features of ZSDOS operating system +ZSVSTAMP.COM - Preserves file date/time stamp across modifications +ZSVSTAMP.DOC - Document describes the use and operation of ZSMSTAMP == CP/M 2.2 Files == @@ -151,9 +200,9 @@ LINK.COM - DRI relocatable object file linker LOAD.COM - DRI loader for Intel hex files MAC.COM - DRI 8080 macro assembler RMAC.COM - DRI 8080 macro assembler generating relocatable object files -STAT.COM - DRI multi-purpose file/disk/IO info & config tool +STAT.COM - DRI multi-purpose file/disk/device info & configuration tool SUBMIT.COM - DRI batch file submission tool -XSUB.COM - DRI batch file extensions +XSUB.COM - DRI batch file enhancer resident system extension == RomWBW Supplemental Applications == @@ -163,7 +212,7 @@ RomWBW enhancements. These applications are documented in the RomWBW Distribution. ASSIGN.COM - Assign,remove,swap drive letters of RomWBW disk slices -FAT.COM - MS-DOS FAT filesystem tool (format, copy, delete, etc.) +FAT.COM - MS-DOS FAT filesystem tool (list, copy, delete, format, etc.) FDU.COM - Test floppy hardware and format floppy disks FORMAT.COM - Placeholder application with formatting instructions INTTEST.COM - Test RomWBW interrupt processing on your hardware @@ -177,7 +226,7 @@ TIMER.COM - Test and display system timer ticks TUNE.COM - Play .PT2, .PT3, and .MYM audio files on supported hardware XM.COM - XModem file transfer application -== General Purposes Applications == +== General Purpose Applications == The following files are commonly used CP/M applications that are generally useful in any CP/M-like system. In general, there is @@ -194,12 +243,12 @@ DDTZ.DOC - Documentation for DDTZ EX.COM - Batch file processor (alternative to DRI SUBMIT) FDISK80.COM - Hard disk partitioning tool (from John Coffman) FIND.COM - Search all drives for a file (from Jay Cotton) -FLASH.COM - Program FLASH chips in-situ (from Sergey Kiselev) +FLASH.COM - Program FLASH chips in-situ (from Will Sowerbutts) FLASH.DOC - Documentation for FLASH MBASIC.COM - Microsoft BASIC language interpreter NULU.COM - Library (.LBR) management tool PMARC.COM - Create or add file(s) to .PMA archive -PMEXT.COM - Extract file(s) from .PMA archive +PMEXT.COM - Extract file(s) from .PMA/.LZH/.LHA archive RMXSUB1.COM - Remove XSUB1 RSX from memory (from Lars Nelson) SUPERSUB.COM - Enhanced replacement for DRI SUBMIT SUPERSUB.DOC - Documentation for SUPERSUB @@ -239,4 +288,4 @@ User area 4 contains a full implementation of the CP/NET 1.2 client provided by Doug Miller. Please read the README.TXT file in this user area for more information. --- WBW 6:56 PM 8/9/2021 \ No newline at end of file +-- WBW 5:46 PM 8/19/2021 \ No newline at end of file diff --git a/Tools/unix/zx/COPYING b/Tools/unix/zx/COPYING new file mode 100644 index 00000000..a43ea212 --- /dev/null +++ b/Tools/unix/zx/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE 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. + + END OF TERMS AND CONDITIONS + + Appendix: 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 +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/Tools/unix/zx/util.c b/Tools/unix/zx/util.c index 21d29728..cb22e18b 100644 --- a/Tools/unix/zx/util.c +++ b/Tools/unix/zx/util.c @@ -21,7 +21,6 @@ */ #include "cpmint.h" -#include /* In debug mode, lseek()s can be traced. */ @@ -117,7 +116,7 @@ swizzle(char *fullpath) return; } - slash = rindex(fullpath, '/'); + slash = strrchr(fullpath, '/'); if (!slash) { return; } diff --git a/Tools/unix/zx/zx.c b/Tools/unix/zx/zx.c index 0ea315d0..bb730a2c 100644 --- a/Tools/unix/zx/zx.c +++ b/Tools/unix/zx/zx.c @@ -39,10 +39,12 @@ char *parse_to_fcb(char *s, int afcb) RAM[afcb] = 0; memset(fcb, ' ', 11); + while (*s == ' ') ++s; + while (1) { - if (s[0] == 0) break; - if (s[0] == ' ') {++s; continue; } + if (s[0] == 0) break; + if (s[0] == ' ') break; if (s[1] == ':') { RAM[afcb] = s[0] - '@'; @@ -58,7 +60,7 @@ char *parse_to_fcb(char *s, int afcb) } *fcb = *s; if (islower(*fcb)) *fcb = toupper(*fcb); ++s; - ++fcb; + ++fcb; if (fcb >= &RAM[afcb+12]) break; } return s; @@ -353,10 +355,9 @@ int main(int ac, char **av) str = parse_to_fcb(pCmd, 0x5C); parse_to_fcb(str, 0x6C); -/* This statement is very useful when creating a client like zxc or zxas + // This statement is very useful when creating a client like zxc or zxas + Msg("Command tail is \"%s\"\n", pCmd); - printf("Command tail is %s\n", pCmd); -*/ load_bios(); memset(RAM + 0xFE9C, 0, 0x64); /* Zap the SCB */ @@ -417,8 +418,9 @@ int zx_term(void) word n; - n = RAM[0x81]; /* Get the return code. This is Hi-Tech C */ - n = (n << 8) | RAM[0x80]; /* specific and fails with other COM files */ + //n = RAM[0x81]; /* Get the return code. This is Hi-Tech C */ + //n = (n << 8) | RAM[0x80]; /* specific and fails with other COM files */ + n = 0; putchar('\n'); diff --git a/Tools/unix/zx/zxbdos.c b/Tools/unix/zx/zxbdos.c index 06b951ad..3c4dd931 100644 --- a/Tools/unix/zx/zxbdos.c +++ b/Tools/unix/zx/zxbdos.c @@ -371,7 +371,7 @@ void cpmbdos(byte *a, byte *b, byte *c, byte *d, byte *e, byte *f, break; case 0x3C: /* Communicate with RSX */ - *h = *l = 0; + *h = 0; *l = 0xFF; /* return error */ break; case 0x62: /* Purge */ diff --git a/Tools/unix/zx/zxcbdos.c b/Tools/unix/zx/zxcbdos.c index b441fa7f..355dd687 100644 --- a/Tools/unix/zx/zxcbdos.c +++ b/Tools/unix/zx/zxcbdos.c @@ -1,7 +1,9 @@ #include "zx.h" #include "zxbdos.h" #include "zxcbdos.h" +#if !(defined(__MINGW32__) || defined(_MSC_BUILD) || defined(__WATCOMC__)) #include +#endif #ifdef WIN32 #include #endif @@ -12,12 +14,12 @@ void bdos_rdline(word line, word *PC) { - char *buf; + unsigned char *buf; if (!line) line = cpm_dma; else RAM[line + 1] = 0; - buf = (char *)&RAM[line]; + buf = (unsigned char *)&RAM[line]; if (cpm_bdos_10(buf)) *PC = 0; } @@ -26,13 +28,47 @@ void bdos_rdline(word line, word *PC) void bdos_rdline(word line, word *PC) { + unsigned char c; + unsigned char *p; + int n; int maxlen; if (!line) line = cpm_dma; maxlen = RAM[line]; - fgets((char *)(RAM + line + 2), maxlen, stdin); - RAM[line + 1] = strlen((char *)(RAM + line + 2)) - 1; + // fgets causes extra linefeeds, so we invent our own + //fgets((char *)(RAM + line + 2), maxlen, stdin); + + p = (RAM + line + 2); + n = 0; + + while (1) { + c = cin(); + if (c == '\r') + break; + if (c == '\b') { + if (n > 0) { + cout('\b'); + cout(' '); + cout('\b'); + n--; + p--; + } + } + else { + if (n < maxlen) { + cout(c); + *p++ = c; + n++; + } + } + } + + cout('\r'); + *p = '\0'; + + //RAM[line + 1] = strlen((char *)(RAM + line + 2)) - 1; + RAM[line + 1] = (unsigned char)n; Msg("Input: [%d] %-*.*s\n", RAM[line + 1], RAM[line + 1], RAM[line +1], (char *)(RAM+line+2)); } @@ -90,7 +126,7 @@ int cstat() return 0xFF; } -#else /* defined(__MINGW32__) || defined(_MSC_BUILD) */ +#else /* defined(__MINGW32__) || defined(_MSC_BUILD) || defined(__WATCOMC__) */ byte cin() { diff --git a/Tools/zx/zx-src.zip b/Tools/zx/zx-src.zip index cb9e929a..1d51fd61 100644 Binary files a/Tools/zx/zx-src.zip and b/Tools/zx/zx-src.zip differ diff --git a/Tools/zx/zx.exe b/Tools/zx/zx.exe index bde1d36f..d2cca5e4 100644 Binary files a/Tools/zx/zx.exe and b/Tools/zx/zx.exe differ diff --git a/Tools/zx/zxdbg.exe b/Tools/zx/zxdbg.exe index 11a5864d..070a9bf8 100644 Binary files a/Tools/zx/zxdbg.exe and b/Tools/zx/zxdbg.exe differ