From: Sage Weil <sage@inktank.com>
Date: Wed, 24 Oct 2012 16:38:58 +0000 (-0700)
Subject: mds: fix #include for getcwd(), simplify
X-Git-Tag: v0.55~207
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=345bcac0d06d1a0d81fc1a30b00ff1e9fd9fbd46;p=ceph.git

mds: fix #include for getcwd(), simplify

Always use getcwd().. it's more portable.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index df9002e8d595..a18e3f6e9037 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -12,6 +12,8 @@
  * 
  */
 
+#include <unistd.h>
+
 #include "global/signal_handler.h"
 
 #include "include/types.h"
@@ -1580,19 +1582,9 @@ void MDS::respawn()
   }
   new_argv[orig_argc] = NULL;
 
-#if defined(__linux__)
-  char *dir = get_current_dir_name();
-  dout(1) << " cwd " << dir << dendl;
-  free(dir);
-#else
-  {
-#include <sys/param.h>
-    char buf[PATH_MAX];
-    
-    getcwd(buf, sizeof(buf));
-    dout(1) << " cwd " << buf << dendl;
-  }
-#endif
+  char buf[PATH_MAX];
+  getcwd(buf, sizeof(buf));
+  dout(1) << " cwd " << buf << dendl;
 
   unblock_all_signals(NULL);
   execv(orig_argv[0], new_argv);