[GNUnet-SVN] r11791 - in gnunet/src: fs util

[gnunet]

Author: grothoff
Date: 2010-06-17 21:31:42 +0200 (Thu, 17 Jun 2010)
New Revision: 11791

Modified:
   gnunet/src/fs/fs_uri.c
   gnunet/src/util/getopt_helpers.c
Log:
fix

Modified: gnunet/src/fs/fs_uri.c
===================================================================
--- gnunet/src/fs/fs_uri.c      2010-06-17 16:59:24 UTC (rev 11790)
+++ gnunet/src/fs/fs_uri.c      2010-06-17 19:31:42 UTC (rev 11791)
@@ -1032,6 +1032,12 @@
   const char *kp;
   char **kl;
 
+  if ( (u1 == NULL) && (u2 == NULL) )
+    return NULL;
+  if (u1 == NULL)
+    return GNUNET_FS_uri_dup (u2);
+  if (u2 == NULL)
+    return GNUNET_FS_uri_dup (u1);
   if ( (u1->type != ksk) ||
        (u2->type != ksk) )
     {

Modified: gnunet/src/util/getopt_helpers.c
===================================================================
--- gnunet/src/util/getopt_helpers.c    2010-06-17 16:59:24 UTC (rev 11790)
+++ gnunet/src/util/getopt_helpers.c    2010-06-17 19:31:42 UTC (rev 11791)
@@ -98,7 +98,7 @@
         {
           for (j = p + 78 - slen; j > p; j--)
             {
-              if (isspace (trans[j]))
+              if (isspace ( (unsigned char) trans[j]))
                 {
                   scp = GNUNET_malloc (j - p + 1);
                   memcpy (scp, &trans[p], j - p);