From 19cb0bdb60a8421c5efd8d5d80d136c7aaae7085 Mon Sep 17 00:00:00 2001
From: Stefan Rueger <stefan.rueger@urclocks.com>
Date: Fri, 26 Jun 2026 13:34:01 +0100
Subject: [PATCH] Provide pgm_is() function

---
 src/libavrdude.h |  1 +
 src/strutil.c    | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/src/libavrdude.h b/src/libavrdude.h
index 277787b2..d037ffe1 100644
--- a/src/libavrdude.h
+++ b/src/libavrdude.h
@@ -1750,6 +1750,7 @@ extern "C" {
   char *str_quote_bash(const char *s);
   const char *str_ccsharg(const char *str);
   char *str_vectorname(const Avrintel *up, int vn);
+  int pgmid_is(const char *str);
 
   int led_set(const PROGRAMMER *pgm, int led);
   int led_clr(const PROGRAMMER *pgm, int led);
diff --git a/src/strutil.c b/src/strutil.c
index 9068993c..62d2993e 100644
--- a/src/strutil.c
+++ b/src/strutil.c
@@ -1693,3 +1693,29 @@ char *str_vectorname(const Avrintel *up, int vn) {
 
   return ret;
 }
+
+// Return whether pgmid matches str or any of str's programming mode variants
+int pgmid_is(const char *str) {
+  const char *sufx[] = {"_tpi", "_isp", "_hvsp", "_pp", "_dw", "_jtag", "_pdi", "_updi", "_avr32"};
+
+  if(!str_starts(pgmid, str))   // Pgmid doesn't start with str: no match
+    return 0;
+
+  // Now that pgmid starts with str, is its remainder one of known suffixes?
+  const char *pend = pgmid + strlen(str);
+  if(!*pend)                    // Yes (empty suffix): str is same as pgmid
+    return 1;
+
+  // Lex arduino_as_isp (misleading suffix): arduino_as is not the programmer
+  if(str_eq(str, "arduino_as") && str_eq(pgmid, "arduino_as_isp"))
+    return 0;
+
+  // Lex jtag2isp/stk500pp: if the programmer name ends in a digit also skip the _
+  int digitend = pend > pgmid && pend[-1] >= '0' && pend[-1] <= '9';
+
+  for(size_t i = 0; i < sizeof sufx/sizeof*sufx; i++)
+    if(str_eq(pend, sufx[i]) || (digitend && str_eq(pend, sufx[i] + 1)))
+      return 1;
+
+  return 0;
+}