aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix a current gcc's -fsanitize warning.Werner Koch2020-08-171-2/+2
| | | | | | | | * src/argparse.c (ARGPARSE_FLAG__INITIALIZED): Make sure it is an unsigned int. -- GnuPG-bug-id: 5026
* core,w32: Use timeout in es_poll even if there are no FDs.Werner Koch2020-08-111-3/+17
| | | | | | | | | | | | * src/w32-estream.c (_gpgrt_w32_poll): Sleep if there are no handles to wait for. -- This better matches the semantics of poll and select and avoid busy waitins. We had this problem for example in the LDAP helper process reaper of GnuPG's Dirmngr. Signed-off-by: Werner Koch <[email protected]>
* Make --lib-version work again.Werner Koch2020-08-051-3/+36
| | | | | | | | | | | * src/gpg-error.c (main): Add printing code. -- This was lost while changing to the included option parser back in 2018. The new code also does some prettying of the output. Fixes-commit: 11ce9bc3d6fe75859e18112824ae7ec3ca0fc8df Signed-off-by: Werner Koch <[email protected]>
* gpgrt-config: Fix handling 'Requires' field.NIIBE Yutaka2020-08-031-6/+11
| | | | | | | | | | * src/gpgrt-config.in (get_attr_l): New. (all_required_config_files): Use get_attr_l. -- GnuPG-bug-id: 5010 Signed-off-by: NIIBE Yutaka <[email protected]>
* w32: Add gpgrt_fcancel to the definition.NIIBE Yutaka2020-07-151-0/+2
| | | | | | | * src/gpg-error.def.in (gpgrt_fcancel): Add. Fixes-commit: 3413489d25577e3fe7f529b8e610a45d2bd1857c Signed-off-by: NIIBE Yutaka <[email protected]>
* estream: Add gpgrt_fcancelWerner Koch2020-06-267-9/+44
| | | | | | | | | | | | * src/estream.c (do_close): Add arg 'cancel_mode' and chnage all callers. (_gpgrt_fcancel): New. * src/gpg-error.def.in, src/gpg-error.vers: Add function. * src/visibility.c (gpgrt_fcancel): New. * src/gpg-error.h.in (gpgrt_fcancel): New. -- Signed-off-by: Werner Koch <[email protected]>
* build: Fix the gpg-error-config test for cross build.NIIBE Yutaka2020-06-151-0/+2
| | | | | | | * src/gpg-error-config-test.sh.in: Clear PKG_CONFIG_SYSROOT_DIR. GnuPG-bug-id: 4973 Signed-off-by: NIIBE Yutaka <[email protected]>
* build: Fix cross-compiling into a separate build dir.David Michael2020-06-031-1/+1
| | | | | | | | | * configure.ac: Create the src directory before writing into it. * src/Makefile.am (EXTRA_DIST): Add gen-lock-obj.sh. -- Signed-off-by: David Michael <[email protected]>
* syscfg: add 64-bit big-endian MIPS architecturedkg/fix-4952Daniel Kahn Gillmor2020-05-192-0/+26
| | | | | | | | | | | | | * src/syscfg/lock-obj-pub.mips64-unknown-linux-gnuabi64.h: new. * src/Makefile.am (lock_obj_pub): Add it. -- This information was dervied and reported by YunQiang Su <[email protected]>. GnuPG-bug-id: 4952 Debian-bug-id: 960161 Signed-off-by: Daniel Kahn Gillmor <[email protected]>
* build: Use gen-lock-obj.sh script when possible.NIIBE Yutaka2020-04-091-0/+7
| | | | | | | | | | | | | * configure.ac (HAVE_GENERATED_LOCK_OBJ_H): New. * src/Makefile.am: Support HAVE_GENERATED_LOCK_OBJ_H. -- For cross build, when possible (currently for GNU/Linux), generate lock-obj-pub.native.h by the script. GnuPG-bug-id: 4774 Signed-off-by: NIIBE Yutaka <[email protected]>
* build: Add a shell script to generate lock-obj-pub.h.NIIBE Yutaka2020-04-091-0/+112
| | | | | | * src/gen-lock-obj.sh: New. Signed-off-by: NIIBE Yutaka <[email protected]>
* core: Improve the echo and info meta commands of the arg parserWerner Koch2020-04-031-9/+74
| | | | | | | | | | | * src/argparse.c (handle_meta_echo): Substitue some vars. (handle_meta_user): Factor some code out to ... (assure_username): new. -- Yeah, that is not really needed but might sometimes be helpful. Signed-off-by: Werner Koch <[email protected]>
* core: Implement meta command [user] also for WindowsWerner Koch2020-04-032-2/+21
| | | | | | | | | | * src/argparse.c (initialize): Clear username. * src/sysutils.c (_gpgrt_getusername): Implement for Windows. -- This also fixes a missing intialization Signed-off-by: Werner Koch <[email protected]>
* core: Implement meta command [user] for the arg parser.Werner Koch2020-04-033-25/+106
| | | | | | | | | | | | | | | | | | | | * src/sysutils.c (_gpgrt_getusername): New. * src/argparse.c (struct _gpgrt_argparse_internal_s): New flags user_* and store the current user. (initialize): Free new malloced field. Clear new flags. (handle_meta_user): Implement. (handle_metacmd): Implement user sections. Remove "group" meta command. (_gpgrt_argparse): Implement user sections. (finish_read_sys): Reset new vars. -- Implementing group would be somewhat complicated and it is doubtful whether this really makes sense and is manageable for the admin. Note that we have not yet implemented this for Windows. Signed-off-by: Werner Koch <[email protected]>
* core: Tweak the printing of headers in the --help output.Werner Koch2020-03-062-8/+19
| | | | | | | * src/argparse.c (show_help): Do not print empty sections between headers. Signed-off-by: Werner Koch <[email protected]>
* core: Add features for pretty printing the helpWerner Koch2020-03-062-7/+35
| | | | | | | | | | | | | | | | | | | | * src/gpg-error.h.in (ARGPARSE_OPT_HEADER): New. (ARGPARSE_OPT_VERBATIM): New. (ARGPARSE_verbatim): New. (ARGPARSE_header): New. * src/argparse.c (show_help): Implement them. -- These two macros are useful for custom help screens. In contrast to the ARGPARSE_group hack they do not need a short option number (we use 1 here as a surrogate) and not the "@" hack. Thus already translated strings can be used. ARGPARSE_header further allows to specify a symbolic name for the group and does some minor formatting. If such a symbolic name is given --dump-option-table also emits this as a pseudo option for consumption by GUIs which for example use tabs to group options. Signed-off-by: Werner Koch <[email protected]>
* core: New function gpgrt_reallocarray.Werner Koch2020-03-037-0/+63
| | | | | | | | | | | | | | | | | * src/init.c (_gpgrt_reallocarray): New. * src/visibility.c (gpgrt_reallocarray): New. * src/gpg-error.vers, src/gpg-error.def.in: Add new function. * src/gpg-error.h.in: Add new interface. * tests/t-malloc.c: New. * tests/Makefile.am (TESTS): Add new test. -- Note that this function is different from the glibc function because it has an extra parameter which allows to clear the new elements. A realloc after a calloc with forgotten memset after it is a common source of error, thus we introduce this slightly different function. Signed-off-by: Werner Koch <[email protected]>
* core: Fix allocation bug introduced with last commit.Werner Koch2020-03-031-1/+3
| | | | | | | | | | * src/argparse.c (initialize): Increase number of extra slots. -- I should really buy the valgrind authors a beer. Fixes-commit: db95feab16e32309a4bfb382827c495c2c49920c Signed-off-by: Werner Koch <[email protected]>
* core: New internal option --dump-option-table for argparser.Werner Koch2020-03-021-3/+85
| | | | | | | | | | | | * src/argparse.c (initialize): Add new internal option. (arg_parse): Implement that option. (dump_option_table): New. (show_help): Remove exit and let the caller call my_exit. -- This options allows us to get a copy of the option table. Signed-off-by: Werner Koch <[email protected]>
* core: Replace fputs by es_fputs in argparser.Werner Koch2020-03-021-1/+1
| | | | | | | * src/argparse.c (writestrings): Use that function to match what we are doing in flushstrings. Signed-off-by: Werner Koch <[email protected]>
* core: Allow returning of attributes from gpgrt_argparser.Werner Koch2020-03-022-20/+60
| | | | | | | | | | | | | | | | | | * src/gpg-error.h.in (ARGPARSE_FLAG_WITHATTR): New. (ARGPARSE_ATTR_FORCE): New. (ARGPARSE_ATTR_IGNORE): New. (ARGPARSE_TYPE_MASK): Moved from argparse.c to here. * src/argparse.c: Always use macros for constants. (_gpgrt_argparse): Handle ARGPARSE_FLAG_WITHATTR. (arg_parse): Ditto. * tests/t-argparse.c (main): Add commented test case. -- This is a ABI compatible hack to allow the ignore and force attributes as well as to return which option has been ignored in a user file or on the command line. Signed-off-by: Werner Koch <[email protected]>
* core: Implement meta commands for the argparser.Werner Koch2020-02-271-68/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * src/argparse.c (opttable_t): Add new flags forced, ignore, and explicit_ignore. (struct _gpgrt_argparse_internal_s): Change flags to bitflags. Add several flags to support meta commands. (initialize): Clear them. (handle_meta_user): Use the new verbose flag. (handle_meta_force): Implement. (handle_meta_ignore): Implement. (handle_meta_echo): Support "-echo". (handle_meta_verbose): New. (handle_metacmd): New meta command verbose. Add always flag and move the detection of unexpected meta commands to here. (_gpgrt_argparse): Make use of the ignore and forced meta commands. (finish_read_sys): New. (_gpgrt_argparser): Support the verbose flag. Call finish_read_sys. (arg_parse): Ignore non-explicit ignored and all forced options. * tests/t-argparse.c (main): Fix printing of the ARGPARSE_CONFFILE case. New option 'M'. * tests/t-argparse.conf, tests/etc/t-argparse.conf: Various changes to test the new meta commands. -- For the command line we print a diagnostic if an ignored or forced options is used. However, we do not ignore options which are only set via [ignore-all]. The rationale for the latter is that an administrator can't be be required to unignore all options used by all modes, of say gpgme. Documentation of the meta commands will for now be added to GnuPG. GnuPG-bug-id: 4788 Signed-off-by: Werner Koch <[email protected]>
* indent: Fix indentation in an argparse.c functionWerner Koch2020-02-271-85/+85
| | | | * src/argparse.c (arg_parse): Fix it here.
* core: Add meta command handler stubs to argparse.c.Werner Koch2020-02-261-1/+115
| | | | | | | | | | | | | * src/argparse.c (handle_meta_user): New stub. (handle_meta_force): New stub. (handle_meta_ignore): New stub. (handle_meta_echo): New. (handle_metacmd): New. (_gpgrt_argparse): Call meta command handler. -- GnuPG-bug-id: 4788 Signed-off-by: Werner Koch <[email protected]>
* core: Prepare argparse.c to track additional info for options.Werner Koch2020-02-261-105/+188
| | | | | | | | | | | | | | | | | | | | | | | | * src/argparse.c (opttable_t): New. (struct _gpgrt_argparse_internal_s): Use this instead of a ppointer to gpgrt_opt_t. (initialize): Copy options to the new tableand keep an original ordinal. (_gpgrt_argparse): Adjust for changes. (any_opt_conffile): Ditto. (find_long_option): Ditto. (arg_parse): Ditto. (long_opt_strlen): Adjust args. (cmp_ordtbl): New. (show_help): Print using the ordinal numbers. -- We will need to keep extra information along with the options. This changes prepares this by using a copy of the user provided option table. The only new info is the original ordinal number which will allow us to eventually do a binary search on the options but still be able to print the help in the user defined way. GnuPG-bug-id: 4788 Signed-off-by: Werner Koch <[email protected]>
* core: Add parser for meta commands to gpgrt_argparser.Werner Koch2020-02-252-2/+74
| | | | | | | | | | | | | | | | | | | | | * src/gpg-error.h.in (ARGPARSE_INVALID_META): New (ARGPARSE_UNKNOWN_META, ARGPARSE_UNEXPECTED_META): New. * src/argparse.c (struct _gpgrt_argparse_internal_s): Add flag insysconfig. (initialize): Init flag. Add error strings. (_gpgrt_argparser): Set that flag. (_gpgrt_argparse): Add parsing of meta commands. * tests/etc/t-argparse.conf: Add some test cases. * tests/t-argparse.conf: Ditto. * tests/t-argparse.c (main): Die only after printing all warnings. -- Noe that this is just the framework to add meta commands to the global config file. We also need to get away from fixes test config files and create them on the fly to that we are able to test also errors. GnuPG-bug-id: 4788
* core: Fold duplicated code from _gpgrt_argparse.Werner Koch2020-02-251-82/+86
| | | | | | * src/argparse.c (_gpgrt_argparse): Fold common code. Signed-off-by: Werner Koch <[email protected]>
* core: Improve readability of _gpgrt_argparse.Werner Koch2020-02-251-41/+57
| | | | | | | | | | | | * src/argparse.c (_gpgrt_argparse): Use enum for the states and replace continue and break. -- The use of continue and break in the endless loop if confusing due to the size of the loop's body and because there are also inner for loops with break. It is better to make things explicit by using goto. Signed-off-by: Werner Koch <[email protected]>
* core: New flag ARGPARSE_FLAG_USERVERS to try versioned config files.Werner Koch2020-02-252-20/+76
| | | | | | | | | | | | * src/gpg-error.h.in (ARGPARSE_FLAG_USERVERS): New. * src/argparse.c: Include unistd.h. (try_versioned_conffile): New. (_gpgrt_argparser): Use it. -- This is neded to bring the versioned config files back to gpg. Signed-off-by: Werner Koch <[email protected]>
* core: New pseudo option ARGPARSE_PERMISSION_ERROR.Werner Koch2020-02-252-0/+5
| | | | | | | | | | | * src/gpg-error.h.in (ARGPARSE_PERMISSION_ERROR): New. * src/argparse.c (initialize): Add code to print this error. -- We need this option to reject certain config files if we detect a permission problem. Signed-off-by: Werner Koch <[email protected]>
* w32: Fix exporting gpgrt_argparser.NIIBE Yutaka2020-02-251-1/+1
| | | | | | * src/gpg-error.def.in (gpgrt_argparser): Fix typo. Signed-off-by: NIIBE Yutaka <[email protected]>
* core: Extend the way a config file can be specified,Werner Koch2020-02-221-8/+88
| | | | | | | | * src/argparse.c (PATHSEP_C, DIRSEP_C): New. (is_absfname, is_twopartfname): New. (_gpgrt_argparser): Allow for a two-part config name. Signed-off-by: Werner Koch <[email protected]>
* core: Change printed license names.Werner Koch2020-02-201-3/+3
| | | | | | | | -- It is the GNU GPL, so print that and not jus the SPDX identifier. Signed-off-by: Werner Koch <[email protected]>
* core: Skip cmdline parsing for no or an empty argv.Werner Koch2020-02-201-4/+13
| | | | | | | | | | | * src/argparse.c (_gpgrt_argparser): Allow for empty argv. Also fix memory leak. -- This comes handy when rereading option files on SIGHUP, for example in gpg-agent. There is no need to provide a dummy array. Signed-off-by: Werner Koch <[email protected]>
* core: More fixes for the new option/argument parser.Werner Koch2020-02-191-7/+18
| | | | | | | | | | | | | * src/argparse.c (arg_parse): Always set opt_flags. New flag no_init. (_gpgrt_argparse): Clear opt_flags at start. (_gpgrt_argparser): Call arg_parse directly. Call arg_parse with no_init set. -- The no_init flag is a minor performance feature to by pass the initialize function which has already been called by _gpgrt_argparser. Signed-off-by: Werner Koch <[email protected]>
* core: Some fixes for the new option/argument parserWerner Koch2020-02-191-8/+29
| | | | | | | | | | * src/argparse.c (ARGPARSE_FLAG__INITIALIZED): New. (initialize): Use a flag bit to track the initialization state. (_gpgrt_argparser): Clear some state on switching files. -- Fixes-commit: 933eb9346a84c87f83f77d990be2f66e2f7b62e7 Signed-off-by: Werner Koch <[email protected]>
* core: Add a high level option/argument parser.Werner Koch2020-02-189-11/+426
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gpg-error.h.in (GPGRT_CONFDIR_USER, GPGRT_CONFDIR_SYS): New consts. (ARGPARSE_FLAG_SYS, ARGPARSE_FLAG_USER, ARGPARSE_FLAG_VERBOSE) (ARGPARSE_NO_CONFFILE, ARGPARSE_CONFFILE, ARGPARSE_OPT_CONFFILE): New consts. (ARGPARSE_conffile, ARGPARSE_noconffile): New macros. (gpgrt_set_confdir): New func. (gpgrt_argparser): New func. * src/argparse.c (confdir): New var. (enum argparser_states): New. (struct _gpgrt_argparse_internal_s): Add a couple of new fields. (initialize): Init them. (any_opt_conffile): New. (_gpgrt_argparser): New. (_gpgrt_set_confdir): New. * src/visibility.c (gpgrt_argparser): New. (gpgrt_set_confdir): New. * src/gpg-error.def.in, src/gpg-error.vers: Add those functions. * tests/t-argparse.c (main): Reworked. * tests/etc/t-argparse.conf: New file. * tests/t-argparse.conf: New file. -- gpgrt_argparser is a high level version of gpgrt_argparse. It handles reading of configuration files internally and allows allows for a global configuration file. The design is so that it minimizes the work to replace the existing option parsing in gpg and friends by this one and to allow global configuration files for them. This is the just the basic code which should allow replacement of the parsers. A forthcoming patch will implement flags for options given in the global config file. GnuPG-bug-id: 4788 Signed-off-by: Werner Koch <[email protected]>
* core: Add gpgrt_fnameconcat and gpgrt_absfnameconcat.Werner Koch2020-02-189-0/+318
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * src/gpg-error.h.in (gpgrt_fnameconcat): New. (gpgrt_absfnameconcat): New. * src/visibility.c (gpgrt_fnameconcat, gpgrt_absfnameconcat): New. * src/stringutils.c: New file. (_gpgrt_vfnameconcat): New. (_gpgrt_fnameconcat, _gpgrt_absfnameconcat): New. * src/gpg-error.def.in: Add new functions. * src/gpg-error.vers: Ditto. * src/sysutils.c: Include pwd.h. (_gpgrt_getpwdir): New. * configure.ac: Test for pwd.h, getpwnam, getpwuid, and their _r variants. * src/Makefile.am (libgpg_error_la_SOURCES): Add new file. * tests/t-stringutils.c: New. * tests/t-common.h (xmalloc, xstrdup, xfree): New. (die): Kludge to avoid compiler warnings. -- The new functions are based on the code of make_filename from GnuPG. They have been written by me ages ago with only minor modifications by David Shaw. I re-license them from LGPL-3.0+ OR GPL-2.0+ to LGPL-2.1-or-later. Signed-off-by: Werner Koch <[email protected]>
* w32: Support static link with -lws2_32.NIIBE Yutaka2020-02-182-2/+3
| | | | | | | | | | | * configure.ac (GPG_ERROR_CONFIG_LIBS_PRIVATE): New. * src/Makefile.am (socklibs): Use GPG_ERROR_CONFIG_LIBS_PRIVATE. * src/gpg-error.pc.in: Require @GPG_ERROR_CONFIG_LIBS_PRIVATE@. -- GnuPG-bug-id: 4623 Signed-off-by: NIIBE Yutaka <[email protected]>
* logging: Also protect gpgrt_inc_errorcount against counter overflow.Werner Koch2020-02-101-7/+5
| | | | | | | | | | | | | * src/logging.c (_gpgrt_inc_errorcount): Protect against counter overflow. (_gpgrt_logv_internal): Use that function here so that we have only one check for counter overflow. -- We already had an overflow checking for log_error but not for the silent increment function. Signed-off-by: Werner Koch <[email protected]>
* tools: Allow error symbol lookup w/o the GPG_ERR_ prefix.Werner Koch2020-02-061-0/+71
| | | | | | | | | | | * src/gpg-error.c (get_err_from_codesymbol): New. (main): Use it here. -- Saves lot of typing for example when looking up an error description using --desc. Signed-off-by: Werner Koch <[email protected]>
* build: Always pass -no-undefined to libtool.Werner Koch2020-02-061-3/+1
| | | | | | | | | | | | * src/Makefile.am: Remove no_undefined macro. -- This helps to build on Cygwin and does the right thing anyway because we do not have any dependencies in gpgrt. Thanks to Michael Haubenwaller to explain this and propose a patch. GnuPG-bug-id: 4474 Signed-off-by: Werner Koch <[email protected]>
* build: Don't use -O0 which is not portable.NIIBE Yutaka2020-01-071-1/+1
| | | | | | * src/Makefile.am (mkheader): Remove -O0 option. Signed-off-by: NIIBE Yutaka <[email protected]>
* New error codes for SQLiteWerner Koch2019-12-132-1/+48
| | | | | | | * src/err-codes.h.in: Add GPG_ERR_SQL_ codes. * src/gpg-error.h.in (gpg_err_code_from_sqlite): New. Signed-off-by: Werner Koch <[email protected]>
* Fix gpg-error.c for preprocessor use.NIIBE Yutaka2019-09-241-4/+4
| | | | | | | | | * src/gpg-error.c (main): Fix conditional compilation. -- Reported-by: Rey Abeleda <[email protected]> Signed-off-by: NIIBE Yutaka <[email protected]>
* gpgrt_setenv: Define behavior when value=NULL.NIIBE Yutaka2019-09-181-1/+1
| | | | | | | * src/sysutils.c (_gpgrt_setenv): Avoid call with value=NULL. GnuPG-bug-id: 4698 Signed-off-by: NIIBE Yutaka <[email protected]>
* logging: Fix the case of using socket_dir_cb which may return NULL.NIIBE Yutaka2019-09-181-3/+4
| | | | | | | * src/logging.c (fun_writer): Fix for socket_dir_cb. GnuPG-bug-id: 4698 Signed-off-by: NIIBE Yutaka <[email protected]>
* estream: Care about erroneous case for stream close.NIIBE Yutaka2019-09-181-10/+5
| | | | | | | | * src/estream.c (do_list_remove): Only access ITEM->NEXT when it's not null. GnuPG-bug-id: 4698 Signed-off-by: NIIBE Yutaka <[email protected]>
* core: Fix broken strings (first letter missing)Werner Koch2019-09-101-1/+1
| | | | | | | | src/err-codes.h.in (GPG_ERR_KEYBOXD): Add missing tabs. -- Fixes-commit: c6d9598a8572e7757504ddf53c01dcf611228143 Signed-off-by: Werner Koch <[email protected]>
* estream: Fix dead assigniment.Werner Koch2019-09-081-1/+0
| | | | | | | | * src/estream-printf.c (pr_string): Here. -- GnuPG-bug-id: 4698 Signed-off-by: Werner Koch <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-08 08:33:31 +0000