Revert "Merge branch 'master' of https://github.com/osfree-project/os…

…free"

This reverts commit ff3fc4f, reversing
changes made to 8a8a58a.

DOS/CMD/append/append.asm

@@ -155,12 +155,11 @@ append_state	dw	0011000000000001b
 ;APPEND_ENVIRON	equ	0100000000000000b
 ;APPEND_EXTENDD	equ	1000000000000000b
 
-NoAppend	db	13, "There are no appended directories.", 13, 10, '$'
+NoAppend	db	13, "No Append", 13, 10, '$'
 Invalid		db	13, "Invalid switch  - ", '$'
 TooMany		db	13, "Too many parameters -  ", '$'
 NotAllw		db	13, "Parameter value not allowed -  ", '$'
 
-if 0
 Help	db	13, "FreeDOS APPEND. Enables programs to open data files in "
 	db		"specified directories as", 13, 10
 	db		"		 if the files were in the current "
@@ -193,31 +192,12 @@ Help	db	13, "FreeDOS APPEND. Enables programs to open data files in "
 	db		"directories.", 13, 10
 	db	"  APPEND without parameters displays the list of appended "
 	db		"directories.", 13, 10, '$'
-endif
-
-Help	db	13, "Use the APPEND command to set a search path for data files", 13, 10
-    	db	    "that are outside the current directory.", 13, 10
-    	db	    "Syntax:", 13, 10
-    	db	    "  APPEND [drive][path];[drive][path][/PATH:ON or /PATH:OFF][/E]", 13, 10
-    	db	    "where:", 13, 10
-    	db	    "  drive\path   Specifies the drive and directory to append.  You can", 13, 10
-    	db	    "               specify more than one directory by using a semicolon.", 13, 10
-    	db	    "  /PATH:ON     Adds appended directories to file requests that", 13, 10
-    	db	    "               that currently specify a path.  /PATH:ON is the default.", 13, 10
-    	db	    "  /PATH:OFF    Turns off the effect of PATH:ON.", 13, 10
-    	db	    "  /E           Files a copy of the appended directory list in an", 13, 10
-    	db	    "               environment variable named APPEND.  /E can be used", 13, 10
-    	db	    "               only the first time you APPEND after starting your", 13, 10
-    	db	    "               session.", 13, 10
-    	db	    "", 13, 10
-    	db	    "To cancel the APPEND command, type: APPEND ;", 13, 10
-    	db	    "To display the appended directory list, type: APPEND", 13, 10, '$'
 
 end_resident:
 ; ================== END OF RESIDENT CODE ================================
 
-WrnInstalled	db	13, "APPEND is already installed.", 13, 10, '$'
-WrongAppend	db	13, "You are attempting to use an incorrect version of APPEND.", 13, 10, '$'
+WrnInstalled	db	13, "APPEND already installed", 13, 10, '$'
+WrongAppend	db	13, "Incorrect APPEND version", 13, 10, '$'
 
 start:		mov	ax, 0B710h	; Check if we're already installed
 		mov	dx, 00000h

DOS/CMD/append/make.bat

@@ -0,0 +1,2 @@
+nasm -dNEW_NASM -fbin append.asm -o append.exe
+upx --8086 -f append.exe

DOS/CMD/append/makefile

@@ -6,16 +6,8 @@
 
 PROJ      = append
 TRGT      = $(PROJ).com
-DESC      = Append dirs to search path
+DESC      = Binary comparison of files
 srcfiles  = $(p)segs$(e) $(p)environ$(e) $(p)cmdline$(e) $(p)int2f$(e) $(p)int21$(e) $(p)append$(e)
 COM       = 1
 
 !include $(%ROOT)/mk/appsdos.mk
-
-$(p)append$(e): append.asm append.inc cmdline.inc useful.inc
-
-$(p)cmdline$(e): cmdline.asm append.inc cmdline.inc useful.inc
-
-$(p)int2f$(e): int2f.asm append.inc cmdline.inc useful.inc
-
-$(p)int21$(e): int21.asm append.inc useful.inc

DOS/CMD/assign/makefile

@@ -1,14 +1,13 @@
 #
-# A Makefile for ASSIGN
+# A Makefile for APPEND
 # (c) osFree project,
 # author, date
 #
 
 PROJ      = assign
 TRGT      = $(PROJ).com
