From: Steffen Prohaska <prohaska@zib.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Johannes Sixt <johannes.sixt@telecom.at>,
Steffen Prohaska <prohaska@zib.de>
Subject: [PATCH 3/7 v2] git_extract_argv0_path(): Move check for valid argv0 from caller to callee
Date: Sun, 18 Jan 2009 13:00:11 +0100 [thread overview]
Message-ID: <1232280015-8144-4-git-send-email-prohaska@zib.de> (raw)
In-Reply-To: <1232280015-8144-3-git-send-email-prohaska@zib.de>
This simplifies the calling code.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
---
exec_cmd.c | 3 +++
git.c | 5 ++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/exec_cmd.c b/exec_cmd.c
index 23a52cf..89931e4 100644
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -23,6 +23,9 @@ const char *system_path(const char *path)
const char *git_extract_argv0_path(const char *argv0)
{
+ if (!argv0 || !*argv0)
+ return 0;
+
const char *slash = argv0 + strlen(argv0);
while (argv0 <= slash && !is_dir_sep(*slash))
diff --git a/git.c b/git.c
index b99b1b2..9c8da93 100644
--- a/git.c
+++ b/git.c
@@ -422,9 +422,8 @@ int main(int argc, const char **argv)
const char *cmd;
int done_alias = 0;
- if (argv[0] && *argv[0])
- cmd = git_extract_argv0_path(argv[0]);
- else
+ cmd = git_extract_argv0_path(argv[0]);
+ if (!cmd)
cmd = "git-help";
/*
--
1.6.1.87.g15624
next prev parent reply other threads:[~2009-01-18 12:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-18 12:00 [PATCH 0/7 v2] RUNTIME_PREFIX Steffen Prohaska
2009-01-18 12:00 ` [PATCH 1/7 v2] Move computation of absolute paths from Makefile to runtime (in preparation for RUNTIME_PREFIX) Steffen Prohaska
2009-01-18 12:00 ` [PATCH 2/7 v2] Refactor git_set_argv0_path() to git_extract_argv0_path() Steffen Prohaska
2009-01-18 12:00 ` Steffen Prohaska [this message]
2009-01-18 12:00 ` [PATCH 4/7 v2] Add calls to git_extract_argv0_path() in programs that call git_config_* Steffen Prohaska
2009-01-18 12:00 ` [PATCH 5/7 v2] Modify setup_path() to only add git_exec_path() to PATH Steffen Prohaska
2009-01-18 12:00 ` [PATCH 6/7 v2] Compute prefix at runtime if RUNTIME_PREFIX is set Steffen Prohaska
2009-01-18 12:00 ` [PATCH 7/7 v2] Windows: Revert to default paths and convert them by RUNTIME_PREFIX Steffen Prohaska
2009-01-19 17:41 ` [PATCH 6/7 v2] Compute prefix at runtime if RUNTIME_PREFIX is set Johannes Schindelin
2009-01-18 19:16 ` [PATCH 3/7 v2] git_extract_argv0_path(): Move check for valid argv0 from caller to callee Johannes Sixt
2009-01-18 19:28 ` Johannes Sixt
2009-01-18 21:28 ` Junio C Hamano
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=1232280015-8144-4-git-send-email-prohaska@zib.de \
--to=prohaska@zib.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.sixt@telecom.at \
/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).