Merge branch 'maint'

3 files changed, 163 insertions, 44 deletions

diff --git a/erts/emulator/sys/unix/erl_child_setup.c b/erts/emulator/sys/unix/erl_child_setup.c
index de61726e5b..6b9ddd8da4 100644
--- a/erts/emulator/sys/unix/erl_child_setup.c
+++ b/erts/emulator/sys/unix/erl_child_setup.c
@@ -75,7 +75,7 @@
 
 //#define HARD_DEBUG
 #ifdef HARD_DEBUG
-#define DEBUG_PRINT(fmt, ...) fprintf(stderr, fmt "\r\n", ##__VA_ARGS__)
+#define DEBUG_PRINT(fmt, ...) fprintf(stderr, "%d:" fmt "\r\n", getpid(), ##__VA_ARGS__)
 #else
 #define DEBUG_PRINT(fmt, ...)
 #endif
@@ -131,12 +131,13 @@ static int sigchld_pipe[2];
 static int
 start_new_child(int pipes[])
 {
+    int errln = -1;
     int size, res, i, pos = 0;
     char *buff, *o_buff;
 
-    char *cmd, *wd, **new_environ, **args = NULL;
+    char *cmd, *cwd, *wd, **new_environ, **args = NULL;
 
-    Sint cnt, flags;
+    Sint32 cnt, flags;
 
     /* only child executes here */
 
@@ -145,6 +146,7 @@ start_new_child(int pipes[])
     } while(res < 0 && (errno == EINTR || errno == ERRNO_BLOCK));
 
     if (res <= 0) {
+        errln = __LINE__;
         goto child_error;
     }
 
@@ -156,10 +158,12 @@ start_new_child(int pipes[])
         if ((res = read(pipes[0], buff + pos, size - pos)) < 0) {
             if (errno == ERRNO_BLOCK || errno == EINTR)
                 continue;
+            errln = __LINE__;
             goto child_error;
         }
         if (res == 0) {
             errno = EPIPE;
+            errln = __LINE__;
             goto child_error;
         }
         pos += res;
@@ -168,12 +172,16 @@ start_new_child(int pipes[])
     o_buff = buff;
 
     flags = get_int32(buff);
-    buff += sizeof(Sint32);
+    buff += sizeof(flags);
 
     DEBUG_PRINT("flags = %d", flags);
 
     cmd = buff;
     buff += strlen(buff) + 1;
