Fix shadowsocks#1059

seaxp · Jan 10, 2017 · ecf1fcc · ecf1fcc
1 parent 1397bf1
commit ecf1fcc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/manager.c b/src/manager.c
@@ -319,7 +319,7 @@ create_and_bind(const char *host, const char *port, int protocol)
 {
     struct addrinfo hints;
     struct addrinfo *result, *rp, *ipv4v6bindall;
-    int s, listen_sock, is_port_reuse;
+    int s, listen_sock = -1, is_port_reuse = 0;
 
     memset(&hints, 0, sizeof(struct addrinfo));
     hints.ai_family   = AF_UNSPEC;                  /* Return IPv4 and IPv6 choices */
@@ -356,8 +356,6 @@ create_and_bind(const char *host, const char *port, int protocol)
         }
     }
 
-    is_port_reuse = 0;
-
     for (/*rp = result*/; rp != NULL; rp = rp->ai_next) {
         listen_sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
         if (listen_sock == -1) {

diff --git a/src/plugin.c b/src/plugin.c
@@ -101,8 +101,13 @@ start_plugin(const char *plugin,
     env = cork_env_clone_current();
     const char *path = cork_env_get(env, "PATH");
     if (path != NULL) {
+#ifdef __GLIBC__
         char *cwd = get_current_dir_name();
         if (cwd) {
+#else
+        char cwd[PATH_MAX];
+        if (!getcwd(cwd, PATH_MAX)) {
+#endif
             size_t path_len = strlen(path) + strlen(cwd) + 2;
             new_path = ss_malloc(path_len);
             snprintf(new_path, path_len, "%s:%s", cwd, path);