Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix OpenWatcom 1.9 build warnings, 0.85b history, increase version to 0.85b #101

Merged
merged 4 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
*.o
*.obj
*.lib
*.exe
*.tmp

config.bat
command.com
config.mak
Expand Down
2 changes: 1 addition & 1 deletion VERSION.TXT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FreeCom version 0.85a - WATCOMC [July 10 2021]
FreeCom version 0.85b - WATCOMC [May 28 2024]
4 changes: 2 additions & 2 deletions command.lsm
Original file line number Diff line number Diff line change
@@ -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: [email protected] (developers)
Expand Down
11 changes: 11 additions & 0 deletions docs/history.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions shell/cswapc.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
#include <assert.h>
#include <suppl.h>
#include <mcb.h>
#include <portable.h>
#include "../include/command.h"

#include "../include/cswap.h"
Expand Down
2 changes: 1 addition & 1 deletion shell/ver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down
8 changes: 5 additions & 3 deletions suppl/p-watcom.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <direct.h>
#include <stdlib.h>
#include <stddef.h>

#include <i86.h>

/* Global argc/argv variables */
#define G_ARGV _argv /* global char **argv variable */
Expand Down Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions suppl/src/intr.asm
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ _intrf:
%elifidni COMPILER, WATCOM ; and Open Watcom
%define COMPILE 1

segment _TEXT class=CODE

segment _TEXT

global intrf_
global _intrf_
Expand Down