rm: don't suppress error messages if -f is used

Unlike every other rm(1) and contrary to the POSIX standard,
libcmd's rm suppresses all error messages (such as 'permission
denied') upon failure to unlink(2) or rmdir(2) if the -f/--force
option is used. This commit makes rm print its error messages
(except for 'not found') regardless of -f (state->force).

This commit also changes the error message 'directory not removed'
to 'directory not empty' which is more like GNU and BSD rm.

Author: McDutchie

NEWS

@@ -2,6 +2,11 @@ This documents significant changes in the 1.0 branch of ksh 93u+m.
 For full details, see the git log at: https://github.com/ksh93/ksh/tree/1.0
 Uppercase BUG_* IDs are shell bug IDs as used by the Modernish shell library.
 
+2025-09-30:
+
+- The rm path-bound built-in command from libcmd no longer suppresses error
+  messages when the -f/--force option is used.
+
 2025-06-14:
 
 - Fixed a bug occurring on systems with posix_spawn(3), spawnve(2), and

src/lib/libcmd/rm.c

@@ -2,7 +2,7 @@
 *                                                                      *
 *               This software is part of the ast package               *
 *          Copyright (c) 1992-2013 AT&T Intellectual Property          *
-*          Copyright (c) 2020-2024 Contributors to ksh 93u+m           *
+*          Copyright (c) 2020-2025 Contributors to ksh 93u+m           *
 *                      and is licensed under the                       *
 *                 Eclipse Public License, Version 2.0                  *
 *                                                                      *
@@ -24,7 +24,7 @@
  */
 
 static const char usage[] =
-"[-?\n@(#)$Id: rm (ksh 93u+m) 2022-08-30 $\n]"
+"[-?\n@(#)$Id: rm (ksh 93u+m) 2025-09-30 $\n]"
 "[--catalog?" ERROR_CATALOG "]"
 "[+NAME?rm - remove files]"
 "[+DESCRIPTION?\brm\b removes the named \afile\a arguments. By default it"
@@ -123,10 +123,8 @@ rm(State_t* state, FTSENT* ent)
 			}
 			error_info.errors++;
 		}
-		else if (!state->force)
-			error(2, "%s: cannot %s directory", ent->fts_path, (ent->fts_info & FTS_NR) ? "read" : "search");
 		else
-			error_info.errors++;
+			error(2, "%s: cannot %s directory", ent->fts_path, (ent->fts_info & FTS_NR) ? "read" : "search");
 		fts_set(NULL, ent, FTS_SKIP);
 		nonempty(ent);
 		break;
@@ -136,10 +134,7 @@ rm(State_t* state, FTSENT* ent)
 		if (path[0] == '.' && (!path[1] || path[1] == '.' && !path[2]) && (ent->fts_level > 0 || path[1]))
 		{
 			fts_set(NULL, ent, FTS_SKIP);
-			if (!state->force)
-				error(2, "%s: cannot remove", ent->fts_path);
-			else
-				error_info.errors++;
+			error(2, "%s: cannot remove", ent->fts_path);
 			break;
 		}
 		if (!state->recursive)
@@ -224,25 +219,17 @@ rm(State_t* state, FTSENT* ent)
 						/* FALLTHROUGH */
 					default:
 						nonempty(ent);
-						if (!state->force)
-							error(ERROR_SYSTEM|2, "%s: directory not removed", ent->fts_path);
-						else
-							error_info.errors++;
+						error(ERROR_SYSTEM|2, "%s: directory not removed", ent->fts_path);
 						break;
 					}
 			}
-			else if (!state->force)
-				error(2, "%s: cannot remove", ent->fts_path);
 			else
-				error_info.errors++;
+				error(2, "%s: cannot remove", ent->fts_path);
 		}
 		else
 		{
 			nonempty(ent);
-			if (!state->force)
-				error(2, "%s: directory not removed", ent->fts_path);
-			else
-				error_info.errors++;
+			error(2, "%s: directory not empty", ent->fts_path);
 		}
 		break;
 	default:
@@ -308,10 +295,7 @@ rm(State_t* state, FTSENT* ent)
 			case ENOENT:
 				break;
 			default:
-				if (!state->force || state->interactive)
-					error(ERROR_SYSTEM|2, "%s: not removed", ent->fts_path);
-				else
-					error_info.errors++;
+				error(ERROR_SYSTEM|2, "%s: not removed", ent->fts_path);
 				break;
 			}
 		}