From nobody Thu Jan 11 23:37:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TB1LN46fMz56ns3; Thu, 11 Jan 2024 23:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TB1LN2lXNz4VMZ; Thu, 11 Jan 2024 23:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705016268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cz6ZU2LBkkk7R3yi+wJEJ7rOLLAkOnvAj7LP47Ig9A4=; b=kAwgzi61dZtrT0kg8mW7xTxGzaks36Ea3qnkk/BexeGHN1BF4gjzukbm+vsqnfFcFUrI43 UVljhZjwEgg0KvuBYQlsZSQvw9/OMv7yWizYA6Lfud3ZjZr4L87SRT5MQlI9r4GOX+gOrK /KMDTkWKxw4DbH8Bfhq3qT4CRSBZGXaLZwDqN+mmhVkKkJBNW5TciphF8RdqAiMvIn9TFm 3xXYD52ZkQuy0z9I+T/QMq+ArCH/NAslZ/tukN+cVGviWDSYJPl8hpZcduCVOv5SSX6wnU KPD4xOcyuHVqAY4o665uSsr85d439KwnVZQ/y//r0j3NNRJ8In05t/0NH9PIYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705016268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cz6ZU2LBkkk7R3yi+wJEJ7rOLLAkOnvAj7LP47Ig9A4=; b=JagnuD0MLopCh4Nl6O8/9rty87P7JW4yKVG4EUI8hQ0ISrVjos/KDfJwYBUODG+yejKXsO Or3eOy285HLhLCUO06lRU4vhmZCT8gkKbdAtYCWrlWXt1fucnCPo+uR7d20RaVV8rn6BuH bEGRUOsM4elo0fmWup6cwf6cumYn26InuKbS2rDIZRfSMfhy9N4IJE4scYWq5mNQw9qf9a 2i7zm//X6I49p4Ipmh+7dDVfzxKLbzR7C4CC6pmyorm8ySum+KSVfc/9cY7V0o17lpJMB/ M5t7CnHeznd4c1KfQMPn1UQNDZmaofiGew3SRIjHUePC23fjp8Sqh2IFeUKuHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705016268; a=rsa-sha256; cv=none; b=pcPORQDotb9Sbl5nhyCU+ZtkXGhcX57lwbS8xriGeR/Vamrw2Yq7GKWnX22SvrfgE1jAsD cw4IWltyvpam+IvgyVyzhvLaol51Rb1pjLPjPXqajxAtGfJSRyii9uVXwOwTADovl3BGdO qkhr2bJiQ7F71UkUpsd/GylEm7tk5he+MdL2/kPr2zyw9k0guz0aBK/7q4K27VmgLfKwGJ +uW7/u+Jqa3Cv3sMtOn9BeOcn+oxbqqNxWE+/j5SmQe5KRf6wc2t37MaWCFYAXasPJzTPg +zd/wsxOJQbP33YPrJPJh5XmWppz+vmPL8HDNPHs3tsMrWPFuIHEaB8MShjpSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TB1LN1Y80zfP2; Thu, 11 Jan 2024 23:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40BNbmnH037686; Thu, 11 Jan 2024 23:37:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BNbmG1037683; Thu, 11 Jan 2024 23:37:48 GMT (envelope-from git) Date: Thu, 11 Jan 2024 23:37:48 GMT Message-Id: <202401112337.40BNbmG1037683@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: d06a00963b7f - main - find: add SIGINFO handler List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d06a00963b7f724b6fdd7d7cdcbed57c534196a9 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=d06a00963b7f724b6fdd7d7cdcbed57c534196a9 commit d06a00963b7f724b6fdd7d7cdcbed57c534196a9 Author: Goran Mekić AuthorDate: 2024-01-11 22:35:25 +0000 Commit: Alan Somers CommitDate: 2024-01-11 23:37:14 +0000 find: add SIGINFO handler Print number of files processed and path currently being processed on SIGINFO. Reviewed by: des, asomers Sponsored by: Axcient MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43380 --- usr.bin/find/extern.h | 1 + usr.bin/find/find.c | 9 +++++++++ usr.bin/find/main.c | 10 ++++++++++ 3 files changed, 20 insertions(+) diff --git a/usr.bin/find/extern.h b/usr.bin/find/extern.h index c84ca8953e50..a1bd5e6d16a5 100644 --- a/usr.bin/find/extern.h +++ b/usr.bin/find/extern.h @@ -121,3 +121,4 @@ extern int exitstatus; extern time_t now; extern int dotfd; extern FTS *tree; +extern volatile sig_atomic_t showinfo; diff --git a/usr.bin/find/find.c b/usr.bin/find/find.c index 54b4fdd679e4..aec04536071a 100644 --- a/usr.bin/find/find.c +++ b/usr.bin/find/find.c @@ -167,6 +167,7 @@ find_execute(PLAN *plan, char *paths[]) { FTSENT *entry; PLAN *p; + size_t counter = 0; int e; tree = fts_open(paths, ftsoptions, (issort ? find_compare : NULL)); @@ -208,6 +209,14 @@ find_execute(PLAN *plan, char *paths[]) continue; #endif /* FTS_W */ } + + if (showinfo) { + fprintf(stderr, "Scanning: %s/%s\n", entry->fts_path, entry->fts_name); + fprintf(stderr, "Scanned: %lu\n\n", counter); + showinfo = 0; + } + ++counter; + #define BADCH " \t\n\\'\"" if (isxargs && strpbrk(entry->fts_path, BADCH)) { (void)fflush(stdout); diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c index 746bd91d80b7..0738da4071c8 100644 --- a/usr.bin/find/main.c +++ b/usr.bin/find/main.c @@ -59,8 +59,10 @@ int isxargs; /* don't permit xargs delimiting chars */ int mindepth = -1, maxdepth = -1; /* minimum and maximum depth */ int regexp_flags = REG_BASIC; /* use the "basic" regexp by default*/ int exitstatus; +volatile sig_atomic_t showinfo = 0; static void usage(void) __dead2; +static void siginfo_handler(int sig __unused); int main(int argc, char *argv[]) @@ -72,6 +74,8 @@ main(int argc, char *argv[]) (void)time(&now); /* initialize the time-of-day */ + (void)signal(SIGINFO, siginfo_handler); + p = start = argv; Hflag = Lflag = 0; ftsoptions = FTS_NOSTAT | FTS_PHYSICAL; @@ -152,3 +156,9 @@ usage(void) " find [-H | -L | -P] [-EXdsx] -f path [path ...] [expression]"); exit(1); } + +static void +siginfo_handler(int sig __unused) +{ + showinfo = 1; +}