From: Masamichi Hosoda <trueroad@trueroad.jp>
Date: Sat, 11 Mar 2017 10:12:15 +0000 (+0900)
Subject: Issue 5077/2: Improve portability of get_working_directory()
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=9fd7a4d08b6414ce4b5b130316b688f36c6a6265;p=lilypond.git

Issue 5077/2: Improve portability of get_working_directory()

We used `getcwd()` with `PATH_MAX` to get the current directory.
However, `PATH_MAX` does not exist in environments such as GNU Hurd.
Debian developers avoided `PATH_MAX`
by using `get_current_dir_name()` instead of `getcwd()`.
It needed to protected with `#ifdef _GNU_SOURCE`
since `get_current_dir_name()` is glibc specific.
So `PATH_MAX` was still required in non-glibc environments.

There is a `getcwd()` extention that can avoid `PATH_MAX`
by setting the first argument to NULL.
The extension can be used in many environments, including glibc,
but POSIX does not recommend it in conforming applications.

This commit improves portability
by obtaining the current directory
with a method conforming to the standard.
---

diff --git a/flower/file-name.cc b/flower/file-name.cc
index e5dd6f6160..990e3d6d91 100644
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -77,16 +77,21 @@ dir_name (const string &file_name)
 string
 get_working_directory ()
 {
-#ifdef _GNU_SOURCE
-  char *cwd = get_current_dir_name();
-  string scwd(cwd);
-  free(cwd);
-  return scwd;
+#ifdef PATH_MAX
+  vector<char> cwd (PATH_MAX);
 #else
-  char cwd[PATH_MAX];
-  // getcwd returns NULL upon a failure, contents of cwd would be undefined!
-  return string (getcwd (cwd, PATH_MAX));
+  vector<char> cwd (1024);
 #endif
+  while (getcwd (cwd.data (), cwd.size ()) == NULL)
+    {
+      if (errno != ERANGE)
+        {
+          // getcwd () fails.
+          return "";
+        }
+      cwd.resize (cwd.size () * 2);
+    }
+  return string (cwd.data ());
 }
 
 /* Join components to full file_name. */