Skip to content

Commit 68e9b5a

Browse files
dschodscho
committed
Merge branch 'busybox-w32'
Signed-off-by: Johannes Schindelin <[email protected]>
2 parents 95a1de2 + 6cce4e5 commit 68e9b5a

48 files changed

Lines changed: 460 additions & 202 deletions

Some content is hidden

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

‎.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
@@ -693,6 +693,7 @@ PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS))
693693
TEST_BUILTINS_OBJS += test-advise.o
694694
TEST_BUILTINS_OBJS += test-bloom.o
695695
TEST_BUILTINS_OBJS += test-chmtime.o
696+
TEST_BUILTINS_OBJS += test-cmp.o
696697
TEST_BUILTINS_OBJS += test-config.o
697698
TEST_BUILTINS_OBJS += test-crontab.o
698699
TEST_BUILTINS_OBJS += test-ctype.o
@@ -711,6 +712,7 @@ TEST_BUILTINS_OBJS += test-genzeros.o
711712
TEST_BUILTINS_OBJS += test-hash-speed.o
712713
TEST_BUILTINS_OBJS += test-hash.o
713714
TEST_BUILTINS_OBJS += test-hashmap.o
715+
TEST_BUILTINS_OBJS += test-iconv.o
714716
TEST_BUILTINS_OBJS += test-index-version.o
715717
TEST_BUILTINS_OBJS += test-json-writer.o
716718
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
@@ -11,6 +11,7 @@
1111
#include "dir.h"
1212
#include "win32/fscache.h"
1313
#include "../attr.h"
14+
#include "../string-list.h"
1415

1516
#define HCAST(type, handle) ((type)(intptr_t)handle)
1617

@@ -1538,6 +1539,65 @@ static char *lookup_prog(const char *dir, int dirlen, const char *cmd,
15381539
return NULL;
15391540
}
15401541

1542+
static char *path_lookup(const char *cmd, int exe_only);
1543+
1544+
static char *is_busybox_applet(const char *cmd)
1545+
{
1546+
static struct string_list applets = STRING_LIST_INIT_DUP;
1547+
static char *busybox_path;
1548+
static int busybox_path_initialized;
1549+
1550+
/* Avoid infinite loop */
1551+
if (!strncasecmp(cmd, "busybox", 7) &&
1552+
(!cmd[7] || !strcasecmp(cmd + 7, ".exe")))
1553+
return NULL;
1554+
1555+
if (!busybox_path_initialized) {
1556+
busybox_path = path_lookup("busybox.exe", 1);
1557+
busybox_path_initialized = 1;
1558+
}
1559+
1560+
/* Assume that sh is compiled in... */
1561+
if (!busybox_path || !strcasecmp(cmd, "sh"))
1562+
return xstrdup_or_null(busybox_path);
1563+
1564+
if (!applets.nr) {
1565+
struct child_process cp = CHILD_PROCESS_INIT;
1566+
struct strbuf buf = STRBUF_INIT;
1567+
char *p;
1568+
1569+
strvec_pushl(&cp.args, busybox_path, "--help", NULL);
1570+
1571+
if (capture_command(&cp, &buf, 2048)) {
1572+
string_list_append(&applets, "");
1573+
return NULL;
1574+
}
1575+
1576+
/* parse output */
1577+
p = strstr(buf.buf, "Currently defined functions:\n");
1578+
if (!p) {
1579+
warning("Could not parse output of busybox --help");
1580+
string_list_append(&applets, "");
1581+
return NULL;
1582+
}
1583+
p = strchrnul(p, '\n');
1584+
for (;;) {
1585+
size_t len;
1586+
1587+
p += strspn(p, "\n\t ,");
1588+
len = strcspn(p, "\n\t ,");
1589+
if (!len)
1590+
break;
1591+
p[len] = '\0';
1592+
string_list_insert(&applets, p);
1593+
p = p + len + 1;
1594+
}
1595+
}
1596+
1597+
return string_list_has_string(&applets, cmd) ?
1598+
xstrdup(busybox_path) : NULL;
1599+
}
1600+
15411601
/*
15421602
* Determines the absolute path of cmd using the split path in path.
15431603
* If cmd contains a slash or backslash, no lookup is performed.
@@ -1566,6 +1626,9 @@ static char *path_lookup(const char *cmd, int exe_only)
15661626
path = sep + 1;
15671627
}
15681628

1629+
if (!prog && !isexe)
1630+
prog = is_busybox_applet(cmd);
1631+
15691632
return prog;
15701633
}
15711634

@@ -1765,8 +1828,8 @@ static int is_msys2_sh(const char *cmd)
17651828
}
17661829

17671830
static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaenv,
1768-
const char *dir,
1769-
int prepend_cmd, int fhin, int fhout, int fherr)
1831+
const char *dir, const char *prepend_cmd,
1832+
int fhin, int fhout, int fherr)
17701833
{
17711834
static int restrict_handle_inheritance = -1;
17721835
STARTUPINFOEXW si;
@@ -1857,9 +1920,9 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
18571920
/* concatenate argv, quoting args as we go */
18581921
strbuf_init(&args, 0);
18591922
if (prepend_cmd) {
1860-
char *quoted = (char *)quote_arg(cmd);
1923+
char *quoted = (char *)quote_arg(prepend_cmd);
18611924
strbuf_addstr(&args, quoted);
1862-
if (quoted != cmd)
1925+
if (quoted != prepend_cmd)
18631926
free(quoted);
18641927
}
18651928
for (; *argv; argv++) {
@@ -2018,7 +2081,8 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
20182081
return (pid_t)pi.dwProcessId;
20192082
}
20202083

