Apple fixes...

6 files changed, 113 insertions, 102 deletions

diff --git a/include/generic.h b/include/generic.h
index 17eab32..85f178b 100644
--- a/include/generic.h
+++ b/include/generic.h
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: generic.h,v 1.26 2004-02-18 00:02:55 pixel Exp $ */
+/* $Id: generic.h,v 1.27 2004-03-01 07:41:47 pixel Exp $ */
 
 #ifndef __GENERIC_H__
 #define __GENERIC_H__
@@ -76,11 +76,11 @@ typedef Uint16 Word;
 typedef Uint32 DWord;
 #endif
 
-#if !defined __ssize_t_defined && !defined _SSIZE_T && !defined ssize_t
+#if !defined __ssize_t_defined && !defined _SSIZE_T && !defined ssize_t && !defined _BSD_SSIZE_T_DEFINED_
 typedef int32 ssize_t;
 #endif
 
-#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __MINGW32__ || defined FORCE64
+#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __MINGW32__ || defined FORCE64 || defined __APPLE__
 typedef long long int64;
 typedef unsigned long long Uint64;
 #else
@@ -93,7 +93,7 @@ typedef unsigned _int64 Uint64;
 #endif
 
 #ifndef PACKED
-#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __MINGW32__
+#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __MINGW32__ || defined __APPLE__
 #define PACKED __attribute__((packed))
 #else // PACKED
 #define PACKED
@@ -101,12 +101,12 @@ typedef unsigned _int64 Uint64;
 #endif // !PACKED
 
 #ifndef PPACKED
-#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __MINGW32__
+#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __MINGW32__ || defined __APPLE__
 #define PPACKED
-#else // PACKED
+#else // PPACKED
 #define PPACKED __declspec(align(1))
 #endif
-#endif // !PACKED
+#endif // !PPACKED
 
 extern char verbosity;
 char ** split(char * s, char t);
@@ -144,7 +144,7 @@ inline T ABS(T x) {
 }
 #endif
 
-#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __MINGW32__
+#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __MINGW32__ || defined __APPLE__
 #define FUNCNAME String(__PRETTY_FUNCTION__)
 #else
 #define FUNCNAME String(__FUNCSIG__)
@@ -168,7 +168,7 @@ inline T ABS(T x) {
                              - (((x)>>3)&0x11111111))
 #define ISPOT(x)	(((x)&(x-1))==0?1:0)
 
-#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__
+#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined __APPLE__
 #define MKDIR(name) mkdir(name, 0777)
 #else
 #if defined __WIN32__ || defined _WIN32
diff --git a/include/gettext.h b/include/gettext.h
index bb3158f..de7395c 100644
--- a/include/gettext.h
+++ b/include/gettext.h
@@ -20,7 +20,7 @@
 #define _LIBGETTEXT_H 1
 
 /* NLS can be disabled through the configure --disable-nls option.  */
-#if ENABLE_NLS
+#if ENABLE_NLS && defined HAVE_LIBINTL_H
 
 /* Get declarations of GNU message catalog functions.  */
 # include <libintl.h>
diff --git a/lib/Exceptions.cc b/lib/Exceptions.cc
index caa0257..2ecafef 100644
--- a/lib/Exceptions.cc
+++ b/lib/Exceptions.cc
@@ -17,14 +17,20 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: Exceptions.cc,v 1.31 2003-12-22 01:57:02 pixel Exp $ */
+/* $Id: Exceptions.cc,v 1.32 2004-03-01 07:41:48 pixel Exp $ */
 
-#include <malloc.h>
 #include <string.h>
 #include <errno.h>
 #include <stddef.h>
 #ifdef HAVE_CONFIG_H
 #include "config.h"
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+#else
+#ifndef __APPLE__
+#include <malloc.h>
+#endif
 #endif
 #ifdef DEBUG
 #include <iostream>
diff --git a/lib/Socket.cc b/lib/Socket.cc
index dd3d3fb..f3e28df 100644
--- a/lib/Socket.cc
+++ b/lib/Socket.cc
@@ -1,3 +1,4 @@
+#define _BSD_SOCKLEN_T_ int
 #include <netdb.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/TaskMan.cc b/lib/TaskMan.cc
