[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37080 - gnunet/src/arm
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37080 - gnunet/src/arm |
Date: |
Tue, 26 Apr 2016 01:32:22 +0200 |
Author: dold
Date: 2016-04-26 01:32:22 +0200 (Tue, 26 Apr 2016)
New Revision: 37080
Modified:
gnunet/src/arm/gnunet-service-arm.c
Log:
Use dollar expansion helper instead of custom code
Modified: gnunet/src/arm/gnunet-service-arm.c
===================================================================
--- gnunet/src/arm/gnunet-service-arm.c 2016-04-25 23:22:22 UTC (rev 37079)
+++ gnunet/src/arm/gnunet-service-arm.c 2016-04-25 23:32:22 UTC (rev 37080)
@@ -415,13 +415,8 @@
{
char *loprefix;
char *options;
- char *optpos;
- char *optend;
- const char *next;
int use_debug;
int is_simple_service;
- char b;
- char *val;
struct ServiceListeningInfo *sli;
SOCKTYPE *lsocks;
unsigned int ls;
@@ -456,42 +451,21 @@
GNUNET_CONFIGURATION_get_value_string (cfg, sl->name, "OPTIONS",
&options))
{
+ char *new_options;
+ char *optpos;
options = GNUNET_strdup (final_option);
- if (NULL == strstr (options, "%"))
- {
- /* replace '{}' with service name */
- while (NULL != (optpos = strstr (options, "{}")))
- {
- char *new_options;
- /* terminate string at opening parenthesis */
- *optpos = 0;
- GNUNET_asprintf (&new_options, "%s%s%s", options, sl->name,
optpos + 2);
- GNUNET_free (options);
- options = new_options;
- }
- /* replace '$PATH' with value associated with "PATH" */
- while (NULL != (optpos = strstr (options, "$")))
- {
- optend = optpos + 1;
- while (isupper ((unsigned char) *optend))
- optend++;
- b = *optend;
- if ('\0' == b)
- next = "";
- else
- next = optend + 1;
- *optend = '\0';
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (cfg, "PATHS",
- optpos + 1, &val))
- val = GNUNET_strdup ("");
- *optpos = '\0';
- GNUNET_asprintf (&optpos, "%s%s%c%s", options, val, b, next);
- GNUNET_free (options);
- GNUNET_free (val);
- options = optpos;
- }
- }
+ /* replace '{}' with service name */
+ while (NULL != (optpos = strstr (options, "{}")))
+ {
+ /* terminate string at opening parenthesis */
+ *optpos = 0;
+ GNUNET_asprintf (&new_options, "%s%s%s", options, sl->name, optpos +
2);
+ GNUNET_free (options);
+ options = new_options;
+ }
+ new_options = GNUNET_CONFIGURATION_expand_dollar (cfg, options);
+ GNUNET_free (options);
+ options = new_options;
}
use_debug = GNUNET_CONFIGURATION_get_value_yesno (cfg, sl->name, "DEBUG");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37080 - gnunet/src/arm,
gnunet <=