mirror of
https://salsa.debian.org/srivasta/make-dfsg.git
synced 2024-12-29 08:09:03 +00:00
da7df54309
w32/compat/posixfcn.c: New file, with emulations of Posix functions and Posix functionality for MS-Windows. w32/subproc/sub_proc.c: Include io.h. (process_noinherit): New function, forces a file descriptor to not be inherited by child processes. (process_easy): Accept two additional arguments, and use them to set up the standard output and standard error handles of the child process. w32/include/sub_proc.h (process_easy): Adjust prototype. (process_noinherit): Add prototype. read.c [WINDOWS32]: Include windows.h and sub_proc.h. makeint.h (LOCALEDIR) [WINDOWS32}: Define to NULL if not defined. This is needed because the MS-Windows build doesn't have a canonical place for LOCALEDIR. (WIN32_LEAN_AND_MEAN) [WINDOWS32]: Define, to avoid getting from windows.h header too much stuff that could conflict with the code. main.c <sync_mutex>: New static variable. <switches>: Add support for "--sync-mutex" switch. (decode_output_sync_flags): Decode the --sync-mutex= switch. (prepare_mutex_handle_string) [WINDOWS32]: New function. (main): Add "output-sync" to .FEATURES. job.h (CLOSE_ON_EXEC) [WINDOWS32]: Define to call process_noinherit. (F_GETFD, F_SETLKW, F_WRLCK, F_UNLCK, struct flock) [WINDOWS32]: New macros. (RECORD_SYNC_MUTEX): New macro, a no-op for Posix platforms. (sync_handle_t): New typedef. job.c <sync_handle>: Change type to sync_handle_t. (FD_NOT_EMPTY): Seek to the file's end. Suggested by Frank Heckenbach <f.heckenbach@fh-soft.de>. (pump_from_tmp_fd) [WINDOWS32]: Switch to_fd to binary mode for the duration of this function, and then change back before returning. (start_job_command) [WINDOWS32]: Support output_sync mode on MS-Windows. Use a system-wide mutex instead of locking stdout/stderr. Call process_easy with two additional arguments: child->outfd and child->errfd. (exec_command) [WINDOWS32]: Pass two additional arguments, both -1, to process_easy, to adjust for the changed function signature. function.c (windows32_openpipe) [WINDOWS32]: This function now returns an int, which is -1 if it fails and zero otherwise. It also calls 'error' instead of 'fatal', to avoid exiting prematurely. (func_shell_base) [WINDOWS32]: Call perror_with_name if windows32_openpipe fails, now that it always returns. This avoids a compiler warning that error_prefix is not used in the MS-Windows build. config.h.W32.template (OUTPUT_SYNC): Define. build_w32.bat: Add w32/compat/posixfcn.c to compilation and linking commands. From Frank Heckenbach <f.heckenbach@fh-soft.de>: job.c (sync_output): Don't discard the output if acquire_semaphore fails; instead, dump the output unsynchronized.
154 lines
4.5 KiB
C
154 lines
4.5 KiB
C
/* Definitions for managing subprocesses in GNU Make.
|
|
Copyright (C) 1992-2012 Free Software Foundation, Inc.
|
|
This file is part of GNU Make.
|
|
|
|
GNU Make 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.
|
|
|
|
GNU Make 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 <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef SEEN_JOB_H
|
|
#define SEEN_JOB_H
|
|
|
|
#ifdef HAVE_FCNTL_H
|
|
# include <fcntl.h>
|
|
#else
|
|
# include <sys/file.h>
|
|
#endif
|
|
|
|
/* How to set close-on-exec for a file descriptor. */
|
|
|
|
#if !defined F_SETFD
|
|
# ifdef WINDOWS32
|
|
# define CLOSE_ON_EXEC(_d) process_noinherit(_d)
|
|
# else
|
|
# define CLOSE_ON_EXEC(_d)
|
|
# endif
|
|
#else
|
|
# ifndef FD_CLOEXEC
|
|
# define FD_CLOEXEC 1
|
|
# endif
|
|
# define CLOSE_ON_EXEC(_d) (void) fcntl ((_d), F_SETFD, FD_CLOEXEC)
|
|
#endif
|
|
|
|
#ifdef OUTPUT_SYNC
|
|
# ifdef WINDOWS32
|
|
/* For emulations in w32/compat/posixfcn.c. */
|
|
# define F_GETFD 1
|
|
# define F_SETLKW 2
|
|
/* Implementation note: None of the values of l_type below can be zero
|
|
-- they are compared with a static instance of the struct, so zero
|
|
means unknown/invalid, see w32/compat/posixfcn.c. */
|
|
# define F_WRLCK 1
|
|
# define F_UNLCK 2
|
|
|
|
struct flock {
|
|
short l_type;
|
|
short l_whence;
|
|
off_t l_start;
|
|
off_t l_len;
|
|
pid_t l_pid;
|
|
};
|
|
|
|
/* This type is actually a HANDLE, but we want to avoid including
|
|
windows.h as much as possible. */
|
|
typedef intptr_t sync_handle_t;
|
|
|
|
/* Public functions emulated/provided in posixfcn.c. */
|
|
int fcntl (intptr_t fd, int cmd, ...);
|
|
intptr_t create_mutex (void);
|
|
int same_stream (FILE *f1, FILE *f2);
|
|
|
|
# define RECORD_SYNC_MUTEX(m) record_sync_mutex(m)
|
|
void record_sync_mutex (const char *str);
|
|
void prepare_mutex_handle_string (intptr_t hdl);
|
|
|
|
# else /* !WINDOWS32 */
|
|
|
|
typedef int sync_handle_t; /* file descriptor */
|
|
|
|
# define RECORD_SYNC_MUTEX(m) (void)(m)
|
|
|
|
# endif
|
|
#endif /* OUTPUT_SYNC */
|
|
|
|
/* Structure describing a running or dead child process. */
|
|
|
|
struct child
|
|
{
|
|
struct child *next; /* Link in the chain. */
|
|
|
|
struct file *file; /* File being remade. */
|
|
|
|
char **environment; /* Environment for commands. */
|
|
char *sh_batch_file; /* Script file for shell commands */
|
|
char **command_lines; /* Array of variable-expanded cmd lines. */
|
|
char *command_ptr; /* Ptr into command_lines[command_line]. */
|
|
|
|
#ifdef VMS
|
|
char *comname; /* Temporary command file name */
|
|
int efn; /* Completion event flag number */
|
|
int cstatus; /* Completion status */
|
|
#endif
|
|
|
|
unsigned int command_line; /* Index into command_lines. */
|
|
pid_t pid; /* Child process's ID number. */
|
|
unsigned int remote:1; /* Nonzero if executing remotely. */
|
|
unsigned int noerror:1; /* Nonzero if commands contained a '-'. */
|
|
unsigned int good_stdin:1; /* Nonzero if this child has a good stdin. */
|
|
unsigned int deleted:1; /* Nonzero if targets have been deleted. */
|
|
unsigned int dontcare:1; /* Saved dontcare flag. */
|
|
#ifdef OUTPUT_SYNC
|
|
int outfd; /* File descriptor for saving stdout */
|
|
int errfd; /* File descriptor for saving stderr */
|
|
#endif
|
|
};
|
|
|
|
extern struct child *children;
|
|
|
|
int is_bourne_compatible_shell(const char *path);
|
|
void new_job (struct file *file);
|
|
void reap_children (int block, int err);
|
|
void start_waiting_jobs (void);
|
|
|
|
char **construct_command_argv (char *line, char **restp, struct file *file,
|
|
int cmd_flags, char** batch_file);
|
|
#ifdef VMS
|
|
int child_execute_job (char *argv, struct child *child);
|
|
#elif defined(__EMX__)
|
|
int child_execute_job (int stdin_fd, int stdout_fd, char **argv, char **envp);
|
|
#else
|
|
void child_execute_job (int stdin_fd, int stdout_fd, char **argv, char **envp);
|
|
#endif
|
|
#ifdef _AMIGA
|
|
void exec_command (char **argv);
|
|
#elif defined(__EMX__)
|
|
int exec_command (char **argv, char **envp);
|
|
#else
|
|
void exec_command (char **argv, char **envp);
|
|
#endif
|
|
|
|
extern unsigned int job_slots_used;
|
|
|
|
void block_sigs (void);
|
|
#ifdef POSIX
|
|
void unblock_sigs (void);
|
|
#else
|
|
#ifdef HAVE_SIGSETMASK
|
|
extern int fatal_signal_mask;
|
|
#define unblock_sigs() sigsetmask (0)
|
|
#else
|
|
#define unblock_sigs()
|
|
#endif
|
|
#endif
|
|
|
|
extern unsigned int jobserver_tokens;
|
|
|
|
#endif /* SEEN_JOB_H */
|