From 1d2358df656b725e8fea0f84850d9240d74ce5bd Mon Sep 17 00:00:00 2001
From: Victor Balada Diaz <victor@dragonflybsd.org>
Date: Sat, 11 Nov 2006 12:11:25 +0000
Subject: [PATCH] Add support for SIGINFO.

Submitted-By: Trevor Kendall <trevorjkendall@gmail.com>
---
 bin/rm/rm.1 | 13 ++++++++++++-
 bin/rm/rm.c | 30 ++++++++++++++++++++++++++----
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index adc1b52404..d92db75a0b 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
 .\" $FreeBSD: src/bin/rm/rm.1,v 1.19.2.6 2003/02/04 22:10:42 trhodes Exp $
-.\" $DragonFly: src/bin/rm/rm.1,v 1.8 2006/11/05 02:26:39 dillon Exp $
+.\" $DragonFly: src/bin/rm/rm.1,v 1.9 2006/11/11 12:11:25 victor Exp $
 .\"
 .Dd January 28, 1999
 .Dt RM 1
@@ -151,6 +151,17 @@ removed.
 If an error occurs,
 .Nm
 exits with a value >0.
+.Pp
+If
+.Nm
+receives a
+.Dv SIGINFO
+(see the
+.Cm status
+argument for
+.Xr stty 1 )
+signal, the current file or directory being removed
+will be written to standard error.
 .Sh NOTE
 The
 .Nm
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index 6c9535836f..00850e1984 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1990, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)rm.c	8.5 (Berkeley) 4/18/94
  * $FreeBSD: src/bin/rm/rm.c,v 1.29.2.5 2002/07/12 07:25:48 tjr Exp $
- * $DragonFly: src/bin/rm/rm.c,v 1.17 2006/11/05 02:26:39 dillon Exp $
+ * $DragonFly: src/bin/rm/rm.c,v 1.18 2006/11/11 12:11:25 victor Exp $
  */
 
 #include <sys/stat.h>
@@ -45,15 +45,17 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <fts.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
 #include <unistd.h>
 
-int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok;
-int rflag, Iflag;
-uid_t uid;
+static int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok;
+static int rflag, Iflag;
+static uid_t uid;
+volatile sig_atomic_t info;
 
 static int	check(const char *, const char *, struct stat *);
 static int	check2(char **);
@@ -61,6 +63,7 @@ static void	checkdot(char **);
 static void	rm_file(char **);
 static int	rm_overwrite(const char *, struct stat *);
 static void	rm_tree(char **);
+static void 	siginfo(int);
 static void	usage(void);
 
 /*
@@ -150,6 +153,8 @@ main(int argc, char *argv[])
 
 	checkdot(argv);
 	uid = geteuid();
+	
+	signal(SIGINFO, siginfo);
 
 	if (*argv) {
 		stdin_ok = isatty(STDIN_FILENO);
@@ -247,12 +252,18 @@ rm_tree(char **argv)
 				continue;
 		}
 
+		if (info) {
+			info = 0;
+			fprintf(stderr, "Currently removing: %s\n", p->fts_path);
+		}
+
 		rval = 0;
 		if (!uid &&
 		    (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) &&
 		    !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE)))
 			rval = chflags(p->fts_accpath,
 				       p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE));
+
 		if (rval == 0) {
 			/*
 			 * If we can't read or search the directory, may still be
@@ -323,6 +334,11 @@ rm_file(char **argv)
 	 * to remove a directory is an error, so must always stat the file.
 	 */
 	while ((f = *argv++) != NULL) {
+		if (info) {
+			info = 0;
+			fprintf(stderr, "Currently removing: %s\n", f);
+		}
+
 		/* Assume if can't stat the file, can't unlink it. */
 		if (lstat(f, &sb)) {
 			if (Wflag) {
@@ -611,3 +627,9 @@ usage(void)
 	    "       unlink file");
 	exit(EX_USAGE);
 }
+
+static void
+siginfo(int notused __unused)
+{
+	info = 1;
+}
-- 
2.41.0