index cc24c80..1dcf331 100644
--- a/lib/TaskMan.cc
+++ b/lib/TaskMan.cc
@@ -1,5 +1,5 @@
 #include <signal.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <sys/poll.h>
 #include <errno.h>
 #include <string.h>
diff --git a/po/fr.po b/po/fr.po
index 98ddf07..cbaff93 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Baltisot 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-14 20:05+0200\n"
+"POT-Creation-Date: 2004-03-01 07:43+0100\n"
 "PO-Revision-Date: 2001-10-29 08:26GMT\n"
 "Last-Translator: Nicolas Noble <nicolas@nobis-crew.org>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -19,219 +19,219 @@ msgstr ""
 msgid "CopyJob from "
 msgstr "CopyJob depuis "
 
-#: lib/CopyJob.cc:82 lib/Handle.cc:43 lib/ReadJob.cc:51
+#: lib/CopyJob.cc:82 lib/Handle.cc:68 lib/ReadJob.cc:51
 msgid " to "
 msgstr " vers "
 
-#: lib/Exceptions.cc:26 lib/Exceptions.cc:31 lib/Exceptions.cc:36
+#: lib/Exceptions.cc:46 lib/Exceptions.cc:51 lib/Exceptions.cc:56
 msgid "Generating a General Exception error: '"
 msgstr "Génération d'une Exception Générale: '"
 
-#: lib/Exceptions.cc:44
+#: lib/Exceptions.cc:64
 msgid "Task not found"
 msgstr "Tâche non trouvée"
 
-#: lib/Exceptions.cc:51
+#: lib/Exceptions.cc:71
 #, c-format
 msgid "Failed allocating %u bytes."
 msgstr "N'a pu allouer %u octets."
 
-#: lib/Exceptions.cc:56
+#: lib/Exceptions.cc:76
 #, c-format
 msgid "An error has occured while %s %u bytes on %s: %s"
 msgstr "Une erreur est survenue en %s %u octets depuis %s: %s"
 
-#: lib/Exceptions.cc:56
+#: lib/Exceptions.cc:76
 msgid "writing"
 msgstr "écrivant"
 
-#: lib/Exceptions.cc:56
+#: lib/Exceptions.cc:76
 msgid "reading"
 msgstr "lisant"
 
-#: lib/Exceptions.cc:65
+#: lib/Exceptions.cc:85
 msgid "No more bytes for reading or writing."
 msgstr "Plus d'octets à lire ou écrire."
 
-#: lib/Exceptions.cc:67
+#: lib/Exceptions.cc:87
 msgid "Generating an IOAgain exception: '"
 msgstr "Génération d'une Exception IOAgain: '"
 
-#: lib/Exceptions.cc:71
+#: lib/Exceptions.cc:91
 msgid "Switching task in a non-tasked environnement"
 msgstr "Basculement de tâche dans un environnement non multi-tâches"
 
-#: lib/Exceptions.cc:73
+#: lib/Exceptions.cc:93
 msgid "Generating a TaskSwitch exception: '"
 msgstr "Génération d'une Exception TaskSwitch: '"
 
-#: lib/Exceptions.cc:77
+#: lib/Exceptions.cc:97
 msgid "Exitting with code "
 msgstr "Sortie avec le code "
 
-#: lib/Exceptions.cc:79
+#: lib/Exceptions.cc:99
 msgid "Generating an Exit exception: '"
 msgstr "Génération d'une Exception Exit: '"
 
-#: lib/Exceptions.cc:117
+#: lib/Exceptions.cc:137
 #, c-format
 msgid "Reallocating pointer at %p for %i bytes, now at %p\n"
 msgstr "Réallocation du pointeur à %p de %i octets, maintenant à %p\n"
 
-#: lib/Exceptions.cc:149
+#: lib/Exceptions.cc:157
 msgid "Error creating pipe: "
 msgstr "Erreur en créant un tube: "
 
-#: lib/Exceptions.cc:156
+#: lib/Exceptions.cc:164
 msgid "Function pipe() not supported by this system.\n"
 msgstr "La fonction pipe() n'est pas supportée par ce système.\n"
 
-#: lib/Exceptions.cc:167
+#: lib/Exceptions.cc:175
 msgid "Was not able to fork().\n"
 msgstr "N'a pu faire de fork().\n"
 
