This repository has been archived by the owner on Feb 10, 2024. It is now read-only.
Various fixes (errors in hexchat-text on windows, and crlf issues in server list) #2238
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also allow \r\n in startup.txt Closes hexchat#2234
TingPing
reviewed
Aug 18, 2018
| @@ -2570,11 +2569,9 @@ load_perform_file (session *sess, char *file) | |||
| tbuf[1024] = 0; | |||
| while (fgets (tbuf, 1024, fp)) | |||
| { | |||
| nl = strchr (tbuf, '\n'); | |||
| if (nl == tbuf) /* skip empty commands */ | |||
| tbuf[strcspn (tbuf, "\r\n")] = 0; | |||
There was a problem hiding this comment.
Well that just breaks Unix.
I think you should just ensure files on Windows are written using \n only.
There was a problem hiding this comment.
Shouldn't break Unix. It cuts the string at the first \r or \n. Unless you mean the user may want to put commands which contain \r.
And ensuring files are written using \n only is not trivial to solve this issue, because if the file already contains \r it will be part of the data, which is the bug I'm solving here.
There was a problem hiding this comment.
Ah my mistake. I do still think there is an advantage to simply using \n everywhere.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The call to g_io_channel_set_buffered with encoding not being NULL was failing and producing lots of error messages in hexchat-text. Btw, I'm not sure if we really need unbuffered i/o here and reads byte by byte. But, well... it works.
The other commit just skips \r when reading the server list file (and also the startup.txt). Other files are not created with fprintf and shouldn't have this issue unless the user edits them manually.