From 23a46daad9659d636dfc47051541f4ed846b685e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernd=20B=C3=B6ckmann?= Date: Wed, 29 May 2024 14:48:29 +0200 Subject: [PATCH 1/4] update version strings and history --- VERSION.TXT | 2 +- command.lsm | 4 ++-- docs/history.txt | 11 +++++++++++ shell/ver.c | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/VERSION.TXT b/VERSION.TXT index 1eb2be3f..613d737f 100644 --- a/VERSION.TXT +++ b/VERSION.TXT @@ -1 +1 @@ -FreeCom version 0.85a - WATCOMC [July 10 2021] +FreeCom version 0.85b - WATCOMC [May 28 2024] diff --git a/command.lsm b/command.lsm index 5f4c92dc..997cd348 100644 --- a/command.lsm +++ b/command.lsm @@ -1,7 +1,7 @@ Begin3 Title: FreeCom -Version: 0.85a -Entered-date: July 10 2021 +Version: 0.85b +Entered-date: May 28 2024 Description: The FreeDOS Command Shell Keywords: freecom freedos command shell Author: freedos-devel@lists.sourceforge.net (developers) diff --git a/docs/history.txt b/docs/history.txt index 24ddc3f3..6ec335cb 100644 --- a/docs/history.txt +++ b/docs/history.txt @@ -1,6 +1,17 @@ FreeDOS Command Line Interface Development History ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +v0.85b +~~~~~ + fix screen corruption that occurs when performing an editing command that clears the command line and the cursor is not at EOL + fix an error that may overwrite 0x100 of a program when writing command line into PSP + COPY: allow lowercase drive letter for destination + COPY: Check that target drive exists and if not return the proper error code + COPY: We shouldn't error if the target argument is a bare drive + fix sort order when sorting by date AND time AND results compare identical, return sort by filename + fix CTTY suitable for serial terminal via AUX (COMn) + various NLS updates + v0.85a ~~~~~ regression fix: ensure not setting errorlevel for all internal commands, exclude commands such IF FOR etc diff --git a/shell/ver.c b/shell/ver.c index a96180ef..ef6e3011 100644 --- a/shell/ver.c +++ b/shell/ver.c @@ -41,7 +41,7 @@ #include "../err_fcts.h" #include "../strings.h" -const char shellver[] = "0.85a - " +const char shellver[] = "0.85b - " #if defined(__BORLANDC__) "BORLANDC" #elif defined(__TURBOC__) From 40c78cae792b0f7e1b41fb2ac2b00b5fde84c366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernd=20B=C3=B6ckmann?= Date: Wed, 29 May 2024 17:13:46 +0200 Subject: [PATCH 2/4] fix NASM segment attribute redefinition warning --- suppl/src/intr.asm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/suppl/src/intr.asm b/suppl/src/intr.asm index bb165d5b..6b034b27 100644 --- a/suppl/src/intr.asm +++ b/suppl/src/intr.asm @@ -43,8 +43,7 @@ _intrf: %elifidni COMPILER, WATCOM ; and Open Watcom %define COMPILE 1 -segment _TEXT class=CODE - +segment _TEXT global intrf_ global _intrf_ From ff24fe9cd4156d2c2d729bbcbe8153ffdc89f85f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernd=20B=C3=B6ckmann?= Date: Wed, 29 May 2024 17:59:45 +0200 Subject: [PATCH 3/4] OpenWatcom 1.9 warning fixes --- shell/cswapc.c | 1 + suppl/p-watcom.h | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/shell/cswapc.c b/shell/cswapc.c index 5346ea6a..db823e77 100644 --- a/shell/cswapc.c +++ b/shell/cswapc.c @@ -55,6 +55,7 @@ #include #include #include +#include #include "../include/command.h" #include "../include/cswap.h" diff --git a/suppl/p-watcom.h b/suppl/p-watcom.h index d4e59064..5ef50e16 100644 --- a/suppl/p-watcom.h +++ b/suppl/p-watcom.h @@ -23,7 +23,7 @@ #include #include #include - +#include /* Global argc/argv variables */ #define G_ARGV _argv /* global char **argv variable */ @@ -71,13 +71,15 @@ typedef struct { unsigned int r_es; unsigned int r_flags; } IREGS; + +#if __WATCOMC__ <= 1290 +void intrf(int inter_no, union REGPACK *regs); +#endif #define intrpt(num,regs) intrf((num), (union REGPACK*)(regs)) -#ifdef __WATCOMC__ unsigned CS_(void); #pragma aux CS_ = "mov ax, cs" value[ax]; #define _CS CS_() -#endif /* get/set current working drive */ extern short getdisk(void); From 4d8d6a592f99ea7badb8c927b98048e596ec942b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernd=20B=C3=B6ckmann?= Date: Wed, 29 May 2024 18:00:56 +0200 Subject: [PATCH 4/4] add binary extensions to .gitignore --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index e20c2def..8dbd9bd9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,9 @@ +*.o +*.obj +*.lib +*.exe +*.tmp + config.bat command.com config.mak