Hash :
427249c6
Author :
Date :
2024-10-22T22:08:24
execute, spawn-pipe: Support DLL dependencies of Windows executables. Reported by Michele Locati <michele@locati.it>. * lib/windows-path.h: New file. * lib/windows-path.c: New file. * lib/windows-spawn.h (compose_envblock): Add new_PATH parameter. (spawnpvech): Add dll_dirs parameter. Call extended_PATH. * lib/windows-spawn.c: Include windows-path.h. (compose_envblock): Add new_PATH parameter. * modules/windows-spawn (Description): Now applies to Cygwin as well. (Files): Add lib/windows-path.h, lib/windows-path.c. (configure.ac): Define GL_COND_OBJ_WINDOWS_PATH. (Makefile.am): Conditionally compile windows-path.c. (Include): Add windows-path.h. * lib/spawni.c (__spawni): Update compose_envblock call. * lib/execute.h (execute): Add dll_dirs parameter. * lib/execute.c: Include windows-path.h. (execute): Add dll_dirs parameter. Pass it down to spawnpvech. Call extended_environ. * lib/spawn-pipe.h (create_pipe_out, create_pipe_in, create_pipe_bidi): Add dll_dirs parameter. * lib/spawn-pipe.c: Include windows-path.h. (create_pipe): Add dll_dirs parameter. Pass it down to spawnpvech. Call extended_environ. (create_pipe_bidi, create_pipe_in, create_pipe_out): Add dll_dirs parameter. * lib/javaexec.c (execute_java_class): Update execute invocations. * lib/cygpath.c (execute_and_read_line): Update create_pipe_in invocation. * lib/javaversion.c (execute_and_read_line): Likewise. * lib/csharpcomp.c (compile_csharp_using_mono, compile_csharp_using_dotnet, compile_csharp_using_sscli): Update execute, create_pipe_in invocations. * lib/csharpexec.c (execute_csharp_using_mono, execute_csharp_using_dotnet, execute_csharp_using_sscli): Likewise. * lib/javacomp.c (compile_using_envjavac, compile_using_javac, execute_and_read_line, is_javac_present): Likewise. * lib/pipe-filter-gi.c (pipe_filter_gi_create): Update create_pipe_bidi invocation. * lib/pipe-filter-ii.c (pipe_filter_ii_execute): Likewise. * tests/test-execute-main.c (main): Update execute invocations. * tests/test-execute-script.c (main): Likewise. * tests/test-spawn-pipe-main.c (main): Update create_pipe_bidi invocation. * tests/test-spawn-pipe-script.c (main): Update create_pipe_in invocations. * NEWS: Mention the changes.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163
/* Convert file names between Cygwin syntax and Windows syntax.
Copyright (C) 2024 Free Software Foundation, Inc.
This file is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
by the Free Software Foundation, either version 3 of the License,
or (at your option) any later version.
This file is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. */
/* Written by Bruno Haible <bruno@clisp.org>, 2024. */
#include <config.h>
/* Specification. */
#include "cygpath.h"
#include <stdlib.h>
#include "xalloc.h"
#include "gettext.h"
#define _(str) gettext (str)
#ifdef __CYGWIN__
/* Since Cygwin has its own notion of mount points (which can be defined by the
user), it would be wrong to blindly convert '/cygdrive/c/foo' to 'C:\foo'.
We really need to use the Cygwin API or the 'cygpath' program. */
# include <errno.h>
# include <error.h>
# if 1
/* Documentation:
https://cygwin.com/cygwin-api/func-cygwin-conv-path.html */
# include <sys/cygwin.h>
char *
cygpath_w (const char *filename)
{
int repeat;
/* Try several times, since there is a small time window during which the
size returned by the previous call may not be sufficient, namely when a
directory gets renamed. */
for (repeat = 3; repeat > 0; repeat--)
{
ssize_t size = cygwin_conv_path (CCP_POSIX_TO_WIN_A | CCP_RELATIVE, filename, NULL, 0);
if (size < 0)
error (EXIT_FAILURE, errno, _("cannot convert file name '%s' to Windows syntax"), filename);
char *result = (char *) xmalloc (size);
if (cygwin_conv_path (CCP_POSIX_TO_WIN_A | CCP_RELATIVE, filename, result, size) == 0)
return result;
free (result);
}
error (EXIT_FAILURE, errno, _("cygwin_conv_path failed"));
return NULL;
}
# else
/* Alternative implementation (slower) */
/* Documentation:
https://cygwin.com/cygwin-ug-net/cygpath.html */
# include <stdio.h>
# include "spawn-pipe.h"
# include "wait-process.h"
/* Executes a program.
Returns the first line of its output, as a freshly allocated string, or
NULL. */
static char *
execute_and_read_line (const char *progname,
const char *prog_path, const char * const *prog_argv)
{
pid_t child;
int fd[1];
FILE *fp;
char *line;
size_t linesize;
size_t linelen;
/* Open a pipe to the program. */
child = create_pipe_in (progname, prog_path, prog_argv, NULL, NULL,
DEV_NULL, false, true, false, fd);
if (child == -1)
return NULL;
/* Retrieve its result. */
fp = fdopen (fd[0], "r");
if (fp == NULL)
error (EXIT_FAILURE, errno, _("fdopen() failed"));
line = NULL; linesize = 0;
linelen = getline (&line, &linesize, fp);
if (linelen == (size_t)(-1))
{
error (0, 0, _("%s subprocess I/O error"), progname);
fclose (fp);
wait_subprocess (child, progname, true, false, true, false, NULL);
}
else
{
int exitstatus;
if (linelen > 0 && line[linelen - 1] == '\n')
line[linelen - 1] = '\0';
/* Read until EOF (otherwise the child process may get a SIGPIPE signal). */
while (getc (fp) != EOF)
;
fclose (fp);
/* Remove zombie process from process list, and retrieve exit status. */
exitstatus =
wait_subprocess (child, progname, true, false, true, false, NULL);
if (exitstatus == 0)
return line;
}
free (line);
return NULL;
}
char *
cygpath_w (const char *filename)
{
const char *argv[4];
argv[0] = "cygpath";
argv[1] = "-w";
argv[2] = filename;
argv[3] = NULL;
char *line = execute_and_read_line ("cygpath", "cygpath", argv);
if (line == NULL || line[0] == '\0')
error (EXIT_FAILURE, 0, _("%s invocation failed"), "cygpath");
return line;
}
# endif
#else
char *
cygpath_w (const char *filename)
{
return xstrdup (filename);
}
#endif