notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow EOL-less description lines at EOF

Browse source 
Mended bug where EOL-less descriptive text at the end
of a file (e.g., a stamp description) would get ignored.

Closes https://sourceforge.net/p/tuxpaint/bugs/298/
h/t Laura
This commit is contained in:
Bill Kendrick 2025-06-06 20:55:01 -07:00
parent 742ab6ddaa
commit cab4394173
2 changed files with 35 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/CHANGES.txt
View file

@ -14,6 +14,11 @@ https://tuxpaint.org/
Closes https://sourceforge.net/p/tuxpaint/bugs/299/ Closes https://sourceforge.net/p/tuxpaint/bugs/299/
h/t Billy A. h/t Billy A.
+ Mended bug where EOL-less descriptive text at the end
of a file (e.g., a stamp description) would get ignored.
Closes https://sourceforge.net/p/tuxpaint/bugs/298/
h/t Laura
2025.May.26 (0.9.35) 2025.May.26 (0.9.35)
* New Magic Tools: * New Magic Tools:
---------------- ----------------

63
src/tuxpaint.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
June 14, 2002 - April 19, 2025 June 14, 2002 - June 6, 2025
*/ */
#include "platform.h" #include "platform.h"
@ -13520,44 +13520,41 @@ static char *loaddesc(const char *const fname, Uint8 *locale_text)
{ {
if (fgets(buf, sizeof(buf), fi)) if (fgets(buf, sizeof(buf), fi))
{ {
if (!feof(fi)) strip_trailing_whitespace(buf);
if (!got_first)
{ {
strip_trailing_whitespace(buf); /* First one is the default: */
if (!got_first) strcpy(def_buf, buf); /* safe; both the same size */
got_first = 1;
}
debug(buf);
// lang_prefix = lang_prefixes[langint];
/* See if it's the one for this locale... */
if ((char *)strcasestr(buf, wished_langs[i].lang_prefix) == buf)
{
debug(buf + strlen(wished_langs[i].lang_prefix));
if ((char *)strcasestr(buf + strlen(wished_langs[i].lang_prefix),
".utf8=") == buf + strlen(wished_langs[i].lang_prefix))
{ {
/* First one is the default: */ lang_prefix = wished_langs[i].lang_prefix;
short_lang_prefix = strdup(lang_prefix);
/* When in doubt, cut off country code */
if (strchr(short_lang_prefix, '_'))
*strchr(short_lang_prefix, '_') = '\0';
strcpy(def_buf, buf); /* safe; both the same size */ need_own_font = wished_langs[i].need_own_font;
got_first = 1; need_right_to_left = wished_langs[i].need_right_to_left;
}
debug(buf); found = 1;
debug("...FOUND!");
// lang_prefix = lang_prefixes[langint];
/* See if it's the one for this locale... */
if ((char *)strcasestr(buf, wished_langs[i].lang_prefix) == buf)
{
debug(buf + strlen(wished_langs[i].lang_prefix));
if ((char *)strcasestr(buf + strlen(wished_langs[i].lang_prefix),
".utf8=") == buf + strlen(wished_langs[i].lang_prefix))
{
lang_prefix = wished_langs[i].lang_prefix;
short_lang_prefix = strdup(lang_prefix);
/* When in doubt, cut off country code */
if (strchr(short_lang_prefix, '_'))
*strchr(short_lang_prefix, '_') = '\0';
need_own_font = wished_langs[i].need_own_font;
need_right_to_left = wished_langs[i].need_right_to_left;
found = 1;
debug("...FOUND!");
}
} }
} }
} }