-#: lib/Exceptions.cc:174
+#: lib/Exceptions.cc:182
 msgid "Function fork() not supported by this system.\n"
 msgstr "La fonction fork() n'est pas supportée par ce système.\n"
 
-#: lib/Exceptions.cc:200
+#: lib/Exceptions.cc:212
 msgid "Operator new(s) called. Allocating memory.\n"
 msgstr "Operateur new(s) appelé. Allocation de la mémoire.\n"
 
-#: lib/Exceptions.cc:207
+#: lib/Exceptions.cc:219
 #, c-format
 msgid "Operator new(s, p) called with p = %p and s = %i. Erasing memory.\n"
 msgstr ""
 "Operateur new(s, p) appelé avec p = %p et s = %i. Effacement de la mémoire\n"
 
-#: lib/Exceptions.cc:214
+#: lib/Exceptions.cc:226
 msgid "Operator delete(p) called. Freeing memory.\n"
 msgstr "Operateur delete(p) appelé. Libération de la mémoire\n"
 
-#: lib/Handle.cc:43
+#: lib/Handle.cc:68
 msgid "Duplication of handle "
 msgstr "Duplication du Handle "
 
-#: lib/Handle.cc:52
+#: lib/Handle.cc:77
 msgid "Destroying handle "
 msgstr "Destruction du handle "
 
-#: lib/Handle.cc:60
+#: lib/Handle.cc:85
 msgid "Initialising handle "
 msgstr "Initialisation du handle "
 
-#: lib/Handle.cc:97
+#: lib/Handle.cc:126
 msgid "write: throwing IOAgain for handle "
 msgstr "write: exception IOAgain pour le handle "
 
-#: lib/Handle.cc:129
+#: lib/Handle.cc:158
 msgid "read: reading "
 msgstr "read: lecture de "
 
-#: lib/Handle.cc:129
+#: lib/Handle.cc:158
 msgid " bytes from handle "
 msgstr " octets depuis le handle "
 
-#: lib/Handle.cc:139
+#: lib/Handle.cc:168
 msgid "read: throwing IOAgain for handle "
 msgstr "read: exceoption IOAgain pour le handle "
 
-#: lib/Handle.cc:217
+#: lib/Handle.cc:246
 msgid "Error during deflateEnd: "
 msgstr "Erreur pendant deflateEnd: "
 
-#: lib/Handle.cc:222
+#: lib/Handle.cc:251
 msgid "Error during inflateEnd: "
 msgstr "Erreur pendant inflateEnd: "
 
-#: lib/Handle.cc:227
+#: lib/Handle.cc:256
 msgid "Error during (zstream) close: "
 msgstr "Erreur pendant close d'un zstream: "
 
-#: lib/Handle.cc:231
+#: lib/Handle.cc:260
 msgid "Performing gzclose on handle "
 msgstr "gzclose sur handle en cours "
 
-#: lib/Handle.cc:235
+#: lib/Handle.cc:264
 msgid "gzclose returned "
 msgstr "gzclose a renvoyé "
 
-#: lib/Handle.cc:239 lib/Handle.cc:247
+#: lib/Handle.cc:268 lib/Handle.cc:277
 msgid "Error during close: "
 msgstr "Erreur pendant close: "
 
-#: lib/Handle.cc:241
+#: lib/Handle.cc:270
 msgid "Error in zlib during gzclose: "
 msgstr "Erreur dans la zlib pendant gzclose: "
 
-#: lib/Handle.cc:266
+#: lib/Handle.cc:306
 msgid "Bare Handle - should not happend"
 msgstr "Handle pur - ne devrait pas arriver"
 
-#: lib/Handle.cc:285
+#: lib/Handle.cc:325
 #, fuzzy
 msgid "Error dupping file `"
 msgstr "Erreur en ouvrant le fichier "
 
-#: lib/Handle.cc:285
+#: lib/Handle.cc:325
 #, fuzzy
 msgid "' (handle "
 msgstr "Le Handle "
 
-#: lib/Handle.cc:292
+#: lib/Handle.cc:332
 msgid "Can't SetZ a Handle twice."
 msgstr "Ne peut faire SetZ sur un Handle deux fois."
 
-#: lib/Handle.cc:295
+#: lib/Handle.cc:335
 msgid "Can't SetZ a virtual Handle."
 msgstr "Ne peut SetZ sur un Handle virtuel."
 
