Modified icons.

Started NLS support.
Added kpsion KDE2 application.
Unified file-headers.

1 files changed, 707 insertions, 702 deletions

diff --git a/lib/rfsv16.cc b/lib/rfsv16.cc
index f98816c..30c3673 100644
--- a/lib/rfsv16.cc
+++ b/lib/rfsv16.cc
@@ -1,28 +1,27 @@
-//
-//  RFSV16 - An implementation of the PSION SIBO RFSV Client protocol
-//
-//  Copyright (C) 1999  Philip Proudman
-//  Modifications for plptools:
-//    Copyright (C) 1999 Matt J. Gumbley <matt@gumbley.demon.co.uk>
-//    Sources: rfsv32.cc by Fritz Elfert, and rfsv16.cc by Philip Proudman
-//    Descriptions of the RFSV16 protocol by Michael Pieper, Olaf Flebbe & Me.
-//
-//  This program is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-//  e-mail philip.proudman@btinternet.com
-
+/*-*-c++-*-
+ * $Id$
+ *
+ * This file is part of plptools.
+ *
+ *  Copyright (C) 1999  Philip Proudman <philip.proudman@btinternet.com>
+ *  Copyright (C) 1999 Matt J. Gumbley <matt@gumbley.demon.co.uk>
+ *  Copyright (C) 1999-2001 Fritz Elfert <felfert@to.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -43,678 +42,678 @@
 
 rfsv16::rfsv16(ppsocket *_skt)
 {
-	serNum = 0;
-	status = rfsv::E_PSI_FILE_DISC;
-	skt = _skt;
-	reset();
+    serNum = 0;
+    status = rfsv::E_PSI_FILE_DISC;
+    skt = _skt;
+    reset();
 }
 
 Enum<rfsv::errs> rfsv16::
 fopen(u_int32_t attr, const char *name, u_int32_t &handle)
-{ 
-	bufferStore a;
-	string realName	= convertSlash(name);
-
-	a.addWord(attr & 0xFFFF);
-	a.addStringT(realName.c_str());
-	if (!sendCommand(FOPEN, a))
-		return E_PSI_FILE_DISC;
-  
-	Enum<rfsv::errs> res = getResponse(a);
-	if (res == 0) {
-		handle = (long)a.getWord(0);
-		return E_PSI_GEN_NONE;
-	}
-	return res;
+{
+    bufferStore a;
+    string realName	= convertSlash(name);
+
+    a.addWord(attr & 0xFFFF);
+    a.addStringT(realName.c_str());
+    if (!sendCommand(FOPEN, a))
+	return E_PSI_FILE_DISC;
+
+    Enum<rfsv::errs> res = getResponse(a);
+    if (res == 0) {
+	handle = (long)a.getWord(0);
+	return E_PSI_GEN_NONE;
+    }
+    return res;
 }
 
 // internal
 Enum<rfsv::errs> rfsv16::
 mktemp(u_int32_t &handle, string &tmpname)
 {
-	bufferStore a;
+    bufferStore a;
 
-	a.addWord(P_FUNIQUE);
-	a.addStringT("TMP");
-	if (!sendCommand(OPENUNIQUE, a))
-		return E_PSI_FILE_DISC;
-  
-	Enum<rfsv::errs> res = getResponse(a);
-	if (res == E_PSI_GEN_NONE) {
-		handle = a.getWord(0);
-		tmpname = a.getString(2);
-		return res;
-	}
+    a.addWord(P_FUNIQUE);
+    a.addStringT("TMP");
+    if (!sendCommand(OPENUNIQUE, a))
+	return E_PSI_FILE_DISC;
+
+    Enum<rfsv::errs> res = getResponse(a);
+    if (res == E_PSI_GEN_NONE) {
+	handle = a.getWord(0);
+	tmpname = a.getString(2);
 	return res;
+    }
+    return res;
 }
 
 // internal and external
 Enum<rfsv::errs> rfsv16::
 fcreatefile(u_int32_t attr, const char *name, u_int32_t &handle)
 {
-	return fopen(attr | P_FCREATE, name, handle);
+    return fopen(attr | P_FCREATE, name, handle);
 }
 
 // this is internal - not used by plpnfsd, unlike fcreatefile
 Enum<rfsv::errs> rfsv16::
 freplacefile(u_int32_t attr, const char *name, u_int32_t &handle)
 {
-	return fopen(attr | P_FREPLACE, name, handle);
+    return fopen(attr | P_FREPLACE, name, handle);
 }
 
 Enum<rfsv::errs> rfsv16::
 fopendir(const char * const name, u_int32_t &handle)
 {
-	return fopen(P_FDIR, name, handle);
+    return fopen(P_FDIR, name, handle);
 }
 
 Enum<rfsv::errs> rfsv16::
 fclose(u_int32_t fileHandle)
 {
-	bufferStore a;
-	a.addWord(fileHandle & 0xFFFF);
-	if (!sendCommand(FCLOSE, a))
-		return E_PSI_FILE_DISC;
-	return getResponse(a);
+    bufferStore a;
+    a.addWord(fileHandle & 0xFFFF);
+    if (!sendCommand(FCLOSE, a))
+	return E_PSI_FILE_DISC;
+    return getResponse(a);
 }
 
 Enum<rfsv::errs> rfsv16::
 opendir(const u_int32_t attr, const char *name, rfsvDirhandle &dH) {
-	u_int32_t handle;
-	Enum<rfsv::errs> res = fopendir(name, handle);
-	dH.h = handle;
-	dH.b.init();
-	return res;
+    u_int32_t handle;
+    Enum<rfsv::errs> res = fopendir(name, handle);
+    dH.h = handle;
+    dH.b.init();
+    return res;
 }
 
 Enum<rfsv::errs> rfsv16::
 closedir(rfsvDirhandle &dH) {
-	return fclose(dH.h);
+    return fclose(dH.h);
 }
 
 Enum<rfsv::errs> rfsv16::
 readdir(rfsvDirhandle &dH, PlpDirent &e) {
-	Enum<rfsv::errs> res = E_PSI_GEN_NONE;
-
-	if (dH.b.getLen() < 17) {
-		dH.b.init();
-		dH.b.addWord(dH.h & 0xFFFF);
-		if (!sendCommand(FDIRREAD, dH.b))
-			return E_PSI_FILE_DISC;
-		res = getResponse(dH.b);
-		dH.b.discardFirstBytes(2); // Don't know what these mean!
-	} 
-	if ((res == E_PSI_GEN_NONE) && (dH.b.getLen() > 16)) {
-		u_int16_t version = dH.b.getWord(0);
-		if (version != 2) {
-			cerr << "dir: not version 2" << endl;
-			return E_PSI_GEN_FAIL;
-		}
-		e.attr    = attr2std((u_int32_t)dH.b.getWord(2));
-		e.size    = dH.b.getDWord(4);
-		e.time    = PsiTime((time_t)dH.b.getDWord(8));
-		e.name    = dH.b.getString(16);
-		// e.UID     = PlpUID(0,0,0);
-		e.attrstr = attr2String(e.attr);
-
-		dH.b.discardFirstBytes(17 + e.name.length());
+    Enum<rfsv::errs> res = E_PSI_GEN_NONE;
 
+    if (dH.b.getLen() < 17) {
+	dH.b.init();
+	dH.b.addWord(dH.h & 0xFFFF);
+	if (!sendCommand(FDIRREAD, dH.b))
+	    return E_PSI_FILE_DISC;
+	res = getResponse(dH.b);
+	dH.b.discardFirstBytes(2); // Don't know what these mean!
+    }
+    if ((res == E_PSI_GEN_NONE) && (dH.b.getLen() > 16)) {
+	u_int16_t version = dH.b.getWord(0);
+	if (version != 2) {
+	    cerr << "dir: not version 2" << endl;
+	    return E_PSI_GEN_FAIL;
 	}
-	return res;
+	e.attr    = attr2std((u_int32_t)dH.b.getWord(2));
+	e.size    = dH.b.getDWord(4);
+	e.time    = PsiTime((time_t)dH.b.getDWord(8));
+	e.name    = dH.b.getString(16);
+	// e.UID     = PlpUID(0,0,0);
+	e.attrstr = attr2String(e.attr);
+
+	dH.b.discardFirstBytes(17 + e.name.length());
+
+    }
+    return res;
 }
 
 Enum<rfsv::errs> rfsv16::
 dir(const char *name, PlpDir &files)
 {
-	rfsvDirhandle h;
-	files.clear();
-	Enum<rfsv::errs> res = opendir(PSI_A_HIDDEN | PSI_A_SYSTEM | PSI_A_DIR, name, h);
-	while (res == E_PSI_GEN_NONE) {
-		PlpDirent e;
-		res = readdir(h, e);
-		if (res == E_PSI_GEN_NONE)
-			files.push_back(e);
-	}
-	closedir(h);
-	if (res == E_PSI_FILE_EOF)
-		res = E_PSI_GEN_NONE;
-	return res;
+    rfsvDirhandle h;
+    files.clear();
+    Enum<rfsv::errs> res = opendir(PSI_A_HIDDEN | PSI_A_SYSTEM | PSI_A_DIR, name, h);
+    while (res == E_PSI_GEN_NONE) {
+	PlpDirent e;
+	res = readdir(h, e);
+	if (res == E_PSI_GEN_NONE)
+	    files.push_back(e);
+    }
+    closedir(h);
+    if (res == E_PSI_FILE_EOF)
+	res = E_PSI_GEN_NONE;
+    return res;
 }
 
 u_int32_t rfsv16::
 opMode(u_int32_t mode)
 {
-	u_int32_t ret = 0;
+    u_int32_t ret = 0;
 
-	ret |= ((mode & 03) == PSI_O_RDONLY) ? 0 : P_FUPDATE;
-	ret |= (mode & PSI_O_TRUNC) ? P_FREPLACE : 0;
-	ret |= (mode & PSI_O_CREAT) ? P_FCREATE : 0;
-	ret |= (mode & PSI_O_APPEND) ? P_FAPPEND : 0;
-	if ((mode & 03) == PSI_O_RDONLY)
-		ret |= (mode & PSI_O_EXCL) ? 0 : P_FSHARE;
-	return ret;
+    ret |= ((mode & 03) == PSI_O_RDONLY) ? 0 : P_FUPDATE;
+    ret |= (mode & PSI_O_TRUNC) ? P_FREPLACE : 0;
+    ret |= (mode & PSI_O_CREAT) ? P_FCREATE : 0;
+    ret |= (mode & PSI_O_APPEND) ? P_FAPPEND : 0;
+    if ((mode & 03) == PSI_O_RDONLY)
+	ret |= (mode & PSI_O_EXCL) ? 0 : P_FSHARE;
+    return ret;
 }
 
 Enum<rfsv::errs> rfsv16::
 fgetmtime(const char * const name, PsiTime &mtime)
 {
-cerr << "rfsv16::fgetmtime" << endl;
-	// NB: fgetattr, fgeteattr is almost identical...
-	bufferStore a;
-	string realName = convertSlash(name);
-	a.addStringT(realName.c_str());
-				// and this needs sending in the length word.
-	if (!sendCommand(FINFO, a))
-		return E_PSI_FILE_DISC;
-  
-	Enum<rfsv::errs> res = getResponse(a);
-	if (res != E_PSI_GEN_NONE) {
-		cerr << "fgetmtime: Error " << res << " on file " << name << endl;	    
-		return res;
-	}
-	else if (a.getLen() == 16) {
-		mtime.setUnixTime(a.getDWord(8));
-		return res;
-	}
-	cerr << "fgetmtime: Unknown response (" << name << ") " << a <<endl;
-	return E_PSI_GEN_FAIL;
+    cerr << "rfsv16::fgetmtime" << endl;
+    // NB: fgetattr, fgeteattr is almost identical...
+    bufferStore a;
+    string realName = convertSlash(name);
+    a.addStringT(realName.c_str());
+    // and this needs sending in the length word.
+    if (!sendCommand(FINFO, a))
+	return E_PSI_FILE_DISC;
+
+    Enum<rfsv::errs> res = getResponse(a);
+    if (res != E_PSI_GEN_NONE) {
+	cerr << "fgetmtime: Error " << res << " on file " << name << endl;
+	return res;
+    }
+    else if (a.getLen() == 16) {
+	mtime.setUnixTime(a.getDWord(8));
+	return res;
+    }
+    cerr << "fgetmtime: Unknown response (" << name << ") " << a <<endl;
+    return E_PSI_GEN_FAIL;
 }
 
 Enum<rfsv::errs> rfsv16::
 fsetmtime(const char *name, PsiTime mtime)
 {
-cerr << "rfsv16::fsetmtime ***" << endl;
-	// I don't think there's a protocol frame that allows us to set the
-	// modification time. SFDATE allows setting of creation time...
-	return E_PSI_NOT_SIBO;
+    cerr << "rfsv16::fsetmtime ***" << endl;
+    // I don't think there's a protocol frame that allows us to set the
+    // modification time. SFDATE allows setting of creation time...
+    return E_PSI_NOT_SIBO;
 }
 
 Enum<rfsv::errs> rfsv16::
 fgetattr(const char * const name, u_int32_t &attr)
 {
-	// NB: fgetmtime, fgeteattr are almost identical...
-	bufferStore a;
-	string realName = convertSlash(name);
-	a.addStringT(realName.c_str());
-				// and this needs sending in the length word.
-	if (!sendCommand(FINFO, a))
-		return E_PSI_FILE_DISC;
-  
-	Enum<rfsv::errs> res = getResponse(a);
-	if (res != 0) {
-		cerr << "fgetattr: Error " << res << " on file " << name << endl;	    
-		return res;
-	}
-	else if (a.getLen() == 16) {
-		attr = attr2std((long)a.getWord(2));
-		return res;
-	}
-	cerr << "fgetattr: Unknown response (" << name << ") " << a <<endl;
-	return E_PSI_GEN_FAIL;
+    // NB: fgetmtime, fgeteattr are almost identical...
+    bufferStore a;
+    string realName = convertSlash(name);
+    a.addStringT(realName.c_str());
+    // and this needs sending in the length word.
+    if (!sendCommand(FINFO, a))
+	return E_PSI_FILE_DISC;
+
+    Enum<rfsv::errs> res = getResponse(a);
+    if (res != 0) {
+	cerr << "fgetattr: Error " << res << " on file " << name << endl;
+	return res;
+    }
+    else if (a.getLen() == 16) {
+	attr = attr2std((long)a.getWord(2));
+	return res;
+    }
+    cerr << "fgetattr: Unknown response (" << name << ") " << a <<endl;
+    return E_PSI_GEN_FAIL;
 }
 
 Enum<rfsv::errs> rfsv16::
 fgeteattr(const char * const name, PlpDirent &e)
 {
-	bufferStore a;
-	string realName = convertSlash(name);
-	a.addStringT(realName.c_str());
-	if (!sendCommand(FINFO, a))
-		return E_PSI_FILE_DISC;
-	Enum<rfsv::errs> res = getResponse(a);
-	if (res != 0) {
-		cerr << "fgeteattr: Error " << res << " on file " << name << endl;
-		return res;
-	}
-	else if (a.getLen() == 16) {
-		const char *p = strrchr(realName.c_str(), '\\');
-		if (p)
-			p++;
-		else
-			p = realName.c_str();
-		e.name = p;
-		e.attr = a.getWord(2);
-		e.size = a.getDWord(4);
-		e.time = PsiTime(a.getDWord(8));
-		e.UID  = PlpUID(0,0,0);
-		return res;
-	}
-	cerr << "fgeteattr: Unknown response (" << name << ") " << a <<endl;
-	return E_PSI_GEN_FAIL;
+    bufferStore a;
+    string realName = convertSlash(name);
+    a.addStringT(realName.c_str());
+    if (!sendCommand(FINFO, a))
+	return E_PSI_FILE_DISC;
+    Enum<rfsv::errs> res = getResponse(a);
+    if (res != 0) {
+	cerr << "fgeteattr: Error " << res << " on file " << name << endl;
+	return res;
+    }
+    else if (a.getLen() == 16) {
+	const char *p = strrchr(realName.c_str(), '\\');
+	if (p)
+	    p++;
+	else
+	    p = realName.c_str();
+	e.name = p;
+	e.attr = a.getWord(2);
+	e.size = a.getDWord(4);
+	e.time = PsiTime(a.getDWord(8));
+	e.UID  = PlpUID(0,0,0);
+	return res;
+    }
+    cerr << "fgeteattr: Unknown response (" << name << ") " << a <<endl;
+    return E_PSI_GEN_FAIL;
 }
 
 Enum<rfsv::errs> rfsv16::
 fsetattr(const char *name, u_int32_t seta, u_int32_t unseta)
 {
-cerr << "rfsv16::fsetattr" << endl;
-	// seta are attributes to set; unseta are attributes to unset. Need to
-	// turn this into attributes to change state and a bit mask.
-	// 210000
-	// 008421
-	// a  shr
-	u_int32_t statusword = std2attr(seta) & (~ std2attr(unseta));
-	statusword ^= 0x0000001; // r bit is inverted
-	u_int32_t bitmask = std2attr(seta) | std2attr(unseta);
-	// cerr << "seta is   " << hex << setw(2) << setfill('0') << seta << endl;
-	// cerr << "unseta is " << hex << setw(2) << setfill('0') << unseta << endl;
-	// cerr << "statusword is  " << hex << setw(2) << setfill('0') << statusword << endl;
-	// cerr << "bitmask is     " << hex << setw(2) << setfill('0') << bitmask << endl;
-	bufferStore a;
-	a.addWord(statusword & 0xFFFF);
-	a.addWord(bitmask & 0xFFFF);
-	a.addStringT(name);
-				// and this needs sending in the length word.
-	if (!sendCommand(SFSTAT, a))
-		return E_PSI_FILE_DISC;
-	return getResponse(a);
+    cerr << "rfsv16::fsetattr" << endl;
+    // seta are attributes to set; unseta are attributes to unset. Need to
+    // turn this into attributes to change state and a bit mask.
+    // 210000
+    // 008421
+    // a  shr
+    u_int32_t statusword = std2attr(seta) & (~ std2attr(unseta));
+    statusword ^= 0x0000001; // r bit is inverted
+    u_int32_t bitmask = std2attr(seta) | std2attr(unseta);
+    // cerr << "seta is   " << hex << setw(2) << setfill('0') << seta << endl;
+    // cerr << "unseta is " << hex << setw(2) << setfill('0') << unseta << endl;
+    // cerr << "statusword is  " << hex << setw(2) << setfill('0') << statusword << endl;
+    // cerr << "bitmask is     " << hex << setw(2) << setfill('0') << bitmask << endl;
+    bufferStore a;
+    a.addWord(statusword & 0xFFFF);
+    a.addWord(bitmask & 0xFFFF);
+    a.addStringT(name);
+    // and this needs sending in the length word.
+    if (!sendCommand(SFSTAT, a))
+	return E_PSI_FILE_DISC;
+    return getResponse(a);
 }
 
 Enum<rfsv::errs> rfsv16::
 dircount(const char * const name, u_int32_t &count)
 {
-	u_int32_t fileHandle;
-	Enum<rfsv::errs> res;
-	count = 0;
+    u_int32_t fileHandle;
+    Enum<rfsv::errs> res;
+    count = 0;
+
+    res = fopen(P_FDIR, name, fileHandle);
+    if (res != E_PSI_GEN_NONE)
+	return res;
 
-	res = fopen(P_FDIR, name, fileHandle);
+    while (1) {
+	bufferStore a;
+	a.addWord(fileHandle & 0xFFFF);
+	if (!sendCommand(FDIRREAD, a))
+	    return E_PSI_FILE_DISC;
+	res = getResponse(a);
 	if (res != E_PSI_GEN_NONE)
-		return res;
-
-	while (1) {
-		bufferStore a;
-		a.addWord(fileHandle & 0xFFFF);
-		if (!sendCommand(FDIRREAD, a))
-			return E_PSI_FILE_DISC;
-		res = getResponse(a);
-		if (res != E_PSI_GEN_NONE)
-			break;
-		a.discardFirstBytes(2); // Don't know what these mean!
-		while (a.getLen() > 16) {
-			int version = a.getWord(0);
-			if (version != 2) {
-				cerr << "dir: not version 2" << endl;
-				fclose(fileHandle);
-				return E_PSI_GEN_FAIL;
-			}
-			// int status = a.getWord(2);
-			// long size = a.getDWord(4);
-			// long date = a.getDWord(8);
-			const char *s = a.getString(16);
-			a.discardFirstBytes(17+strlen(s));
-			count++;
-		}
+	    break;
+	a.discardFirstBytes(2); // Don't know what these mean!
+	while (a.getLen() > 16) {
+	    int version = a.getWord(0);
+	    if (version != 2) {
+		cerr << "dir: not version 2" << endl;
+		fclose(fileHandle);
+		return E_PSI_GEN_FAIL;
+	    }
+	    // int status = a.getWord(2);
+	    // long size = a.getDWord(4);
+	    // long date = a.getDWord(8);
+	    const char *s = a.getString(16);
+	    a.discardFirstBytes(17+strlen(s));
+	    count++;
 	}
-	if (res == E_PSI_FILE_EOF)
-		res = E_PSI_GEN_NONE;
-	fclose(fileHandle);
-	return res;
+    }
+    if (res == E_PSI_FILE_EOF)
+	res = E_PSI_GEN_NONE;
+    fclose(fileHandle);
+    return res;
 }
 
 Enum<rfsv::errs> rfsv16::
 devlist(u_int32_t &devbits)
 {
-	Enum<rfsv::errs> res;
-	u_int32_t fileHandle;
-	devbits = 0;
+    Enum<rfsv::errs> res;
+    u_int32_t fileHandle;
+    devbits = 0;
+
+    // The following is taken from a trace between a Series 3c and PsiWin.
+    // Hope it works! We PARSE to find the correct node, then FOPEN
+    // (P_FDEVICE) this, FDEVICEREAD each entry, setting the appropriate
+    // drive-letter-bit in devbits, then FCLOSE.
+
+    bufferStore a;
+    a.init();
+    a.addByte(0x00); // no Name 1
+    a.addByte(0x00); // no Name 2
+    a.addByte(0x00); // no Name 3
+    if (!sendCommand(PARSE, a))
+	return E_PSI_FILE_DISC;
+    res = getResponse(a);
+    if (res != E_PSI_GEN_NONE)
+	return res;
 
-	// The following is taken from a trace between a Series 3c and PsiWin.
-	// Hope it works! We PARSE to find the correct node, then FOPEN
-	// (P_FDEVICE) this, FDEVICEREAD each entry, setting the appropriate
-	// drive-letter-bit in devbits, then FCLOSE.
+    // Find the drive to FOPEN
+    char name[4] = { 'x', ':', '\\', '\0' } ;
+    a.discardFirstBytes(6); // Result, fsys, dev, path, file, file, ending, flag
+    /* This leaves R E M : : M : \ */
+    name[0] = (char) a.getByte(5); // the M
+    res = fopen(P_FDEVICE, name, fileHandle);
+    if (res != E_PSI_GEN_NONE)
+	return status;
 
