Merge branch 'ef/mingw-upload-archive'
* ef/mingw-upload-archive: mingw: poll.h is no longer in sys/ upload-archive: use start_command instead of fork compat/win32/poll.c: upgrade from upstream mingw: move poll out of sys-folder
This commit is contained in:
Junio C Hamano
commit
7406aa203f
8
Makefile
8
Makefile
@ -515,7 +515,7 @@ LIB_H += compat/mingw.h
|
||||
LIB_H += compat/obstack.h
|
||||
LIB_H += compat/win32/pthread.h
|
||||
LIB_H += compat/win32/syslog.h
|
||||
LIB_H += compat/win32/sys/poll.h
|
||||
LIB_H += compat/win32/poll.h
|
||||
LIB_H += compat/win32/dirent.h
|
||||
LIB_H += connected.h
|
||||
LIB_H += csum-file.h
|
||||
@ -1088,6 +1088,7 @@ ifeq ($(uname_S),Windows)
|
||||
NO_PREAD = YesPlease
|
||||
NEEDS_CRYPTO_WITH_SSL = YesPlease
|
||||
NO_LIBGEN_H = YesPlease
|
||||
NO_SYS_POLL_H = YesPlease
|
||||
NO_SYMLINK_HEAD = YesPlease
|
||||
NO_IPV6 = YesPlease
|
||||
NO_SETENV = YesPlease
|
||||
@ -1126,7 +1127,7 @@ ifeq ($(uname_S),Windows)
|
||||
BASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
|
||||
COMPAT_OBJS = compat/msvc.o compat/winansi.o \
|
||||
compat/win32/pthread.o compat/win32/syslog.o \
|
||||
compat/win32/sys/poll.o compat/win32/dirent.o
|
||||
compat/win32/poll.o compat/win32/dirent.o
|
||||
COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
|
||||
BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib
|
||||
EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib
|
||||
@ -1181,6 +1182,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
|
||||
NO_PREAD = YesPlease
|
||||
NEEDS_CRYPTO_WITH_SSL = YesPlease
|
||||
NO_LIBGEN_H = YesPlease
|
||||
NO_SYS_POLL_H = YesPlease
|
||||
NO_SYMLINK_HEAD = YesPlease
|
||||
NO_SETENV = YesPlease
|
||||
NO_UNSETENV = YesPlease
|
||||
@ -1214,7 +1216,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
|
||||
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
|
||||
COMPAT_OBJS += compat/mingw.o compat/winansi.o \
|
||||
compat/win32/pthread.o compat/win32/syslog.o \
|
||||
compat/win32/sys/poll.o compat/win32/dirent.o
|
||||
compat/win32/poll.o compat/win32/dirent.o
|
||||
EXTLIBS += -lws2_32
|
||||
PTHREAD_LIBS =
|
||||
X = .exe
|
||||
|
||||
@ -87,6 +87,7 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
|
||||
const char *exec = "git-upload-archive";
|
||||
const char *output = NULL;
|
||||
const char *remote = NULL;
|
||||
int is_remote = 0;
|
||||
struct option local_opts[] = {
|
||||
OPT_STRING('o', "output", &output, "file",
|
||||
"write the archive to this file"),
|
||||
@ -94,6 +95,9 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
|
||||
"retrieve the archive from remote repository <repo>"),
|
||||
OPT_STRING(0, "exec", &exec, "cmd",
|
||||
"path to the remote git-upload-archive command"),
|
||||
{ OPTION_BOOLEAN, 0, "remote-request", &is_remote, NULL,
|
||||
"indicate we are serving a remote request",
|
||||
PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
|
||||
OPT_END()
|
||||
};
|
||||
|
||||
@ -108,5 +112,5 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
|
||||
|
||||
setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
|
||||
|
||||
return write_archive(argc, argv, prefix, 1, output, 0);
|
||||
return write_archive(argc, argv, prefix, 1, output, is_remote);
|
||||
}
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
#include "archive.h"
|
||||
#include "pkt-line.h"
|
||||
#include "sideband.h"
|
||||
#include "run-command.h"
|
||||
|
||||
static const char upload_archive_usage[] =
|
||||
"git upload-archive <repo>";
|
||||
@ -18,28 +19,17 @@ static const char lostchild[] =
|
||||
|
||||
#define MAX_ARGS (64)
|
||||
|
||||
static int run_upload_archive(int argc, const char **argv, const char *prefix)
|
||||
static void prepare_argv(const char **sent_argv, const char **argv)
|
||||
{
|
||||
const char *sent_argv[MAX_ARGS];
|
||||
const char *arg_cmd = "argument ";
|
||||
char *p, buf[4096];
|
||||
int sent_argc;
|
||||
int len;
|
||||
|
||||
if (argc != 2)
|
||||
usage(upload_archive_usage);
|
||||
|
||||
if (strlen(argv[1]) + 1 > sizeof(buf))
|
||||
die("insanely long repository name");
|
||||
|
||||
strcpy(buf, argv[1]); /* enter-repo smudges its argument */
|
||||
|
||||
if (!enter_repo(buf, 0))
|
||||
die("'%s' does not appear to be a git repository", buf);
|
||||
|
||||
/* put received options in sent_argv[] */
|
||||
sent_argc = 1;
|
||||
sent_argv[0] = "git-upload-archive";
|
||||
sent_argc = 2;
|
||||
sent_argv[0] = "archive";
|
||||
sent_argv[1] = "--remote-request";
|
||||
for (p = buf;;) {
|
||||
/* This will die if not enough free space in buf */
|
||||
len = packet_read_line(0, p, (buf + sizeof buf) - p);
|
||||
@ -62,9 +52,6 @@ static int run_upload_archive(int argc, const char **argv, const char *prefix)
|
||||
*p++ = 0;
|
||||
}
|
||||
sent_argv[sent_argc] = NULL;
|
||||
|
||||
/* parse all options sent by the client */
|
||||
return write_archive(sent_argc, sent_argv, prefix, 0, NULL, 1);
|
||||
}
|
||||
|
||||
__attribute__((format (printf, 1, 2)))
|
||||
@ -96,38 +83,25 @@ static ssize_t process_input(int child_fd, int band)
|
||||
|
||||
int cmd_upload_archive(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
pid_t writer;
|
||||
int fd1[2], fd2[2];
|
||||
/*
|
||||
* Set up sideband subprocess.
|
||||
*
|
||||
* We (parent) monitor and read from child, sending its fd#1 and fd#2
|
||||
* multiplexed out to our fd#1. If the child dies, we tell the other
|
||||
* end over channel #3.
|
||||
*/
|
||||
if (pipe(fd1) < 0 || pipe(fd2) < 0) {
|
||||
int err = errno;
|
||||
packet_write(1, "NACK pipe failed on the remote side\n");
|
||||
die("upload-archive: %s", strerror(err));
|
||||
}
|
||||
writer = fork();
|
||||
if (writer < 0) {
|
||||
const char *sent_argv[MAX_ARGS];
|
||||
struct child_process cld = { sent_argv };
|
||||
cld.out = cld.err = -1;
|
||||
cld.git_cmd = 1;
|
||||
|
||||
if (argc != 2)
|
||||
usage(upload_archive_usage);
|
||||
|
||||
if (!enter_repo(argv[1], 0))
|
||||
die("'%s' does not appear to be a git repository", argv[1]);
|
||||
|
||||
prepare_argv(sent_argv, argv);
|
||||
if (start_command(&cld)) {
|
||||
int err = errno;
|
||||
packet_write(1, "NACK fork failed on the remote side\n");
|
||||
die("upload-archive: %s", strerror(err));
|
||||
}
|
||||
if (!writer) {
|
||||
/* child - connect fd#1 and fd#2 to the pipe */
|
||||
dup2(fd1[1], 1);
|
||||
dup2(fd2[1], 2);
|
||||
close(fd1[1]); close(fd2[1]);
|
||||
close(fd1[0]); close(fd2[0]); /* we do not read from pipe */
|
||||
|
||||
exit(run_upload_archive(argc, argv, prefix));
|
||||
}
|
||||
|
||||
/* parent - read from child, multiplex and send out to fd#1 */
|
||||
close(fd1[1]); close(fd2[1]); /* we do not write to pipe */
|
||||
packet_write(1, "ACK\n");
|
||||
packet_flush(1);
|
||||
|
||||
@ -135,9 +109,9 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix)
|
||||
struct pollfd pfd[2];
|
||||
int status;
|
||||
|
||||
pfd[0].fd = fd1[0];
|
||||
pfd[0].fd = cld.out;
|
||||
pfd[0].events = POLLIN;
|
||||
pfd[1].fd = fd2[0];
|
||||
pfd[1].fd = cld.err;
|
||||
pfd[1].events = POLLIN;
|
||||
if (poll(pfd, 2, -1) < 0) {
|
||||
if (errno != EINTR) {
|
||||
@ -156,7 +130,7 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix)
|
||||
if (process_input(pfd[0].fd, 1))
|
||||
continue;
|
||||
|
||||
if (waitpid(writer, &status, 0) < 0)
|
||||
if (waitpid(cld.pid, &status, 0) < 0)
|
||||
error_clnt("%s", lostchild);
|
||||
else if (!WIFEXITED(status) || WEXITSTATUS(status) > 0)
|
||||
error_clnt("%s", deadchild);
|
||||
|
||||
@ -85,8 +85,6 @@ static inline int symlink(const char *oldpath, const char *newpath)
|
||||
{ errno = ENOSYS; return -1; }
|
||||
static inline int fchmod(int fildes, mode_t mode)
|
||||
{ errno = ENOSYS; return -1; }
|
||||
static inline pid_t fork(void)
|
||||
{ errno = ENOSYS; return -1; }
|
||||
static inline unsigned int alarm(unsigned int seconds)
|
||||
{ return 0; }
|
||||
static inline int fsync(int fd)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* Emulation for poll(2)
|
||||
Contributed by Paolo Bonzini.
|
||||
|
||||
Copyright 2001-2003, 2006-2010 Free Software Foundation, Inc.
|
||||
Copyright 2001-2003, 2006-2011 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of gnulib.
|
||||
|
||||
@ -27,7 +27,10 @@
|
||||
#include <malloc.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
#include "poll.h"
|
||||
|
||||
/* Specification. */
|
||||
#include <poll.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
#include <assert.h>
|
||||
@ -314,10 +317,7 @@ compute_revents (int fd, int sought, fd_set *rfds, fd_set *wfds, fd_set *efds)
|
||||
#endif /* !MinGW */
|
||||
|
||||
int
|
||||
poll (pfd, nfd, timeout)
|
||||
struct pollfd *pfd;
|
||||
nfds_t nfd;
|
||||
int timeout;
|
||||
poll (struct pollfd *pfd, nfds_t nfd, int timeout)
|
||||
{
|
||||
#ifndef WIN32_NATIVE
|
||||
fd_set rfds, wfds, efds;
|
||||
@ -454,6 +454,7 @@ poll (pfd, nfd, timeout)
|
||||
if (!hEvent)
|
||||
hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
|
||||
|
||||
restart:
|
||||
handle_array[0] = hEvent;
|
||||
nhandles = 1;
|
||||
FD_ZERO (&rfds);
|
||||
@ -594,6 +595,12 @@ poll (pfd, nfd, timeout)
|
||||
rc++;
|
||||
}
|
||||
|
||||
if (!rc && timeout == INFTIM)
|
||||
{
|
||||
SwitchToThread();
|
||||
goto restart;
|
||||
}
|
||||
|
||||
return rc;
|
||||
#endif
|
||||
}
|
||||
@ -96,7 +96,7 @@ test_expect_success 'git archive with --output' \
|
||||
'git archive --output=b4.tar HEAD &&
|
||||
test_cmp b.tar b4.tar'
|
||||
|
||||
test_expect_success NOT_MINGW 'git archive --remote' \
|
||||
test_expect_success 'git archive --remote' \
|
||||
'git archive --remote=. HEAD >b5.tar &&
|
||||
test_cmp b.tar b5.tar'
|
||||
|
||||
@ -266,7 +266,7 @@ test_expect_success 'archive --list mentions user filter' '
|
||||
grep "^bar\$" output
|
||||
'
|
||||
|
||||
test_expect_success NOT_MINGW 'archive --list shows only enabled remote filters' '
|
||||
test_expect_success 'archive --list shows only enabled remote filters' '
|
||||
git archive --list --remote=. >output &&
|
||||
! grep "^tar\.foo\$" output &&
|
||||
grep "^bar\$" output
|
||||
@ -298,7 +298,7 @@ test_expect_success 'extension matching requires dot' '
|
||||
test_cmp b.tar config-implicittar.foo
|
||||
'
|
||||
|
||||
test_expect_success NOT_MINGW 'only enabled filters are available remotely' '
|
||||
test_expect_success 'only enabled filters are available remotely' '
|
||||
test_must_fail git archive --remote=. --format=tar.foo HEAD \
|
||||
>remote.tar.foo &&
|
||||
git archive --remote=. --format=bar >remote.bar HEAD &&
|
||||
@ -341,12 +341,12 @@ test_expect_success GZIP,GUNZIP 'extract tgz file' '
|
||||
test_cmp b.tar j.tar
|
||||
'
|
||||
|
||||
test_expect_success GZIP,NOT_MINGW 'remote tar.gz is allowed by default' '
|
||||
test_expect_success GZIP 'remote tar.gz is allowed by default' '
|
||||
git archive --remote=. --format=tar.gz HEAD >remote.tar.gz &&
|
||||
test_cmp j.tgz remote.tar.gz
|
||||
'
|
||||
|
||||
test_expect_success GZIP,NOT_MINGW 'remote tar.gz can be disabled' '
|
||||
test_expect_success GZIP 'remote tar.gz can be disabled' '
|
||||
git config tar.tar.gz.remote false &&
|
||||
test_must_fail git archive --remote=. --format=tar.gz HEAD \
|
||||
>remote.tar.gz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user