Fix mingw tools build
mkimage does not build due to missing strtok_r() and getline() implementation Signed-off-by: Remy Bohmer <linux@bohmer.net>
This commit is contained in:
parent
6a590c5f5f
commit
faf36c1437
|
@ -24,7 +24,9 @@
|
||||||
#include "mingw_support.h"
|
#include "mingw_support.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
#include <string.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#include <assert.h>
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
|
|
||||||
int fsync(int fd)
|
int fsync(int fd)
|
||||||
|
@ -77,3 +79,158 @@ int munmap(void *addr, size_t len)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Reentrant string tokenizer. Generic version.
|
||||||
|
Copyright (C) 1991,1996-1999,2001,2004,2007 Free Software Foundation, Inc.
|
||||||
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2, or (at your option)
|
||||||
|
any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along
|
||||||
|
with this program; if not, write to the Free Software Foundation,
|
||||||
|
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
|
||||||
|
|
||||||
|
/* Parse S into tokens separated by characters in DELIM.
|
||||||
|
If S is NULL, the saved pointer in SAVE_PTR is used as
|
||||||
|
the next starting point. For example:
|
||||||
|
char s[] = "-abc-=-def";
|
||||||
|
char *sp;
|
||||||
|
x = strtok_r(s, "-", &sp); // x = "abc", sp = "=-def"
|
||||||
|
x = strtok_r(NULL, "-=", &sp); // x = "def", sp = NULL
|
||||||
|
x = strtok_r(NULL, "=", &sp); // x = NULL
|
||||||
|
// s = "abc\0-def\0"
|
||||||
|
*/
|
||||||
|
char *strtok_r(char *s, const char *delim, char **save_ptr)
|
||||||
|
{
|
||||||
|
char *token;
|
||||||
|
|
||||||
|
if (s == NULL)
|
||||||
|
s = *save_ptr;
|
||||||
|
|
||||||
|
/* Scan leading delimiters. */
|
||||||
|
s += strspn(s, delim);
|
||||||
|
if (*s == '\0') {
|
||||||
|
*save_ptr = s;
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Find the end of the token. */
|
||||||
|
token = s;
|
||||||
|
s = strpbrk (token, delim);
|
||||||
|
if (s == NULL) {
|
||||||
|
/* This token finishes the string. */
|
||||||
|
*save_ptr = memchr(token, '\0', strlen(token));
|
||||||
|
} else {
|
||||||
|
/* Terminate the token and make *SAVE_PTR point past it. */
|
||||||
|
*s = '\0';
|
||||||
|
*save_ptr = s + 1;
|
||||||
|
}
|
||||||
|
return token;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* getline.c -- Replacement for GNU C library function getline
|
||||||
|
|
||||||
|
Copyright (C) 1993, 1996, 2001, 2002 Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU General Public License as
|
||||||
|
published by the Free Software Foundation; either version 2 of the
|
||||||
|
License, or (at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful, but
|
||||||
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
||||||
|
|
||||||
|
/* Written by Jan Brittenson, bson@gnu.ai.mit.edu. */
|
||||||
|
|
||||||
|
/* Always add at least this many bytes when extending the buffer. */
|
||||||
|
#define MIN_CHUNK 64
|
||||||
|
|
||||||
|
/* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR
|
||||||
|
+ OFFSET (and null-terminate it). *LINEPTR is a pointer returned from
|
||||||
|
malloc (or NULL), pointing to *N characters of space. It is realloc'd
|
||||||
|
as necessary. Return the number of characters read (not including the
|
||||||
|
null terminator), or -1 on error or EOF.
|
||||||
|
NOTE: There is another getstr() function declared in <curses.h>. */
|
||||||
|
static int getstr(char **lineptr, size_t *n, FILE *stream,
|
||||||
|
char terminator, size_t offset)
|
||||||
|
{
|
||||||
|
int nchars_avail; /* Allocated but unused chars in *LINEPTR. */
|
||||||
|
char *read_pos; /* Where we're reading into *LINEPTR. */
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
if (!lineptr || !n || !stream)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
if (!*lineptr) {
|
||||||
|
*n = MIN_CHUNK;
|
||||||
|
*lineptr = malloc(*n);
|
||||||
|
if (!*lineptr)
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
nchars_avail = *n - offset;
|
||||||
|
read_pos = *lineptr + offset;
|
||||||
|
|
||||||
|
for (;;) {
|
||||||
|
register int c = getc(stream);
|
||||||
|
|
||||||
|
/* We always want at least one char left in the buffer, since we
|
||||||
|
always (unless we get an error while reading the first char)
|
||||||
|
NUL-terminate the line buffer. */
|
||||||
|
|
||||||
|
assert(*n - nchars_avail == read_pos - *lineptr);
|
||||||
|
if (nchars_avail < 2) {
|
||||||
|
if (*n > MIN_CHUNK)
|
||||||
|
*n *= 2;
|
||||||
|
else
|
||||||
|
*n += MIN_CHUNK;
|
||||||
|
|
||||||
|
nchars_avail = *n + *lineptr - read_pos;
|
||||||
|
*lineptr = realloc(*lineptr, *n);
|
||||||
|
if (!*lineptr)
|
||||||
|
return -1;
|
||||||
|
read_pos = *n - nchars_avail + *lineptr;
|
||||||
|
assert(*n - nchars_avail == read_pos - *lineptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (c == EOF || ferror (stream)) {
|
||||||
|
/* Return partial line, if any. */
|
||||||
|
if (read_pos == *lineptr)
|
||||||
|
return -1;
|
||||||
|
else
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
*read_pos++ = c;
|
||||||
|
nchars_avail--;
|
||||||
|
|
||||||
|
if (c == terminator)
|
||||||
|
/* Return the line. */
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Done - NUL terminate and return the number of chars read. */
|
||||||
|
*read_pos = '\0';
|
||||||
|
|
||||||
|
ret = read_pos - (*lineptr + offset);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
int getline (char **lineptr, size_t *n, FILE *stream)
|
||||||
|
{
|
||||||
|
return getstr(lineptr, n, stream, '\n', 0);
|
||||||
|
}
|
||||||
|
|
|
@ -44,5 +44,7 @@ typedef ULONG ulong;
|
||||||
int fsync(int fd);
|
int fsync(int fd);
|
||||||
void *mmap(void *, size_t, int, int, int, int);
|
void *mmap(void *, size_t, int, int, int, int);
|
||||||
int munmap(void *, size_t);
|
int munmap(void *, size_t);
|
||||||
|
char *strtok_r(char *s, const char *delim, char **save_ptr);
|
||||||
|
int getline(char **lineptr, size_t *n, FILE *stream);
|
||||||
|
|
||||||
#endif /* __MINGW_SUPPORT_H_ */
|
#endif /* __MINGW_SUPPORT_H_ */
|
||||||
|
|
Loading…
Reference in New Issue