README.org: fzf example: preview window make bigger

Was 50%:50% and by UX we do not need the half of the screen for the dictionary name.

.clang-format

@@ -15,7 +15,7 @@ BreakBeforeBinaryOperators: true
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: true
 BinPackParameters: true
-ColumnLimit:     0
+ColumnLimit:     120
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 DerivePointerAlignment: false
 ExperimentalAutoDetectBinPacking: false

.github/workflows/main.yml

@@ -0,0 +1,50 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  schedule:
+    - cron: '00 02 */4 * *'
+env:
+  RUST_BACKTRACE: 1
+jobs:
+  tests:
+    name: Run tests
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+
+      matrix:
+        os: [ubuntu-22.04, ubuntu-latest]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: jwlawson/actions-setup-cmake@v2
+        with:
+          cmake-version: '3.10'
+          github-api-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Check versions
+        run: |
+          set -e
+          cmake --version
+          gcc --version
+          echo "end of versions checking"
+        shell: bash
+      - uses: awalsh128/cache-apt-pkgs-action@v1
+        with:
+          packages: libglib2.0-dev
+          version: 1.0
+      - name: Run tests
+        run: |
+          set -e
+          cd $GITHUB_WORKSPACE
+          mkdir build
+          cd build
+          cmake -DBUILD_TESTS=True ..
+          make -k -j2 VERBOSE=1
+          ctest --output-on-failure
+        shell: bash

.travis.yml

@@ -1,49 +0,0 @@
-#
-# Available repositories are listed here:
-# https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
-#
-
-sudo: false
-
-language: cpp
-
-matrix:
-  include:
-    - env: COMPILER_VERSION=4.8
-      os: linux
-      compiler: g++
-      addons:
-        apt:
-          sources:
-          - ubuntu-toolchain-r-test
-          - kalakris-cmake
-          - ubuntu-sdk-team
-          packages:
-          - g++-4.8
-          - cmake
-          - libglib2.0-dev
-          - jq
-    # - env: COMPILER_VERSION=3.5
-    #   os: linux
-    #   compiler: clang++
-    #   addons:
-    #     apt:
-    #       sources:
-    #       - ubuntu-toolchain-r-test
-    #       - llvm-toolchain-precise-3.5
-    #       packages:
-    #       - clang-3.5
-    #       - cmake
-    #       - libglib2.0-dev
-
-
-before_script:
-  - mkdir build
-  - cd build
-  - CC=$CC-${COMPILER_VERSION} CXX=$CXX-${COMPILER_VERSION} cmake -DBUILD_TESTS=True ..
-  - cd ..
-
-script:
-  - cd build
-  - make -k -j2 VERBOSE=1
-  - ctest --output-on-failure

CMakeLists.txt

@@ -1,24 +1,18 @@
+cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
+cmake_policy(VERSION 3.10)
+
 project(sdcv)
 
-# Older versions have a different signature for CMAKE_MINIMUM_REQUIRED,
+set(CMAKE_CXX_STANDARD 11)
-# check it manually just to make sure
+set(CMAKE_CXX_STANDARD_REQUIRED True)
-if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.8)
+set(CMAKE_CXX_EXTENSIONS False)
-  message(FATAL_ERROR "${PROJECT_NAME} requires at least CMake v2.8."
-		" You are running v${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}."
-		" Please upgrade." )
-endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.8)
-
-# If we get this far, use the modern signature.  This will also cause newer
-# CMake versions to try to be backwards-compatible with the desired version
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-cmake_policy(VERSION 2.8)
 
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler.cmake")
 
 set(ZLIB_FIND_REQUIRED True)
 include(FindZLIB)
 
-set(GLIB2_REQ "'glib-2.0 >= 2.6.1'")
+set(GLIB2_REQ "'glib-2.0 >= 2.36'")
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindGLIB2.cmake")
 
@@ -33,7 +27,8 @@ if (WITH_READLINE)
   find_path(READLINE_INCLUDE_DIR readline/readline.h)
   find_library(READLINE_LIBRARY NAMES readline)
   if (NOT (READLINE_INCLUDE_DIR AND READLINE_LIBRARY))
-    set(WITH_READLINE False CACHE FORCE)
+    message(STATUS "readline library not FOUND, disable it's usage")
+    set(WITH_READLINE False CACHE BOOL "Use readline library" FORCE)
   endif ()
 endif (WITH_READLINE)
 
@@ -88,10 +83,13 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
 include_directories(
 	${ZLIB_INCLUDE_DIR}
 	${GLIB2_INCLUDE_DIRS}
-	${READLINE_INCLUDE_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/src/lib
 	${CMAKE_CURRENT_BINARY_DIR}
-)
+      )
+
+if (WITH_READLINE)
+  include_directories(${READLINE_INCLUDE_DIR})
+endif()
 
 #
 # Packing stuff
@@ -101,7 +99,7 @@ set(CPACK_PACKAGE_VENDOR "Evgeniy Dushistov <dushistov@mail.ru>")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.org")
 set(CPACK_PACKAGE_VERSION_MAJOR "0")
 set(CPACK_PACKAGE_VERSION_MINOR "5")
-set(CPACK_PACKAGE_VERSION_PATCH "2")
+set(CPACK_PACKAGE_VERSION_PATCH "5")
 
 set(sdcv_VERSION
 	"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
@@ -113,8 +111,10 @@ add_executable(sdcv ${sdcv_SRCS})
 target_link_libraries(sdcv
   ${GLIB2_LIBRARIES}
   ${ZLIB_LIBRARIES}
-  ${READLINE_LIBRARY}
 )
+if (WITH_READLINE)
+  target_link_libraries(sdcv ${READLINE_LIBRARY})
+endif()
 if (ENABLE_NLS)
   set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "locale")
 endif ()
@@ -152,5 +152,8 @@ if (BUILD_TESTS)
   add_sdcv_shell_test(t_utf8output)
   add_sdcv_shell_test(t_utf8input)
   add_sdcv_shell_test(t_datadir)
+  add_sdcv_shell_test(t_return_code)
+  add_sdcv_shell_test(t_multiple_results)
+  add_sdcv_shell_test(t_newlines_in_ifo)
 
 endif (BUILD_TESTS)

NEWS

@@ -1,9 +1,25 @@
+Version 0.5.5
+    - Avoid crashes when passing unknown dicts to the -u flag (by NiLuJe)
+    - Use off_t for stuff mainly assigned to a stat.st_size value
+Version 0.5.4
+    - Use binary search for synonyms
+    - Various improvments in work with synonyms
+    - Added --json (same as --json-output) to match man
+    - Show all matched result
+    - More robust parsing of ifo file
+    - Prevent crash if file size of files not matched expecting one for .oft files
+Version 0.5.3
+  - Use single quotes around JSON data to reduce need for escaping
+  - Store integer magic in cache file
+  - Added $SDCV_HISTFILE to set history file
+  - return exit code 2 if search term not found
+  - Comply with the XDG Base Directory Specification
 Version 0.5.2
-Synonyms index support (.syn files) by Peter <craven@gmx.net>
+  - Synonyms index support (.syn files) by Peter <craven@gmx.net>
-Add support of json output by Peter <craven@gmx.net> (--json-output)
+  - Add support of json output by Peter <craven@gmx.net> (--json-output)
-Add -e for exact searches (no fuzzy matches) by Peter <craven@gmx.net>
+  - Add -e for exact searches (no fuzzy matches) by Peter <craven@gmx.net>
-Fix build with clang 3.4.1
+  - Fix build with clang 3.4.1
-fix FSF address in license by Tomáš Čech <sleep_walker@suse.com>
+  - fix FSF address in license by Tomáš Čech <sleep_walker@suse.com>
 
 Version 0.5.1
  Fix usage of SDCV_PAGER by Anton Yuzhaninov

README.org

@@ -1,6 +1,9 @@
 #+OPTIONS: ^:nil
