X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Ftextfile.c;h=2e57e2f669d067985aaf749a55f920769ac5dbf1;hb=01ce2d43d6ba9721bf46c3e132c4be394ef3f0f9;hp=332386dc5880d9a18ba546dd487cb2564d25ecf5;hpb=88bfb44de205f72acaefac0d509e1e4e604496f1;p=wimlib diff --git a/src/textfile.c b/src/textfile.c index 332386dc..2e57e2f6 100644 --- a/src/textfile.c +++ b/src/textfile.c @@ -5,33 +5,24 @@ /* * Copyright (C) 2014 Eric Biggers * - * This file is part of wimlib, a library for working with WIM files. + * This file is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) any + * later version. * - * wimlib 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 3 of the License, or (at your option) - * any later version. - * - * wimlib 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 + * This file 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 Lesser General Public License for more * details. * - * You should have received a copy of the GNU General Public License - * along with wimlib; if not, see http://www.gnu.org/licenses/. + * You should have received a copy of the GNU Lesser General Public License + * along with this file; if not, see http://www.gnu.org/licenses/. */ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include "wimlib/assert.h" -#include "wimlib/encoding.h" -#include "wimlib/error.h" -#include "wimlib/file_io.h" -#include "wimlib/textfile.h" -#include "wimlib/util.h" - #include #include #include @@ -39,6 +30,44 @@ #include #include +#include "wimlib/encoding.h" +#include "wimlib/error.h" +#include "wimlib/file_io.h" +#include "wimlib/textfile.h" +#include "wimlib/util.h" + +static int +stdin_get_contents(void **buf_ret, size_t *bufsize_ret) +{ + char *buf = NULL; + size_t filled = 0; + size_t capacity = 0; + + do { + size_t new_capacity = (capacity * 2) + 256; + char *new_buf; + + if (new_capacity <= capacity || + !(new_buf = REALLOC(buf, new_capacity))) { + ERROR("Too much data sent on stdin!"); + FREE(buf); + return WIMLIB_ERR_INVALID_PARAM; + } + buf = new_buf; + capacity = new_capacity; + filled += fread(&buf[filled], 1, capacity - filled, stdin); + } while (filled == capacity); + + if (!feof(stdin)) { + ERROR_WITH_ERRNO("Error reading stdin"); + FREE(buf); + return WIMLIB_ERR_READ; + } + *buf_ret = buf; + *bufsize_ret = filled; + return 0; +} + static int read_file_contents(const tchar *path, void **buf_ret, size_t *bufsize_ret) { @@ -49,9 +78,6 @@ read_file_contents(const tchar *path, void **buf_ret, size_t *bufsize_ret) int ret; int errno_save; - if (!path || !*path) - return WIMLIB_ERR_INVALID_PARAM; - raw_fd = topen(path, O_RDONLY | O_BINARY); if (raw_fd < 0) { ERROR_WITH_ERRNO("Can't open \"%"TS"\"", path); @@ -131,22 +157,9 @@ translate_text_buffer(const u8 *buf_raw, size_t bufsize_raw, bufsize_raw - offset_raw, &buf_tstr, &bufsize_tstr); } else { - #if TCHAR_IS_UTF16LE - bufsize_tstr = bufsize_raw - offset_raw; - buf_tstr = MALLOC(bufsize_tstr + 2); - if (buf_tstr) { - memcpy(buf_tstr, buf_raw + offset_raw, bufsize_tstr); - ((u8*)buf_tstr)[bufsize_tstr + 0] = 0; - ((u8*)buf_tstr)[bufsize_tstr + 1] = 0; - ret = 0; - } else { - ret = WIMLIB_ERR_NOMEM; - } - #else ret = utf16le_to_tstr((const utf16lechar *)(buf_raw + offset_raw), bufsize_raw - offset_raw, &buf_tstr, &bufsize_tstr); - #endif } if (ret) return ret; @@ -157,23 +170,23 @@ translate_text_buffer(const u8 *buf_raw, size_t bufsize_raw, } static int -string_set_append(struct string_set *set, tchar *str) +string_list_append(struct string_list *list, tchar *str) { - size_t num_alloc_strings = set->num_alloc_strings; + size_t num_alloc_strings = list->num_alloc_strings; - if (set->num_strings == num_alloc_strings) { + if (list->num_strings == num_alloc_strings) { tchar **new_strings; num_alloc_strings = max(num_alloc_strings * 3 / 2, num_alloc_strings + 4); - new_strings = REALLOC(set->strings, - sizeof(set->strings[0]) * num_alloc_strings); + new_strings = REALLOC(list->strings, + sizeof(list->strings[0]) * num_alloc_strings); if (!new_strings) return WIMLIB_ERR_NOMEM; - set->strings = new_strings; - set->num_alloc_strings = num_alloc_strings; + list->strings = new_strings; + list->num_alloc_strings = num_alloc_strings; } - set->strings[set->num_strings++] = str; + list->strings[list->num_strings++] = str; return 0; } @@ -280,8 +293,8 @@ parse_text_file(const tchar *path, tchar *buf, size_t buflen, return ret; } - ret = string_set_append(pos_sections[current_section].strings, - line_begin); + ret = string_list_append(pos_sections[current_section].strings, + line_begin); if (ret) return ret; } @@ -289,13 +302,14 @@ parse_text_file(const tchar *path, tchar *buf, size_t buflen, } /** - * do_load_text_file - + * load_text_file - * - * Read and parse lines from a text file from an on-disk file or a buffer. - * The file may contain sections, like in an INI file. + * Read and parse lines from a text file given as an on-disk file, standard + * input, or a buffer. The file may contain sections, like in an INI file. * * @path - * Path to the file on disk to read, or a dummy name for the buffer. + * If @buf is NULL, then either the path to the file on-disk to read, or + * NULL to read from standard input. Else, a dummy name for the buffer. * @buf * If NULL, the data will be read from the @path file. Otherwise the data * will be read from this buffer. @@ -309,12 +323,11 @@ parse_text_file(const tchar *path, tchar *buf, size_t buflen, * consists of the name of the section (e.g. [ExclusionList], like in the * INI file format), along with a pointer to the list of lines parsed for * that section. Use an empty name to indicate the destination of lines - * not in any section. Each list must be initialized to an empty string - * set. + * not in any section. Each list must be initialized to empty. * @num_pos_sections * Number of entries in the @pos_sections array. * @flags - * Flags: LOAD_TEXT_FILE_REMOVE_QUOTES, LOAD_TEXT_FILE_NO_WARNINGS. + * Flags: LOAD_TEXT_FILE_* flags. * @mangle_line * Optional callback to validate and/or modify each line being read. * @@ -324,34 +337,40 @@ parse_text_file(const tchar *path, tchar *buf, size_t buflen, * LOAD_TEXT_FILE_NO_WARNINGS is specified. */ int -do_load_text_file(const tchar *path, - const void *buf, size_t bufsize, - void **mem_ret, - const struct text_file_section *pos_sections, - int num_pos_sections, - int flags, - line_mangle_t mangle_line) +load_text_file(const tchar *path, const void *buf, size_t bufsize, + void **mem_ret, + const struct text_file_section *pos_sections, + int num_pos_sections, + int flags, line_mangle_t mangle_line) { int ret; - bool pathmode = (buf == NULL); + bool is_filemode = (buf == NULL); + bool is_stdin = (is_filemode && path == NULL); tchar *tstr; size_t tstr_nchars; - if (pathmode) { - ret = read_file_contents(path, (void **)&buf, &bufsize); + if (is_stdin && !(flags & LOAD_TEXT_FILE_ALLOW_STDIN)) + return WIMLIB_ERR_INVALID_PARAM; + + if (is_filemode) { + if (is_stdin) + ret = stdin_get_contents((void **)&buf, &bufsize); + else + ret = read_file_contents(path, (void **)&buf, &bufsize); if (ret) return ret; } ret = translate_text_buffer(buf, bufsize, &tstr, &tstr_nchars); - if (pathmode) + if (is_filemode) FREE((void *)buf); if (ret) return ret; tstr[tstr_nchars++] = T('\n'); - ret = parse_text_file(path, tstr, tstr_nchars, pos_sections, + ret = parse_text_file(is_stdin ? T("") : path, + tstr, tstr_nchars, pos_sections, num_pos_sections, flags, mangle_line); if (ret) { for (int i = 0; i < num_pos_sections; i++)