+
+    cwd = buff;
+    buff += strlen(buff) + 1;
+
     if (*buff == '\0') {
         wd = NULL;
     } else {
@@ -185,10 +193,10 @@ start_new_child(int pipes[])
     DEBUG_PRINT("wd = %s", wd);
 
     cnt = get_int32(buff);
-    buff += sizeof(Sint32);
+    buff += sizeof(cnt);
     new_environ = malloc(sizeof(char*)*(cnt + 1));
 
-    DEBUG_PRINT("env_len = %ld", cnt);
+    DEBUG_PRINT("env_len = %d", cnt);
     for (i = 0; i < cnt; i++, buff++) {
         new_environ[i] = buff;
         while(*buff != '\0') buff++;
@@ -198,7 +206,7 @@ start_new_child(int pipes[])
     if (o_buff + size != buff) {
         /* This is a spawn executable call */
         cnt = get_int32(buff);
-        buff += sizeof(Sint32);
+        buff += sizeof(cnt);
         args = malloc(sizeof(char*)*(cnt + 1));
         for (i = 0; i < cnt; i++, buff++) {
             args[i] = buff;
@@ -209,7 +217,12 @@ start_new_child(int pipes[])
 
     if (o_buff + size != buff) {
         errno = EINVAL;
-        goto child_error;
+        errln = __LINE__;
+        fprintf(stderr,"erl_child_setup: failed with protocol "
+                "error %d on line %d", errno, errln);
+        /* we abort here as it is most likely a symptom of an
+           emulator/erl_child_setup bug */
+        abort();
     }
 
     DEBUG_PRINT("read ack");
@@ -221,12 +234,32 @@ start_new_child(int pipes[])
             ASSERT(res == sizeof(proto));
         }
     } while(res < 0 && (errno == EINTR || errno == ERRNO_BLOCK));
+
     if (res < 1) {
         errno = EPIPE;
+        errln = __LINE__;
         goto child_error;
     }
 
-    DEBUG_PRINT("Do that forking business: '%s'\n",cmd);
+    DEBUG_PRINT("Set cwd to: '%s'",cwd);
+
+    if (chdir(cwd) < 0) {
+        /* This is not good, it probably means that the cwd of
+           beam is invalid. We ignore it and try anyways as
+           the child might now need a cwd or the chdir below
+           could take us to a valid directory.
+        */
+    }
+
+    DEBUG_PRINT("Set wd to: '%s'",wd);
+
+    if (wd && chdir(wd) < 0) {
+        int err = errno;
+        fprintf(stderr,"spawn: Could not cd to %s\r\n", wd);
+        _exit(err);
+    }
+
+    DEBUG_PRINT("Do that forking business: '%s'",cmd);
 
     /* When the dup2'ing below is done, only
        fd's 0, 1, 2 and maybe 3, 4 should survive the
@@ -236,25 +269,34 @@ start_new_child(int pipes[])
     if (flags & FORKER_FLAG_USE_STDIO) {
         /* stdin for process */
         if (flags & FORKER_FLAG_DO_WRITE &&
-            dup2(pipes[0], 0) < 0)
+            dup2(pipes[0], 0) < 0) {
+            errln = __LINE__;
             goto child_error;
+        }
         /* stdout for process */
         if (flags & FORKER_FLAG_DO_READ &&
-            dup2(pipes[1], 1) < 0)
+            dup2(pipes[1], 1) < 0) {
+            errln = __LINE__;
             goto child_error;
+        }
     }
     else {	/* XXX will fail if pipes[0] == 4 (unlikely..) */
-        if (flags & FORKER_FLAG_DO_READ && dup2(pipes[1], 4) < 0)
+        if (flags & FORKER_FLAG_DO_READ && dup2(pipes[1], 4) < 0) {
+            errln = __LINE__;
             goto child_error;
-        if (flags & FORKER_FLAG_DO_WRITE && dup2(pipes[0], 3) < 0)
+        }
+        if (flags & FORKER_FLAG_DO_WRITE && dup2(pipes[0], 3) < 0) {
+            errln = __LINE__;
             goto child_error;
+        }
     }
 
-    if (dup2(pipes[2], 2) < 0)
-        goto child_error;
-
-    if (wd && chdir(wd) < 0)
+    /* we do the dup2 of stderr last so that errors
+       in child_error will be printed to stderr */
+    if (dup2(pipes[2], 2) < 0) {
+        errln = __LINE__;
         goto child_error;
+    }
 
 #if defined(USE_SETPGRP_NOARGS)		/* SysV */
     (void) setpgrp();
@@ -276,9 +318,14 @@ start_new_child(int pipes[])
     } else {
         execle(SHELL, "sh", "-c", cmd, (char *) NULL, new_environ);
     }
+
+    DEBUG_PRINT("exec error: %d",errno);
+    _exit(errno);
+
 child_error:
-    DEBUG_PRINT("exec error: %d\r\n",errno);
-    _exit(128 + errno);
+    fprintf(stderr,"erl_child_setup: failed with error %d on line %d\r\n",
+            errno, errln);
+    _exit(errno);
 }
 
 
@@ -469,7 +516,7 @@ main(int argc, char *argv[])
 
             proto.action = ErtsSysForkerProtoAction_SigChld;
             proto.u.sigchld.error_number = ibuff[1];