+    while (1) {
 	bufferStore a;
 	a.init();
-	a.addByte(0x00); // no Name 1
-	a.addByte(0x00); // no Name 2
-	a.addByte(0x00); // no Name 3
-	if (!sendCommand(PARSE, a))
-		return E_PSI_FILE_DISC;
+	a.addWord(fileHandle & 0xFFFF);
+	if (!sendCommand(FDEVICEREAD, a))
+	    return E_PSI_FILE_DISC;
 	res = getResponse(a);
-	if (res != E_PSI_GEN_NONE)
-		return res;
-
-	// Find the drive to FOPEN
-	char name[4] = { 'x', ':', '\\', '\0' } ;
-	a.discardFirstBytes(6); // Result, fsys, dev, path, file, file, ending, flag
-	/* This leaves R E M : : M : \ */
-	name[0] = (char) a.getByte(5); // the M
-	res = fopen(P_FDEVICE, name, fileHandle);
-	if (res != E_PSI_GEN_NONE) 
-		return status;
-
-	while (1) {
-		bufferStore a;
-		a.init();
-		a.addWord(fileHandle & 0xFFFF);
-		if (!sendCommand(FDEVICEREAD, a))
-			return E_PSI_FILE_DISC;
-		res = getResponse(a);
-		if (res)
-			break;
-		u_int16_t version = a.getWord(0);
-		if (version != 2) {
-			cerr << "devlist: not version 2" << endl;
-			fclose(fileHandle);
-			return E_PSI_GEN_FAIL; // FIXME
-		}
-		char drive = a.getByte(64);
-		if (drive >= 'A' && drive <= 'Z') {
-			int shift = (drive - 'A');
-			devbits |= (long) ( 1 << shift );
-		}
-		else {
-			cerr << "devlist: non-alphabetic drive letter ("
-				 << drive << ")" << endl;
-		}
+	if (res)
+	    break;
+	u_int16_t version = a.getWord(0);
+	if (version != 2) {
+	    cerr << "devlist: not version 2" << endl;
+	    fclose(fileHandle);
+	    return E_PSI_GEN_FAIL; // FIXME
 	}
-	if (res == E_PSI_FILE_EOF)
-		res = E_PSI_GEN_NONE;
-	fclose(fileHandle);
-	return res;
+	char drive = a.getByte(64);
+	if (drive >= 'A' && drive <= 'Z') {
+	    int shift = (drive - 'A');
+	    devbits |= (long) ( 1 << shift );
+	}
+	else {
+	    cerr << "devlist: non-alphabetic drive letter ("
+		 << drive << ")" << endl;
+	}
+    }
+    if (res == E_PSI_FILE_EOF)
+	res = E_PSI_GEN_NONE;
+    fclose(fileHandle);
+    return res;
 }
 
 static int sibo_dattr[] = {
-	1, // Unknown
-	2, // Floppy
-	3, // Disk
-	6, // Flash
-	5, // RAM
-	7, // ROM
-	7, // write-protected == ROM ?
+    1, // Unknown
+    2, // Floppy
+    3, // Disk
+    6, // Flash
+    5, // RAM
+    7, // ROM
+    7, // write-protected == ROM ?
 };
 
 Enum<rfsv::errs> rfsv16::
 devinfo(const u_int32_t devnum, PlpDrive &drive)
 {
-	bufferStore a;
-	Enum<rfsv::errs> res;
-	// long fileHandle;
-
-	// Again, this is taken from an exchange between PsiWin and a 3c.
-	// For each drive, we PARSE with its drive letter to get a response
-	// (which we ignore), then do a STATUSDEVICE to get the info.
-
-	a.init();
-	a.addByte((char) (devnum + 'A')); // Name 1
-	a.addByte(':');
-	a.addByte(0x00);
-	a.addByte(0x00); // No name 2
-	a.addByte(0x00); // No name 3
-	if (!sendCommand(PARSE, a))
-		return E_PSI_FILE_DISC;
-	if ((res = getResponse(a)) != E_PSI_GEN_NONE) {
-		// cerr << "devinfo PARSE res is " << dec << (signed short int) res << endl;
-		return res;
-	}
-	
-	a.init();
-	a.addByte((char) (devnum + 'A')); // Name 1
-	a.addByte(':');
-	a.addByte('\\');
-	a.addByte(0x00);
-	if (!sendCommand(STATUSDEVICE, a))
-		return E_PSI_FILE_DISC;
-	if ((res = getResponse(a)) != E_PSI_GEN_NONE) {
-		// cerr << "devinfo STATUSDEVICE res is " << dec << (signed short int) res << endl;
-		return res;
-	}
+    bufferStore a;
+    Enum<rfsv::errs> res;
+    // long fileHandle;
+
+    // Again, this is taken from an exchange between PsiWin and a 3c.
+    // For each drive, we PARSE with its drive letter to get a response
+    // (which we ignore), then do a STATUSDEVICE to get the info.
+
+    a.init();
+    a.addByte((char) (devnum + 'A')); // Name 1
+    a.addByte(':');
+    a.addByte(0x00);
+    a.addByte(0x00); // No name 2
+    a.addByte(0x00); // No name 3
+    if (!sendCommand(PARSE, a))
+	return E_PSI_FILE_DISC;
+    if ((res = getResponse(a)) != E_PSI_GEN_NONE) {
+	// cerr << "devinfo PARSE res is " << dec << (signed short int) res << endl;
+	return res;
+    }
+
+    a.init();
+    a.addByte((char) (devnum + 'A')); // Name 1
+    a.addByte(':');
+    a.addByte('\\');
+    a.addByte(0x00);
+    if (!sendCommand(STATUSDEVICE, a))
+	return E_PSI_FILE_DISC;
+    if ((res = getResponse(a)) != E_PSI_GEN_NONE) {
+	// cerr << "devinfo STATUSDEVICE res is " << dec << (signed short int) res << endl;
+	return res;
+    }
 
-	int attr = a.getWord(2);
-	attr = sibo_dattr[a.getWord(2) & 0xff];
-	drive.setMediaType(attr);
+    int attr = a.getWord(2);
+    attr = sibo_dattr[a.getWord(2) & 0xff];
+    drive.setMediaType(attr);
 
-	attr = a.getWord(2);
-	int changeable = a.getWord(4) ? 32 : 0;
-	int internal = (attr & 0x2000) ? 16 : 0;
+    attr = a.getWord(2);
+    int changeable = a.getWord(4) ? 32 : 0;
+    int internal = (attr & 0x2000) ? 16 : 0;
 
-	drive.setDriveAttribute(changeable | internal);
+    drive.setDriveAttribute(changeable | internal);
 
-	int variable = (attr & 0x4000) ? 1 : 0;
-	int dualdens = (attr & 0x1000) ? 2 : 0;
-	int formattable = (attr & 0x0800) ? 4 : 0;
-	int protect = ((attr & 0xff) == 6) ? 8 : 0;
+    int variable = (attr & 0x4000) ? 1 : 0;
+    int dualdens = (attr & 0x1000) ? 2 : 0;
+    int formattable = (attr & 0x0800) ? 4 : 0;
+    int protect = ((attr & 0xff) == 6) ? 8 : 0;
 
-	drive.setMediaAttribute(variable|dualdens|formattable|protect);
+    drive.setMediaAttribute(variable|dualdens|formattable|protect);
 
-	drive.setUID(0);
-	drive.setSize(a.getDWord(6), 0);
-	drive.setSpace(a.getDWord(10), 0);
+    drive.setUID(0);
+    drive.setSize(a.getDWord(6), 0);
+    drive.setSpace(a.getDWord(10), 0);
 
-	drive.setName('A' + devnum, a.getString(14));
+    drive.setName('A' + devnum, a.getString(14));
 
 
-	return res;
+    return res;
 }
 
 bool rfsv16::
 sendCommand(enum commands cc, bufferStore & data)
 {
-	if (status == E_PSI_FILE_DISC) {
-		reconnect();
-		if (status == E_PSI_FILE_DISC)
-			return false;
-	}
-	
-	bool result;
-	bufferStore a;
-	a.addWord(cc);
-	a.addWord(data.getLen());
-	a.addBuff(data);
+    if (status == E_PSI_FILE_DISC) {
+	reconnect();
+	if (status == E_PSI_FILE_DISC)
+	    return false;
+    }
+
+    bool result;
+    bufferStore a;
+    a.addWord(cc);
+    a.addWord(data.getLen());
+    a.addBuff(data);
+    result = skt->sendBufferStore(a);
+    if (!result) {
+	reconnect();
 	result = skt->sendBufferStore(a);
-	if (!result) {
-		reconnect();
-		result = skt->sendBufferStore(a);
 	if (!result)
-		status = E_PSI_FILE_DISC;
-	}
-	return result;
+	    status = E_PSI_FILE_DISC;
+    }
+    return result;
 }
 
 
 Enum<rfsv::errs> rfsv16::
 getResponse(bufferStore & data)
 {
-	// getWord(2) is the size field
-	// which is the body of the response not counting the command (002a) and
-	// the size word.
-	if (skt->getBufferStore(data) != 1) {
-		cerr << "rfsv16::getResponse: duff response. "
-			"getBufferStore failed." << endl;
-	} else if (data.getWord(0) == 0x2a &&
-	    data.getWord(2) == data.getLen()-4) {
-		Enum<errs> ret = (enum errs)data.getWord(4);
-		data.discardFirstBytes(6);
-		return ret;
-	} else {
+    // getWord(2) is the size field
+    // which is the body of the response not counting the command (002a) and
+    // the size word.
+    if (skt->getBufferStore(data) != 1) {
+	cerr << "rfsv16::getResponse: duff response. "
+	    "getBufferStore failed." << endl;
+    } else if (data.getWord(0) == 0x2a &&
+	       data.getWord(2) == data.getLen()-4) {
+	Enum<errs> ret = (enum errs)data.getWord(4);
+	data.discardFirstBytes(6);
+	return ret;
+    } else {
 	cerr << "rfsv16::getResponse: duff response. Size field:" <<
-			data.getWord(2) << " Frame size:" <<
-			data.getLen()-4 << " Result field:" <<
-			data.getWord(4) << endl;
-	}
-	status = E_PSI_FILE_DISC;
-	return status;
+	    data.getWord(2) << " Frame size:" <<
+	    data.getLen()-4 << " Result field:" <<
+	    data.getWord(4) << endl;
+    }
+    status = E_PSI_FILE_DISC;
+    return status;
 }
 
 Enum<rfsv::errs> rfsv16::
 fread(const u_int32_t handle, unsigned char * const buf, const u_int32_t len, u_int32_t &count)
 {
-	Enum<rfsv::errs> res;
-	unsigned char *p = buf;
-
-	count = 0;
-	while (count < len) {
-		bufferStore a;
-
-		// Read in blocks of 291 bytes; the maximum payload for
-		// an RFSV frame. ( As seen in traces ) - this isn't optimal:
-		// RFSV can handle fragmentation of frames, where only the
-		// first FREAD RESPONSE frame has a RESPONSE (00 2A), SIZE
-		// and RESULT field. Every subsequent frame
-		// just has data, 297 bytes (or less) of it.
-		//
-		a.addWord(handle);
-		a.addWord((len - count) > RFSV16_MAXDATALEN
-			  ? RFSV16_MAXDATALEN
-			  : (len - count));
-		if (!sendCommand(FREAD, a))
-			return E_PSI_FILE_DISC;
-		if ((res = getResponse(a)) != E_PSI_GEN_NONE) {
-			if (res == E_PSI_FILE_EOF)
-				return E_PSI_GEN_NONE;
-			return res;
-		}
-		long l = a.getLen();
-		memcpy(buf, a.getString(), l);
-		count += l;
-		p += l;
+    Enum<rfsv::errs> res;
+    unsigned char *p = buf;
+
+    count = 0;
+    while (count < len) {
+	bufferStore a;
+
+	// Read in blocks of 291 bytes; the maximum payload for
+	// an RFSV frame. ( As seen in traces ) - this isn't optimal:
+	// RFSV can handle fragmentation of frames, where only the
+	// first FREAD RESPONSE frame has a RESPONSE (00 2A), SIZE
+	// and RESULT field. Every subsequent frame
+	// just has data, 297 bytes (or less) of it.
+	//
+	a.addWord(handle);
+	a.addWord((len - count) > RFSV16_MAXDATALEN
+		  ? RFSV16_MAXDATALEN
+		  : (len - count));
+	if (!sendCommand(FREAD, a))
+	    return E_PSI_FILE_DISC;
+	if ((res = getResponse(a)) != E_PSI_GEN_NONE) {
+	    if (res == E_PSI_FILE_EOF)
+		return E_PSI_GEN_NONE;
+	    return res;
 	}
-	return res;
+	long l = a.getLen();
+	memcpy(buf, a.getString(), l);
+	count += l;
+	p += l;
+    }
+    return res;
 }
 
 Enum<rfsv::errs> rfsv16::
 fwrite(const u_int32_t handle, const unsigned char * const buf, const u_int32_t len, u_int32_t &count)
 {
-	Enum<rfsv::errs> res;
-	const unsigned char *p = buf;
-
-	count = 0;
-	while (count < len) {
-		bufferStore a;
-		int nbytes;
-
-		// Write in blocks of 291 bytes; the maximum payload for
-		// an RFSV frame. ( As seen in traces ) - this isn't optimal:
-		// RFSV can handle fragmentation of frames, where only the
-		// first FREAD RESPONSE frame has a RESPONSE (00 2A), SIZE
-		// and RESULT field. Every subsequent frame
-		// just has data, 297 bytes (or less) of it.
-		nbytes = (len - count) > RFSV16_MAXDATALEN
-		    ? RFSV16_MAXDATALEN
-		    : (len - count);
-		a.addWord(handle);
-		a.addBytes(p, nbytes);
-		if (!sendCommand(FWRITE, a))
-			return E_PSI_FILE_DISC;
-		if ((res = getResponse(a)) != E_PSI_GEN_NONE)
-			return res;
-		
-		count += nbytes;
-		p += nbytes;
-	}
-	return res;
+    Enum<rfsv::errs> res;
+    const unsigned char *p = buf;
+
+    count = 0;
+    while (count < len) {
+	bufferStore a;
+	int nbytes;
+
+	// Write in blocks of 291 bytes; the maximum payload for
+	// an RFSV frame. ( As seen in traces ) - this isn't optimal:
+	// RFSV can handle fragmentation of frames, where only the
+	// first FREAD RESPONSE frame has a RESPONSE (00 2A), SIZE
+	// and RESULT field. Every subsequent frame
+	// just has data, 297 bytes (or less) of it.
+	nbytes = (len - count) > RFSV16_MAXDATALEN
+	    ? RFSV16_MAXDATALEN
+	    : (len - count);
+	a.addWord(handle);
+	a.addBytes(p, nbytes);
+	if (!sendCommand(FWRITE, a))
+	    return E_PSI_FILE_DISC;
+	if ((res = getResponse(a)) != E_PSI_GEN_NONE)
+	    return res;
+
+	count += nbytes;
+	p += nbytes;
+    }
+    return res;
 }
 
 Enum<rfsv::errs> rfsv16::
 copyFromPsion(const char *from, const char *to, void *ptr, cpCallback_t cb)
 {
-	Enum<rfsv::errs> res;
-	u_int32_t handle;
-	u_int32_t len;
-	u_int32_t total = 0;
+    Enum<rfsv::errs> res;
+    u_int32_t handle;
+    u_int32_t len;
+    u_int32_t total = 0;
 
-	if ((res = fopen(P_FSHARE | P_FSTREAM, from, handle)) != E_PSI_GEN_NONE)
-		return res;
-	ofstream op(to);
-	if (!op) {
-		fclose(handle);
-		return E_PSI_GEN_FAIL;
+    if ((res = fopen(P_FSHARE | P_FSTREAM, from, handle)) != E_PSI_GEN_NONE)
+	return res;
+    ofstream op(to);
+    if (!op) {
+	fclose(handle);
+	return E_PSI_GEN_FAIL;
+    }
+    do {
+	unsigned char buf[RFSV_SENDLEN];
+	if ((res = fread(handle, buf, sizeof(buf), len)) == E_PSI_GEN_NONE) {
+	    if (len > 0)
+		op.write(buf, len);
+	    total += len;
+	    if (cb && !cb(ptr, total))
+		res = E_PSI_FILE_CANCEL;
 	}
-	do {
-		unsigned char buf[RFSV_SENDLEN];
-		if ((res = fread(handle, buf, sizeof(buf), len)) == E_PSI_GEN_NONE) {
-			if (len > 0)
-				op.write(buf, len);
-			total += len;
-			if (cb && !cb(ptr, total))
-				res = E_PSI_FILE_CANCEL;
-		}
-	} while (len > 0 && (res == E_PSI_GEN_NONE));
+    } while (len > 0 && (res == E_PSI_GEN_NONE));
 
-	fclose(handle);
-	op.close();
-	if (res == E_PSI_FILE_EOF)
-		res = E_PSI_GEN_NONE;
-	return res;
+    fclose(handle);
+    op.close();
+    if (res == E_PSI_FILE_EOF)
+	res = E_PSI_GEN_NONE;
+    return res;
 }
 
 Enum<rfsv::errs> rfsv16::
 copyToPsion(const char *from, const char *to, void *ptr, cpCallback_t cb)
 {
-	u_int32_t handle;
-	u_int32_t len = 0;
-	u_int32_t total = 0;
-	Enum<rfsv::errs> res;
-
-	ifstream ip(from);
-	if (!ip)
-		return E_PSI_FILE_NXIST;
-	res = fcreatefile(P_FSTREAM | P_FUPDATE, to, handle);
-	if (res != E_PSI_GEN_NONE) {
-		res = freplacefile(P_FSTREAM | P_FUPDATE, to, handle);
-		if (res != E_PSI_GEN_NONE)
-			return res;
-	}
-	unsigned char *buff = new unsigned char[RFSV_SENDLEN];
-	while (res == E_PSI_GEN_NONE && ip && !ip.eof()) {
-		ip.read(buff, RFSV_SENDLEN);
-		if ((res = fwrite(handle, buff, ip.gcount(), len)) == E_PSI_GEN_NONE) {
-			total += len;
-			if (cb && !cb(ptr, total))
-				res = E_PSI_FILE_CANCEL;
-		}
+    u_int32_t handle;
+    u_int32_t len = 0;
+    u_int32_t total = 0;
+    Enum<rfsv::errs> res;
+
+    ifstream ip(from);
+    if (!ip)
+	return E_PSI_FILE_NXIST;
+    res = fcreatefile(P_FSTREAM | P_FUPDATE, to, handle);
+    if (res != E_PSI_GEN_NONE) {
+	res = freplacefile(P_FSTREAM | P_FUPDATE, to, handle);
+	if (res != E_PSI_GEN_NONE)
+	    return res;
+    }
+    unsigned char *buff = new unsigned char[RFSV_SENDLEN];
+    while (res == E_PSI_GEN_NONE && ip && !ip.eof()) {
+	ip.read(buff, RFSV_SENDLEN);
+	if ((res = fwrite(handle, buff, ip.gcount(), len)) == E_PSI_GEN_NONE) {
+	    total += len;
+	    if (cb && !cb(ptr, total))
+		res = E_PSI_FILE_CANCEL;
 	}
-	delete[]buff;
-	fclose(handle);
-	ip.close();
-	return res;
+    }
+    delete[]buff;
+    fclose(handle);
+    ip.close();
+    return res;
 }
 
 Enum<rfsv::errs> rfsv16::
 copyOnPsion(const char *from, const char *to, void *ptr, cpCallback_t cb)
 {
-	u_int32_t handle_from;
-	u_int32_t handle_to;
-	u_int32_t len;
-	u_int32_t wlen;
-	u_int32_t total = 0;
-	Enum<rfsv::errs> res;
-
-	if ((res = fopen(P_FSHARE | P_FSTREAM, from, handle_from)) != E_PSI_GEN_NONE)
-		return res;
-	res = fcreatefile(P_FSTREAM | P_FUPDATE, to, handle_to);
-	if (res != E_PSI_GEN_NONE) {
-		res = freplacefile(P_FSTREAM | P_FUPDATE, to, handle_to);
-		if (res != E_PSI_GEN_NONE)
-			return res;
-	}
-	do {
-		unsigned char buf[RFSV_SENDLEN];
-		if ((res = fread(handle_from, buf, sizeof(buf), len)) == E_PSI_GEN_NONE) {
-			if (len > 0) {
-				if ((res = fwrite(handle_to, buf, len, wlen)) == E_PSI_GEN_NONE) {
-					total += wlen;
-					if (cb && !cb(ptr, total))
-						res = E_PSI_FILE_CANCEL;
-				}
-			}
-		}
-	} while (len > 0 && wlen > 0 && (res == E_PSI_GEN_NONE));
-	fclose(handle_from);
-	fclose(handle_to);
-	if (res == E_PSI_FILE_EOF)
-		res = E_PSI_GEN_NONE;
+    u_int32_t handle_from;
+    u_int32_t handle_to;
+    u_int32_t len;
+    u_int32_t wlen;
+    u_int32_t total = 0;
+    Enum<rfsv::errs> res;
+
+    if ((res = fopen(P_FSHARE | P_FSTREAM, from, handle_from)) != E_PSI_GEN_NONE)
 	return res;
+    res = fcreatefile(P_FSTREAM | P_FUPDATE, to, handle_to);
+    if (res != E_PSI_GEN_NONE) {
+	res = freplacefile(P_FSTREAM | P_FUPDATE, to, handle_to);
+	if (res != E_PSI_GEN_NONE)
+	    return res;
+    }
+    do {
+	unsigned char buf[RFSV_SENDLEN];
+	if ((res = fread(handle_from, buf, sizeof(buf), len)) == E_PSI_GEN_NONE) {
+	    if (len > 0) {
+		if ((res = fwrite(handle_to, buf, len, wlen)) == E_PSI_GEN_NONE) {
+		    total += wlen;
+		    if (cb && !cb(ptr, total))
+			res = E_PSI_FILE_CANCEL;
+		}
+	    }
+	}
+    } while (len > 0 && wlen > 0 && (res == E_PSI_GEN_NONE));
+    fclose(handle_from);
+    fclose(handle_to);
+    if (res == E_PSI_FILE_EOF)
+	res = E_PSI_GEN_NONE;
+    return res;
 }
 
 Enum<rfsv::errs> rfsv16::
 fsetsize(u_int32_t handle, u_int32_t size)
 {
-	bufferStore a;
-	a.addWord(handle & 0xffff);
-	a.addDWord(size);
-	if (!sendCommand(FSETEOF, a))
-		return E_PSI_FILE_DISC;
-	return getResponse(a);
+    bufferStore a;
+    a.addWord(handle & 0xffff);
+    a.addDWord(size);
+    if (!sendCommand(FSETEOF, a))
+	return E_PSI_FILE_DISC;
+    return getResponse(a);
 }
 
 /*
@@ -725,14 +724,14 @@ fsetsize(u_int32_t handle, u_int32_t size)
 Enum<rfsv::errs> rfsv16::
 fseek(const u_int32_t handle, const int32_t pos, const u_int32_t mode, u_int32_t &resultpos)
 {
-	bufferStore a;
-	Enum<rfsv::errs> res;
-	u_int32_t savpos = 0;
-	u_int32_t realpos;
-	u_int32_t calcpos = 0;
+    bufferStore a;
+    Enum<rfsv::errs> res;
+    u_int32_t savpos = 0;
+    u_int32_t realpos;
+    u_int32_t calcpos = 0;
 
 /*
-   seek-parameter for psion:
+  seek-parameter for psion:
    dword position
    dword handle
    dword mode
@@ -742,150 +741,150 @@ fseek(const u_int32_t handle, const int32_t pos, const u_int32_t mode, u_int32_t
    ??no more?? 4 = sense recpos
    ??no more?? 5 = set recpos
    ??no more?? 6 = text-rewind
- */
+*/
 
-	if ((mode < PSI_SEEK_SET) || (mode > PSI_SEEK_END))
-		return E_PSI_GEN_ARG;
-
-	if ((mode == PSI_SEEK_CUR) && (pos >= 0)) {
-		/* get and save current position */
-		a.init();
-		a.addWord(handle);
-		a.addDWord(0);
-		a.addWord(PSI_SEEK_CUR);
-		if (!sendCommand(FSEEK, a))
-			return E_PSI_FILE_DISC;
-		if ((res = getResponse(a)) != E_PSI_GEN_NONE)
-			return res;
-		savpos = a.getDWord(0);
-		if (pos == 0) {
-			resultpos = savpos;
-			return res;
-		}
+    if ((mode < PSI_SEEK_SET) || (mode > PSI_SEEK_END))
+	return E_PSI_GEN_ARG;
+
+    if ((mode == PSI_SEEK_CUR) && (pos >= 0)) {
+	/* get and save current position */
+	a.init();
+	a.addWord(handle);
+	a.addDWord(0);
+	a.addWord(PSI_SEEK_CUR);
+	if (!sendCommand(FSEEK, a))
+	    return E_PSI_FILE_DISC;
+	if ((res = getResponse(a)) != E_PSI_GEN_NONE)
+	    return res;
+	savpos = a.getDWord(0);
+	if (pos == 0) {
+	    resultpos = savpos;
+	    return res;
 	}
-	if ((mode == PSI_SEEK_END) && (pos >= 0)) {
-		/* get and save end position */
-		a.init();
-		a.addWord(handle);
-		a.addDWord(0);
-		a.addWord(PSI_SEEK_END);
-		if (!sendCommand(FSEEK, a))
-			return E_PSI_FILE_DISC;
-		if ((res = getResponse(a)) != E_PSI_GEN_NONE)
-			return res;
-		savpos = a.getDWord(0);
-		if (pos == 0) {
-			resultpos = savpos;
-			return res;
-		}
+    }
+    if ((mode == PSI_SEEK_END) && (pos >= 0)) {
+	/* get and save end position */
+	a.init();
+	a.addWord(handle);
+	a.addDWord(0);
+	a.addWord(PSI_SEEK_END);
+	if (!sendCommand(FSEEK, a))
+	    return E_PSI_FILE_DISC;
+	if ((res = getResponse(a)) != E_PSI_GEN_NONE)
+	    return res;
+	savpos = a.getDWord(0);
+	if (pos == 0) {
+	    resultpos = savpos;
+	    return res;
 	}
-	/* Now the real seek */
+    }
+    /* Now the real seek */
+    a.addWord(handle);
+    a.addDWord(pos);
+    a.addWord(mode);
+    if (!sendCommand(FSEEK, a))
+	return E_PSI_FILE_DISC;
+    if ((res = getResponse(a)) != 0)
+	return res;
+    realpos = a.getDWord(0);
+    switch (mode) {
+	case PSI_SEEK_SET:
+	    calcpos = pos;
+	    break;
+	case PSI_SEEK_CUR:
+	    calcpos = savpos + pos;
+	    break;
+	case PSI_SEEK_END:
+	    resultpos = realpos;
+	    return res;
+	    break;
+    }
+    if (calcpos > realpos) {
+	/* Beyond end of file */
+	res = fsetsize(handle, calcpos);
+	if (res != E_PSI_GEN_NONE)
+	    return res;
+	a.init();
 	a.addWord(handle);
-	a.addDWord(pos);
-	a.addWord(mode);
+	a.addDWord(calcpos);
+	a.addWord(PSI_SEEK_SET);
 	if (!sendCommand(FSEEK, a))
-		return E_PSI_FILE_DISC;
+	    return E_PSI_FILE_DISC;
 	if ((res = getResponse(a)) != 0)
-		return res;
+	    return res;
 	realpos = a.getDWord(0);
-	switch (mode) {
-		case PSI_SEEK_SET:
-			calcpos = pos;
-			break;
-		case PSI_SEEK_CUR:
-			calcpos = savpos + pos;
-			break;
-		case PSI_SEEK_END:
-			resultpos = realpos;
-			return res;
-			break;
-	}
-	if (calcpos > realpos) {
-		/* Beyond end of file */
-		res = fsetsize(handle, calcpos);
-		if (res != E_PSI_GEN_NONE)
-			return res;
-		a.init();
-		a.addWord(handle);
-		a.addDWord(calcpos);
-		a.addWord(PSI_SEEK_SET);
-		if (!sendCommand(FSEEK, a))
-			return E_PSI_FILE_DISC;
-		if ((res = getResponse(a)) != 0)
-			return res;
-		realpos = a.getDWord(0);
-	}
-	resultpos = realpos;
-	return res;
+    }
+    resultpos = realpos;
+    return res;
 }
 
 Enum<rfsv::errs> rfsv16::
 mkdir(const char* dirName)
 {
-	string realName = convertSlash(dirName);
-	bufferStore a;
-	a.addStringT(realName.c_str());
-	sendCommand(MKDIR, a);
-	Enum<rfsv::errs> res = getResponse(a);
-	if (res == E_PSI_GEN_NONE) {
-		// Correct response
-		return res;
-	}
-	cerr << "Unknown response from mkdir "<< res <<endl;
-	return E_PSI_GEN_FAIL;
+    string realName = convertSlash(dirName);
+    bufferStore a;
+    a.addStringT(realName.c_str());
+    sendCommand(MKDIR, a);
+    Enum<rfsv::errs> res = getResponse(a);
+    if (res == E_PSI_GEN_NONE) {
+	// Correct response
+	return res;
+    }
+    cerr << "Unknown response from mkdir "<< res <<endl;
+    return E_PSI_GEN_FAIL;
 }
 
 Enum<rfsv::errs> rfsv16::
 rmdir(const char *dirName)
 {
-	// There doesn't seem to be an RMDIR command, but DELETE works. We
-	// should probably check to see if the file is a directory first!
-	return remove(dirName);
+    // There doesn't seem to be an RMDIR command, but DELETE works. We
+    // should probably check to see if the file is a directory first!
+    return remove(dirName);
 }
 
 Enum<rfsv::errs> rfsv16::
 rename(const char *oldName, const char *newName)
 {
-cerr << "rfsv16::rename ***" << endl;
-
-	string realOldName = convertSlash(oldName);
-	string realNewName = convertSlash(newName);
-	bufferStore a;
-	a.addStringT(realOldName.c_str());
-	a.addStringT(realNewName.c_str());
-	sendCommand(RENAME, a);
-	Enum<rfsv::errs> res = getResponse(a);
-	if (res == E_PSI_GEN_NONE) {
-		// Correct response
-		return res;
-	}
-	cerr << "Unknown response from rename "<< res <<endl;
-	return E_PSI_GEN_FAIL;
+    cerr << "rfsv16::rename ***" << endl;
+
+    string realOldName = convertSlash(oldName);
+    string realNewName = convertSlash(newName);
+    bufferStore a;
+    a.addStringT(realOldName.c_str());
+    a.addStringT(realNewName.c_str());
+    sendCommand(RENAME, a);
+    Enum<rfsv::errs> res = getResponse(a);
+    if (res == E_PSI_GEN_NONE) {
+	// Correct response
+	return res;
+    }
+    cerr << "Unknown response from rename "<< res <<endl;
+    return E_PSI_GEN_FAIL;
 }
 
 Enum<rfsv::errs> rfsv16::
 remove(const char* psionName)
 {
-	Enum<rfsv::errs> res;
-	string realName = convertSlash(psionName);
-	bufferStore a;
-	a.addStringT(realName.c_str());
-				// and this needs sending in the length word.
-	sendCommand(DELETE, a);
-	res = getResponse(a);
-	if (res == E_PSI_GEN_NONE) {
-		// Correct response
-		return res;
-	}
-	cerr << "Unknown response from delete "<< res <<endl;
-	return E_PSI_GEN_FAIL;
+    Enum<rfsv::errs> res;
+    string realName = convertSlash(psionName);
+    bufferStore a;
+    a.addStringT(realName.c_str());
+    // and this needs sending in the length word.
+    sendCommand(DELETE, a);
+    res = getResponse(a);
+    if (res == E_PSI_GEN_NONE) {
+	// Correct response
+	return res;
+    }
+    cerr << "Unknown response from delete "<< res <<endl;
+    return E_PSI_GEN_FAIL;
 }
 
 Enum<rfsv::errs> rfsv16::
 setVolumeName(const char drive , const char * const name)
 {
-// Not yet ... 
-	return E_PSI_GEN_FAIL;
+// Not yet ...
+    return E_PSI_GEN_FAIL;
 }
 
 /*
@@ -894,36 +893,36 @@ setVolumeName(const char drive , const char * const name)
 u_int32_t rfsv16::
 attr2std(u_int32_t attr)
 {
-	u_int32_t res = 0;
-
-	// Common attributes
-	if (!(attr & P_FAWRITE))
-		res |= PSI_A_RDONLY;
-	if (attr & P_FAHIDDEN)
-		res |= PSI_A_HIDDEN;
-	if (attr & P_FASYSTEM)
-		res |= PSI_A_SYSTEM;
-	if (attr & P_FADIR)
-		res |= PSI_A_DIR;
-	if (attr & P_FAMOD)
-		res |= PSI_A_ARCHIVE;
-	if (attr & P_FAVOLUME)
-		res |= PSI_A_VOLUME;
-
-	// SIBO-specific
-	if (attr & P_FAREAD)
-		res |= PSI_A_READ;
-	if (attr & P_FAEXEC)
-		res |= PSI_A_EXEC;
-	if (attr & P_FASTREAM)
-		res |= PSI_A_STREAM;
-	if (attr & P_FATEXT)
-		res |= PSI_A_TEXT;
-
-	// Do what we can for EPOC
-	res |= PSI_A_NORMAL;
-
-	return res;
+    u_int32_t res = 0;
+
+    // Common attributes
+    if (!(attr & P_FAWRITE))
+	res |= PSI_A_RDONLY;
+    if (attr & P_FAHIDDEN)
+	res |= PSI_A_HIDDEN;
+    if (attr & P_FASYSTEM)
+	res |= PSI_A_SYSTEM;
+    if (attr & P_FADIR)
+	res |= PSI_A_DIR;
+    if (attr & P_FAMOD)
+	res |= PSI_A_ARCHIVE;
+    if (attr & P_FAVOLUME)
+	res |= PSI_A_VOLUME;
+
+    // SIBO-specific
+    if (attr & P_FAREAD)
+	res |= PSI_A_READ;
+    if (attr & P_FAEXEC)
+	res |= PSI_A_EXEC;
+    if (attr & P_FASTREAM)
+	res |= PSI_A_STREAM;
+    if (attr & P_FATEXT)
+	res |= PSI_A_TEXT;
+
+    // Do what we can for EPOC
+    res |= PSI_A_NORMAL;
+
+    return res;
 }
 
 /*
@@ -932,31 +931,37 @@ attr2std(u_int32_t attr)
 u_int32_t rfsv16::
 std2attr(const u_int32_t attr)
 {
-	u_int32_t res = 0;
-
-	// Common attributes
-	if (!(attr & PSI_A_RDONLY))
-		res |= P_FAWRITE;
-	if (attr & PSI_A_HIDDEN)
-		res |= P_FAHIDDEN;
-	if (attr & PSI_A_SYSTEM)
-		res |= P_FASYSTEM;
-	if (attr & PSI_A_DIR)
-		res |= P_FADIR;
-	if (attr & PSI_A_ARCHIVE)
-		res |= P_FAMOD;
-	if (attr & PSI_A_VOLUME)
-		res |= P_FAVOLUME;
-
-	// SIBO-specific
-	if (attr & PSI_A_READ)
-		res |= P_FAREAD;
-	if (attr & PSI_A_EXEC)
-		res |= P_FAEXEC;
-	if (attr & PSI_A_STREAM)
-		res |= P_FASTREAM;
-	if (attr & PSI_A_TEXT)
-		res |= P_FATEXT;
-
-	return res;
+    u_int32_t res = 0;
+
+    // Common attributes
+    if (!(attr & PSI_A_RDONLY))
+	res |= P_FAWRITE;
+    if (attr & PSI_A_HIDDEN)
+	res |= P_FAHIDDEN;
+    if (attr & PSI_A_SYSTEM)
+	res |= P_FASYSTEM;
+    if (attr & PSI_A_DIR)
+	res |= P_FADIR;
+    if (attr & PSI_A_ARCHIVE)
+	res |= P_FAMOD;
+    if (attr & PSI_A_VOLUME)
+	res |= P_FAVOLUME;
+
+    // SIBO-specific
+    if (attr & PSI_A_READ)
+	res |= P_FAREAD;
+    if (attr & PSI_A_EXEC)
+	res |= P_FAEXEC;
+    if (attr & PSI_A_STREAM)
+	res |= P_FASTREAM;
+    if (attr & PSI_A_TEXT)
+	res |= P_FATEXT;
+
+    return res;
 }
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * End:
+ */