all repos — fluxbox @ dafe9f9fb6c2c71711b172b1e73c2da0664a2bd3

custom fork of the fluxbox windowmanager

fixed basename
fluxgen fluxgen
commit

dafe9f9fb6c2c71711b172b1e73c2da0664a2bd3

parent

062768a077b03a67b049b3c2d98341b00d5445dd

2 files changed, 13 insertions(+), 2 deletions(-)

jump to
M src/FbTk/StringUtil.ccsrc/FbTk/StringUtil.cc

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: StringUtil.cc,v 1.5 2003/08/22 19:38:00 fluxgen Exp $ +// $Id: StringUtil.cc,v 1.6 2003/08/22 22:11:19 fluxgen Exp $ #include "StringUtil.hh"

@@ -169,6 +169,13 @@ std::string toUpper(const std::string &conv) {

std::string ret = conv; std::transform(ret.begin(), ret.end(), ret.begin(), toupper); return ret; +} + +std::string basename(const std::string &filename) { + std::string::size_type first_pos = filename.find_last_of("/"); + if (first_pos != std::string::npos) + return filename.substr(first_pos + 1); + return filename; } }; // end namespace StringUtil
M src/FbTk/StringUtil.hhsrc/FbTk/StringUtil.hh

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -//$Id: StringUtil.hh,v 1.4 2003/08/22 19:37:07 fluxgen Exp $ +//$Id: StringUtil.hh,v 1.5 2003/08/22 22:11:19 fluxgen Exp $ #ifndef FBTK_STRINGUTIL_HH #define FBTK_STRINGUTIL_HH

@@ -49,6 +49,10 @@ /// @return lower case letters of conv

std::string toLower(const std::string &conv); /// @return upper case letters of conv std::string toUpper(const std::string &conv); +#ifdef basename +#undef basename +#endif // basename +std::string basename(const std::string &basename); /// Breaks a string into tokens template <typename Container>