-            DEBUG_PRINT("send %s to %d", buff, uds_fd);
+            DEBUG_PRINT("send sigchld to %d (errno = %d)", uds_fd, ibuff[1]);
             if (write(uds_fd, &proto, sizeof(proto)) < 0) {
                 if (errno == EINTR)
                     continue;
diff --git a/erts/emulator/sys/unix/sys_drivers.c b/erts/emulator/sys/unix/sys_drivers.c
index 3d7be020e1..400f163652 100644
--- a/erts/emulator/sys/unix/sys_drivers.c
+++ b/erts/emulator/sys/unix/sys_drivers.c
@@ -554,7 +554,7 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name,
     ErtsSysDriverData *dd;
     char *cmd_line;
     char wd_buff[MAXPATHLEN+1];
-    char *wd;
+    char *wd, *cwd;
     int ifd[2], ofd[2], stderrfd;
 
     if (pipe(ifd) < 0) return ERL_DRV_ERROR_ERRNO;
@@ -631,24 +631,22 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name,
 	return ERL_DRV_ERROR_ERRNO;
     }
 
-    if (opts->wd == NULL) {
-        if ((wd = getcwd(wd_buff, MAXPATHLEN+1)) == NULL) {
-            /* on some OSs this call opens a fd in the
-               background which means that this can
-               return EMFILE */
-            int err = errno;
-            close_pipes(ifd, ofd);
-            erts_free(ERTS_ALC_T_TMP, (void *) cmd_line);
-            if (new_environ != environ)
-                erts_free(ERTS_ALC_T_ENVIRONMENT, (void *) new_environ);
-            erts_smp_rwmtx_runlock(&environ_rwmtx);
-            errno = err;
-            return ERL_DRV_ERROR_ERRNO;
-        }
-    } else {
-        wd = opts->wd;
+    if ((cwd = getcwd(wd_buff, MAXPATHLEN+1)) == NULL) {
+        /* on some OSs this call opens a fd in the
+           background which means that this can
+           return EMFILE */
+        int err = errno;
+        close_pipes(ifd, ofd);
+        erts_free(ERTS_ALC_T_TMP, (void *) cmd_line);
+        if (new_environ != environ)
+            erts_free(ERTS_ALC_T_ENVIRONMENT, (void *) new_environ);
+        erts_smp_rwmtx_runlock(&environ_rwmtx);
+        errno = err;
+        return ERL_DRV_ERROR_ERRNO;
     }
 
+    wd = opts->wd;
+
     {
         struct iovec *io_vector;
         int iov_len = 5;
@@ -660,6 +658,8 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name,
             | (opts->read_write & DO_READ ? FORKER_FLAG_DO_READ : 0)
             | (opts->read_write & DO_WRITE ? FORKER_FLAG_DO_WRITE : 0);
 
+        if (wd) iov_len++;
+
         /* count number of elements in environment */
         while(new_environ[env_len] != NULL)
             env_len++;
@@ -704,10 +704,16 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name,
         io_vector[i++].iov_len = len;
         buffsz += len;
 
-        io_vector[i].iov_base = wd;
+        io_vector[i].iov_base = cwd;
         io_vector[i].iov_len = strlen(io_vector[i].iov_base) + 1;
         buffsz += io_vector[i++].iov_len;
 
+        if (wd) {
+            io_vector[i].iov_base = wd;
+            io_vector[i].iov_len = strlen(io_vector[i].iov_base) + 1;
+            buffsz += io_vector[i++].iov_len;
+        }
+
         io_vector[i].iov_base = nullbuff;
         io_vector[i++].iov_len = 1;
         buffsz += io_vector[i-1].iov_len;
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl
index c9901ba610..5c0bfdffd4 100644
--- a/erts/emulator/test/port_SUITE.erl
+++ b/erts/emulator/test/port_SUITE.erl
@@ -83,6 +83,7 @@
     bad_port_messages/1,
     basic_ping/1,
     cd/1,
+    cd_relative/1,
     close_deaf_port/1,
     count_fds/1,
     dying_port/1,
@@ -138,7 +139,7 @@
     win_massive_client/1
 ]).
 
