Compare commits

...

4 Commits

Author SHA1 Message Date
Pedro López-Cabanillas
ffc9c33a0f Revert "Create linux-build.yml"
This reverts commit 87ed76971bb407f9cb139e2843abf98540356fef.
2025-08-10 19:20:46 +02:00
Pedro López-Cabanillas
3c1db7c8b1 Merge branch uchardet:master into devel 2025-08-10 19:17:48 +02:00
Jehan
06029ec334 src: allow setting a default language in the CLI tool.
The syntax of --weight stays the same with the addition that the
language '*' means setting the default weight.

For instance, if you are sure that your input is either French or
English, you could run:

> uchardet -l -w 'fr:1,en:1,*:0'

(setting same weight to French and English, and everything else to 0)
2025-08-08 11:40:10 +02:00
Marcus Nilsson
9699dfce07 Issue #40: Close file when it's no longer needed 2025-06-07 23:35:44 +00:00
2 changed files with 5 additions and 40 deletions

View File

@ -1,39 +0,0 @@
# This starter workflow is for a CMake project running on a single platform. There is a different starter workflow if you need cross-platform coverage.
# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-multi-platform.yml
name: Build on Linux
on:
push:
branches: [ "master", "devel" ]
pull_request:
branches: [ "master", "devel" ]
env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
BUILD_TYPE: RelWithDebInfo
jobs:
build:
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
# You can convert this to a matrix build if you need cross-platform coverage.
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
- name: Build
# Build your program with the given configuration
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
- name: Test
working-directory: ${{github.workspace}}/build
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest -C ${{env.BUILD_TYPE}}

View File

@ -190,7 +190,10 @@ int main(int argc, char ** argv)
return 1; return 1;
} }
*comma = '\0'; *comma = '\0';
uchardet_weigh_language(handle, lang_weight, strtof (comma + 1, NULL)); if (strcmp (lang_weight, "*") == 0)
uchardet_set_default_weight(handle, strtof (comma + 1, NULL));
else
uchardet_weigh_language(handle, lang_weight, strtof (comma + 1, NULL));
} }
while ((lang_weight = strtok_r (NULL, ",", &saveptr))); while ((lang_weight = strtok_r (NULL, ",", &saveptr)));
} }
@ -266,6 +269,7 @@ int main(int argc, char ** argv)
printf("%s: ", filename); printf("%s: ", filename);
} }
detect(handle, f, show_lang, verbose); detect(handle, f, show_lang, verbose);
fclose(f);
} }
uchardet_delete(handle); uchardet_delete(handle);