From: Ralf Thielow <ralf.thielow@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, larsxschneider@gmail.com, me@jnm2.com,
philipoakley@iee.org, john@keeping.me.uk,
johannes.schindelin@gmx.de, Ralf Thielow <ralf.thielow@gmail.com>
Subject: [PATCH v2 1/3] Revert "display HTML in default browser using Windows' shell API"
Date: Fri, 26 Aug 2016 19:58:34 +0200 [thread overview]
Message-ID: <20160826175836.14073-2-ralf.thielow@gmail.com> (raw)
In-Reply-To: <20160826175836.14073-1-ralf.thielow@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Since 4804aab (help (Windows): Display HTML in default browser using
Windows' shell API, 2008-07-13), Git for Windows used to call
`ShellExecute()` to launch the default Windows handler for `.html`
files.
The idea was to avoid going through a shell script, for performance
reasons.
However, this change ignores the `help.browser` config setting. Together
with browsing help not being a performance-critical operation, let's
just revert that patch.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
builtin/help.c | 7 -------
compat/mingw.c | 42 ------------------------------------------
compat/mingw.h | 3 ---
3 files changed, 52 deletions(-)
diff --git a/builtin/help.c b/builtin/help.c
index 8848013..e8f79d7 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -379,17 +379,10 @@ static void get_html_page_path(struct strbuf *page_path, const char *page)
free(to_free);
}
-/*
- * If open_html is not defined in a platform-specific way (see for
- * example compat/mingw.h), we use the script web--browse to display
- * HTML.
- */
-#ifndef open_html
static void open_html(const char *path)
{
execl_git_cmd("web--browse", "-c", "help.browser", path, (char *)NULL);
}
-#endif
static void show_html_page(const char *git_cmd)
{
diff --git a/compat/mingw.c b/compat/mingw.c
index 2b5467d..3fbfda5 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1930,48 +1930,6 @@ int mingw_raise(int sig)
}
}
-
-static const char *make_backslash_path(const char *path)
-{
- static char buf[PATH_MAX + 1];
- char *c;
-
- if (strlcpy(buf, path, PATH_MAX) >= PATH_MAX)
- die("Too long path: %.*s", 60, path);
-
- for (c = buf; *c; c++) {
- if (*c == '/')
- *c = '\\';
- }
- return buf;
-}
-
-void mingw_open_html(const char *unixpath)
-{
- const char *htmlpath = make_backslash_path(unixpath);
- typedef HINSTANCE (WINAPI *T)(HWND, const char *,
- const char *, const char *, const char *, INT);
- T ShellExecute;
- HMODULE shell32;
- int r;
-
- shell32 = LoadLibrary("shell32.dll");
- if (!shell32)
- die("cannot load shell32.dll");
- ShellExecute = (T)GetProcAddress(shell32, "ShellExecuteA");
- if (!ShellExecute)
- die("cannot run browser");
-
- printf("Launching default browser to display HTML ...\n");
- r = HCAST(int, ShellExecute(NULL, "open", htmlpath,
- NULL, "\\", SW_SHOWNORMAL));
- FreeLibrary(shell32);
- /* see the MSDN documentation referring to the result codes here */
- if (r <= 32) {
- die("failed to launch browser for %.*s", MAX_PATH, unixpath);
- }
-}
-
int link(const char *oldpath, const char *newpath)
{
typedef BOOL (WINAPI *T)(LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES);
diff --git a/compat/mingw.h b/compat/mingw.h
index 95e128f..2cadb81 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -417,9 +417,6 @@ int mingw_offset_1st_component(const char *path);
#include <inttypes.h>
#endif
-void mingw_open_html(const char *path);
-#define open_html mingw_open_html
-
/**
* Converts UTF-8 encoded string to UTF-16LE.
*
--
2.9.2.912.gd0c0e83
next prev parent reply other threads:[~2016-08-26 17:58 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-12 2:00 `git stash --help` tries to pull up nonexistent file gitstack.html Joseph Musser
2016-08-12 15:48 ` Junio C Hamano
2016-08-12 16:03 ` Lars Schneider
2016-08-12 16:15 ` Joseph Musser
2016-08-12 16:25 ` Junio C Hamano
2016-08-12 18:14 ` Jacob Keller
2016-08-12 20:10 ` [PATCH] help: make option --help open man pages only for Git commands Ralf Thielow
2016-08-12 21:34 ` Junio C Hamano
2016-08-12 22:53 ` Junio C Hamano
2016-08-13 0:08 ` Philip Oakley
2016-08-13 15:31 ` Junio C Hamano
2016-08-15 5:36 ` [PATCH v2] " Ralf Thielow
2016-08-15 11:25 ` Philip Oakley
2016-08-15 17:57 ` Junio C Hamano
2016-08-15 20:40 ` Philip Oakley
2016-08-15 22:19 ` Junio C Hamano
2016-08-16 10:06 ` John Keeping
2016-08-16 16:20 ` [PATCH v3] " Ralf Thielow
2016-08-16 16:33 ` John Keeping
2016-08-16 16:39 ` Ralf Thielow
2016-08-16 17:27 ` Junio C Hamano
2016-08-16 17:57 ` Ralf Thielow
2016-08-16 19:06 ` Junio C Hamano
2016-08-18 18:57 ` [PATCH 0/2] " Ralf Thielow
2016-08-18 18:57 ` [PATCH 1/2] help: introduce option --command-only Ralf Thielow
2016-08-18 18:57 ` [PATCH 2/2] help: make option --help open man pages only for Git commands Ralf Thielow
2016-08-18 19:51 ` Junio C Hamano
2016-08-23 17:34 ` Ralf Thielow
2016-08-18 21:47 ` [PATCH 1/2] help: introduce option --command-only Philip Oakley
2016-08-19 8:32 ` Johannes Schindelin
2016-08-19 15:53 ` Junio C Hamano
2016-08-23 17:41 ` Ralf Thielow
2016-08-24 7:47 ` Johannes Schindelin
2016-08-19 8:39 ` Remi Galan Alfonso
2016-08-23 17:37 ` Ralf Thielow
2016-08-26 17:58 ` [PATCH v2 0/3] help: make option --help open man pages only for Git commands Ralf Thielow
2016-08-26 17:58 ` Ralf Thielow [this message]
2016-08-26 17:58 ` [PATCH v2 2/3] help: introduce option --exclude-guides Ralf Thielow
2016-08-26 19:06 ` Junio C Hamano
2016-08-26 19:42 ` Junio C Hamano
2016-08-26 20:03 ` Ralf Thielow
2016-08-26 20:28 ` Junio C Hamano
2016-08-26 20:00 ` Ralf Thielow
2016-08-26 20:20 ` Junio C Hamano
2016-08-26 20:39 ` Ralf Thielow
2016-08-26 17:58 ` [PATCH v2 3/3] help: make option --help open man pages only for Git commands Ralf Thielow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160826175836.14073-2-ralf.thielow@gmail.com \
--to=ralf.thielow@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=john@keeping.me.uk \
--cc=larsxschneider@gmail.com \
--cc=me@jnm2.com \
--cc=philipoakley@iee.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).