-DESC      = Assign
-srcfiles  = $(p)asgn_tsr$(e) $(p)assign$(e)
+DESC      = Binary comparison of files
+srcfiles  = $(p)assign$(e)
 COM       = 1
 
 !include $(%ROOT)/mk/appsdos.mk
-

DOS/CMD/assign/makefile-old

@@ -1,87 +1,87 @@
-##!dmake -f
-
-# main goal of this Makefile:
-# ASSIGN
-
-# source in the Free-Dos initialization 
-.INCLUDE .FIRST .IGNORE : "fd_init.mk" "../fd_init.mk" "../../fd_init.mk"
-
-#
-#Project related settings
-#
-.IF $(_COMPTYPE) == MC
-PRG = assign.com
-.ELSE
-PRG = assign.exe
-.ENDIF
-SRC = assign.c
-OBJ = assign.obj
-HDR = asgn_asc.c yerror.h
-MYCFLAGS = # TEST=YES
-MSGLIB !:= msg.lib
-MSGDCL !:= yerror.h
-LDLIBS = $(MSGLIB) $(FDLIB)\$(_MODEL)_$(LNG).lib $(FDLIB)\Suppl_$(_MODEL).lib
-
-#
-#First target
-#
-all : $(CFG) $(PRG)	# copy library into Free-Dos library dir
-
-.INIT : $(CFG) tags refs errlist # Will make the utilizing files
-
-#
-#C initialization file
-#
-.IF $(CFG)
-# Compiler configuration file, for Borland C only
-# options: no Windows, no RTTI, use pre-compiled headers, no floating point
-
-CONFIGURATION = -W-	\
--X-	\
--H	\
--I.;$(INCDIR)	\
--L.;$(LIBDIR)	\
--H=assign.csm	\
--f-	\
--ff-	\
--m$(_MODEL)
-
-.IF $(_COMPILER) != BC31
-CONFIGURATION += -RT-
-.ENDIF
-
-$(CFG) : $(MAKEFILE:s/-f//)
-	Cat $(mktmp $(CONFIGURATION:t"\n")\n) >$@
-
-.ENDIF
-
-
-$(PRG) .SWAP : $(MSGLIB) $(OBJ) asgn_asc.c
-.IF $(_COMPTYPE) == MC
-	$(LD) $(LDCOMFLAG) $(LDFLAGS) $(MCDIR)\Pc86rl_t @$(mktmp $(OBJ:t" ") \n), $@, NUL,@$(mktmp $(LDLIBS:t" ") $(MCDIR)\Mclib\n)
-.ELSE
-	$(CC) -e$@ @$(mktmp $(OBJ:t"\n") $(LDLIBS:t"\n")\n)
-.ENDIF
-
-asgn_tsr.com : asgn_tsr.obj
-	$(LD) $(LDCOMFLAG) $< , $@;
-
-asgn_asc.c : asgn_tsr.com
-	$(FDBIN)\Bin2c module $< >$@
-
-#MAKEDEP START
-assign.obj : assign.c \
-	asgn_asc.c \
-	yerror.h
-#MAKEDEP STOP
-
-ci :: $(shell dir /b *.1 *.1g)
-
-clean :: 
-	$(RM) /s asgn_tsr.obj asgn_tsr.com asgn_tsr.map assign.com assign.exe
-
-clobber :: 
-	$(RM) /s asgn_asc.c
-
-# source in the Free-Dos standard targets 
-.INCLUDE .FIRST .IGNORE : fd_exit.mk ../fd_exit.mk ../../fd_exit.mk
+##!dmake -f
+
+# main goal of this Makefile:
+# ASSIGN
+
+# source in the Free-Dos initialization 
+.INCLUDE .FIRST .IGNORE : "fd_init.mk" "../fd_init.mk" "../../fd_init.mk"
+
+#
+#Project related settings
+#
+.IF $(_COMPTYPE) == MC
+PRG = assign.com
+.ELSE
+PRG = assign.exe
+.ENDIF
+SRC = assign.c
+OBJ = assign.obj
+HDR = asgn_asc.c yerror.h
+MYCFLAGS = # TEST=YES
+MSGLIB !:= msg.lib
+MSGDCL !:= yerror.h
+LDLIBS = $(MSGLIB) $(FDLIB)\$(_MODEL)_$(LNG).lib $(FDLIB)\Suppl_$(_MODEL).lib
+
+#
+#First target
+#
+all : $(CFG) $(PRG)	# copy library into Free-Dos library dir
+
+.INIT : $(CFG) tags refs errlist # Will make the utilizing files
+
+#
+#C initialization file
+#
+.IF $(CFG)
+# Compiler configuration file, for Borland C only
+# options: no Windows, no RTTI, use pre-compiled headers, no floating point
+
+CONFIGURATION = -W-	\
+-X-	\
+-H	\
+-I.;$(INCDIR)	\
+-L.;$(LIBDIR)	\
+-H=assign.csm	\
+-f-	\
+-ff-	\
+-m$(_MODEL)
+
+.IF $(_COMPILER) != BC31
+CONFIGURATION += -RT-
+.ENDIF
+
+$(CFG) : $(MAKEFILE:s/-f//)
+	Cat $(mktmp $(CONFIGURATION:t"\n")\n) >$@
+
+.ENDIF
+
+
+$(PRG) .SWAP : $(MSGLIB) $(OBJ) asgn_asc.c
+.IF $(_COMPTYPE) == MC
+	$(LD) $(LDCOMFLAG) $(LDFLAGS) $(MCDIR)\Pc86rl_t @$(mktmp $(OBJ:t" ") \n), $@, NUL,@$(mktmp $(LDLIBS:t" ") $(MCDIR)\Mclib\n)
+.ELSE
+	$(CC) -e$@ @$(mktmp $(OBJ:t"\n") $(LDLIBS:t"\n")\n)
+.ENDIF
+
+asgn_tsr.com : asgn_tsr.obj
+	$(LD) $(LDCOMFLAG) $< , $@;
+
+asgn_asc.c : asgn_tsr.com
+	$(FDBIN)\Bin2c module $< >$@
+
+#MAKEDEP START
+assign.obj : assign.c \
+	asgn_asc.c \
+	yerror.h
+#MAKEDEP STOP
+
+ci :: $(shell dir /b *.1 *.1g)
+
+clean :: 
+	$(RM) /s asgn_tsr.obj asgn_tsr.com asgn_tsr.map assign.com assign.exe
+
+clobber :: 
+	$(RM) /s asgn_asc.c
+
+# source in the Free-Dos standard targets 
+.INCLUDE .FIRST .IGNORE : fd_exit.mk ../fd_exit.mk ../../fd_exit.mk

DOS/CMD/attrib/doc/attrib/history.txt

@@ -0,0 +1,136 @@
+Abbreviations:
+plb - Phil Brutsche (the original author)
+ber - Brian Reifsnyder (new maintainer as of 2001)
+dal - David Lindauer (added subdirectory support)
+avb - Arkady Belousov, <ark@mos.ru>
+
+1998/02/12 (plb), version 0.1
+ + Initial version.
+
+1998/02/13 (plb)
+ + Started documentation.
+ * Fixed bug in display_attribs where if there were no files found, the
+   program exited regardless of any remaining file specifications in the
+   argument list.
+
+1998/02/18 (plb), version 0.2
+ + Finished documentation.
+ + Changed calls to _dos_setfileattr and _dos_getfileattr to use the
+   internal function setfileattr. This function was created by me for use
+   in this program; It will be submitted to the maintainer of the FreeDOS
+   C Library shortly.
+
+1998/02/22 (plb)
+ + Added MS undocumented function: `attrib ,` will unset all file
+   attributes.
+
+1998/02/24 (plb), version 0.3
+ + Added ability to change attributes on directories.
+
+1998/03/08 (plb), version 0.4
+ * Rewrote to be able to use file lists (ie `attrib @filename` or
+   `attrib @-`) per a suggestion from Charles Dye <raster@highfiber.com>.
+
+1998/03/16 (plb), version 0.5
+ * Updated these friggin' comments :-).
+ + Added a command-line parameter (`/?` in case yer interested. `-?` works
+   too.) to display online help.
+
+1998/07/19 (plb), version 0.60
+ Fixed bugs:
+ * If files in another directory are specified, or are on another drive,
+   it will set the attributes for the appropriately names file in the
+   current directory.
+ * If only a drive is specified (ie `attrib d:`) it will assume `*.*` was
+   meant.
+
+1998/07/21 (plb)
+ Fixed bugs:
+ + In 4DOS attrib and MS-DOS attrib, if you give some attributes but no
+   file names it will give all files and directories in the current
+   directory those attributes. (eg `attrib +r` would set all the files
+   in the current directory as read-only). This attrib didn't do that.
+
+1998/08/29 (plb)
+ Changed behavior:
+ + As per a suggestion from Charles Dye <raster@highfiber.com>, specifying
+   only a directory on the command line will display the attributes for
+   that directory.
+
+1998/08/30 (plb)
+ Changed behavior:
+ * As per a suggestion from Charles Dye <raster@highfiber.com>, it now
+   ignores the directory entries `..` and `.`.
+
+1998/09/02 (plb), version 0.63
+
+1998/09/04 (plb), version 0.63a
+ * When I released 0.63, I forgot to change the variable attrib_version
+   from "0.60" to "0.63". Oops! Fixed now.
+
+1998/09/26 (plb), version 0.64
+ + Fixed a problem where ATTRIB didn't play nicely with FreeDOS.
+
+2000/08/15 (plb), version 1.0
+ There appears that no major new bugs have been reported. I'm releasing
+ this as 1.0 and crossing my fingers...
+
+2001/07/25 (ber), version 1.10
+ Minor changes:
+ * Changed the appearance of the online help information.
+ * Cleaned up and re-ordered source code.
+ + Executable is now a packed with Apack 0.99b, written by Jorgen Ibsen.
+   Greetings to Jorgen Ibsen!
+
+2001/08/07, version 1.20
+ + Added subdir support. (dal)
+ * Re-structured source code. (ber)
+
+2002/08/01 (avb), version 2.0
+ Bugfixes:
+ * two characters targets was ignored: has_filespec wasn't assigned 1 when
+   argument have two characters but not begins from '+' nor '-'.
+ * target with trailing backslash or extension without name now handled
+   correctly.
+ * last line in file-list without CRLF now handled correctly.
+ * [version 0.2] setfileattr() call intr(), which not sets `errno' and
+   thus perror() reflects old (or zero) error code. Instead replacing
+   intr() by intdosx(), setfileattr() replaced back to _dos_setfileattr().
+ * [version 0.3] now comma clear all attributes if no attribute options
+   and for all files if no other targets, else comma will be ignored (as
+   in MS ATTRIB). As previously comma inside arguments will not be parsed
+   (unlike MS ATTRIB, where comma inside argument also splits argument).
+ - [version 0.64?] removed check for FreeDOS bug, which long ago fixed;
+   with this check directory attributes in FreeDOS will not be affected.
+ - [version 1.20] perror() inside set_file_attribs was not removed; this
+   causes extraneous error message for each subdirectory, where required
+   targets not found.
+ - [version 1.20] xsplit() count as extension all after rightmost dot,
+   even if file name itself not contains dot; this causes wrong parsing
+   and buffer overrun.
+ + [version 1.21] with checking old FreeDOS bug was removed FA_DIREC
+   attribute clearing. FA_DIREC attribute clearing returned.
+
+ Changes and additions:
+ + added batch file and configuration file for compilation.
+ + source cleaned and optimized; from executable removed superfluous code.
+ - "Version" and "Copyright" reverted back to "VeRsIoN" and "CoPyRiGhT",
+   but later deleted.
+ * literals replaced by names (PATHLEN) and expressions (sizeof(line)).
+ + added `D' marker for directories.
+ * directories now skipped when target contains wildcards.
+ + added option "/D" to include directories into search by wildcards.
+ * "@" prefix replaced by "/@" option.
+ + new command line parsing: comma before arguments is removed (but clears
+   all attributes if no other attribute options); added support for options
+   combinations ("/s/d", "+r/d") and clusters ("/sd", "+rhs/sd/@"); wrong
+   attributes and options are diagnosed.
+ + added strupr() for lines from file-list.
+ + in lines from file-list removed enclosing spaces and quotes pair.
+ + ordered errorlevels returned for each event.
+
+ Questions:
+ - missed documenation, mentioned above.
+
+2003/07/01 (avb), version 2.1
+ * slightly improved help screen.