-#: lib/Handle.cc:299
+#: lib/Handle.cc:339
 msgid "Setting up zstream using inflate/deflate...\n"
 msgstr "Configuration du zstream en utilisatant inflate/deflate...\n"
 
-#: lib/Handle.cc:308
+#: lib/Handle.cc:348
 msgid "Error in deflateInit: "
 msgstr "Erreur dans deflateInit: "
 
-#: lib/Handle.cc:316
+#: lib/Handle.cc:356
 msgid "Error in inflateInit: "
 msgstr "Erreur dans inflateInit: "
 
-#: lib/Handle.cc:332
+#: lib/Handle.cc:372
 msgid "Performing gzdopen on handle "
 msgstr "gzdopen effectué sur le handle "
 
-#: lib/Handle.cc:332
+#: lib/Handle.cc:372
 msgid " with mode \""
 msgstr " avec le mode \""
 
-#: lib/Handle.cc:335
+#: lib/Handle.cc:375
 #, fuzzy
 msgid "Was not able to gzdopen: "
 msgstr "N'a pu faire de gzdopen."
 
-#: lib/Handle.cc:345
+#: lib/Handle.cc:385
 msgid "Performing gzwrite of "
 msgstr "gzwrite effectué sur "
 
-#: lib/Handle.cc:345 lib/Handle.cc:372
+#: lib/Handle.cc:385 lib/Handle.cc:412
 msgid " byte(s) for handle "
 msgstr " octet(s) pour le handle "
 
-#: lib/Handle.cc:357
+#: lib/Handle.cc:397
 msgid "Error in zlib during gzwrite: "
 msgstr "Erreur dans la zlib pendant gzwrite: "
 
-#: lib/Handle.cc:372
+#: lib/Handle.cc:412
 msgid "Performing gzread of "
 msgstr "gzread effectué de "
 
-#: lib/Handle.cc:407
+#: lib/Handle.cc:447
 msgid "Handle "
 msgstr "Le Handle "
 
-#: lib/Handle.cc:407
+#: lib/Handle.cc:447
 msgid " can't seek"
 msgstr " ne peut faire de seek() "
 
@@ -279,126 +279,130 @@ msgstr "non "
 msgid "hooked)"
 msgstr "détourné)"
 
-#: lib/Input.cc:73
+#: lib/Input.cc:94
 #, fuzzy
 msgid "Opening file"
 msgstr "Erreur en ouvrant le fichier "
 
-#: lib/Input.cc:73
+#: lib/Input.cc:94
 #, c-format
 msgid "Input at %p\n"
 msgstr ""
 
-#: lib/Input.cc:78 lib/Output.cc:34
+#: lib/Input.cc:99 lib/Output.cc:48
 msgid "Error opening file "
 msgstr "Erreur en ouvrant le fichier "
 
-#: lib/Input.cc:78
+#: lib/Input.cc:99
 msgid " for reading: "
 msgstr " en lecture: "
 
-#: lib/Input.cc:95
+#: lib/Input.cc:120
 msgid "Opening file in archive, position "
 msgstr "Ouverture du fichier dans l'archive, position "
 
-#: lib/Input.cc:140 lib/Input.cc:144 lib/Output.cc:68 lib/Output.cc:72
+#: lib/Input.cc:166 lib/Input.cc:170 lib/Output.cc:119 lib/Output.cc:123
 msgid "Error seeking file "
 msgstr "Erreur en parcourant le fichier "
 
-#: lib/Input.cc:140 lib/Output.cc:68
+#: lib/Input.cc:166 lib/Output.cc:119
 msgid ": "
 msgstr ": "
 
-#: lib/Input.cc:144 lib/Output.cc:72
+#: lib/Input.cc:170 lib/Output.cc:123
 msgid ": the position does not match"
 msgstr ": la position ne correspond pas"
 
-#: lib/Input.cc:155
+#: lib/Input.cc:181
 msgid "Wrap-opening "
 msgstr "Ouverture rapide de "
 
-#: lib/Input.cc:162
+#: lib/Input.cc:188
 msgid "Trying to open the file in archive, since it seems to be here\n"
 msgstr ""
 
