Latest changes

5 files changed, 96 insertions, 69 deletions

diff --git a/include/Exceptions.h b/include/Exceptions.h
index 40f402f..98f6c52 100644
--- a/include/Exceptions.h
+++ b/include/Exceptions.h
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <generic.h>
 
-#ifndef pid_t
+#if !defined pid_t && !defined _SYS_TYPES_H
 typedef int pid_t;
 #endif
 
diff --git a/include/generic.h b/include/generic.h
index 46e35ff..aa6033e 100644
--- a/include/generic.h
+++ b/include/generic.h
@@ -55,11 +55,11 @@ typedef Uint16 Word;
 typedef Uint32 DWord;
 #endif
 
-#ifndef __ssize_t_defined
+#if !defined __ssize_t_defined && !defined _SSIZE_T
 typedef int32 ssize_t;
 #endif
 
-#if defined __linux__ || defined __solaris__ || defined __CYGWIN32__ || defined FORCE64
+#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__ || defined FORCE64
 typedef long long int64;
 typedef unsigned long long uint64;
 #else
@@ -72,7 +72,7 @@ typedef unsigned _int64 uint64;
 #endif
 
 #ifndef PACKED
-#if defined __linux__ || defined __CYGWIN32__
+#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__
 #define PACKED __attribute__((packed))
 #else // PACKED
 #define PACKED
@@ -133,7 +133,7 @@ inline T ABS(T x) {
                              - (((x)>>3)&0x11111111))
 #define ISPOT(x)	(((x)&(x-1))==0?1:0)
 
-#if defined __linux__ || defined __CYGWIN32__
+#if defined __linux__ || defined sun || defined __solaris__ || defined __CYGWIN32__
 #define MKDIR(name) mkdir(name, 0777)
 #else
 #if defined __WIN32__ || defined _WIN32
