From 4b493db99a2aaa9f5a8f7a9a885898903c144b41 Mon Sep 17 00:00:00 2001 From: Robert Pengelly Date: Wed, 26 Mar 2025 15:52:20 +0000 Subject: [PATCH] Add DOS support --- Makefile.wat | 18 ++++ lib.c | 68 +++++++------ lib.h | 4 +- report.c | 4 +- rm.c | 263 ++++++++++++++++++++++++++++++++++++++++++--------- 5 files changed, 280 insertions(+), 77 deletions(-) create mode 100644 Makefile.wat diff --git a/Makefile.wat b/Makefile.wat new file mode 100644 index 0000000..714b2ea --- /dev/null +++ b/Makefile.wat @@ -0,0 +1,18 @@ +#****************************************************************************** +# @file Makefile.wat +#****************************************************************************** +SRCDIR ?= $(CURDIR) +VPATH := $(SRCDIR) + +SRC := lib.c report.c rm.c + +all: rm.exe + +rm.exe: $(SRC) + + wcl -fe=$@ $^ + +clean: + + for /r %%f in (*.obj) do ( if exist %%f ( del /q %%f ) ) + if exist rm.exe ( del /q rm.exe ) diff --git a/lib.c b/lib.c index 284ad74..6a276f6 100644 --- a/lib.c +++ b/lib.c @@ -52,6 +52,15 @@ char *xstrdup (const char *__p) { } +char *xstrndup (const char *__s, unsigned long __len) { + + char *p = xmalloc (__len + 1); + + memcpy (p, __s, __len); + return p; + +} + void parse_args (int argc, char **argv, int optind) { const char *r; @@ -68,45 +77,50 @@ void parse_args (int argc, char **argv, int optind) { check_options: if (r[0] == '-') { - ++r; - } - - while (*r != '\0') { - char ch = *r++; - - if (ch == 'f') { - - state->fflag++; - continue; - - } - - if (ch == 'i') { - - state->iflag++; - continue; + r++; - } - - if (ch == 'r') { + while (*r != '\0') { - state->rflag++; - continue; + char ch = *r++; + + if (ch == 'f') { + + state->fflag++; + continue; + + } + + if (ch == 'i') { + + state->iflag++; + continue; + + } + + if (ch == 'r') { + + state->rflag++; + continue; + + } + + report_at (program_name, 0, REPORT_ERROR, "invalid option -- '%c'", ch); + + print_usage (); + exit (EXIT_FAILURE); } - - report_at (program_name, 0, REPORT_ERROR, "invalid option -- '%c'", ch); - - print_usage (); - exit (EXIT_FAILURE); } if ((r = argv[optind])) { if (*r == '-') { + + optind++; goto check_options; + } } diff --git a/lib.h b/lib.h index ec8cb8b..b91d6b6 100644 --- a/lib.h +++ b/lib.h @@ -4,9 +4,11 @@ #ifndef _LIB_H #define _LIB_H -char *xstrdup (const char *__p); void parse_args (int argc, char **argv, int optind); +char *xstrdup (const char *__p); +char *xstrndup (const char *__s, unsigned long __len); + void *xmalloc (unsigned long __size); void *xrealloc (void *__ptr, unsigned long __size); diff --git a/report.c b/report.c index fb010ce..2fcee5b 100644 --- a/report.c +++ b/report.c @@ -25,7 +25,7 @@ static void reset_console_color (void) { SetConsoleTextAttribute (hStdError, OriginalConsoleColor); OriginalConsoleColor = -1; -#else +#elif defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__) fprintf (stderr, "\033[0m"); @@ -55,7 +55,7 @@ static void set_console_color (int color) { wColor = (OriginalConsoleColor & 0xF0) + (color & 0xF); SetConsoleTextAttribute (hStdError, wColor); -#else +#elif defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__) fprintf (stderr, "\033[%dm", color); diff --git a/rm.c b/rm.c index 70b9b34..c568f5c 100644 --- a/rm.c +++ b/rm.c @@ -13,7 +13,8 @@ struct rm_state *state = 0; const char *program_name = 0; -#if defined (_WIN32) +#if defined (_WIN32) || defined (__WIN32__) +# include # include static BOOL IsDirectory (LPCTSTR szPath) { @@ -25,21 +26,9 @@ static BOOL IsDirectory (LPCTSTR szPath) { static void rm (const char *path) { - const char *p = path; - char *p2; - + char *p2 = xstrdup (path); unsigned long len; - if (isalpha ((int) p[0]) && p[1] == ':') { - p += 2; - } - - while (*p == '/') { - p++; - } - - p2 = xstrdup (path); - if (IsDirectory (p2)) { char *subpath, *filename; @@ -47,9 +36,11 @@ static void rm (const char *path) { HANDLE hFind; WIN32_FIND_DATA FindFileData; - if (!state->rflag && !state->fflag) { + if (!state->rflag) { - report_at (program_name, 0, REPORT_ERROR, "cannot remove directoies without -r"); + if (!state->fflag) { + report_at (program_name, 0, REPORT_ERROR, "cannot remove directoies without -r"); + } free (p2); return; @@ -73,62 +64,240 @@ static void rm (const char *path) { if ((hFind = FindFirstFile (subpath, &FindFileData)) == INVALID_HANDLE_VALUE) { free (subpath); - return; + + do { + + filename = FindFileData.cFileName; + + if (filename[0] == '.' && (filename[1] == '\0' || (filename[1] == '.' && filename[2] == '\0'))) { + continue; + } + + len = strlen (path); + + if (path[len - 1] == '/') { + + len += (strlen (filename) + 1); + + if (!(subpath = malloc (len))) { + + report_at (program_name, 0, REPORT_ERROR, "failed to allocate memory for '%s'", filename); + continue; + + } + + sprintf (subpath, "%s%s", path, filename); + + } else { + + len += (1 + strlen (filename) + 1); + + if (!(subpath = malloc (len))) { + + report_at (program_name, 0, REPORT_ERROR, "failed to allocate memory for '%s'", filename); + continue; + + } + + sprintf (subpath, "%s/%s", path, filename); + + } + + rm (subpath); + free (subpath); + + } while (FindNextFile (hFind, &FindFileData) != 0); + + } + FindClose (hFind); + rmdir (path); + + } else { + + if (!state->fflag && remove (p2)) { + report_at (program_name, 0, REPORT_ERROR, "unable to remove %s", p2); + } + + } + + free (p2); + +} +#elif defined (__WATCOMC__) +# include + +static int IsDirectory (char *path) { + + struct SREGS sr = { 0 }; + union REGS r = { 0 }; + + char *temp = xstrdup (path); + unsigned len = strlen (temp); + + if (len > 3) { + + while (temp[len - 1] == '\\') { + temp[--len] = '\0'; } + + } + + r.w.dx = FP_OFF (temp); + sr.ds = FP_SEG (temp); + + r.w.ax = 0x4300; + int86x (0x21, &r, &r, &sr); + + free (temp); + return (!(r.w.cflag & 1) && (r.w.cx & 0x10)); + +} + +static int FindFirstFile (char *path) { + + struct SREGS sr = { 0 }; + union REGS r = { 0 }; + + r.w.dx = FP_OFF (path); + sr.ds = FP_SEG (path); + + r.w.ax = 0x4e00; + int86x (0x21, &r, &r, &sr); + + return !(r.w.cflag & 1); + +} + +static int FindNextFile (void) { + + union REGS r = { 0 }; + + r.w.ax = 0x4f00; + int86 (0x21, &r, &r); + + return !(r.w.cflag & 1); + +} + +static void rm (const char *path) { + + char *p2 = xstrdup (path); + unsigned long len; + + if (IsDirectory (p2)) { + + char *subpath, *filename; + int i; - free (subpath); + struct SREGS sr = { 0 }; + union REGS r = { 0 }; - do { + char dta_addr[64] = { 0 }; - filename = FindFileData.cFileName; - - if (filename[0] == '.' && (filename[1] == '\0' || (filename[1] == '.' && filename[2] == '\0'))) { - continue; + if (!state->rflag) { + + if (!state->fflag) { + report_at (program_name, 0, REPORT_ERROR, "cannot remove directoies without -r"); } - len = strlen (path); + free (p2); + return; + + } + + r.w.dx = FP_OFF (dta_addr); + sr.ds = FP_SEG (dta_addr); + + r.w.ax = 0x1a00; + int86x (0x21, &r, &r, &sr); + + len = strlen (p2); + + if (p2[len - 1] == '\\') { + + subpath = xmalloc (len + 5); + sprintf (subpath, "%s*.*", p2); + + } else { + + subpath = xmalloc (len + 6); + sprintf (subpath, "%s\\*.*", p2); + + } + + if (FindFirstFile (subpath)) { + + free (subpath); - if (path[len - 1] == '/') { + do { - len += (strlen (filename) + 1); + filename = xstrndup (dta_addr + 30, 12); - if (!(subpath = malloc (len))) { - - report_at (program_name, 0, REPORT_ERROR, "failed to allocate memory for '%s'", filename); + if (filename[0] == '.' && (filename[1] == '\0' || (filename[1] == '.' && filename[2] == '\0'))) { continue; + } + + for (i = 11; i >= 0; i--) { + + if (filename[i] == ' ') { + filename[i] = '\0'; + } else { + + if (isupper ((int) filename[i])) { + filename[i] = tolower ((int) filename[i]); + } + + } } - sprintf (subpath, "%s%s", path, filename); - - } else { - - len += (1 + strlen (filename) + 1); + len = strlen (path); - if (!(subpath = malloc (len))) { + if (path[len - 1] == '\\') { - report_at (program_name, 0, REPORT_ERROR, "failed to allocate memory for '%s'", filename); - continue; + len += (strlen (filename) + 1); + + if (!(subpath = malloc (len))) { + + report_at (program_name, 0, REPORT_ERROR, "failed to allocate memory for '%s'", filename); + continue; + + } + + sprintf (subpath, "%s%s", path, filename); + + } else { + + len += (1 + strlen (filename) + 1); + + if (!(subpath = malloc (len))) { + + report_at (program_name, 0, REPORT_ERROR, "failed to allocate memory for '%s'", filename); + continue; + + } + + sprintf (subpath, "%s\\%s", path, filename); } - sprintf (subpath, "%s/%s", path, filename); + rm (subpath); + free (subpath); - } - - rm (subpath); - free (subpath); + } while (FindNextFile ()); + + } - } while (FindNextFile (hFind, &FindFileData) != 0); + r.w.dx = FP_OFF (path); + sr.ds = FP_SEG (path); - FindClose (hFind); + r.w.ax = 0x3a00; + int86x (0x21, &r, &r, &sr); } else { - int ret = remove (p2); - - if (!state->fflag && ret) { + if (!state->fflag && remove (p2)) { report_at (program_name, 0, REPORT_ERROR, "unable to remove %s", p2); } -- 2.34.1