Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix multiline outputs only showing the first line #128

Merged
merged 2 commits into from
Dec 18, 2024
Merged

Fix multiline outputs only showing the first line #128

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa5099a
Fix multiline outputs only showing the first line
jdholtz Dec 18, 2024
c676c89
Replace newlines in a history entry with semicolons
jdholtz Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/calc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,14 @@ static int get_real_history_index(GPtrArray* history, unsigned int selected_line
static void append_last_result_to_history(CALCModePrivateData* pd) {
if (!is_error_string(pd->last_result) && strlen(pd->last_result) > 0) {
char* history_entry = g_strdup_printf("%s", pd->last_result);

// Replace newlines with semicolons so one entry isn't split into multiple entries
for (unsigned int i = 0; i < strlen(history_entry); i++) {
if (history_entry[i] == '\n') {
history_entry[i] = ';';
}
}

g_ptr_array_add(pd->history, (gpointer) history_entry);
if (find_arg(NO_PERSIST_HISTORY_OPTION) == -1) {
append_str_to_history(history_entry);
Expand Down Expand Up @@ -539,18 +547,18 @@ static void process_cb(GObject* source_object, GAsyncResult* res, gpointer user_
error = NULL;
}

gsize bytes_read = 0;
unsigned int stdout_bufsize = 4096;
char stdout_buf[stdout_bufsize];
g_input_stream_read_all(stdout_stream, stdout_buf, stdout_bufsize, NULL, NULL, &error);
g_input_stream_read_all(stdout_stream, stdout_buf, stdout_bufsize, &bytes_read, NULL, &error);

if (error != NULL) {
g_error("Process errored with: %s", error->message);
g_error_free(error);
error = NULL;
}

unsigned int line_length = strcspn(stdout_buf, "\n");
*last_result = g_strndup(stdout_buf, line_length);
*last_result = g_strndup(stdout_buf, bytes_read - 1);
g_input_stream_close(stdout_stream, NULL, &error);

if (error != NULL) {
Expand Down