Preserve case in version number modifiers, fixes #13

Author: depressed-pho

NEWS.md

@@ -1,5 +1,11 @@
 # Release notes
 
+## 0.3.4 -- 2025-10-02
+
+* Fixed an issue where `pkgrrxx` didn't preserve case in version numbers,
+  leading to a failure while checking for updates when a package like
+  `osabi-NetBSD-11.0_BETA` was installed. Reported by @drixter [#13].
+
 ## 0.3.3 -- 2025-03-07
 
 * Fix an issue where `pkgchkxx -ab` crashes upon trying to install the

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.71])
-AC_INIT([pkgchkxx], [0.3.3], [pkgsrc-users@NetBSD.org])
+AC_INIT([pkgchkxx], [0.3.4], [pkgsrc-users@NetBSD.org])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([lib/pkgxx/pkgname.hxx])
 AC_CONFIG_HEADERS([lib/pkgxx/config.h])

lib/pkgxx/pkgname.cxx

@@ -9,13 +9,13 @@ namespace {
     using namespace pkgxx;
 
     std::vector<pkgversion::modifier> const modifiers = {
-        pkgversion::modifier(pkgversion::modifier::kind::ALPHA, "alpha"),
-        pkgversion::modifier(pkgversion::modifier::kind::BETA , "beta"),
-        pkgversion::modifier(pkgversion::modifier::kind::RC   , "pre"),
-        pkgversion::modifier(pkgversion::modifier::kind::RC   , "rc"),
-        pkgversion::modifier(pkgversion::modifier::kind::DOT  , "pl"),
-        pkgversion::modifier(pkgversion::modifier::kind::DOT  , "_"),
-        pkgversion::modifier(pkgversion::modifier::kind::DOT  , ".")
+        pkgversion::modifier(pkgversion::modifier::kind_t::ALPHA, "alpha"),
+        pkgversion::modifier(pkgversion::modifier::kind_t::BETA , "beta"),
+        pkgversion::modifier(pkgversion::modifier::kind_t::RC   , "pre"),
+        pkgversion::modifier(pkgversion::modifier::kind_t::RC   , "rc"),
+        pkgversion::modifier(pkgversion::modifier::kind_t::DOT  , "pl"),
+        pkgversion::modifier(pkgversion::modifier::kind_t::DOT  , "_"),
+        pkgversion::modifier(pkgversion::modifier::kind_t::DOT  , ".")
     };
 }
 
@@ -38,8 +38,15 @@ namespace pkgxx {
                 bool found_mod = false;
                 for (auto const& mod: modifiers) {
                     if (ci_starts_with(it, str.end(), mod.string())) {
-                        _comps.push_back(mod);
-                        it += mod.string().size();
+                        // It's very important to construct a new modifier
+                        // object based on the original string, otherwise
+                        // its case will not be preserved (#13).
+                        auto const len = mod.string().size();
+                        _comps.emplace_back(
+                            modifier(
+                                mod.kind(),
+                                std::string(it, it + len)));
+                        it += len;
                         found_mod = true;
                         break;
                     }
@@ -58,7 +65,7 @@ namespace pkgxx {
                 break;
             }
             if (is_ascii_alpha(*it)) {
-                _comps.emplace_back(modifier(modifier::kind::DOT, ""s));
+                _comps.emplace_back(modifier(modifier::kind_t::DOT, ""s));
                 _comps.emplace_back(alpha(*it++));
                 continue;
             }

lib/pkgxx/pkgname.hxx

@@ -60,7 +60,7 @@ namespace pkgxx {
         /** A modifier is a specially-treated string occuring in a package version. */
         struct modifier {
             /// The kind of modifier.
-            enum class kind: int {
+            enum class kind_t: int {
                 ALPHA = -3,
                 BETA  = -2,
                 RC    = -1,
@@ -69,13 +69,13 @@ namespace pkgxx {
 
             /// Construct an instance of \ref modifier with its kind and
             /// its original string.
-            modifier(kind k, std::string const& str) noexcept
+            modifier(kind_t k, std::string const& str) noexcept
                 : _kind(k)
                 , _str(str) {}
 
             /// Construct an instance of \ref modifier with its kind and
             /// its original string.
-            modifier(kind k, std::string&& str) noexcept
+            modifier(kind_t k, std::string&& str) noexcept
                 : _kind(k)
                 , _str(str) {}
 
@@ -84,6 +84,12 @@ namespace pkgxx {
                 return static_cast<int>(_kind);
             }
 
+            /// Obtain the kind of the modifier.
+            kind_t
+            kind() const noexcept {
+                return _kind;
+            }
+
             /// Obtain the original string of a modifier.
             operator std::string const&() const noexcept {
                 return string();
@@ -104,7 +110,7 @@ namespace pkgxx {
         private:
             friend struct std::hash<modifier>;
 
-            kind _kind;
+            kind_t _kind;
             std::string _str;
         };