alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mu-flags: ensure shortcut is single-char

Browse Source 
And add some tests. Use std::popcount.
This commit is contained in:
Dirk-Jan C. Binnema
2026-07-23 11:15:08 +03:00
committed by Seth Ladygo
parent 2750fe9f27
commit 0658f18062
2 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/message/mu-flags.hh
View File

@ -1,5 +1,5 @@
/*
** Copyright (C) 2022-2025 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
** Copyright (C) 2022-2026 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
**
** This program is free software; you can redistribute it and/or modify it
** under the terms of the GNU General Public License as published by the
@ -21,6 +21,7 @@
#define MU_FLAGS_HH__
#include <algorithm>
#include <bit>
#include <string_view>
#include <array>
#include <utils/mu-utils.hh>
@ -183,10 +184,10 @@ flag_info(Flags flag)
constexpr auto upper = static_cast<unsigned>(Flags::_final_);
const auto val = static_cast<unsigned>(flag);
if (__builtin_popcount(val) != 1 || val >= upper)
if (std::popcount(val) != 1 || val >= upper)
return Nothing;
return AllMessageFlagInfos[static_cast<unsigned>(__builtin_ctz(val))];
return AllMessageFlagInfos[static_cast<unsigned>(std::countr_zero(val))];
}
/**
@ -223,7 +224,12 @@ flag_info(std::string_view name)
if (info.name == name)
return info;
return flag_info(name.at(0));
/* only a single character can be a shortcut; otherwise e.g. "zombie"
* would resolve to the 'z' flag */
if (name.size() == 1)
return flag_info(name.at(0));
return Nothing;
}
/**