Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/util-common.c39
-rw-r--r--src/common/util-common.h2
2 files changed, 41 insertions, 0 deletions
diff --git a/src/common/util-common.c b/src/common/util-common.c
index e8341688..542dcfde 100644
--- a/src/common/util-common.c
+++ b/src/common/util-common.c
@@ -17,6 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <ctype.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
@@ -127,6 +128,44 @@ char *safe_fgets(char *s, int size, FILE *stream)
return ret;
}
+/* Trim whitespace and newlines from a string
+ */
+size_t strtrim(char *str)
+{
+ char *end, *pch = str;
+
+ if(str == NULL || *str == '\0') {
+ /* string is empty, so we're done. */
+ return 0;
+ }
+
+ while(isspace((unsigned char)*pch)) {
+ pch++;
+ }
+ if(pch != str) {
+ size_t len = strlen(pch);
+ if(len) {
+ memmove(str, pch, len + 1);
+ pch = str;
+ } else {
+ *str = '\0';
+ }
+ }
+
+ /* check if there wasn't anything but whitespace in the string. */
+ if(*str == '\0') {
+ return 0;
+ }
+
+ end = (str + strlen(str) - 1);
+ while(isspace((unsigned char)*end)) {
+ end--;
+ }
+ *++end = '\0';
+
+ return end - pch;
+}
+
#ifndef HAVE_STRNLEN
/* A quick and dirty implementation derived from glibc */
/** Determines the length of a fixed-size string.
diff --git a/src/common/util-common.h b/src/common/util-common.h
index a2093bef..af2ebdaa 100644
--- a/src/common/util-common.h
+++ b/src/common/util-common.h
@@ -30,6 +30,8 @@ int llstat(char *path, struct stat *buf);
char *safe_fgets(char *s, int size, FILE *stream);
+size_t strtrim(char *str);
+
#ifndef HAVE_STRNDUP
char *strndup(const char *s, size_t n);
#endif