Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
jtag: linuxgpiod: drop extra parenthesis
[openocd.git] / src / pld / xilinx_bit.c
diff --git a/src/pld/xilinx_bit.c b/src/pld/xilinx_bit.c
index 1ae1ea8df689ae7277d46510e1e083c0c8e9a648..e4cc52ef9720510db2501876d7f516aa96665c73 100644 (file)
--- a/src/pld/xilinx_bit.c
+++ b/src/pld/xilinx_bit.c
@@ -1,22 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2006 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -25,41 +13,35 @@
 #include "pld.h"
 #include <helper/log.h>
 
-#include <sys/stat.h>
-
+#include <helper/system.h>
 
 static int read_section(FILE *input_file, int length_size, char section,
-               uint32_t *buffer_length, uint8_t **buffer)
+       uint32_t *buffer_length, uint8_t **buffer)
 {
        uint8_t length_buffer[4];
        int length;
        char section_char;
        int read_count;
 
-       if ((length_size != 2) && (length_size != 4))
-       {
+       if ((length_size != 2) && (length_size != 4)) {
                LOG_ERROR("BUG: length_size neither 2 nor 4");
                return ERROR_PLD_FILE_LOAD_FAILED;
        }
 
-       if ((read_count = fread(&section_char, 1, 1, input_file)) != 1)
-       {
+       read_count = fread(&section_char, 1, 1, input_file);
+       if (read_count != 1)
                return ERROR_PLD_FILE_LOAD_FAILED;
-       }
 
        if (section_char != section)
-       {
                return ERROR_PLD_FILE_LOAD_FAILED;
-       }
 
-       if ((read_count = fread(length_buffer, 1, length_size, input_file)) != length_size)
-       {
+       read_count = fread(length_buffer, 1, length_size, input_file);
+       if (read_count != length_size)
                return ERROR_PLD_FILE_LOAD_FAILED;
-       }
 
        if (length_size == 4)
                length = be_to_h_u32(length_buffer);
-       else /* (length_size == 2) */
+       else    /* (length_size == 2) */
                length = be_to_h_u16(length_buffer);
 
        if (buffer_length)
@@ -67,10 +49,9 @@ static int read_section(FILE *input_file, int length_size, char section,
 
        *buffer = malloc(length);
 
-       if ((read_count = fread(*buffer, 1, length, input_file)) != length)
-       {
+       read_count = fread(*buffer, 1, length, input_file);
+       if (read_count != length)
                return ERROR_PLD_FILE_LOAD_FAILED;
-       }
 
        return ERROR_OK;
 }
@@ -78,60 +59,73 @@ static int read_section(FILE *input_file, int length_size, char section,
 int xilinx_read_bit_file(struct xilinx_bit_file *bit_file, const char *filename)
 {
        FILE *input_file;
-       struct stat input_stat;
        int read_count;
 
        if (!filename || !bit_file)
-               return ERROR_INVALID_ARGUMENTS;
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
-       if (stat(filename, &input_stat) == -1)
-       {
-               LOG_ERROR("couldn't stat() %s: %s", filename, strerror(errno));
+       input_file = fopen(filename, "rb");
+       if (!input_file) {
+               LOG_ERROR("couldn't open %s: %s", filename, strerror(errno));
                return ERROR_PLD_FILE_LOAD_FAILED;
        }
 
-       if (S_ISDIR(input_stat.st_mode))
-       {
-               LOG_ERROR("%s is a directory", filename);
-               return ERROR_PLD_FILE_LOAD_FAILED;
-       }
+       bit_file->source_file = NULL;
+       bit_file->part_name = NULL;
+       bit_file->date = NULL;
+       bit_file->time = NULL;
+       bit_file->data = NULL;
 
-       if (input_stat.st_size == 0) {
-               LOG_ERROR("Empty file %s", filename);
+       read_count = fread(bit_file->unknown_header, 1, 13, input_file);
+       if (read_count != 13) {
+               LOG_ERROR("couldn't read unknown_header from file '%s'", filename);
+               fclose(input_file);
                return ERROR_PLD_FILE_LOAD_FAILED;
        }
 
-       if (!(input_file = fopen(filename, "rb")))
-       {
-               LOG_ERROR("couldn't open %s: %s", filename, strerror(errno));
+       if (read_section(input_file, 2, 'a', NULL, &bit_file->source_file) != ERROR_OK) {
+               xilinx_free_bit_file(bit_file);
+               fclose(input_file);
                return ERROR_PLD_FILE_LOAD_FAILED;
        }
 
-       if ((read_count = fread(bit_file->unknown_header, 1, 13, input_file)) != 13)
-       {
-               LOG_ERROR("couldn't read unknown_header from file '%s'", filename);
+       if (read_section(input_file, 2, 'b', NULL, &bit_file->part_name) != ERROR_OK) {
+               xilinx_free_bit_file(bit_file);
+               fclose(input_file);
                return ERROR_PLD_FILE_LOAD_FAILED;
        }
 
-       if (read_section(input_file, 2, 'a', NULL, &bit_file->source_file) != ERROR_OK)
-               return ERROR_PLD_FILE_LOAD_FAILED;
-
-       if (read_section(input_file, 2, 'b', NULL, &bit_file->part_name) != ERROR_OK)
-               return ERROR_PLD_FILE_LOAD_FAILED;
-
-       if (read_section(input_file, 2, 'c', NULL, &bit_file->date) != ERROR_OK)
+       if (read_section(input_file, 2, 'c', NULL, &bit_file->date) != ERROR_OK) {
+               xilinx_free_bit_file(bit_file);
+               fclose(input_file);
                return ERROR_PLD_FILE_LOAD_FAILED;
+       }
 
-       if (read_section(input_file, 2, 'd', NULL, &bit_file->time) != ERROR_OK)
+       if (read_section(input_file, 2, 'd', NULL, &bit_file->time) != ERROR_OK) {
+               xilinx_free_bit_file(bit_file);
+               fclose(input_file);
                return ERROR_PLD_FILE_LOAD_FAILED;
+       }
 
-       if (read_section(input_file, 4, 'e', &bit_file->length, &bit_file->data) != ERROR_OK)
+       if (read_section(input_file, 4, 'e', &bit_file->length, &bit_file->data) != ERROR_OK) {
+               xilinx_free_bit_file(bit_file);
+               fclose(input_file);
                return ERROR_PLD_FILE_LOAD_FAILED;
+       }
 
-       LOG_DEBUG("bit_file: %s %s %s,%s %" PRIi32 "", bit_file->source_file, bit_file->part_name,
+       LOG_DEBUG("bit_file: %s %s %s,%s %" PRIu32 "", bit_file->source_file, bit_file->part_name,
                bit_file->date, bit_file->time, bit_file->length);
 
        fclose(input_file);
 
        return ERROR_OK;
 }
+
+void xilinx_free_bit_file(struct xilinx_bit_file *bit_file)
+{
+       free(bit_file->source_file);
+       free(bit_file->part_name);
+       free(bit_file->date);
+       free(bit_file->time);
+       free(bit_file->data);
+}
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)