Commit 3f683aad authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

When making a tempdir for windows unit tests, avoid an extra backslash 

The extra \ is harmless, but mildly unpleasant.

Fixes 12392; bugfix on 0.2.2.25-alpha where we started using
GetTempDir().  Based on a patch by Gisle Vanem.
parent 4da4c4c6

src/test/test.c

+9 −2
Original line number Diff line number Diff line
@@ -106,11 +106,18 @@ setup_directory(void) 
  {

    char buf[MAX_PATH];

    const char *tmp = buf;

    const char *extra_backslash = "";

    /* If this fails, we're probably screwed anyway */

    if (!GetTempPathA(sizeof(buf),buf))

      tmp = "c:\\windows\\temp";

      tmp = "c:\\windows\\temp\\";

    if (strcmpend(tmp, "\\")) {

      /* According to MSDN, it should be impossible for GetTempPath to give us

       * an answer that doesn't end with \.  But let's make sure. */

      extra_backslash = "\\";

    }

    tor_snprintf(temp_dir, sizeof(temp_dir),

                 "%s\\tor_test_%d_%s", tmp, (int)getpid(), rnd32);

                 "%s%stor_test_%d_%s", tmp, extra_backslash,

                 (int)getpid(), rnd32);

    r = mkdir(temp_dir);

  }

#else