local-exec_filename

Keep compatibility with experimental implementation

Gbp-Pq: Topic hurd-i386
Gbp-Pq: Name local-exec_filename.diff

diff --git a/hurd/Makefile b/hurd/Makefile
index 78d5ab7f4f18589cb9249be65150c0a37a021e76..816ba46a207b7d9d7ff68c62207ebca064c0b3de 100644 (file)
--- a/hurd/Makefile
+++ b/hurd/Makefile
@@ -32,8 +32,8 @@ user-interfaces               := $(addprefix hurd/,\
                                       auth auth_request auth_reply startup \
                                       process process_request \
                                       msg msg_reply msg_request \
-                                      exec exec_startup crash interrupt \
-                                      fs fsys io io_reply io_request \
+                                      exec exec_experimental exec_startup crash interrupt \
+                                      fs fs_experimental fsys io io_reply io_request \
                                       term tioctl socket ifsock \
                                       login password pfinet pci \
                                       )

diff --git a/hurd/Versions b/hurd/Versions
index 7e4f1c5630ad94082794c7e3b11a1d22bc5e40cc..98e3fa22bf88c6937d001fc5e2346b33fe82561e 100644 (file)
--- a/hurd/Versions
+++ b/hurd/Versions
@@ -120,6 +120,10 @@ libc {
     # functions used in macros & inline functions
     __errno_location;
   }
+  GLIBC_2.21 {
+    # "quasi-internal" functions
+    _hurd_exec_file_name;
+  }
   GLIBC_2.26 {
     # "quasi-internal" functions
     _hurd_exec_paths;

diff --git a/hurd/hurdexec.c b/hurd/hurdexec.c
index 16d28ce2ef9bd95e5bba78bd1aa6fe1d51f18254..1fe4c96b634eeff1a9223bec45203d9a0840fd28 100644 (file)
--- a/hurd/hurdexec.c
+++ b/hurd/hurdexec.c
@@ -25,9 +25,12 @@
 #include <hurd/fd.h>
 #include <hurd/signal.h>
 #include <hurd/id.h>
+#include <hurd/fs_experimental.h>
 #include <assert.h>
 #include <argz.h>
 
+#include <shlib-compat.h>
+
 /* Overlay TASK, executing FILE with arguments ARGV and environment ENVP.
    If TASK == mach_task_self (), some ports are dealloc'd by the exec server.
    ARGV and ENVP are terminated by NULL pointers.
@@ -39,6 +42,13 @@ _hurd_exec (task_t task, file_t file,
   return _hurd_exec_paths (task, file, NULL, NULL, argv, envp);
 }
 
+error_t
+__hurd_exec_file_name (task_t task, file_t file, const char *filename,
+           char *const argv[], char *const envp[])
+{
+  return _hurd_exec_paths (task, file, filename, filename, argv, envp);
+}
+
 link_warning (_hurd_exec,
              "_hurd_exec is deprecated, use _hurd_exec_paths instead");
 
@@ -431,6 +441,18 @@ retry:
                               portnames, nportnames);
       /* Fall back for backwards compatibility.  This can just be removed
          when __file_exec goes away.  */
+      if (err == MIG_BAD_ID)
+       err = __file_exec_file_name (file, task, flags,
+                                   path ? path : "",
+                                   args, argslen, env, envlen,
+                                   dtable, MACH_MSG_TYPE_COPY_SEND, dtablesize,
+                                   ports, MACH_MSG_TYPE_COPY_SEND,
+                                   _hurd_nports,
+                                   ints, INIT_INT_MAX,
+                                   please_dealloc, pdp - please_dealloc,
+                                   portnames, nportnames);
+      /* Fall back for backwards compatibility.  This can just be removed
+         when __file_exec goes away.  */
       if (err == MIG_BAD_ID)
        err = __file_exec (file, task, flags,
                           args, argslen, env, envlen,
@@ -477,3 +499,9 @@ retry:
   return err;
 }
 libc_hidden_def (_hurd_exec_paths)
+extern error_t _hurd_exec_file_name (task_t task,
+                                    file_t file,
+                                    const char *filename,
+                                    char *const argv[],
+                                    char *const envp[]);
+versioned_symbol (libc, __hurd_exec_file_name, _hurd_exec_file_name, GLIBC_2_21);

diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index f674623f133f736b58596d7555b4d6aee49c48b4..fb4ce578dc1b19ff535b21c4b50dad54095354ff 100644 (file)
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -1975,6 +1975,7 @@ GLIBC_2.2.6 xprt_register F
 GLIBC_2.2.6 xprt_unregister F
 GLIBC_2.21 __mach_host_self_ D 0x4
 GLIBC_2.21 __pthread_get_cleanup_stack F
+GLIBC_2.21 _hurd_exec_file_name F
 GLIBC_2.21 pthread_attr_destroy F
 GLIBC_2.21 pthread_attr_getdetachstate F
 GLIBC_2.21 pthread_attr_getinheritsched F

diff --git a/sysdeps/mach/hurd/spawni.c b/sysdeps/mach/hurd/spawni.c
index 6296d47f10deb429de0710a813b42fe698f1754f..b7062a3aa645278693275ce94b6884d63f8ee19d 100644 (file)
--- a/sysdeps/mach/hurd/spawni.c
+++ b/sysdeps/mach/hurd/spawni.c
@@ -30,6 +30,7 @@
 #include <hurd/id.h>
 #include <hurd/lookup.h>
 #include <hurd/resource.h>
+#include <hurd/fs_experimental.h>
 #include <assert.h>
 #include <argz.h>
 #include "spawn_int.h"
@@ -815,6 +816,18 @@ retry:
           ints, INIT_INT_MAX,
           NULL, 0, NULL, 0);
 
+       /* Fallback for backwards compatibility.  This can just be removed
+          when __file_exec goes away.  */
+       if (err == MIG_BAD_ID)
+         err = __file_exec_file_name
+         (file, task,
+          __sigismember (&_hurdsig_traced, SIGKILL) ? EXEC_SIGTRAP : 0,
+          relpath, args, argslen, env, envlen,
+          dtable, MACH_MSG_TYPE_COPY_SEND, dtablesize,
+          ports, MACH_MSG_TYPE_COPY_SEND, _hurd_nports,
+          ints, INIT_INT_MAX,
+          NULL, 0, NULL, 0);
+
        /* Fallback for backwards compatibility.  This can just be removed
           when __file_exec goes away.  */
        if (err == MIG_BAD_ID)