- Non-KDE stuff now builds correctly with gcc3

27 files changed, 444 insertions, 347 deletions

diff --git a/lib/Enum.h b/lib/Enum.h
index df91aa3..ba410f9 100644
--- a/lib/Enum.h
+++ b/lib/Enum.h
@@ -312,7 +312,7 @@ name(#EnumName),defaultValue(initWith)
  * Writes enumeration's string representation.
  */
 template <typename E>
-inline std::ostream& operator << (ostream& out, const Enum<E> &e) {
+inline std::ostream& operator << (std::ostream& out, const Enum<E> &e) {
     return out << _(e.toString().c_str());
 }
 
diff --git a/lib/bufferstore.h b/lib/bufferstore.h
index 5a1d8bf..0e951b8 100644
--- a/lib/bufferstore.h
+++ b/lib/bufferstore.h
@@ -25,8 +25,7 @@
 #define _BUFFERSTORE_H_
 
 #include <sys/types.h>
-
-class ostream;
+#include <stream.h>
 
 /**
  * A generic container for an array of bytes.
@@ -130,7 +129,7 @@ public:
     *
     * @returns The stream.
     */
-    friend ostream &operator<<(ostream &, const bufferStore &);
+    friend class std::ostream &operator<<(std::ostream &, const bufferStore &);
 
     /**
     * Tests if the bufferStore is empty.
diff --git a/lib/log.cc b/lib/log.cc
index 48b07d8..321de6a 100644
--- a/lib/log.cc
+++ b/lib/log.cc
@@ -22,18 +22,24 @@
  *
  */
 #include "log.h"
+#include <unistd.h>
 
-logbuf::logbuf(int _level) {
+logbuf::logbuf(int level, int fd) {
     ptr = buf;
     len = 0;
-    level = _level;
+    _on = true;
+    _level = level;
+    _fd = fd;
 }
 
 int logbuf::overflow(int c) {
     if (c == '\n') {
 	*ptr++ = '\n';
 	*ptr = '\0';
-	syslog(level, buf);
+	if (_on)
+	    syslog(_level, buf);
+	else if (_fd != -1)
+	    write(_fd, buf, len + 1);
 	ptr = buf;
 	len = 0;
 	return 0;
diff --git a/lib/log.h b/lib/log.h
index 9067ae1..9f629e1 100644
--- a/lib/log.h
+++ b/lib/log.h
@@ -38,13 +38,18 @@
  *
  * <PRE>
  *	openlog("myDaemon", LOG_CONS|LOG_PID, LOG_DAEMON);
- *	logbuf ebuf(LOG_ERR);
+ *	logbuf ebuf(LOG_ERR, 2);
  *	ostream lerr(&ebuf);
  *
  *	... some code ...
  *
  *	lerr << "Whoops, got an error" << endl;
  * </PRE>
+ *
+ * The second optional argument of the constructor can be used
+ * to switch the output destination between syslog and some
+ * file. If it is omitted or set to -1, logging can be switched on
+ * or off. The initial state is on.
  */
 class logbuf : public streambuf {
 public:
@@ -54,8 +59,38 @@ public:
     *
     * @param level The log level for this instance.
     * 	see syslog(3) for symbolic names to use.
+    * @param fd An optional file descriptor to use
+    *   if switched off.
+    */
+    logbuf(int level, int fd = -1);
+
+    /**
+    * Switches loggin on or off.
+    *
+    * @param on The desired state.
     */
-    logbuf(int level);
+    void setOn(bool on) { _on = on; }
+
+    /**
+    * Modifies the loglevel of this instance.
+    * 
+    * @param level The new loglevel.
+    */
+    void setLevel(int level) { _level = level; }
+
+    /**
+    * Retrieve the current state.
+    *
+    * @returns The current state.
+    */
+    bool on() { return _on; }
+
+    /**
+    * Retrieves the current loglevel.
+    * 
+    * @returns The current loglevel.
+    */
+    int level() { return _level; }
 
     /**
     * Called by the associated
@@ -81,7 +116,18 @@ private:
     /**
     * The log level to use with syslog.
     */
-    int level;
+    int _level;
+
+    /**
+    * File descriptor to use when switched off.
+    * If this is -1, don't output anything.
+    */
+    int _fd;
+
+    /**
+    * Log flag.
+    */
+    bool _on;
 
     /**
     * The internal buffer for holding
diff --git a/lib/plpdirent.h b/lib/plpdirent.h
index 1c5e8ab..5eeced7 100644
--- a/lib/plpdirent.h
+++ b/lib/plpdirent.h
@@ -266,7 +266,7 @@ public:
     *
     * @param ret The string is returned here.
     */
-    void getDriveAttribute(string &ret);
+    void getDriveAttribute(std::string &ret);
 
     /**
     * Retrieve the attributes of the media.
diff --git a/lib/ppsocket.cc b/lib/ppsocket.cc
index 8940148..757c2a4 100644
--- a/lib/ppsocket.cc
+++ b/lib/ppsocket.cc
@@ -45,6 +45,8 @@
 #define  INVALID_SOCKET	-1
 #define  SOCKET_ERROR	-1
 
+using namespace std;
+
 ppsocket::ppsocket(const ppsocket & another)
 {
     m_Socket = another.m_Socket;
diff --git a/lib/psiprocess.h b/lib/psiprocess.h
index 24d47eb..3e76d8e 100644
--- a/lib/psiprocess.h
+++ b/lib/psiprocess.h
@@ -24,6 +24,7 @@
 #define _PSIPROCESS_H_
 
 #include <string>
+#include <stream.h>
 
 class rpcs;
 
@@ -104,16 +105,16 @@ public:
     * The output is in human readable similar to the
     * output of a "ls" command.
     */
-    friend ostream &operator<<(ostream &o, const PsiProcess &p);
+    friend class std::ostream &operator<<(std::ostream &o, const PsiProcess &p);
 
 private:
     friend class rpcs;
 
-    void setArgs(string _args);
+    void setArgs(std::string _args);
 
     int pid;
-    string  name;
-    string  args;
+    std::string  name;
+    std::string  args;
     bool s5mx;
 };
 
diff --git a/lib/rpcs.h b/lib/rpcs.h
index 2cb276a..5834afa 100644
--- a/lib/rpcs.h
+++ b/lib/rpcs.h
@@ -33,7 +33,7 @@ class ppsocket;
 class bufferStore;
 class bufferArray;
 
-typedef vector<PsiProcess> processList;
+typedef std::vector<PsiProcess> processList;
 
 /**
  * Remote procedure call services via PLP
@@ -340,7 +340,7 @@ public:
     *
     * @return Psion error code. 0 = Ok.
     */
-    virtual Enum<rfsv::errs> getCmdLine(const char *process, string &ret) = 0;
+    virtual Enum<rfsv::errs> getCmdLine(const char *process, std::string &ret) = 0;
 
     /**
     * Retrieve general Information about the connected
diff --git a/lib/rpcs16.cc b/lib/rpcs16.cc
index ce13b4d..3a2b59a 100644
--- a/lib/rpcs16.cc
+++ b/lib/rpcs16.cc
@@ -38,6 +38,8 @@
 #include "bufferarray.h"
 #include "ppsocket.h"
 
+using namespace std;
+
 rpcs16::rpcs16(ppsocket * _skt)
 {
     skt = _skt;
diff --git a/lib/rpcs16.h b/lib/rpcs16.h
index 58ca05b..0489d87 100644
--- a/lib/rpcs16.h
+++ b/lib/rpcs16.h
@@ -41,7 +41,7 @@ class rpcs16 : public rpcs {
     friend class rpcsfactory;
 
  public:
-    Enum<rfsv::errs> getCmdLine(const char *, string &);
+    Enum<rfsv::errs> getCmdLine(const char *, std::string &);
 
  private:
     rpcs16(ppsocket *);
diff --git a/lib/rpcs32.cc b/lib/rpcs32.cc
index b1cbe49..b8874f1 100644
--- a/lib/rpcs32.cc
+++ b/lib/rpcs32.cc
@@ -37,6 +37,8 @@
 #include "bufferarray.h"
 #include "ppsocket.h"
 
+using namespace std;
+
 rpcs32::rpcs32(ppsocket * _skt)
 {
     skt = _skt;
diff --git a/lib/rpcs32.h b/lib/rpcs32.h
index 9089b66..4f02a2d 100644
--- a/lib/rpcs32.h
+++ b/lib/rpcs32.h
@@ -40,7 +40,7 @@ class rpcs32 : public rpcs {
     friend class rpcsfactory;
 
  public:
-    Enum<rfsv::errs> getCmdLine(const char *, string &);
+    Enum<rfsv::errs> getCmdLine(const char *, std::string &);
     Enum<rfsv::errs> getMachineInfo(machineInfo &);
     Enum<rfsv::errs> configRead(u_int32_t, bufferStore &);
     Enum<rfsv::errs> configWrite(bufferStore);
diff --git a/ncpd/link.cc b/ncpd/link.cc
index 453211f..76a8be4 100644
--- a/ncpd/link.cc
+++ b/ncpd/link.cc
@@ -50,6 +50,11 @@ extern "C" {
     }
 };
 
+using namespace std;
+
+extern ostream lout;
+extern ostream lerr;
+
 ENUM_DEFINITION(Link::link_type, Link::LINK_TYPE_UNKNOWN) {
     stringRep.add(Link::LINK_TYPE_UNKNOWN, N_("Unknown"));
     stringRep.add(Link::LINK_TYPE_SIBO,    N_("SIBO"));
@@ -169,7 +174,7 @@ sendAck(int seq)
 	return;
     bufferStore tmp;
     if (verbose & LNK_DEBUG_LOG)
-	cout << "Link: >> ack seq=" << seq << endl;
+	lout << "Link: >> ack seq=" << seq << endl;
     if (seq > 7) {
 	int hseq = seq >> 3;
 	int lseq = (seq & 7) | 8;
@@ -187,7 +192,7 @@ sendReqCon()
 	return;
     bufferStore tmp;
     if (verbose & LNK_DEBUG_LOG)
-	cout << "Link: >> con seq=4" << endl;
+	lout << "Link: >> con seq=4" << endl;
     tmp.addByte(0x24);
     tmp.addDWord(conMagic);
     ackWaitQueueElement e;
@@ -208,7 +213,7 @@ sendReqReq()
 	return;
     bufferStore tmp;
     if (verbose & LNK_DEBUG_LOG)
-	cout << "Link: >> con seq=1" << endl;
+	lout << "Link: >> con seq=1" << endl;
     tmp.addByte(0x21);
     ackWaitQueueElement e;
     e.seq = 0; // expected response is Ack with seq=0 or ReqCon
@@ -228,7 +233,7 @@ sendReq()
 	return;
     bufferStore tmp;
     if (verbose & LNK_DEBUG_LOG)
-	cout << "Link: >> con seq=1" << endl;
+	lout << "Link: >> con seq=1" << endl;
     tmp.addByte(0x20);
     // No Ack expected for this, so no new entry in ackWaitQueue
     p->send(tmp);
@@ -259,11 +264,11 @@ receive(bufferStore buff)
 	case 0x30:
 	    // Normal data
 	    if (verbose & LNK_DEBUG_LOG) {
-		cout << "Link: << dat seq=" << seq ;
+		lout << "Link: << dat seq=" << seq ;
 		if (verbose & LNK_DEBUG_DUMP)
-		    cout << " " << buff << endl;
+		    lout << " " << buff << endl;
 		else
-		    cout << " len=" << buff.getLen() << endl;
+		    lout << " len=" << buff.getLen() << endl;
 	    }
 	    sendAck((rxSequence+1) & seqMask);
 
@@ -278,14 +283,14 @@ receive(bufferStore buff)
 			    // XOFF
 			    xoff[buff.getByte(1)] = true;
 			    if (verbose & LNK_DEBUG_LOG)
-				cout << "Link: got XOFF for channel "
+				lout << "Link: got XOFF for channel "
 				     << buff.getByte(1) << endl;
 			    break;
 			case 2:
 			    // XON
 			    xoff[buff.getByte(1)] = false;
 			    if (verbose & LNK_DEBUG_LOG)
-				cout << "Link: got XON for channel "
+				lout << "Link: got XON for channel "
 				     << buff.getByte(1) << endl;
 			    // Transmit packets on hold queue
 			    transmitHoldQueue(buff.getByte(1));
@@ -298,7 +303,7 @@ receive(bufferStore buff)
 
 	    } else {
 		if (verbose & LNK_DEBUG_LOG)
-		    cout << "Link: DUP\n";
+		    lout << "Link: DUP\n";
 	    }
 	    break;
 
@@ -314,10 +319,10 @@ receive(bufferStore buff)
 		    refstamp = i->stamp;
 		    ackWaitQueue.erase(i);
 		    if (verbose & LNK_DEBUG_LOG) {
-			cout << "Link: << ack seq=" << seq ;
+			lout << "Link: << ack seq=" << seq ;
 			if (verbose & LNK_DEBUG_DUMP)
-			    cout << " " << buff;
-			cout << endl;
+			    lout << " " << buff;
+			lout << endl;
 		    }
 		    break;
 		}
@@ -336,7 +341,7 @@ receive(bufferStore buff)
 		    purgeAllQueues();
 		    p->setEpoc(false);
 		    if (verbose & LNK_DEBUG_LOG)
-			cout << "Link: 1-linkType set to " << linkType << endl;
+			lout << "Link: 1-linkType set to " << linkType << endl;
 		}
 		// Older packets implicitely ack'ed
 		multiAck(refstamp);
@@ -357,7 +362,7 @@ receive(bufferStore buff)
 			if (i->txcount-- == 0) {
 			    // timeout, remove packet
 			    if (verbose & LNK_DEBUG_LOG)
-				cout << "Link: >> TRANSMIT timeout seq=" <<
+				lout << "Link: >> TRANSMIT timeout seq=" <<
 				    i->seq << endl;
 			    ackWaitQueue.erase(i);
 			    i--;
@@ -365,7 +370,7 @@ receive(bufferStore buff)
 			    // retransmit it
 			    i->stamp = now;
 			    if (verbose & LNK_DEBUG_LOG)
-				cout << "Link: >> RETRANSMIT seq=" << i->seq
+				lout << "Link: >> RETRANSMIT seq=" << i->seq
 				     << endl;
 			    p->send(i->data);
 			}
@@ -373,10 +378,10 @@ receive(bufferStore buff)
 		    }
 		pthread_mutex_unlock(&queueMutex);
 		if ((verbose & LNK_DEBUG_LOG) && (!nextFound)) {
-		    cout << "Link: << UNMATCHED ack seq=" << seq;
+		    lout << "Link: << UNMATCHED ack seq=" << seq;
 		    if (verbose & LNK_DEBUG_DUMP)
-			cout << " " << buff;
-		    cout << endl;
+			lout << " " << buff;
+		    lout << endl;
 		}
 	    }
 	    break;
@@ -392,7 +397,7 @@ receive(bufferStore buff)
 			ackWaitQueue.erase(i);
 			linkType = LINK_TYPE_EPOC;
 			if (verbose & LNK_DEBUG_LOG)
-			    cout << "Link: 2-linkType set to " << linkType << endl;
+			    lout << "Link: 2-linkType set to " << linkType << endl;
 			conFound = true;
 			failed = false;
 			// EPOC can handle extended sequence numbers
@@ -401,10 +406,10 @@ receive(bufferStore buff)
 			maxOutstanding = 8;
 			p->setEpoc(true);
 			if (verbose & LNK_DEBUG_LOG) {
-			    cout << "Link: << con seq=" << seq ;
+			    lout << "Link: << con seq=" << seq ;
 			    if (verbose & LNK_DEBUG_DUMP)
-				cout << " " << buff;
-			    cout << endl;
+				lout << " " << buff;
+			    lout << endl;
 			}
 			break;
 		    }
@@ -416,16 +421,16 @@ receive(bufferStore buff)
 		sendAck(rxSequence);
 	    } else {
 		if (verbose & LNK_DEBUG_LOG) {
-		    cout << "Link: << req seq=" << seq;
+		    lout << "Link: << req seq=" << seq;
 		    if (verbose & LNK_DEBUG_DUMP)
-			cout << " " << buff;
-		    cout << endl;
+			lout << " " << buff;
+		    lout << endl;
 		}
 		rxSequence = txSequence = 0;
 		if (seq > 0) {
 		    linkType = LINK_TYPE_EPOC;
 		    if (verbose & LNK_DEBUG_LOG)
-			cout << "Link: 3-linkType set to " << linkType << endl;
+			lout << "Link: 3-linkType set to " << linkType << endl;
 		    // EPOC can handle extended sequence numbers
 		    seqMask = 0x7ff;
 		    // EPOC can handle up to 8 unacknowledged packets
@@ -440,7 +445,7 @@ receive(bufferStore buff)
 		    seqMask = 7;
 		    maxOutstanding = 1;
 		    if (verbose & LNK_DEBUG_LOG)
-			cout << "Link: 4-linkType set to " << linkType << endl;
+			lout << "Link: 4-linkType set to " << linkType << endl;
 		    rxSequence = 0;
 		    txSequence = 1; // Our ReqReq was seq 0
 		    purgeAllQueues();
@@ -453,12 +458,12 @@ receive(bufferStore buff)
 	case 0x10:
 	    // Disconnect
 	    if (verbose & LNK_DEBUG_LOG)
-		cout << "Link: << DISC" << endl;
+		lout << "Link: << DISC" << endl;
 	    failed = true;
 	    break;
 
 	default:
-	    cerr << "Link: FATAL: Unknown packet type " << type << endl;
+	    lerr << "Link: FATAL: Unknown packet type " << type << endl;
     }
 }
 
@@ -531,15 +536,15 @@ transmit(bufferStore buf)
 	    // Request for new link
 	    e.txcount = 4;
 	    if (verbose & LNK_DEBUG_LOG)
-		cout << "Link: >> req seq=" << e.seq << endl;
+		lout << "Link: >> req seq=" << e.seq << endl;
 	    buf.prependByte(0x20 + e.seq);
 	} else {
 	    e.txcount = 8;
 	    if (verbose & LNK_DEBUG_LOG) {
-		cout << "Link: >> dat seq=" << e.seq;
+		lout << "Link: >> dat seq=" << e.seq;
 		if (verbose & LNK_DEBUG_DUMP)
-		    cout << " " << buf;
-		cout << endl;
+		    lout << " " << buf;
+		lout << endl;
 	    }
 	    if (e.seq > 7) {
 		int hseq = e.seq >> 3;
@@ -615,7 +620,7 @@ retransmit()
 	    if (i->txcount-- == 0) {
 		// timeout, remove packet
 		if (verbose & LNK_DEBUG_LOG)
-		    cout << "Link: >> TRANSMIT timeout seq=" << i->seq << endl;
+		    lout << "Link: >> TRANSMIT timeout seq=" << i->seq << endl;
 		ackWaitQueue.erase(i);
 		failed = true;
 		i--;
@@ -623,7 +628,7 @@ retransmit()
 		// retransmit it
 		i->stamp = now;
 		if (verbose & LNK_DEBUG_LOG)
-		    cout << "Link: >> RETRANSMIT seq=" << i->seq << endl;
+		    lout << "Link: >> RETRANSMIT seq=" << i->seq << endl;
 		p->send(i->data);
 	    }
 	}
@@ -648,7 +653,7 @@ hasFailed()
     bool lfailed = p->linkFailed();
     if (failed || lfailed) {
 	if (verbose & LNK_DEBUG_LOG)
-	    cout << "Link: hasFailed: " << failed << ", " << lfailed << endl;
+	    lout << "Link: hasFailed: " << failed << ", " << lfailed << endl;
     }
     failed |= lfailed;
     return failed;
diff --git a/ncpd/link.h b/ncpd/link.h
index 25cd280..e8b2386 100644
--- a/ncpd/link.h
+++ b/ncpd/link.h
@@ -193,9 +193,9 @@ private:
     bool failed;
     Enum<link_type> linkType;
 
-    vector<ackWaitQueueElement> ackWaitQueue;
-    vector<bufferStore> holdQueue;
-    vector<bufferStore> waitQueue;
+    std::vector<ackWaitQueueElement> ackWaitQueue;
+    std::vector<bufferStore> holdQueue;
+    std::vector<bufferStore> waitQueue;
     bool xoff[256];
 };
 
diff --git a/ncpd/linkchan.cc b/ncpd/linkchan.cc
index 2d9a67e..9a45158 100644
--- a/ncpd/linkchan.cc
+++ b/ncpd/linkchan.cc
@@ -32,6 +32,9 @@
 
 using namespace std;
 
+extern ostream lout;
+extern ostream lerr;
+
 linkChan::linkChan(ncp * _ncpController, int _ncpChannel):channel(_ncpController)
 {
     registerSer = 0x1234;
@@ -45,11 +48,11 @@ ncpDataCallback(bufferStore & a)
 {
     int len = a.getLen();
     if (verbose & LINKCHAN_DEBUG_LOG) {
-	cout << "linkchan: << msg ";
+	lout << "linkchan: << msg ";
 	if (verbose & LINKCHAN_DEBUG_DUMP)
-	    cout << a << endl;
+	    lout << a << endl;
 	else
-	    cout << len << endl;
+	    lout << len << endl;
     }
 
     if ((len >= 5) && (a.getByte(0) == 1)) {
@@ -63,16 +66,16 @@ ncpDataCallback(bufferStore & a)
 
 	strncpy(srvName, a.getString(7), 17);
 	if (verbose & LINKCHAN_DEBUG_LOG)
-	    cout << "linkchan: received registerAck: ser=0x" << hex << setw(4)
-		 << setfill(0) << ser << " res=" << res << " srvName=\""
+	    lout << "linkchan: received registerAck: ser=0x" << hex << setw(4)
+		 << setfill('0') << ser << " res=" << res << " srvName=\""
 		 << srvName << "\"" << endl;
 
 	while (!registerStack.empty()) {
 	    se = registerStack.pop();
 	    if (se.getWord(0) == ser) {
 		if (verbose & LINKCHAN_DEBUG_LOG)
-		    cout << "linkchan: found ser=0x" << hex << setw(4) <<
-			setfill(0) << se.getWord(0) <<
+		    lout << "linkchan: found ser=0x" << hex << setw(4) <<
+			setfill('0') << se.getWord(0) <<
 			" on stack -> callBack to waiting chan" << endl;
 		if (strlen(srvName) < 4)
 		    strcat(srvName, ".*");
@@ -83,7 +86,7 @@ ncpDataCallback(bufferStore & a)
 	registerStack = newStack;
 	return;
     }
-    cerr << "linkchan: unknown message " << a.getByte(0) << endl;
+    lerr << "linkchan: unknown message " << a.getByte(0) << endl;
 }
 
 char *linkChan::
@@ -96,14 +99,14 @@ void linkChan::
 ncpConnectAck()
 {
     if (verbose & LINKCHAN_DEBUG_LOG)
-	cout << "linkchan: << cack" << endl;
+	lout << "linkchan: << cack" << endl;
 }
 
 void linkChan::
 ncpConnectTerminate()
 {
     if (verbose & LINKCHAN_DEBUG_LOG)
-	cout << "linkchan: << ctrm" << endl;
+	lout << "linkchan: << ctrm" << endl;
     terminateWhenAsked();
 }
 
diff --git a/ncpd/main.cc b/ncpd/main.cc
index a1b7dc5..6e63088 100644
--- a/ncpd/main.cc
+++ b/ncpd/main.cc
@@ -47,7 +47,9 @@
 #include "packet.h"
 #include "log.h"
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 #include <getopt.h>
 
 using namespace std;
@@ -64,10 +66,15 @@ static int numScp = 0;
 static socketChan *scp[257]; // MAX_CHANNELS_PSION + 1
 
 
+logbuf dlog(LOG_DEBUG, STDOUT_FILENO);
+logbuf elog(LOG_ERR, STDERR_FILENO);
+ostream lout(&dlog);
+ostream lerr(&elog);
+
 static RETSIGTYPE
 term_handler(int)
 {
-    cout << "Got SIGTERM" << endl;
+    lout << "Got SIGTERM" << endl;
     signal(SIGTERM, term_handler);
     active = false;
 };
@@ -75,7 +82,7 @@ term_handler(int)
 static RETSIGTYPE
 int_handler(int)
 {
-    cout << "Got SIGINT" << endl;
+    lout << "Got SIGINT" << endl;
     signal(SIGINT, int_handler);
     active = false;
 };
@@ -92,7 +99,7 @@ checkForNewSocketConnection()
 	next->setWatch(&iow);
 	// New connect
 	if (verbose)
-	    cout << "New socket connection from " << peer << endl;
+	    lout << "New socket connection from " << peer << endl;
 	if ((numScp >= theNCP->maxLinks()) || (!theNCP->gotLinkChannel())) {
 	    bufferStore a;
 
@@ -105,7 +112,7 @@ checkForNewSocketConnection()
 	    next->sendBufferStore(a);
 	    next->closeSocket();
 	    if (verbose)
-		cout << "rejected" << endl;
+		lout << "rejected" << endl;
 	} else
 	    scp[numScp++] = new socketChan(next, theNCP);
     }
@@ -230,7 +237,7 @@ link_thread(void *arg)
 	    }
             iow.watch(5, 0);
             if (verbose)
-                cout << "ncp: restarting\n";
+                lout << "ncp: restarting\n";
             theNCP->reset();
         }
     }
@@ -250,6 +257,8 @@ main(int argc, char **argv)
     unsigned short nverbose = 0;
 
     struct servent *se = getservbyname("psion", "tcp");
+    dlog.setOn(false);
+    elog.setOn(false);
     endservent();
     if (se != 0L)
 	sockNum = ntohs(se->s_port);
@@ -340,13 +349,9 @@ main(int argc, char **argv)
 		     << strerror(errno) << endl;
 	    else {
 		if (dofork || autoexit) {
-		    logbuf dlog(LOG_DEBUG);
-		    logbuf elog(LOG_ERR);
-		    ostream lout(&dlog);
-		    ostream lerr(&elog);
-		    cout = lout;
-		    cerr = lerr;
 		    openlog("ncpd", LOG_CONS|LOG_PID, LOG_DAEMON);
+		    dlog.setOn(true);
+		    elog.setOn(true);
 		    syslog(LOG_INFO,
 			   "daemon started. Listening at %s:%d, "
 			   "using device %s\n", host, sockNum, serialDevice);
@@ -365,17 +370,17 @@ main(int argc, char **argv)
 		memset(scp, 0, sizeof(scp));
 		theNCP = new ncp(serialDevice, baudRate, nverbose);
 		if (!theNCP) {
-		    cerr << "Could not create NCP object" << endl;
+		    lerr << "Could not create NCP object" << endl;
 		    exit(-1);
 		}
 		pthread_t thr_a, thr_b;
 		if (pthread_create(&thr_a, NULL, link_thread, NULL) != 0) {
-		    cerr << "Could not create Link thread" << endl;
+		    lerr << "Could not create Link thread" << endl;
 		    exit(-1);
 		}
 		if (pthread_create(&thr_a, NULL,
 				   pollSocketConnections, NULL) != 0) {
-		    cerr << "Could not create Socket thread" << endl;
+		    lerr << "Could not create Socket thread" << endl;
 		    exit(-1);
 		}
 		while (active)
@@ -388,7 +393,7 @@ main(int argc, char **argv)
 	    skt.closeSocket();
 	    break;
 	case -1:
-	    cerr << "fork: " << strerror(errno) << endl;
+	    lerr << "fork: " << strerror(errno) << endl;
 	    break;
 	default:
 	    exit(0);
diff --git a/ncpd/ncp.cc b/ncpd/ncp.cc
index 1780826..aff7867 100644
--- a/ncpd/ncp.cc
+++ b/ncpd/ncp.cc
@@ -40,6 +40,11 @@
 #define MAX_CHANNELS_SIBO  8
 #define NCP_SENDLEN 250
 
+using namespace std;
+
+extern ostream lout;
+extern ostream lerr;
+
 ncp::ncp(const char *fname, int baud, unsigned short _verbose)
 {
     channelPtr = new channel*[MAX_CHANNELS_PSION + 1];
@@ -133,19 +138,19 @@ receive(bufferStore s) {
 	    int allData = s.getByte(1);
 	    s.discardFirstBytes(2);
 	    if (!isValidChannel(channel)) {
-		cerr << "ncp: Got message for unknown channel\n";
+		lerr << "ncp: Got message for unknown channel\n";
 	    } else {
 		messageList[channel].addBuff(s);
 		if (allData == LAST_MESS) {
 		    channelPtr[channel]->ncpDataCallback(messageList[channel]);
 		    messageList[channel].init();
 		} else if (allData != NOT_LAST_MESS) {
-		    cerr << "ncp: bizarre third byte!\n";
+		    lerr << "ncp: bizarre third byte!\n";
 		}
 	    }
 	}
     } else
-	cerr << "Got null message\n";
+	lerr << "Got null message\n";
 }
 
 void ncp::
@@ -158,7 +163,7 @@ controlChannel(int chan, enum interControllerMessageType t, bufferStore & comman
     open.addByte(t);
     open.addBuff(command);
     if (verbose & NCP_DEBUG_LOG)
-	cout << "ncp: >> " << ctrlMsgName(t) << " " << chan << endl;
+	lout << "ncp: >> " << ctrlMsgName(t) << " " << chan << endl;
     l->send(open);
 }
 
@@ -169,7 +174,7 @@ findPcServer(const char *name)
 	vector<PcServer>::iterator i;
 	for (i = pcServers.begin(); i != pcServers.end(); i++)
 	    if (i->getName() == name)
-		return i;
+		    return i->self();
     }
     return NULL;
 }
@@ -184,7 +189,7 @@ unregisterPcServer(PcServer *server) {
     if (server) {
 	vector<PcServer>::iterator i;
 	for (i = pcServers.begin(); i != pcServers.end(); i++)
-	    if (i == server) {
+	    if (i->self() == server) {
 		pcServers.erase(i);
 		return;
 	    }
@@ -199,7 +204,7 @@ decodeControlMessage(bufferStore & buff)
     interControllerMessageType imt = (interControllerMessageType)buff.getByte(1);
     buff.discardFirstBytes(2);
     if (verbose & NCP_DEBUG_LOG)
-	cout << "ncp: << " << ctrlMsgName(imt) << " " << remoteChan;
+	lout << "ncp: << " << ctrlMsgName(imt) << " " << remoteChan;
 
     bufferStore b;
     int localChan;
@@ -208,8 +213,8 @@ decodeControlMessage(bufferStore & buff)
 	case NCON_MSG_CONNECT_TO_SERVER:
 	    if (verbose & NCP_DEBUG_LOG) {
 		if (verbose & NCP_DEBUG_DUMP)
-		    cout << " [" << buff << "]";
-		cout << endl;
+		    lout << " [" << buff << "]";
+		lout << endl;
 	    }
 
 	    failed = false;
@@ -224,11 +229,11 @@ decodeControlMessage(bufferStore & buff)
 		b.addByte(0);
 		controlChannel(localChan, NCON_MSG_CONNECT_RESPONSE, b);
 		if (verbose & NCP_DEBUG_LOG)
-		    cout << "ncp: Link UP" << endl;
+		    lout << "ncp: Link UP" << endl;
 		// Create linkchan if it does not yet exist
 		if (!lChan) {
 		    if (verbose & NCP_DEBUG_LOG)
-			cout << "ncp: new passive linkChan" << endl;
+			lout << "ncp: new passive linkChan" << endl;
 		    channelPtr[localChan] =
 			lChan = new linkChan(this, localChan);
 		    lChan->setVerbose(verbose);
@@ -249,19 +254,19 @@ decodeControlMessage(bufferStore & buff)
 		if (ok) {
 		    b.addByte(rfsv::E_PSI_GEN_NONE);
 		    if (verbose & NCP_DEBUG_LOG)
-			cout << "ncp: ACCEPT client connect" << endl;
+			lout << "ncp: ACCEPT client connect" << endl;
 		} else {
 		    localChan = 0;
 		    b.addByte(rfsv::E_PSI_FILE_NXIST);
 		    if (verbose & NCP_DEBUG_LOG)
-			cout << "ncp: REJECT client connect" << endl;
+			lout << "ncp: REJECT client connect" << endl;
 		}
 		controlChannel(localChan, NCON_MSG_CONNECT_RESPONSE, b);
 
 		// Create linkchan if it does not yet exist
 		if (!lChan) {
 		    if (verbose & NCP_DEBUG_LOG)
-			cout << "ncp: new active linkChan" << endl;
+			lout << "ncp: new active linkChan" << endl;
 		    channelPtr[localChan] =
 			lChan = new linkChan(this, -1);
 		    lChan->setVerbose(verbose);
@@ -277,20 +282,20 @@ decodeControlMessage(bufferStore & buff)
 	    failed = false;
 	    forChan = buff.getByte(0);
 	    if (verbose & NCP_DEBUG_LOG)
-		cout << " ch=" << forChan << " stat=";
+		lout << " ch=" << forChan << " stat=";
 	    if (buff.getByte(1) == 0) {
 		if (verbose & NCP_DEBUG_LOG)
-		    cout << "OK" << endl;
+		    lout << "OK" << endl;
 		if (isValidChannel(forChan)) {
 		    remoteChanList[forChan] = remoteChan;
 		    channelPtr[forChan]->ncpConnectAck();
 		} else {
 		    if (verbose & NCP_DEBUG_LOG)
-			cout << "ncp: message for unknown channel" << endl;
+			lout << "ncp: message for unknown channel" << endl;
 		}
 	    } else {
 		if (verbose & NCP_DEBUG_LOG)
-		    cout << "Unknown " << (int) buff.getByte(1) << endl;
+		    lout << "Unknown " << (int) buff.getByte(1) << endl;
 		if (isValidChannel(forChan))
 		    channelPtr[forChan]->ncpConnectNak();
 	    }
@@ -313,8 +318,8 @@ decodeControlMessage(bufferStore & buff)
 		protocolVersion = ver;
 		if (verbose & NCP_DEBUG_LOG) {
 		    if (verbose & NCP_DEBUG_DUMP)
-			cout << " [" << buff << "]";
-		    cout << endl;
+			lout << " [" << buff << "]";
+		    lout << endl;
 		}
 		// Fake NCP version 2 for a Series 3 (behave like PsiWin 1.1)
 		if (ver == PV_SERIES_3) {
@@ -330,14 +335,14 @@ decodeControlMessage(bufferStore & buff)
 		b.addDWord(time(NULL));
 		controlChannel(0, NCON_MSG_NCP_INFO, b);
 	    } else {
-		cout << "ALERT!!!! Unexpected Protocol Version!! (No Series 5/3?)!" << endl;
+		lout << "ALERT!!!! Unexpected Protocol Version!! (No Series 5/3?)!" << endl;
 		failed = true;
 	    }
 	    break;
 
 	case NCON_MSG_CHANNEL_DISCONNECT:
 	    if (verbose & NCP_DEBUG_LOG)
-		cout << " ch=" << (int) buff.getByte(0) << endl;
+		lout << " ch=" << (int) buff.getByte(0) << endl;
 	    disconnect(buff.getByte(0));
 	    l->purgeQueue(remoteChan);
 	    break;
@@ -349,8 +354,8 @@ decodeControlMessage(bufferStore & buff)
 	default:
 	    if (verbose & NCP_DEBUG_LOG) {
 		if (verbose & NCP_DEBUG_DUMP)
-		    cout << " [" << buff << "]";
-		cout << endl;
+		    lout << " [" << buff << "]";
+		lout << endl;
 	    }
 
     }
@@ -362,7 +367,7 @@ getFirstUnusedChan()
     for (int cNum = 1; cNum < maxLinks(); cNum++) {
 	if (channelPtr[cNum] == NULL) {
 	    if (verbose & NCP_DEBUG_LOG)
-		cout << "ncp: getFirstUnusedChan=" << cNum << endl;
+		lout << "ncp: getFirstUnusedChan=" << cNum << endl;
 	    channelPtr[cNum] = (channel *)0xdeadbeef;
 	    return cNum;
 	}
@@ -380,7 +385,7 @@ void ncp::
 RegisterAck(int chan, const char *name)
 {
     if (verbose & NCP_DEBUG_LOG)
-	cout << "ncp: RegisterAck: chan=" << chan << endl;
+	lout << "ncp: RegisterAck: chan=" << chan << endl;
     for (int cNum = 1; cNum < maxLinks(); cNum++) {
 	channel *ch = channelPtr[cNum];
 	if (isValidChannel(cNum) && ch->getNcpChannel() == chan) {
@@ -389,7 +394,7 @@ RegisterAck(int chan, const char *name)
 	    return;
 	}
     }
-    cerr << "ncp: RegisterAck: no channel to deliver" << endl;
+    lerr << "ncp: RegisterAck: no channel to deliver" << endl;
 }
 
 void ncp::
@@ -404,9 +409,9 @@ Register(channel * ch)
 	    ch->setNcpChannel(cNum);
 	    lChan->Register(ch);
 	} else
-	    cerr << "ncp: Out of channels in register" << endl;
+	    lerr << "ncp: Out of channels in register" << endl;
     } else
-	cerr << "ncp: Register without established lChan" << endl;
+	lerr << "ncp: Register without established lChan" << endl;
 }
 
 int ncp::
@@ -464,12 +469,12 @@ void ncp::
 disconnect(int channel)
 {
     if (!isValidChannel(channel)) {
-	cerr << "ncp: Ignored disconnect for unknown channel #" << channel << endl;
+	lerr << "ncp: Ignored disconnect for unknown channel #" << channel << endl;
 	return;
     }
     channelPtr[channel]->terminateWhenAsked();
     if (verbose & NCP_DEBUG_LOG)
-	cout << "ncp: disconnect: channel=" << channel << endl;
+	lout << "ncp: disconnect: channel=" << channel << endl;
     channelPtr[channel] = NULL;
     bufferStore b;
     b.addByte(remoteChanList[channel]);
@@ -488,7 +493,7 @@ hasFailed()
     bool lfailed = l->hasFailed();
     if (failed || lfailed) {
 	if (verbose & NCP_DEBUG_LOG)
-	    cout << "ncp: hasFailed: " << failed << ", " << lfailed << endl;
+	    lout << "ncp: hasFailed: " << failed << ", " << lfailed << endl;
     }
     failed |= lfailed;
     if (failed) {
diff --git a/ncpd/ncp.h b/ncpd/ncp.h
index 5a6a1ba..fba51e5 100644
--- a/ncpd/ncp.h
+++ b/ncpd/ncp.h
@@ -46,12 +46,13 @@ class channel;
  */
 class PcServer {
 public:
-    PcServer(ppsocket *, string _name) { name = _name; }
+    PcServer(ppsocket *, std::string _name) { name = _name; }
     ~PcServer() {}
     bool clientConnect(int, int) { return false; }
-    string getName() { return name; }
+    std::string getName() { return name; }
+    PcServer *self() { return this; }
 private:
-    string name;
+    std::string name;
 };
 
 class ncp {
@@ -111,7 +112,7 @@ private:
     short int protocolVersion;
     linkChan *lChan;
     int maxChannels;
-    vector<PcServer> pcServers;
+    std::vector<PcServer> pcServers;
 };
 
 #endif
diff --git a/ncpd/packet.cc b/ncpd/packet.cc
index 57b83c7..841dc54 100644
--- a/ncpd/packet.cc
+++ b/ncpd/packet.cc
@@ -149,6 +149,11 @@ static const int baud_table[] = {
 };
 #define BAUD_TABLE_SIZE (sizeof(baud_table) / sizeof(int))
 
+using namespace std;
+
+extern ostream lout;
+extern ostream lerr;
+
 packet::
 packet(const char *fname, int _baud, Link *_link, unsigned short _verbose)
 {
@@ -227,7 +232,7 @@ void packet::
 internalReset()
 {
     if (verbose & PKT_DEBUG_LOG)
-	cout << "resetting serial connection" << endl;
+	lout << "resetting serial connection" << endl;
     if (fd != -1) {
 	ser_exit(fd);
 	fd = -1;
@@ -249,7 +254,7 @@ internalReset()
 
     fd = init_serial(devname, realBaud, 0);
     if (verbose & PKT_DEBUG_LOG)
-	cout << "serial connection set to " << dec << realBaud
+	lout << "serial connection set to " << dec << realBaud
 	     << " baud, fd=" << fd << endl;
     if (fd != -1) {
 	lastFatal = false;
@@ -292,12 +297,12 @@ send(bufferStore &b)
     long len = b.getLen();
 
     if (verbose & PKT_DEBUG_LOG) {
-	cout << "packet: >> ";
+	lout << "packet: >> ";
 	if (verbose & PKT_DEBUG_DUMP)
-	    cout << b;
+	    lout << b;
 	else
-	    cout << " len=" << dec << len;
-	cout << endl;
+	    lout << " len=" << dec << len;
+	lout << endl;
     }
 
     for (int i = 0; i < len; i++) {
@@ -432,15 +437,15 @@ findSync()
 		    inCRCstate = 0;
 		    if (receivedCRC != crcIn) {
 			if (verbose & PKT_DEBUG_LOG)
-			    cout << "packet: BAD CRC" << endl;
+			    lout << "packet: BAD CRC" << endl;
 		    } else {
 			if (verbose & PKT_DEBUG_LOG) {
-			    cout << "packet: << ";
+			    lout << "packet: << ";
 			    if (verbose & PKT_DEBUG_DUMP)
-				cout << rcv;
+				lout << rcv;
 			    else
-				cout << "len=" << dec << rcv.getLen();
-			    cout << endl;
+				lout << "len=" << dec << rcv.getLen();
+			    lout << endl;
 			}
 			theLINK->receive(rcv);
 		    }
@@ -481,7 +486,7 @@ linkFailed()
 	lastFatal = true;
     if ((serialStatus == -1) || (arg != serialStatus)) {
 	if (verbose & PKT_DEBUG_HANDSHAKE)
-	    cout << "packet: < DTR:" << ((arg & TIOCM_DTR)?1:0)
+	    lout << "packet: < DTR:" << ((arg & TIOCM_DTR)?1:0)
 		 << " RTS:" << ((arg & TIOCM_RTS)?1:0)
 		 << " DCD:" << ((arg & TIOCM_CAR)?1:0)
 		 << " DSR:" << ((arg & TIOCM_DSR)?1:0)
@@ -492,7 +497,7 @@ linkFailed()
 	    if (res < 0)
 		lastFatal = true;
 	    if (verbose & PKT_DEBUG_HANDSHAKE)
-		cout << "packet: > DTR:" << ((arg & TIOCM_DTR)?1:0)
+		lout << "packet: > DTR:" << ((arg & TIOCM_DTR)?1:0)
 		     << " RTS:" << ((arg & TIOCM_RTS)?1:0)
 		     << " DCD:" << ((arg & TIOCM_CAR)?1:0)
 		     << " DSR:" << ((arg & TIOCM_DSR)?1:0)
@@ -505,9 +510,9 @@ linkFailed()
 	failed = true;
     }
     if ((verbose & PKT_DEBUG_LOG) && lastFatal)
-	cout << "packet: linkFATAL\n";
+	lout << "packet: linkFATAL\n";
     if ((verbose & PKT_DEBUG_LOG) && failed)
-	cout << "packet: linkFAILED\n";
+	lout << "packet: linkFAILED\n";
     return (lastFatal || failed);
 }
 
diff --git a/ncpd/socketchan.cc b/ncpd/socketchan.cc
index 371befd..d0b22bf 100644
--- a/ncpd/socketchan.cc
+++ b/ncpd/socketchan.cc
@@ -34,6 +34,8 @@
 #include <ppsocket.h>
 #include <rfsv.h>
 
+extern std::ostream lerr;
+
 socketChan:: socketChan(ppsocket * _skt, ncp * _ncpController):
     channel(_ncpController)
 {
@@ -58,7 +60,7 @@ ncpDataCallback(bufferStore & a)
     if (registerName != 0) {
 	skt->sendBufferStore(a);
     } else
-	cerr << "socketchan: Connect without name!!!\n";
+	lerr << "socketchan: Connect without name!!!\n";
 }
 
 char *socketChan::
@@ -88,7 +90,7 @@ ncpCommand(bufferStore & a)
 		a.addStringT("Series 5");
 		break;
 	    default:
-		cerr << "ncpd: protocol version not known" << endl;
+		lerr << "ncpd: protocol version not known" << endl;
 		a.addStringT("Unknown!");
 		break;
 	}
@@ -132,7 +134,7 @@ ncpCommand(bufferStore & a)
 	ok = true;
     }
     if (!ok) {
-	cerr << "socketChan:: received unknown NCP command (" << a << ")" << endl;
+	lerr << "socketChan:: received unknown NCP command (" << a << ")" << endl;
 	a.init();
 	a.addByte(rfsv::E_PSI_GEN_NSUP);
 	skt->sendBufferStore(a);
@@ -209,7 +211,7 @@ socketPoll()
 
 		if (memchr(a.getString(), 0, a.getLen()) == 0) {
 			// Not 0 terminated, -> invalid
-			cerr << "ncpd: command " << a << " unrecognized."
+			lerr << "ncpd: command " << a << " unrecognized."
 			     << endl;
 			return;
 		}
@@ -223,7 +225,7 @@ socketPoll()
 		// NCP$INFO.*
 		if (a.getLen() > 8 && !strncmp(a.getString(), "NCP$", 4)) {
 		    if (!ncpCommand(a))
-			cerr << "ncpd: command " << a << " unrecognized."
+			lerr << "ncpd: command " << a << " unrecognized."
 			     << endl;
 		    return;
 		}
@@ -255,7 +257,7 @@ socketPoll()
 	} else if (res == 1) {
 	    if (a.getLen() > 8 && !strncmp(a.getString(), "NCP$", 4)) {
 		if (!ncpCommand(a))
-		    cerr << "ncpd: command " << a << " unrecognized."
+		    lerr << "ncpd: command " << a << " unrecognized."
 			 << endl;
 		return;
 	    }
diff --git a/plpbackup/plpbackup.cc b/plpbackup/plpbackup.cc
index 4b3c634..6b49a30 100644
--- a/plpbackup/plpbackup.cc
+++ b/plpbackup/plpbackup.cc
@@ -55,6 +55,8 @@
 #include <bufferstore.h>
 #include <bufferarray.h>
 
+using namespace std;
+
 bool full = false;
 bool S5mx = false;
 bool doRestore = false;
diff --git a/plpftp/main.cc b/plpftp/main.cc
index 2bbc7d7..ad7fe01 100644
--- a/plpftp/main.cc
+++ b/plpftp/main.cc
@@ -40,7 +40,9 @@
 
 #include "ftp.h"
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 #include <getopt.h>
 
 static void
diff --git a/plpnfsd/main.cc b/plpnfsd/main.cc
index 882168f..c622bd3 100644
--- a/plpnfsd/main.cc
+++ b/plpnfsd/main.cc
@@ -42,7 +42,9 @@ extern "C" {
 #include "rfsv_api.h"
 }
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 #include <getopt.h>
 
 static rfsv *a;
diff --git a/plpprint/plpprintd.cc b/plpprint/plpprintd.cc
index e324a7e..6708d44 100644
--- a/plpprint/plpprintd.cc
+++ b/plpprint/plpprintd.cc
@@ -27,6 +27,7 @@
 #include <stream.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <syslog.h>
 #include <unistd.h>
@@ -38,7 +39,9 @@
 #include <wprt.h>
 #include <psibitmap.h>
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 #include <getopt.h>
 
 #define TEMPLATE "plpprint_XXXXXX"
@@ -46,6 +49,8 @@
 #define SPOOLDIR "/var/spool/plpprint"
 #define PSDICT   "/prolog.ps"
 
+using namespace std;
+
 char *spooldir = SPOOLDIR;
 char *printcmd = PRINTCMD;
 wprt *wPrt;
diff --git a/po/de.po b/po/de.po
index 29bbb7d..0b507f9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: plptools 0.11\n"
-"POT-Creation-Date: 2002-07-14 07:56+0200\n"
+"POT-Creation-Date: 2002-07-14 20:57+0200\n"
 "PO-Revision-Date: 2002-07-08 00:06CET\n"
 "Last-Translator: Fritz Elfert <felfert@to.com>\n"
 "Language-Team: Deutsch <de@li.org>\n"
@@ -552,7 +552,7 @@ msgstr "Keine Antwort vom ncpd"
 msgid "Not present"
 msgstr "Nicht vorhanden"
 
-#: lib/plpdirent.cc:176 ncpd/link.cc:54
+#: lib/plpdirent.cc:176 ncpd/link.cc:59
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -1034,7 +1034,7 @@ msgstr "Behalte ursprünglichen Ordner \""
 msgid "Transfer complete, ("
 msgstr "Ãœbertragung abgeschlossen, ("
 
-#: plpbackup/plpbackup.cc:1200 plpftp/ftp.cc:578 plpftp/ftp.cc:669
+#: plpbackup/plpbackup.cc:1202 plpftp/ftp.cc:578 plpftp/ftp.cc:669
 msgid " bytes in "
 msgstr " Bytes in "
 
@@ -1304,47 +1304,47 @@ msgstr "Kein solcher Prozess"
 msgid "syntax error. Try \"help\""
 msgstr "Syntaxfehler. Probieren Sie \"help\""
 
-#: plpbackup/plpbackup.cc:98
+#: plpbackup/plpbackup.cc:100
 msgid "Could not get user's home directory from /etc/passwd"
 msgstr "Konnte das persönliche Verzeichnis nicht ermitteln"
 
-#: plpbackup/plpbackup.cc:118
+#: plpbackup/plpbackup.cc:120
 msgid "Could not get machine UID"
 msgstr "Konnte Geräte-UID nicht ermitteln"
 
-#: plpbackup/plpbackup.cc:138
+#: plpbackup/plpbackup.cc:140
 msgid "Could not read SIBO UID file"
 msgstr "Konnte SIBO UID Datei nicht lesen"
 
-#: plpbackup/plpbackup.cc:143
+#: plpbackup/plpbackup.cc:145
 msgid "Could not get Psion owner info"
 msgstr "Konnte Geräte-Eigner nicht ermitteln"
 
-#: plpbackup/plpbackup.cc:170
+#: plpbackup/plpbackup.cc:172
 msgid "Could not write SIBO UID file "
 msgstr "Konnte SIBO UID Datei nicht schreiben "
 
-#: plpbackup/plpbackup.cc:200
+#: plpbackup/plpbackup.cc:202
 msgid "Got signal "
 msgstr "Empfang von Signal "
 
-#: plpbackup/plpbackup.cc:212
+#: plpbackup/plpbackup.cc:214
 msgid "Abort? (y/N) "
 msgstr "Abbruch? (j/N) "
 
-#: plpbackup/plpbackup.cc:213
+#: plpbackup/plpbackup.cc:215
 msgid "Y"
 msgstr "J"
 
-#: plpbackup/plpbackup.cc:229
+#: plpbackup/plpbackup.cc:231
 msgid "Stopping programs ..."
 msgstr "Stoppe Programme ..."
 
-#: plpbackup/plpbackup.cc:231
+#: plpbackup/plpbackup.cc:233
 msgid "plpbackup: Could not get process list: "
 msgstr "plpbackup: Konnte Prozessliste nicht lesen "
 
-#: plpbackup/plpbackup.cc:251
+#: plpbackup/plpbackup.cc:253
 msgid ""
 "Could not stop all processes. Please stop running\n"
 "programs manually on the Psion, then hit return."
@@ -1352,232 +1352,232 @@ msgstr ""
 "Konnte nicht alle Prozesse stoppen. Bitte beenden Sie\n"
 "laufende Programme manuell auf dem Psion. Drücken Sie dann RETURN."
 
-#: plpbackup/plpbackup.cc:266
+#: plpbackup/plpbackup.cc:268
 msgid "Restarting programs ..."
 msgstr "Starte Programme ..."
 
-#: plpbackup/plpbackup.cc:485
+#: plpbackup/plpbackup.cc:487
 msgid "Performing "
 msgstr "Ausführen von "
 
-#: plpbackup/plpbackup.cc:487
+#: plpbackup/plpbackup.cc:489
 msgid "format"
 msgstr "Formatierung"
 
-#: plpbackup/plpbackup.cc:490 plpbackup/plpbackup.cc:505
-#: plpbackup/plpbackup.cc:720
+#: plpbackup/plpbackup.cc:492 plpbackup/plpbackup.cc:507
+#: plpbackup/plpbackup.cc:722
 msgid " and "
 msgstr " und "
 
-#: plpbackup/plpbackup.cc:491
+#: plpbackup/plpbackup.cc:493
 msgid "restore"
 msgstr "Rücksicherung"
 
-#: plpbackup/plpbackup.cc:493
+#: plpbackup/plpbackup.cc:495
 msgid "full"
 msgstr "kompletter"
 
-#: plpbackup/plpbackup.cc:493
+#: plpbackup/plpbackup.cc:495
 msgid "incremental"
 msgstr "inkrementeller"
 
-#: plpbackup/plpbackup.cc:493
+#: plpbackup/plpbackup.cc:495
 msgid " backup"
 msgstr " Sicherung"
 
-#: plpbackup/plpbackup.cc:494
+#: plpbackup/plpbackup.cc:496
 msgid " of "
 msgstr " von "
 
-#: plpbackup/plpbackup.cc:496
+#: plpbackup/plpbackup.cc:498
 msgid "all drives"
 msgstr "allen Laufverken"
 
-#: plpbackup/plpbackup.cc:498
+#: plpbackup/plpbackup.cc:500
 msgid "Drive "
 msgstr "Laufwerk "
 
-#: plpbackup/plpbackup.cc:511
+#: plpbackup/plpbackup.cc:513
 msgid " to "
 msgstr " nach "
 
-#: plpbackup/plpbackup.cc:513
+#: plpbackup/plpbackup.cc:515
 msgid " from "
 msgstr " von "
 
-#: plpbackup/plpbackup.cc:713
+#: plpbackup/plpbackup.cc:715
 msgid "It contains Backups of drive "
 msgstr "Es enthält Sicherungen von Laufwerk "
 
-#: plpbackup/plpbackup.cc:733
+#: plpbackup/plpbackup.cc:735
 msgid ""
 "Select (I)ndividual files, (W)hole archive, (N)one from this archive? (I/W/"
 "N) "
 msgstr "Wähle (I)ndividuelle Dateien, (G)esamtes Archiv, (N)ichts? (I/G/N) "
 
-#: plpbackup/plpbackup.cc:735
+#: plpbackup/plpbackup.cc:737
 msgid "IWA"
 msgstr "IGN"
 
-#: plpbackup/plpbackup.cc:759
+#: plpbackup/plpbackup.cc:761
 msgid "Could not run external editor"
 msgstr "Konnte externen Editor nicht starten"
 
-#: plpbackup/plpbackup.cc:792
+#: plpbackup/plpbackup.cc:794
 msgid ""
 "Archive skipped, because it does not contain any files on selected drives"
 msgstr ""
 "Archiv übersprungen, da es keine Dateien von den gewählten Lauferken enthält"
 
-#: plpbackup/plpbackup.cc:837
+#: plpbackup/plpbackup.cc:839
 msgid "OAS"
 msgstr "OAS"
 
-#: plpbackup/plpbackup.cc:878
+#: plpbackup/plpbackup.cc:880
 msgid "Could not get backup index"
 msgstr "Konnte Sicherungs-Index nicht einlesen"
 
-#: plpbackup/plpbackup.cc:886
+#: plpbackup/plpbackup.cc:888
 msgid "' is a full backup"
 msgstr " ist eine Komplett-Sicherung"
 
-#: plpbackup/plpbackup.cc:890
+#: plpbackup/plpbackup.cc:892
 msgid "' is an incremental backup"
 msgstr " ist eine inkrementelle Sicherung"
 
-#: plpbackup/plpbackup.cc:895
+#: plpbackup/plpbackup.cc:897
 msgid "' is NOT a plpbackup"
 msgstr " ist KEINE mit plpbackup erzeugte Sicherung"
 
-#: plpbackup/plpbackup.cc:932
+#: plpbackup/plpbackup.cc:934
 msgid "Extracting tar archive ..."
 msgstr "Entpacke tar-Archiv ..."
 
-#: plpbackup/plpbackup.cc:934
+#: plpbackup/plpbackup.cc:936
 msgid "Execution of "
 msgstr "Ausführen von "
 
-#: plpbackup/plpbackup.cc:943 plpbackup/plpbackup.cc:1030
-#: plpbackup/plpbackup.cc:1078
+#: plpbackup/plpbackup.cc:945 plpbackup/plpbackup.cc:1032
+#: plpbackup/plpbackup.cc:1080
 msgid "Restore aborted by user"
 msgstr "Rücksicherung durch Benutzer abgebrochen"
 
-#: plpbackup/plpbackup.cc:951 plpbackup/plpbackup.cc:1070
+#: plpbackup/plpbackup.cc:953 plpbackup/plpbackup.cc:1072
 msgid "Restore "
 msgstr "Rücksichern "
 
-#: plpbackup/plpbackup.cc:964
+#: plpbackup/plpbackup.cc:966
 msgid "Could not create directory "
 msgstr "Fehler beim Anlegen von Verzeichnis "
 
-#: plpbackup/plpbackup.cc:980
+#: plpbackup/plpbackup.cc:982
 msgid "Could not create "
 msgstr "Konnte nicht anlegen "
 
-#: plpbackup/plpbackup.cc:990
+#: plpbackup/plpbackup.cc:992
 msgid "Could not get attributes of "
 msgstr "Fehler beim Lesen der Dateiattribute von "
 
-#: plpbackup/plpbackup.cc:1007
+#: plpbackup/plpbackup.cc:1009
 msgid "Could not set attributes of"
 msgstr "Fehler beim Setzen der Dateiattribute von"
 
-#: plpbackup/plpbackup.cc:1019
+#: plpbackup/plpbackup.cc:1021
 msgid "Could not set modification time of "
 msgstr "Fehler beim Setzen der Änderungszeit von "
 
-#: plpbackup/plpbackup.cc:1042 plpbackup/plpbackup.cc:1244
+#: plpbackup/plpbackup.cc:1044 plpbackup/plpbackup.cc:1246
 msgid "Skipping "
 msgstr "Ãœberspringe "
 
-#: plpbackup/plpbackup.cc:1045 plpbackup/plpbackup.cc:1085
+#: plpbackup/plpbackup.cc:1047 plpbackup/plpbackup.cc:1087
 msgid "Error during restore of "
 msgstr "Fehler beim Rücksichern von "
 
 # This are the characters for valid answers
 # of the next message.
-#: plpbackup/plpbackup.cc:1051 plpbackup/plpbackup.cc:1253
+#: plpbackup/plpbackup.cc:1053 plpbackup/plpbackup.cc:1255
 msgid "STAR"
 msgstr "SDAW"
 
-#: plpbackup/plpbackup.cc:1053 plpbackup/plpbackup.cc:1255
+#: plpbackup/plpbackup.cc:1055 plpbackup/plpbackup.cc:1257
 msgid "(S)kip all, Skip (t)his, (A)bort, (R)etry: "
 msgstr "Ãœber(S)pringe alle, Ãœberspringe (D)iese, (A)bbruch, (W)iederholen: "
 
-#: plpbackup/plpbackup.cc:1104 plpbackup/plpbackup.cc:1392
+#: plpbackup/plpbackup.cc:1106 plpbackup/plpbackup.cc:1394
 msgid "Total time elapsed:     "
 msgstr "Gesamtzeit:     "
 
-#: plpbackup/plpbackup.cc:1138 plpbackup/plpbackup.cc:1190
-#: plpbackup/plpbackup.cc:1232 plpbackup/plpbackup.cc:1281
+#: plpbackup/plpbackup.cc:1140 plpbackup/plpbackup.cc:1192
+#: plpbackup/plpbackup.cc:1234 plpbackup/plpbackup.cc:1283
 msgid "Backup aborted by user"
 msgstr "Sicherung wegen Fehler abgebrochen"
 
-#: plpbackup/plpbackup.cc:1157 plpbackup/plpbackup.cc:1175
+#: plpbackup/plpbackup.cc:1159 plpbackup/plpbackup.cc:1177
 msgid "Scanning Drive "
 msgstr "Durchsuche Laufwerk "
 
-#: plpbackup/plpbackup.cc:1170
+#: plpbackup/plpbackup.cc:1172
 msgid "plpbackup: Couldn't get Drive list"
 msgstr "plpbackup: Konnte Laufwerks-Liste nicht ermitteln"
 
-#: plpbackup/plpbackup.cc:1200
+#: plpbackup/plpbackup.cc:1202
 msgid "Size of backup: "
 msgstr "Umfang der Sicherung: "
 
-#: plpbackup/plpbackup.cc:1201
+#: plpbackup/plpbackup.cc:1203
 msgid " files."
 msgstr " Dateien."
 
-#: plpbackup/plpbackup.cc:1204
+#: plpbackup/plpbackup.cc:1206
 msgid "Nothing to backup"
 msgstr "Nichts zu sichern"
 
-#: plpbackup/plpbackup.cc:1220 plpbackup/plpbackup.cc:1273
+#: plpbackup/plpbackup.cc:1222 plpbackup/plpbackup.cc:1275
 msgid "Backing up "
 msgstr "Sichere "
 
-#: plpbackup/plpbackup.cc:1247 plpbackup/plpbackup.cc:1288
+#: plpbackup/plpbackup.cc:1249 plpbackup/plpbackup.cc:1290
 msgid "Error during backup of "
 msgstr "Fehler beim Sichern von "
 
-#: plpbackup/plpbackup.cc:1307
+#: plpbackup/plpbackup.cc:1309
 msgid "Writing index ..."
 msgstr "Schreibe Index ..."
 
-#: plpbackup/plpbackup.cc:1334
+#: plpbackup/plpbackup.cc:1336
 msgid "plpbackup: Could not write index "
 msgstr "plpbackup: Konnte Index nicht schreiben "
 
-#: plpbackup/plpbackup.cc:1344
+#: plpbackup/plpbackup.cc:1346
 msgid "Creating tar archive ..."
 msgstr "Lege tar-Archiv an ..."
 
-#: plpbackup/plpbackup.cc:1357
+#: plpbackup/plpbackup.cc:1359
 msgid "plpbackup: Error during execution of "
 msgstr "plpbackup: Fehler beim Ausführen von "
 
-#: plpbackup/plpbackup.cc:1367
+#: plpbackup/plpbackup.cc:1369
 msgid "Resetting archive attributes ..."
 msgstr "Archiv-Attribute zurücksetzen ..."
 
-#: plpbackup/plpbackup.cc:1386
+#: plpbackup/plpbackup.cc:1388
 msgid "Backup aborted due to error"
 msgstr "Sicherung wegen Fehler abgebrochen"
 
-#: plpbackup/plpbackup.cc:1394
+#: plpbackup/plpbackup.cc:1396
 msgid "Time for scanning:      "
 msgstr "Zeit für Durchsuchen:     "
 
-#: plpbackup/plpbackup.cc:1397
+#: plpbackup/plpbackup.cc:1399
 msgid "Time for transfer:      "
 msgstr "Zeit für Übertragung:     "
 
-#: plpbackup/plpbackup.cc:1399
+#: plpbackup/plpbackup.cc:1401
 msgid "Average transfer speed: "
 msgstr "Durchschnittliche Ãœbertragungsgeschwindigkeit: "
 
-#: plpbackup/plpbackup.cc:1410
+#: plpbackup/plpbackup.cc:1412
 msgid ""
 "Usage: plpbackup OPTIONS [<drive>:] [<drive>:] ...\n"
 "\n"
@@ -1614,47 +1614,47 @@ msgstr ""
 "Laufwerke.\n"
 "\n"
 
-#: plpbackup/plpbackup.cc:1427
+#: plpbackup/plpbackup.cc:1429
 msgid "Try 'plpbackup --help' for more information."
 msgstr "Versuchen Sie 'plpbackup --help' für weitere Informationen."
 
-#: plpbackup/plpbackup.cc:1498
+#: plpbackup/plpbackup.cc:1500
 msgid "plpbackup version "
 msgstr "plpbackup Version "
 
-#: plpbackup/plpbackup.cc:1536
+#: plpbackup/plpbackup.cc:1538
 msgid "Invalid drive argument "
 msgstr "Ungültiges Laufwerk "
 
-#: plpbackup/plpbackup.cc:1542
+#: plpbackup/plpbackup.cc:1544
 msgid "Backup mode can not be combined with format or restore."
 msgstr ""
 "Sicherungs-Modus kann nicht mit Formatieren oder Rücksicherung kombiniert "
 "werden."
 
-#: plpbackup/plpbackup.cc:1547
+#: plpbackup/plpbackup.cc:1549
 msgid "Format mode needs at least one drive specified."
 msgstr "Formatier-Modus benötigt mindestens eine Laufwerksangabe."
 
-#: plpbackup/plpbackup.cc:1551
+#: plpbackup/plpbackup.cc:1553
 msgid "Backup can only create one archive at a time."
 msgstr "Die Sicherung kann nur jeweils ein Archiv zu einer Zeit anlegen."
 
-#: plpbackup/plpbackup.cc:1560 plpbackup/plpbackup.cc:1565
+#: plpbackup/plpbackup.cc:1562 plpbackup/plpbackup.cc:1567
 msgid "plpbackup: could not connect to ncpd"
 msgstr "plpbackup: Konnte ncpd nicht kontaktieren"
 
-#: sisinstall/sismain.cpp:31
+#: sisinstall/sismain.cpp:33
 #, fuzzy
 msgid "Got an error, Press any key to exit."
 msgstr "Installation beendet. Beenden mit beliebiger Taste."
 
-#: sisinstall/sismain.cpp:36
+#: sisinstall/sismain.cpp:38
 #, c-format
 msgid "Error %d on line %d: %s\n"
 msgstr ""
 
-#: sisinstall/sismain.cpp:55
+#: sisinstall/sismain.cpp:57
 msgid ""
 "Usage: sisinstall [OPTIONS]... SISFILE\n"
 "\n"
@@ -1676,41 +1676,41 @@ msgstr ""
 " -n, --dry-run           Nur parsen; keine Installation.\n"
 " -w, --newt              Benutze NEWT Oberfläche.\n"
 
-#: sisinstall/sismain.cpp:109
+#: sisinstall/sismain.cpp:111
 msgid "sisinstall version 0.1\n"
 msgstr "Installationsprogramm, Version 0.1\n"
 
-#: sisinstall/sismain.cpp:128 sisinstall/sismain.cpp:136
+#: sisinstall/sismain.cpp:130 sisinstall/sismain.cpp:138
 #, c-format
 msgid "Installing sis file %s%s.\n"
 msgstr "Installiere SIS-Datei %s%s.\n"
 
-#: sisinstall/sismain.cpp:130 sisinstall/sismain.cpp:137
+#: sisinstall/sismain.cpp:132 sisinstall/sismain.cpp:139
 msgid ", not really"
 msgstr ", nicht wirklich"
 
-#: sisinstall/sismain.cpp:145
+#: sisinstall/sismain.cpp:147
 msgid "Missing SIS filename\n"
 msgstr ""
 
-#: sisinstall/sismain.cpp:153
+#: sisinstall/sismain.cpp:155
 #, c-format
 msgid "File is %d bytes long\n"
 msgstr "Datei ist %d bytes lang\n"
 
-#: sisinstall/sismain.cpp:168
+#: sisinstall/sismain.cpp:170
 msgid "Couldn't connect with the Psion\n"
 msgstr "Konnte nicht mit dem Psion verbinden\n"
 
-#: sisinstall/sismain.cpp:189
+#: sisinstall/sismain.cpp:191
 msgid "Could not parse the sis file.\n"
 msgstr "Konnte SIS-Datei nicht parsen.\n"
 
-#: sisinstall/sismain.cpp:198
+#: sisinstall/sismain.cpp:200
 msgid "Installation complete. Press any key to exit."
 msgstr "Installation beendet. Beenden mit beliebiger Taste."
 
-#: ncpd/main.cc:138
+#: ncpd/main.cc:145
 msgid ""
 "Usage: ncpd [OPTIONS]...\n"
 "\n"
@@ -1756,17 +1756,17 @@ msgstr ""
 " -s, --serial=DEV        Benutze serielle Schnittstelle DEV.\n"
 " -b, --baudrate=RATE     Setze Schnittstellengeschwindigkeit auf BAUD.\n"
 
-#: ncpd/main.cc:163
+#: ncpd/main.cc:170
 msgid "                         Default: "
 msgstr "                         Vorgabe: "
 
-#: ncpd/main.cc:165
+#: ncpd/main.cc:172
 msgid ""
 "                         Default: Autocycle 115.2k, 57.6k 38.4k, 19.2k\n"
 msgstr ""
 "                         Vorgabe: Automatisch 115.2k, 57.6k 38.4k, 19.2k\n"
 
-#: ncpd/main.cc:168
+#: ncpd/main.cc:175
 msgid ""
 " -p, --port=[HOST:]PORT  Listen on host HOST, port PORT.\n"
 "                         Default for HOST: 127.0.0.1\n"
@@ -1776,23 +1776,23 @@ msgstr ""
 "                         Vorgabe für HOST: 127.0.0.1\n"
 "                         Vorgabe für PORT: "
 
-#: ncpd/main.cc:176
+#: ncpd/main.cc:183
 msgid "Try `ncpd --help' for more information"
 msgstr "Versuchen Sie `ncpd --help' für weitere Informationen."
 
-#: ncpd/main.cc:266
+#: ncpd/main.cc:275
 msgid "ncpd Version "
 msgstr "ncpd Version "
 
-#: ncpd/link.cc:55
+#: ncpd/link.cc:60
 msgid "SIBO"
 msgstr "SIBO"
 
-#: ncpd/link.cc:56
+#: ncpd/link.cc:61
 msgid "EPOC"
 msgstr "EPOC"
 
-#: plpnfsd/main.cc:475
+#: plpnfsd/main.cc:477
 msgid ""
 "Usage: plpnfsd [OPTIONS]...\n"
 "\n"
@@ -1822,14 +1822,14 @@ msgstr ""
 "                         Vorgabe für HOST ist 127.0.0.1\n"
 "                         Vorgabe für PORT ist "
 
-#: plpnfsd/main.cc:493
+#: plpnfsd/main.cc:495
 msgid "Try `plpnfsd --help' for more information"
 msgstr "Versuchen Sie `plpnfsd --help' für weitere Informationen."
 
-#: plpnfsd/main.cc:560
+#: plpnfsd/main.cc:562
 msgid "plpnfsd Version "
 msgstr "ncpd Version "
 
-#: plpprint/plpprintd.cc:1011
+#: plpprint/plpprintd.cc:1016
 msgid "plpprintd: could not connect to ncpd"
 msgstr "plpprintd: Konnte ncpd nicht kontaktieren."
diff --git a/po/sv.po b/po/sv.po
index 9140d17..21b49db 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: plptools 0.11\n"
-"POT-Creation-Date: 2002-07-14 07:56+0200\n"
+"POT-Creation-Date: 2002-07-14 20:57+0200\n"
 "PO-Revision-Date: 2002-07-11 09:10+0200\n"
 "Last-Translator: Daniel Brahneborg <basic@chello.se>\n"
 "Language-Team: SWEDISH <SE@li.org>\n"
@@ -552,7 +552,7 @@ msgstr "inget svar från ncpd"
 msgid "Not present"
 msgstr "Inte tillgänglig"
 
-#: lib/plpdirent.cc:176 ncpd/link.cc:54
+#: lib/plpdirent.cc:176 ncpd/link.cc:59
 msgid "Unknown"
 msgstr "Okänd"
 
@@ -1038,7 +1038,7 @@ msgstr "Behller ursprungsmappen \""
 msgid "Transfer complete, ("
 msgstr "verfringen klar, ("
 
-#: plpbackup/plpbackup.cc:1200 plpftp/ftp.cc:578 plpftp/ftp.cc:669
+#: plpbackup/plpbackup.cc:1202 plpftp/ftp.cc:578 plpftp/ftp.cc:669
 msgid " bytes in "
 msgstr " bytes p "
 
@@ -1310,50 +1310,50 @@ msgstr "ingen sdan process"
 msgid "syntax error. Try \"help\""
 msgstr "syntax error. Prova \"help\""
 
-#: plpbackup/plpbackup.cc:98
+#: plpbackup/plpbackup.cc:100
 msgid "Could not get user's home directory from /etc/passwd"
 msgstr "Kunde inte hitta anvndarens hemdirectory frn /etc/passwd"
 
-#: plpbackup/plpbackup.cc:118
+#: plpbackup/plpbackup.cc:120
 msgid "Could not get machine UID"
 msgstr "Kunde inte hmta maskinens UID"
 
-#: plpbackup/plpbackup.cc:138
+#: plpbackup/plpbackup.cc:140
 #, fuzzy
 msgid "Could not read SIBO UID file"
 msgstr "Kunde inte parsa sisfilen.\n"
 
-#: plpbackup/plpbackup.cc:143
+#: plpbackup/plpbackup.cc:145
 #, fuzzy
 msgid "Could not get Psion owner info"
 msgstr "Kunde inte hämta maskinens UID"
 
-#: plpbackup/plpbackup.cc:170
+#: plpbackup/plpbackup.cc:172
 #, fuzzy
 msgid "Could not write SIBO UID file "
 msgstr "Kunde inte parsa sisfilen.\n"
 
-#: plpbackup/plpbackup.cc:200
+#: plpbackup/plpbackup.cc:202
 msgid "Got signal "
 msgstr "Fick signal "
 
-#: plpbackup/plpbackup.cc:212
+#: plpbackup/plpbackup.cc:214
 msgid "Abort? (y/N) "
 msgstr "Avbryt? (y/N) "
 
-#: plpbackup/plpbackup.cc:213
+#: plpbackup/plpbackup.cc:215
 msgid "Y"
 msgstr ""
 
-#: plpbackup/plpbackup.cc:229
+#: plpbackup/plpbackup.cc:231
 msgid "Stopping programs ..."
 msgstr "Avslutar program ..."
 
-#: plpbackup/plpbackup.cc:231
+#: plpbackup/plpbackup.cc:233
 msgid "plpbackup: Could not get process list: "
 msgstr "plpbackup: Kunde inte hmta processlistan: "
 
-#: plpbackup/plpbackup.cc:251
+#: plpbackup/plpbackup.cc:253
 msgid ""
 "Could not stop all processes. Please stop running\n"
 "programs manually on the Psion, then hit return."
@@ -1361,247 +1361,247 @@ msgstr ""
 "Kunde inte avsluta alla processer. Var vnlig avsluta\n"
 "programmen manuellt p Psionen, tryck sedan p return."
 
-#: plpbackup/plpbackup.cc:266
+#: plpbackup/plpbackup.cc:268
 msgid "Restarting programs ..."
 msgstr "Startar om programmen ..."
 
-#: plpbackup/plpbackup.cc:485
+#: plpbackup/plpbackup.cc:487
 #, fuzzy
 msgid "Performing "
 msgstr "Promptning är nu "
 
-#: plpbackup/plpbackup.cc:487
+#: plpbackup/plpbackup.cc:489
 #, fuzzy
 msgid "format"
 msgstr "formatterbar"
 
-#: plpbackup/plpbackup.cc:490 plpbackup/plpbackup.cc:505
-#: plpbackup/plpbackup.cc:720
+#: plpbackup/plpbackup.cc:492 plpbackup/plpbackup.cc:507
+#: plpbackup/plpbackup.cc:722
 #, fuzzy
 msgid " and "
 msgstr " dag "
 
-#: plpbackup/plpbackup.cc:491
+#: plpbackup/plpbackup.cc:493
 msgid "restore"
 msgstr ""
 
-#: plpbackup/plpbackup.cc:493
+#: plpbackup/plpbackup.cc:495
 msgid "full"
 msgstr ""
 
-#: plpbackup/plpbackup.cc:493
+#: plpbackup/plpbackup.cc:495
 #, fuzzy
 msgid "incremental"
 msgstr "intern"
 
-#: plpbackup/plpbackup.cc:493
+#: plpbackup/plpbackup.cc:495
 #, fuzzy
 msgid " backup"
 msgstr "Backupens storlek: "
 
-#: plpbackup/plpbackup.cc:494
+#: plpbackup/plpbackup.cc:496
 #, fuzzy
 msgid " of "
 msgstr " timme "
 
-#: plpbackup/plpbackup.cc:496
+#: plpbackup/plpbackup.cc:498
 #, fuzzy
 msgid "all drives"
 msgstr "fel drivrutin"
 
-#: plpbackup/plpbackup.cc:498
+#: plpbackup/plpbackup.cc:500
 msgid "Drive "
 msgstr ""
 
-#: plpbackup/plpbackup.cc:511
+#: plpbackup/plpbackup.cc:513
 #, fuzzy
 msgid " to "
 msgstr " dag "
 
-#: plpbackup/plpbackup.cc:513
+#: plpbackup/plpbackup.cc:515
 msgid " from "
 msgstr ""
 
-#: plpbackup/plpbackup.cc:713
+#: plpbackup/plpbackup.cc:715
 msgid "It contains Backups of drive "
 msgstr ""
 
-#: plpbackup/plpbackup.cc:733
+#: plpbackup/plpbackup.cc:735
 msgid ""
 "Select (I)ndividual files, (W)hole archive, (N)one from this archive? (I/W/"
 "N) "
 msgstr ""
 
-#: plpbackup/plpbackup.cc:735
+#: plpbackup/plpbackup.cc:737
 msgid "IWA"
 msgstr ""
 
-#: plpbackup/plpbackup.cc:759
+#: plpbackup/plpbackup.cc:761
 #, fuzzy
 msgid "Could not run external editor"
 msgstr "Kunde inte läsa processlistan "
 
-#: plpbackup/plpbackup.cc:792
+#: plpbackup/plpbackup.cc:794
 msgid ""
 "Archive skipped, because it does not contain any files on selected drives"
 msgstr ""
 
-#: plpbackup/plpbackup.cc:837
+#: plpbackup/plpbackup.cc:839
 msgid "OAS"
 msgstr ""
 
-#: plpbackup/plpbackup.cc:878
+#: plpbackup/plpbackup.cc:880
 #, fuzzy
 msgid "Could not get backup index"
 msgstr "Kunde inte hämta maskinens UID"
 
-#: plpbackup/plpbackup.cc:886
+#: plpbackup/plpbackup.cc:888
 msgid "' is a full backup"
 msgstr ""
 
-#: plpbackup/plpbackup.cc:890
+#: plpbackup/plpbackup.cc:892
 msgid "' is an incremental backup"
 msgstr ""
 
-#: plpbackup/plpbackup.cc:895
+#: plpbackup/plpbackup.cc:897
 msgid "' is NOT a plpbackup"
 msgstr ""
 
-#: plpbackup/plpbackup.cc:932
+#: plpbackup/plpbackup.cc:934
 #, fuzzy
 msgid "Extracting tar archive ..."
 msgstr "Skapar tar-arkiv ..."
 
-#: plpbackup/plpbackup.cc:934
+#: plpbackup/plpbackup.cc:936
 msgid "Execution of "
 msgstr ""
 
-#: plpbackup/plpbackup.cc:943 plpbackup/plpbackup.cc:1030
-#: plpbackup/plpbackup.cc:1078
+#: plpbackup/plpbackup.cc:945 plpbackup/plpbackup.cc:1032
+#: plpbackup/plpbackup.cc:1080
 #, fuzzy
 msgid "Restore aborted by user"
 msgstr "Backup avbruten av anvndaren"
 
-#: plpbackup/plpbackup.cc:951 plpbackup/plpbackup.cc:1070
+#: plpbackup/plpbackup.cc:953 plpbackup/plpbackup.cc:1072
 msgid "Restore "
 msgstr ""
 
-#: plpbackup/plpbackup.cc:964
+#: plpbackup/plpbackup.cc:966
 #, fuzzy
 msgid "Could not create directory "
 msgstr "Kunde inte läsa processlistan "
 
-#: plpbackup/plpbackup.cc:980
+#: plpbackup/plpbackup.cc:982
 #, fuzzy
 msgid "Could not create "
 msgstr "Kunde inte starta "
 
-#: plpbackup/plpbackup.cc:990
+#: plpbackup/plpbackup.cc:992
 #, fuzzy
 msgid "Could not get attributes of "
 msgstr "Kunde inte starta "
 
-#: plpbackup/plpbackup.cc:1007
+#: plpbackup/plpbackup.cc:1009
 #, fuzzy
 msgid "Could not set attributes of"
 msgstr "Kunde inte starta "
 
-#: plpbackup/plpbackup.cc:1019
+#: plpbackup/plpbackup.cc:1021
 #, fuzzy
 msgid "Could not set modification time of "
 msgstr "Kunde inte hämta maskinens UID"
 
-#: plpbackup/plpbackup.cc:1042 plpbackup/plpbackup.cc:1244
+#: plpbackup/plpbackup.cc:1044 plpbackup/plpbackup.cc:1246
 msgid "Skipping "
 msgstr "Hoppar ver "
 
-#: plpbackup/plpbackup.cc:1045 plpbackup/plpbackup.cc:1085
+#: plpbackup/plpbackup.cc:1047 plpbackup/plpbackup.cc:1087
 #, fuzzy
 msgid "Error during restore of "
 msgstr "Fel under kopiering av "
 
-#: plpbackup/plpbackup.cc:1051 plpbackup/plpbackup.cc:1253
+#: plpbackup/plpbackup.cc:1053 plpbackup/plpbackup.cc:1255
 msgid "STAR"
 msgstr "HDAF"
 
-#: plpbackup/plpbackup.cc:1053 plpbackup/plpbackup.cc:1255
+#: plpbackup/plpbackup.cc:1055 plpbackup/plpbackup.cc:1257
 msgid "(S)kip all, Skip (t)his, (A)bort, (R)etry: "
 msgstr "(H)oppa ver alla, Hoppa ver (d)en hr, (A)vbryt, (F)rsk igen: "
 
-#: plpbackup/plpbackup.cc:1104 plpbackup/plpbackup.cc:1392
+#: plpbackup/plpbackup.cc:1106 plpbackup/plpbackup.cc:1394
 msgid "Total time elapsed:     "
 msgstr "Totalt åtgången tid:    "
 
-#: plpbackup/plpbackup.cc:1138 plpbackup/plpbackup.cc:1190
-#: plpbackup/plpbackup.cc:1232 plpbackup/plpbackup.cc:1281
+#: plpbackup/plpbackup.cc:1140 plpbackup/plpbackup.cc:1192
+#: plpbackup/plpbackup.cc:1234 plpbackup/plpbackup.cc:1283
 msgid "Backup aborted by user"
 msgstr "Backup avbruten av användaren"
 
-#: plpbackup/plpbackup.cc:1157 plpbackup/plpbackup.cc:1175
+#: plpbackup/plpbackup.cc:1159 plpbackup/plpbackup.cc:1177
 msgid "Scanning Drive "
 msgstr "Gr igenom Enhet "
 
-#: plpbackup/plpbackup.cc:1170
+#: plpbackup/plpbackup.cc:1172
 msgid "plpbackup: Couldn't get Drive list"
 msgstr "plpbackup: Kunde inte hmta listan p Enheter"
 
-#: plpbackup/plpbackup.cc:1200
+#: plpbackup/plpbackup.cc:1202
 msgid "Size of backup: "
 msgstr "Backupens storlek: "
 
-#: plpbackup/plpbackup.cc:1201
+#: plpbackup/plpbackup.cc:1203
 msgid " files."
 msgstr " filer."
 
-#: plpbackup/plpbackup.cc:1204
+#: plpbackup/plpbackup.cc:1206
 msgid "Nothing to backup"
 msgstr "Ingenting att kopiera"
 
-#: plpbackup/plpbackup.cc:1220 plpbackup/plpbackup.cc:1273
+#: plpbackup/plpbackup.cc:1222 plpbackup/plpbackup.cc:1275
 msgid "Backing up "
 msgstr "Kopierar "
 
-#: plpbackup/plpbackup.cc:1247 plpbackup/plpbackup.cc:1288
+#: plpbackup/plpbackup.cc:1249 plpbackup/plpbackup.cc:1290
 msgid "Error during backup of "
 msgstr "Fel under kopiering av "
 
-#: plpbackup/plpbackup.cc:1307
+#: plpbackup/plpbackup.cc:1309
 msgid "Writing index ..."
 msgstr "Skriver innehllslista ..."
 
-#: plpbackup/plpbackup.cc:1334
+#: plpbackup/plpbackup.cc:1336
 msgid "plpbackup: Could not write index "
 msgstr "plpbackup: Kunde inte skriva innehllslista "
 
-#: plpbackup/plpbackup.cc:1344
+#: plpbackup/plpbackup.cc:1346
 msgid "Creating tar archive ..."
 msgstr "Skapar tar-arkiv ..."
 
-#: plpbackup/plpbackup.cc:1357
+#: plpbackup/plpbackup.cc:1359
 msgid "plpbackup: Error during execution of "
 msgstr "plpbackup: Fel under krning av "
 
-#: plpbackup/plpbackup.cc:1367
+#: plpbackup/plpbackup.cc:1369
 msgid "Resetting archive attributes ..."
 msgstr "terstller arkiveringsattribut ..."
 
-#: plpbackup/plpbackup.cc:1386
+#: plpbackup/plpbackup.cc:1388
 msgid "Backup aborted due to error"
 msgstr "Kopiering avbruten p grund av fel"
 
-#: plpbackup/plpbackup.cc:1394
+#: plpbackup/plpbackup.cc:1396
 msgid "Time for scanning:      "
 msgstr "Tid fr genomgng:      "
 
-#: plpbackup/plpbackup.cc:1397
+#: plpbackup/plpbackup.cc:1399
 msgid "Time for transfer:      "
 msgstr "Tid fr verfring:     "
 
-#: plpbackup/plpbackup.cc:1399
+#: plpbackup/plpbackup.cc:1401
 msgid "Average transfer speed: "
 msgstr "verfringshastighet:   "
 
-#: plpbackup/plpbackup.cc:1410
+#: plpbackup/plpbackup.cc:1412
 msgid ""
 "Usage: plpbackup OPTIONS [<drive>:] [<drive>:] ...\n"
 "\n"
@@ -1635,44 +1635,44 @@ msgstr ""
 "  <enhet> En enhetsbokstav. Om ingen anges, g igenom alla enheter.\n"
 "\n"
 
-#: plpbackup/plpbackup.cc:1427
+#: plpbackup/plpbackup.cc:1429
 msgid "Try 'plpbackup --help' for more information."
 msgstr "Prova 'plpbackup --help' fr mer information."
 
-#: plpbackup/plpbackup.cc:1498
+#: plpbackup/plpbackup.cc:1500
 msgid "plpbackup version "
 msgstr ""
 
-#: plpbackup/plpbackup.cc:1536
+#: plpbackup/plpbackup.cc:1538
 msgid "Invalid drive argument "
 msgstr "Ogiltig enhetsbokstav "
 
-#: plpbackup/plpbackup.cc:1542
+#: plpbackup/plpbackup.cc:1544
 msgid "Backup mode can not be combined with format or restore."
 msgstr "Backup-lget kan inte kombineras med formattering eller terstllning."
 
-#: plpbackup/plpbackup.cc:1547
+#: plpbackup/plpbackup.cc:1549
 msgid "Format mode needs at least one drive specified."
 msgstr "Formatlget krver minst en enhetsbokstav."
 
-#: plpbackup/plpbackup.cc:1551
+#: plpbackup/plpbackup.cc:1553
 msgid "Backup can only create one archive at a time."
 msgstr "Backup kan bara skapa ett arkiv i taget."
 
-#: plpbackup/plpbackup.cc:1560 plpbackup/plpbackup.cc:1565
+#: plpbackup/plpbackup.cc:1562 plpbackup/plpbackup.cc:1567
 msgid "plpbackup: could not connect to ncpd"
 msgstr "plpbackup: fick ingen kontakt med ncpd"
 
-#: sisinstall/sismain.cpp:31
+#: sisinstall/sismain.cpp:33
 msgid "Got an error, Press any key to exit."
 msgstr ""
 
-#: sisinstall/sismain.cpp:36
+#: sisinstall/sismain.cpp:38
 #, c-format
 msgid "Error %d on line %d: %s\n"
 msgstr ""
 
-#: sisinstall/sismain.cpp:55
+#: sisinstall/sismain.cpp:57
 msgid ""
 "Usage: sisinstall [OPTIONS]... SISFILE\n"
 "\n"
@@ -1685,41 +1685,41 @@ msgid ""
 " -w, --newt              Use the Newt interface.\n"
 msgstr ""
 
-#: sisinstall/sismain.cpp:109
+#: sisinstall/sismain.cpp:111
 msgid "sisinstall version 0.1\n"
 msgstr ""
 
-#: sisinstall/sismain.cpp:128 sisinstall/sismain.cpp:136
+#: sisinstall/sismain.cpp:130 sisinstall/sismain.cpp:138
 #, c-format
 msgid "Installing sis file %s%s.\n"
 msgstr "Installerar sisfil %s%s.\n"
 
-#: sisinstall/sismain.cpp:130 sisinstall/sismain.cpp:137
+#: sisinstall/sismain.cpp:132 sisinstall/sismain.cpp:139
 msgid ", not really"
 msgstr ", inte egentligen"
 
-#: sisinstall/sismain.cpp:145
+#: sisinstall/sismain.cpp:147
 msgid "Missing SIS filename\n"
 msgstr ""
 
-#: sisinstall/sismain.cpp:153
+#: sisinstall/sismain.cpp:155
 #, c-format
 msgid "File is %d bytes long\n"
 msgstr "Filen r %d bytes lng\n"
 
-#: sisinstall/sismain.cpp:168
+#: sisinstall/sismain.cpp:170
 msgid "Couldn't connect with the Psion\n"
 msgstr "Kunde inte f kontakt med Psionen\n"
 
-#: sisinstall/sismain.cpp:189
+#: sisinstall/sismain.cpp:191
 msgid "Could not parse the sis file.\n"
 msgstr "Kunde inte parsa sisfilen.\n"
 
-#: sisinstall/sismain.cpp:198
+#: sisinstall/sismain.cpp:200
 msgid "Installation complete. Press any key to exit."
 msgstr ""
 
-#: ncpd/main.cc:138
+#: ncpd/main.cc:145
 msgid ""
 "Usage: ncpd [OPTIONS]...\n"
 "\n"
@@ -1744,40 +1744,40 @@ msgid ""
 " -b, --baudrate=RATE     Set serial speed to BAUD.\n"
 msgstr ""
 
-#: ncpd/main.cc:163
+#: ncpd/main.cc:170
 msgid "                         Default: "
 msgstr ""
 
-#: ncpd/main.cc:165
+#: ncpd/main.cc:172
 msgid ""
 "                         Default: Autocycle 115.2k, 57.6k 38.4k, 19.2k\n"
 msgstr ""
 
-#: ncpd/main.cc:168
+#: ncpd/main.cc:175
 msgid ""
 " -p, --port=[HOST:]PORT  Listen on host HOST, port PORT.\n"
 "                         Default for HOST: 127.0.0.1\n"
 "                         Default for PORT: "
 msgstr ""
 
-#: ncpd/main.cc:176
+#: ncpd/main.cc:183
 #, fuzzy
 msgid "Try `ncpd --help' for more information"
 msgstr "Prova 'plpftp --help' för mer information"
 
-#: ncpd/main.cc:266
+#: ncpd/main.cc:275
 msgid "ncpd Version "
 msgstr ""
 
-#: ncpd/link.cc:55
+#: ncpd/link.cc:60
 msgid "SIBO"
 msgstr ""
 
-#: ncpd/link.cc:56
+#: ncpd/link.cc:61
 msgid "EPOC"
 msgstr ""
 
-#: plpnfsd/main.cc:475
+#: plpnfsd/main.cc:477
 #, fuzzy
 msgid ""
 "Usage: plpnfsd [OPTIONS]...\n"
@@ -1809,16 +1809,16 @@ msgstr ""
 "                        Om inget är angivet är VÄRD 127.0.0.1\n"
 "                        och PORT är "
 
-#: plpnfsd/main.cc:493
+#: plpnfsd/main.cc:495
 #, fuzzy
 msgid "Try `plpnfsd --help' for more information"
 msgstr "Prova 'plpftp --help' för mer information"
 
-#: plpnfsd/main.cc:560
+#: plpnfsd/main.cc:562
 msgid "plpnfsd Version "
 msgstr ""
 
-#: plpprint/plpprintd.cc:1011
+#: plpprint/plpprintd.cc:1016
 #, fuzzy
 msgid "plpprintd: could not connect to ncpd"
 msgstr "plpftp: kunde inte få kontakt med ncpd"
diff --git a/sisinstall/sismain.cpp b/sisinstall/sismain.cpp
index b673c13..70d285f 100644
--- a/sisinstall/sismain.cpp
+++ b/sisinstall/sismain.cpp
@@ -17,7 +17,9 @@
 # include <newt.h>
 #endif
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 #include <getopt.h>
 
 bool usenewt = false;
@@ -66,7 +68,7 @@ void printHelp()
 	));
 }
 
-void main(int argc, char* argv[])
+int main(int argc, char* argv[])
 {
 	char* filename = 0;
 	char option;
@@ -200,6 +202,6 @@ void main(int argc, char* argv[])
 		newtFinished();
 		}
 #endif
-	exit(0);
+	return 0;
 }