merge 8.0.4 changes into 8.1

2 files changed, 46 insertions, 40 deletions

diff --git a/win/mkd.bat b/win/mkd.bat
index 1d1365c..3c8989b 100644
--- a/win/mkd.bat
+++ b/win/mkd.bat
@@ -1,20 +1,21 @@
-@echo off

-rem RCS: @(#) $Id: mkd.bat,v 1.1.4.1 1998/09/30 02:19:26 stanton Exp $
-

-if exist %1 goto end

-

-if %OS% == Windows_NT goto winnt

-

-echo Add support for Win 95 please

-goto end

-

-goto success

-

-:winnt

-md %1

-if errorlevel 1 goto end

-

-:success

-echo created directory %1

-

-:end

+@echo off
+rem RCS: @(#) $Id: mkd.bat,v 1.1.4.2 1998/10/06 20:29:51 stanton Exp $
+
+if exist %1\tag.txt goto end
+
+if "%OS%" == "Windows_NT" goto winnt
+
+md %1
+if errorlevel 1 goto end
+
+goto success
+
+:winnt
+md %1
+if errorlevel 1 goto end
+
+:success
+echo TAG >%1\tag.txt
+echo created directory %1
+
+:end
diff --git a/win/rmd.bat b/win/rmd.bat
index 6490f83..458cbbe 100644
--- a/win/rmd.bat
+++ b/win/rmd.bat
@@ -1,20 +1,25 @@
-@echo off

-rem RCS: @(#) $Id: rmd.bat,v 1.1.4.1 1998/09/30 02:19:27 stanton Exp $
-

-if not exist %1 goto end

-

-if %OS% == Windows_NT goto winnt

-

-echo Add support for Win 95 please

-goto end

-

-goto success

-

-:winnt

-rmdir %1 /s /q

-if errorlevel 1 goto end

-

-:success

-echo deleted directory %1

-

-:end

+@echo off
+rem RCS: @(#) $Id: rmd.bat,v 1.1.4.2 1998/10/06 20:29:51 stanton Exp $
+
+if not exist %1\tag.txt goto end
+
+echo Removing directory %1
+
+if "%OS%" == "Windows_NT" goto winnt
+
+cd %1
+if errorlevel 1 goto end
+del *.*
+cd ..
+rmdir %1
+if errorlevel 1 goto end
+goto success
+
+:winnt
+rmdir %1 /s /q
+if errorlevel 1 goto end
+
+:success
+echo deleted directory %1
+
+:end