2021-
static pid_t mingw_spawnv(const char *cmd, const char **argv, int prepend_cmd)
2084+
static pid_t mingw_spawnv(const char *cmd, const char **argv,
2085+
const char *prepend_cmd)
20222086
{
20232087
return mingw_spawnve_fd(cmd, argv, NULL, NULL, prepend_cmd, 0, 1, 2);
20242088
}
@@ -2046,14 +2110,14 @@ pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **deltaenv,
20462110
pid = -1;
20472111
}
20482112
else {
2049-
pid = mingw_spawnve_fd(iprog, argv, deltaenv, dir, 1,
2113+
pid = mingw_spawnve_fd(iprog, argv, deltaenv, dir, interpr,
20502114
fhin, fhout, fherr);
20512115
free(iprog);
20522116
}
20532117
argv[0] = argv0;
20542118
}
20552119
else
2056-
pid = mingw_spawnve_fd(prog, argv, deltaenv, dir, 0,
2120+
pid = mingw_spawnve_fd(prog, argv, deltaenv, dir, NULL,
20572121
fhin, fhout, fherr);
20582122
free(prog);
20592123
}
@@ -2081,7 +2145,7 @@ static int try_shell_exec(const char *cmd, char *const *argv)
20812145
argv2[0] = (char *)cmd; /* full path to the script file */
20822146
COPY_ARRAY(&argv2[1], &argv[1], argc);
20832147
exec_id = trace2_exec(prog, argv2);
2084-
pid = mingw_spawnv(prog, argv2, 1);
2148+
pid = mingw_spawnv(prog, argv2, interpr);
20852149
if (pid >= 0) {
20862150
int status;
20872151
if (waitpid(pid, &status, 0) < 0)
@@ -2105,7 +2169,7 @@ int mingw_execv(const char *cmd, char *const *argv)
21052169
int exec_id;
21062170

21072171
exec_id = trace2_exec(cmd, (const char **)argv);
2108-
pid = mingw_spawnv(cmd, (const char **)argv, 0);
2172+
pid = mingw_spawnv(cmd, (const char **)argv, NULL);
21092173
if (pid < 0) {
21102174
trace2_exec_result(exec_id, -1);
21112175
return -1;

‎config.mak.uname‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -694,6 +694,62 @@ else
694694
NO_CURL = YesPlease
695695
endif
696696
endif
697+
ifeq (i686,$(uname_M))
698+
MINGW_PREFIX := mingw32
699+
endif
700+
ifeq (x86_64,$(uname_M))
701+
MINGW_PREFIX := mingw64
702+
endif
703+
704+
DESTDIR_WINDOWS = $(shell cygpath -aw '$(DESTDIR_SQ)')
705+
DESTDIR_MIXED = $(shell cygpath -am '$(DESTDIR_SQ)')
706+
install-mingit-test-artifacts:
707+
install -m755 -d '$(DESTDIR_SQ)/usr/bin'
708+
printf '%s\n%s\n' >'$(DESTDIR_SQ)/usr/bin/perl' \
709+
"#!/mingw64/bin/busybox sh" \
710+
"exec \"$(shell cygpath -am /usr/bin/perl.exe)\" \"\$$@\""
711+
712+
install -m755 -d '$(DESTDIR_SQ)'
713+
printf '%s%s\n%s\n%s\n%s\n%s\n' >'$(DESTDIR_SQ)/init.bat' \
714+
"PATH=$(DESTDIR_WINDOWS)\\$(MINGW_PREFIX)\\bin;" \
715+
"C:\\WINDOWS;C:\\WINDOWS\\system32" \
716+
"@set GIT_TEST_INSTALLED=$(DESTDIR_MIXED)/$(MINGW_PREFIX)/bin" \
717+
"@`echo "$(DESTDIR_WINDOWS)" | sed 's/:.*/:/'`" \
718+
"@cd `echo "$(DESTDIR_WINDOWS)" | sed 's/^.://'`\\test-git\\t" \
719+
"@echo Now, run 'helper\\test-run-command testsuite'"
720+
721+
install -m755 -d '$(DESTDIR_SQ)/test-git'
722+
sed 's/^\(NO_PERL\|NO_PYTHON\)=.*/\1=YesPlease/' \
723+
<GIT-BUILD-OPTIONS >'$(DESTDIR_SQ)/test-git/GIT-BUILD-OPTIONS'
724+
725+
install -m755 -d '$(DESTDIR_SQ)/test-git/t/helper'
726+
install -m755 $(TEST_PROGRAMS) '$(DESTDIR_SQ)/test-git/t/helper'
727+
(cd t && $(TAR) cf - t[0-9][0-9][0-9][0-9] lib-diff) | \
728+
(cd '$(DESTDIR_SQ)/test-git/t' && $(TAR) xf -)
729+
install -m755 t/t556x_common t/*.sh '$(DESTDIR_SQ)/test-git/t'
730+
731+
install -m755 -d '$(DESTDIR_SQ)/test-git/templates'
732+
(cd templates && $(TAR) cf - blt) | \
733+
(cd '$(DESTDIR_SQ)/test-git/templates' && $(TAR) xf -)
734+
735+
# po/build/locale for t0200
736+
install -m755 -d '$(DESTDIR_SQ)/test-git/po/build/locale'
737+
(cd po/build/locale && $(TAR) cf - .) | \
738+
(cd '$(DESTDIR_SQ)/test-git/po/build/locale' && $(TAR) xf -)
739+
740+
# git-daemon.exe for t5802, git-http-backend.exe for t5560
741+
install -m755 -d '$(DESTDIR_SQ)/$(MINGW_PREFIX)/bin'
742+
install -m755 git-daemon.exe git-http-backend.exe \
743+
'$(DESTDIR_SQ)/$(MINGW_PREFIX)/bin'
744+
745+
# git-upload-archive (dashed) for t5000
746+
install -m755 -d '$(DESTDIR_SQ)/$(MINGW_PREFIX)/bin'
747+
install -m755 git-upload-archive.exe '$(DESTDIR_SQ)/$(MINGW_PREFIX)/bin'
748+
749+
# git-difftool--helper for t7800
750+
install -m755 -d '$(DESTDIR_SQ)/$(MINGW_PREFIX)/libexec/git-core'
751+
install -m755 git-difftool--helper \
752+
'$(DESTDIR_SQ)/$(MINGW_PREFIX)/libexec/git-core'
697753
endif
698754
ifeq ($(uname_S),QNX)
699755
COMPAT_CFLAGS += -DSA_RESTART=0

‎git-sh-setup.sh‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -333,17 +333,30 @@ create_virtual_base() {
333333
# Platform specific tweaks to work around some commands
334334
case $(uname -s) in
335335
*MINGW*)
336-
# Windows has its own (incompatible) sort and find
337-
sort () {
338-
/usr/bin/sort "$@"
339-
}
340-
find () {
341-
/usr/bin/find "$@"
342-
}
343-
# git sees Windows-style pwd
344-
pwd () {
345-
builtin pwd -W
346-
}
336+
if test -x /usr/bin/sort
337+
then
338+
# Windows has its own (incompatible) sort; override
339+
sort () {
340+
/usr/bin/sort "$@"
341+
}
342+
fi
343+
if test -x /usr/bin/find
344+
then
345+
# Windows has its own (incompatible) find; override
346+
find () {
347+
/usr/bin/find "$@"
348+
}
349+
fi
350+
# On Windows, Git wants Windows paths. But /usr/bin/pwd spits out
351+
# Unix-style paths. At least in Bash, we have a builtin pwd that
352+
# understands the -W option to force "mixed" paths, i.e. with drive
353+
# prefix but still with forward slashes. Let's use that, if available.
354+
if type builtin >/dev/null 2>&1
355+
then
356+
pwd () {
357+
builtin pwd -W
358+
}
359+
fi
347360
is_absolute_path () {
348361
case "$1" in
349362
[/\\]* | [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)