r5827 jmb - in /trunk/iconv: doc/ChangeLog module/header.cmhg module/header.h riscpkg/RiscPkg/Control
by netsurf＠semichrome.net
Author: jmb
Date: Sat Nov 29 08:48:07 2008
New Revision: 5827
URL: http://source.netsurf-browser.org?rev=5827&view=rev
Log:
Bump version number.
Update changelog with changes since 0.09
Modified:
trunk/iconv/doc/ChangeLog
trunk/iconv/module/header.cmhg
trunk/iconv/module/header.h
trunk/iconv/riscpkg/RiscPkg/Control
Modified: trunk/iconv/doc/ChangeLog
URL: http://source.netsurf-browser.org/trunk/iconv/doc/ChangeLog?rev=5827&r1=5...
==============================================================================
--- trunk/iconv/doc/ChangeLog (original)
+++ trunk/iconv/doc/ChangeLog Sat Nov 29 08:48:07 2008
@@ -89,3 +89,12 @@
- Add support for ISO-8859-16 (Latin 10)
- Significantly improve detection and reporting of error conditions
+0.10 29-Nov-2008
+----------------
+
+ - Fixes to the *Iconv command parameter parsing
+ - Ensure *Iconv outputs all converted data when the input is invalid
+ - Fix handling of illegal UTF-8 byte sequences
+ - Fix handling of incomplete multibyte input sequences.
+
+
Modified: trunk/iconv/module/header.cmhg
URL: http://source.netsurf-browser.org/trunk/iconv/module/header.cmhg?rev=5827...
==============================================================================
--- trunk/iconv/module/header.cmhg (original)
+++ trunk/iconv/module/header.cmhg Sat Nov 29 08:48:07 2008
@@ -1,4 +1,4 @@
-help-string: Iconv 0.09
+help-string: Iconv 0.10
title-string: Iconv
Modified: trunk/iconv/module/header.h
URL: http://source.netsurf-browser.org/trunk/iconv/module/header.h?rev=5827&r1...
==============================================================================
--- trunk/iconv/module/header.h (original)
+++ trunk/iconv/module/header.h Sat Nov 29 08:48:07 2008
@@ -11,10 +11,10 @@
#define Module_Title "Iconv"
#define Module_Help "Iconv"
-#define Module_VersionString "0.09"
-#define Module_VersionNumber 9
+#define Module_VersionString "0.10"
+#define Module_VersionNumber 10
#ifndef Module_Date
-#define Module_Date "20 Nov 2008"
+#define Module_Date "29 Nov 2008"
#endif
#ifdef __cplusplus
Modified: trunk/iconv/riscpkg/RiscPkg/Control
URL: http://source.netsurf-browser.org/trunk/iconv/riscpkg/RiscPkg/Control?rev...
==============================================================================
--- trunk/iconv/riscpkg/RiscPkg/Control (original)
+++ trunk/iconv/riscpkg/RiscPkg/Control Sat Nov 29 08:48:07 2008
@@ -2,7 +2,7 @@
Priority: Optional
Section: Module
Maintainer: John-Mark Bell <jmb(a)netsurf-browser.org>
-Version: 0.0.9
+Version: 0.1.0
Licence: Free
Standards-Version: 0.1.0
Description: Character set conversion resource
14 years, 2 months
r5826 jmb - in /trunk/iconv/src: iconv.c internal.h
by netsurf＠semichrome.net
Author: jmb
Date: Sat Nov 29 08:46:56 2008
New Revision: 5826
URL: http://source.netsurf-browser.org?rev=5826&view=rev
Log:
Fix resumption of decode after EINVAL.
iconv() expects to replay the whole sequence whereas UnicodeLib expects to resume where it left off.
Modified:
trunk/iconv/src/iconv.c
trunk/iconv/src/internal.h
Modified: trunk/iconv/src/iconv.c
URL: http://source.netsurf-browser.org/trunk/iconv/src/iconv.c?rev=5826&r1=582...
==============================================================================
--- trunk/iconv/src/iconv.c (original)
+++ trunk/iconv/src/iconv.c Sat Nov 29 08:46:56 2008
@@ -268,10 +268,16 @@
}
if (inbuf == NULL || *inbuf == NULL) {
+ /* Clear skip */
+ e->skip = 0;
+
+ /* Reset read codec */
if (e->in) {
encoding_reset(e->in);
encoding_set_flags(e->in, e->inflags, e->inflags);
}
+
+ /* Reset write codec, flushing shift sequences, if asked */
if (e->out) {
if (outbuf != NULL) {
char *prev_outbuf = *outbuf;
@@ -317,6 +323,21 @@
LOG(("reading"));
+ /* If, on the previous attempt to convert data, we reached the end
+ * of the input buffer mid-sequence, then we retain the number of
+ * bytes into the sequence we have read so far. We need to skip over
+ * these bytes in the input now because UnicodeLib expects the next
+ * byte to be the next in the sequence rather than the iconv()
+ * semantics of replaying the entire incomplete sequence from the
+ * start.
+ */
+ if (e->skip != 0) {
+ *inbuf += e->skip;
+ *inbytesleft -= e->skip;
+
+ e->skip = 0;
+ }
+
/* Perform the conversion.
*
* To ensure that we detect the correct error conditions
@@ -357,6 +378,8 @@
* assume everything's reversible. */
return 0;
case WRITE_NONE: /* 3 */
+ /* Mark where we need to start in the next call */
+ e->skip = read;
errno = EINVAL;
break;
case WRITE_NOMEM: /* 4 */
@@ -414,6 +437,9 @@
int ret;
e = (struct encoding_context*)handle;
+
+ if (c == 0xFFFE)
+ c = 0xFFFD;
/* Stop on invalid characters if we're not transliterating */
/** \todo is this sane? -- we can't distinguish between illegal input
Modified: trunk/iconv/src/internal.h
URL: http://source.netsurf-browser.org/trunk/iconv/src/internal.h?rev=5826&r1=...
==============================================================================
--- trunk/iconv/src/internal.h (original)
+++ trunk/iconv/src/internal.h Sat Nov 29 08:46:56 2008
@@ -29,6 +29,7 @@
WRITE_NOMEM,
WRITE_NONE
} write_state;
+ int skip;
struct encoding_context *prev, *next;
};
14 years, 2 months
r5825 tlsa - /trunk/netsurfweb/documentation/resinstall.en
by netsurf＠semichrome.net
Author: tlsa
Date: Sat Nov 29 07:11:36 2008
New Revision: 5825
URL: http://source.netsurf-browser.org?rev=5825&view=rev
Log:
Tidy up.
Modified:
trunk/netsurfweb/documentation/resinstall.en
Modified: trunk/netsurfweb/documentation/resinstall.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/documentation/resinsta...
==============================================================================
--- trunk/netsurfweb/documentation/resinstall.en (original)
+++ trunk/netsurfweb/documentation/resinstall.en Sat Nov 29 07:11:36 2008
@@ -84,7 +84,7 @@
<p class="guidescreenshotfeature"><img src="images/resinstall/configure.png" title="Configure Window" alt=""></p>
-<p>After running Configure you will have a window which looks like the above. Note that the icons you see will vary depending on which version of RISC OS you run.</p>
+<p>After running Configure you will have a window which looks like the above. Note that the icons you see will vary depending on which version of RISC OS you have.</p>
<h2 id="SystemMerge">Merging a !System directory</h2>
14 years, 2 months
r5824 tlsa - /trunk/netsurfweb/projects/iconv/index.en
by netsurf＠semichrome.net
Author: tlsa
Date: Sat Nov 29 07:06:06 2008
New Revision: 5824
URL: http://source.netsurf-browser.org?rev=5824&view=rev
Log:
Link to resource installation guide.
Modified:
trunk/netsurfweb/projects/iconv/index.en
Modified: trunk/netsurfweb/projects/iconv/index.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/projects/iconv/index.e...
==============================================================================
--- trunk/netsurfweb/projects/iconv/index.en (original)
+++ trunk/netsurfweb/projects/iconv/index.en Sat Nov 29 07:06:06 2008
@@ -40,6 +40,8 @@
<dd><p>Use the <strong>Boot merge</strong> facility in Configure to merge the supplied !Boot directory with the one on your system.</p><p>If there is no Boot merge facility provided on your system, simply drag the supplied !Boot directory over your existing boot structure.</p></dd>
</dl>
+<p><strong>Note:</strong> if you are unsure how to follow these steps, then please see the pictorial <a href="/documentation/resinstall">guide to resource installation</a> on the NetSurf site.</p>
+
<h2>Download</h2>
<p>Please <a href="iconv_latest.zip">download iconv</a> and follow the <strong>two</strong> installation steps above.</p>
14 years, 2 months
r5823 tlsa - /trunk/netsurfweb/documentation/resinstall.en
by netsurf＠semichrome.net
Author: tlsa
Date: Sat Nov 29 07:02:33 2008
New Revision: 5823
URL: http://source.netsurf-browser.org?rev=5823&view=rev
Log:
Tidy up thanks to jmb.
Modified:
trunk/netsurfweb/documentation/resinstall.en
Modified: trunk/netsurfweb/documentation/resinstall.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/documentation/resinsta...
==============================================================================
--- trunk/netsurfweb/documentation/resinstall.en (original)
+++ trunk/netsurfweb/documentation/resinstall.en Sat Nov 29 07:02:33 2008
@@ -68,9 +68,9 @@
<p>Many RISC OS applications depend on some shared resources and modules in order to run. These shared resources can be used by several different programs at the same time and are stored inside the RISC OS <strong>Boot Structure</strong>.</p>
-<p>NetSurf, like many RISC OS applications comes with two directories, <strong>!Boot</strong> and <strong>!System</strong>. These directories contain all the resources that NetSurf requires to run. The Boot Structure is specifically organised so that applications can find the resources they need to run.</p>
+<p>NetSurf, like many RISC OS applications, comes with two directories; <strong>!Boot</strong> and <strong>!System</strong>. These directories contain all the resources that NetSurf requires to run. The Boot Structure is specifically organised so that applications can find the resources they need to run.</p>
-<p>In order to install the resources that NetSurf depends on, the supplied !Boot and !System directories need to be merged with your system's Boot Structure. Fortunately this procedure is automated by drag-and-drop tools which do this job for you.</p>
+<p>To install the resources that NetSurf depends on, the supplied !Boot and !System directories need to be merged with your system's Boot Structure. Fortunately this procedure is automated by drag-and-drop tools which do this job for you.</p>
<h3>Running Configure</h3>
@@ -104,7 +104,7 @@
<p class="guidescreenshotfeature"><img src="images/resinstall/bootinstall.png" title="Boot Merge Window" alt=""></p>
-<p>Simply drag the !Boot directory supplied with the software onto this window and click the "Merge" button. The System Merge tool will then automatically merge the new resources into your Boot Structure.</p>
+<p>Simply drag the !Boot directory supplied with the software onto this window and click the "Merge" button. The Boot Merge tool will then automatically merge the new resources into your Boot Structure.</p>
<p><strong>Note:</strong> some old versions of RISC OS do not have a Boot Merge tool. In this case, you must instead drop the supplied !Boot over the !Boot directory which resides in the root directory of your hard disc drive.</p>
14 years, 2 months
r5822 tlsa - /trunk/netsurfweb/documentation/roinfo.en
by netsurf＠semichrome.net
Author: tlsa
Date: Sat Nov 29 06:56:43 2008
New Revision: 5822
URL: http://source.netsurf-browser.org?rev=5822&view=rev
Log:
Link resource installation guide from RO NS install info.
Modified:
trunk/netsurfweb/documentation/roinfo.en
Modified: trunk/netsurfweb/documentation/roinfo.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/documentation/roinfo.e...
==============================================================================
--- trunk/netsurfweb/documentation/roinfo.en (original)
+++ trunk/netsurfweb/documentation/roinfo.en Sat Nov 29 06:56:43 2008
@@ -90,6 +90,8 @@
<p>Double click on !NetSurf in your chosen location to launch NetSurf.</p>
+<p><strong>Note:</strong> if you are unsure how to follow steps <em>1</em> and <em>2</em> above, then please see our pictorial <a href="resinstall">guide to resource installation</a>.</p>
+
<h3 id="GettingStartedRequirements">Requirements</h3>
<p>When NetSurf is run it will look for all the resources it needs to function correctly. If anything is not found, it displays an error message indicating the resource it could not locate on your system. If such a message appears, NetSurf is likely to be requesting one of the following resources.</p>
14 years, 2 months
r5821 tlsa - in /trunk/netsurfweb: documentation/guide.en documentation/resinstall.en netsurf.css
by netsurf＠semichrome.net
Author: tlsa
Date: Sat Nov 29 06:47:44 2008
New Revision: 5821
URL: http://source.netsurf-browser.org?rev=5821&view=rev
Log:
Fix CSS.
Modified:
trunk/netsurfweb/documentation/guide.en
trunk/netsurfweb/documentation/resinstall.en
trunk/netsurfweb/netsurf.css
Modified: trunk/netsurfweb/documentation/guide.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/documentation/guide.en...
==============================================================================
--- trunk/netsurfweb/documentation/guide.en (original)
+++ trunk/netsurfweb/documentation/guide.en Sat Nov 29 06:47:44 2008
@@ -680,7 +680,7 @@
<p>Whenever you follow a link to a file that NetSurf doesn't know how to handle, NetSurf opens the download window. This allows you to save a local copy of the file. The download window is shown below.</p>
-<p class="guidescreenshot"><img src="images/dwnld" title="Download Window" alt=""></p>
+<p class="guidescreenshot"><img src="images/dwnld.png" title="Download Window" alt=""></p>
<p>As soon as the download window opens, NetSurf starts downloading the file to your Scrap directory. At any time, either as the file downloads or after it has finished, it is possible drag the file icon at the top of the window to the directory where you wish to keep the file. This action causes the file to be moved to your desired location from Scrap and if the download is incomplete, the remainder of the file will also go to the new location.</p>
Modified: trunk/netsurfweb/documentation/resinstall.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/documentation/resinsta...
==============================================================================
--- trunk/netsurfweb/documentation/resinstall.en (original)
+++ trunk/netsurfweb/documentation/resinstall.en Sat Nov 29 06:47:44 2008
@@ -82,7 +82,7 @@
<li>On some versions of the OS from RISCOS Ltd you can click <span class="action">menu</span> over the <em>switcher</em> icon which resides at the extreme right hand side of the iconbar. Choose the "Choices..." option from the menu.</li>
</ul>
-<p class="guidescreenshot"><img src="images/resinstall/configure.png" title="Configure Window" alt=""></p>
+<p class="guidescreenshotfeature"><img src="images/resinstall/configure.png" title="Configure Window" alt=""></p>
<p>After running Configure you will have a window which looks like the above. Note that the icons you see will vary depending on which version of RISC OS you run.</p>
@@ -90,7 +90,7 @@
<p>In the Configure window, click on the "System" icon. This opens the <em>System Merge</em> window, as pictured below.</p>
-<p class="guidescreenshot"><img src="images/resinstall/system.png" title="System Merge Window" alt=""></p>
+<p class="guidescreenshotfeature"><img src="images/resinstall/system.png" title="System Merge Window" alt=""></p>
<p>Simply drag the !System directory supplied with the software onto this window and click the "Merge" button. The System Merge tool will then automatically merge the new resources into your Boot Structure.</p>
@@ -98,11 +98,11 @@
<p>In the Configure window, click on the "Boot" icon. This opens the <em>Boot sequence</em> Configure window, as pictured below.</p>
-<p class="guidescreenshot"><img src="images/resinstall/boot.png" title="Boot sequence Configure Window" alt=""></p>
+<p class="guidescreenshotfeature"><img src="images/resinstall/boot.png" title="Boot sequence Configure Window" alt=""></p>
<p>In this window, click on the "Install" icon. This opens the <em>Boot Merge</em> window, as pictured below.</p>
-<p class="guidescreenshot"><img src="images/resinstall/bootinstall.png" title="Boot Merge Window" alt=""></p>
+<p class="guidescreenshotfeature"><img src="images/resinstall/bootinstall.png" title="Boot Merge Window" alt=""></p>
<p>Simply drag the !Boot directory supplied with the software onto this window and click the "Merge" button. The System Merge tool will then automatically merge the new resources into your Boot Structure.</p>
Modified: trunk/netsurfweb/netsurf.css
URL: http://source.netsurf-browser.org/trunk/netsurfweb/netsurf.css?rev=5821&r...
==============================================================================
--- trunk/netsurfweb/netsurf.css (original)
+++ trunk/netsurfweb/netsurf.css Sat Nov 29 06:47:44 2008
@@ -803,6 +803,9 @@
float:right;
padding:0 0 1em 1em; }
+.guidescreenshotfeature {
+ text-align: center; }
+
.guideiconinfo {
clear: left; }
14 years, 2 months
r5820 tlsa - in /trunk/netsurfweb/documentation: images/resinstall/ images/resinstall/boot.png images/resinstall/bootinstall.png images/resinstall/configure.png images/resinstall/system.png resinstall.en
by netsurf＠semichrome.net
Author: tlsa
Date: Sat Nov 29 06:38:04 2008
New Revision: 5820
URL: http://source.netsurf-browser.org?rev=5820&view=rev
Log:
Pictorial guide for RISC OS resource installation.
Added:
trunk/netsurfweb/documentation/images/resinstall/
trunk/netsurfweb/documentation/images/resinstall/boot.png (with props)
trunk/netsurfweb/documentation/images/resinstall/bootinstall.png (with props)
trunk/netsurfweb/documentation/images/resinstall/configure.png (with props)
trunk/netsurfweb/documentation/images/resinstall/system.png (with props)
trunk/netsurfweb/documentation/resinstall.en
Added: trunk/netsurfweb/documentation/images/resinstall/boot.png
URL: http://source.netsurf-browser.org/trunk/netsurfweb/documentation/images/r...
==============================================================================
Binary file - no diff available.
Propchange: trunk/netsurfweb/documentation/images/resinstall/boot.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/netsurfweb/documentation/images/resinstall/bootinstall.png
URL: http://source.netsurf-browser.org/trunk/netsurfweb/documentation/images/r...
==============================================================================
Binary file - no diff available.
Propchange: trunk/netsurfweb/documentation/images/resinstall/bootinstall.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/netsurfweb/documentation/images/resinstall/configure.png
URL: http://source.netsurf-browser.org/trunk/netsurfweb/documentation/images/r...
==============================================================================
Binary file - no diff available.
Propchange: trunk/netsurfweb/documentation/images/resinstall/configure.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/netsurfweb/documentation/images/resinstall/system.png
URL: http://source.netsurf-browser.org/trunk/netsurfweb/documentation/images/r...
==============================================================================
Binary file - no diff available.
Propchange: trunk/netsurfweb/documentation/images/resinstall/system.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/netsurfweb/documentation/resinstall.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/documentation/resinsta...
==============================================================================
--- trunk/netsurfweb/documentation/resinstall.en (added)
+++ trunk/netsurfweb/documentation/resinstall.en Sat Nov 29 06:38:04 2008
@@ -1,0 +1,129 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+ "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>NetSurf | RISC OS Resource Installation Guide</title>
+<link rel="stylesheet" type="text/css" href="/netsurf.css">
+<link rel="icon" type="image/png" href="/webimages/favicon.png">
+</head>
+
+<body>
+<p class="banner"><a href="/"><img src="/netsurf.png" alt="NetSurf"></a></p>
+
+<div class="navigation">
+<div class="navsection">
+<ul>
+<li><a href="/about/">About NetSurf</a></li>
+<li><a href="/downloads/">Downloads</a></li>
+<li><a href="/documentation/">Documentation</a>
+<ul>
+<li><a href="/documentation/info">User info</a></li>
+<li><a href="/documentation/guide">User guide</a></li>
+<li><a href="/documentation/progress">Project progress</a></li>
+<li><a href="/documentation/develop">Developer info</a></li>
+</ul>
+</li>
+<li><a href="/developers/">Development area</a></li>
+<li><a href="/webmasters/">Webmaster area</a></li>
+<li><a href="/contact/">Contact</a></li>
+</ul>
+</div>
+
+<div class="navsection">
+<ul class="languages">
+<!--<li><a href="index.de">Deutsch</a></li>-->
+<li>English</li>
+<!--<li><a href="index.fr">Français</a></li>-->
+<!--<li><a href="index.nl">Nederlands</a></li>-->
+</ul>
+</div>
+
+<div class="navsection">
+<ul class="sitelinks">
+<li><a href="http://wiki.netsurf-browser.org/">Development wiki</a></li>
+<li><a href="http://planet.netsurf-browser.org/">Planet NetSurf</a></li>
+<li><a href="http://source.netsurf-browser.org/">SVN repository viewer</a></li>
+</ul>
+</div>
+
+</div>
+
+<div class="content">
+
+<p class="breadcrumbs"><a href="/">Home</a> » <a href="/documentation/">Documentation</a> » Resource Installation Guide</p>
+
+<h1>RISC OS Resource Installation Guide</h1>
+
+<p>This page is a pictorial guide to installing resources on RISC OS.</p>
+
+<ul>
+<li><a href="#Introduction">Introduction</a></li>
+<li><a href="#SystemMerge">Merging a !System directory</a></li>
+<li><a href="#BootMerge">Merging a !Boot directory</a></li>
+</ul>
+
+<p class="updated">Last updated 29 November 2008</p>
+
+<h2 id="Introduction">Introduction</h2>
+
+<p>Many RISC OS applications depend on some shared resources and modules in order to run. These shared resources can be used by several different programs at the same time and are stored inside the RISC OS <strong>Boot Structure</strong>.</p>
+
+<p>NetSurf, like many RISC OS applications comes with two directories, <strong>!Boot</strong> and <strong>!System</strong>. These directories contain all the resources that NetSurf requires to run. The Boot Structure is specifically organised so that applications can find the resources they need to run.</p>
+
+<p>In order to install the resources that NetSurf depends on, the supplied !Boot and !System directories need to be merged with your system's Boot Structure. Fortunately this procedure is automated by drag-and-drop tools which do this job for you.</p>
+
+<h3>Running Configure</h3>
+
+<p>First of all, we need to run the RISC OS Configure application. There are several ways to do this:</p>
+
+<ul>
+<li>The most common way to run Configure is to double click !Boot, in the root directory of your hard disc.</li>
+<li>On RISC OS 5 you can click <span class="action">menu</span> over the <em>switcher</em> icon which resides at the extreme right hand side of the iconbar. Choose the "Configure" option from the menu.</li>
+<li>On some versions of the OS from RISCOS Ltd you can click <span class="action">menu</span> over the <em>switcher</em> icon which resides at the extreme right hand side of the iconbar. Choose the "Choices..." option from the menu.</li>
+</ul>
+
+<p class="guidescreenshot"><img src="images/resinstall/configure.png" title="Configure Window" alt=""></p>
+
+<p>After running Configure you will have a window which looks like the above. Note that the icons you see will vary depending on which version of RISC OS you run.</p>
+
+<h2 id="SystemMerge">Merging a !System directory</h2>
+
+<p>In the Configure window, click on the "System" icon. This opens the <em>System Merge</em> window, as pictured below.</p>
+
+<p class="guidescreenshot"><img src="images/resinstall/system.png" title="System Merge Window" alt=""></p>
+
+<p>Simply drag the !System directory supplied with the software onto this window and click the "Merge" button. The System Merge tool will then automatically merge the new resources into your Boot Structure.</p>
+
+<h2 id="BootMerge">Merging a !Boot directory</h2>
+
+<p>In the Configure window, click on the "Boot" icon. This opens the <em>Boot sequence</em> Configure window, as pictured below.</p>
+
+<p class="guidescreenshot"><img src="images/resinstall/boot.png" title="Boot sequence Configure Window" alt=""></p>
+
+<p>In this window, click on the "Install" icon. This opens the <em>Boot Merge</em> window, as pictured below.</p>
+
+<p class="guidescreenshot"><img src="images/resinstall/bootinstall.png" title="Boot Merge Window" alt=""></p>
+
+<p>Simply drag the !Boot directory supplied with the software onto this window and click the "Merge" button. The System Merge tool will then automatically merge the new resources into your Boot Structure.</p>
+
+<p><strong>Note:</strong> some old versions of RISC OS do not have a Boot Merge tool. In this case, you must instead drop the supplied !Boot over the !Boot directory which resides in the root directory of your hard disc drive.</p>
+
+
+
+<div class="footer">
+<p>Copyright 2003 - 2008 The NetSurf Developers</p>
+</div>
+
+</div>
+
+
+<form method="get" action="http://www.google.co.uk/search">
+<div class="searchbox">
+<input type="hidden" name="q" value="site:netsurf-browser.org">
+<input type="text" name="q" maxlength="255"><br>
+<input type="submit" value="Search" name="btnG">
+</div>
+</form>
+
+</body>
+</html>
14 years, 2 months
r5819 jmb - /trunk/iconv/unicode/unicode.jmb1.p
by netsurf＠semichrome.net
Author: jmb
Date: Sat Nov 29 06:12:35 2008
New Revision: 5819
URL: http://source.netsurf-browser.org?rev=5819&view=rev
Log:
Incorporate fix for utf-8 codec when encountering illegal byte sequences
Modified:
trunk/iconv/unicode/unicode.jmb1.p
Modified: trunk/iconv/unicode/unicode.jmb1.p
URL: http://source.netsurf-browser.org/trunk/iconv/unicode/unicode.jmb1.p?rev=...
==============================================================================
--- trunk/iconv/unicode/unicode.jmb1.p (original)
+++ trunk/iconv/unicode/unicode.jmb1.p Sat Nov 29 06:12:35 2008
@@ -4,8 +4,27 @@
retrieving revision 1.9
diff -u -r1.9 enc_utf8
--- c/enc_utf8 10 Jun 2002 15:08:35 -0000 1.9
-+++ c/enc_utf8 19 Nov 2008 18:55:18 -0000
-@@ -96,7 +96,7 @@
++++ c/enc_utf8 29 Nov 2008 11:57:03 -0000
+@@ -81,22 +81,23 @@
+ }
+ else
+ {
++ /* Reset the count of expected continuation bytes */
++ ue->count = 0;
++
+ if (ucs_out)
+ if (ucs_out(handle, 0xFFFD))
+ {
+- /* Character has been used, so ensure its counted */
++ /* Character has been used, so ensure it's counted */
+ count--;
+ break;
+ }
+
+- ue->count = 0;
+-
+ goto retry;
+ }
}
else
{
@@ -14,13 +33,22 @@
u = c;
else if (c < 0xC0 || c >= 0xFE)
u = 0xFFFD;
+@@ -121,7 +122,7 @@
+ if (ucs_out)
+ if (ucs_out(handle, u))
+ {
+- /* Character has been used, so ensure its counted */
++ /* Character has been used, so ensure it's counted */
+ count--;
+ break;
+ }
Index: c/encoding
===================================================================
RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/c/encoding,v
retrieving revision 1.39
diff -u -r1.39 encoding
--- c/encoding 26 Aug 2005 15:02:17 -0000 1.39
-+++ c/encoding 19 Nov 2008 18:55:19 -0000
++++ c/encoding 29 Nov 2008 11:57:03 -0000
@@ -67,20 +67,20 @@
static EncList enclist[] =
{
@@ -54,7 +82,7 @@
retrieving revision 1.19
diff -u -r1.19 iso2022
--- c/iso2022 25 Aug 2005 11:57:08 -0000 1.19
-+++ c/iso2022 19 Nov 2008 18:55:19 -0000
++++ c/iso2022 29 Nov 2008 11:57:04 -0000
@@ -32,6 +32,7 @@
#include <stdio.h>
#include <string.h>
@@ -231,7 +259,7 @@
retrieving revision 1.1
diff -u -r1.1 iso6937
--- c/iso6937 25 Aug 2005 11:57:08 -0000 1.1
-+++ c/iso6937 19 Nov 2008 18:55:20 -0000
++++ c/iso6937 29 Nov 2008 11:57:04 -0000
@@ -354,11 +354,13 @@
static int iso6937_find_accent_pair(UCS4 u)
@@ -254,7 +282,7 @@
retrieving revision 1.6
diff -u -r1.6 johab
--- c/johab 10 Jun 2002 15:08:35 -0000 1.6
-+++ c/johab 19 Nov 2008 18:55:20 -0000
++++ c/johab 29 Nov 2008 11:57:05 -0000
@@ -116,10 +116,10 @@
/* Hangul is --X */
static const unsigned char final_only[28] =
@@ -318,7 +346,7 @@
retrieving revision 1.13
diff -u -r1.13 shiftjis
--- c/shiftjis 10 Jun 2002 15:08:35 -0000 1.13
-+++ c/shiftjis 19 Nov 2008 18:55:20 -0000
++++ c/shiftjis 29 Nov 2008 11:57:05 -0000
@@ -173,7 +173,7 @@
else
{
@@ -357,7 +385,7 @@
retrieving revision 1.4
diff -u -r1.4 textconv
--- c/textconv 25 Aug 2005 11:57:08 -0000 1.4
-+++ c/textconv 19 Nov 2008 18:55:20 -0000
++++ c/textconv 29 Nov 2008 11:57:05 -0000
@@ -67,8 +67,8 @@
static int src_enc = csCurrent;
@@ -391,7 +419,7 @@
retrieving revision 1.3
diff -u -r1.3 unix
--- c/unix 5 Mar 2004 18:16:24 -0000 1.3
-+++ c/unix 19 Nov 2008 18:55:20 -0000
++++ c/unix 29 Nov 2008 11:57:05 -0000
@@ -33,6 +33,8 @@
#include "layers_dbg.h"
#endif
@@ -452,7 +480,7 @@
retrieving revision 1.2
diff -u -r1.2 Makefile
--- ccsolaris/Makefile 25 Aug 2005 11:57:08 -0000 1.2
-+++ ccsolaris/Makefile 19 Nov 2008 18:55:21 -0000
++++ ccsolaris/Makefile 29 Nov 2008 11:57:05 -0000
@@ -17,9 +17,25 @@
#
# Project: Unicode
14 years, 2 months
r5818 jmb - in /trunk/iconv: module/module.c test/data/utf8-ilseq.txt
by netsurf＠semichrome.net
Author: jmb
Date: Sat Nov 29 05:55:24 2008
New Revision: 5818
URL: http://source.netsurf-browser.org?rev=5818&view=rev
Log:
Test data for illegal utf-8 byte sequence.
Fix command line argument parsing somewhat.
Ensure we output all the converted data, even if we're aborting because of an illegal byte sequence.
Added:
trunk/iconv/test/data/utf8-ilseq.txt
Modified:
trunk/iconv/module/module.c
Modified: trunk/iconv/module/module.c
URL: http://source.netsurf-browser.org/trunk/iconv/module/module.c?rev=5818&r1...
==============================================================================
--- trunk/iconv/module/module.c (original)
+++ trunk/iconv/module/module.c Sat Nov 29 05:55:24 2008
@@ -228,8 +228,6 @@
p++;
}
*f = '\0';
- while (*p == ' ')
- p++;
argc--;
break;
case 't':
@@ -246,8 +244,6 @@
p++;
}
*t = '\0';
- while (*p == ' ')
- p++;
argc--;
break;
case 'l':
@@ -269,8 +265,6 @@
p++;
}
*o = '\0';
- while (*p == ' ')
- p++;
argc--;
break;
case 'v':
@@ -290,6 +284,9 @@
"Iconv: invalid option -- %c", *(p+1));
return &ErrorGeneric;
}
+
+ while (*p == ' ')
+ p++;
}
if (list) {
@@ -388,7 +385,12 @@
"character sequence: "
"'%10s'\n", in);
}
+
if (stop_on_invalid) {
+ /* Flush through any output */
+ fwrite(output, 1,
+ sizeof(output) - outlen,
+ ofp);
iconv_close(cd);
fclose(ofp);
fclose(inf);
Added: trunk/iconv/test/data/utf8-ilseq.txt
URL: http://source.netsurf-browser.org/trunk/iconv/test/data/utf8-ilseq.txt?re...
==============================================================================
--- trunk/iconv/test/data/utf8-ilseq.txt (added)
+++ trunk/iconv/test/data/utf8-ilseq.txt Sat Nov 29 05:55:24 2008
@@ -1,0 +1,2 @@
+This side-scroller is plenty of fun if you can deal with all the clichés. Spiderman is your typical, old-fashioned, jump-kick-punch game.
+
14 years, 2 months
