From 06f75f5ca40793ec28debd59dca6b059a96118fb Mon Sep 17 00:00:00 2001 From: fluxgen Date: Sun, 6 Jan 2002 11:00:39 +0000 Subject: added StringUtil.cc/.hh --- src/StringUtil.cc | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/StringUtil.hh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 src/StringUtil.cc create mode 100644 src/StringUtil.hh diff --git a/src/StringUtil.cc b/src/StringUtil.cc new file mode 100644 index 0000000..dabc02e --- /dev/null +++ b/src/StringUtil.cc @@ -0,0 +1,55 @@ +// StringUtil.cc for fluxbox +// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// 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. + +#include "StringUtil.hh" + +#include +#include +#include + +//------- strdup ------------------------ +//TODO: comment this +//---------------------------------------- +char *StringUtil::strdup(const char *s) { + int l = strlen(s) + 1; + char *n = new char[l]; + strncpy(n, s, l); + return n; +} + + +//------------- expandFilename ---------------------- +// if ~ then expand it to home of user +// returns expanded filename +// (note: the function creates new memory for the string) +//--------------------------------------------------- +char *StringUtil::expandFilename(const char *filename) { + + char retval[strlen(filename)+strlen(getenv("HOME"))+2]; + retval[0]=0; //mark end + if (filename[0]=='~') { + strcat(retval, getenv("HOME")); + strcat(retval, &filename[1]); + } else + return StringUtil::strdup(filename); //return unmodified value + + return StringUtil::strdup(retval); //return modified value +} diff --git a/src/StringUtil.hh b/src/StringUtil.hh new file mode 100644 index 0000000..e48b4dd --- /dev/null +++ b/src/StringUtil.hh @@ -0,0 +1,30 @@ +// StringUtil.hh for fluxbox +// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// 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. +#ifndef _STRINGUTIL_HH_ +#define _STRINGUTIL_HH_ + +struct StringUtil +{ + static char *strdup(const char *); + static char *expandFilename(const char *filename); +}; + +#endif // _STRINGUTIL_HH_ -- cgit v0.11.2