r12474@Kushana: nickm | 2007-03-06 16:10:05 -0500

 We have a PATH_SEPARATOR macro.  How about we use it?


svn:r9782

1 files changed, 6 insertions, 6 deletions

diff --git a/src/or/config.c b/src/or/config.c
index 47a2786b6..658e26aca 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -907,7 +907,8 @@ options_act(or_options_t *old_options)
   if (running_tor) {
     len = strlen(options->DataDirectory)+32;
     fn = tor_malloc(len);
-    tor_snprintf(fn, len, "%s/cached-status", options->DataDirectory);
+    tor_snprintf(fn, len, "%s"PATH_SEPARATOR"cached-status",
+                 options->DataDirectory);
     if (check_private_dir(fn, CPD_CREATE) != 0) {
       log_err(LD_CONFIG,
               "Couldn't access/create private data directory \"%s\"", fn);
@@ -3516,11 +3517,10 @@ normalize_data_directory(or_options_t *options)
       * want. */
      log_warn(LD_CONFIG,
               "Default DataDirectory is \"~/.tor\".  This expands to "
-              "\"%s\", which is probably not what you want.  Using \"%s/tor\" "
-              "instead", fn, LOCALSTATEDIR);
+              "\"%s\", which is probably not what you want.  Using "
+              "\"%s"PATH_SEPARATOR"tor\" instead", fn, LOCALSTATEDIR);
      tor_free(fn);
-     fn = tor_strdup(LOCALSTATEDIR"/tor");
-
+     fn = tor_strdup(LOCALSTATEDIR PATH_SEPARATOR "tor");
    }
    tor_free(options->DataDirectory);
    options->DataDirectory = fn;
@@ -3933,7 +3933,7 @@ get_or_state_fname(void)
   or_options_t *options = get_options();
   size_t len = strlen(options->DataDirectory) + 16;
   fname = tor_malloc(len);
-  tor_snprintf(fname, len, "%s/state", options->DataDirectory);
+  tor_snprintf(fname, len, "%s"PATH_SEPARATOR"state", options->DataDirectory);
   return fname;
 }