X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fpld%2Fxilinx_bit.c;h=f83d8942d38fb717f6e5e5367f00632d46f1df7a;hp=33c3ed79b7b24940c8dd4e85b74d1bee6d8fc6cd;hb=HEAD;hpb=ca594adb5a71f2bf60c1380172b8e61b075d9479 diff --git a/src/pld/xilinx_bit.c b/src/pld/xilinx_bit.c index 33c3ed79b7..e4cc52ef97 100644 --- a/src/pld/xilinx_bit.c +++ b/src/pld/xilinx_bit.c @@ -1,65 +1,47 @@ +// 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 #include "xilinx_bit.h" #include "pld.h" -#include "log.h" - -#include +#include +#include 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(§ion_char, 1, 1, input_file)) != 1) - { + read_count = fread(§ion_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,71 +49,83 @@ 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; } -int xilinx_read_bit_file(xilinx_bit_file_t *bit_file, const char *filename) +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); +}