diff --git a/lib/SQL.cc b/lib/SQL.cc
index e158904..26620e4 100644
--- a/lib/SQL.cc
+++ b/lib/SQL.cc
@@ -1,3 +1,9 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_MYSQL
+
 #include "SQL.h"
 
 SQLConnection::SQLConnection(String host, String user, String passwd,
@@ -66,3 +72,5 @@ AssocArray SQLConnection::fetchrow() {
     
     return r;
 }
+
+#endif
diff --git a/lib/String.cc b/lib/String.cc
index f24dcca..bd265a0 100644
--- a/lib/String.cc
+++ b/lib/String.cc
@@ -54,7 +54,7 @@ String::String(const char * s) : str(Base::strdup(s)), siz(::strlen(str)) {
 #endif
 }
 
-String::String(int hs, char * s) : str(Base::strdup(s ? s : "")), siz(hs) {
+String::String(int hs, char * s) : str(s), siz(hs) {
 #ifdef DEBUG
     fprintf(stderr, _("Fast-Creating a string with `%s' at %p from %p, this = %p\n"), str, str, s, this);
 #endif
diff --git a/po/fr.po b/po/fr.po
index 51b5061..76c9787 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Baltisot 1.0.0\n"
-"POT-Creation-Date: 2003-05-16 14:28+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-08-25 16:26+0200\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"
@@ -119,107 +120,117 @@ msgstr "Destruction du handle "
 msgid "Initialising handle "
 msgstr "Initialisation du handle "
 
-#: lib/Handle.cc:95
+#: lib/Handle.cc:97
 msgid "write: throwing IOAgain for handle "
 msgstr "write: exception IOAgain pour le handle "
 
-#: lib/Handle.cc:124
+#: lib/Handle.cc:129
 msgid "read: reading "
 msgstr "read: lecture de "
 
-#: lib/Handle.cc:124
+#: lib/Handle.cc:129
 msgid " bytes from handle "
 msgstr " octets depuis le handle "
 
-#: lib/Handle.cc:134
+#: lib/Handle.cc:139
 msgid "read: throwing IOAgain for handle "
 msgstr "read: exceoption IOAgain pour le handle "
 
-#: lib/Handle.cc:212
+#: lib/Handle.cc:217
 msgid "Error during deflateEnd: "
 msgstr "Erreur pendant deflateEnd: "
 
-#: lib/Handle.cc:217
+#: lib/Handle.cc:222
 msgid "Error during inflateEnd: "
 msgstr "Erreur pendant inflateEnd: "
 
-#: lib/Handle.cc:222
+#: lib/Handle.cc:227
 msgid "Error during (zstream) close: "
 msgstr "Erreur pendant close d'un zstream: "
 
-#: lib/Handle.cc:226
+#: lib/Handle.cc:231
 msgid "Performing gzclose on handle "
 msgstr "gzclose sur handle en cours "
 
-#: lib/Handle.cc:230
+#: lib/Handle.cc:235
 msgid "gzclose returned "
 msgstr "gzclose a renvoyé "
 
-#: lib/Handle.cc:234 lib/Handle.cc:242
+#: lib/Handle.cc:239 lib/Handle.cc:247
 msgid "Error during close: "
 msgstr "Erreur pendant close: "
 
-#: lib/Handle.cc:236
+#: lib/Handle.cc:241
 msgid "Error in zlib during gzclose: "
 msgstr "Erreur dans la zlib pendant gzclose: "
 
-#: lib/Handle.cc:261
+#: lib/Handle.cc:266
 msgid "Bare Handle - should not happend"
 msgstr "Handle pur - ne devrait pas arriver"
 
-#: lib/Handle.cc:282
+#: lib/Handle.cc:285
+#, fuzzy
+msgid "Error dupping file `"
+msgstr "Erreur en ouvrant le fichier "
+
+#: lib/Handle.cc:285
+#, fuzzy
+msgid "' (handle "
+msgstr "Le Handle "
+
+#: lib/Handle.cc:292
 msgid "Can't SetZ a Handle twice."
 msgstr "Ne peut faire SetZ sur un Handle deux fois."
 
-#: lib/Handle.cc:285
+#: lib/Handle.cc:295
 msgid "Can't SetZ a virtual Handle."
 msgstr "Ne peut SetZ sur un Handle virtuel."
 
-#: lib/Handle.cc:289
+#: lib/Handle.cc:299
 msgid "Setting up zstream using inflate/deflate...\n"
 msgstr "Configuration du zstream en utilisatant inflate/deflate...\n"
 
-#: lib/Handle.cc:298
+#: lib/Handle.cc:308
 msgid "Error in deflateInit: "
 msgstr "Erreur dans deflateInit: "
 
-#: lib/Handle.cc:306
+#: lib/Handle.cc:316
 msgid "Error in inflateInit: "
 msgstr "Erreur dans inflateInit: "
 
-#: lib/Handle.cc:321
+#: lib/Handle.cc:332
 msgid "Performing gzdopen on handle "
 msgstr "gzdopen effectué sur le handle "
 
-#: lib/Handle.cc:321
+#: lib/Handle.cc:332
 msgid " with mode \""
 msgstr " avec le mode \""
 
-#: lib/Handle.cc:324
+#: lib/Handle.cc:335
 msgid "Was not able to gzdopen."
 msgstr "N'a pu faire de gzdopen."
 
-#: lib/Handle.cc:334
+#: lib/Handle.cc:345
 msgid "Performing gzwrite of "
 msgstr "gzwrite effectué sur "
 
-#: lib/Handle.cc:334 lib/Handle.cc:361
+#: lib/Handle.cc:345 lib/Handle.cc:372
 msgid " byte(s) for handle "
 msgstr " octet(s) pour le handle "
 
-#: lib/Handle.cc:346
+#: lib/Handle.cc:357
 msgid "Error in zlib during gzwrite: "
 msgstr "Erreur dans la zlib pendant gzwrite: "
 
-#: lib/Handle.cc:361
+#: lib/Handle.cc:372
 msgid "Performing gzread of "
 msgstr "gzread effectué de "
 
-#: lib/Handle.cc:396
+#: lib/Handle.cc:407
 msgid "Handle "
 msgstr "Le Handle "
 
-#: lib/Handle.cc:396
+#: lib/Handle.cc:407
 msgid " can't seek"
 msgstr " ne peut faire de seek() "
 
@@ -268,120 +279,125 @@ msgid "hooked)"
 msgstr "détourné)"
 
 #: lib/Input.cc:73
+#, fuzzy
+msgid "Opening file"
+msgstr "Erreur en ouvrant le fichier "
+
+#: lib/Input.cc:73
 #, c-format
-msgid "Opening file %s, Input at %p\n"
-msgstr "Ouverture du fichier %s, Input à %p\n"
+msgid "Input at %p\n"
+msgstr ""
 
-#: lib/Input.cc:77 lib/Output.cc:31
+#: lib/Input.cc:78 lib/Output.cc:34
 msgid "Error opening file "
 msgstr "Erreur en ouvrant le fichier "
 
-#: lib/Input.cc:77
+#: lib/Input.cc:78
 msgid " for reading: "
 msgstr " en lecture: "
 
-#: lib/Input.cc:94
+#: lib/Input.cc:95
 msgid "Opening file in archive, position "
 msgstr "Ouverture du fichier dans l'archive, position "
 
-#: lib/Input.cc:139 lib/Input.cc:143 lib/Output.cc:65 lib/Output.cc:69
+#: lib/Input.cc:140 lib/Input.cc:144 lib/Output.cc:68 lib/Output.cc:72
 msgid "Error seeking file "
 msgstr "Erreur en parcourant le fichier "
 
-#: lib/Input.cc:139 lib/Output.cc:65
+#: lib/Input.cc:140 lib/Output.cc:68
 msgid ": "
 msgstr ": "
 
-#: lib/Input.cc:143 lib/Output.cc:69
+#: lib/Input.cc:144 lib/Output.cc:72
 msgid ": the position does not match"
 msgstr ": la position ne correspond pas"
 
-#: lib/Input.cc:154
+#: lib/Input.cc:155
 msgid "Wrap-opening "
 msgstr "Ouverture rapide de "
 
-#: lib/Input.cc:161
+#: lib/Input.cc:162
 msgid "Trying to open the file in archive, since it seems to be here\n"
 msgstr ""
 
-#: lib/Input.cc:203
+#: lib/Input.cc:208
 msgid "Archive: not in built-in format."
 msgstr ""
 
-#: lib/Input.cc:214
+#: lib/Input.cc:219
 msgid "Adding file `"
 msgstr ""
 
-#: lib/Input.cc:214
+#: lib/Input.cc:219
 msgid "' to node `"
 msgstr ""
 
-#: lib/Input.cc:226
+#: lib/Input.cc:231
 msgid "Archive: unsupported archive format."
 msgstr ""
 
-#: lib/Input.cc:250
+#: lib/Input.cc:255
 msgid "Looking for file `"
 msgstr ""
 
-#: lib/Input.cc:250 lib/Input.cc:337
+#: lib/Input.cc:255 lib/Input.cc:342
 msgid "' in archive "
 msgstr ""
 
-#: lib/Input.cc:254 lib/Input.cc:271 lib/Input.cc:334 lib/Input.cc:337
+#: lib/Input.cc:259 lib/Input.cc:276 lib/Input.cc:339 lib/Input.cc:342
 msgid "File `"
 msgstr ""
 
-#: lib/Input.cc:254
+#: lib/Input.cc:259
 msgid "' found in archive "
 msgstr ""
 
-#: lib/Input.cc:271
+#: lib/Input.cc:276
 msgid "' not found in archive collection."
 msgstr ""
 
-#: lib/Input.cc:290
+#: lib/Input.cc:295
 msgid "Checking against node `"
 msgstr ""
 
-#: lib/Input.cc:334
+#: lib/Input.cc:339
 msgid "' not in archive "
 msgstr ""
 
-#: lib/Input.cc:337
+#: lib/Input.cc:342
 msgid " is a directory - can't open."
 msgstr ""
 
-#: lib/Input.cc:356
+#: lib/Input.cc:361
 msgid "Adding `"
 msgstr ""
 
-#: lib/Input.cc:356
+#: lib/Input.cc:361
 msgid "' as first child of node `"
 msgstr ""
 
-#: lib/Input.cc:388
+#: lib/Input.cc:393
 msgid "Computed pointer for `"
 msgstr ""
 
-#: lib/Input.cc:390
+#: lib/Input.cc:395
 msgid "Node has child\n"
 msgstr ""
 
-#: lib/Input.cc:392
+#: lib/Input.cc:397
 msgid "Node is "
 msgstr ""
 
-#: lib/Input.cc:392
+#: lib/Input.cc:397
 msgid " bytes large.\n"
 msgstr ""
 
-#: lib/Main.cc:33
+#: lib/Main.cc:34
 #, c-format
 msgid "The application caused an exception: %s\n"
 msgstr ""
 
-#: lib/Main.cc:37
+#: lib/Main.cc:38
 msgid "The application caused an unknow exception\n"
 msgstr ""
 
@@ -390,7 +406,7 @@ msgstr ""
 msgid "Output pipe to stdin ("
 msgstr "Tube d'entrée depuis stdout ("
 
-#: lib/Output.cc:31
+#: lib/Output.cc:34
 msgid " for writing: "
 msgstr " en écriture: "
 
@@ -418,27 +434,27 @@ msgstr "Erreur en créeant un socket."
 msgid "Failed accepting."
 msgstr "N'a pu accepter."
 
-#: lib/String.cc:26
+#: lib/String.cc:27
 #, c-format
 msgid "Duplicating string `%s', from %p to %p, from this %p to this %p\n"
 msgstr ""
 
-#: lib/String.cc:32
+#: lib/String.cc:37
 #, c-format
 msgid "Creating a string with `%c' at %p, this = %p\n"
 msgstr ""
 
-#: lib/String.cc:48
+#: lib/String.cc:53
 #, c-format
 msgid "Creating a string with `%s' at %p from %p, this = %p\n"
 msgstr ""
 
-#: lib/String.cc:54
+#: lib/String.cc:59
 #, c-format
 msgid "Fast-Creating a string with `%s' at %p from %p, this = %p\n"
 msgstr ""
 
-#: lib/String.cc:115
+#: lib/String.cc:120
 #, c-format
 msgid "Destroying string @ %p, freeing %p.\n"
 msgstr ""
@@ -483,6 +499,9 @@ msgstr "Erreur avec poll, handle "
 msgid " invalid."
 msgstr " invalide."
 
+#~ msgid "Opening file %s, Input at %p\n"
+#~ msgstr "Ouverture du fichier %s, Input à %p\n"
+
 #~ msgid "Allocating %i bytes of memory, got it at %p\n"
 #~ msgstr "Allocation de %i octets de mémoire, recu à %p\n"