Re: [PATCH 1/3] remote-testsvn.c: Avoid the getline() GNU extension function
- From
Joachim Schmitz <jojo@schmitz-digital.de>
- Date
- Aug 25, 2012, 19:03 UTC
- Message-ID
- <k1b7ij$p8v$1@ger.gmane.org>
- In-Reply-To
- <503907B3.9040101@ramsay1.demon.co.uk>
Ramsay Jones wrote:
Show 13 quoted lines
> The getline() function is a GNU extension (you need to define > _GNU_SOURCE before including stdio.h) and is, therefore, not > portable. In particular, getline() is not available on MinGW. > > In order to support non-GNU systems, we replace the call to > getline() with (almost) equivalent code using strbuf_getline(). > Note that, unlike getline(), strbuf_getline() removes the > newline terminator from the returned string. This difference > in semantics does not matter at this call-site. Also, we note > that the original code was leaking the memory allocated to > 'line' by getline(). > > Signed-off-by: Ramsay Jones ramsay@ramsay1.demon.co.uk
Tested-by: Joachim Schmitz jojo@schmitz-digital.de
Show 47 quoted lines
> ---
>
> Hi Florian,
>
> Could you please squash this into commit 0320cef0 ("remote-svn: add
> marks-file regeneration", 22-08-2012).
>
> ATB,
> Ramsay Jones
>
> remote-testsvn.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/remote-testsvn.c b/remote-testsvn.c
> index 09dc304..d0b81d5 100644
> --- a/remote-testsvn.c
> +++ b/remote-testsvn.c
> @@ -121,9 +121,8 @@ static void regenerate_marks(void)
>
> static void check_or_regenerate_marks(int latestrev) {
> FILE *marksfile;
> - char *line = NULL;
> - size_t linelen = 0;
> struct strbuf sb = STRBUF_INIT;
> + struct strbuf line = STRBUF_INIT;
> int found = 0;
>
> if (latestrev < 1)
> @@ -139,8 +138,8 @@ static void check_or_regenerate_marks(int
> latestrev) { fclose(marksfile);
> } else {
> strbuf_addf(&sb, ":%d ", latestrev);
> - while (getline(&line, &linelen, marksfile) != -1) {
> - if (!prefixcmp(line, sb.buf)) {
> + while (strbuf_getline(&line, marksfile, '\n') != EOF) {
> + if (!prefixcmp(line.buf, sb.buf)) {
> found++;
> break;
> }
> @@ -151,6 +150,7 @@ static void check_or_regenerate_marks(int
> latestrev) { }
> free_notes(NULL);
> strbuf_release(&sb);
> + strbuf_release(&line);
> }
>
> static int cmd_import(const char *line)I'd like to second this request, having the same problem on HP NonStop and this patch fixes it for me too.
Bye, Jojo