From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id E4B573858422 for ; Mon, 1 Nov 2021 02:38:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E4B573858422 Received: by smtp.gentoo.org (Postfix, from userid 559) id 1C963342E1B; Mon, 1 Nov 2021 02:38:11 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 2/2] sim: ppc: handle \r in igen inputs [PR sim/28476] Date: Sun, 31 Oct 2021 22:38:09 -0400 Message-Id: <20211101023809.15374-2-vapier@gentoo.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211101023809.15374-1-vapier@gentoo.org> References: <20211101023809.15374-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Nov 2021 02:38:14 -0000 Make sure we consume & ignore \r bytes in inputs in case the file encodings are from a non-LF systems (e.g. Windows). --- sim/ppc/table.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/sim/ppc/table.c b/sim/ppc/table.c index 3c7e4464beb5..6399bdaddcb1 100644 --- a/sim/ppc/table.c +++ b/sim/ppc/table.c @@ -208,7 +208,7 @@ table_entry_read(table *root) /* break the line into its colon delimitered fields */ for (field = 0; field < file->nr_fields-1; field++) { entry->fields[field] = file->pos; - while(*file->pos && *file->pos != ':' && *file->pos != '\n') + while(*file->pos && *file->pos != ':' && *file->pos != '\n' && *file->pos != '\r') file->pos++; if (*file->pos == ':') { *file->pos = '\0'; @@ -219,7 +219,11 @@ table_entry_read(table *root) /* any trailing stuff not the last field */ ASSERT(field == file->nr_fields-1); entry->fields[field] = file->pos; - while (*file->pos && *file->pos != '\n') { + while (*file->pos && *file->pos != '\n' && *file->pos != '\r') { + file->pos++; + } + if (*file->pos == '\r') { + *file->pos = '\0'; file->pos++; } if (*file->pos == '\n') { @@ -243,7 +247,7 @@ table_entry_read(table *root) file->pos++; for (field = 0; field < file->nr_model_fields-1; field++) { model->fields[field] = file->pos; - while(*file->pos && *file->pos != ':' && *file->pos != '\n') + while(*file->pos && *file->pos != ':' && *file->pos != '\n' && *file->pos != '\r') file->pos++; if (*file->pos == ':') { *file->pos = '\0'; @@ -254,7 +258,11 @@ table_entry_read(table *root) /* any trailing stuff not the last field */ ASSERT(field == file->nr_model_fields-1); model->fields[field] = file->pos; - while (*file->pos && *file->pos != '\n') { + while (*file->pos && *file->pos != '\n' && *file->pos != '\r') { + file->pos++; + } + if (*file->pos == '\r') { + *file->pos = '\0'; file->pos++; } if (*file->pos == '\n') { @@ -274,13 +282,13 @@ table_entry_read(table *root) do { do { file->pos++; - } while (*file->pos != '\0' && *file->pos != '\n'); - if (*file->pos == '\n') { + } while (*file->pos != '\0' && *file->pos != '\n' && *file->pos != '\r'); + if (*file->pos == '\n' || *file->pos == '\r') { char *save_pos = ++file->pos; int extra_lines = 0; file->line_nr++; /* Allow tab indented to have blank lines */ - while (*save_pos == '\n') { + while (*save_pos == '\n' || *save_pos == '\r') { save_pos++; extra_lines++; } @@ -290,7 +298,7 @@ table_entry_read(table *root) } } } while (*file->pos != '\0' && *file->pos == '\t'); - if (file->pos[-1] == '\n') + if (file->pos[-1] == '\n' || file->pos[-1] == '\r') file->pos[-1] = '\0'; } else -- 2.33.0