forked from msys2/MSYS2-packages
-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Git for Windows Build Agent <[email protected]>
- Loading branch information
Git for Windows Build Agent
committed
Nov 10, 2018
1 parent
38ff25d
commit ca383bf
Showing
60 changed files
with
712 additions
and
1,345 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From e923fc0c6137cf2a0d6a5a811ee399e3b0a7df8b Mon Sep 17 00:00:00 2001 | ||
From cc5f9392d2f34a4aa71ca1e62da56f06aecaa874 Mon Sep 17 00:00:00 2001 | ||
From: Alexpux <[email protected]> | ||
Date: Tue, 5 Apr 2016 10:15:20 +0300 | ||
Subject: [PATCH 02/N] Rename DLL from cygwin to msys | ||
|
@@ -17,8 +17,6 @@ Subject: [PATCH 02/N] Rename DLL from cygwin to msys | |
winsup/cygwin/cygthread.cc | 2 +- | ||
winsup/cygwin/cygwin.sc.in | 21 +++++++---- | ||
winsup/cygwin/dcrt0.cc | 20 ++++++----- | ||
winsup/cygwin/devices.cc | 2 +- | ||
winsup/cygwin/devices.in | 2 +- | ||
winsup/cygwin/dlfcn.cc | 5 +++ | ||
winsup/cygwin/dll_init.cc | 8 +++++ | ||
winsup/cygwin/dtable.cc | 6 ++++ | ||
|
@@ -58,7 +56,7 @@ Subject: [PATCH 02/N] Rename DLL from cygwin to msys | |
winsup/utils/path.cc | 12 +++---- | ||
winsup/utils/ssp.c | 8 ++--- | ||
winsup/utils/strace.cc | 10 +++--- | ||
54 files changed, 250 insertions(+), 137 deletions(-) | ||
52 files changed, 248 insertions(+), 135 deletions(-) | ||
|
||
diff --git a/winsup/Makefile.in b/winsup/Makefile.in | ||
index 148d985..81ce93c 100644 | ||
|
@@ -117,7 +115,7 @@ index e101623..66272bc 100644 | |
|
||
/* Named pipes based transport, for security on NT */ | ||
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in | ||
index b75774a..88d5c49 100644 | ||
index a232836..6b31632 100644 | ||
--- a/winsup/cygwin/Makefile.in | ||
+++ b/winsup/cygwin/Makefile.in | ||
@@ -106,17 +106,17 @@ RUNTEST = `if [ -f $${srcdir}/../dejagnu/runtest ] ; then \ | ||
|
@@ -153,7 +151,7 @@ index b75774a..88d5c49 100644 | |
--exclude='(?i:dll)' \ | ||
--exclude='reloc' \ | ||
--exclude='^main$$' \ | ||
@@ -540,7 +541,7 @@ endif | ||
@@ -542,7 +543,7 @@ endif | ||
|
||
API_VER:=$(srcdir)/include/cygwin/version.h | ||
|
||
|
@@ -162,7 +160,7 @@ index b75774a..88d5c49 100644 | |
SUBLIBS:=libpthread.a libutil.a ${CURDIR}/libm.a ${CURDIR}/libc.a libdl.a libresolv.a librt.a libacl.a libssp.a | ||
EXTRALIBS:=libautomode.a libbinmode.a libtextmode.a libtextreadmode.a | ||
INSTOBJS:=automode.o binmode.o textmode.o textreadmode.o | ||
@@ -590,7 +591,8 @@ install-libs: $(TARGET_LIBS) | ||
@@ -592,7 +593,8 @@ install-libs: $(TARGET_LIBS) | ||
for i in $^; do \ | ||
$(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/lib/`basename $$i` ; \ | ||
done | ||
|
@@ -172,7 +170,7 @@ index b75774a..88d5c49 100644 | |
|
||
install-headers: | ||
cd $(srcdir); \ | ||
@@ -655,7 +657,7 @@ uninstall-man: | ||
@@ -657,7 +659,7 @@ uninstall-man: | ||
done | ||
|
||
clean distclean realclean: | ||
|
@@ -181,7 +179,7 @@ index b75774a..88d5c49 100644 | |
-@$(MAKE) -C ${cygserver_blddir} libclean | ||
|
||
maintainer-clean: clean | ||
@@ -668,29 +670,29 @@ maintainer-clean: clean | ||
@@ -670,29 +672,29 @@ maintainer-clean: clean | ||
$(LDSCRIPT): $(LDSCRIPT).in | ||
$(CC) -E - -P < $^ -o $@ | ||
|
||
|
@@ -220,10 +218,10 @@ index b75774a..88d5c49 100644 | |
$(LIBSERVER): ${cygserver_blddir}/Makefile | ||
$(MAKE) -C ${cygserver_blddir} libcygserver.a | ||
diff --git a/winsup/cygwin/common.din b/winsup/cygwin/common.din | ||
index 6e8bf91..f6ddc0b 100644 | ||
index d1d9555..0e003df 100644 | ||
--- a/winsup/cygwin/common.din | ||
+++ b/winsup/cygwin/common.din | ||
@@ -372,8 +372,8 @@ cygwin_attach_handle_to_fd SIGFE | ||
@@ -382,8 +382,8 @@ cygwin_attach_handle_to_fd SIGFE | ||
cygwin_conv_path SIGFE | ||
cygwin_conv_path_list SIGFE | ||
cygwin_create_path SIGFE | ||
|
@@ -468,32 +466,6 @@ index af5eaac..7a23e03 100644 | |
small_printf ("%05u ***** %s : %10d\n", GetCurrentProcessId (), s, strace.microseconds ()); | ||
} | ||
#endif | ||
diff --git a/winsup/cygwin/devices.cc b/winsup/cygwin/devices.cc | ||
index c2df919..537bf35 100644 | ||
--- a/winsup/cygwin/devices.cc | ||
+++ b/winsup/cygwin/devices.cc | ||
@@ -308,7 +308,7 @@ const _RDATA _device dev_storage[] = | ||
{"/dev/fd14", BRACK(FHDEV(DEV_FLOPPY_MAJOR, 14)), "\\Device\\Floppy14", exists_ntdev, S_IFBLK, true}, | ||
{"/dev/fd15", BRACK(FHDEV(DEV_FLOPPY_MAJOR, 15)), "\\Device\\Floppy15", exists_ntdev, S_IFBLK, true}, | ||
{"/dev/full", BRACK(FH_FULL), "\\Device\\Null", exists_ntdev, S_IFCHR, true}, | ||
- {"/dev/kmsg", BRACK(FH_KMSG), "\\Device\\MailSlot\\cygwin\\dev\\kmsg", exists_ntdev, S_IFCHR, true}, | ||
+ {"/dev/kmsg", BRACK(FH_KMSG), "\\Device\\MailSlot\\msys\\dev\\kmsg", exists_ntdev, S_IFCHR, true}, | ||
{"/dev/nst0", BRACK(FHDEV(DEV_TAPE_MAJOR, 128)), "\\Device\\Tape0", exists_ntdev, S_IFBLK, true}, | ||
{"/dev/nst1", BRACK(FHDEV(DEV_TAPE_MAJOR, 129)), "\\Device\\Tape1", exists_ntdev, S_IFBLK, true}, | ||
{"/dev/nst2", BRACK(FHDEV(DEV_TAPE_MAJOR, 130)), "\\Device\\Tape2", exists_ntdev, S_IFBLK, true}, | ||
diff --git a/winsup/cygwin/devices.in b/winsup/cygwin/devices.in | ||
index 3ec3249..3d2eaf3 100644 | ||
--- a/winsup/cygwin/devices.in | ||
+++ b/winsup/cygwin/devices.in | ||
@@ -166,7 +166,7 @@ const _device dev_error_storage = | ||
"/dev/fd%(0-15)d", BRACK(FHDEV(DEV_FLOPPY_MAJOR, {$1})), "\\Device\\Floppy{$1}", exists_ntdev, S_IFBLK | ||
"/dev/scd%(0-15)d", BRACK(FHDEV(DEV_CDROM_MAJOR, {$1})), "\\Device\\CdRom{$1}", exists_ntdev, S_IFBLK | ||
"/dev/sr%(0-15)d", BRACK(FHDEV(DEV_CDROM_MAJOR, {$1})), "\\Device\\CdRom{$1}", exists_ntdev, S_IFBLK | ||
-"/dev/kmsg", BRACK(FH_KMSG), "\\Device\\MailSlot\\cygwin\\dev\\kmsg", exists_ntdev, S_IFCHR | ||
+"/dev/kmsg", BRACK(FH_KMSG), "\\Device\\MailSlot\\msys\\dev\\kmsg", exists_ntdev, S_IFCHR | ||
%other {return NULL;} | ||
%% | ||
#undef BRACK | ||
diff --git a/winsup/cygwin/dlfcn.cc b/winsup/cygwin/dlfcn.cc | ||
index 7ef7dfd..eeec7fb 100644 | ||
--- a/winsup/cygwin/dlfcn.cc | ||
|
@@ -540,7 +512,7 @@ index 549e5cc..cbb7957 100644 | |
HANDLE retaddr; | ||
if (_my_tls.isinitialized ()) | ||
diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc | ||
index f464618..e6f560f 100644 | ||
index 0ebeef0..3d6ebc0 100644 | ||
--- a/winsup/cygwin/dtable.cc | ||
+++ b/winsup/cygwin/dtable.cc | ||
@@ -965,9 +965,15 @@ handle_to_fn (HANDLE h, char *posix_fn) | ||
|
@@ -560,7 +532,7 @@ index f464618..e6f560f 100644 | |
w32len = cygheap->installation_key.Length / sizeof (WCHAR); | ||
if (w32len | ||
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc | ||
index f659540..049fd64 100644 | ||
index 419b097..2cdfed7 100644 | ||
--- a/winsup/cygwin/exceptions.cc | ||
+++ b/winsup/cygwin/exceptions.cc | ||
@@ -500,14 +500,14 @@ try_to_debug (bool waitloop) | ||
|
@@ -581,7 +553,7 @@ index f659540..049fd64 100644 | |
break; | ||
} | ||
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc | ||
index 0b8185d..1790083 100644 | ||
index 7fe46eb..81618b1 100644 | ||
--- a/winsup/cygwin/fhandler_tty.cc | ||
+++ b/winsup/cygwin/fhandler_tty.cc | ||
@@ -464,7 +464,11 @@ fhandler_pty_slave::open (int flags, mode_t) | ||
|
@@ -621,7 +593,7 @@ index 0b8185d..1790083 100644 | |
master_ctl = CreateNamedPipe (buf, PIPE_ACCESS_DUPLEX | ||
| FILE_FLAG_FIRST_PIPE_INSTANCE, | ||
diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc | ||
index bcbef12..2a9567c 100644 | ||
index c6fef67..fbac1f9 100644 | ||
--- a/winsup/cygwin/fork.cc | ||
+++ b/winsup/cygwin/fork.cc | ||
@@ -160,7 +160,7 @@ frok::child (volatile char * volatile here) | ||
|
@@ -650,7 +622,7 @@ index 4078e65..3c992bb 100644 | |
if (!fn) | ||
{ | ||
diff --git a/winsup/cygwin/i686.din b/winsup/cygwin/i686.din | ||
index f3cd2fd..417a827 100644 | ||
index 934243b..515e8e6 100644 | ||
--- a/winsup/cygwin/i686.din | ||
+++ b/winsup/cygwin/i686.din | ||
@@ -1,4 +1,4 @@ | ||
|
@@ -659,7 +631,7 @@ index f3cd2fd..417a827 100644 | |
|
||
EXPORTS | ||
#Exported variables | ||
@@ -598,7 +598,7 @@ cygwin32_conv_to_full_posix_path = cygwin_conv_to_full_posix_path SIGFE | ||
@@ -596,7 +596,7 @@ cygwin32_conv_to_full_posix_path = cygwin_conv_to_full_posix_path SIGFE | ||
cygwin32_conv_to_full_win32_path = cygwin_conv_to_full_win32_path SIGFE | ||
cygwin32_conv_to_posix_path = cygwin_conv_to_posix_path SIGFE | ||
cygwin32_conv_to_win32_path = cygwin_conv_to_win32_path SIGFE | ||
|
@@ -668,7 +640,7 @@ index f3cd2fd..417a827 100644 | |
cygwin32_internal = cygwin_internal SIGFE | ||
cygwin32_posix_path_list_p = cygwin_posix_path_list_p NOSIGFE | ||
cygwin32_posix_to_win32_path_list = cygwin_posix_to_win32_path_list SIGFE | ||
@@ -616,7 +616,7 @@ cygwin_posix_to_win32_path_list_buf_size SIGFE | ||
@@ -614,7 +614,7 @@ cygwin_posix_to_win32_path_list_buf_size SIGFE | ||
cygwin_win32_to_posix_path_list SIGFE | ||
cygwin_win32_to_posix_path_list_buf_size SIGFE | ||
dll_entry@12 NOSIGFE | ||
|
@@ -732,10 +704,10 @@ index 56b4363..6bc948a 100644 | |
|
||
#endif /* __CYGWIN_CYGWIN_DLL_H__ */ | ||
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h | ||
index fa9137d..5c130cf 100644 | ||
index 0eede79..b5af4fd 100644 | ||
--- a/winsup/cygwin/include/cygwin/version.h | ||
+++ b/winsup/cygwin/include/cygwin/version.h | ||
@@ -511,7 +511,11 @@ details. */ | ||
@@ -516,7 +516,11 @@ details. */ | ||
names include the CYGWIN_VERSION_SHARED_DATA version as well as this | ||
identifier. */ | ||
|
||
|
@@ -747,7 +719,7 @@ index fa9137d..5c130cf 100644 | |
|
||
/* The Cygwin mount table interface in the Win32 registry also has a version | ||
number associated with it in case that is changed in a non-backwards | ||
@@ -527,7 +531,11 @@ details. */ | ||
@@ -532,7 +536,11 @@ details. */ | ||
|
||
/* Identifiers used in the Win32 registry. */ | ||
|
||
|
@@ -861,7 +833,7 @@ index 5aecb14..15eddda 100755 | |
"END_CYGWIN_VERSION_INFO\n\0"; | ||
cygwin_version_info cygwin_version = | ||
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc | ||
index e4eef8b..f7893a2 100644 | ||
index 6b6986c..f4ca032 100644 | ||
--- a/winsup/cygwin/pinfo.cc | ||
+++ b/winsup/cygwin/pinfo.cc | ||
@@ -188,7 +188,7 @@ pinfo::maybe_set_exit_code_from_windows () | ||
|
@@ -956,10 +928,10 @@ index d4c2701..6001299 100644 | |
ts.SourceIdentifier.LowPart = 0x0103; | ||
|
||
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc | ||
index 31b7629..2e10098 100644 | ||
index 6d10855..ffa3854 100644 | ||
--- a/winsup/cygwin/syscalls.cc | ||
+++ b/winsup/cygwin/syscalls.cc | ||
@@ -367,7 +367,7 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags) | ||
@@ -331,7 +331,7 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags) | ||
/* Create hopefully unique filename. | ||
Since we have to stick to the current directory on remote shares, make | ||
the new filename at least very unlikely to match by accident. It starts | ||
|
@@ -968,7 +940,7 @@ index 31b7629..2e10098 100644 | |
starting at U+dc00. Use plain ASCII chars on filesystems not supporting | ||
Unicode. The rest of the filename is the inode number in hex encoding | ||
and a hash of the full NT path in hex. The combination allows to remove | ||
@@ -376,7 +376,7 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags) | ||
@@ -340,7 +340,7 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags) | ||
RtlAppendUnicodeToString (&recycler, | ||
(pc.fs_flags () & FILE_UNICODE_ON_DISK | ||
&& !pc.fs_is_samba ()) | ||
|
@@ -978,10 +950,10 @@ index 31b7629..2e10098 100644 | |
/* Note: Modern Samba versions apparently don't like buffer sizes of more | ||
than 65535 in some NtQueryInformationFile/NtSetInformationFile calls. | ||
diff --git a/winsup/cygwin/syslog.cc b/winsup/cygwin/syslog.cc | ||
index 81717c6..36d1a1a 100644 | ||
index 6a29550..431f9d2 100644 | ||
--- a/winsup/cygwin/syslog.cc | ||
+++ b/winsup/cygwin/syslog.cc | ||
@@ -25,7 +25,11 @@ details. */ | ||
@@ -26,7 +26,11 @@ details. */ | ||
#include "cygtls.h" | ||
#include "tls_pbuf.h" | ||
|
||
|
@@ -994,7 +966,7 @@ index 81717c6..36d1a1a 100644 | |
static struct | ||
{ | ||
diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h | ||
index fcb08e2..43933ba 100644 | ||
index d5babd6..ff4d778 100644 | ||
--- a/winsup/cygwin/winsup.h | ||
+++ b/winsup/cygwin/winsup.h | ||
@@ -162,7 +162,11 @@ extern "C" void _pei386_runtime_relocator (per_process *); | ||
|
@@ -1225,7 +1197,7 @@ index be525d0..b9cc985 100644 | |
|
||
.PHONY: warn_dumper | ||
diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc | ||
index 2d5cda3..d34392a 100644 | ||
index d5972c0..6d61891 100644 | ||
--- a/winsup/utils/cygcheck.cc | ||
+++ b/winsup/utils/cygcheck.cc | ||
@@ -69,8 +69,7 @@ static const char *known_env_vars[] = { | ||
|
@@ -1338,7 +1310,7 @@ index 2d5cda3..d34392a 100644 | |
scan_registry (0, HKEY_CURRENT_USER, | ||
(char *) "HKEY_CURRENT_USER", 0, false); | ||
scan_registry (0, HKEY_LOCAL_MACHINE, | ||
@@ -1872,7 +1871,7 @@ dump_sysinfo () | ||
@@ -1868,7 +1867,7 @@ dump_sysinfo () | ||
printf ("\n"); | ||
|
||
if (givehelp) | ||
|
@@ -1347,7 +1319,7 @@ index 2d5cda3..d34392a 100644 | |
int cygwin_dll_count = 0; | ||
char cygdll_path[32768]; | ||
for (pathlike *pth = paths; pth->dir; pth++) | ||
@@ -1889,10 +1888,10 @@ dump_sysinfo () | ||
@@ -1885,10 +1884,10 @@ dump_sysinfo () | ||
wcstombs (f, ffinfo.cFileName, sizeof f); | ||
if (strcasecmp (f + strlen (f) - 4, ".dll") == 0) | ||
{ | ||
|
@@ -1360,7 +1332,7 @@ index 2d5cda3..d34392a 100644 | |
{ | ||
if (!cygwin_dll_count) | ||
strcpy (cygdll_path, pth->dir); | ||
@@ -1916,9 +1915,9 @@ dump_sysinfo () | ||
@@ -1912,9 +1911,9 @@ dump_sysinfo () | ||
FindClose (ff); | ||
} | ||
if (cygwin_dll_count > 1) | ||
|
@@ -1372,7 +1344,7 @@ index 2d5cda3..d34392a 100644 | |
|
||
dump_dodgy_apps (verbose); | ||
|
||
@@ -2165,8 +2164,8 @@ static char opts[] = "cdsrvkflphV"; | ||
@@ -2161,8 +2160,8 @@ static char opts[] = "cdsrvkflphV"; | ||
static void | ||
print_version () | ||
{ | ||
|
@@ -1383,7 +1355,7 @@ index 2d5cda3..d34392a 100644 | |
"Copyright (C) 1998 - %s Cygwin Authors\n" | ||
"This is free software; see the source for copying conditions. " | ||
"There is NO\n" | ||
@@ -2198,7 +2197,7 @@ load_cygwin (int& argc, char **&argv) | ||
@@ -2194,7 +2193,7 @@ load_cygwin (int& argc, char **&argv) | ||
{ | ||
HMODULE h; | ||
|
||
|
@@ -1430,7 +1402,7 @@ index c83b764..42ffbfd 100644 | |
wcscpy (dllpath, sysdir); | ||
wcscpy (dllpath + sysdir_len, dll); | ||
diff --git a/winsup/utils/path.cc b/winsup/utils/path.cc | ||
index a76cf76..4da4288 100644 | ||
index 17ea352..d0d4cab 100644 | ||
--- a/winsup/utils/path.cc | ||
+++ b/winsup/utils/path.cc | ||
@@ -598,14 +598,14 @@ read_mounts () | ||
|
@@ -1495,7 +1467,7 @@ index 548b89a..09ee26d 100644 | |
"The \"-b\" means 'skip the help pages'. You can omit this until you're\n" | ||
"familiar with the report layout. The gprof documentation explains\n" | ||
diff --git a/winsup/utils/strace.cc b/winsup/utils/strace.cc | ||
index ae62cdc..5fc5888 100644 | ||
index 21c0835..0c3266c 100644 | ||
--- a/winsup/utils/strace.cc | ||
+++ b/winsup/utils/strace.cc | ||
@@ -283,7 +283,7 @@ load_cygwin () | ||
|
Oops, something went wrong.