From c7af43a62497fb3e10c8de9a5bb8cc8113efb99c Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Wed, 1 Oct 2008 03:41:33 +0000 Subject: Now NodeFamily and MyFamily config options allow spaces in identity fingerprints, so it's easier to paste them in. Suggested by Lucky Green. svn:r17021 --- src/common/container.c | 22 +++++++++++++++------- src/common/container.h | 1 + 2 files changed, 16 insertions(+), 7 deletions(-) (limited to 'src/common') diff --git a/src/common/container.c b/src/common/container.c index 8021bd19c3..060615d1c3 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -324,12 +324,17 @@ smartlist_insert(smartlist_t *sl, int idx, void *val) /** * Split a string str along all occurrences of sep, - * adding the split strings, in order, to sl. If - * flags&SPLIT_SKIP_SPACE is true, remove initial and - * trailing space from each entry. If - * flags&SPLIT_IGNORE_BLANK is true, remove any entries of - * length 0. If max>0, divide the string into no more than max - * pieces. If sep is NULL, split on any sequence of horizontal space. + * adding the split strings, in order, to sl. + * + * If flags&SPLIT_SKIP_SPACE is true, remove initial and + * trailing space from each entry. + * If flags&SPLIT_IGNORE_BLANK is true, remove any entries + * of length 0. + * If flags&SPLIT_STRIP_SPACE is true, strip spaces from each + * split string. + * + * If max>0, divide the string into no more than max pieces. If + * sep is NULL, split on any sequence of horizontal space. */ int smartlist_split_string(smartlist_t *sl, const char *str, const char *sep, @@ -375,7 +380,10 @@ smartlist_split_string(smartlist_t *sl, const char *str, const char *sep, --end; } if (end != cp || !(flags&SPLIT_IGNORE_BLANK)) { - smartlist_add(sl, tor_strndup(cp, end-cp)); + char *string = tor_strndup(cp, end-cp); + if (flags&SPLIT_STRIP_SPACE) + tor_strstrip(string, " "); + smartlist_add(sl, string); ++n; } if (!next) diff --git a/src/common/container.h b/src/common/container.h index 0a790ea4ac..b4ca358289 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -121,6 +121,7 @@ void smartlist_pqueue_assert_ok(smartlist_t *sl, #define SPLIT_SKIP_SPACE 0x01 #define SPLIT_IGNORE_BLANK 0x02 +#define SPLIT_STRIP_SPACE 0x04 int smartlist_split_string(smartlist_t *sl, const char *str, const char *sep, int flags, int max); char *smartlist_join_strings(smartlist_t *sl, const char *join, int terminate, -- cgit v1.2.3-54-g00ecf