[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30188 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r30188 - gnunet/src/util |
Date: |
Mon, 14 Oct 2013 22:33:13 +0200 |
Author: LRN
Date: 2013-10-14 22:33:13 +0200 (Mon, 14 Oct 2013)
New Revision: 30188
Modified:
gnunet/src/util/configuration.c
Log:
Don't put back separator that wasn't there originally
Modified: gnunet/src/util/configuration.c
===================================================================
--- gnunet/src/util/configuration.c 2013-10-14 15:31:04 UTC (rev 30187)
+++ gnunet/src/util/configuration.c 2013-10-14 20:33:13 UTC (rev 30188)
@@ -1054,6 +1054,8 @@
char *def;
char *end;
unsigned int lopen;
+ char erased_char;
+ char *erased_pos;
if (NULL == orig)
return NULL;
@@ -1072,6 +1074,8 @@
"Doesn't start with $ - not expanding\n");
return orig;
}
+ erased_char = 0;
+ erased_pos = NULL;
if ('{' == orig[1])
{
start = &orig[2];
@@ -1098,6 +1102,8 @@
break;
}
}
+ erased_char = *end;
+ erased_pos = end;
*end = '\0';
post = end + 1;
def = strchr (orig, ':');
@@ -1126,6 +1132,8 @@
}
else
{
+ erased_char = orig[i];
+ erased_pos = &orig[i];
orig[i] = '\0';
post = &orig[i + 1];
}
@@ -1155,7 +1163,8 @@
}
if (NULL == env)
{
- orig[strlen (orig)] = DIR_SEPARATOR;
+ if (erased_pos)
+ *erased_pos = erased_char;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Expanded to `%s' (returning orig)\n",
orig);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30188 - gnunet/src/util,
gnunet <=