summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util.c48
-rw-r--r--util.h5
2 files changed, 52 insertions, 1 deletions
diff --git a/util.c b/util.c
index 4774610265..56f53eafd6 100644
--- a/util.c
+++ b/util.c
@@ -490,3 +490,51 @@ int reset_all_signal_handlers(void) {
return 0;
}
+
+char *strstrip(char *s) {
+ char *e, *l = NULL;
+
+ /* Drops trailing whitespace. Modifies the string in
+ * place. Returns pointer to first non-space character */
+
+ s += strspn(s, WHITESPACE);
+
+ for (e = s; *e; e++)
+ if (!strchr(WHITESPACE, *e))
+ l = e;
+
+ if (l)
+ *(l+1) = 0;
+ else
+ *s = 0;
+
+ return s;
+
+}
+
+char *file_in_same_dir(const char *path, const char *filename) {
+ char *e, *r;
+ size_t k;
+
+ assert(path);
+ assert(filename);
+
+ /* This removes the last component of path and appends
+ * filename, unless the latter is absolute anyway or the
+ * former isn't */
+
+ if (path_is_absolute(filename))
+ return strdup(filename);
+
+ if (!(e = strrchr(path, '/')))
+ return strdup(filename);
+
+ k = strlen(filename);
+ if (!(r = new(char, e-path+1+k+1)))
+ return NULL;
+
+ memcpy(r, path, e-path+1);
+ memcpy(r+(e-path)+1, filename, k+1);
+
+ return r;
+}
diff --git a/util.h b/util.h
index a969060331..9aceaef47f 100644
--- a/util.h
+++ b/util.h
@@ -19,7 +19,7 @@ typedef uint64_t usec_t;
#define NSEC_PER_USEC 1000ULL
/* What is interpreted as whitespace? */
-#define WHITESPACE " \t\n"
+#define WHITESPACE " \t\n\r"
usec_t now(clockid_t clock);
@@ -101,4 +101,7 @@ char *path_make_absolute(const char *p, const char *prefix);
int reset_all_signal_handlers(void);
+char *strstrip(char *s);
+char *file_in_same_dir(const char *path, const char *filename);
+
#endif