projects
/
debian
/
tar
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.22
[debian/tar]
/
lib
/
getdelim.c
diff --git
a/lib/getdelim.c
b/lib/getdelim.c
index 286a460f816d36818827d204ebbe9e631455acc6..4cd1c1171e6a7e6c0849281fe252d615a8215056 100644
(file)
--- a/
lib/getdelim.c
+++ b/
lib/getdelim.c
@@
-35,13
+35,18
@@
#ifndef SSIZE_MAX
# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
#endif
#ifndef SSIZE_MAX
# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
#endif
-#if !HAVE_FLOCKFILE
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+# define getc_maybe_unlocked(fp) getc(fp)
+#elif !HAVE_FLOCKFILE || !HAVE_FUNLOCKFILE || !HAVE_DECL_GETC_UNLOCKED
# undef flockfile
# undef flockfile
-# define flockfile(x) ((void) 0)
-#endif
-#if !HAVE_FUNLOCKFILE
# undef funlockfile
# undef funlockfile
+# define flockfile(x) ((void) 0)
# define funlockfile(x) ((void) 0)
# define funlockfile(x) ((void) 0)
+# define getc_maybe_unlocked(fp) getc(fp)
+#else
+# define getc_maybe_unlocked(fp) getc_unlocked(fp)
#endif
/* Read up to (and including) a DELIMITER from FP into *LINEPTR (and
#endif
/* Read up to (and including) a DELIMITER from FP into *LINEPTR (and
@@
-81,7
+86,7
@@
getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
{
int i;
{
int i;
- i = getc (fp);
+ i = getc
_maybe_unlocked
(fp);
if (i == EOF)
{
result = -1;
if (i == EOF)
{
result = -1;