[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libextractor] branch master updated (32e5c97 -> 4894c06)
|
From: |
gnunet |
|
Subject: |
[libextractor] branch master updated (32e5c97 -> 4894c06) |
|
Date: |
Sat, 30 Jan 2021 15:28:46 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch master
in repository libextractor.
from 32e5c97 improve fuzz_default script
new ba1b54b mask SIGPIPE to avoid problems with crashing in test (should
fix #6709)
new 0ad1232 get rid of plibc.h
new 4894c06 releasing v1.11
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ChangeLog | 21 +-
configure.ac | 2 +-
src/include/Makefile.am | 5 +-
src/include/extractor.h | 2 +-
src/include/platform.h | 2 -
src/include/plibc.h | 1092 -------------------------------------
src/main/extract.c | 70 +--
src/main/extractor.c | 3 +-
src/main/extractor_datasource.c | 18 +-
src/main/extractor_ipc_gnu.c | 3 +-
src/main/extractor_ipc_w32.c | 2 +-
src/main/extractor_plugin_main.c | 1 -
src/main/extractor_plugins.h | 1 -
src/main/extractor_plugpath.c | 17 +-
src/main/test_bzip2.c | 2 +-
src/main/test_file.c | 2 +-
src/main/test_gzip.c | 2 +-
src/main/test_ipc.c | 2 +-
src/main/test_plugin_load_multi.c | 2 +-
src/main/test_plugin_loading.c | 2 +-
src/main/test_trivial.c | 2 +-
src/plugins/fuzz_default.sh | 4 +-
src/plugins/gif_extractor.c | 6 +-
src/plugins/old/ebml_extractor.c | 6 +-
src/plugins/rpm_extractor.c | 14 +-
src/plugins/test_lib.c | 33 +-
26 files changed, 126 insertions(+), 1190 deletions(-)
delete mode 100644 src/include/plibc.h
diff --git a/ChangeLog b/ChangeLog
index afbcecc..a1ba981 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
+Sat 30 Jan 2021 03:25:35 PM CET
+ Fix #6709: mask SIGPIPE to avoid test case failure
+ with latest librpm. Remove plibc.h logic.
+ Releasing GNU libextractor 1.11. -CG
+
Thu Oct 29 09:20:41 PM CET 2020
- Fix #6613: test failure with latest exiv2 library
- (harmless). Add hard timeout for zzuf test suite
- on systems where timeout command exists. -CG
+ Fix #6613: test failure with latest exiv2 library
+ (harmless). Add hard timeout for zzuf test suite
+ on systems where timeout command exists. -CG
Thu Jul 2 15:58:16 CEST 2020
Fixed some code that called deprecated libav routines.
@@ -18,7 +23,7 @@ Mon 29 Jul 2019 05:57:04 PM CEST
Fix build issue with exiv2-0.27 (#5820). -AS (via Gentoo)
Mon 13 May 2019 07:42:19 AM CEST
- Consistently use AS_IF and AS_CASE in configure.ac. -CG
+ Consistently use AS_IF and AS_CASE in configure.ac. -CG
Sun 12 May 2019 01:56:56 PM CEST
Updated French translation. -CG
@@ -569,7 +574,7 @@ Thu Aug 18 21:18:28 PDT 2005
Made quotations match GNU standards.
Sat Aug 13 18:41:02 PDT 2005
- Fixed problems with ole2 extractor. Also removed
+ Fixed problems with ole2 extractor. Also removed
requirement for static version of glib (!).
Releasing libextractor 0.5.3.
@@ -616,7 +621,7 @@ Fri May 6 14:54:58 EST 2005
(important for systems with not that much memory).
Fri May 6 06:02:02 EST 2005
- Added Python binding.
+ Added Python binding.
Tue Apr 5 17:22:28 EST 2005
Added translation to Kinyarwanda.
@@ -936,8 +941,8 @@ Sun Jun 2 22:49:17 EST 2002
with libhtmlparse). Released v0.0.2.
Sat May 25 16:56:59 EST 2002
- Added building of a description from artist,
- title and album, fixed bugs.
+ Added building of a description from artist,
+ title and album, fixed bugs.
Tue May 21 22:24:07 EST 2002
Added removing of duplicates, splitting keywords,
diff --git a/configure.ac b/configure.ac
index 3c9b972..456287a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
#
#
AC_PREREQ(2.61)
-AC_INIT([libextractor], [1.10], [bug-libextractor@gnu.org])
+AC_INIT([libextractor], [1.11], [bug-libextractor@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index a81ffc2..db3dcf1 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -1,8 +1,7 @@
# This Makefile.am is in the public domain
-SUBDIRS = .
+SUBDIRS = .
include_HEADERS = \
- extractor.h
+ extractor.h
EXTRA_DIST = \
- plibc.h \
platform.h \
gettext.h
diff --git a/src/include/extractor.h b/src/include/extractor.h
index 3e6c098..78fe627 100644
--- a/src/include/extractor.h
+++ b/src/include/extractor.h
@@ -35,7 +35,7 @@ extern "C" {
* 0.2.6-1 => 0x00020601
* 4.5.2-0 => 0x04050200
*/
-#define EXTRACTOR_VERSION 0x01080001
+#define EXTRACTOR_VERSION 0x010B0000
#include <stdio.h>
diff --git a/src/include/platform.h b/src/include/platform.h
index 9f72f57..b457a72 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -35,8 +35,6 @@
#define _(a) dgettext ("org.gnunet.libextractor", a)
#endif
-#include "plibc.h"
-
#include <string.h>
#include <unistd.h>
#include <ctype.h>
diff --git a/src/include/plibc.h b/src/include/plibc.h
deleted file mode 100644
index 9199072..0000000
--- a/src/include/plibc.h
+++ /dev/null
@@ -1,1092 +0,0 @@
-/*
- This file is part of PlibC.
- Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Nils Durner (and other
contributing authors)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
-*/
-
-/**
- * @file include/plibc.h
- * @brief PlibC header
- * @attention This file is usually not installed under Unix,
- * so ship it with your application
- * @version $Revision: 158 $
- */
-
-#ifndef _PLIBC_H_
-#define _PLIBC_H_
-
-#ifndef SIGALRM
- #define SIGALRM 14
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stddef.h>
-
-#ifdef Q_OS_WIN32
- #define WINDOWS 1
-#endif
-
-#define HAVE_PLIBC_FD 0
-
-#ifdef WINDOWS
-
-#if ENABLE_NLS
- #include "langinfo.h"
-#endif
-
-#include <ws2tcpip.h>
-#include <windows.h>
-#include <sys/types.h>
-#include <time.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <errno.h>
-#include <stdarg.h>
-
-#define __BYTE_ORDER BYTE_ORDER
-#define __BIG_ENDIAN BIG_ENDIAN
-
-/* Conflicts with our definitions */
-#define __G_WIN32_H__
-
-/* Convert LARGE_INTEGER to double */
-#define Li2Double(x) ((double) ((x).HighPart) * 4.294967296E9 \
- + (double) ((x).LowPart))
-#ifndef HAVE_DECL__STATI64
-struct _stati64
-{
- _dev_t st_dev;
- _ino_t st_ino;
- _mode_t st_mode;
- short st_nlink;
- short st_uid;
- short st_gid;
- _dev_t st_rdev;
- __int64 st_size;
- time_t st_atime;
- time_t st_mtime;
- time_t st_ctime;
-};
-#endif
-typedef unsigned int sa_family_t;
-
-struct sockaddr_un
-{
- short sun_family; /*AF_UNIX*/
- char sun_path[108]; /*path name */
-};
-
-#ifndef pid_t
- #define pid_t DWORD
-#endif
-
-#ifndef error_t
- #define error_t int
-#endif
-
-#ifndef WEXITSTATUS
- #define WEXITSTATUS(status) (((status) & 0xff00) >> 8)
-#endif
-
-#ifndef MSG_DONTWAIT
- #define MSG_DONTWAIT 0
-#endif
-
-enum
-{
- _SC_PAGESIZE = 30,
- _SC_PAGE_SIZE = 30
-};
-
-#if ! defined(EACCESS)
-# define EACCESS EACCES
-#endif
-
-/* Thanks to the Cygwin project */
-#if ! defined(ENOCSI)
-# define ENOCSI 43 /* No CSI structure available */
-#endif
-#if ! defined(EL2HLT)
-# define EL2HLT 44 /* Level 2 halted */
-#endif
-#if ! defined(EDEADLK)
-# define EDEADLK 45 /* Deadlock condition */
-#endif
-#if ! defined(ENOLCK)
-# define ENOLCK 46 /* No record locks available */
-#endif
-#if ! defined(EBADE)
-# define EBADE 50 /* Invalid exchange */
-#endif
-#if ! defined(EBADR)
-# define EBADR 51 /* Invalid request descriptor */
-#endif
-#if ! defined(EXFULL)
-# define EXFULL 52 /* Exchange full */
-#endif
-#if ! defined(ENOANO)
-# define ENOANO 53 /* No anode */
-#endif
-#if ! defined(EBADRQC)
-# define EBADRQC 54 /* Invalid request code */
-#endif
-#if ! defined(EBADSLT)
-# define EBADSLT 55 /* Invalid slot */
-#endif
-#if ! defined(EDEADLOCK)
-# define EDEADLOCK EDEADLK /* File locking deadlock error */
-#endif
-#if ! defined(EBFONT)
-# define EBFONT 57 /* Bad font file fmt */
-#endif
-#if ! defined(ENOSTR)
-# define ENOSTR 60 /* Device not a stream */
-#endif
-#if ! defined(ENODATA)
-# define ENODATA 61 /* No data (for no delay io) */
-#endif
-#if ! defined(ETIME)
-# define ETIME 62 /* Timer expired */
-#endif
-#if ! defined(ENOSR)
-# define ENOSR 63 /* Out of streams resources */
-#endif
-#if ! defined(ENONET)
-# define ENONET 64 /* Machine is not on the network */
-#endif
-#if ! defined(ENOPKG)
-# define ENOPKG 65 /* Package not installed */
-#endif
-#if ! defined(EREMOTE)
-# define EREMOTE 66 /* The object is remote */
-#endif
-#if ! defined(ENOLINK)
-# define ENOLINK 67 /* The link has been severed */
-#endif
-#if ! defined(EADV)
-# define EADV 68 /* Advertise error */
-#endif
-#if ! defined(ESRMNT)
-# define ESRMNT 69 /* Srmount error */
-#endif
-#if ! defined(ECOMM)
-# define ECOMM 70 /* Communication error on send */
-#endif
-#if ! defined(EMULTIHOP)
-# define EMULTIHOP 74 /* Multihop attempted */
-#endif
-#if ! defined(ELBIN)
-# define ELBIN 75 /* Inode is remote (not really error) */
-#endif
-#if ! defined(EDOTDOT)
-# define EDOTDOT 76 /* Cross mount point (not really error) */
-#endif
-#if ! defined(EBADMSG)
-# define EBADMSG 77 /* Trying to read unreadable message */
-#endif
-#if ! defined(ENOTUNIQ)
-# define ENOTUNIQ 80 /* Given log. name not unique */
-#endif
-#if ! defined(EBADFD)
-# define EBADFD 81 /* f.d. invalid for this operation */
-#endif
-#if ! defined(EREMCHG)
-# define EREMCHG 82 /* Remote address changed */
-#endif
-#if ! defined(ELIBACC)
-# define ELIBACC 83 /* Can't access a needed shared lib */
-#endif
-#if ! defined(ELIBBAD)
-# define ELIBBAD 84 /* Accessing a corrupted shared lib */
-#endif
-#if ! defined(ELIBSCN)
-# define ELIBSCN 85 /* .lib section in a.out corrupted */
-#endif
-#if ! defined(ELIBMAX)
-# define ELIBMAX 86 /* Attempting to link in too many libs */
-#endif
-#if ! defined(ELIBEXEC)
-# define ELIBEXEC 87 /* Attempting to exec a shared library */
-#endif
-#if ! defined(ENOSYS)
-# define ENOSYS 88 /* Function not implemented */
-#endif
-#if ! defined(ENMFILE)
-# define ENMFILE 89 /* No more files */
-#endif
-#if ! defined(ENOTEMPTY)
-# define ENOTEMPTY 90 /* Directory not empty */
-#endif
-#if ! defined(ENAMETOOLONG)
-# define ENAMETOOLONG 91 /* File or path name too long */
-#endif
-#if ! defined(EPFNOSUPPORT)
-# define EPFNOSUPPORT 96 /* Protocol family not supported */
-#endif
-#if ! defined(ENOSHARE)
-# define ENOSHARE 97 /* No such host or network path */
-#endif
-#if ! defined(ENOMEDIUM)
-# define ENOMEDIUM 98 /* No medium (in tape drive) */
-#endif
-#if ! defined(ESHUTDOWN)
-# define ESHUTDOWN 99 /* Can't send after socket shutdown */
-#endif
-#if ! defined(EADDRINUSE)
-# define EADDRINUSE 100 /* Address already in use */
-#endif
-#if ! defined(EADDRNOTAVAIL)
-# define EADDRNOTAVAIL 101 /* Address not available */
-#endif
-#if ! defined(EAFNOSUPPORT)
-# define EAFNOSUPPORT 102 /* Address family not supported by protocol family
*/
-#endif
-#if ! defined(EALREADY)
-# define EALREADY 103 /* Socket already connected */
-#endif
-#if ! defined(ECANCELED)
-# define ECANCELED 105 /* Connection cancelled */
-#endif
-#if ! defined(ECONNABORTED)
-# define ECONNABORTED 106 /* Connection aborted */
-#endif
-#if ! defined(ECONNREFUSED)
-# define ECONNREFUSED 107 /* Connection refused */
-#endif
-#if ! defined(ECONNRESET)
-# define ECONNRESET 108 /* Connection reset by peer */
-#endif
-#if ! defined(EDESTADDRREQ)
-# define EDESTADDRREQ 109 /* Destination address required */
-#endif
-#if ! defined(EHOSTUNREACH)
-# define EHOSTUNREACH 110 /* Host is unreachable */
-#endif
-#if ! defined(ECONNABORTED)
-# define ECONNABORTED 111 /* Connection aborted */
-#endif
-#if ! defined(EINPROGRESS)
-# define EINPROGRESS 112 /* Connection already in progress */
-#endif
-#if ! defined(EISCONN)
-# define EISCONN 113 /* Socket is already connected */
-#endif
-#if ! defined(ELOOP)
-# define ELOOP 114 /* Too many symbolic links */
-#endif
-#if ! defined(EMSGSIZE)
-# define EMSGSIZE 115 /* Message too long */
-#endif
-#if ! defined(ENETDOWN)
-# define ENETDOWN 116 /* Network interface is not configured */
-#endif
-#if ! defined(ENETRESET)
-# define ENETRESET 117 /* Connection aborted by network */
-#endif
-#if ! defined(ENETUNREACH)
-# define ENETUNREACH 118 /* Network is unreachable */
-#endif
-#if ! defined(ENOBUFS)
-# define ENOBUFS 119 /* No buffer space available */
-#endif
-#if ! defined(EHOSTDOWN)
-# define EHOSTDOWN 120 /* Host is down */
-#endif
-#if ! defined(EPROCLIM)
-# define EPROCLIM 121 /* Too many processes */
-#endif
-#if ! defined(EDQUOT)
-# define EDQUOT 122 /* Disk quota exceeded */
-#endif
-#if ! defined(ENOPROTOOPT)
-# define ENOPROTOOPT 123 /* Protocol not available */
-#endif
-#if ! defined(ESOCKTNOSUPPORT)
-# define ESOCKTNOSUPPORT 124 /* Socket type not supported */
-#endif
-#if ! defined(ESTALE)
-# define ESTALE 125 /* Unknown error */
-#endif
-#if ! defined(ENOTCONN)
-# define ENOTCONN 126 /* Socket is not connected */
-#endif
-#if ! defined(ETOOMANYREFS)
-# define ETOOMANYREFS 127 /* Too many references: cannot splice */
-#endif
-#if ! defined(ENOTSOCK)
-# define ENOTSOCK 128 /* Socket operation on non-socket */
-#endif
-#if ! defined(ENOTSUP)
-# define ENOTSUP 129 /* Not supported */
-#endif
-#if ! defined(EOPNOTSUPP)
-# define EOPNOTSUPP 130 /* Operation not supported on transport endpoint */
-#endif
-#if ! defined(EUSERS)
-# define EUSERS 131 /* Too many users */
-#endif
-#if ! defined(EOVERFLOW)
-# define EOVERFLOW 132 /* Value too large for defined data type */
-#endif
-#if ! defined(EOWNERDEAD)
-# define EOWNERDEAD 133 /* Unknown error */
-#endif
-#if ! defined(EPROTO)
-# define EPROTO 134 /* Protocol error */
-#endif
-#if ! defined(EPROTONOSUPPORT)
-# define EPROTONOSUPPORT 135 /* Unknown protocol */
-#endif
-#if ! defined(EPROTOTYPE)
-# define EPROTOTYPE 136 /* Protocol wrong type for socket */
-#endif
-#if ! defined(ECASECLASH)
-# define ECASECLASH 137 /* Filename exists with different case */
-#endif
-#if ! defined(ETIMEDOUT)
-/* Make sure it's the same as WSATIMEDOUT */
-# define ETIMEDOUT 138 /* Connection timed out */
-#endif
-#if ! defined(EWOULDBLOCK) || EWOULDBLOCK == 140
-# undef EWOULDBLOCK /* MinGW-w64 defines it as 140, but we want it as EAGAIN
*/
-# define EWOULDBLOCK EAGAIN /* Operation would block */
-#endif
-
-#undef HOST_NOT_FOUND
-#define HOST_NOT_FOUND 1
-#undef TRY_AGAIN
-#define TRY_AGAIN 2
-#undef NO_RECOVERY
-#define NO_RECOVERY 3
-#undef NO_ADDRESS
-#define NO_ADDRESS 4
-
-#define PROT_READ 0x1
-#define PROT_WRITE 0x2
-#define MAP_SHARED 0x1
-#define MAP_PRIVATE 0x2 /* unsupported */
-#define MAP_FIXED 0x10
-#define MAP_ANONYMOUS 0x20 /* unsupported */
-#define MAP_FAILED ((void *) -1)
-
-#define MS_ASYNC 1 /* sync memory asynchronously */
-#define MS_INVALIDATE 2 /* invalidate the caches */
-#define MS_SYNC 4 /* synchronous memory sync */
-
-struct statfs
-{
- long f_type; /* type of filesystem (see below) */
- long f_bsize; /* optimal transfer block size */
- long f_blocks; /* total data blocks in file system */
- long f_bfree; /* free blocks in fs */
- long f_bavail; /* free blocks avail to non-superuser */
- long f_files; /* total file nodes in file system */
- long f_ffree; /* free file nodes in fs */
- long f_fsid; /* file system id */
- long f_namelen; /* maximum length of filenames */
- long f_spare[6]; /* spare for later */
-};
-#define sleep(secs) (Sleep (secs * 1000))
-
-/*********************** statfs *****************************/
-/* fake block size */
-#define FAKED_BLOCK_SIZE 512
-
-/* linux-compatible values for fs type */
-#define MSDOS_SUPER_MAGIC 0x4d44
-#define NTFS_SUPER_MAGIC 0x5346544E
-
-/*********************** End of statfs ***********************/
-
-#define SHUT_RDWR SD_BOTH
-
-/* Operations for flock() */
-#define LOCK_SH 1 /* shared lock */
-#define LOCK_EX 2 /* exclusive lock */
-#define LOCK_NB 4 /* or'd with one of the above to prevent
- blocking */
-#define LOCK_UN 8 /* remove lock */
-
-/* Not supported under MinGW */
-#ifndef S_IRGRP
-#define S_IRGRP 0
-#endif
-#ifndef S_IWGRP
-#define S_IWGRP 0
-#endif
-#ifndef S_IROTH
-#define S_IROTH 0
-#endif
-#ifndef S_IXGRP
-#define S_IXGRP 0
-#endif
-#ifndef S_IWOTH
-#define S_IWOTH 0
-#endif
-#ifndef S_IXOTH
-#define S_IXOTH 0
-#endif
-#ifndef S_ISUID
-#define S_ISUID 0
-#endif
-#ifndef S_ISGID
-#define S_ISGID 0
-#endif
-#ifndef S_ISVTX
-#define S_ISVTX 0
-#endif
-#ifndef S_IRWXG
-#define S_IRWXG 0
-#endif
-#ifndef S_IRWXO
-#define S_IRWXO 0
-#endif
-
-#define SHUT_WR SD_SEND
-#define SHUT_RD SD_RECEIVE
-#define SHUT_RDWR SD_BOTH
-
-#define SIGKILL 9
-#define SIGTERM 15
-
-#define SetErrnoFromWinError(e) _SetErrnoFromWinError (e, __FILE__, __LINE__)
-
-BOOL _plibc_CreateShortcut (const char *pszSrc, const char *pszDest);
-
-BOOL _plibc_CreateShortcutW (const wchar_t *pwszSrc, const wchar_t *pwszDest);
-
-BOOL _plibc_DereferenceShortcut (char *pszShortcut);
-
-BOOL _plibc_DereferenceShortcutW (wchar_t *pwszShortcut);
-
-char *plibc_ChooseDir (char *pszTitle, unsigned long ulFlags);
-
-wchar_t *plibc_ChooseDirW (wchar_t *pwszTitle, unsigned long ulFlags);
-
-char *plibc_ChooseFile (char *pszTitle, unsigned long ulFlags);
-
-wchar_t *plibc_ChooseFileW (wchar_t *pwszTitle, unsigned long ulFlags);
-
-long QueryRegistry (HKEY hMainKey, const char *pszKey, const char *pszSubKey,
- char *pszBuffer, long *pdLength);
-
-long QueryRegistryW (HKEY hMainKey, const wchar_t *pszKey, const
- wchar_t *pszSubKey,
- wchar_t *pszBuffer, long *pdLength);
-
-BOOL __win_IsHandleMarkedAsBlocking (int hHandle);
-
-void __win_SetHandleBlockingMode (int s, BOOL bBlocking);
-
-void __win_DiscardHandleBlockingMode (int s);
-
-int _win_isSocketValid (int s);
-
-int plibc_conv_to_win_path (const char *pszUnix, char *pszWindows);
-
-int plibc_conv_to_win_pathw (const wchar_t *pszUnix, wchar_t *pwszWindows);
-
-int plibc_conv_to_win_pathwconv (const char *pszUnix, wchar_t *pwszWindows);
-
-int plibc_conv_to_win_pathwconv_ex (const char *pszUnix, wchar_t *pszWindows,
- int derefLinks);
-
-unsigned plibc_get_handle_count ();
-
-typedef void (*TPanicProc) (int, char *);
-void plibc_set_panic_proc (TPanicProc proc);
-
-void plibc_set_stat_size_size (int iLength);
-
-void plibc_set_stat_time_size (int iLength);
-
-int flock (int fd, int operation);
-
-int fsync (int fildes);
-
-int inet_pton (int af, const char *src, void *dst);
-
-int inet_pton4 (const char *src, u_char *dst, int pton);
-
-#if USE_IPV6
-int inet_pton6 (const char *src, u_char *dst);
-
-#endif
-int statfs (const char *path, struct statfs *buf);
-
-const char *hstrerror (int err);
-
-int mkstemp (char *tmplate);
-
-char *strptime (const char *buf, const char *format, struct tm *tm);
-
-const char *inet_ntop (int af, const void *src, char *dst, size_t size);
-
-#ifndef gmtime_r
-struct tm *gmtime_r (const time_t *clock, struct tm *result);
-
-#endif
-
-int plibc_init (char *pszOrg, char *pszApp);
-
-int plibc_init_utf8 (char *pszOrg, char *pszApp, int utf8_mode);
-
-void plibc_shutdown ();
-
-int plibc_initialized ();
-
-void _SetErrnoFromWinError (long lWinError, char *pszCaller, int iLine);
-
-void SetErrnoFromWinsockError (long lWinError);
-
-void SetHErrnoFromWinError (long lWinError);
-
-void SetErrnoFromHRESULT (HRESULT hRes);
-
-int GetErrnoFromWinsockError (long lWinError);
-
-FILE *_win_fopen (const char *filename, const char *mode);
-
-int _win_fclose (FILE *);
-
-DIR *_win_opendir (const char *dirname);
-
-struct dirent *_win_readdir (DIR *dirp);
-
-int _win_closedir (DIR *dirp);
-
-int _win_open (const char *filename, int oflag, ...);
-
-#ifdef ENABLE_NLS
-char *_win_bindtextdomain (const char *domainname, const char *dirname);
-
-#endif
-int _win_chdir (const char *path);
-
-int _win_close (int fd);
-
-int _win_creat (const char *path, mode_t mode);
-
-char *_win_ctime (const time_t *clock);
-
-char *_win_ctime_r (const time_t *clock, char *buf);
-
-int _win_fstat (int handle, struct stat *buffer);
-
-int _win_ftruncate (int fildes, off_t length);
-
-int _win_truncate (const char *fname, int distance);
-
-int _win_kill (pid_t pid, int sig);
-
-int _win_pipe (int *phandles);
-
-int _win_mkfifo (const char *path, mode_t mode);
-
-int _win_rmdir (const char *path);
-
-int _win_access (const char *path, int mode);
-
-int _win_chmod (const char *filename, int pmode);
-
-char *realpath (const char *file_name, char *resolved_name);
-
-long _win_random (void);
-
-void _win_srandom (unsigned int seed);
-
-int _win_remove (const char *path);
-
-int _win_rename (const char *oldname, const char *newname);
-
-int _win_stat (const char *path, struct stat *buffer);
-
-int _win_stati64 (const char *path, struct _stati64 *buffer);
-
-long _win_sysconf (int name);
-
-int _win_unlink (const char *filename);
-
-int _win_write (int fildes, const void *buf, size_t nbyte);
-
-int _win_read (int fildes, void *buf, size_t nbyte);
-
-size_t _win_fwrite (const void *buffer, size_t size, size_t count,
- FILE *stream);
-
-size_t _win_fread (void *buffer, size_t size, size_t count, FILE *stream);
-
-int _win_symlink (const char *path1, const char *path2);
-
-void *_win_mmap (void *start, size_t len, int access, int flags, int fd,
- unsigned long long offset);
-
-int _win_msync (void *start, size_t length, int flags);
-
-int _win_munmap (void *start, size_t length);
-
-int _win_lstat (const char *path, struct stat *buf);
-
-int _win_lstati64 (const char *path, struct _stati64 *buf);
-
-int _win_readlink (const char *path, char *buf, size_t bufsize);
-
-int _win_accept (int s, struct sockaddr *addr, int *addrlen);
-
-pid_t _win_waitpid (pid_t pid, int *stat_loc, int options);
-
-int _win_bind (int s, const struct sockaddr *name, int namelen);
-
-int _win_connect (int s,const struct sockaddr *name, int namelen);
-
-int _win_getpeername (int s, struct sockaddr *name,
- int *namelen);
-
-int _win_getsockname (int s, struct sockaddr *name,
- int *namelen);
-
-int _win_getsockopt (int s, int level, int optname, char *optval,
- int *optlen);
-
-int _win_listen (int s, int backlog);
-
-int _win_recv (int s, char *buf, int len, int flags);
-
-int _win_recvfrom (int s, void *buf, int len, int flags,
- struct sockaddr *from, int *fromlen);
-
-int _win_select (int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds,
- const struct timeval *tv);
-
-int _win_send (int s, const char *buf, int len, int flags);
-
-int _win_sendto (int s, const char *buf, int len, int flags,
- const struct sockaddr *to, int tolen);
-
-int _win_setsockopt (int s, int level, int optname, const void *optval,
- int optlen);
-
-int _win_shutdown (int s, int how);
-
-int _win_socket (int af, int type, int protocol);
-
-int _win_socketpair (int af, int type, int protocol, int socket_vector[2]);
-
-struct hostent *_win_gethostbyaddr (const char *addr, int len, int type);
-
-struct hostent *_win_gethostbyname (const char *name);
-
-struct hostent *gethostbyname2 (const char *name, int af);
-
-char *_win_strerror (int errnum);
-
-int IsWinNT ();
-
-char *index (const char *s, int c);
-
-char *_win_strtok_r (char *ptr, const char *sep, char **end);
-
-#if ! HAVE_STRNDUP
-char *strndup (const char *s, size_t n);
-
-#endif
-#if ! HAVE_STRNLEN && (! defined(__MINGW64_VERSION_MAJOR) || \
- ! defined(_INC_STRING))
-size_t strnlen (const char *str, size_t maxlen);
-
-#endif
-char *stpcpy (char *dest, const char *src);
-
-char *strcasestr (const char *haystack_start, const char *needle_start);
-
-#ifndef __MINGW64_VERSION_MAJOR
-#define strcasecmp(a, b) stricmp (a, b)
-#define strncasecmp(a, b, c) strnicmp (a, b, c)
-#endif
-#ifndef wcscasecmp
-#define wcscasecmp(a, b) wcsicmp (a, b)
-#endif
-#ifndef wcsncasecmp
-#define wcsncasecmp(a, b, c) wcsnicmp (a, b, c)
-#endif
-#ifndef strtok_r /* winpthreads defines it in pthread.h */
-#define strtok_r _win_strtok_r
-#endif
-#endif /* WINDOWS */
-
-#ifndef WINDOWS
- #define DIR_SEPARATOR '/'
- #define DIR_SEPARATOR_STR "/"
- #define PATH_SEPARATOR ':'
- #define PATH_SEPARATOR_STR ":"
- #define NEWLINE "\n"
-
-#ifdef ENABLE_NLS
- #define BINDTEXTDOMAIN(d, n) bindtextdomain (d, n)
-#endif
- #define CREAT(p, m) creat (p, m)
- #define PLIBC_CTIME(c) ctime (c)
- #define CTIME_R(c, b) ctime_r (c, b)
- #undef FOPEN
- #define FOPEN(f, m) fopen (f, m)
- #define FCLOSE(f) fclose (f)
- #define FTRUNCATE(f, l) ftruncate (f, l)
- #define TRUNCATE(f, l) truncate (f, l)
- #define OPENDIR(d) opendir (d)
- #define CLOSEDIR(d) closedir (d)
- #define READDIR(d) readdir (d)
- #define OPEN open
- #define CHDIR(d) chdir (d)
- #define CLOSE(f) close (f)
- #define LSEEK(f, o, w) lseek (f, o, w)
- #define RMDIR(f) rmdir (f)
- #define ACCESS(p, m) access (p, m)
- #define CHMOD(f, p) chmod (f, p)
- #define FSTAT(h, b) fstat (h, b)
- #define PLIBC_KILL(p, s) kill (p, s)
- #define PIPE(h) pipe (h)
- #define REMOVE(p) remove (p)
- #define RENAME(o, n) rename (o, n)
- #define STAT(p, b) stat (p, b)
- #define STAT64(p, b) stat64 (p, b)
- #define SYSCONF(n) sysconf (n)
- #define UNLINK(f) unlink (f)
- #define WRITE(f, b, n) write (f, b, n)
- #define READ(f, b, n) read (f, b, n)
- #define GN_FREAD(b, s, c, f) fread (b, s, c, f)
- #define GN_FWRITE(b, s, c, f) fwrite (b, s, c, f)
- #define SYMLINK(a, b) symlink (a, b)
- #define MMAP(s, l, p, f, d, o) mmap (s, l, p, f, d, o)
- #define MKFIFO(p, m) mkfifo (p, m)
- #define MSYNC(s, l, f) msync (s, l, f)
- #define MUNMAP(s, l) munmap (s, l)
- #define STRERROR(i) strerror (i)
- #define RANDOM() random ()
- #define SRANDOM(s) srandom (s)
- #define READLINK(p, b, s) readlink (p, b, s)
- #define LSTAT(p, b) lstat (p, b)
- #define LSTAT64(p, b) lstat64 (p, b)
- #define PRINTF printf
- #define FPRINTF fprintf
- #define VPRINTF(f, a) vprintf (f, a)
- #define VFPRINTF(s, f, a) vfprintf (s, f, a)
- #define VSPRINTF(d, f, a) vsprintf (d, f, a)
- #define VSNPRINTF(str, size, fmt, a) vsnprintf (str, size, fmt, a)
- #define _REAL_SNPRINTF snprintf
- #define SPRINTF sprintf
- #define VSSCANF(s, f, a) vsscanf (s, f, a)
- #define SSCANF sscanf
- #define VFSCANF(s, f, a) vfscanf (s, f, a)
- #define VSCANF(f, a) vscanf (f, a)
- #define SCANF scanf
- #define FSCANF fscanf
- #define WAITPID(p, s, o) waitpid (p, s, o)
- #define ACCEPT(s, a, l) accept (s, a, l)
- #define BIND(s, n, l) bind (s, n, l)
- #define CONNECT(s, n, l) connect (s, n, l)
- #define GETPEERNAME(s, n, l) getpeername (s, n, l)
- #define GETSOCKNAME(s, n, l) getsockname (s, n, l)
- #define GETSOCKOPT(s, l, o, v, p) getsockopt (s, l, o, v, p)
- #define LISTEN(s, b) listen (s, b)
- #define RECV(s, b, l, f) recv (s, b, l, f)
- #define RECVFROM(s, b, l, f, r, o) recvfrom (s, b, l, f, r, o)
- #define SELECT(n, r, w, e, t) select (n, r, w, e, t)
- #define SEND(s, b, l, f) send (s, b, l, f)
- #define SENDTO(s, b, l, f, o, n) sendto (s, b, l, f, o, n)
- #define SETSOCKOPT(s, l, o, v, n) setsockopt (s, l, o, v, n)
- #define SHUTDOWN(s, h) shutdown (s, h)
- #define SOCKET(a, t, p) socket (a, t, p)
- #define SOCKETPAIR(a, t, p, v) socketpair (a, t, p, v)
- #define GETHOSTBYADDR(a, l, t) gethostbyaddr (a, l, t)
- #define GETHOSTBYNAME(n) gethostbyname (n)
- #define GETTIMEOFDAY(t, n) gettimeofday (t, n)
- #define INSQUE(e, p) insque (e, p)
- #define REMQUE(e) remque (e)
- #define HSEARCH(i, a) hsearch (i, a)
- #define HCREATE(n) hcreate (n)
- #define HDESTROY() hdestroy ()
- #define HSEARCH_R(i, a, r, h) hsearch_r (i, a, r, h)
- #define HCREATE_R(n, h) hcreate_r (n, h)
- #define HDESTROY_R(h) hdestroy_r (h)
- #define TSEARCH(k, r, c) tsearch (k, r, c)
- #define TFIND(k, r, c) tfind (k, r, c)
- #define TDELETE(k, r, c) tdelete (k, r, c)
- #define TWALK(r, a) twalk (r, a)
- #define TDESTROY(r, f) tdestroy (r, f)
- #define LFIND(k, b, n, s, c) lfind (k, b, n, s, c)
- #define LSEARCH(k, b, n, s, c) lsearch (k, b, n, s, c)
- #define STRUCT_STAT64 struct stat64
-#else
- #define DIR_SEPARATOR '\\'
- #define DIR_SEPARATOR_STR "\\"
- #define PATH_SEPARATOR ';'
- #define PATH_SEPARATOR_STR ";"
- #define NEWLINE "\r\n"
-
-#ifdef ENABLE_NLS
- #define BINDTEXTDOMAIN(d, n) _win_bindtextdomain (d, n)
-#endif
- #define CREAT(p, m) _win_creat (p, m)
- #define PLIBC_CTIME(c) _win_ctime (c)
- #define CTIME_R(c, b) _win_ctime_r (c, b)
- #define FOPEN(f, m) _win_fopen (f, m)
- #define FCLOSE(f) _win_fclose (f)
- #define FTRUNCATE(f, l) _win_ftruncate (f, l)
- #define TRUNCATE(f, l) _win_truncate (f, l)
- #define OPENDIR(d) _win_opendir (d)
- #define CLOSEDIR(d) _win_closedir (d)
- #define READDIR(d) _win_readdir (d)
- #define OPEN _win_open
- #define CHDIR(d) _win_chdir (d)
- #define CLOSE(f) _win_close (f)
- #define PLIBC_KILL(p, s) _win_kill (p, s)
- #define LSEEK(f, o, w) lseek (f, o, w)
- #define FSTAT(h, b) _win_fstat (h, b)
- #define RMDIR(f) _win_rmdir (f)
- #define ACCESS(p, m) _win_access (p, m)
- #define CHMOD(f, p) _win_chmod (f, p)
- #define PIPE(h) _win_pipe (h)
- #define RANDOM() _win_random ()
- #define SRANDOM(s) _win_srandom (s)
- #define REMOVE(p) _win_remove (p)
- #define RENAME(o, n) _win_rename (o, n)
- #define STAT(p, b) _win_stat (p, b)
- #define STAT64(p, b) _win_stati64 (p, b)
- #define SYSCONF(n) _win_sysconf (n)
- #define UNLINK(f) _win_unlink (f)
- #define WRITE(f, b, n) _win_write (f, b, n)
- #define READ(f, b, n) _win_read (f, b, n)
- #define GN_FREAD(b, s, c, f) _win_fread (b, s, c, f)
- #define GN_FWRITE(b, s, c, f) _win_fwrite (b, s, c, f)
- #define SYMLINK(a, b) _win_symlink (a, b)
- #define MMAP(s, l, p, f, d, o) _win_mmap (s, l, p, f, d, o)
- #define MKFIFO(p, m) _win_mkfifo (p, m)
- #define MSYNC(s, l, f) _win_msync (s, l, f)
- #define MUNMAP(s, l) _win_munmap (s, l)
- #define STRERROR(i) _win_strerror (i)
- #define READLINK(p, b, s) _win_readlink (p, b, s)
- #define LSTAT(p, b) _win_lstat (p, b)
- #define LSTAT64(p, b) _win_lstati64 (p, b)
- #define PRINTF printf
- #define FPRINTF fprintf
- #define VPRINTF(f, a) vprintf (f, a)
- #define VFPRINTF(s, f, a) vfprintf (s, f, a)
- #define VSPRINTF(d, f, a) vsprintf (d, f, a)
- #define VSNPRINTF(str, size, fmt, a) vsnprintf (str, size, fmt, a)
- #define _REAL_SNPRINTF snprintf
- #define SPRINTF sprintf
- #define VSSCANF(s, f, a) vsscanf (s, f, a)
- #define SSCANF sscanf
- #define VFSCANF(s, f, a) vfscanf (s, f, a)
- #define VSCANF(f, a) vscanf (f, a)
- #define SCANF scanf
- #define FSCANF fscanf
- #define WAITPID(p, s, o) _win_waitpid (p, s, o)
- #define ACCEPT(s, a, l) _win_accept (s, a, l)
- #define BIND(s, n, l) _win_bind (s, n, l)
- #define CONNECT(s, n, l) _win_connect (s, n, l)
- #define GETPEERNAME(s, n, l) _win_getpeername (s, n, l)
- #define GETSOCKNAME(s, n, l) _win_getsockname (s, n, l)
- #define GETSOCKOPT(s, l, o, v, p) _win_getsockopt (s, l, o, v, p)
- #define LISTEN(s, b) _win_listen (s, b)
- #define RECV(s, b, l, f) _win_recv (s, b, l, f)
- #define RECVFROM(s, b, l, f, r, o) _win_recvfrom (s, b, l, f, r, o)
- #define SELECT(n, r, w, e, t) _win_select (n, r, w, e, t)
- #define SEND(s, b, l, f) _win_send (s, b, l, f)
- #define SENDTO(s, b, l, f, o, n) _win_sendto (s, b, l, f, o, n)
- #define SETSOCKOPT(s, l, o, v, n) _win_setsockopt (s, l, o, v, n)
- #define SHUTDOWN(s, h) _win_shutdown (s, h)
- #define SOCKET(a, t, p) _win_socket (a, t, p)
- #define SOCKETPAIR(a, t, p, v) _win_socketpair (a, t, p, v)
- #define GETHOSTBYADDR(a, l, t) _win_gethostbyaddr (a, l, t)
- #define GETHOSTBYNAME(n) _win_gethostbyname (n)
- #define GETTIMEOFDAY(t, n) gettimeofday (t, n)
- #define INSQUE(e, p) _win_insque (e, p)
- #define REMQUE(e) _win_remque (e)
- #define HSEARCH(i, a) _win_hsearch (i, a)
- #define HCREATE(n) _win_hcreate (n)
- #define HDESTROY() _win_hdestroy ()
- #define HSEARCH_R(i, a, r, h) _win_hsearch_r (i, a, r, h)
- #define HCREATE_R(n, h) _win_hcreate_r (n, h)
- #define HDESTROY_R(h) _win_hdestroy_r (h)
- #define TSEARCH(k, r, c) _win_tsearch (k, r, c)
- #define TFIND(k, r, c) _win_tfind (k, r, c)
- #define TDELETE(k, r, c) _win_tdelete (k, r, c)
- #define TWALK(r, a) _win_twalk (r, a)
- #define TDESTROY(r, f) _win_tdestroy (r, f)
- #define LFIND(k, b, n, s, c) _win_lfind (k, b, n, s, c)
- #define LSEARCH(k, b, n, s, c) _win_lsearch (k, b, n, s, c)
- #define STRUCT_STAT64 struct _stati64
-#endif
-
-/* search.h */
-
-/* Prototype structure for a linked-list data structure.
- This is the type used by the `insque' and `remque' functions. */
-
-struct PLIBC_SEARCH_QELEM
-{
- struct qelem *q_forw;
- struct qelem *q_back;
- char q_data[1];
-};
-
-
-/* Insert ELEM into a doubly-linked list, after PREV. */
-void _win_insque (void *__elem, void *__prev);
-
-/* Unlink ELEM from the doubly-linked list that it is in. */
-void _win_remque (void *__elem);
-
-
-/* For use with hsearch(3). */
-typedef int (*PLIBC_SEARCH__compar_fn_t) (__const void *, __const void *);
-
-typedef PLIBC_SEARCH__compar_fn_t _win_comparison_fn_t;
-
-/* Action which shall be performed in the call the hsearch. */
-typedef enum
-{
- PLIBC_SEARCH_FIND,
- PLIBC_SEARCH_ENTER
-}
-PLIBC_SEARCH_ACTION;
-
-typedef struct PLIBC_SEARCH_entry
-{
- char *key;
- void *data;
-}
-PLIBC_SEARCH_ENTRY;
-
-/* The reentrant version has no static variables to maintain the state.
- Instead the interface of all functions is extended to take an argument
- which describes the current status. */
-typedef struct _PLIBC_SEARCH_ENTRY
-{
- unsigned int used;
- PLIBC_SEARCH_ENTRY entry;
-}
-_PLIBC_SEARCH_ENTRY;
-
-
-/* Family of hash table handling functions. The functions also
- have reentrant counterparts ending with _r. The non-reentrant
- functions all work on a signle internal hashing table. */
-
-/* Search for entry matching ITEM.key in internal hash table. If
- ACTION is `FIND' return found entry or signal error by returning
- NULL. If ACTION is `ENTER' replace existing data (if any) with
- ITEM.data. */
-PLIBC_SEARCH_ENTRY *_win_hsearch (PLIBC_SEARCH_ENTRY __item,
PLIBC_SEARCH_ACTION
- __action);
-
-/* Create a new hashing table which will at most contain NEL elements. */
-int _win_hcreate (size_t __nel);
-
-/* Destroy current internal hashing table. */
-void _win_hdestroy (void);
-
-/* Data type for reentrant functions. */
-struct PLIBC_SEARCH_hsearch_data
-{
- struct _PLIBC_SEARCH_ENTRY *table;
- unsigned int size;
- unsigned int filled;
-};
-
-/* Reentrant versions which can handle multiple hashing tables at the
- same time. */
-int _win_hsearch_r (PLIBC_SEARCH_ENTRY __item, PLIBC_SEARCH_ACTION __action,
- PLIBC_SEARCH_ENTRY **__retval,
- struct PLIBC_SEARCH_hsearch_data *__htab);
-
-int _win_hcreate_r (size_t __nel, struct PLIBC_SEARCH_hsearch_data *__htab);
-
-void _win_hdestroy_r (struct PLIBC_SEARCH_hsearch_data *__htab);
-
-
-/* The tsearch routines are very interesting. They make many
- assumptions about the compiler. It assumes that the first field
- in node must be the "key" field, which points to the datum.
- Everything depends on that. */
-/* For tsearch */
-typedef enum
-{
- PLIBC_SEARCH_preorder,
- PLIBC_SEARCH_postorder,
- PLIBC_SEARCH_endorder,
- PLIBC_SEARCH_leaf
-}
-PLIBC_SEARCH_VISIT;
-
-/* Search for an entry matching the given KEY in the tree pointed to
- by *ROOTP and insert a new element if not found. */
-void *_win_tsearch (__const void *__key, void **__rootp,
- PLIBC_SEARCH__compar_fn_t __compar);
-
-/* Search for an entry matching the given KEY in the tree pointed to
- by *ROOTP. If no matching entry is available return NULL. */
-void *_win_tfind (__const void *__key, void *__const *__rootp,
- PLIBC_SEARCH__compar_fn_t __compar);
-
-/* Remove the element matching KEY from the tree pointed to by *ROOTP. */
-void *_win_tdelete (__const void *__restrict __key,
- void **__restrict __rootp,
- PLIBC_SEARCH__compar_fn_t __compar);
-
-typedef void (*PLIBC_SEARCH__action_fn_t) (__const void *__nodep,
- PLIBC_SEARCH_VISIT __value,
- int __level);
-
-/* Walk through the whole tree and call the ACTION callback for every node
- or leaf. */
-void _win_twalk (__const void *__root, PLIBC_SEARCH__action_fn_t __action);
-
-/* Callback type for function to free a tree node. If the keys are atomic
- data this function should do nothing. */
-typedef void (*PLIBC_SEARCH__free_fn_t) (void *__nodep);
-
-/* Destroy the whole tree, call FREEFCT for each node or leaf. */
-void _win_tdestroy (void *__root, PLIBC_SEARCH__free_fn_t __freefct);
-
-
-/* Perform linear search for KEY by comparing by COMPAR in an array
- [BASE,BASE+NMEMB*SIZE). */
-void *_win_lfind (__const void *__key, __const void *__base,
- size_t *__nmemb, size_t __size, PLIBC_SEARCH__compar_fn_t
- __compar);
-
-/* Perform linear search for KEY by comparing by COMPAR function in
- array [BASE,BASE+NMEMB*SIZE) and insert entry if not found. */
-void *_win_lsearch (__const void *__key, void *__base,
- size_t *__nmemb, size_t __size, PLIBC_SEARCH__compar_fn_t
- __compar);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif // _PLIBC_H_
-
-/* end of plibc.h */
diff --git a/src/main/extract.c b/src/main/extract.c
index 144f2c3..5efc53a 100644
--- a/src/main/extract.c
+++ b/src/main/extract.c
@@ -70,7 +70,7 @@ ignore_sigpipe ()
sig.sa_flags = SA_RESTART;
#endif
if (0 != sigaction (SIGPIPE, &sig, &oldsig))
- FPRINTF (stderr,
+ fprintf (stderr,
"Failed to install SIGPIPE handler: %s\n", strerror (errno));
}
@@ -290,7 +290,7 @@ print_selected_keywords (void *cls,
if (YES != print[type])
return 0;
if (verbose > 3)
- FPRINTF (stdout,
+ fprintf (stdout,
_ ("Found by `%s' plugin:\n"),
plugin_name);
mt = EXTRACTOR_metatype_to_string (type);
@@ -298,7 +298,7 @@ print_selected_keywords (void *cls,
switch (format)
{
case EXTRACTOR_METAFORMAT_UNKNOWN:
- FPRINTF (stdout,
+ fprintf (stdout,
_ ("%s - (unknown, %u bytes)\n"),
stype,
(unsigned int) data_len);
@@ -317,7 +317,7 @@ print_selected_keywords (void *cls,
keyword = strdup (data);
if (NULL != keyword)
{
- FPRINTF (stdout,
+ fprintf (stdout,
"%s - %s\n",
stype,
keyword);
@@ -329,13 +329,13 @@ print_selected_keywords (void *cls,
#endif
break;
case EXTRACTOR_METAFORMAT_BINARY:
- FPRINTF (stdout,
+ fprintf (stdout,
_ ("%s - (binary, %u bytes)\n"),
stype,
(unsigned int) data_len);
break;
case EXTRACTOR_METAFORMAT_C_STRING:
- FPRINTF (stdout,
+ fprintf (stdout,
"%s - %.*s\n",
stype,
(int) data_len,
@@ -392,7 +392,7 @@ print_selected_keywords_grep_friendly (void *cls,
if (0 == data_len)
return 0;
if (verbose > 1)
- FPRINTF (stdout,
+ fprintf (stdout,
"%s: ",
gettext (mt));
#if HAVE_ICONV
@@ -406,7 +406,7 @@ print_selected_keywords_grep_friendly (void *cls,
keyword = strdup (data);
if (NULL != keyword)
{
- FPRINTF (stdout,
+ fprintf (stdout,
"`%s' ",
keyword);
free (keyword);
@@ -420,10 +420,10 @@ print_selected_keywords_grep_friendly (void *cls,
break;
case EXTRACTOR_METAFORMAT_C_STRING:
if (verbose > 1)
- FPRINTF (stdout,
+ fprintf (stdout,
"%s ",
gettext (mt));
- FPRINTF (stdout,
+ fprintf (stdout,
"`%s'",
data);
break;
@@ -575,7 +575,7 @@ finish_bibtex (const char *fn)
if ( (NULL == btm[0].value) ||
(NULL == btm[1].value) ||
(NULL == btm[2].value) )
- FPRINTF (stdout,
+ fprintf (stdout,
"@%s %s { ",
et,
fn);
@@ -592,18 +592,18 @@ finish_bibtex (const char *fn)
temp[n] = '_';
else
temp[n] = tolower ( (unsigned char) temp[n]);
- FPRINTF (stdout,
+ fprintf (stdout,
"@%s %s { ",
et,
temp);
}
for (i = 0; NULL != btm[i].bibTexName; i++)
if (NULL != btm[i].value)
- FPRINTF (stdout,
+ fprintf (stdout,
"\t%s = {%s},\n",
btm[i].bibTexName,
btm[i].value);
- FPRINTF (stdout, "%s", "}\n\n");
+ fprintf (stdout, "%s", "}\n\n");
}
@@ -775,7 +775,7 @@ main (int argc, char *argv[])
#endif
if (NULL == (print = malloc (sizeof (int) * EXTRACTOR_metatype_get_max ())))
{
- FPRINTF (stderr,
+ fprintf (stderr,
"malloc failed: %s\n",
strerror (errno));
return 1;
@@ -785,7 +785,7 @@ main (int argc, char *argv[])
if (0 != _get_utf8_args (argc, argv, &utf8_argc, &utf8_argv))
{
- FPRINTF (stderr, "Failed to get arguments: %s\n", strerror (errno));
+ fprintf (stderr, "Failed to get arguments: %s\n", strerror (errno));
return 1;
}
@@ -821,7 +821,7 @@ main (int argc, char *argv[])
bibtex = YES;
if (NULL != processor)
{
- FPRINTF (stderr,
+ fprintf (stderr,
"%s",
_ (
"Illegal combination of options, cannot combine multiple
styles of printing.\n"));
@@ -834,7 +834,7 @@ main (int argc, char *argv[])
grepfriendly = YES;
if (NULL != processor)
{
- FPRINTF (stderr,
+ fprintf (stderr,
"%s",
_ (
"Illegal combination of options, cannot combine multiple
styles of printing.\n"));
@@ -869,7 +869,7 @@ main (int argc, char *argv[])
case 'p':
if (NULL == optarg)
{
- FPRINTF (stderr,
+ fprintf (stderr,
_ (
"You must specify an argument for the `%s' option (option
ignored).\n"),
"-p");
@@ -898,7 +898,7 @@ main (int argc, char *argv[])
}
if (NULL == EXTRACTOR_metatype_to_string (i))
{
- FPRINTF (stderr,
+ fprintf (stderr,
"Unknown keyword type `%s', use option `%s' to get a list.\n",
optarg,
"-L");
@@ -929,7 +929,7 @@ main (int argc, char *argv[])
}
if (NULL == EXTRACTOR_metatype_to_string (i))
{
- FPRINTF (stderr,
+ fprintf (stderr,
"Unknown keyword type `%s', use option `%s' to get a list.\n",
optarg,
"-L");
@@ -938,7 +938,7 @@ main (int argc, char *argv[])
}
break;
default:
- FPRINTF (stderr,
+ fprintf (stderr,
"%s",
_ ("Use --help to get a list of options.\n"));
free (utf8_argv);
@@ -947,7 +947,7 @@ main (int argc, char *argv[])
} /* while (1) */
if (optind < 0)
{
- FPRINTF (stderr,
+ fprintf (stderr,
"%s", "Unknown error parsing options\n");
free (print);
free (utf8_argv);
@@ -955,7 +955,7 @@ main (int argc, char *argv[])
}
if (utf8_argc - optind < 1)
{
- FPRINTF (stderr,
+ fprintf (stderr,
"%s", "Invoke with list of filenames to extract keywords
form!\n");
free (print);
free (utf8_argv);
@@ -980,15 +980,15 @@ main (int argc, char *argv[])
/* extract keywords */
if (YES == bibtex)
- FPRINTF (stdout,
+ fprintf (stdout,
"%s", _ ("% BiBTeX file\n"));
for (i = optind; i < utf8_argc; i++)
{
errno = 0;
if (YES == grepfriendly)
- FPRINTF (stdout, "%s ", utf8_argv[i]);
+ fprintf (stdout, "%s ", utf8_argv[i]);
else if (NO == bibtex)
- FPRINTF (stdout,
+ fprintf (stdout,
_ ("Keywords for file %s:\n"),
utf8_argv[i]);
else
@@ -1003,15 +1003,15 @@ main (int argc, char *argv[])
{
struct stat sb;
unsigned char *data = NULL;
- int f = OPEN (utf8_argv[i], O_RDONLY
+ int f = open (utf8_argv[i], O_RDONLY
#if WINDOWS
| O_BINARY
#endif
);
if ( (-1 != f) &&
- (0 == FSTAT (f, &sb)) &&
+ (0 == fstat (f, &sb)) &&
(NULL != (data = malloc ((size_t) sb.st_size))) &&
- (sb.st_size == READ (f, data, (size_t) sb.st_size) ) )
+ (sb.st_size == read (f, data, (size_t) sb.st_size) ) )
{
EXTRACTOR_extract (plugins,
NULL,
@@ -1022,7 +1022,7 @@ main (int argc, char *argv[])
else
{
if (verbose > 0)
- FPRINTF (stderr,
+ fprintf (stderr,
"%s: %s: %s\n",
utf8_argv[0], utf8_argv[i], strerror (errno));
ret = 1;
@@ -1030,18 +1030,18 @@ main (int argc, char *argv[])
if (NULL != data)
free (data);
if (-1 != f)
- (void) CLOSE (f);
+ (void) close (f);
}
if (YES == grepfriendly)
- FPRINTF (stdout, "%s", "\n");
+ fprintf (stdout, "%s", "\n");
continue;
}
if (YES == grepfriendly)
- FPRINTF (stdout, "%s", "\n");
+ fprintf (stdout, "%s", "\n");
if (bibtex)
finish_bibtex (utf8_argv[i]);
if (verbose > 0)
- FPRINTF (stdout, "%s", "\n");
+ fprintf (stdout, "%s", "\n");
free (print);
free (utf8_argv);
EXTRACTOR_plugin_remove_all (plugins);
diff --git a/src/main/extractor.c b/src/main/extractor.c
index 89d734d..defa229 100644
--- a/src/main/extractor.c
+++ b/src/main/extractor.c
@@ -19,7 +19,6 @@
*/
#include "platform.h"
-#include "plibc.h"
#include "extractor.h"
#include <dirent.h>
#include <sys/types.h>
@@ -670,7 +669,7 @@ EXTRACTOR_ltdl_init ()
int err;
#if ENABLE_NLS
- BINDTEXTDOMAIN (PACKAGE, LOCALEDIR);
+ bindtextdomain (PACKAGE, LOCALEDIR);
#endif
err = lt_dlinit ();
if (err > 0)
diff --git a/src/main/extractor_datasource.c b/src/main/extractor_datasource.c
index 0b18d7c..9f51d90 100644
--- a/src/main/extractor_datasource.c
+++ b/src/main/extractor_datasource.c
@@ -229,7 +229,7 @@ bfds_pick_next_buffer_at (struct BufferedFileDataSource
*bfds,
bfds->buffer_pos = pos;
return 0;
}
- position = (int64_t) LSEEK (bfds->fd, pos, SEEK_SET);
+ position = (int64_t) lseek (bfds->fd, pos, SEEK_SET);
if (position < 0)
{
LOG_STRERROR ("lseek");
@@ -1214,38 +1214,38 @@ EXTRACTOR_datasource_create_from_file_ (const char
*filename,
winmode = O_BINARY;
#endif
- if (-1 == (fd = OPEN (filename, O_RDONLY | O_LARGEFILE | winmode)))
+ if (-1 == (fd = open (filename, O_RDONLY | O_LARGEFILE | winmode)))
{
LOG_STRERROR_FILE ("open", filename);
return NULL;
}
- if ( (0 != FSTAT (fd, &sb)) ||
+ if ( (0 != fstat (fd, &sb)) ||
(S_ISDIR (sb.st_mode)) )
{
if (! S_ISDIR (sb.st_mode))
LOG_STRERROR_FILE ("fstat", filename);
else
LOG ("Skipping directory `%s'\n", filename);
- (void) CLOSE (fd);
+ (void) close (fd);
return NULL;
}
fsize = (int64_t) sb.st_size;
if (0 == fsize)
{
- (void) CLOSE (fd);
+ (void) close (fd);
return NULL;
}
bfds = bfds_new (NULL, fd, fsize);
if (NULL == bfds)
{
- (void) CLOSE (fd);
+ (void) close (fd);
return NULL;
}
if (NULL == (ds = malloc (sizeof (struct EXTRACTOR_Datasource))))
{
LOG_STRERROR ("malloc");
bfds_delete (bfds);
- (void) CLOSE (fd);
+ (void) close (fd);
return NULL;
}
ds->bfds = bfds;
@@ -1261,7 +1261,7 @@ EXTRACTOR_datasource_create_from_file_ (const char
*filename,
LOG ("Failed to initialize decompressor\n");
bfds_delete (bfds);
free (ds);
- (void) CLOSE (fd);
+ (void) close (fd);
return NULL;
}
}
@@ -1333,7 +1333,7 @@ EXTRACTOR_datasource_destroy_ (struct
EXTRACTOR_Datasource *ds)
cfs_destroy (ds->cfs);
bfds_delete (ds->bfds);
if (-1 != ds->fd)
- (void) CLOSE (ds->fd);
+ (void) close (ds->fd);
free (ds);
}
diff --git a/src/main/extractor_ipc_gnu.c b/src/main/extractor_ipc_gnu.c
index 06e4a1b..4bb5869 100644
--- a/src/main/extractor_ipc_gnu.c
+++ b/src/main/extractor_ipc_gnu.c
@@ -23,7 +23,6 @@
* @author Christian Grothoff
*/
#include "platform.h"
-#include "plibc.h"
#include "extractor.h"
#include "extractor_datasource.h"
#include "extractor_logging.h"
@@ -155,7 +154,7 @@ EXTRACTOR_IPC_shared_memory_create_ (size_t size)
"%sLE-%u-%u",
tpath,
getpid (),
- (unsigned int) RANDOM ());
+ (unsigned int) random ());
if (-1 == (shm->shm_id = shm_open (shm->shm_name,
O_RDWR | O_CREAT,
S_IRUSR | S_IWUSR)))
diff --git a/src/main/extractor_ipc_w32.c b/src/main/extractor_ipc_w32.c
index b53bc3c..8749da9 100644
--- a/src/main/extractor_ipc_w32.c
+++ b/src/main/extractor_ipc_w32.c
@@ -162,7 +162,7 @@ EXTRACTOR_IPC_shared_memory_create_ (size_t size)
snprintf (shm->shm_name, MAX_SHM_NAME,
"%slibextractor-shm-%u-%u",
tpath, getpid (),
- (unsigned int) RANDOM ());
+ (unsigned int) random ());
shm->map = CreateFileMapping (INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0,
size, shm->shm_name);
shm->ptr = MapViewOfFile (shm->map, FILE_MAP_WRITE, 0, 0, size);
diff --git a/src/main/extractor_plugin_main.c b/src/main/extractor_plugin_main.c
index ee51c8f..409290d 100644
--- a/src/main/extractor_plugin_main.c
+++ b/src/main/extractor_plugin_main.c
@@ -23,7 +23,6 @@
* @author Christian Grothoff
*/
#include "platform.h"
-#include "plibc.h"
#include "extractor.h"
#include "extractor_common.h"
#include "extractor_datasource.h"
diff --git a/src/main/extractor_plugins.h b/src/main/extractor_plugins.h
index 8b0f5e6..b362d43 100644
--- a/src/main/extractor_plugins.h
+++ b/src/main/extractor_plugins.h
@@ -26,7 +26,6 @@
#define EXTRACTOR_PLUGINS_H
#include "platform.h"
-#include "plibc.h"
#include "extractor.h"
#include <signal.h>
#include <ltdl.h>
diff --git a/src/main/extractor_plugpath.c b/src/main/extractor_plugpath.c
index 4374bc5..269061f 100644
--- a/src/main/extractor_plugpath.c
+++ b/src/main/extractor_plugpath.c
@@ -24,7 +24,6 @@
*/
#include "platform.h"
-#include "plibc.h"
#include "extractor.h"
#include <dirent.h>
#include <sys/types.h>
@@ -103,7 +102,7 @@ get_path_from_proc_exe ()
sizeof (fn),
"/proc/%u/maps",
getpid ());
- if (NULL != (f = FOPEN (fn, "r")))
+ if (NULL != (f = fopen (fn, "r")))
{
while (NULL != fgets (line, 1024, f))
{
@@ -419,7 +418,7 @@ append_to_dir (const char *path,
if (0 == (slen = strlen (path)))
return NULL;
- if (DIR_SEPARATOR == fname[0])
+ if ('/' == fname[0])
fname++;
ret = malloc (slen + strlen (fname) + 2);
if (NULL == ret)
@@ -476,9 +475,9 @@ get_installation_paths (EXTRACTOR_PathProcessor pp,
LOG_STRERROR ("strdup");
return;
}
- for (prefix = strtok_r (d, PATH_SEPARATOR_STR, &saveptr);
+ for (prefix = strtok_r (d, ":", &saveptr);
NULL != prefix;
- prefix = strtok_r (NULL, PATH_SEPARATOR_STR, &saveptr))
+ prefix = strtok_r (NULL, ":", &saveptr))
pp (pp_cls, prefix);
free (d);
return;
@@ -551,9 +550,9 @@ find_plugin_in_path (void *cls,
if (NULL != sc->path)
return;
- if (NULL == (dir = OPENDIR (path)))
+ if (NULL == (dir = opendir (path)))
return;
- while (NULL != (ent = READDIR (dir)))
+ while (NULL != (ent = readdir (dir)))
{
if ('.' == ent->d_name[0])
continue;
@@ -568,7 +567,7 @@ find_plugin_in_path (void *cls,
if (NULL == (sym = strdup (sym_name)))
{
LOG_STRERROR ("strdup");
- CLOSEDIR (dir);
+ closedir (dir);
return;
}
dot = strchr (sym, '.');
@@ -582,7 +581,7 @@ find_plugin_in_path (void *cls,
}
free (sym);
}
- CLOSEDIR (dir);
+ closedir (dir);
}
diff --git a/src/main/test_bzip2.c b/src/main/test_bzip2.c
index 598e913..1c4c9d3 100644
--- a/src/main/test_bzip2.c
+++ b/src/main/test_bzip2.c
@@ -135,7 +135,7 @@ main (int argc, char *argv[])
/* change environment to find 'extractor_test' plugin which is
not installed but should be in the current directory (or .libs)
on 'make check' */
- if (0 != putenv ("LIBEXTRACTOR_PREFIX=." PATH_SEPARATOR_STR ".libs/"))
+ if (0 != putenv ("LIBEXTRACTOR_PREFIX=.:.libs/"))
fprintf (stderr,
"Failed to update my environment, plugin loading may fail: %s\n",
strerror (errno));
diff --git a/src/main/test_file.c b/src/main/test_file.c
index a2d6a5e..83681f7 100644
--- a/src/main/test_file.c
+++ b/src/main/test_file.c
@@ -135,7 +135,7 @@ main (int argc, char *argv[])
/* change environment to find 'extractor_test' plugin which is
not installed but should be in the current directory (or .libs)
on 'make check' */
- if (0 != putenv ("LIBEXTRACTOR_PREFIX=." PATH_SEPARATOR_STR ".libs/"))
+ if (0 != putenv ("LIBEXTRACTOR_PREFIX=.:.libs/"))
fprintf (stderr,
"Failed to update my environment, plugin loading may fail: %s\n",
strerror (errno));
diff --git a/src/main/test_gzip.c b/src/main/test_gzip.c
index 071c74c..5b29ac1 100644
--- a/src/main/test_gzip.c
+++ b/src/main/test_gzip.c
@@ -139,7 +139,7 @@ main (int argc, char *argv[])
/* change environment to find 'extractor_test' plugin which is
not installed but should be in the current directory (or .libs)
on 'make check' */
- if (0 != putenv ("LIBEXTRACTOR_PREFIX=." PATH_SEPARATOR_STR ".libs/"))
+ if (0 != putenv ("LIBEXTRACTOR_PREFIX=.:.libs/"))
fprintf (stderr,
"Failed to update my environment, plugin loading may fail: %s\n",
strerror (errno));
diff --git a/src/main/test_ipc.c b/src/main/test_ipc.c
index 4da3ef5..1ef23f0 100644
--- a/src/main/test_ipc.c
+++ b/src/main/test_ipc.c
@@ -145,7 +145,7 @@ main (int argc, char *argv[])
/* change environment to find 'extractor_test' plugin which is
not installed but should be in the current directory (or .libs)
on 'make check' */
- if (0 != putenv ("LIBEXTRACTOR_PREFIX=." PATH_SEPARATOR_STR ".libs/"))
+ if (0 != putenv ("LIBEXTRACTOR_PREFIX=.:.libs/"))
fprintf (stderr,
"Failed to update my environment, plugin loading may fail: %s\n",
strerror (errno));
diff --git a/src/main/test_plugin_load_multi.c
b/src/main/test_plugin_load_multi.c
index 6b30390..18b3e64 100644
--- a/src/main/test_plugin_load_multi.c
+++ b/src/main/test_plugin_load_multi.c
@@ -60,7 +60,7 @@ main (int argc, char *argv[])
/* change environment to find 'extractor_test' plugin which is
not installed but should be in the current directory (or .libs)
on 'make check' */
- if (0 != putenv ("LIBEXTRACTOR_PREFIX=." PATH_SEPARATOR_STR ".libs/"))
+ if (0 != putenv ("LIBEXTRACTOR_PREFIX=.:.libs/"))
fprintf (stderr,
"Failed to update my environment, plugin loading may fail: %s\n",
strerror (errno));
diff --git a/src/main/test_plugin_loading.c b/src/main/test_plugin_loading.c
index 537b703..708c76c 100644
--- a/src/main/test_plugin_loading.c
+++ b/src/main/test_plugin_loading.c
@@ -33,7 +33,7 @@ main (int argc, char *argv[])
/* change environment to find 'extractor_test' plugin which is
not installed but should be in the current directory (or .libs)
on 'make check' */
- if (0 != putenv ("LIBEXTRACTOR_PREFIX=." PATH_SEPARATOR_STR ".libs/"))
+ if (0 != putenv ("LIBEXTRACTOR_PREFIX=.:.libs/"))
fprintf (stderr,
"Failed to update my environment, plugin loading may fail: %s\n",
strerror (errno));
diff --git a/src/main/test_trivial.c b/src/main/test_trivial.c
index b0860b4..ce0e7d5 100644
--- a/src/main/test_trivial.c
+++ b/src/main/test_trivial.c
@@ -51,7 +51,7 @@ main (int argc, char *argv[])
/* change environment to find 'extractor_test' plugin which is
not installed but should be in the current directory (or .libs)
on 'make check' */
- if (0 != putenv ("LIBEXTRACTOR_PREFIX=." PATH_SEPARATOR_STR ".libs/"))
+ if (0 != putenv ("LIBEXTRACTOR_PREFIX=.:.libs/"))
fprintf (stderr,
"Failed to update my environment, plugin loading may fail: %s\n",
strerror (errno));
diff --git a/src/plugins/fuzz_default.sh b/src/plugins/fuzz_default.sh
index c404723..7418dff 100755
--- a/src/plugins/fuzz_default.sh
+++ b/src/plugins/fuzz_default.sh
@@ -6,11 +6,11 @@ ZZSTARTSEED=0
ZZSTOPSEED=100
ret=0
# fallbacks for direct, non-"make check" usage
-if test x"$testdatadir" = x""
+if test x"${testdatadir:-NONE}" = xNONE""
then
testdatadir=../../test
fi
-if test x"$bindir" = x""
+if test x"${bindir:-NONE}" = xNONE""
then
bindir=`grep "^prefix = " ./Makefile | cut -d ' ' -f 3`
bindir="$bindir/bin"
diff --git a/src/plugins/gif_extractor.c b/src/plugins/gif_extractor.c
index 405eebe..3b202b5 100644
--- a/src/plugins/gif_extractor.c
+++ b/src/plugins/gif_extractor.c
@@ -36,7 +36,7 @@
* @return -1 on error, otherwise number of bytes read
*/
static int
-gif_read_func (GifFileType *ft,
+gif_READ_func (GifFileType *ft,
GifByteType *bt,
int arg)
{
@@ -68,13 +68,13 @@ EXTRACTOR_gif_extract_method (struct
EXTRACTOR_ExtractContext *ec)
int et;
char dims[128];
#if defined (GIF_LIB_VERSION) || GIFLIB_MAJOR <= 4
- if (NULL == (gif_file = DGifOpen (ec, &gif_read_func)))
+ if (NULL == (gif_file = DGifOpen (ec, &gif_READ_func)))
return; /* not a GIF */
#else
int gif_error;
gif_error = 0;
- gif_file = DGifOpen (ec, &gif_read_func, &gif_error);
+ gif_file = DGifOpen (ec, &gif_READ_func, &gif_error);
if ((gif_file == NULL) || (gif_error != 0))
{
if (gif_file != NULL)
diff --git a/src/plugins/old/ebml_extractor.c b/src/plugins/old/ebml_extractor.c
index f7daa9a..0d4fc91 100644
--- a/src/plugins/old/ebml_extractor.c
+++ b/src/plugins/old/ebml_extractor.c
@@ -734,7 +734,7 @@ struct ebml_state
int reported_ebml;
int valid_ebml;
uint64_t ebml_version;
- uint64_t ebml_read_version;
+ uint64_t ebml_READ_version;
uint64_t ebml_max_id_length;
uint64_t ebml_max_size_length;
char *doctype;
@@ -796,7 +796,7 @@ clean_ebml_state_ebml (struct ebml_state *state)
state->reported_ebml = 0;
state->valid_ebml = 0;
state->ebml_version = 1;
- state->ebml_read_version = 1;
+ state->ebml_READ_version = 1;
state->ebml_max_id_length = 4;
state->ebml_max_size_length = 8;
state->doctype = NULL;
@@ -1699,7 +1699,7 @@ EXTRACTOR_ebml_extract_method (struct
EXTRACTOR_PluginList *plugin,
state->ebml_version = uint_value;
break;
case EBMLID_READ_VERSION:
- state->ebml_read_version = uint_value;
+ state->ebml_READ_version = uint_value;
if (uint_value > 1)
{
/* We don't support EBML versions > 1 */
diff --git a/src/plugins/rpm_extractor.c b/src/plugins/rpm_extractor.c
index 90c5892..248217a 100644
--- a/src/plugins/rpm_extractor.c
+++ b/src/plugins/rpm_extractor.c
@@ -106,7 +106,7 @@ pipe_feeder (void *args)
while ( (0 == p->shutdown) &&
(done < rret) )
{
- if (-1 == (wret = WRITE (p->pi[1],
+ if (-1 == (wret = write (p->pi[1],
&buf[done],
rret - done)))
{
@@ -119,7 +119,7 @@ pipe_feeder (void *args)
if (done != rret)
break;
}
- CLOSE (p->pi[1]);
+ close (p->pi[1]);
return NULL;
}
@@ -272,8 +272,8 @@ EXTRACTOR_rpm_extract_method (struct
EXTRACTOR_ExtractContext *ec)
return;
if (0 != pthread_mutex_init (&parg.lock, NULL))
{
- CLOSE (parg.pi[0]);
- CLOSE (parg.pi[1]);
+ close (parg.pi[0]);
+ close (parg.pi[1]);
return;
}
if (0 != pthread_create (&pthr,
@@ -282,8 +282,8 @@ EXTRACTOR_rpm_extract_method (struct
EXTRACTOR_ExtractContext *ec)
&parg))
{
pthread_mutex_destroy (&parg.lock);
- CLOSE (parg.pi[0]);
- CLOSE (parg.pi[1]);
+ close (parg.pi[0]);
+ close (parg.pi[1]);
return;
}
rpmlogSetCallback (&discard_log_callback, NULL);
@@ -416,7 +416,7 @@ END:
sig.sa_handler = SIG_IGN;
sigaction (SIGALRM, &sig, &old);
parg.shutdown = 1;
- CLOSE (parg.pi[0]);
+ close (parg.pi[0]);
Fclose (fdi);
pthread_kill (pthr, SIGALRM);
pthread_join (pthr, &unused);
diff --git a/src/plugins/test_lib.c b/src/plugins/test_lib.c
index 97d4dc5..8bd6d4e 100644
--- a/src/plugins/test_lib.c
+++ b/src/plugins/test_lib.c
@@ -26,6 +26,7 @@
#include "test_lib.h"
#include <sys/types.h>
#include <regex.h>
+#include <signal.h>
/**
* Function that libextractor calls for each
@@ -174,6 +175,33 @@ run (const char *plugin_name,
}
+#ifndef WINDOWS
+/**
+ * Install a signal handler to ignore SIGPIPE.
+ */
+static void
+ignore_sigpipe ()
+{
+ struct sigaction oldsig;
+ struct sigaction sig;
+
+ memset (&sig, 0, sizeof (struct sigaction));
+ sig.sa_handler = SIG_IGN;
+ sigemptyset (&sig.sa_mask);
+#ifdef SA_INTERRUPT
+ sig.sa_flags = SA_INTERRUPT; /* SunOS */
+#else
+ sig.sa_flags = SA_RESTART;
+#endif
+ if (0 != sigaction (SIGPIPE, &sig, &oldsig))
+ fprintf (stderr,
+ "Failed to install SIGPIPE handler: %s\n", strerror (errno));
+}
+
+
+#endif
+
+
/**
* Main function to be called to test a plugin.
*
@@ -191,7 +219,10 @@ ET_main (const char *plugin_name,
/* change environment to find plugins which may not yet be
not installed but should be in the current directory (or .libs)
on 'make check' */
- if (0 != putenv ("LIBEXTRACTOR_PREFIX=." PATH_SEPARATOR_STR ".libs/"))
+#ifndef WINDOWS
+ ignore_sigpipe ();
+#endif
+ if (0 != putenv ("LIBEXTRACTOR_PREFIX=./.libs/"))
fprintf (stderr,
"Failed to update my environment, plugin loading may fail: %s\n",
strerror (errno));
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [libextractor] branch master updated (32e5c97 -> 4894c06),
gnunet <=