From 316e6579b44080c5f7815fe991ccebedd9b04570 Mon Sep 17 00:00:00 2001 From: Fritz Elfert Date: Thu, 11 Jul 2002 17:52:23 +0000 Subject: - Removed README.0.6-mjg and README.mjg; they are outdated --- CHANGES | 4 ++ Makefile.am | 2 +- README.0.6-mjg | 62 ------------------------- README.mjg | 120 ------------------------------------------------- TODO | 4 +- kde2/doc/en/.cvsignore | 1 + po/sv.po | 26 +++-------- 7 files changed, 15 insertions(+), 204 deletions(-) delete mode 100644 README.0.6-mjg delete mode 100644 README.mjg diff --git a/CHANGES b/CHANGES index 5192cb0..91c784a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +Changes since Version 0.9 + +See ChangeLog + Changes from Version 0.7 to 0.8 - Fixed lot of bugs, especially in nfs code diff --git a/Makefile.am b/Makefile.am index a65cea6..2e142d2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ endif SUBDIRS = intl po lib ncpd plpnfsd plpftp plpbackup plpprint sisinstall \ $(KDESUB) doc . -EXTRA_DIST = CHANGES COPYING README TODO INSTALL README.mjg ABOUT-NLS include/*.h* etc/*magic etc/*.in patches conf/m4/kde/*.m4 conf/m4/plptools/*.m4 conf/[a-l]* conf/missing conf/mkinstalldirs +EXTRA_DIST = CHANGES COPYING README TODO INSTALL ABOUT-NLS include/*.h* etc/*magic etc/*.in patches conf/m4/kde/*.m4 conf/m4/plptools/*.m4 conf/[a-l]* conf/missing conf/mkinstalldirs DISTCLEANFILES = etc/psion AUTOMAKE_OPTIONS = foreign diff --git a/README.0.6-mjg b/README.0.6-mjg deleted file mode 100644 index 7e5c737..0000000 --- a/README.0.6-mjg +++ /dev/null @@ -1,62 +0,0 @@ -Patches to plptools-0.6, collected by Matt Gumbley --------------------------------------------------- - -1) Compilation patches to enable builds on Solaris. ftp.cc and ppsocket.cc -2) Christof Meerwald's patches so that ncpd can autoterminate (-e option), and - patch for mgetty PLP autodetection (in the new patches directory), also a - patch to make the connection more stable. -3) Peter Cherriman's patch which fixes the "one hour out" bug, which "...is that - a file timestamp is sometimes different when you do a "ls -l" on a mounted - psion, than the timestamp listed by the properties box on the psion. - - My previous fix, no longer worked when the daylight saving changed. Linux - stores timestamps internally as the number of seconds since the EPOC in - UTC(GMT). However the psion seems stores timestamps as the number of seconds - since the EPOC. However the EPOC in defined relative to the currently set - timezone on the psion. - - My new fix takes into account the timezone and DST status provided by the - linux system, it now works in by GMT(UTC+0) and BST(UTC+0+DST), but I - haven't tested it very much in other timezones, but I think it works. - - It provides the correct timestamps apart from files created within a hour - of a DST change, however this can't be helped due to the strange way the - psion stores timestamps and handles timezone and DST." -4) Added --with-mountdir option to configure to allow the plpnfsd mount point - to be specified at build time. Default is /mnt/psion. -5) Added /dev/psion at the start of the serial ports probed for. -6) Peter Cherriman's patch that fixes compilation of ftp.cc on some platforms. -7) Jim Hague's patches for SIBO, and later Linux Kernels, from Feb 2000. - My apologies to Jim for not merging these sooner. He says: - - "I've been doing a little work on getting plptools working with my 3a. ... - I have plpftp working for file transfer and plpnsfd also working, at least - sufficiently to back up my 3a. - - I have also modified the include files required for the Linux build so - that it works with a 2.2 series kernels with the NFSv3 patch applied; - actually, all I've done is copy the relevant bits of the old NFSv2 headers. - - It all seems to work with my 3a, though compared to p3nfsd plpnsfd seems - very slow at listing directories - when time permits I shall take a - closer look. - - In addition to my English 3a (v3.22F) I have also tried it on an Italian 3a - (v3.40F). The latter exhibits some curious behaviour - if you start ncpd, - run up plpftp and quit plpftp, the 3a closes its serial port down (drops - CTS and DSR) and seems to need a reset before it will re-open the serial - port. Again, when time permits I shall see if it does this when using - PsiWin." - - Other parts of Jim's patch: - "Which reminds me - 0.6 doesn't seem to have working copyFromPsion and - copyToPsion. I've fixed it up and tidied up the retrieval of Owner - Infomation a little - 3as anyway send lots of \0\0\0\0\0, each of which - was being displayed in plpftp as a blank line. " - - Jim's patch removes lots of diagnostics in the rfsv16 code, and looks like - it fixes lots of stuff I hadn't got round to . - Splendid. - -Last patch update: 18/07/00. - diff --git a/README.mjg b/README.mjg deleted file mode 100644 index a557988..0000000 --- a/README.mjg +++ /dev/null @@ -1,120 +0,0 @@ -Retrofitting RFSV 16 to Fritz Elfert's plptools -=============================================== - -These notes updated 21/10/99 - - -I started modifying Fritz' plptools-0.3 with the intention of adding back the -RFSV16 support. Fritz then released 0.4, and so I re-patched 0.4, and did lots -more work, and merged in some patches from Pete Bentley. - -The result is this, plptools-0.4-mjg. - -When it's finished, hopefully Fritz will merge it into the next official -release. - -Release Dates: -plptools-0.4-mjg1 on 23/09/99 -plptools-0.4-mjg2 on 04/10/99 -plptools-0.4-mjg3 on 07/10/99 -plptools-0.4-mjg4 on 10/10/99 -plptools-0.4-mjg5 on 21/10/99 (+ patch against 0.4 original) - -The changes to plptools-0.4 are: -* Now detects which version of the NCP protocol is in use, and records this: - this is how we detect whether the Psion is a Series 3 or Series 5. -* Makefiles updated to include the rfsv16 stuff, the rfsv base class, and the - rfsvfactory object. -* Instantiates either an RFSV32 or RFSV16 object to handle the file server - requests, based on the protocol version returned by the INFO command above. - There is an rfsvfactory object to make this easier in client programs. - This is used in plpftp and plpnfsd. This will obtain the NCP version number - over the socket, by announcing itself as "NCP$INFO.*". The correct RFSV class - will further announce itself as SYS$RFSV.* - this is stored in connectName. - RFSV objects have an opAttr method to output a correct attributes flag for each - protocol. -* Added --with-drive and --with-basedir to the configure.in script, and - include/defs.h.in. These are used in RFSV16, and plpftp now uses these, - instead of the DEFAULT_DRIVE AND DEFAULT_BASE_DIRECTORY of ftp.h -* ncpd/packet.h: verbose is now a short int, to allow packet debugging. -* Pete Bentley's changes. Fixes bogus definition of usleep(); plpftp compiles in - the absence of libreadline and libhistory; accept 3rd parameter in ppsocket is - signed not unsigned; -v all debugging option; (sun) link detection changes; - new PKT_DEBUG_HANDSHAKE debug level added; correct termios.h include for - Solaris; Solaris non-blocking fixes; move the fcntl for O_NONBLOCK; remove - O_NONBLOCK where needed; set SO_REUSEADDR for ncpd. -* Peter Cherriman's "1 hour out" fix (doesn't work for me though... could be my - PC clock) - -Some things to do: -* Finish rfsv16.cc: - fread, fwrite, fseek, copyFromPsion, copyToPsion, fsetsize, mktemp, - fcreatefile, freplacefile, fopendir, fsetmtime - -* Test everything with plpftp and plpnfsd. -* Remove read, write fully? -* Remove unused convertName method in plpftp/ftp.cc,h - -Adding RFSV16 back is still a work in progress.... stay tuned! - - -Building plptools for use with a Psion 3 -======================================== -./configure --with-speed=19200 --with-serial=/dev/ttyS1 --with-drive=M: -# Or whatever port you use. I use ttyS1, since ttyS0 is my mouse. -# The default speed is 115200 bps, which is only for the Lucky S5 owners. -# The S3c can take speeds up to 57600, but my RS232 protocol analyser can't - -# your mileage may vary. -make -make install -plpftp -# NFS access not finished yet - - -Tip for use with a Psion 3 -========================== -Turn the Psion's remote link on first, THEN run ncpd. - -Why this seems to help matters ------------------------------- -This seems to ensure that the Psion will send a request for the LINK.* process, -which is what we must detect to allow other connections to the NCP daemon. It -seems there may be a strange bug when you start ncpd, THEN start the Psion link -- the link request/acknowledge messages are exchanged correctly, followed by -valid INFO/NCP Protocol Version messages - and then the Psion attempts to -connect to the PC's SYS$RFSV.* - IMHO, it should start by attempting to connect -to LINK.* - -Philip Proudman's plp_1.7 always receives the LINK.* connect request, as do -other protocol implementations. - -I haven't managed to work out why the Psion starts by sending a SYS$RFSV.* -connect request with plptools, and not with other implementations, but the above -work-around gets round it. - - -Troubleshooting -=============== -Q. I can't build it on SuSE Linux. -A. You need the gppshare and libgpp packages. (Thanks to der.hans) - - -Acknowledgements -================ -This couldn't have been written without pioneering investigations into the link -protocol by Olaf Flebbe, Michael Pieper, and others. Philip Proudman beat me to -producing a decent, working PLP stack (Thanks, Philip ;-) and Fritz Elfert did -some excellent merging of Rudolf Koenig's p3nfs. Also thanks to the Majordomo -maintainers @geekstuff.co.uk, who host the linux-psion list. - -Finally, the RFSV16 re-merge would still be in my In-tray if my wife Angela -hadn't been away for the week, leaving me to code, and fend for myself. - -Thanks to Pete Bentley for ideas on proxying, his patches, suggestions for -improvement, and a loan Series 5 for testing against. - - -Viola! --- -Matt Gumbley -matt@gumbley.demon.co.uk diff --git a/TODO b/TODO index 5aeffea..ea9e0db 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,7 @@ +plpprintd: + Fix pattern stuff Speed up plpnfsd. -rpc -man pages getty-style locking of the serial-line in a manner that it can be used with other devices/programs without stopping/starting ncpd all the time. diff --git a/kde2/doc/en/.cvsignore b/kde2/doc/en/.cvsignore index dae511d..960e4b1 100644 --- a/kde2/doc/en/.cvsignore +++ b/kde2/doc/en/.cvsignore @@ -2,3 +2,4 @@ Makefile.in Makefile HTML index.docbook +*.bz2 diff --git a/po/sv.po b/po/sv.po index 008afdd..9ca604c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -852,11 +852,12 @@ msgstr "" msgid "Got namelength %d\n" msgstr "" -#: lib/sisreqrecord.cpp:56 +#: lib/sisreqrecord.cpp:66 #, fuzzy, c-format msgid "Got namepos %d\n" msgstr "Hittade källnamn %.*s\n" +#: lib/sisreqrecord.cpp:69 #, c-format msgid "Position/length too large for req record %d.\n" msgstr "Position/längd för stor för kravpost %d.\n" @@ -1662,24 +1663,7 @@ msgstr "Backup kan bara skapa ett arkiv i taget." msgid "plpbackup: could not connect to ncpd" msgstr "plpbackup: fick ingen kontakt med ncpd" -#: sisinstall/sismain.cpp:43 -msgid "" -"Usage: sisinstall [OPTIONS]... SISFILE\n" -"\n" -"Supported options:\n" -"\n" -" -h, --help Display this text.\n" -" -V, --version Print version and exit.\n" -" -l, --loglevel=LEVEL Set the log level, by default 0.\n" -" -n, --dry-run Just parse file file.\n" -" -w, --newt Use the Newt interface.\n" -msgstr "" - -#: sisinstall/sismain.cpp:98 -msgid "sisinstall version 0.1\n" -msgstr "" - -#: sisinstall/sismain.cpp:117 sisinstall/sismain.cpp:125 +#: sisinstall/sismain.cpp:31 msgid "Got an error, Press any key to exit." msgstr "" @@ -1701,6 +1685,10 @@ msgid "" " -w, --newt Use the Newt interface.\n" msgstr "" +#: sisinstall/sismain.cpp:109 +msgid "sisinstall version 0.1\n" +msgstr "" + #: sisinstall/sismain.cpp:128 sisinstall/sismain.cpp:136 #, c-format msgid "Installing sis file %s%s.\n" -- cgit v1.2.3