--export([do_iter_max_ports/2]).
+-export([do_iter_max_ports/2, relative_cd/0]).
 
 %% Internal exports.
 -export([tps/3]).
@@ -159,8 +160,7 @@ all() ->
      {group, multiple_packets}, parallell, dying_port,
      port_program_with_path, open_input_file_port,
      open_output_file_port, name1, env, huge_env, bad_env, cd,
-     pipe_limit_env,
-     bad_args,
+     cd_relative, pipe_limit_env, bad_args,
      exit_status, iter_max_ports, count_fds, t_exit, {group, tps}, line,
      stderr_to_stdout, otp_3906, otp_4389, win_massive,
      mix_up_ports, otp_5112, otp_5119,
@@ -1087,8 +1087,7 @@ cd(Config)  when is_list(Config) ->
     Cmd = Program ++ " -pz " ++ DataDir ++
     " -noshell -s port_test pwd -s erlang halt",
     _ = open_port({spawn, Cmd},
-                  [{cd, TestDir},
-                   {line, 256}]),
+                  [{cd, TestDir}, {line, 256}]),
     receive
         {_, {data, {eol, String}}} ->
             case filename_equal(String, TestDir) of
@@ -1114,7 +1113,74 @@ cd(Config)  when is_list(Config) ->
         Other3 ->
             ct:fail({env, Other3})
     end,
-    ok.
+
+    InvalidDir = filename:join(DataDir, "invaliddir"),
+    try open_port({spawn, Cmd},
+                  [{cd, InvalidDir}, exit_status, {line, 256}]) of
+        _ ->
+            receive
+                {_, {exit_status, _}} ->
+                    ok;
+                Other4 ->
+                    ct:fail({env, Other4})
+            end
+    catch error:eacces ->
+            %% This happens on Windows
+            ok
+    end,
+
+    %% Check that there are no lingering messages
+    receive
+        Other5 ->
+            ct:fail({env, Other5})
+    after 10 ->
+            ok
+    end.
+
+%% Test that an emulator that has set it's cwd to
+%% something other then when it started, can use
+%% relative {cd,"./"} to open port and that cd will
+%% be relative the new cwd and not the original
+cd_relative(Config) ->
+
+    Program = atom_to_list(lib:progname()),
+    DataDir = proplists:get_value(data_dir, Config),
+    TestDir = filename:join(DataDir, "dir"),
+
+    Cmd = Program ++ " -pz " ++ filename:dirname(code:where_is_file("port_SUITE.beam")) ++
+    " -noshell -s port_SUITE relative_cd -s erlang halt",
+
+    _ = open_port({spawn, Cmd}, [{line, 256}, {cd, TestDir}]),
+
+    receive
+        {_, {data, {eol, String}}} ->
+            case filename_equal(String, TestDir) of
+                true ->
+                    ok;
+                false ->
+                    ct:fail({cd_relative, String})
+            end;
+        Other ->
+            ct:fail(Other)
+    end.
+
+relative_cd() ->
+
+    Program = atom_to_list(lib:progname()),
+    ok = file:set_cwd(".."),
+    {ok, Cwd} = file:get_cwd(),
+
+    Cmd = Program ++ " -pz " ++ Cwd ++
+    " -noshell -s port_test pwd -s erlang halt",
+
+    _ = open_port({spawn, Cmd}, [{line, 256}, {cd, "./dir"}, exit_status]),
+
+    receive
+        {_, {data, {eol, String}}} ->
+            io:format("~s~n",[String]);
+        Other ->
+            io:format("ERROR: ~p~n",[Other])
+    end.
 
 filename_equal(A, B) ->
     case os:type() of