diff options
author | fluxgen <fluxgen> | 2002-01-06 11:00:39 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-01-06 11:00:39 (GMT) |
commit | 06f75f5ca40793ec28debd59dca6b059a96118fb (patch) | |
tree | 2b6537812db1e0fd36ab274005fb687c60153302 | |
parent | a1d1742f2dbec6c31a16f6c5d82411898fa1a59f (diff) | |
download | fluxbox_lack-06f75f5ca40793ec28debd59dca6b059a96118fb.zip fluxbox_lack-06f75f5ca40793ec28debd59dca6b059a96118fb.tar.bz2 |
added StringUtil.cc/.hh
-rw-r--r-- | src/StringUtil.cc | 55 | ||||
-rw-r--r-- | src/StringUtil.hh | 30 |
2 files changed, 85 insertions, 0 deletions
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 @@ | |||
1 | // StringUtil.cc for fluxbox | ||
2 | // Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) | ||
3 | // | ||
4 | // Permission is hereby granted, free of charge, to any person obtaining a | ||
5 | // copy of this software and associated documentation files (the "Software"), | ||
6 | // to deal in the Software without restriction, including without limitation | ||
7 | // the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
8 | // and/or sell copies of the Software, and to permit persons to whom the | ||
9 | // Software is furnished to do so, subject to the following conditions: | ||
10 | // | ||
11 | // The above copyright notice and this permission notice shall be included in | ||
12 | // all copies or substantial portions of the Software. | ||
13 | // | ||
14 | // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
15 | // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
16 | // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
17 | // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
18 | // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
20 | // DEALINGS IN THE SOFTWARE. | ||
21 | |||
22 | #include "StringUtil.hh" | ||
23 | |||
24 | #include <stdlib.h> | ||
25 | #include <string.h> | ||
26 | #include <stdio.h> | ||
27 | |||
28 | //------- strdup ------------------------ | ||
29 | //TODO: comment this | ||
30 | //---------------------------------------- | ||
31 | char *StringUtil::strdup(const char *s) { | ||
32 | int l = strlen(s) + 1; | ||
33 | char *n = new char[l]; | ||
34 | strncpy(n, s, l); | ||
35 | return n; | ||
36 | } | ||
37 | |||
38 | |||
39 | //------------- expandFilename ---------------------- | ||
40 | // if ~ then expand it to home of user | ||
41 | // returns expanded filename | ||
42 | // (note: the function creates new memory for the string) | ||
43 | //--------------------------------------------------- | ||
44 | char *StringUtil::expandFilename(const char *filename) { | ||
45 | |||
46 | char retval[strlen(filename)+strlen(getenv("HOME"))+2]; | ||
47 | retval[0]=0; //mark end | ||
48 | if (filename[0]=='~') { | ||
49 | strcat(retval, getenv("HOME")); | ||
50 | strcat(retval, &filename[1]); | ||
51 | } else | ||
52 | return StringUtil::strdup(filename); //return unmodified value | ||
53 | |||
54 | return StringUtil::strdup(retval); //return modified value | ||
55 | } | ||
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 @@ | |||
1 | // StringUtil.hh for fluxbox | ||
2 | // Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) | ||
3 | // | ||
4 | // Permission is hereby granted, free of charge, to any person obtaining a | ||
5 | // copy of this software and associated documentation files (the "Software"), | ||
6 | // to deal in the Software without restriction, including without limitation | ||
7 | // the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
8 | // and/or sell copies of the Software, and to permit persons to whom the | ||
9 | // Software is furnished to do so, subject to the following conditions: | ||
10 | // | ||
11 | // The above copyright notice and this permission notice shall be included in | ||
12 | // all copies or substantial portions of the Software. | ||
13 | // | ||
14 | // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
15 | // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
16 | // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
17 | // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
18 | // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
20 | // DEALINGS IN THE SOFTWARE. | ||
21 | #ifndef _STRINGUTIL_HH_ | ||
22 | #define _STRINGUTIL_HH_ | ||
23 | |||
24 | struct StringUtil | ||
25 | { | ||
26 | static char *strdup(const char *); | ||
27 | static char *expandFilename(const char *filename); | ||
28 | }; | ||
29 | |||
30 | #endif // _STRINGUTIL_HH_ | ||