ExtraKeysSetting::keybuffer is terminated by LF rather than NUL. So
we have to replace NUL by LF after calling
UserSettings::get("extrakeys") in the ExtraKeysSetting constructor.
Otherwise the last saved key is discarded. Also, bufsize has to be
set appropriately before the call to count_keys(), or else all saved
keys are discarded.
Similarly, the final LF in keybuffer has to be replaced by NUL in the
ExtraKeysSetting destructor before the call to
UserSettings::set("extrakeys", keybuffer). Otherwise we get garbage
at the end of the "extrakeys" setting in setup.rc.
const char *p = UserSettings::instance().get ("extrakeys");
if (p)
{
+ bufsize = strlen (p) + 1; // Include final NUL.
keybuffer = strdup (p);
+ // Replace final NUL by LF.
+ keybuffer[bufsize - 1] = 0x0a;
// Calling count_keys gets the count but also sizes the buffer
// correctly, discarding any trailing non-LF-terminated data.
bufsize = count_keys ();
ExtraKeysSetting::~ExtraKeysSetting ()
{
if (keybuffer)
- UserSettings::instance().set ("extrakeys", keybuffer);
+ {
+ // Replace final LF by NUL.
+ keybuffer[bufsize - 1] = '\0';
+ UserSettings::instance().set ("extrakeys", keybuffer);
+ }
}
void