[GNUnet-SVN] r18823 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2011-12-25 22:36:28 +0100 (Sun, 25 Dec 2011)
New Revision: 18823

Modified:
   gnunet/src/fs/fs_uri.c
Log:
-also break at some other tokens

Modified: gnunet/src/fs/fs_uri.c
===================================================================
--- gnunet/src/fs/fs_uri.c      2011-12-25 21:36:17 UTC (rev 18822)
+++ gnunet/src/fs/fs_uri.c      2011-12-25 21:36:28 UTC (rev 18823)
@@ -1571,7 +1571,12 @@
 
 
 /**
- * Break the filename up by "_", " " and "." (any other separators?) to make
+ * Where to break up keywords
+ */
+#define TOKENS "_. /-!?#&address@hidden"\'\\;:"
+
+/**
+ * Break the filename up by TOKENS to make
  * keywords.
  *
  * @param s string to break down.
@@ -1592,7 +1597,7 @@
   int seps = 0;
 
   ss = GNUNET_strdup (s);
-  for (p = strtok (ss, "_. "); p != NULL; p = strtok (NULL, "_, "))
+  for (p = strtok (ss, TOKENS); p != NULL; p = strtok (NULL, TOKENS))
   {
     if (NULL != array)
     {
@@ -1609,6 +1614,7 @@
   GNUNET_free (ss);
   return seps;
 }
+#undef TOKENS
 
 
 /**