Skip to content

Commit eda75f9

Browse files
dschodscho
committed
Merge branch 'busybox-w32'
Signed-off-by: Johannes Schindelin <[email protected]>
2 parents d2c1889 + 13ca69a commit eda75f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+449
-191
lines changed

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*.perl eol=lf diff=perl
55
*.pl eof=lf diff=perl
66
*.pm eol=lf diff=perl
7+
*.png binary
78
*.py eol=lf diff=python
89
*.bat eol=crlf
910
CODE_OF_CONDUCT.md -whitespace

‎Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,7 @@ TEST_BUILTINS_OBJS += test-advise.o
715715
TEST_BUILTINS_OBJS += test-bitmap.o
716716
TEST_BUILTINS_OBJS += test-bloom.o
717717
TEST_BUILTINS_OBJS += test-chmtime.o
718+
TEST_BUILTINS_OBJS += test-cmp.o
718719
TEST_BUILTINS_OBJS += test-config.o
719720
TEST_BUILTINS_OBJS += test-crontab.o
720721
TEST_BUILTINS_OBJS += test-csprng.o
@@ -737,6 +738,7 @@ TEST_BUILTINS_OBJS += test-hash-speed.o
737738
TEST_BUILTINS_OBJS += test-hash.o
738739
TEST_BUILTINS_OBJS += test-hashmap.o
739740
TEST_BUILTINS_OBJS += test-hexdump.o
741+
TEST_BUILTINS_OBJS += test-iconv.o
740742
TEST_BUILTINS_OBJS += test-index-version.o
741743
TEST_BUILTINS_OBJS += test-json-writer.o
742744
TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o

‎compat/mingw.c

Lines changed: 73 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <sspi.h>
1616
#include "win32/fscache.h"
1717
#include "../attr.h"
18+
#include "../string-list.h"
1819

1920
#define HCAST(type, handle) ((type)(intptr_t)handle)
2021

@@ -1614,6 +1615,65 @@ static char *lookup_prog(const char *dir, int dirlen, const char *cmd,
16141615
return NULL;
16151616
}
16161617

1618+
static char *path_lookup(const char *cmd, int exe_only);
1619+
1620+
static char *is_busybox_applet(const char *cmd)
1621+
{
1622+
static struct string_list applets = STRING_LIST_INIT_DUP;
1623+
static char *busybox_path;
1624+
static int busybox_path_initialized;
1625+
1626+
/* Avoid infinite loop */
1627+
if (!strncasecmp(cmd, "busybox", 7) &&
1628+
(!cmd[7] || !strcasecmp(cmd + 7, ".exe")))
1629+
return NULL;
1630+
1631+
if (!busybox_path_initialized) {
1632+
busybox_path = path_lookup("busybox.exe", 1);
1633+
busybox_path_initialized = 1;
1634+
}
1635+
1636+
/* Assume that sh is compiled in... */
1637+
if (!busybox_path || !strcasecmp(cmd, "sh"))
1638+
return xstrdup_or_null(busybox_path);
1639+
1640+
if (!applets.nr) {
1641+
struct child_process cp = CHILD_PROCESS_INIT;
1642+
struct strbuf buf = STRBUF_INIT;
1643+
char *p;
1644+
1645+
strvec_pushl(&cp.args, busybox_path, "--help", NULL);
1646+
1647+
if (capture_command(&cp, &buf, 2048)) {
1648+
string_list_append(&applets, "");
1649+
return NULL;
1650+
}
1651+
1652+
/* parse output */
1653+
p = strstr(buf.buf, "Currently defined functions:\n");
1654+
if (!p) {
1655+
warning("Could not parse output of busybox --help");
1656+
string_list_append(&applets, "");
1657+
return NULL;
1658+
}
1659+
p = strchrnul(p, '\n');
1660+
for (;;) {
1661+
size_t len;
1662+
1663+
p += strspn(p, "\n\t ,");
1664+
len = strcspn(p, "\n\t ,");
1665+
if (!len)
1666+
break;
1667+
p[len] = '\0';
1668+
string_list_insert(&applets, p);
1669+
p = p + len + 1;
1670+
}
1671+
}
1672+
1673+
return string_list_has_string(&applets, cmd) ?
1674+
xstrdup(busybox_path) : NULL;
1675+
}
1676+
16171677
/*
16181678
* Determines the absolute path of cmd using the split path in path.
16191679
* If cmd contains a slash or backslash, no lookup is performed.
@@ -1642,6 +1702,9 @@ static char *path_lookup(const char *cmd, int exe_only)
16421702
path = sep + 1;
16431703
}
16441704

1705+
if (!prog && !isexe)
1706+
prog = is_busybox_applet(cmd);
1707+
16451708
return prog;
16461709
}
16471710

@@ -1841,8 +1904,8 @@ static int is_msys2_sh(const char *cmd)
18411904
}
18421905

18431906
static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaenv,
1844-
const char *dir,
1845-
int prepend_cmd, int fhin, int fhout, int fherr)
1907+
const char *dir, const char *prepend_cmd,
1908+
int fhin, int fhout, int fherr)
18461909
{
18471910
static int restrict_handle_inheritance = -1;
18481911
STARTUPINFOEXW si;
@@ -1933,9 +1996,9 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
19331996
/* concatenate argv, quoting args as we go */
19341997
strbuf_init(&args, 0);
19351998
if (prepend_cmd) {
1936-
char *quoted = (char *)quote_arg(cmd);
1999+
char *quoted = (char *)quote_arg(prepend_cmd);
19372000
strbuf_addstr(&args, quoted);
1938-
if (quoted != cmd)
2001+
if (quoted != prepend_cmd)
19392002
free(quoted);
19402003
}
19412004
for (; *argv; argv++) {
@@ -2094,7 +2157,8 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
20942157
return (pid_t)pi.dwProcessId;
20952158
}
20962159

