adding new GNUNET_HELPER_ API for communication with (SUID) helper binaries via stdin...

[oweals/gnunet.git] / src / util / strings.c

diff --git a/src/util/strings.c b/src/util/strings.c
index dc4037a1ffbcd4af6ae7026f5633ab3cc3142bcb..bd0a8eb527732b67bed288a45e0e0f63f0430821 100644 (file)
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -236,11 +236,15 @@ GNUNET_STRINGS_fancy_size_to_bytes (const char *fancy_size,
       ret += last;
       last = 0;
       if (1 != sscanf (tok, "%llu", &last))
+      {
+        GNUNET_free (in);
         return GNUNET_SYSERR;   /* expected number */
+      }
     }
   }
   ret += last;
   *size = ret;
+  GNUNET_free (in);
   return GNUNET_OK;
 }
 
@@ -311,25 +315,28 @@ GNUNET_STRINGS_fancy_time_to_relative (const char *fancy_size,
       ret += last;
       last = 0;
       if (1 != sscanf (tok, "%llu", &last))
+      {
+        GNUNET_free (in);
         return GNUNET_SYSERR;   /* expected number */
+      }
     }
   }
   ret += last;
   rtime->rel_value = (uint64_t) ret;
+  GNUNET_free (in);
   return GNUNET_OK;
 }
 
-
 /**
  * Convert the len characters long character sequence
- * given in input that is in the given charset
- * to UTF-8.
+ * given in input that is in the given input charset
+ * to a string in given output charset.
  * @return the converted string (0-terminated),
  *  if conversion fails, a copy of the orignal
  *  string is returned.
  */
 char *
-GNUNET_STRINGS_to_utf8 (const char *input, size_t len, const char *charset)
+GNUNET_STRINGS_conv (const char *input, size_t len, const char *input_charset, const char *output_charset)
 {
   char *ret;
 
@@ -340,12 +347,12 @@ GNUNET_STRINGS_to_utf8 (const char *input, size_t len, const char *charset)
   char *itmp;
   iconv_t cd;
 
-  cd = iconv_open ("UTF-8", charset);
+  cd = iconv_open (output_charset, input_charset);
   if (cd == (iconv_t) - 1)
   {
     LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "iconv_open");
-    LOG (GNUNET_ERROR_TYPE_WARNING, _("Character set requested was `%s'\n"),
-         charset);
+    LOG (GNUNET_ERROR_TYPE_WARNING, _("Character sets requested were `%s'->`%s'\n"),
+         input_charset, output_charset);
     ret = GNUNET_malloc (len + 1);
     memcpy (ret, input, len);
     ret[len] = '\0';
@@ -387,6 +394,36 @@ GNUNET_STRINGS_to_utf8 (const char *input, size_t len, const char *charset)
 }
 
 
+/**
+ * Convert the len characters long character sequence
+ * given in input that is in the given charset
+ * to UTF-8.
+ * @return the converted string (0-terminated),
+ *  if conversion fails, a copy of the orignal
+ *  string is returned.
+ */
+char *
+GNUNET_STRINGS_to_utf8 (const char *input, size_t len, const char *charset)
+{
+  return GNUNET_STRINGS_conv (input, len, charset, "UTF-8");
+}
+
+/**
+ * Convert the len bytes-long UTF-8 string
+ * given in input to the given charset.
+
+ * @return the converted string (0-terminated),
+ *  if conversion fails, a copy of the orignal
+ *  string is returned.
+ */
+char *
+GNUNET_STRINGS_from_utf8 (const char *input, size_t len, const char *charset)
+{
+  return GNUNET_STRINGS_conv (input, len, "UTF-8", charset);
+}
+
+
+
 /**
  * Complete filename (a la shell) from abbrevition.
  * @param fil the name of the file, may contain ~/ or