-[[https://travis-ci.org/Dushistov/sdcv][https://travis-ci.org/Dushistov/sdcv.svg?branch=master]]
+[[https://github.com/Dushistov/sdcv/actions?query=workflow%3ACI+branch%3Amaster][https://github.com/Dushistov/sdcv/workflows/CI/badge.svg]]
 [[https://github.com/Dushistov/sdcv/blob/master/LICENSE][https://img.shields.io/badge/license-GPL%202-brightgreen.svg]]
+
+* sdcv
+*sdcv* is a simple, cross-platform, text-based utility for working with dictionaries in [[http://stardict-4.sourceforge.net/][StarDict]] format.
 * How to compile and install
 #+BEGIN_SRC sh
 mkdir /tmp/build-sdcv
@@ -22,9 +25,30 @@ you can use "DESTDIR" variable to change installation path
 See sdcv man page for usage description.
 
 * Bugs
-If you find bug reports it via email to dushistov at mail dot ru. 
+To report bugs use https://github.com/Dushistov/sdcv/issues ,
+if it is not possible you can report it via email to dushistov at mail dot ru.
 Be sure to include the word "sdcv" somewhere in the "Subject:" field.
 
+* Integration with [[https://github.com/junegunn/fzf][fzf]]
+Useful when you have multiple dictionaries
+#+BEGIN_SRC sh
+fzf --prompt="Dict: " \
+    --phony \
+    --bind "enter:reload(sdcv {q} -n --json | jq '.[].dict' -r)" \
+    --preview "sdcv {q} -en --use-dict={}" \
+    --preview-window=right:70%:wrap \
+   < <(echo)
+#+END_SRC
+
+* Integration with readline
+This lines can be added to inputrc file (~/.inputrc, /etc/inputrc),
+to abort multiply usage with ESC:
+#+begin_src
+$if sdcv
+    "\e\e": "-1\n"
+$endif
+#+end_src
+
 * Notes to developer
 ** make source code release
 #+BEGIN_SRC sh

cmake/compiler.cmake

@@ -16,19 +16,6 @@ if (NOT DEFINED SDCV_COMPILER_IS_GCC_COMPATIBLE)
   endif()
 endif()
 
-if (MSVC AND (MSVC_VERSION LESS 1900))
-  message(FATAL_ERROR "MSVC version ${MSVC_VERSION} have no full c++11 support")
-elseif (MSVC)
-  add_definitions(-DNOMINMAX)
-elseif (NOT MSVC)
-  check_cxx_compiler_flag("-std=c++11" CXX_SUPPORTS_CXX11)
-  if (CXX_SUPPORTS_CXX11)
-    append("-std=c++11" CMAKE_CXX_FLAGS)
-  else ()
-    message(FATAL_ERROR "sdcv requires C++11 support but the '-std=c++11' flag isn't supported.")
-  endif()
-endif ()
-
 if (SDCV_COMPILER_IS_GCC_COMPATIBLE)
   append("-Wall" "-Wextra" "-Wformat-security" "-Wcast-align" "-Werror=format" "-Wcast-qual" CMAKE_C_FLAGS)
   append("-Wall" "-pedantic" "-Wextra" "-Wformat-security" "-Wcast-align" "-Werror=format" "-Wcast-qual" CMAKE_CXX_FLAGS)

doc/sdcv.1

@@ -25,7 +25,7 @@ you can use the UP and DOWN keys to cycle through history.
 .B "\-h  \-\-help"
 Display help message and exit
 .TP 8
-.B "\-v \-\-verbose"
+.B "\-v \-\-version"
 Display version and exit
 .TP 8
 .B "\-l \-\-list\-dicts" 
@@ -64,7 +64,7 @@ Use ANSI escape codes for colorizing sdcv output (does not work with json output
 .TP 
 /usr/share/stardict/dic
 .TP
-$(HOME)/.stardict/dic
+$(XDG_DATA_HOME)/stardict/dic
 
 Place where sdcv expects to find dictionaries.
 Instead of /usr/share/stardict/dic you can use any directory
@@ -72,12 +72,12 @@ you want, just set the STARDICT_DATA_DIR environment variable.
 For example, if you have dictionaries in /mnt/data/stardict-dicts/dic,
 set STARDICT_DATA_DIR to /mnt/data/stardict-dicts.
 .TP
-$(HOME)/.sdcv_history
+$(XDG_DATA_HOME)/sdcv_history
 
 This file includes the last $(SDCV_HISTSIZE) words, which you sought with sdcv.
 SDCV uses this file only if it was compiled with readline library support.
 .TP
-$(HOME)/.sdcv_ordering
+$(XDG_CONFIG_HOME)/sdcv_ordering
 
 This is a text file containing one dictionary bookname per line.
 It specifies in which order the results of a search should be shown.
@@ -86,11 +86,14 @@ Environment Variables Used By \fIsdcv\fR:
 .TP 20
 .B STARDICT_DATA_DIR
 If set, sdcv uses this variable as the data directory, this means that sdcv
-searches dictionaries in $\fBSTARDICT_DATA_DIR\fR\\dic
+searches dictionaries in $\fBSTARDICT_DATA_DIR\fR/dic
 .TP 20
 .B SDCV_HISTSIZE
-If set, sdcv writes in $(HOME)/.sdcv_history the last $(SDCV_HISTSIZE) words, 
+If set, sdcv writes in $(XDG_DATA_HOME)/sdcv_history (or $(SDCV_HISTFILE)) the last $(SDCV_HISTSIZE) words,
-which you look up using sdcv. If it is not set, then the last 2000 words are saved in $(HOME)/.sdcv_history.
+which you look up using sdcv. If it is not set, then the last 2000 words are saved in $(XDG_DATA_HOME)/sdcv_history.
+.TP 20
+.B SDCV_HISTFILE
+If set, sdcv writes it's history to $(SDCV_HISTFILE). If it is not set, then the default $(XDG_DATA_HOME)/sdcv_history path will be used.
 .TP 20
 .B SDCV_PAGER
 If SDCV_PAGER is set, its value is used as the name of the program

doc/uk/sdcv.1

@@ -50,7 +50,7 @@ sdcv проста, міжплатформена текстова утиліта
 .TP 
 /usr/share/stardict/dic 
 .TP
-$(HOME)/.stardict/dic
+$(XDG_DATA_HOME)/stardict/dic
 
 Місце, де sdcv очікує знайти словники.
 Замість шляху /usr/share/stardict/dic Ви можете використовувати все, 
@@ -58,7 +58,7 @@ $(HOME)/.stardict/dic
 Наприклад, якщо Ви маєте словники у теці /mnt/data/stardict-dicts/dic, 
 встановіть STARDICT_DATA_DIR у /mnt/data/stardict-dicts.
 .TP
-$(HOME)/.sdcv_history
+$(XDG_DATA_HOME)/sdcv_history
 
 Цей файл містить останні $(SDCV_HISTSIZE) слова, які Ви шукали з sdcv.
 SDCV використовує цей файл при умові, якщо sdcv був скомпільований 
@@ -69,12 +69,12 @@ SDCV використовує цей файл при умові, якщо sdcv
 .TP 20
 .B STARDICT_DATA_DIR
 Якщо встановлена, sdcv використає цю змінну як теку даних, це означає, 
-що sdcv шукатиме словники у $\fBSTARDICT_DATA_DIR\fR\dic
+що sdcv шукатиме словники у $\fBSTARDICT_DATA_DIR\fR/dic
 .TP 20
 .B SDCV_HISTSIZE
-Якщо встановлена, sdcv писатиме у $(HOME)/.sdcv_history лише 
+Якщо встановлена, sdcv писатиме у $(XDG_DATA_HOME)/sdcv_history лише
 останні $(SDCV_HISTSIZE) слова, які Ви шукали з sdcv. Якщо не встановлена, 
-то збірігатиметься останніх 2000 слів у $(HOME)/.sdcv_history.
+то збірігатиметься останніх 2000 слів у $(XDG_DATA_HOME)/sdcv_history.
 .SH BUGS
 Звіти про помилки висилайте на адресу dushistov на mail крапка ru. 
 Не забувайте включати слово "sdcv" десь у полі "Тема:".

po/cs.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sdcv 0.4.2\n"
 "Report-Msgid-Bugs-To: dushistov@mail.ru\n"
-"POT-Creation-Date: 2017-08-16 09:52+0300\n"
+"POT-Creation-Date: 2020-08-14 12:58+0300\n"
 "PO-Revision-Date: 2008-09-24 10:42+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -20,21 +20,21 @@ msgstr ""
 msgid "popen failed"
 msgstr "popen selhalo"
 
-#: ../src/libwrapper.cpp:340
+#: ../src/libwrapper.cpp:341
 #, c-format
 msgid "Can not convert %s to utf8.\n"
 msgstr "Nepodařilo se převést %s do utf8.\n"
 
-#: ../src/libwrapper.cpp:398 ../src/libwrapper.cpp:432
+#: ../src/libwrapper.cpp:399 ../src/libwrapper.cpp:433
 #, fuzzy, c-format
 msgid "Found %zu items, similar to %s.\n"
 msgstr "Nalezeno %d záznamů podobných %s.\n"
 
-#: ../src/libwrapper.cpp:416
+#: ../src/libwrapper.cpp:417
 msgid "Your choice[-1 to abort]: "
 msgstr "Vaše volba [-1 pro ukončení]: "
 
-#: ../src/libwrapper.cpp:426
+#: ../src/libwrapper.cpp:427
 #, fuzzy, c-format
 msgid ""
 "Invalid choice.\n"
@@ -43,102 +43,102 @@ msgstr ""
 "Chybná volba.\n"
 "Musí být mezi 0 a %d nebo -1.\n"
 
-#: ../src/libwrapper.cpp:445
+#: ../src/libwrapper.cpp:446
 #, c-format
 msgid "Nothing similar to %s, sorry :(\n"
 msgstr "Nic podobného %s nenalezeno, promiň :(\n"
 
-#: ../src/sdcv.cpp:88
+#: ../src/sdcv.cpp:89
 #, fuzzy
 msgid "display version information and exit"
 msgstr "-v, --version            zobrazí informace o verzi a skončí\n"
 
-#: ../src/sdcv.cpp:90
+#: ../src/sdcv.cpp:91
 #, fuzzy
 msgid "display list of available dictionaries and exit"
 msgstr "-l, --list-dicts         zobrazí seznam dostupných slovníků a skončí\n"
 
-#: ../src/sdcv.cpp:92
+#: ../src/sdcv.cpp:93
 #, fuzzy
 msgid "for search use only dictionary with this bookname"
 msgstr "-u, --use-dict jméno     vyhledávat jen v zadaném slovníku\n"
 
-#: ../src/sdcv.cpp:93
+#: ../src/sdcv.cpp:94
 msgid "bookname"
 msgstr ""
 
-#: ../src/sdcv.cpp:95
+#: ../src/sdcv.cpp:96
 msgid "for use in scripts"
 msgstr ""
 
-#: ../src/sdcv.cpp:97
+#: ../src/sdcv.cpp:98
 msgid "print the result formatted as JSON"
 msgstr ""
 
-#: ../src/sdcv.cpp:99
+#: ../src/sdcv.cpp:100
 msgid "do not fuzzy-search for similar words, only return exact matches"
 msgstr ""
 
-#: ../src/sdcv.cpp:101
+#: ../src/sdcv.cpp:102
 #, fuzzy
 msgid "output must be in utf8"
 msgstr "--utf8-output            výstup musí být v utf8\n"
 
-#: ../src/sdcv.cpp:103
+#: ../src/sdcv.cpp:104
 #, fuzzy
 msgid "input of sdcv in utf8"
 msgstr "--utf8-input             vstup musí být v utf8\n"
 
-#: ../src/sdcv.cpp:105
+#: ../src/sdcv.cpp:106
 #, fuzzy
 msgid "use this directory as path to stardict data directory"
 msgstr ""
 "--data-dir cesta/někam   použít tento adresář jako cestu ke slovníkům "
 "stardict\n"
 
-#: ../src/sdcv.cpp:106
+#: ../src/sdcv.cpp:107
 msgid "path/to/dir"
 msgstr ""
 
-#: ../src/sdcv.cpp:108
+#: ../src/sdcv.cpp:109
 msgid ""
 "only use the dictionaries in data-dir, do not search in user and system "
 "directories"
 msgstr ""
 
-#: ../src/sdcv.cpp:110
+#: ../src/sdcv.cpp:111
 msgid "colorize the output"
 msgstr ""
 
-#: ../src/sdcv.cpp:115
+#: ../src/sdcv.cpp:116
 msgid " words"
 msgstr ""
 
-#: ../src/sdcv.cpp:121
+#: ../src/sdcv.cpp:122
 #, c-format
 msgid "Invalid command line arguments: %s\n"
 msgstr ""
 
-#: ../src/sdcv.cpp:127
+#: ../src/sdcv.cpp:128
 #, c-format
 msgid "Console version of Stardict, version %s\n"
 msgstr "Konzolová verze Stardictu, verze %s\n"
 
-#: ../src/sdcv.cpp:202
+#: ../src/sdcv.cpp:206
 #, c-format
 msgid "g_mkdir failed: %s\n"
 msgstr "g_mkdir selhalo: %s\n"
 
-#: ../src/sdcv.cpp:217
+#: ../src/sdcv.cpp:222
 msgid "Enter word or phrase: "
 msgstr "Zadejte slovo nebo frázi: "
 
-#: ../src/sdcv.cpp:225
+#: ../src/sdcv.cpp:230
 #, c-format
 msgid "There are no words/phrases to translate.\n"
 msgstr "Nebyla zadáno nic k přeložení.\n"
 
-#: ../src/sdcv.cpp:237
+#: ../src/sdcv.cpp:242
 #, c-format
 msgid "Dictionary's name   Word count\n"
 msgstr "Jméno slovníku      Počet slov\n"

po/fr.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sdcv 0.4.2\n"
 "Report-Msgid-Bugs-To: dushistov@mail.ru\n"
-"POT-Creation-Date: 2017-08-16 09:52+0300\n"
+"POT-Creation-Date: 2020-08-14 12:58+0300\n"
 "PO-Revision-Date: 2009-06-15 23:20+0800\n"
 "Language-Team: Vincent Petry <PVince81@yahoo.fr>\n"
 "Language: \n"
@@ -22,21 +22,21 @@ msgstr ""
 msgid "popen failed"
 msgstr "Échec de popen"
 
-#: ../src/libwrapper.cpp:340
+#: ../src/libwrapper.cpp:341
 #, c-format
 msgid "Can not convert %s to utf8.\n"
 msgstr "Ne peut convertir %s au format utf8.\n"
 
-#: ../src/libwrapper.cpp:398 ../src/libwrapper.cpp:432
+#: ../src/libwrapper.cpp:399 ../src/libwrapper.cpp:433
 #, fuzzy, c-format
 msgid "Found %zu items, similar to %s.\n"
 msgstr "Trouvé %d éléments similaires à %s.\n"
 
-#: ../src/libwrapper.cpp:416
+#: ../src/libwrapper.cpp:417
 msgid "Your choice[-1 to abort]: "
 msgstr "Votre choix[-1 pour abandonner] : "
 
-#: ../src/libwrapper.cpp:426
+#: ../src/libwrapper.cpp:427
 #, fuzzy, c-format
 msgid ""
 "Invalid choice.\n"
@@ -45,107 +45,107 @@ msgstr ""
 "Selection invalide.\n"
 "Veuillez choisir un nombre entre 0 et %d, ou -1.\n"
 
-#: ../src/libwrapper.cpp:445
+#: ../src/libwrapper.cpp:446
 #, c-format
 msgid "Nothing similar to %s, sorry :(\n"
 msgstr "Aucun mot/phrase similaire à %s, désolé :(\n"
 
-#: ../src/sdcv.cpp:88
+#: ../src/sdcv.cpp:89
 #, fuzzy
 msgid "display version information and exit"
 msgstr ""
 "-v, --version            afficher les informations de version et sortir\n"
 
-#: ../src/sdcv.cpp:90
+#: ../src/sdcv.cpp:91
 #, fuzzy
 msgid "display list of available dictionaries and exit"
 msgstr ""
 "-l, --list-dicts         afficher la liste des dictionnaires disponibles et "
 "sortir\n"
 
-#: ../src/sdcv.cpp:92
+#: ../src/sdcv.cpp:93
 #, fuzzy
 msgid "for search use only dictionary with this bookname"
 msgstr ""
 "-u, --use-dict nom_dict  pour chercher seulement en utilisant le "
 "dictionnaire spécifié\n"
 
-#: ../src/sdcv.cpp:93
+#: ../src/sdcv.cpp:94
 msgid "bookname"
 msgstr ""
 
-#: ../src/sdcv.cpp:95
+#: ../src/sdcv.cpp:96
 msgid "for use in scripts"
 msgstr ""
 
-#: ../src/sdcv.cpp:97
+#: ../src/sdcv.cpp:98
 msgid "print the result formatted as JSON"
 msgstr ""
 
-#: ../src/sdcv.cpp:99
+#: ../src/sdcv.cpp:100
 msgid "do not fuzzy-search for similar words, only return exact matches"
 msgstr ""
 
-#: ../src/sdcv.cpp:101
+#: ../src/sdcv.cpp:102
 #, fuzzy
 msgid "output must be in utf8"
 msgstr "--utf8-output            force la sortie au format utf8\n"
 
-#: ../src/sdcv.cpp:103
+#: ../src/sdcv.cpp:104
 #, fuzzy
 msgid "input of sdcv in utf8"
 msgstr "--utf8-input             force l'entrée de sdcv au format utf8\n"
 
-#: ../src/sdcv.cpp:105
+#: ../src/sdcv.cpp:106
 #, fuzzy
 msgid "use this directory as path to stardict data directory"
 msgstr ""
 "--data-dir chemin        utiliser ce chemin pour trouver les données de "
 "stardict\n"
 
-#: ../src/sdcv.cpp:106
+#: ../src/sdcv.cpp:107
 msgid "path/to/dir"
 msgstr ""
 
-#: ../src/sdcv.cpp:108
+#: ../src/sdcv.cpp:109
 msgid ""
 "only use the dictionaries in data-dir, do not search in user and system "
 "directories"
 msgstr ""
 
-#: ../src/sdcv.cpp:110
+#: ../src/sdcv.cpp:111
 msgid "colorize the output"
 msgstr ""
 
-#: ../src/sdcv.cpp:115
+#: ../src/sdcv.cpp:116
 msgid " words"
 msgstr ""
 
-#: ../src/sdcv.cpp:121
+#: ../src/sdcv.cpp:122
 #, c-format
 msgid "Invalid command line arguments: %s\n"
 msgstr ""
 
-#: ../src/sdcv.cpp:127
+#: ../src/sdcv.cpp:128
 #, c-format
 msgid "Console version of Stardict, version %s\n"
 msgstr "Version console de Stardict, version %s\n"
 
-#: ../src/sdcv.cpp:202
+#: ../src/sdcv.cpp:206
 #, c-format
 msgid "g_mkdir failed: %s\n"
 msgstr "Échec de g_mkdir : %s\n"
 
-#: ../src/sdcv.cpp:217
+#: ../src/sdcv.cpp:222
 msgid "Enter word or phrase: "
 msgstr "Entrez un mot ou une phrase: "
 
-#: ../src/sdcv.cpp:225
+#: ../src/sdcv.cpp:230
 #, c-format
 msgid "There are no words/phrases to translate.\n"
 msgstr "Il n'y a pas de mots/phrases à traduire.\n"
 
-#: ../src/sdcv.cpp:237
+#: ../src/sdcv.cpp:242
 #, c-format
 msgid "Dictionary's name   Word count\n"
 msgstr "Nom dictionnaire    Nombre de mots\n"

po/ka.po

@@ -0,0 +1,147 @@
+# Georgian translation for sdcv.
+# Copyright (C) 2025 sdcv authors
+# This file is distributed under the same license as the sdcv project.
+# Temuri Doghonadze <temuri.doghonadze@gmail.com>, 2025.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sdcv 0.5\n"
+"Report-Msgid-Bugs-To: dushistov@mail.ru\n"
+"POT-Creation-Date: 2020-08-14 12:58+0300\n"
+"PO-Revision-Date: 2025-01-26 03:17+0100\n"
+"Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
+"Language-Team: Georgian <(nothing)>\n"
+"Language: ka\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.5\n"
+
+#: ../src/libwrapper.cpp:300
+msgid "popen failed"
+msgstr "popen ჩავარდა"
+
+#: ../src/libwrapper.cpp:341
+#, c-format
+msgid "Can not convert %s to utf8.\n"
+msgstr "%s-ის utf8-ში გადაყვანა შეუძლებელია.\n"
+
+#: ../src/libwrapper.cpp:399 ../src/libwrapper.cpp:433
+#, c-format
+msgid "Found %zu items, similar to %s.\n"
+msgstr "აღმოჩენილია %zu ელემენტი, რომელიც %s-ს ჰგავს.\n"
+
+#: ../src/libwrapper.cpp:417
+msgid "Your choice[-1 to abort]: "
+msgstr "თქვენი არჩევანი[-1 გასაუქმებლად]: "
+
+#: ../src/libwrapper.cpp:427
+#, c-format
+msgid ""
+"Invalid choice.\n"
+"It must be from 0 to %zu or -1.\n"
+msgstr ""
+"არასწორი არჩევანი.\n"
+"უნდა იყოს 0-დან %zu-მდე, ან -1.\n"
+
+#: ../src/libwrapper.cpp:446
+#, c-format
+msgid "Nothing similar to %s, sorry :(\n"
+msgstr "%s-ს არაფერი ჰგავს :(\n"
+
+#: ../src/sdcv.cpp:89
+msgid "display version information and exit"
+msgstr "ვერსიის ჩვენება და გასვლა"
+
+#: ../src/sdcv.cpp:91
+msgid "display list of available dictionaries and exit"
+msgstr "ხელმისაწვდომი ლექსიკონების ჩვენება და გასვლა"
+
+#: ../src/sdcv.cpp:93
+msgid "for search use only dictionary with this bookname"
+msgstr "ძებნისთვის, მხოლოდ, ამ სახელის მქონე ლექსიკონის გამოყენება"
+
+#: ../src/sdcv.cpp:94
+msgid "bookname"
+msgstr "ლექსიკონის_სახელი"
+
+#: ../src/sdcv.cpp:96
+msgid "for use in scripts"
+msgstr "სკრიპტებში გამოსაყენებლად"
+
+#: ../src/sdcv.cpp:98
+msgid "print the result formatted as JSON"
+msgstr "შედეგების JSON ფორმატში გამოტანა"
+
+#: ../src/sdcv.cpp:100
+msgid "do not fuzzy-search for similar words, only return exact matches"
+msgstr ""
+"მსგავსი სიტყვებისთვის არაზუსტი ძებნა გამოყენებული არ იქნება. "
+"დაბრუნდება, მხოლოდ, ზუსტი დამთხვევები"
+
+#: ../src/sdcv.cpp:102
+msgid "output must be in utf8"
+msgstr "გამოტანა utf8-ში უნდა იყოს"
+
+#: ../src/sdcv.cpp:104
+msgid "input of sdcv in utf8"
+msgstr "პროგრამაში შეყვანა utf8 -ში"
+
+#: ../src/sdcv.cpp:106
+msgid "use this directory as path to stardict data directory"
+msgstr ""
+"ამ საქაღალდის გამოყენება stardict-ის მონაცემების საქაღალდის ბილიკად"
+
+#: ../src/sdcv.cpp:107
+msgid "path/to/dir"
+msgstr "ბილიკი/სასურველ/საქაღალდემდე"
+
+#: ../src/sdcv.cpp:109
+msgid ""
+"only use the dictionaries in data-dir, do not search in user and system "
+"directories"
+msgstr ""
+"ლექსიკონების, მხოლოდ, data-dir-დან გამოყენება. მომხმარებლის და სისტემურ "
+"საქაღალდეებში ძებნა არ მოხდება"
+
+#: ../src/sdcv.cpp:111
+msgid "colorize the output"
+msgstr "ფერებში გამოტანა"
+
+#: ../src/sdcv.cpp:116
+msgid " words"
+msgstr " სიტყვა"
+
+#: ../src/sdcv.cpp:122
+#, c-format
+msgid "Invalid command line arguments: %s\n"
+msgstr "არასწორი ბრძანების სტრიქონის არგუმენტები: %s\n"
+
+#: ../src/sdcv.cpp:128
+#, c-format
+msgid "Console version of Stardict, version %s\n"
+msgstr "Startdict-ის კონსოლის ვერსია. ვერსია %s\n"
+
+#: ../src/sdcv.cpp:206
+#, c-format
+msgid "g_mkdir failed: %s\n"
+msgstr "g_mkdir ჩავარდა: %s\n"
+
+#: ../src/sdcv.cpp:222
+msgid "Enter word or phrase: "
+msgstr "შეიყვანეთ სიტყვა ან ფრაზა: "
+
+#: ../src/sdcv.cpp:230
+#, c-format
+msgid "There are no words/phrases to translate.\n"
+msgstr "სათარგმნი სიტყვების/ფრაზების გარეშე.\n"
+
+#: ../src/sdcv.cpp:242
+#, c-format
+msgid "Dictionary's name   Word count\n"
+msgstr "ლექსიკონის სახელი     სიტყვების რაოდენობა\n"
+
+#: ../src/utils.cpp:48
+#, c-format
+msgid "Can not convert %s to current locale.\n"
+msgstr "ვერ გადავიყვანე %s მიმდინარე ლოკალში.\n"

po/ru.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sdcv 0.5\n"
 "Report-Msgid-Bugs-To: dushistov@mail.ru\n"
-"POT-Creation-Date: 2017-08-16 09:52+0300\n"
+"POT-Creation-Date: 2020-08-14 12:58+0300\n"
 "PO-Revision-Date: 2017-08-16 10:05+0300\n"
 "Last-Translator: Evgeniy Dushistov <dushistov@mail.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -23,21 +23,21 @@ msgstr ""
 msgid "popen failed"
 msgstr "функция popen завершилась с ошибкой"
 
-#: ../src/libwrapper.cpp:340
+#: ../src/libwrapper.cpp:341
 #, c-format
 msgid "Can not convert %s to utf8.\n"
 msgstr "Не могу преобразовать %s в utf8.\n"
 
-#: ../src/libwrapper.cpp:398 ../src/libwrapper.cpp:432
+#: ../src/libwrapper.cpp:399 ../src/libwrapper.cpp:433
 #, c-format
 msgid "Found %zu items, similar to %s.\n"
 msgstr "Найдено %zu слов, похожих на %s.\n"
 
-#: ../src/libwrapper.cpp:416
+#: ../src/libwrapper.cpp:417
 msgid "Your choice[-1 to abort]: "
 msgstr "Ваш выбор[-1 - отмена]: "
 
-#: ../src/libwrapper.cpp:426
+#: ../src/libwrapper.cpp:427
 #, c-format
 msgid ""
 "Invalid choice.\n"
@@ -46,95 +46,98 @@ msgstr ""
 "Неправильный выбор.\n"
 "Должно быть от 0 до %zu или -1.\n"
 
-#: ../src/libwrapper.cpp:445
+#: ../src/libwrapper.cpp:446
 #, c-format
 msgid "Nothing similar to %s, sorry :(\n"
 msgstr "Ничего похожего на %s, извините :(\n"
 
-#: ../src/sdcv.cpp:88
+#: ../src/sdcv.cpp:89
 msgid "display version information and exit"
 msgstr "показать номер версии и завершить работу"
 
-#: ../src/sdcv.cpp:90
+#: ../src/sdcv.cpp:91
 msgid "display list of available dictionaries and exit"
 msgstr "показать список доступных словарей и завершить работу"
 
-#: ../src/sdcv.cpp:92
+#: ../src/sdcv.cpp:93
 msgid "for search use only dictionary with this bookname"
 msgstr "для поиска использовать только этот словарь с таким именем"
 
-#: ../src/sdcv.cpp:93
+#: ../src/sdcv.cpp:94
 msgid "bookname"
 msgstr "имя_словаря"
 
-#: ../src/sdcv.cpp:95
+#: ../src/sdcv.cpp:96
 msgid "for use in scripts"
 msgstr "для использования в скриптах"
 
-#: ../src/sdcv.cpp:97
+#: ../src/sdcv.cpp:98
 msgid "print the result formatted as JSON"
 msgstr "выдать результат в JSON формате"
 
-#: ../src/sdcv.cpp:99
+#: ../src/sdcv.cpp:100
 msgid "do not fuzzy-search for similar words, only return exact matches"
-msgstr "не использовать нечеткий поиск похожих слов, вернуть только точные совпадения"
+msgstr ""
+"не использовать нечеткий поиск похожих слов, вернуть только точные совпадения"
 
-#: ../src/sdcv.cpp:101
+#: ../src/sdcv.cpp:102
 msgid "output must be in utf8"
 msgstr "вывод программы должен быть в utf8"
 
-#: ../src/sdcv.cpp:103
+#: ../src/sdcv.cpp:104
 msgid "input of sdcv in utf8"
 msgstr "ввод программы в utf8"
 
-#: ../src/sdcv.cpp:105
+#: ../src/sdcv.cpp:106
 msgid "use this directory as path to stardict data directory"
 msgstr ""
 "использовать эту директорию в качестве пути к \"stardict data\" директории"
 
-#: ../src/sdcv.cpp:106
+#: ../src/sdcv.cpp:107
 msgid "path/to/dir"
 msgstr "путь/до/директории"
 
-#: ../src/sdcv.cpp:108
+#: ../src/sdcv.cpp:109
 msgid ""
 "only use the dictionaries in data-dir, do not search in user and system "
 "directories"
-msgstr "использовать словари только из data-dir, не искать в пользовательских и системных каталогах"
+msgstr ""
+"использовать словари только из data-dir, не искать в пользовательских и "
+"системных каталогах"
 
-#: ../src/sdcv.cpp:110
+#: ../src/sdcv.cpp:111
 msgid "colorize the output"
 msgstr "раскрашивать вывод в разные цвета"
 
-#: ../src/sdcv.cpp:115
+#: ../src/sdcv.cpp:116
 msgid " words"
 msgstr "слова"
 
-#: ../src/sdcv.cpp:121
+#: ../src/sdcv.cpp:122
 #, c-format
 msgid "Invalid command line arguments: %s\n"
 msgstr "Неправильный аргумент командой строки: %s\n"
 
-#: ../src/sdcv.cpp:127
+#: ../src/sdcv.cpp:128
 #, c-format
 msgid "Console version of Stardict, version %s\n"
 msgstr "Консольная версия StarDict, версия %s\n"
 
-#: ../src/sdcv.cpp:202
+#: ../src/sdcv.cpp:206
 #, c-format
 msgid "g_mkdir failed: %s\n"
 msgstr "g_mkdir завершился с ошибкой: %s\n"
 
-#: ../src/sdcv.cpp:217
+#: ../src/sdcv.cpp:222
 msgid "Enter word or phrase: "
 msgstr "Введите слово или фразу: "
 
-#: ../src/sdcv.cpp:225
+#: ../src/sdcv.cpp:230
 #, c-format
 msgid "There are no words/phrases to translate.\n"
 msgstr "Не задано слова/фразы для перевода.\n"
 
-#: ../src/sdcv.cpp:237
+#: ../src/sdcv.cpp:242
 #, c-format
 msgid "Dictionary's name   Word count\n"
 msgstr "Название словаря     Количество слов\n"

po/sdcv.pot

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sdcv 0.5\n"
 "Report-Msgid-Bugs-To: dushistov@mail.ru\n"
-"POT-Creation-Date: 2017-08-16 09:52+0300\n"
+"POT-Creation-Date: 2020-08-14 12:58+0300\n"
 "PO-Revision-Date: 2017-08-16 10:01+0300\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,115 +20,115 @@ msgstr ""
 msgid "popen failed"
 msgstr ""
 
-#: ../src/libwrapper.cpp:340
+#: ../src/libwrapper.cpp:341
 #, c-format
 msgid "Can not convert %s to utf8.\n"
 msgstr ""
 
-#: ../src/libwrapper.cpp:398 ../src/libwrapper.cpp:432
+#: ../src/libwrapper.cpp:399 ../src/libwrapper.cpp:433
 #, c-format
 msgid "Found %zu items, similar to %s.\n"
 msgstr ""
 
-#: ../src/libwrapper.cpp:416
+#: ../src/libwrapper.cpp:417
 msgid "Your choice[-1 to abort]: "
 msgstr ""
 
-#: ../src/libwrapper.cpp:426
+#: ../src/libwrapper.cpp:427
 #, c-format
 msgid ""
 "Invalid choice.\n"
 "It must be from 0 to %zu or -1.\n"
 msgstr ""
 
-#: ../src/libwrapper.cpp:445
+#: ../src/libwrapper.cpp:446
 #, c-format
 msgid "Nothing similar to %s, sorry :(\n"
 msgstr ""
 
-#: ../src/sdcv.cpp:88
+#: ../src/sdcv.cpp:89
 msgid "display version information and exit"
 msgstr ""
 
-#: ../src/sdcv.cpp:90
+#: ../src/sdcv.cpp:91
 msgid "display list of available dictionaries and exit"
 msgstr ""
 
-#: ../src/sdcv.cpp:92
+#: ../src/sdcv.cpp:93
 msgid "for search use only dictionary with this bookname"
 msgstr ""
 
-#: ../src/sdcv.cpp:93
+#: ../src/sdcv.cpp:94
 msgid "bookname"
 msgstr ""
 
-#: ../src/sdcv.cpp:95
+#: ../src/sdcv.cpp:96
 msgid "for use in scripts"
 msgstr ""
 
-#: ../src/sdcv.cpp:97
+#: ../src/sdcv.cpp:98
 msgid "print the result formatted as JSON"
 msgstr ""
 
-#: ../src/sdcv.cpp:99
+#: ../src/sdcv.cpp:100
 msgid "do not fuzzy-search for similar words, only return exact matches"
 msgstr ""
 
-#: ../src/sdcv.cpp:101
+#: ../src/sdcv.cpp:102
 msgid "output must be in utf8"
 msgstr ""
 
-#: ../src/sdcv.cpp:103
+#: ../src/sdcv.cpp:104
 msgid "input of sdcv in utf8"
 msgstr ""
 
-#: ../src/sdcv.cpp:105
+#: ../src/sdcv.cpp:106
 msgid "use this directory as path to stardict data directory"
 msgstr ""
 
-#: ../src/sdcv.cpp:106
+#: ../src/sdcv.cpp:107
 msgid "path/to/dir"
 msgstr ""
 
-#: ../src/sdcv.cpp:108
+#: ../src/sdcv.cpp:109
 msgid ""
 "only use the dictionaries in data-dir, do not search in user and system "
 "directories"
 msgstr ""
 
-#: ../src/sdcv.cpp:110
+#: ../src/sdcv.cpp:111
 msgid "colorize the output"
 msgstr ""
 
-#: ../src/sdcv.cpp:115
+#: ../src/sdcv.cpp:116
 msgid " words"
 msgstr ""
 
-#: ../src/sdcv.cpp:121
+#: ../src/sdcv.cpp:122
 #, c-format
 msgid "Invalid command line arguments: %s\n"
 msgstr ""
 
-#: ../src/sdcv.cpp:127
+#: ../src/sdcv.cpp:128
 #, c-format
 msgid "Console version of Stardict, version %s\n"
 msgstr ""
 
-#: ../src/sdcv.cpp:202
+#: ../src/sdcv.cpp:206
 #, c-format
 msgid "g_mkdir failed: %s\n"
 msgstr ""
 
-#: ../src/sdcv.cpp:217
+#: ../src/sdcv.cpp:222
 msgid "Enter word or phrase: "
 msgstr ""
 
-#: ../src/sdcv.cpp:225
+#: ../src/sdcv.cpp:230
 #, c-format
 msgid "There are no words/phrases to translate.\n"
 msgstr ""
 
-#: ../src/sdcv.cpp:237
+#: ../src/sdcv.cpp:242
 #, c-format
 msgid "Dictionary's name   Word count\n"
 msgstr ""

po/sk.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sdcv 0.3.2\n"
 "Report-Msgid-Bugs-To: dushistov@mail.ru\n"
-"POT-Creation-Date: 2017-08-16 09:52+0300\n"
+"POT-Creation-Date: 2020-08-14 12:58+0300\n"
 "PO-Revision-Date: 2007-09-11 00:22+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -22,22 +22,22 @@ msgstr ""
 msgid "popen failed"
 msgstr "popen zlyhalo"
 
-#: ../src/libwrapper.cpp:340
+#: ../src/libwrapper.cpp:341
 #, c-format
 msgid "Can not convert %s to utf8.\n"
 msgstr "nie je možné konvertovať %s na utf8.\n"
 
-#: ../src/libwrapper.cpp:398 ../src/libwrapper.cpp:432
+#: ../src/libwrapper.cpp:399 ../src/libwrapper.cpp:433
 #, fuzzy, c-format
 msgid "Found %zu items, similar to %s.\n"
 msgstr "Nájdené %d položiek, podobných %s,\n"
 
-#: ../src/libwrapper.cpp:416
+#: ../src/libwrapper.cpp:417
 #, fuzzy
 msgid "Your choice[-1 to abort]: "
 msgstr "Vaša voľba[-1 zruší]: "
 
-#: ../src/libwrapper.cpp:426
+#: ../src/libwrapper.cpp:427
 #, fuzzy, c-format
 msgid ""
 "Invalid choice.\n"
@@ -46,103 +46,103 @@ msgstr ""
 "Neplatná voľba.\n"
 "Musí byť od 0 do %d alebo -1.\n"
 
-#: ../src/libwrapper.cpp:445
+#: ../src/libwrapper.cpp:446
 #, c-format
 msgid "Nothing similar to %s, sorry :(\n"
 msgstr "Ľutujem, nič sa nepodobá na %s :(\n"
 
-#: ../src/sdcv.cpp:88
+#: ../src/sdcv.cpp:89
 #, fuzzy
 msgid "display version information and exit"
 msgstr "-v, --version            zobrazí informácie o verzii a skončí\n"
 
-#: ../src/sdcv.cpp:90
+#: ../src/sdcv.cpp:91
 #, fuzzy
 msgid "display list of available dictionaries and exit"
 msgstr ""
 "-l, --list-dicts         zobrazí zoznam dostupných slovníkov a skončí\n"
 
-#: ../src/sdcv.cpp:92
+#: ../src/sdcv.cpp:93
 #, fuzzy
 msgid "for search use only dictionary with this bookname"
 msgstr "-u, --use-dict názov     použiť pre hľadanie iba zvolený slovník\n"
 
-#: ../src/sdcv.cpp:93
+#: ../src/sdcv.cpp:94
 msgid "bookname"
 msgstr ""
 
-#: ../src/sdcv.cpp:95
+#: ../src/sdcv.cpp:96
 msgid "for use in scripts"
 msgstr ""
 
-#: ../src/sdcv.cpp:97
+#: ../src/sdcv.cpp:98
 msgid "print the result formatted as JSON"
 msgstr ""
 
-#: ../src/sdcv.cpp:99
+#: ../src/sdcv.cpp:100
 msgid "do not fuzzy-search for similar words, only return exact matches"
 msgstr ""
 
-#: ../src/sdcv.cpp:101
+#: ../src/sdcv.cpp:102
 #, fuzzy
 msgid "output must be in utf8"
 msgstr "--utf8-output            výstup musí byť v utf8\n"
 
-#: ../src/sdcv.cpp:103
+#: ../src/sdcv.cpp:104
 #, fuzzy
 msgid "input of sdcv in utf8"
 msgstr "--utf8-input             vstup pre sdcv je v utf8\n"
 
-#: ../src/sdcv.cpp:105
+#: ../src/sdcv.cpp:106
 #, fuzzy
 msgid "use this directory as path to stardict data directory"
 msgstr ""
 "--data-dir path/to/dir   použiť tento priečinok ako cestu pre stardict "
 "dátový priečinok\n"
 
-#: ../src/sdcv.cpp:106
+#: ../src/sdcv.cpp:107
 msgid "path/to/dir"
 msgstr ""
 
-#: ../src/sdcv.cpp:108
+#: ../src/sdcv.cpp:109
 msgid ""
 "only use the dictionaries in data-dir, do not search in user and system "
 "directories"
 msgstr ""
 
-#: ../src/sdcv.cpp:110
+#: ../src/sdcv.cpp:111
 msgid "colorize the output"
 msgstr ""
 
-#: ../src/sdcv.cpp:115
+#: ../src/sdcv.cpp:116
 msgid " words"
 msgstr ""
 
-#: ../src/sdcv.cpp:121
+#: ../src/sdcv.cpp:122
 #, c-format
 msgid "Invalid command line arguments: %s\n"
 msgstr ""
 
-#: ../src/sdcv.cpp:127
+#: ../src/sdcv.cpp:128
 #, c-format
 msgid "Console version of Stardict, version %s\n"
 msgstr "Konzolová verzia StarDict, verzia %s\n"
 
-#: ../src/sdcv.cpp:202
+#: ../src/sdcv.cpp:206
 #, c-format
 msgid "g_mkdir failed: %s\n"
 msgstr "g_mkdir zlyhalo: %s\n"
 
-#: ../src/sdcv.cpp:217
+#: ../src/sdcv.cpp:222
 msgid "Enter word or phrase: "
 msgstr "Vložte slovo alebo frázu: "
 
-#: ../src/sdcv.cpp:225
+#: ../src/sdcv.cpp:230
 #, c-format
 msgid "There are no words/phrases to translate.\n"
 msgstr "Nie je čo preložiť.\n"
 
-#: ../src/sdcv.cpp:237
+#: ../src/sdcv.cpp:242
 #, c-format
 msgid "Dictionary's name   Word count\n"
 msgstr "názov slovníka      počet slov\n"

po/uk.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sdcv 0.3\n"
 "Report-Msgid-Bugs-To: dushistov@mail.ru\n"
-"POT-Creation-Date: 2017-08-16 09:52+0300\n"
+"POT-Creation-Date: 2020-08-14 12:58+0300\n"
 "PO-Revision-Date: 2004-12-14 17:54+0300\n"
 "Last-Translator:  <dubyk@lsl.lviv.ua>\n"
 "Language-Team: Ukrainian <dubyk@lsl.lviv.ua>\n"
@@ -23,22 +23,22 @@ msgstr ""
 msgid "popen failed"
 msgstr ""
 
-#: ../src/libwrapper.cpp:340
+#: ../src/libwrapper.cpp:341
 #, c-format
 msgid "Can not convert %s to utf8.\n"
 msgstr "Не можу перетворити %s у utf8.\n"
 
-#: ../src/libwrapper.cpp:398 ../src/libwrapper.cpp:432
+#: ../src/libwrapper.cpp:399 ../src/libwrapper.cpp:433
 #, fuzzy, c-format
 msgid "Found %zu items, similar to %s.\n"
 msgstr "Знайдено %d слів, схожих на %s.\n"
 
-#: ../src/libwrapper.cpp:416
+#: ../src/libwrapper.cpp:417
 #, fuzzy
 msgid "Your choice[-1 to abort]: "
 msgstr "Ваш вибір: "
 
-#: ../src/libwrapper.cpp:426
+#: ../src/libwrapper.cpp:427
 #, fuzzy, c-format
 msgid ""
 "Invalid choice.\n"
@@ -47,105 +47,105 @@ msgstr ""
 "Неправильний вибір.\n"
 "Повинно бути від 0 до %d.\n"
 
-#: ../src/libwrapper.cpp:445
+#: ../src/libwrapper.cpp:446
 #, c-format
 msgid "Nothing similar to %s, sorry :(\n"
 msgstr "Нічого схожого на %s, даруйте :(\n"
 
-#: ../src/sdcv.cpp:88
+#: ../src/sdcv.cpp:89
 #, fuzzy
 msgid "display version information and exit"
 msgstr "-v, --version            показати номер версії і завершити роботу\n"
 
-#: ../src/sdcv.cpp:90
+#: ../src/sdcv.cpp:91
 #, fuzzy
 msgid "display list of available dictionaries and exit"
 msgstr ""
 "-l, --list-dicts         показати список доступних словників і завершити "
 "роботу\n"
 
-#: ../src/sdcv.cpp:92
+#: ../src/sdcv.cpp:93
 #, fuzzy
 msgid "for search use only dictionary with this bookname"
 msgstr ""
 "-u, --use-dict ім`я словника  для пошуку використовувати лише цей словник\n"
 
-#: ../src/sdcv.cpp:93
+#: ../src/sdcv.cpp:94
 msgid "bookname"
 msgstr ""
 
-#: ../src/sdcv.cpp:95
+#: ../src/sdcv.cpp:96
 msgid "for use in scripts"
 msgstr ""
 
-#: ../src/sdcv.cpp:97
+#: ../src/sdcv.cpp:98
 msgid "print the result formatted as JSON"
 msgstr ""
 
-#: ../src/sdcv.cpp:99
+#: ../src/sdcv.cpp:100
 msgid "do not fuzzy-search for similar words, only return exact matches"
 msgstr ""
 
-#: ../src/sdcv.cpp:101
+#: ../src/sdcv.cpp:102
 #, fuzzy
 msgid "output must be in utf8"
 msgstr "--utf8-output            вивід програми повинен бути в utf8\n"
 
-#: ../src/sdcv.cpp:103
+#: ../src/sdcv.cpp:104
 #, fuzzy
 msgid "input of sdcv in utf8"
 msgstr "--utf8-input             ввід програми в utf8\n"
 
-#: ../src/sdcv.cpp:105
+#: ../src/sdcv.cpp:106
 #, fuzzy
 msgid "use this directory as path to stardict data directory"
 msgstr ""
 "--data-dir тека    використовувати цю теку як шлях до stardict data "
 "directory\n"
 
-#: ../src/sdcv.cpp:106
+#: ../src/sdcv.cpp:107
 msgid "path/to/dir"
 msgstr ""
 
-#: ../src/sdcv.cpp:108
+#: ../src/sdcv.cpp:109
 msgid ""
 "only use the dictionaries in data-dir, do not search in user and system "
 "directories"
 msgstr ""
 
-#: ../src/sdcv.cpp:110
+#: ../src/sdcv.cpp:111
 msgid "colorize the output"
 msgstr ""
 
-#: ../src/sdcv.cpp:115
+#: ../src/sdcv.cpp:116
 msgid " words"
 msgstr ""
 
-#: ../src/sdcv.cpp:121
+#: ../src/sdcv.cpp:122
 #, c-format
 msgid "Invalid command line arguments: %s\n"
 msgstr ""
 
-#: ../src/sdcv.cpp:127
+#: ../src/sdcv.cpp:128
 #, c-format
 msgid "Console version of Stardict, version %s\n"
 msgstr "Консольна версія Зоряного словника [Stardict], номер версії %s\n"
 
-#: ../src/sdcv.cpp:202
+#: ../src/sdcv.cpp:206
 #, c-format
 msgid "g_mkdir failed: %s\n"
 msgstr ""
 
-#: ../src/sdcv.cpp:217
+#: ../src/sdcv.cpp:222
 msgid "Enter word or phrase: "
 msgstr "ВведЁть слово або фразу: "
 
-#: ../src/sdcv.cpp:225
+#: ../src/sdcv.cpp:230
 #, c-format
 msgid "There are no words/phrases to translate.\n"
 msgstr "Не задано слова/фрази для перекладу.\n"
 
-#: ../src/sdcv.cpp:237
+#: ../src/sdcv.cpp:242
 #, fuzzy, c-format
 msgid "Dictionary's name   Word count\n"
 msgstr "назва словника     кількість слів\n"

po/zh_CN.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sdcv 0.3\n"
 "Report-Msgid-Bugs-To: dushistov@mail.ru\n"
-"POT-Creation-Date: 2017-08-16 09:52+0300\n"
+"POT-Creation-Date: 2020-08-14 12:58+0300\n"
 "PO-Revision-Date: 2005-1-17 00:58+0800\n"
 "Last-Translator: Cai Qian <caiqian@gnome.org>\n"
 "Language-Team: Simplified Chinese\n"
@@ -19,22 +19,22 @@ msgstr ""
 msgid "popen failed"
 msgstr ""
 
-#: ../src/libwrapper.cpp:340
+#: ../src/libwrapper.cpp:341
 #, c-format
 msgid "Can not convert %s to utf8.\n"
 msgstr "无法将 %s 转换为 UTF-8。\n"
 
-#: ../src/libwrapper.cpp:398 ../src/libwrapper.cpp:432
+#: ../src/libwrapper.cpp:399 ../src/libwrapper.cpp:433
 #, fuzzy, c-format
 msgid "Found %zu items, similar to %s.\n"
 msgstr "发现 %d 条记录和 %s 相似。\n"
 
-#: ../src/libwrapper.cpp:416
+#: ../src/libwrapper.cpp:417
 #, fuzzy
 msgid "Your choice[-1 to abort]: "
 msgstr "您的选择为："
 
-#: ../src/libwrapper.cpp:426
+#: ../src/libwrapper.cpp:427
 #, fuzzy, c-format
 msgid ""
 "Invalid choice.\n"
@@ -43,100 +43,100 @@ msgstr ""
 "无效的选择。\n"
 "必须是 0 到 %d。\n"
 
-#: ../src/libwrapper.cpp:445
+#: ../src/libwrapper.cpp:446
 #, c-format
 msgid "Nothing similar to %s, sorry :(\n"
 msgstr "对不起，没有发现和 %s 相似的 :(\n"
 
-#: ../src/sdcv.cpp:88
+#: ../src/sdcv.cpp:89
 #, fuzzy
 msgid "display version information and exit"
 msgstr "-v, --version            显示版本信息并退出\n"
 
-#: ../src/sdcv.cpp:90
+#: ../src/sdcv.cpp:91
 #, fuzzy
 msgid "display list of available dictionaries and exit"
 msgstr "-l, --list-dicts         显示可用的字典列表并退出\n"
 
-#: ../src/sdcv.cpp:92
+#: ../src/sdcv.cpp:93
 #, fuzzy
 msgid "for search use only dictionary with this bookname"
 msgstr "-u, --use-dict 字典名    只使用指定的字典进行单词搜索\n"
 
-#: ../src/sdcv.cpp:93
+#: ../src/sdcv.cpp:94
 msgid "bookname"
 msgstr ""
 
-#: ../src/sdcv.cpp:95
+#: ../src/sdcv.cpp:96
 msgid "for use in scripts"
 msgstr ""
 
-#: ../src/sdcv.cpp:97
+#: ../src/sdcv.cpp:98
 msgid "print the result formatted as JSON"
 msgstr ""
 
-#: ../src/sdcv.cpp:99
+#: ../src/sdcv.cpp:100
 msgid "do not fuzzy-search for similar words, only return exact matches"
 msgstr ""
 
-#: ../src/sdcv.cpp:101
+#: ../src/sdcv.cpp:102
 #, fuzzy
 msgid "output must be in utf8"
 msgstr "--utf8-output            输出必须是 UTF-8\n"
 
-#: ../src/sdcv.cpp:103
+#: ../src/sdcv.cpp:104
 #, fuzzy
 msgid "input of sdcv in utf8"
 msgstr "--utf8-input             sdcv 的输入为 UTF-8\n"
 
-#: ../src/sdcv.cpp:105
+#: ../src/sdcv.cpp:106
 #, fuzzy
 msgid "use this directory as path to stardict data directory"
 msgstr "--data-dir 目录路径      指定 Stardict 数据所在目录的路径\n"
 
-#: ../src/sdcv.cpp:106
+#: ../src/sdcv.cpp:107
 msgid "path/to/dir"
 msgstr ""
 
-#: ../src/sdcv.cpp:108
+#: ../src/sdcv.cpp:109
 msgid ""
 "only use the dictionaries in data-dir, do not search in user and system "
 "directories"
 msgstr ""
 
-#: ../src/sdcv.cpp:110
+#: ../src/sdcv.cpp:111
 msgid "colorize the output"
 msgstr ""
 
-#: ../src/sdcv.cpp:115
+#: ../src/sdcv.cpp:116
 msgid " words"
 msgstr ""
 
-#: ../src/sdcv.cpp:121
+#: ../src/sdcv.cpp:122
 #, c-format
 msgid "Invalid command line arguments: %s\n"
 msgstr ""
 
-#: ../src/sdcv.cpp:127
+#: ../src/sdcv.cpp:128
 #, c-format
 msgid "Console version of Stardict, version %s\n"
 msgstr "Stardict 的控制台版本，版本为 %s\n"
 
-#: ../src/sdcv.cpp:202
+#: ../src/sdcv.cpp:206
 #, c-format
 msgid "g_mkdir failed: %s\n"
 msgstr ""
 
-#: ../src/sdcv.cpp:217
+#: ../src/sdcv.cpp:222
 msgid "Enter word or phrase: "
 msgstr "请输入单词或短语："
 
-#: ../src/sdcv.cpp:225
+#: ../src/sdcv.cpp:230
 #, c-format
 msgid "There are no words/phrases to translate.\n"
 msgstr "没有供翻译的单词或短语。\n"
 
-#: ../src/sdcv.cpp:237
+#: ../src/sdcv.cpp:242
 #, fuzzy, c-format
 msgid "Dictionary's name   Word count\n"
 msgstr "字典名    单词量\n"

po/zh_TW.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sdcv 0.4.2\n"
 "Report-Msgid-Bugs-To: dushistov@mail.ru\n"
-"POT-Creation-Date: 2017-08-16 09:52+0300\n"
+"POT-Creation-Date: 2020-08-14 12:58+0300\n"
 "PO-Revision-Date: 2013-06-12 14:11+0800\n"
 "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -22,21 +22,21 @@ msgstr ""
 msgid "popen failed"
 msgstr "popen 失敗"
 
-#: ../src/libwrapper.cpp:340
+#: ../src/libwrapper.cpp:341
 #, c-format
 msgid "Can not convert %s to utf8.\n"
 msgstr "無法將 %s 轉換為 UTF-8。\n"
 
-#: ../src/libwrapper.cpp:398 ../src/libwrapper.cpp:432
+#: ../src/libwrapper.cpp:399 ../src/libwrapper.cpp:433
 #, fuzzy, c-format
 msgid "Found %zu items, similar to %s.\n"
 msgstr "找到 %d 項紀錄和 %s 相似。\n"
 
-#: ../src/libwrapper.cpp:416
+#: ../src/libwrapper.cpp:417
 msgid "Your choice[-1 to abort]: "
 msgstr "您的選擇是[-1 表示放棄]："
 
-#: ../src/libwrapper.cpp:426
+#: ../src/libwrapper.cpp:427
 #, fuzzy, c-format
 msgid ""
 "Invalid choice.\n"
@@ -45,100 +45,100 @@ msgstr ""
 "無效的選擇。\n"
 "必須是 0 到 %d 之間或 -1。\n"
 
-#: ../src/libwrapper.cpp:445
+#: ../src/libwrapper.cpp:446
 #, c-format
 msgid "Nothing similar to %s, sorry :(\n"
 msgstr "抱歉，沒有和 %s 相似者 :(\n"
 
-#: ../src/sdcv.cpp:88
+#: ../src/sdcv.cpp:89
 #, fuzzy
 msgid "display version information and exit"
 msgstr "-v, --version            顯示版本資訊並離開\n"
 
-#: ../src/sdcv.cpp:90
+#: ../src/sdcv.cpp:91
 #, fuzzy
 msgid "display list of available dictionaries and exit"
 msgstr "-l, --list-dicts         顯示可用的字典清單並離開\n"
 
-#: ../src/sdcv.cpp:92
+#: ../src/sdcv.cpp:93
 #, fuzzy
 msgid "for search use only dictionary with this bookname"
 msgstr "-u, --use-dict 字典名    只使用指定的字典進行單字搜尋\n"
 
-#: ../src/sdcv.cpp:93
+#: ../src/sdcv.cpp:94
 msgid "bookname"
 msgstr ""
 
-#: ../src/sdcv.cpp:95
+#: ../src/sdcv.cpp:96
 msgid "for use in scripts"
 msgstr ""
 
-#: ../src/sdcv.cpp:97
+#: ../src/sdcv.cpp:98
 msgid "print the result formatted as JSON"
 msgstr ""
 
-#: ../src/sdcv.cpp:99
+#: ../src/sdcv.cpp:100
 msgid "do not fuzzy-search for similar words, only return exact matches"
 msgstr ""
 
-#: ../src/sdcv.cpp:101
+#: ../src/sdcv.cpp:102
 #, fuzzy
 msgid "output must be in utf8"
 msgstr "--utf8-output            輸出必須是 UTF-8\n"
 
-#: ../src/sdcv.cpp:103
+#: ../src/sdcv.cpp:104
 #, fuzzy
 msgid "input of sdcv in utf8"
 msgstr "--utf8-input             sdcv 的輸入為 UTF-8\n"
 
-#: ../src/sdcv.cpp:105
+#: ../src/sdcv.cpp:106
 #, fuzzy
 msgid "use this directory as path to stardict data directory"
 msgstr "--data-dir 目錄路徑      指定 Stardict 資料所在目錄的路徑\n"
 
-#: ../src/sdcv.cpp:106
+#: ../src/sdcv.cpp:107
 msgid "path/to/dir"
 msgstr ""
 
-#: ../src/sdcv.cpp:108
+#: ../src/sdcv.cpp:109
 msgid ""
 "only use the dictionaries in data-dir, do not search in user and system "
 "directories"
 msgstr ""
 
-#: ../src/sdcv.cpp:110
+#: ../src/sdcv.cpp:111
 msgid "colorize the output"
 msgstr ""
 
-#: ../src/sdcv.cpp:115
+#: ../src/sdcv.cpp:116
 msgid " words"
 msgstr ""
 
-#: ../src/sdcv.cpp:121
+#: ../src/sdcv.cpp:122
 #, c-format
 msgid "Invalid command line arguments: %s\n"
 msgstr ""
 
-#: ../src/sdcv.cpp:127
+#: ../src/sdcv.cpp:128
 #, c-format
 msgid "Console version of Stardict, version %s\n"
 msgstr "Stardict 的主控臺版本，版本為 %s\n"
 
-#: ../src/sdcv.cpp:202
+#: ../src/sdcv.cpp:206
 #, c-format
 msgid "g_mkdir failed: %s\n"
 msgstr "g_mkdir 失敗：%s\n"
 
-#: ../src/sdcv.cpp:217
+#: ../src/sdcv.cpp:222
 msgid "Enter word or phrase: "
 msgstr "請輸入單字或片語："
 
-#: ../src/sdcv.cpp:225
+#: ../src/sdcv.cpp:230
 #, c-format
 msgid "There are no words/phrases to translate.\n"
 msgstr "沒有可供翻譯的單字或片語。\n"
 
-#: ../src/sdcv.cpp:237
+#: ../src/sdcv.cpp:242
 #, c-format
 msgid "Dictionary's name   Word count\n"
 msgstr "字典名稱            單字數量\n"

src/dictziplib.hpp

@@ -27,7 +27,7 @@ public:
 private:
     const char *start; /* start of mmap'd area */
     const char *end; /* end of mmap'd area */
-    unsigned long size; /* size of mmap */
+    off_t size; /* size of mmap */
 
     int type;
     z_stream zStream;
@@ -47,7 +47,7 @@ private:
     std::string origFilename;
     std::string comment;
     unsigned long crc;
-    unsigned long length;
+    off_t length;
     unsigned long compressedLength;
     DictCache cache[DICT_CACHE_SIZE];
     MapFile mapfile;

src/libwrapper.cpp

@@ -23,6 +23,7 @@
 #endif
 
 #include <cstring>
+#include <cstdio> //for popen
 #include <map>
 #include <memory>
 
@@ -199,14 +200,18 @@ static std::string parse_data(const gchar *data, bool colorize_output)
 
 void Library::SimpleLookup(const std::string &str, TSearchResultList &res_list)
 {
-    glong ind;
+    std::set<glong> wordIdxs;
     res_list.reserve(ndicts());
-    for (gint idict = 0; idict < ndicts(); ++idict)
+    for (gint idict = 0; idict < ndicts(); ++idict) {
-        if (SimpleLookupWord(str.c_str(), ind, idict))
+        wordIdxs.clear();
-            res_list.push_back(
+        if (SimpleLookupWord(str.c_str(), wordIdxs, idict))
-                TSearchResult(dict_name(idict),
+            for (auto &wordIdx : wordIdxs)
-                              poGetWord(ind, idict),
+                res_list.push_back(
-                              parse_data(poGetWordData(ind, idict), colorize_output_)));
+                    TSearchResult(dict_name(idict),
+                                  poGetWord(wordIdx, idict),
+                                  parse_data(poGetWordData(wordIdx, idict),
+                                             colorize_output_)));
+    }
 }
 
 void Library::LookupWithFuzzy(const std::string &str, TSearchResultList &res_list)
@@ -314,12 +319,12 @@ public:
 private:
     FILE *output;
 };
-}
+} // namespace
 
-bool Library::process_phrase(const char *loc_str, IReadLine &io, bool force)
+search_result Library::process_phrase(const char *loc_str, IReadLine &io, bool force)
 {
     if (nullptr == loc_str)
-        return true;
+        return SEARCH_SUCCESS;
 
     std::string query;
 
@@ -330,6 +335,7 @@ bool Library::process_phrase(const char *loc_str, IReadLine &io, bool force)
     gsize bytes_read;
     gsize bytes_written;
     glib::Error err;
+    search_result rval = SEARCH_SUCCESS;
     glib::CharStr str;
     if (!utf8_input_)
         str.reset(g_locale_to_utf8(loc_str, -1, &bytes_read, &bytes_written, get_addr(err)));
@@ -339,11 +345,11 @@ bool Library::process_phrase(const char *loc_str, IReadLine &io, bool force)
     if (nullptr == get_impl(str)) {
         fprintf(stderr, _("Can not convert %s to utf8.\n"), loc_str);
         fprintf(stderr, "%s\n", err->message);
-        return false;
+        return SEARCH_FAILURE;
     }
 
     if (str[0] == '\0')
-        return true;
+        return SEARCH_SUCCESS;
 
     TSearchResultList res_list;
 
@@ -410,10 +416,9 @@ bool Library::process_phrase(const char *loc_str, IReadLine &io, bool force)
                        colorize_output_ ? ESC_END : "");
             }
             int choise;
-            std::unique_ptr<IReadLine> choice_readline(create_readline_object());
             for (;;) {
                 std::string str_choise;
-                choice_readline->read(_("Your choice[-1 to abort]: "), str_choise);
+                io.read(_("Your choice[-1 to abort]: "), str_choise);
                 sscanf(str_choise.c_str(), "%d", &choise);
                 if (choise >= 0 && choise < int(res_list.size())) {
                     sdcv_pager pager;
@@ -443,10 +448,11 @@ bool Library::process_phrase(const char *loc_str, IReadLine &io, bool force)
             loc_str = utf8_to_locale_ign_err(get_impl(str));
         if (!json_)
             printf(_("Nothing similar to %s, sorry :(\n"), utf8_output_ ? get_impl(str) : loc_str.c_str());
+        rval = SEARCH_NO_RESULT;
     }
 
     if (json_) {
         fputs("]\n", stdout);
     }
-    return true;
+    return rval;
 }

src/libwrapper.hpp

@@ -23,6 +23,13 @@ struct TSearchResult {
 
 typedef std::vector<TSearchResult> TSearchResultList;
 
+//possible return values for Library.process_phase()
+enum search_result {
+    SEARCH_SUCCESS = 0,
+    SEARCH_FAILURE,
+    SEARCH_NO_RESULT
+};
+
 //this class is wrapper around Dicts class for easy use
 //of it
 class Library : public Libs
@@ -38,7 +45,7 @@ public:
         setFuzzy(!no_fuzzy);
     }
 
-    bool process_phrase(const char *loc_str, IReadLine &io, bool force = false);
+    search_result process_phrase(const char *loc_str, IReadLine &io, bool force = false);
 
 private:
     bool utf8_input_;

src/mapfile.hpp

@@ -7,6 +7,7 @@
 #ifdef HAVE_MMAP
 #include <fcntl.h>
 #include <sys/mman.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #endif
 #ifdef _WIN32
@@ -21,13 +22,13 @@ public:
     ~MapFile();
     MapFile(const MapFile &) = delete;
     MapFile &operator=(const MapFile &) = delete;
-    bool open(const char *file_name, unsigned long file_size);
+    bool open(const char *file_name, off_t file_size);
     gchar *begin() { return data; }
 
 private:
     char *data = nullptr;
-    unsigned long size = 0ul;
 #ifdef HAVE_MMAP
+    size_t size = 0u;
     int mmap_fd = -1;
 #elif defined(_WIN32)
     HANDLE hFile = 0;
@@ -35,25 +36,31 @@ private:
 #endif
 };
 
-inline bool MapFile::open(const char *file_name, unsigned long file_size)
+inline bool MapFile::open(const char *file_name, off_t file_size)
 {
-    size = file_size;
 #ifdef HAVE_MMAP
     if ((mmap_fd = ::open(file_name, O_RDONLY)) < 0) {
-        //g_print("Open file %s failed!\n",fullfilename);
+        // g_print("Open file %s failed!\n",fullfilename);
         return false;
     }
-    data = (gchar *)mmap(nullptr, file_size, PROT_READ, MAP_SHARED, mmap_fd, 0);
+    struct stat st;
+    if (fstat(mmap_fd, &st) == -1 || st.st_size < 0 || (st.st_size == 0 && S_ISREG(st.st_mode))
+        || st.st_size != file_size) {
+        close(mmap_fd);
+        return false;
+    }
+
+    size = static_cast<size_t>(st.st_size);
+    data = (gchar *)mmap(nullptr, size, PROT_READ, MAP_SHARED, mmap_fd, 0);
     if ((void *)data == (void *)(-1)) {
-        //g_print("mmap file %s failed!\n",idxfilename);
+        // g_print("mmap file %s failed!\n",idxfilename);
+        size = 0u;
         data = nullptr;
         return false;
     }
 #elif defined(_WIN32)
-    hFile = CreateFile(file_name, GENERIC_READ, 0, nullptr, OPEN_ALWAYS,
+    hFile = CreateFile(file_name, GENERIC_READ, 0, nullptr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
-                       FILE_ATTRIBUTE_NORMAL, 0);
+    hFileMap = CreateFileMapping(hFile, nullptr, PAGE_READONLY, 0, file_size, nullptr);
-    hFileMap = CreateFileMapping(hFile, nullptr, PAGE_READONLY, 0,
-                                 file_size, nullptr);
     data = (gchar *)MapViewOfFile(hFileMap, FILE_MAP_READ, 0, 0, file_size);
 #else
     gsize read_len;

src/readline.cpp

@@ -57,11 +57,25 @@ public:
         return stdio_getline(stdin, line);
     }
 };
-}
+} // namespace
 #else
 
 namespace
 {
+std::string get_hist_file_path()
+{
+    const gchar *hist_file_str = g_getenv("SDCV_HISTFILE");
+
+    if (hist_file_str != nullptr)
+        return std::string(hist_file_str);
+
+    const std::string hist_file_path = std::string(g_get_home_dir()) + G_DIR_SEPARATOR + ".sdcv_history";
+    if (g_file_test(hist_file_path.c_str(), G_FILE_TEST_IS_REGULAR))
+        return hist_file_path;
+
+    return std::string(g_get_user_data_dir()) + G_DIR_SEPARATOR + "sdcv_history";
+}
+
 class real_readline : public IReadLine
 {
 
@@ -70,13 +84,13 @@ public:
     {
         rl_readline_name = "sdcv";
         using_history();
-        const std::string histname = std::string(g_get_home_dir()) + G_DIR_SEPARATOR + ".sdcv_history";
+        const std::string histname = get_hist_file_path();
         read_history(histname.c_str());
     }
 
     ~real_readline()
     {
-        const std::string histname = std::string(g_get_home_dir()) + G_DIR_SEPARATOR + ".sdcv_history";
+        const std::string histname = get_hist_file_path();
         write_history(histname.c_str());
         const gchar *hist_size_str = g_getenv("SDCV_HISTSIZE");
         int hist_size;
@@ -102,7 +116,7 @@ public:
         add_history(phrase.c_str());
     }
 };
-}
+} // namespace
 #endif //WITH_READLINE
 
 IReadLine *create_readline_object()

src/sdcv.cpp

@@ -53,7 +53,7 @@ static void free_str_array(gchar **arr)
         g_free(*p);
     g_free(arr);
 }
-}
+} // namespace
 namespace glib
 {
 using StrArr = ResourceWrapper<gchar *, gchar *, free_str_array>;
@@ -61,13 +61,14 @@ using StrArr = ResourceWrapper<gchar *, gchar *, free_str_array>;
 
 static void list_dicts(const std::list<std::string> &dicts_dir_list, bool use_json);
 
-int main(int argc, char *argv[]) try {
+int main(int argc, char *argv[])
+try {
     setlocale(LC_ALL, "");
 #if ENABLE_NLS
     bindtextdomain("sdcv",
                    //"./locale"//< for testing
                    GETTEXT_TRANSLATIONS_PATH //< should be
-                   );
+    );
     textdomain("sdcv");
 #endif
 
@@ -82,6 +83,7 @@ int main(int argc, char *argv[]) try {
     glib::CharStr opt_data_dir;
     gboolean only_data_dir = FALSE;
     gboolean colorize = FALSE;
+    glib::StrArr word_list;
 
     const GOptionEntry entries[] = {
         { "version", 'v', 0, G_OPTION_ARG_NONE, &show_version,
@@ -95,6 +97,8 @@ int main(int argc, char *argv[]) try {
           _("for use in scripts"), nullptr },
         { "json-output", 'j', 0, G_OPTION_ARG_NONE, &json_output,
           _("print the result formatted as JSON"), nullptr },
+        { "json", 'j', 0, G_OPTION_ARG_NONE, &json_output,
+          _("print the result formatted as JSON"), nullptr },
         { "exact-search", 'e', 0, G_OPTION_ARG_NONE, &no_fuzzy,
           _("do not fuzzy-search for similar words, only return exact matches"), nullptr },
         { "utf8-output", '0', 0, G_OPTION_ARG_NONE, &utf8_output,
@@ -108,11 +112,13 @@ int main(int argc, char *argv[]) try {
           _("only use the dictionaries in data-dir, do not search in user and system directories"), nullptr },
         { "color", 'c', 0, G_OPTION_ARG_NONE, &colorize,
           _("colorize the output"), nullptr },
+        { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, get_addr(word_list),
+          _("search terms"), _(" words") },
         {},
     };
 
     glib::Error error;
-    GOptionContext *context = g_option_context_new(_(" words"));
+    GOptionContext *context = g_option_context_new(nullptr);
     g_option_context_set_help_enabled(context, TRUE);
     g_option_context_add_main_entries(context, entries, nullptr);
     const gboolean parse_res = g_option_context_parse(context, &argc, &argv, get_addr(error));
@@ -141,13 +147,13 @@ int main(int argc, char *argv[]) try {
         data_dir = get_impl(opt_data_dir);
     }
 
-    const char *homedir = g_getenv("HOME");
+    std::string conf_dir = std::string(g_get_home_dir()) + G_DIR_SEPARATOR + ".stardict";
-    if (!homedir)
+    if (!g_file_test(conf_dir.c_str(), G_FILE_TEST_IS_DIR))
-        homedir = g_get_home_dir();
+        conf_dir = std::string(g_get_user_data_dir()) + G_DIR_SEPARATOR + "stardict";
 
     std::list<std::string> dicts_dir_list;
     if (!only_data_dir)
-        dicts_dir_list.push_back(std::string(homedir) + G_DIR_SEPARATOR + ".stardict" + G_DIR_SEPARATOR + "dic");
+        dicts_dir_list.push_back(conf_dir + G_DIR_SEPARATOR + "dic");
     dicts_dir_list.push_back(data_dir);
     if (show_list_dicts) {
         list_dicts(dicts_dir_list, json_output);
@@ -180,24 +186,35 @@ int main(int argc, char *argv[]) try {
         }
 
         // add bookname to list
-        gchar **p = get_impl(use_dict_list);
+        for (gchar **p = get_impl(use_dict_list); *p != nullptr; ++p) {
-        while (*p) {
+            auto it = bookname_to_ifo.find(*p);
-            order_list.push_back(bookname_to_ifo.at(*p));
+            if (it != bookname_to_ifo.end()) {
-            ++p;
+                order_list.push_back(it->second);
+            } else {
+                fprintf(stderr, _("Unknown dictionary: %s\n"), *p);
+            }
         }
     } else {
-        const std::string odering_cfg_file = std::string(homedir) + G_DIR_SEPARATOR_S ".sdcv_ordering";
+        std::string ordering_cfg_file = std::string(g_get_user_config_dir()) + G_DIR_SEPARATOR_S "sdcv_ordering";
-        FILE *ordering_file = fopen(odering_cfg_file.c_str(), "r");
+        FILE *ordering_file = fopen(ordering_cfg_file.c_str(), "r");
+        if (ordering_file == nullptr) {
+            ordering_cfg_file = std::string(g_get_home_dir()) + G_DIR_SEPARATOR_S ".sdcv_ordering";
+            ordering_file = fopen(ordering_cfg_file.c_str(), "r");
+        }
         if (ordering_file != nullptr) {
             std::string line;
             while (stdio_getline(ordering_file, line)) {
-                order_list.push_back(bookname_to_ifo.at(line));
+                auto it = bookname_to_ifo.find(line);
+                if (it != bookname_to_ifo.end()) {
+                    order_list.push_back(it->second);
+                } else {
+                    fprintf(stderr, _("Unknown dictionary: %s\n"), line.c_str());
+                }
             }
             fclose(ordering_file);
         }
     }
 
-    const std::string conf_dir = std::string(g_get_home_dir()) + G_DIR_SEPARATOR + ".stardict";
     if (g_mkdir(conf_dir.c_str(), S_IRWXU) == -1 && errno != EEXIST) {
         fprintf(stderr, _("g_mkdir failed: %s\n"), strerror(errno));
     }
@@ -206,16 +223,22 @@ int main(int argc, char *argv[]) try {
     lib.load(dicts_dir_list, order_list, disable_list);
 
     std::unique_ptr<IReadLine> io(create_readline_object());
-    if (optind < argc) {
+    if (word_list != nullptr) {
-        for (int i = optind; i < argc; ++i)
+        search_result rval = SEARCH_SUCCESS;
-            if (!lib.process_phrase(argv[i], *io, non_interactive)) {
+        gchar **p = get_impl(word_list);
-                return EXIT_FAILURE;
+        while (*p) {
-            }
+            search_result this_rval = lib.process_phrase(*p++, *io, non_interactive);
+            // If we encounter any error, save it but continue through the word
+            // list to check all requested words.
+            if (rval == SEARCH_SUCCESS)
+                rval = this_rval;
+        }
+        if (rval != SEARCH_SUCCESS)
+            return rval;
     } else if (!non_interactive) {
-
         std::string phrase;
         while (io->read(_("Enter word or phrase: "), phrase)) {
-            if (!lib.process_phrase(phrase.c_str(), *io))
+            if (lib.process_phrase(phrase.c_str(), *io) == SEARCH_FAILURE)
                 return EXIT_FAILURE;
             phrase.clear();
         }

src/stardict_lib.hpp

@@ -1,11 +1,10 @@
 #pragma once
 
-#include <cstdio>
 #include <cstring>
 #include <functional>
 #include <list>
-#include <map>
 #include <memory>
+#include <set>
 #include <string>
 #include <vector>
 
@@ -29,7 +28,7 @@ inline void set_uint32(gchar *addr, guint32 val)
 struct cacheItem {
     guint32 offset;
     gchar *data;
-    //write code here to make it inline
+    // write code here to make it inline
     cacheItem() { data = nullptr; }
     ~cacheItem() { g_free(data); }
 };
@@ -67,7 +66,7 @@ private:
     gint cache_cur = 0;
 };
 
-//this structure contain all information about dictionary
+// this structure contain all information about dictionary
 struct DictInfo {
     std::string ifo_file_name;
     guint32 wordcount;
@@ -78,8 +77,8 @@ struct DictInfo {
     std::string website;
     std::string date;
     std::string description;
-    guint32 index_file_size;
+    off_t index_file_size;
-    guint32 syn_file_size;
+    off_t syn_file_size;
     std::string sametypesequence;
 
     bool load_from_ifo_file(const std::string &ifofilename, bool istreedict);
@@ -92,21 +91,31 @@ public:
     guint32 wordentry_size;
 
     virtual ~IIndexFile() {}
-    virtual bool load(const std::string &url, gulong wc, gulong fsize, bool verbose) = 0;
+    virtual bool load(const std::string &url, gulong wc, off_t fsize, bool verbose) = 0;
     virtual const gchar *get_key(glong idx) = 0;
     virtual void get_data(glong idx) = 0;
     virtual const gchar *get_key_and_data(glong idx) = 0;
-    virtual bool lookup(const char *str, glong &idx) = 0;
+    virtual bool lookup(const char *str, std::set<glong> &idxs, glong &next_idx) = 0;
+    virtual bool lookup(const char *str, std::set<glong> &idxs)
+    {
+        glong unused_next_idx;
+        return lookup(str, idxs, unused_next_idx);
+    };
 };
 
 class SynFile
 {
 public:
+    SynFile() {}
+    ~SynFile() {}
     bool load(const std::string &url, gulong wc);
-    bool lookup(const char *str, glong &idx);
+    bool lookup(const char *str, std::set<glong> &idxs, glong &next_idx);
+    bool lookup(const char *str, std::set<glong> &idxs);
+    const gchar *get_key(glong idx) { return synlist[idx]; }
 
 private:
-    std::map<std::string, gulong> synonyms;
+    MapFile synfile;
+    std::vector<gchar *> synlist;
 };
 
 class Dict : public DictBase
@@ -133,7 +142,12 @@ public:
         *offset = idx_file->wordentry_offset;
         *size = idx_file->wordentry_size;
     }
-    bool Lookup(const char *str, glong &idx);
+    bool Lookup(const char *str, std::set<glong> &idxs, glong &next_idx);
+    bool Lookup(const char *str, std::set<glong> &idxs)
+    {
+        glong unused_next_idx;
+        return Lookup(str, idxs, unused_next_idx);
+    }
 
     bool LookupWithRule(GPatternSpec *pspec, glong *aIndex, int iBuffLen);
 
@@ -146,7 +160,7 @@ private:
     std::unique_ptr<IIndexFile> idx_file;
     std::unique_ptr<SynFile> syn_file;
 
-    bool load_ifofile(const std::string &ifofilename, gulong &idxfilesize);
+    bool load_ifofile(const std::string &ifofilename, off_t &idxfilesize);
 };
 
 class Libs
@@ -155,7 +169,7 @@ public:
     Libs(std::function<void(void)> f = std::function<void(void)>())
     {
         progress_func = f;
-        iMaxFuzzyDistance = MAX_FUZZY_DISTANCE; //need to read from cfg.
+        iMaxFuzzyDistance = MAX_FUZZY_DISTANCE; // need to read from cfg.
     }
     void setVerbose(bool verbose) { verbose_ = verbose; }
     void setFuzzy(bool fuzzy) { fuzzy_ = fuzzy; }
@@ -181,15 +195,12 @@ public:
             return nullptr;
         return oLib[iLib]->get_data(iIndex);
     }
-    const gchar *poGetCurrentWord(glong *iCurrent);
+    bool LookupWord(const gchar *sWord, std::set<glong> &iWordIndices, int iLib)
-    const gchar *poGetNextWord(const gchar *word, glong *iCurrent);
-    const gchar *poGetPreWord(glong *iCurrent);
-    bool LookupWord(const gchar *sWord, glong &iWordIndex, int iLib)
     {
-        return oLib[iLib]->Lookup(sWord, iWordIndex);
+        return oLib[iLib]->Lookup(sWord, iWordIndices);
     }
-    bool LookupSimilarWord(const gchar *sWord, glong &iWordIndex, int iLib);
+    bool LookupSimilarWord(const gchar *sWord, std::set<glong> &iWordIndices, int iLib);
-    bool SimpleLookupWord(const gchar *sWord, glong &iWordIndex, int iLib);
+    bool SimpleLookupWord(const gchar *sWord, std::set<glong> &iWordIndices, int iLib);
 
     bool LookupWithFuzzy(const gchar *sWord, gchar *reslist[], gint reslist_size);
     gint LookupWithRule(const gchar *sWord, gchar *reslist[]);

src/utils.hpp

@@ -68,7 +68,7 @@ namespace glib
 {
 typedef ResourceWrapper<gchar, void, g_free> CharStr;
 typedef ResourceWrapper<GError, GError, g_error_free> Error;
-}
+} // namespace glib
 
 extern std::string utf8_to_locale_ign_err(const std::string &utf8_str);
 

tests/not-unix-newlines-ifo/russian/russian.ifo

@@ -0,0 +1,9 @@
+StarDict's dict ifo file
+version=3.0.0
+bookname=Russian-English Dictionary (ru-en)
+wordcount=415144
+idxfilesize=12344255
+sametypesequence=h
+synwordcount=1277580
+author=Vuizur
+description=

tests/stardict-test_multiple_results-2.4.2/test.ifo

@@ -0,0 +1,7 @@
+StarDict's dict ifo file
+version=3.0.0
+bookname=Test multiple results
+wordcount=246
+idxfilesize=5977
+synwordcount=124
+description=

tests/t_datadir

@@ -6,7 +6,7 @@ unset SDCV_PAGER
 have=`"$PATH_TO_SDCV" --data-dir /tmp/bugagaga -l | wc -l`
 #do not count header
 have=$(($have-1))
-ndicts=`find "${HOME}"/.stardict/dic -name "*.ifo" -print | wc -l`
+ndicts=`find "${XDG_DATA_HOME:-$HOME/.local/share}"/stardict/dic -name "*.ifo" -print | wc -l`
 #ndicts=$(($ndicts+1))
 if [ $have -ne $ndicts ]; then
 	ndicts=$(($ndicts-1))

tests/t_json

@@ -9,17 +9,24 @@ unset SDCV_PAGER
 unset STARDICT_DATA_DIR
 
 test_json() {
-    PARAMS="$1"
+    EXPECTED=$(echo "$1" | jq 'sort')
-    EXPECTED=$(echo "$2" | jq 'sort')
+    shift
-    RESULT=$($SDCV $PARAMS | jq 'sort')
+    RESULT=$($SDCV "$@" | jq 'sort')
-    if [ "$EXPECTED" != "$RESULT"]; then
+    if [ "$EXPECTED" != "$RESULT" ]; then
         echo "expected $EXPECTED but got $RESULT"
         exit 1
     fi
 }
 
-test_json "-x -j -l -n --data-dir \"$TEST_DIR\"" "[{\"name\": \"Test synonyms\", \"wordcount\": \"1\"},{\"name\": \"Sample 1 test dictionary\", \"wordcount\": \"1\"},{\"name\": \"test_dict\", \"wordcount\": \"1\"}]"
+test_json '[{"name": "Russian-English Dictionary (ru-en)", "wordcount": "415144"},
-test_json "-x -j -n --data-dir \"$TEST_DIR\" foo" "[{\"dict\": \"Test synonyms\",\"word\":\"test\",\"definition\":\"\nresult of test\"}]"
+            {"name": "Test synonyms", "wordcount": "2"},
-test_json "-x -j -n --data-dir \"$TEST_DIR\" foobarbaaz" "[]"
+            {"name": "Test multiple results", "wordcount": "246"},
+            {"name": "Sample 1 test dictionary", "wordcount": "1"},
+            {"name": "test_dict", "wordcount": "1"}]' -x -j -l -n --data-dir "$TEST_DIR"
+test_json '[{"dict": "Test synonyms","word":"test","definition":"\u000aresult of test"}]' -x -j -n --data-dir "$TEST_DIR" foo
+test_json '[]' -x -j -n --data-dir "$TEST_DIR" foobarbaaz
+
+# Test multiple searches, with the first failing.
+test_json '[][{"dict": "Test synonyms","word":"test","definition":"\u000aresult of test"}]' -x -j -n --data-dir "$TEST_DIR" foobarbaaz foo
 
 exit 0

tests/t_list

@@ -4,7 +4,7 @@ PATH_TO_SDCV="$1"
 ndicts=`"$PATH_TO_SDCV" -l | wc -l`
 ndicts=$(($ndicts-1))
 ncom=`find /usr/share/stardict/dic -name "*.ifo" | wc -l`
-nspe=`find "${HOME}"/.stardict/dic -name "*.ifo" | wc -l`
+nspe=`find "${XDG_DATA_HOME:-$HOME/.local/share}"/stardict/dic -name "*.ifo" | wc -l`
 nmy=$(($ncom+$nspe))
 
 if [ $nmy -ne $ndicts ]; then

tests/t_multiple_results

@@ -0,0 +1,67 @@
+#!/bin/sh
+
+set -e
+
+SDCV="$1"
+TEST_DIR="$2"
+
+unset SDCV_PAGER
+unset STARDICT_DATA_DIR
+
+test_json() {
+    word="$1"
+    jq_cmp="$2"
+    result="$("$SDCV" --data-dir "$TEST_DIR" -exjn "$word" | sed 's|\\n|\\u000a|g')"
+    cmp_result="$(echo "$result" | jq "$jq_cmp")"
+    if [ "$cmp_result" != "true" ]; then
+        echo "expected '$jq_cmp' to return true, but $result didn't"
+        exit 1
+    fi
+}
+
+# Basic two-result search for the same headword.
+test_json bark \
+    '. == [
+        {"dict":"Test multiple results","word":"bark","definition":"\u000aThe harsh sound made by a dog."},
+        {"dict":"Test multiple results","word":"bark","definition":"\u000aThe tough outer covering of trees and other woody plants."}
+    ]'
+
+# Multi-result search where one word exists as both a synyonym and a separate
+# headword. This ensures that if there is a matching synyonym we don't skip the
+# regular search.
+test_json cat \
+    '. == [
+        {"dict":"Test multiple results","word":"cat","definition":"\u000aA cute animal which (rarely) barks."},
+        {"dict":"Test multiple results","word":"lion","definition":"\u000aA larger cat which might bite your head off."},
+        {"dict":"Test multiple results","word":"panther","definition":"\u000aI know very little about panthers, sorry."}
+    ]'
+
+# Many-result search for a word that matches 120 distinct headwords.
+test_json many_headwords 'length == 120'
+test_json many_headwords 'all(.word == "many_headwords")'
+test_json many_headwords \
+    'to_entries | map(.value.definition == "\u000aDefinition for [many_headwords] entry #\(.key+1) (same headword).") | all'
+
+# Many-result search for 120 words that have the same synonym.
+test_json many_synonyms 'length == 120'
+test_json many_synonyms \
+    'to_entries | map(.value.word == "many_synonyms-\(.key+101)") | all'
+test_json many_synonyms \
+    'to_entries | map(.value.definition == "\u000aDefinition for [many_synonyms-\(.key+101)] (same synonym).") | all'
+
+# Ensure that we don't return more than one result even if a word can be
+# resolved in more than one way.
+#
+# Most well-formed dictionaries don't have entries like this (it basically
+# requires you to have a dictionary where there is a synonym that is identical
+# to a word's headword or multiple identical synyonym entries).
+#
+# This entry was created by creating extra synonyms with different names then
+# modifying the .syn file manually.
+test_json many_resolution_paths \
+    '. == [
+        {"dict":"Test multiple results","word":"many_resolution_paths",
+         "definition":"\u000aDefinition for [many_resolution_paths] headword (same word, multiple synonym entries)."}
+    ]'
+
+exit 0

tests/t_newlines_in_ifo

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+PATH_TO_SDCV="$1"
+TEST_DIR="$2"
+
+unset SDCV_PAGER
+unset STARDICT_DATA_DIR
+
+RES=$("$PATH_TO_SDCV" -n -x --data-dir="$TEST_DIR/not-unix-newlines-ifo" -l | tail -n 1)
+
+if [ "$RES" = "Russian-English Dictionary (ru-en)    415144" ]; then
+  exit 0
+else
+  echo "test failed, unexpected result: $RES" >&2
+  exit 1
+fi

tests/t_return_code

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+SDCV="$1"
+TEST_DIR="$2"
+
+unset SDCV_PAGER
+
+test_return_code() {
+    WORD=$1
+    EXPECTED=$2
+    $SDCV -e -n --data-dir "$TEST_DIR" -u "Test synonyms" $WORD > /dev/null
+    RC=$?
+    if [ $RC -ne $EXPECTED ]; then
+        echo "Return code for $WORD should be '$EXPECTED' but was '$RC'"
+        exit 1
+    fi
+}
+
+test_return_code testawordy 0
+test_return_code testawordies 2
+
+exit 0

tests/t_use

@@ -5,8 +5,8 @@ set -e
 PATH_TO_SDCV="$1"
 TESTS_DIR="$2"
 
-mkdir -p "${HOME}"/.stardict/dic
+mkdir -p "${XDG_DATA_HOME:-$HOME/.local/share}"/stardict/dic
-cp -R "${TESTS_DIR}/stardict-test_dict-2.4.2" "${HOME}"/.stardict/dic
+cp -R "${TESTS_DIR}/stardict-test_dict-2.4.2" "${XDG_DATA_HOME:-$HOME/.local/share}"/stardict/dic
 unset SDCV_PAGER
 RES=`"$PATH_TO_SDCV" -n -u test_dict test | grep "test passed"`
 
@@ -15,6 +15,6 @@ if [ -z "$RES" ]; then
 	exit 1
 fi
 
-rm -fr "${HOME}"/.stardict/dic/stardict-test_dict-2.4.2
+rm -fr "${XDG_DATA_HOME:-$HOME/.local/share}"/stardict/dic/stardict-test_dict-2.4.2
 
 exit 0

tests/t_utf8input

@@ -4,9 +4,8 @@ set -e
 
 PATH_TO_SDCV="$1"
 TESTS_DIR="$2"
-
+mkdir -p "${XDG_DATA_HOME:-$HOME/.local/share}"/stardict/dic
-mkdir -p "${HOME}"/.stardict/dic
+cp -R "${TESTS_DIR}/rus-eng-stardict-2.4.2" "${XDG_DATA_HOME:-$HOME/.local/share}"/stardict/dic/
-cp -R "${TESTS_DIR}/rus-eng-stardict-2.4.2" "${HOME}"/.stardict/dic/
 
 unset SDCV_PAGER
 export LANG=ru_RU.KOI8-R