From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Ramsay Jones <ramsay@ramsayjones.plus.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH v3 0/4] Ensure that we can build without libgen.h
Date: Mon, 11 Jan 2016 19:29:41 +0100 (CET) [thread overview]
Message-ID: <cover.1452536924.git.johannes.schindelin@gmx.de> (raw)
In-Reply-To: <cover.1452270051.git.johannes.schindelin@gmx.de>
This mini series adds a fall-back for the `dirname()` function that we use
e.g. in git-am. This is necessary because not all platforms have a working
libgen.h.
While at it, we ensure that our basename() drop-in conforms to the POSIX
specifications.
In addition to the interdiff vs v2, the commit message was fixed to
mention basename("") as cornercase (not basename("abc")).
Johannes Schindelin (4):
Refactor skipping DOS drive prefixes
compat/basename: make basename() conform to POSIX
Provide a dirname() function when NO_LIBGEN_H=YesPlease
t0060: verify that basename() and dirname() work as expected
compat/basename.c | 66 ++++++++++++++++++--
compat/mingw.c | 14 ++---
compat/mingw.h | 10 ++-
git-compat-util.h | 10 +++
path.c | 14 ++---
t/t0060-path-utils.sh | 3 +
test-path-utils.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 259 insertions(+), 24 deletions(-)
Interdiff vs v2:
diff --git a/test-path-utils.c b/test-path-utils.c
index 74e74c9..4ab68ac 100644
--- a/test-path-utils.c
+++ b/test-path-utils.c
@@ -40,15 +40,15 @@ static void normalize_argv_string(const char **var, const char *input)
}
struct test_data {
- char *from; /* input: transform from this ... */
- char *to; /* output: ... to this. */
+ const char *from; /* input: transform from this ... */
+ const char *to; /* output: ... to this. */
};
static int test_function(struct test_data *data, char *(*func)(char *input),
const char *funcname)
{
int failed = 0, i;
- static char buffer[1024];
+ char buffer[1024];
char *to;
for (i = 0; data[i].to; i++) {
@@ -61,10 +61,10 @@ static int test_function(struct test_data *data, char *(*func)(char *input),
if (strcmp(to, data[i].to)) {
error("FAIL: %s(%s) => '%s' != '%s'\n",
funcname, data[i].from, to, data[i].to);
- failed++;
+ failed = 1;
}
}
- return !!failed;
+ return failed;
}
static struct test_data basename_data[] = {
@@ -132,7 +132,6 @@ static struct test_data basename_data[] = {
#endif
#endif
- { NULL, "." },
{ NULL, NULL }
};
@@ -197,7 +196,6 @@ static struct test_data dirname_data[] = {
#endif
#endif
- { NULL, "." },
{ NULL, NULL }
};
--
2.6.3.windows.1.300.g1c25e49
next prev parent reply other threads:[~2016-01-11 18:29 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-30 14:50 [PATCH] Provide a dirname() function when NO_LIBGEN_H=YesPlease Johannes Schindelin
2015-09-30 18:24 ` Junio C Hamano
2016-01-08 16:17 ` Johannes Schindelin
2015-09-30 18:57 ` Ramsay Jones
2016-01-08 16:18 ` Johannes Schindelin
2016-01-08 16:21 ` [PATCH v2 0/4] Ensure that we can build without libgen.h Johannes Schindelin
2016-01-08 16:21 ` [PATCH v2 1/4] Refactor skipping DOS drive prefixes Johannes Schindelin
2016-01-08 21:51 ` Eric Sunshine
2016-01-08 22:07 ` Junio C Hamano
2016-01-11 9:32 ` Johannes Schindelin
2016-01-11 15:58 ` Junio C Hamano
2016-01-08 16:21 ` [PATCH v2 2/4] compat/basename: make basename() conform to POSIX Johannes Schindelin
2016-01-08 18:45 ` Junio C Hamano
2016-01-09 14:53 ` Johannes Schindelin
2016-01-11 16:01 ` Junio C Hamano
2016-01-08 16:21 ` [PATCH v2 3/4] Provide a dirname() function when NO_LIBGEN_H=YesPlease Johannes Schindelin
2016-01-08 18:53 ` Junio C Hamano
2016-01-08 16:21 ` [PATCH v2 4/4] t0060: verify that basename() and dirname() work as expected Johannes Schindelin
2016-01-10 4:17 ` Eric Sunshine
2016-01-11 10:50 ` Johannes Schindelin
2016-01-13 18:52 ` Michael Blume
2016-01-13 19:43 ` Junio C Hamano
2016-01-14 6:09 ` Johannes Schindelin
2016-01-11 18:29 ` Johannes Schindelin [this message]
2016-01-11 18:29 ` [PATCH v3 1/4] Refactor skipping DOS drive prefixes Johannes Schindelin
2016-01-11 18:29 ` [PATCH v3 2/4] compat/basename: make basename() conform to POSIX Johannes Schindelin
2016-01-11 18:30 ` [PATCH v3 3/4] Provide a dirname() function when NO_LIBGEN_H=YesPlease Johannes Schindelin
2016-01-11 20:33 ` Eric Sunshine
2016-01-11 22:56 ` Junio C Hamano
2016-01-12 7:57 ` Johannes Schindelin
2016-01-11 18:30 ` [PATCH v3 4/4] t0060: verify that basename() and dirname() work as expected Johannes Schindelin
2016-01-11 22:59 ` [PATCH v3 0/4] Ensure that we can build without libgen.h Junio C Hamano
2016-01-12 7:57 ` [PATCH v4 " Johannes Schindelin
2016-01-12 7:57 ` [PATCH v4 1/4] Refactor skipping DOS drive prefixes Johannes Schindelin
2016-01-22 18:50 ` Johannes Sixt
2016-01-22 19:09 ` Junio C Hamano
2016-01-23 8:25 ` Johannes Schindelin
2016-01-23 19:02 ` Johannes Sixt
2016-01-24 10:56 ` Johannes Schindelin
2016-01-24 12:36 ` Johannes Sixt
2016-01-24 22:12 ` Junio C Hamano
2016-01-25 21:47 ` [PATCH] mingw: avoid linking to the C library's isalpha() Johannes Sixt
2016-01-25 22:04 ` Junio C Hamano
2016-01-12 7:57 ` [PATCH v4 2/4] compat/basename: make basename() conform to POSIX Johannes Schindelin
2016-01-13 0:49 ` Ramsay Jones
2016-01-13 7:14 ` Johannes Schindelin
2016-01-12 7:57 ` [PATCH v4 3/4] Provide a dirname() function when NO_LIBGEN_H=YesPlease Johannes Schindelin
2016-01-13 0:55 ` Ramsay Jones
2016-01-13 7:40 ` Johannes Schindelin
2016-01-13 16:44 ` Ramsay Jones
2016-01-12 7:57 ` [PATCH v4 4/4] t0060: verify that basename() and dirname() work as expected Johannes Schindelin
2016-01-13 0:58 ` Ramsay Jones
2016-01-13 7:17 ` Johannes Schindelin
[not found] ` <5695E4FB.2060705@web.de>
2016-01-13 9:27 ` Johannes Schindelin
2016-01-13 16:46 ` Ramsay Jones
2016-01-13 16:34 ` Ramsay Jones
2016-01-13 17:20 ` Junio C Hamano
2016-01-13 18:53 ` Johannes Schindelin
2016-01-13 0:44 ` [PATCH v4 0/4] Ensure that we can build without libgen.h Ramsay Jones
2016-01-13 2:56 ` Junio C Hamano
2016-01-13 6:15 ` Torsten Bögershausen
2016-01-13 7:38 ` Johannes Schindelin
2016-01-13 7:02 ` Johannes Schindelin
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=cover.1452536924.git.johannes.schindelin@gmx.de \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ramsay@ramsayjones.plus.com \
--cc=sunshine@sunshineco.com \
/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).