2097-
static pid_t mingw_spawnv(const char *cmd, const char **argv, int prepend_cmd)
2160+
static pid_t mingw_spawnv(const char *cmd, const char **argv,
2161+
const char *prepend_cmd)
20982162
{
20992163
return mingw_spawnve_fd(cmd, argv, NULL, NULL, prepend_cmd, 0, 1, 2);
21002164
}
@@ -2122,14 +2186,14 @@ pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **deltaenv,
21222186
pid = -1;
21232187
}
21242188
else {
2125-
pid = mingw_spawnve_fd(iprog, argv, deltaenv, dir, 1,
2189+
pid = mingw_spawnve_fd(iprog, argv, deltaenv, dir, interpr,
21262190
fhin, fhout, fherr);
21272191
free(iprog);
21282192
}
21292193
argv[0] = argv0;
21302194
}
21312195
else
2132-
pid = mingw_spawnve_fd(prog, argv, deltaenv, dir, 0,
2196+
pid = mingw_spawnve_fd(prog, argv, deltaenv, dir, NULL,
21332197
fhin, fhout, fherr);
21342198
free(prog);
21352199
}
@@ -2157,7 +2221,7 @@ static int try_shell_exec(const char *cmd, char *const *argv)
21572221
argv2[0] = (char *)cmd; /* full path to the script file */
21582222
COPY_ARRAY(&argv2[1], &argv[1], argc);
21592223
exec_id = trace2_exec(prog, argv2);
2160-
pid = mingw_spawnv(prog, argv2, 1);
2224+
pid = mingw_spawnv(prog, argv2, interpr);
21612225
if (pid >= 0) {
21622226
int status;
21632227
if (waitpid(pid, &status, 0) < 0)
@@ -2181,7 +2245,7 @@ int mingw_execv(const char *cmd, char *const *argv)
21812245
int exec_id;
21822246

21832247
exec_id = trace2_exec(cmd, (const char **)argv);
2184-
pid = mingw_spawnv(cmd, (const char **)argv, 0);
2248+
pid = mingw_spawnv(cmd, (const char **)argv, NULL);
21852249
if (pid < 0) {
21862250
trace2_exec_result(exec_id, -1);
21872251
return -1;

‎config.mak.uname

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,62 @@ else
738738
NO_CURL = YesPlease
739739
endif
740740
endif
741+
ifeq (i686,$(uname_M))
742+
MINGW_PREFIX := mingw32
743+
endif
744+
ifeq (x86_64,$(uname_M))
745+
MINGW_PREFIX := mingw64
746+
endif
747+
748+
DESTDIR_WINDOWS = $(shell cygpath -aw '$(DESTDIR_SQ)')
749+
DESTDIR_MIXED = $(shell cygpath -am '$(DESTDIR_SQ)')
750+
install-mingit-test-artifacts:
751+
install -m755 -d '$(DESTDIR_SQ)/usr/bin'
752+
printf '%s\n%s\n' >'$(DESTDIR_SQ)/usr/bin/perl' \
753+
"#!/mingw64/bin/busybox sh" \
754+
"exec \"$(shell cygpath -am /usr/bin/perl.exe)\" \"\$$@\""
755+
756+
install -m755 -d '$(DESTDIR_SQ)'
757+
printf '%s%s\n%s\n%s\n%s\n%s\n' >'$(DESTDIR_SQ)/init.bat' \
758+
"PATH=$(DESTDIR_WINDOWS)\\$(MINGW_PREFIX)\\bin;" \
759+
"C:\\WINDOWS;C:\\WINDOWS\\system32" \
760+
"@set GIT_TEST_INSTALLED=$(DESTDIR_MIXED)/$(MINGW_PREFIX)/bin" \
761+
"@`echo "$(DESTDIR_WINDOWS)" | sed 's/:.*/:/'`" \
762+
"@cd `echo "$(DESTDIR_WINDOWS)" | sed 's/^.://'`\\test-git\\t" \
763+
"@echo Now, run 'helper\\test-run-command testsuite'"
764+
765+
install -m755 -d '$(DESTDIR_SQ)/test-git'
766+
sed 's/^\(NO_PERL\|NO_PYTHON\)=.*/\1=YesPlease/' \
767+
<GIT-BUILD-OPTIONS >'$(DESTDIR_SQ)/test-git/GIT-BUILD-OPTIONS'
768+
769+
install -m755 -d '$(DESTDIR_SQ)/test-git/t/helper'
770+
install -m755 $(TEST_PROGRAMS) '$(DESTDIR_SQ)/test-git/t/helper'
771+
(cd t && $(TAR) cf - t[0-9][0-9][0-9][0-9] lib-diff) | \
772+
(cd '$(DESTDIR_SQ)/test-git/t' && $(TAR) xf -)
773+
install -m755 t/t556x_common t/*.sh '$(DESTDIR_SQ)/test-git/t'
774+
775+
install -m755 -d '$(DESTDIR_SQ)/test-git/templates'
776+
(cd templates && $(TAR) cf - blt) | \
777+
(cd '$(DESTDIR_SQ)/test-git/templates' && $(TAR) xf -)
778+
779+
# po/build/locale for t0200
780+
install -m755 -d '$(DESTDIR_SQ)/test-git/po/build/locale'
781+
(cd po/build/locale && $(TAR) cf - .) | \
782+
(cd '$(DESTDIR_SQ)/test-git/po/build/locale' && $(TAR) xf -)
783+
784+
# git-daemon.exe for t5802, git-http-backend.exe for t5560
785+
install -m755 -d '$(DESTDIR_SQ)/$(MINGW_PREFIX)/bin'
786+
install -m755 git-daemon.exe git-http-backend.exe \
787+
'$(DESTDIR_SQ)/$(MINGW_PREFIX)/bin'
788+
789+
# git-upload-archive (dashed) for t5000
790+
install -m755 -d '$(DESTDIR_SQ)/$(MINGW_PREFIX)/bin'
791+
install -m755 git-upload-archive.exe '$(DESTDIR_SQ)/$(MINGW_PREFIX)/bin'
792+
793+
# git-difftool--helper for t7800
794+
install -m755 -d '$(DESTDIR_SQ)/$(MINGW_PREFIX)/libexec/git-core'
795+
install -m755 git-difftool--helper \
796+
'$(DESTDIR_SQ)/$(MINGW_PREFIX)/libexec/git-core'
741797
endif
742798
ifeq ($(uname_S),QNX)
743799
COMPAT_CFLAGS += -DSA_RESTART=0

‎git-sh-setup.sh

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -308,17 +308,30 @@ create_virtual_base() {
308308
# Platform specific tweaks to work around some commands
309309
case $(uname -s) in
310310
*MINGW*)
311-
# Windows has its own (incompatible) sort and find
312-
sort () {
313-
/usr/bin/sort "$@"
314-
}
315-
find () {
316-
/usr/bin/find "$@"
317-
}
318-
# git sees Windows-style pwd
319-
pwd () {
320-
builtin pwd -W
321-
}
311+
if test -x /usr/bin/sort
312+
then
313+
# Windows has its own (incompatible) sort; override
314+
sort () {
315+
/usr/bin/sort "$@"
316+
}
317+
fi
318+
if test -x /usr/bin/find
319+
then
320+
# Windows has its own (incompatible) find; override
321+
find () {
322+
/usr/bin/find "$@"
323+
}
324+
fi
325+
# On Windows, Git wants Windows paths. But /usr/bin/pwd spits out
326+
# Unix-style paths. At least in Bash, we have a builtin pwd that
327+
# understands the -W option to force "mixed" paths, i.e. with drive
328+
# prefix but still with forward slashes. Let's use that, if available.
329+
if type builtin >/dev/null 2>&1
330+
then
331+
pwd () {
332+
builtin pwd -W
333+
}
334+
fi
322335
is_absolute_path () {
323336
case "$1" in
324337
[/\\]* | [A-Za-z]:*)

‎t/helper/test-cmp.c

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
#include "test-tool.h"
2+
#include "git-compat-util.h"
3+
#include "strbuf.h"
4+
#include "gettext.h"
5+
#include "parse-options.h"
6+
#include "run-command.h"
7+
8+
#ifdef WIN32
9+
#define NO_SUCH_DIR "\\\\.\\GLOBALROOT\\invalid"
10+
#else
11+
#define NO_SUCH_DIR "/dev/null"
12+
#endif
13+
14+
static int run_diff(const char *path1, const char *path2)
15+
{
16+
const char *argv[] = {
17+
"diff", "--no-index", NULL, NULL, NULL
18+
};
19+
const char *env[] = {
20+
"GIT_PAGER=cat",
21+
"GIT_DIR=" NO_SUCH_DIR,
22+
"HOME=" NO_SUCH_DIR,
23+
NULL
24+
};
25+
26+
argv[2] = path1;
27+
argv[3] = path2;
28+
return run_command_v_opt_cd_env(argv,
29+
RUN_COMMAND_NO_STDIN | RUN_GIT_CMD,
30+
NULL, env);
31+
}
32+
33+
int cmd__cmp(int argc, const char **argv)
34+
{
35+
FILE *f0, *f1;
36+
struct strbuf b0 = STRBUF_INIT, b1 = STRBUF_INIT;
37+
38+
if (argc != 3)
39+
die("Require exactly 2 arguments, got %d", argc);
40+
41+
if (!(f0 = !strcmp(argv[1], "-") ? stdin : fopen(argv[1], "r")))
42+
return error_errno("could not open '%s'", argv[1]);
43+
if (!(f1 = !strcmp(argv[2], "-") ? stdin : fopen(argv[2], "r"))) {
44+
fclose(f0);
45+
return error_errno("could not open '%s'", argv[2]);
46+
}
47+
48+
for (;;) {
49+
int r0 = strbuf_getline(&b0, f0);
50+
int r1 = strbuf_getline(&b1, f1);
51+
52+
if (r0 == EOF) {
53+
fclose(f0);
54+
fclose(f1);
55+
strbuf_release(&b0);
56+
strbuf_release(&b1);
57+
if (r1 == EOF)
58+
return 0;
59+
cmp_failed:
60+
if (!run_diff(argv[1], argv[2]))
61+
die("Huh? 'diff --no-index %s %s' succeeded",
62+
argv[1], argv[2]);
63+
return 1;
64+
}
65+
if (r1 == EOF || strbuf_cmp(&b0, &b1)) {
66+
fclose(f0);
67+
fclose(f1);
68+
strbuf_release(&b0);
69+
strbuf_release(&b1);
70+
goto cmp_failed;
71+
}
72+
}
73+
}

0 commit comments

Comments
 (0)