-#: lib/Input.cc:208
+#: lib/Input.cc:274
+msgid "Archive: file is not a PE."
+msgstr ""
+
+#: lib/Input.cc:291
 msgid "Archive: not in built-in format."
 msgstr ""
 
-#: lib/Input.cc:219
+#: lib/Input.cc:302
 msgid "Adding file `"
 msgstr ""
 
-#: lib/Input.cc:219
+#: lib/Input.cc:302
 msgid "' to node `"
 msgstr ""
 
-#: lib/Input.cc:231
+#: lib/Input.cc:314
 msgid "Archive: unsupported archive format."
 msgstr ""
 
-#: lib/Input.cc:255
+#: lib/Input.cc:339
 msgid "Looking for file `"
 msgstr ""
 
-#: lib/Input.cc:255 lib/Input.cc:342
+#: lib/Input.cc:339 lib/Input.cc:433
 msgid "' in archive "
 msgstr ""
 
-#: lib/Input.cc:259 lib/Input.cc:276 lib/Input.cc:339 lib/Input.cc:342
+#: lib/Input.cc:343 lib/Input.cc:361 lib/Input.cc:430 lib/Input.cc:433
 msgid "File `"
 msgstr ""
 
-#: lib/Input.cc:259
+#: lib/Input.cc:343
 msgid "' found in archive "
 msgstr ""
 
-#: lib/Input.cc:276
+#: lib/Input.cc:361
 msgid "' not found in archive collection."
 msgstr ""
 
-#: lib/Input.cc:295
+#: lib/Input.cc:386
 msgid "Checking against node `"
 msgstr ""
 
-#: lib/Input.cc:339
+#: lib/Input.cc:430
 msgid "' not in archive "
 msgstr ""
 
-#: lib/Input.cc:342
+#: lib/Input.cc:433
 msgid " is a directory - can't open."
 msgstr ""
 
-#: lib/Input.cc:361
+#: lib/Input.cc:452
 msgid "Adding `"
 msgstr ""
 
-#: lib/Input.cc:361
+#: lib/Input.cc:452
 msgid "' as first child of node `"
 msgstr ""
 
-#: lib/Input.cc:393
+#: lib/Input.cc:484
 msgid "Computed pointer for `"
 msgstr ""
 
-#: lib/Input.cc:395
+#: lib/Input.cc:486
 msgid "Node has child\n"
 msgstr ""
 
-#: lib/Input.cc:397
+#: lib/Input.cc:488
 msgid "Node is "
 msgstr ""
 
-#: lib/Input.cc:397
+#: lib/Input.cc:488
 msgid " bytes large.\n"
 msgstr ""
 
-#: lib/Main.cc:34
+#: lib/Main.cc:60
 #, c-format
 msgid "The application caused an exception: %s\n"
 msgstr ""
 
-#: lib/Main.cc:38
+#: lib/Main.cc:64
 msgid "The application caused an unknow exception\n"
 msgstr ""
 
@@ -407,7 +411,7 @@ msgstr ""
 msgid "Output pipe to stdin ("
 msgstr "Tube d'entrée depuis stdout ("
 
-#: lib/Output.cc:34
+#: lib/Output.cc:48
 msgid " for writing: "
 msgstr " en écriture: "
 
@@ -435,27 +439,27 @@ msgstr "Erreur en créeant un socket."
 msgid "Failed accepting."
 msgstr "N'a pu accepter."
 
-#: lib/String.cc:27
+#: lib/String.cc:48
 #, c-format
 msgid "Duplicating string `%s', from %p to %p, from this %p to this %p\n"
 msgstr ""
 
-#: lib/String.cc:37
+#: lib/String.cc:58
 #, c-format
 msgid "Creating a string with `%c' at %p, this = %p\n"
 msgstr ""
 
-#: lib/String.cc:53
+#: lib/String.cc:71
 #, c-format
 msgid "Creating a string with `%s' at %p from %p, this = %p\n"
 msgstr ""
 
-#: lib/String.cc:59
+#: lib/String.cc:77
 #, c-format
 msgid "Fast-Creating a string with `%s' at %p from %p, this = %p\n"
 msgstr ""
 
-#: lib/String.cc:120
+#: lib/String.cc:138
 #, c-format
 msgid "Destroying string @ %p, freeing %p.\n"
 msgstr ""