Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Difference From 0.6 To 0.7
2022-01-08 13:33 | Bump version number: 0.8 (check-in: 9918bb8dab user: mark tags: trunk) | |
2022-01-08 13:30 | CHANGES for 0.7 (check-in: 2c45034580 user: mark tags: trunk, 0.7) | |
2022-01-08 13:10 | Bump year in license headers (check-in: 277b68b64f user: mark tags: trunk) | |
2021-11-21 15:32 | Bump version number: 0.7 (check-in: f3d6c2ff7b user: mark tags: trunk) | |
2021-11-21 15:28 | CHANGES for 0.6 (check-in: bbf8590008 user: mark tags: trunk, 0.6) | |
2021-11-21 14:40 | Add user-defined colour support to the branch view. (check-in: 3d1f3389a3 user: mark tags: trunk) | |
Changes to CHANGES.md.
1 2 3 4 5 6 7 | **fnc 0.6** 2021-11-22 - implement support for user-defined colours in tl, diff, tree and blame views - make branch view accessible from all other views - optimise colour scheme initialisation - implement new 'fnc config' interface to configure per-project settings - improve build by making make file make(1) compatible | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | **fnc 0.7** 2022-01-09 - factor out common make(1) and gmake build bits - make build depend on make file - make all commands compatible with `-R|--repository` (i.e., no checkout needed) - implement Vim-like smartcase for commands that filter repository results - improve timeline arg parsing for more informative output upon invalid input - plug small memory leak when the timeline command fails to initialise a view - fix database locking issue when opening multiple tree views from the timeline - add pledge(2) and unveil(2) support on OpenBSD builds - add (s)ort keymap (i.e., `--sort` CLI option counterpart) to the branch view - add (d)ate keymap to toggle display of last modified timestamp in tree view - allow blame of empty files rather than erroring out - fix NULL dereference UB when the ".." parent dir is selected in tree view - merge upstream fix when annotating files with shallow history - add support for configurable horizontal split view mode (timeline -> diff) - keep the last/first line in view when paging down/up to stay oriented - expand horizontal splitscreen support to include tree -> blame views - improve handling of cached commit builder statements - plug small memleak of file labels when traversing commits from the diff view - display message rather than error out when binary files are blamed - expand horizontal split coverage to include timeline -> tree views - implement '#' keymap to display line numbers in blame view - implement (L)ine keymap to navigate directly to the entered line in blame view - convert diff code to use upstream v2 API - keep lines on screen in view when using keymaps that modify diff content - reset diff search state when traversing commits from the diff view - apply upstream diff fix to render consecutive edited lines as one block - implement '#' keymap to display line numbers in diff view - improve `C-f/C-b` paging in the in-app help window - add user-defined option to configure search highlight colours - implement navigate to (L)ine keymap in diff view - enhance timeline and diff view headers - implement user-defined option to configure line selection cursor in diff view - implement Vim-like `C-e/C-y` keymaps to scroll down/up one line in diff view - implement horizontal scrolling in diff and blame views - improve view request handling and optimise new view initialisation - implement `C-n/C-p` keymap to navigate to the next/previous file in the diff - implement (F)ile keymap to navigate directly to a file in the diff - apply upstream diff v2 fix for rendering untouched lines as changed - implement Vim-like `C-d/C-u` keymaps to scroll the view down/up half a page - enhance search behaviour in all views **fnc 0.6** 2021-11-22 - implement support for user-defined colours in tl, diff, tree and blame views - make branch view accessible from all other views - optimise colour scheme initialisation - implement new 'fnc config' interface to configure per-project settings - improve build by making make file make(1) compatible |
︙ | ︙ |
Changes to GNUmakefile.
1 | # | | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | # # FNC GNU Makefile # # CONFIGURATION include fnc.bld.mk UNAME := $(shell uname -s) # OSX has ncursesw, and needs iconv. ifeq ($(UNAME),Darwin) # OSX FNC_LDFLAGS += -lncurses -lpanel -liconv else # Linux (tested on Debian), OpenBSD, FreeBSD FNC_LDFLAGS += -lncursesw -lpanelw endif |
Changes to LICENSE.
|
| | | 1 2 3 4 5 6 7 8 9 10 11 12 13 | Copyright (c) 2021, 2022 Mark Jamsek <mark@jamsek.com> Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
Changes to Makefile.
1 2 3 4 | # # FNC Makefile # | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | # # FNC Makefile # # CONFIGURATION .include "fnc.bld.mk" UNAME != uname -s # OSX has ncursesw, and needs iconv. .if $(UNAME) == Darwin # OSX FNC_LDFLAGS += -lncurses -lpanel -liconv .else # Linux (tested on Debian), OpenBSD, FreeBSD FNC_LDFLAGS += -lncursesw -lpanelw .endif |
Changes to README.md.
1 2 | # README | | | 1 2 3 4 5 6 7 8 9 10 | # README # fnc 0.6 ## An ncurses browser for [Fossil][0] repositories in the terminal. `fnc` uses [libfossil][1] to create a [`fossil ui`][2] experience in the terminal. Tested and confirmed to run on the following amd64 systems (additional platforms |
︙ | ︙ | |||
79 80 81 82 83 84 85 86 87 88 89 90 91 92 | ![diff removed file](https://fnc.bsdbox.org/uv/resources/img/fnc-diff-split-file-removed.png "fnc diff file removed") ![blame split screen](https://fnc.bsdbox.org/uv/resources/img/fnc-blame-splitscreen.png "fnc blame split screen") ![tree split screen](https://fnc.bsdbox.org/uv/resources/img/fnc-tree-splitscreen.png "fnc tree split screen") ![branch split screen](https://fnc.bsdbox.org/uv/resources/img/fnc-branch-splitscreen.png "fnc branch split screen") ![in-app help](https://fnc.bsdbox.org/uv/resources/img/fnc-inapp_help.png "fnc in-app help") ![timeline help](https://fnc.bsdbox.org/uv/resources/img/fnc-timeline-help.png "fnc timeline help") [0]: https://fossil-scm.org [1]: https://fossil.wanderinghorse.net/r/libfossil [2]: https://fossil-scm.org/home/help?cmd=ui [3]: https://fnc.bsdbox.org/uv/download.html [4]: https://fnc.bsdbox.org/uv/resources/doc/fnc.1.html [5]: https://fnc.bsdbox.org/uv/resources/img/fnc-timeline-fullscreen.png [6]: https://itac.bsdbox.org/fnc-demo.mp4 | > > > > > > > > > > | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | ![diff removed file](https://fnc.bsdbox.org/uv/resources/img/fnc-diff-split-file-removed.png "fnc diff file removed") ![blame split screen](https://fnc.bsdbox.org/uv/resources/img/fnc-blame-splitscreen.png "fnc blame split screen") ![tree split screen](https://fnc.bsdbox.org/uv/resources/img/fnc-tree-splitscreen.png "fnc tree split screen") ![branch split screen](https://fnc.bsdbox.org/uv/resources/img/fnc-branch-splitscreen.png "fnc branch split screen") ![in-app help](https://fnc.bsdbox.org/uv/resources/img/fnc-inapp_help.png "fnc in-app help") ![timeline help](https://fnc.bsdbox.org/uv/resources/img/fnc-timeline-help.png "fnc timeline help") # Trivia **fnc** [fɪŋk] *noun* (n.) 1. an ncurses browser for [Fossil][0] repositories in the terminal *verb* (v.) 2. to inform etymology From the German word *Fink*, meaning "finch", a type of bird. [0]: https://fossil-scm.org [1]: https://fossil.wanderinghorse.net/r/libfossil [2]: https://fossil-scm.org/home/help?cmd=ui [3]: https://fnc.bsdbox.org/uv/download.html [4]: https://fnc.bsdbox.org/uv/resources/doc/fnc.1.html [5]: https://fnc.bsdbox.org/uv/resources/img/fnc-timeline-fullscreen.png [6]: https://itac.bsdbox.org/fnc-demo.mp4 |
︙ | ︙ |
Added fnc.bld.mk.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | # # FNC Common Build # # CONFIGURATION CC ?= cc PREFIX ?= /usr/local MANDIR ?= /share/man VERSION ?= 0.7 # FLAGS NEEDED TO BUILD SQLITE3 SQLITE_CFLAGS = ${CFLAGS} -Wall -Werror -Wno-sign-compare -pedantic -std=c99 \ -DNDEBUG=1 \ -DSQLITE_DQS=0 \ -DSQLITE_THREADSAFE=0 \ -DSQLITE_DEFAULT_MEMSTATUS=0 \ -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 \ -DSQLITE_LIKE_DOESNT_MATCH_BLOBS \ -DSQLITE_OMIT_DECLTYPE \ -DSQLITE_OMIT_PROGRESS_CALLBACK \ -DSQLITE_OMIT_SHARED_CACHE \ -DSQLITE_OMIT_LOAD_EXTENSION \ -DSQLITE_MAX_EXPR_DEPTH=0 \ -DSQLITE_USE_ALLOCA \ -DSQLITE_ENABLE_LOCKING_STYLE=0 \ -DSQLITE_DEFAULT_FILE_FORMAT=4 \ -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ -DSQLITE_ENABLE_FTS4 \ -DSQLITE_ENABLE_DBSTAT_VTAB \ -DSQLITE_ENABLE_JSON1 \ -DSQLITE_ENABLE_FTS5 \ -DSQLITE_ENABLE_STMTVTAB \ -DSQLITE_HAVE_ZLIB \ -DSQLITE_INTROSPECTION_PRAGMAS \ -DSQLITE_ENABLE_DBPAGE_VTAB \ -DSQLITE_TRUSTED_SCHEMA=0 # FLAGS NEEDED TO BUILD LIBFOSSIL FOSSIL_CFLAGS = ${CFLAGS} -Wall -Werror -Wsign-compare -pedantic -std=c99 # On SOME Linux (e.g., Ubuntu 18.04.6), we have to include wchar curses from # I/.../ncursesw, but linking to -lncursesw (w/ no special -L path) works fine. # FLAGS NEEDED TO BUILD FNC FNC_CFLAGS = ${CFLAGS} -Wall -Werror -Wsign-compare -pedantic -std=c99 \ -I./lib -I./include -I/usr/include/ncursesw \ -D_XOPEN_SOURCE_EXTENDED -DVERSION=${VERSION} FNC_LDFLAGS = ${LDFLAGS} -lm -lutil -lz -lpthread -fPIC all: bin bin: lib/sqlite3.o lib/libfossil.o src/fnc.o src/fnc lib/sqlite3.o: lib/sqlite3.c lib/sqlite3.h ${CC} ${SQLITE_CFLAGS} -c $< -o $@ lib/libfossil.o: lib/libfossil.c lib/libfossil.h ${CC} ${FOSSIL_CFLAGS} -c $< -o $@ src/fnc.o: src/fnc.c include/settings.h fnc.bld.mk ${CC} ${FNC_CFLAGS} -c $< -o $@ src/fnc: src/fnc.o lib/libfossil.o lib/sqlite3.o fnc.bld.mk ${CC} -o $@ src/fnc.o lib/libfossil.o lib/sqlite3.o ${FNC_LDFLAGS} install: install -s -m 0755 src/fnc ${PREFIX}/bin/fnc install -m 0644 src/fnc.1 ${PREFIX}${MANDIR}/man1/fnc.1 uninstall: rm -f ${PREFIX}/bin/fnc ${PREFIX}${MANDIR}/man1/fnc.1 clean: rm -f lib/*.o src/*.o src/fnc release: clean tar czvf ../fnc-${VERSION}.tgz -C .. fnc-${VERSION} .PHONY: clean release |
Changes to include/settings.h.
︙ | ︙ | |||
10 11 12 13 14 15 16 17 18 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /* * All configurable fnc settings, which can be stored in either the fossil(1) | > > > > > > > > | < < < < | | | | | | | | | | | | | | | | | > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > | < < | > > > > > | | > | > > > > | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #define GEN_ENUM_SYM(pfx, id) pfx##_##id #define GEN_ENUM(name, pfx, info) \ enum name { info(pfx, GEN_ENUM_SYM) }; #define GEN_STR_SYM(pfx, id) #pfx"_"#id #define GEN_STR(name, pfx, info) \ static const char *name[] = { info(pfx, GEN_STR_SYM) }; /* * All configurable fnc settings, which can be stored in either the fossil(1) * repository (e.g., ./repo.fossil) or shell envvars with `export SETTING=val`. */ #define USER_OPTIONS(pfx, _) \ _(pfx, START_SETTINGS), \ _(pfx, COLOUR_COMMIT), \ _(pfx, COLOUR_USER), \ _(pfx, COLOUR_DATE), \ _(pfx, COLOUR_DIFF_META), \ _(pfx, COLOUR_DIFF_MINUS), \ _(pfx, COLOUR_DIFF_PLUS), \ _(pfx, COLOUR_DIFF_CHUNK), \ _(pfx, COLOUR_DIFF_TAGS), \ _(pfx, COLOUR_TREE_LINK), \ _(pfx, COLOUR_TREE_DIR), \ _(pfx, COLOUR_TREE_EXEC), \ _(pfx, COLOUR_BRANCH_OPEN), \ _(pfx, COLOUR_BRANCH_CLOSED), \ _(pfx, COLOUR_BRANCH_CURRENT), \ _(pfx, COLOUR_BRANCH_PRIVATE), \ _(pfx, COLOUR_HL_LINE), \ _(pfx, COLOUR_HL_SEARCH), \ _(pfx, VIEW_SPLIT_MODE), \ _(pfx, VIEW_SPLIT_WIDTH), \ _(pfx, VIEW_SPLIT_HEIGHT), \ _(pfx, EOF_SETTINGS) #define LINE_ATTR_ENUM(pfx, _) \ _(pfx, AUTO), \ _(pfx, MONO) #define INPUT_TYPE_ENUM(pfx, _) \ _(pfx, ALPHA), \ _(pfx, NUMERIC) #define LINE_TYPE_ENUM(pfx, _) \ _(pfx, TIMELINE_HEADER), \ _(pfx, TIMELINE_COMMIT), \ _(pfx, DIFF_HEADER), \ _(pfx, DIFF_ARTIFACT), \ _(pfx, DIFF_USER), \ _(pfx, DIFF_TAGS), \ _(pfx, DIFF_DATE), \ _(pfx, DIFF_COMMENT), \ _(pfx, DIFF_CHANGESET), \ _(pfx, DIFF_INDEX), \ _(pfx, DIFF_META), \ _(pfx, DIFF_MINUS), \ _(pfx, DIFF_PLUS), \ _(pfx, DIFF_CHUNK), \ #define VIEW_MODE_ENUM(pfx, _) \ _(pfx, NONE), \ _(pfx, VERT), \ _(pfx, HRZN) #define ENUM_INFO(_) \ _(fnc_opt_id, FNC, USER_OPTIONS) \ _(line_attr, SLINE, LINE_ATTR_ENUM) \ _(input_type, INPUT, INPUT_TYPE_ENUM) \ _(line_type, LINE, LINE_TYPE_ENUM) \ _(view_mode, VIEW_SPLIT, VIEW_MODE_ENUM) #define GEN_ENUMS(name, pfx, info) GEN_ENUM(name, pfx, info) ENUM_INFO(GEN_ENUMS) #define STR_INFO(_) \ _(fnc_opt_name, FNC, USER_OPTIONS) #define GEN_STRINGS(name, pfx, info) GEN_STR(name, pfx, info) STR_INFO(GEN_STRINGS) |
Changes to lib/libfossil-config.h.
︙ | ︙ | |||
51 52 53 54 55 56 57 | #if !defined(HAVE_STDINT_H) # define HAVE_STDINT_H 1 #endif #if !defined(_DEFAULT_SOURCE) # define _DEFAULT_SOURCE 1 #endif #if !defined(_XOPEN_SOURCE) | | | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | #if !defined(HAVE_STDINT_H) # define HAVE_STDINT_H 1 #endif #if !defined(_DEFAULT_SOURCE) # define _DEFAULT_SOURCE 1 #endif #if !defined(_XOPEN_SOURCE) # define _XOPEN_SOURCE 700 #endif #else #if !defined(HAVE_LSTAT) # define HAVE_LSTAT 0 #endif #if !defined(HAVE_LTDL_H) # define HAVE_LTDL_H 0 |
︙ | ︙ |
Changes to lib/libfossil.c.
1 | #include "libfossil.h" | | | 1 2 3 4 5 6 7 8 9 | #include "libfossil.h" /* start of file ./src/fsl.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
44 45 46 47 48 49 50 51 52 53 54 55 56 57 | const fsl_buffer fsl_buffer_empty = fsl_buffer_empty_m; const fsl_card_F fsl_card_F_empty = fsl_card_F_empty_m; const fsl_card_F_list fsl_card_F_list_empty = fsl_card_F_list_empty_m; const fsl_card_J fsl_card_J_empty = fsl_card_J_empty_m; const fsl_card_Q fsl_card_Q_empty = fsl_card_Q_empty_m; const fsl_card_T fsl_card_T_empty = fsl_card_T_empty_m; const fsl_checkin_opt fsl_checkin_opt_empty = fsl_checkin_opt_empty_m; const fsl_ckout_manage_opt fsl_ckout_manage_opt_empty = fsl_ckout_manage_opt_empty_m; const fsl_ckout_unmanage_opt fsl_ckout_unmanage_opt_empty = fsl_ckout_unmanage_opt_empty_m; const fsl_ckup_opt fsl_ckup_opt_empty = fsl_ckup_opt_m; const fsl_confirmer fsl_confirmer_empty = fsl_confirmer_empty_m; const fsl_cx fsl_cx_empty = fsl_cx_empty_m; | > > | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | const fsl_buffer fsl_buffer_empty = fsl_buffer_empty_m; const fsl_card_F fsl_card_F_empty = fsl_card_F_empty_m; const fsl_card_F_list fsl_card_F_list_empty = fsl_card_F_list_empty_m; const fsl_card_J fsl_card_J_empty = fsl_card_J_empty_m; const fsl_card_Q fsl_card_Q_empty = fsl_card_Q_empty_m; const fsl_card_T fsl_card_T_empty = fsl_card_T_empty_m; const fsl_checkin_opt fsl_checkin_opt_empty = fsl_checkin_opt_empty_m; const fsl_cidiff_opt fsl_cidiff_opt_empty = fsl_cidiff_opt_empty_m; const fsl_cidiff_state fsl_cidiff_state_empty = fsl_cidiff_state_empty_m; const fsl_ckout_manage_opt fsl_ckout_manage_opt_empty = fsl_ckout_manage_opt_empty_m; const fsl_ckout_unmanage_opt fsl_ckout_unmanage_opt_empty = fsl_ckout_unmanage_opt_empty_m; const fsl_ckup_opt fsl_ckup_opt_empty = fsl_ckup_opt_m; const fsl_confirmer fsl_confirmer_empty = fsl_confirmer_empty_m; const fsl_cx fsl_cx_empty = fsl_cx_empty_m; |
︙ | ︙ | |||
375 376 377 378 379 380 381 | } int fsl_stricmp_cmp( void const * lhs, void const * rhs ){ return fsl_stricmp((char const *)lhs, (char const *)rhs); } fsl_size_t fsl_strlen( char const * src ){ | | | | | 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 | } int fsl_stricmp_cmp( void const * lhs, void const * rhs ){ return fsl_stricmp((char const *)lhs, (char const *)rhs); } fsl_size_t fsl_strlen( char const * src ){ char const * const b = src; if(src) while( *src ) ++src; return (fsl_size_t)(src - b); } char * fsl_strndup( char const * src, fsl_int_t len ){ if(!src) return NULL; else{ fsl_buffer b = fsl_buffer_empty; if(len<0) len = (fsl_int_t)fsl_strlen(src); |
︙ | ︙ | |||
922 923 924 925 926 927 928 | } /** Convenience form of fsl_simplify_sql() which assumes b holds an SQL string. It gets processed by fsl_simplify_sql() and its 'used' length potentially gets adjusted to match the adjusted SQL string. */ | | | | | 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 | } /** Convenience form of fsl_simplify_sql() which assumes b holds an SQL string. It gets processed by fsl_simplify_sql() and its 'used' length potentially gets adjusted to match the adjusted SQL string. */ fsl_size_t fsl_simplify_sql_buffer( fsl_buffer * const b ){ return b->used = fsl_simplify_sql( (char *)b->mem, (fsl_int_t)b->used ); } char const *fsl_preferred_ckout_db_name(){ #if FSL_PLATFORM_IS_WINDOWS return "_FOSSIL_"; #else return ".fslckout"; #endif } bool fsl_isatty(int fd){ return isatty(fd) ? true : false; } bool fsl__is_reserved_fn_windows(const char *zPath, fsl_int_t nameLen){ static const char *const azRes[] = { "CON", "PRN", "AUX", "NUL", "COM", "LPT" }; unsigned int i; |
︙ | ︙ | |||
1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 | return zEnd[-10]=='/' ? true : !!gotSuffix; } default:{ return false; } } } #undef MARKER #if defined(_WIN32) || defined(WIN32) #undef isatty #endif | > > > > | | | 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 | return zEnd[-10]=='/' ? true : !!gotSuffix; } default:{ return false; } } } void fsl_randomness(unsigned int n, void *tgt){ sqlite3_randomness((int)n, tgt); } #undef MARKER #if defined(_WIN32) || defined(WIN32) #undef isatty #endif /* end of file ./src/fsl.c */ /* start of file ./src/annotate.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
1321 1322 1323 1324 1325 1326 1327 | if(NULL==x){ rc = FSL_RC_OOM; goto end; } a->aVers = x; a->naVers = n; } | | > > > > | | 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 | if(NULL==x){ rc = FSL_RC_OOM; goto end; } a->aVers = x; a->naVers = n; } #define AnnStr(COL,FLD) zCol = NULL; \ rc = fsl_stmt_get_text(&q, COL, &zCol, &nCol); \ if(rc) goto end; \ else if(!zCol){ goto end; \ /*zCol=""; nCol=0; //causes downstream 'RID 0 is invalid' error*/} \ zTmp = fsl_strndup(zCol, (fsl_int_t)nCol); \ if(!zTmp){ rc = FSL_RC_OOM; goto end; } \ a->aVers[a->nVers].FLD = zTmp AnnStr(0,zFUuid); AnnStr(1,zMUuid); AnnStr(2,zUser); #undef AnnStr a->aVers[a->nVers].mtime = mtime; |
︙ | ︙ | |||
1487 1488 1489 1490 1491 1492 1493 | fsl__cx_scratchpad_yield(f, scratch); fsl__annotator_clean(&ann); return rc; } #undef MARKER #undef blob_to_utf8_no_bom | | | | 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 | fsl__cx_scratchpad_yield(f, scratch); fsl__annotator_clean(&ann); return rc; } #undef MARKER #undef blob_to_utf8_no_bom /* end of file ./src/annotate.c */ /* start of file ./src/appendf.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /************************************************************************ The printf-like implementation in this file is based on the one found in the sqlite3 distribution is in the Public Domain. This copy was forked for use with the clob API in Feb 2008 by Stephan |
︙ | ︙ | |||
2269 2270 2271 2272 2273 2274 2275 | && (c=fsl_utf8_read_char(z, zEnd, &zNext)); z = zNext ){ if( c=='\\' || c=='"' ){ out("\\", 1); outc; }else if( c<' ' ){ out("\\",1); | > | > | | | | | | | | | | | > > | 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 | && (c=fsl_utf8_read_char(z, zEnd, &zNext)); z = zNext ){ if( c=='\\' || c=='"' ){ out("\\", 1); outc; }else if( c<' ' ){ out("\\",1); switch(c){ case '\b': out("b",1); break; case '\f': out("f",1); break; case '\n': out("n",1); break; case '\t': out("t",1); break; case '\r': out("r",1); break; default:{ unsigned char ubuf[5] = {'u',0,0,0,0}; int i; for(i = 4; i>0; --i){ ubuf[i] = "0123456789abcdef"[c&0xf]; c >>= 4; } out(ubuf,5); break; } } }else if(c<128){ outc; }/* At this point we know that c is part of a multi-byte character. We're assuming legal UTF8 input, which means emitting a surrogate pair if the value is > 0xffff. */ else if(c<0xFFFF){ |
︙ | ︙ | |||
2928 2929 2930 2931 2932 2933 2934 | } case etSTRING: { bufpt = va_arg(ap,char*); length = bufpt ? StrNLen32(bufpt, (precision>0 && flag_alternateform) ? precision*4/*max bytes per char*/ | | | | 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 | } case etSTRING: { bufpt = va_arg(ap,char*); length = bufpt ? StrNLen32(bufpt, (precision>0 && flag_alternateform) ? precision*4/*max bytes per char*/ : (precision>=0 ? precision : -1)) : (int)0; if(flag_alternateform && length && (precision>0 || width>0)){ appendf__utf8_altform(bufpt, &length, &precision, &width); }else if( length && precision>=0 && precision<length ){ length = precision; } break; } case etDYNSTRING: { /* etDYNSTRING needs to be handled separately because it free()s its argument (which isn't available outside this block). This means, though, that %-#z does not work. */ bufpt = va_arg(ap,char*); length = bufpt ? StrNLen32(bufpt, (precision>0 && flag_alternateform) ? precision*4/*max bytes per char*/ : (precision>=0 ? precision : -1)) : (int)0; if(flag_alternateform && length && (precision>0 || width>0)){ appendf__utf8_altform(bufpt, &length, &precision, &width); }else if( length && precision>=0 && precision<length ){ length = precision; } pfrc = spech_dynstring( pfAppend, pfAppendArg, |
︙ | ︙ | |||
3215 3216 3217 3218 3219 3220 3221 | va_start( vargs, fmt ); rc = fsl_snprintfv( dest, n, fmt, vargs ); va_end( vargs ); return rc; } #undef MARKER | | | | > | 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 | va_start( vargs, fmt ); rc = fsl_snprintfv( dest, n, fmt, vargs ); va_end( vargs ); return rc; } #undef MARKER /* end of file ./src/appendf.c */ /* start of file ./src/auth.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /*************************************************************************** This file contains routines related to working with user authentication. */ FSL_EXPORT char * fsl_sha1_shared_secret( fsl_cx * const f, char const * zLoginName, char const * zPw ){ if(!f || !zPw || !zLoginName) return 0; else{ fsl_sha1_cx hash = fsl_sha1_cx_empty; unsigned char zResult[20]; char zDigest[41]; if(!f->cache.projectCode){ |
︙ | ︙ | |||
3266 3267 3268 3269 3270 3271 3272 | fsl_sha1_update(&hash, zPw, fsl_strlen(zPw)); fsl_sha1_final(&hash, zResult); fsl_sha1_digest_to_base16(zResult, zDigest); return fsl_strndup( zDigest, FSL_STRLEN_SHA1 ); } } | | | | | 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 | fsl_sha1_update(&hash, zPw, fsl_strlen(zPw)); fsl_sha1_final(&hash, zResult); fsl_sha1_digest_to_base16(zResult, zDigest); return fsl_strndup( zDigest, FSL_STRLEN_SHA1 ); } } FSL_EXPORT char * fsl_repo_login_group_name(fsl_cx * const f){ return f ? fsl_config_get_text(f, FSL_CONFDB_REPO, "login-group-name", 0) : 0; } FSL_EXPORT char * fsl_repo_login_cookie_name(fsl_cx * const f){ fsl_db * db; if(!f || !(db = fsl_cx_db_repo(f))) return 0; else{ char const * sql = "SELECT 'fossil-' || substr(value,1,16)" " FROM config" " WHERE name IN ('project-code','login-group-code')" " ORDER BY name /*sort*/"; return fsl_db_g_text(db, 0, sql); } } FSL_EXPORT int fsl_repo_login_search_uid(fsl_cx * const f, char const * zUsername, char const * zPasswd, fsl_id_t * userId){ int rc; char * zSecret; fsl_db * db; if(!f || !userId || !zUsername || !*zUsername |
︙ | ︙ | |||
3314 3315 3316 3317 3318 3319 3320 | " AND login NOT IN ('anonymous','nobody','developer','reader')" " AND (pw=%Q OR (length(pw)<>40 AND pw=%Q))", zUsername, zSecret, zPasswd); fsl_free(zSecret); return rc; } | | | | | 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 | " AND login NOT IN ('anonymous','nobody','developer','reader')" " AND (pw=%Q OR (length(pw)<>40 AND pw=%Q))", zUsername, zSecret, zPasswd); fsl_free(zSecret); return rc; } FSL_EXPORT int fsl_repo_login_clear( fsl_cx * const f, fsl_id_t userId ){ fsl_db * db; if(!f) return FSL_RC_MISUSE; else if(!(db = fsl_needs_repo(f))) return FSL_RC_NOT_A_REPO; else{ int const rc = fsl_db_exec(db, "UPDATE user SET cookie=NULL, ipaddr=NULL, " " cexpire=0 WHERE " " CASE WHEN %"FSL_ID_T_PFMT">=0 THEN uid=%"FSL_ID_T_PFMT"" " ELSE uid>0 END" " AND login NOT IN('anonymous','nobody'," " 'developer','reader')", (fsl_id_t)userId, (fsl_id_t)userId); if(rc){ fsl_cx_uplift_db_error(f, db); } return rc; } } #undef MARKER /* end of file ./src/auth.c */ /* start of file ./src/bag.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
3535 3536 3537 3538 3539 3540 3541 | void fsl_id_bag_swap(fsl_id_bag * const lhs, fsl_id_bag * const rhs){ fsl_id_bag x = *lhs; *lhs = *rhs; *rhs = x; } #undef fsl_id_bag_hash | | | | 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 | void fsl_id_bag_swap(fsl_id_bag * const lhs, fsl_id_bag * const rhs){ fsl_id_bag x = *lhs; *lhs = *rhs; *rhs = x; } #undef fsl_id_bag_hash /* end of file ./src/bag.c */ /* start of file ./src/buffer.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
3563 3564 3565 3566 3567 3568 3569 3570 | #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > | | | > | | > | < | | | | < | > | > | > > > > > > > | | > > > > | > | > > > > > > > > | > > > > > > | | | | | | | | | | | | | | < < | < > > | | < < < | | | | | | | | | < | 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 | #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) #define buffer_is_external(b) (b->mem && 0==b->capacity) /** Materializes external buffer b by allocating b->used+extra+1 bytes, copying b->used bytes from b->mem to the new block, NUL-terminating the block, and replacing b->mem with the new block. Returns 0 on success, else FSL_RC_OOM. Asserts that b is an external buffer. */ static int fsl__buffer_materialize( fsl_buffer * const b, fsl_size_t extra ){ assert(buffer_is_external(b)); fsl_size_t const n = b->used + extra + 1; unsigned char * x = (unsigned char *)fsl_malloc(n); if(!x) return FSL_RC_OOM; memcpy(x, b->mem, b->used); b->capacity = n; x[b->used] = 0; b->mem = x; return 0; } int fsl_buffer_materialize( fsl_buffer * const b ){ return buffer_is_external(b) ? fsl__buffer_materialize(b, 0) : 0; } #define buffer_materialize(B,N) (buffer_is_external(B) ? fsl__buffer_materialize((B),(N)) : 0) void fsl_buffer_external( fsl_buffer * const b, void const * mem, fsl_int_t n ){ if(b->mem) fsl_buffer_clear(b); if(n<0) n =(fsl_int_t)fsl_strlen((char const *)mem); b->used = n; b->cursor = 0; b->mem = (unsigned char *)mem; b->capacity = 0; } fsl_buffer * fsl_buffer_reuse( fsl_buffer * const b ){ if(buffer_is_external(b)){ *b = fsl_buffer_empty; }else{ if(b->capacity){ assert(b->mem); b->mem[0] = 0; b->used = 0; } b->cursor = 0; } return b; } void fsl_buffer_clear( fsl_buffer * const buf ){ if(buf->capacity) fsl_free(buf->mem); *buf = fsl_buffer_empty; } int fsl_buffer_reserve( fsl_buffer * const buf, fsl_size_t n ){ if( ! buf ) return FSL_RC_MISUSE; else if( 0 == n ){ if(!buffer_is_external(buf)){ fsl_free(buf->mem); }/* else if it has memory, it's owned elsewhere */ *buf = fsl_buffer_empty; return 0; }else if( !buffer_is_external(buf) && buf->capacity >= n ){ assert(buf->mem); return 0; }else{ unsigned char * x; bool const isExt = buffer_is_external(buf); assert((buf->used < n) && "Buffer in-use greater than capacity!"); if(isExt && n<=buf->used){ /*For external buffers, always keep at least the initially-pointed-to size. */ n = buf->used + 1; } x = (unsigned char *)fsl_realloc( isExt ? NULL : buf->mem, n ); if( !x ) return FSL_RC_OOM; else if(isExt){ memcpy( x, buf->mem, buf->used ); x[buf->used] = 0; }else{ memset( x + buf->used, 0, n - buf->used ); } buf->mem = x; buf->capacity = n; return 0; } } int fsl_buffer_resize( fsl_buffer * const b, fsl_size_t n ){ if(buffer_is_external(b)){ if(n==b->used) return 0; else if(n==0){ b->capacity = 0; fsl_buffer_external(b, "", 0); return 0; } unsigned char * x = (unsigned char *)fsl_malloc( n+1/*NUL*/ ); if( !x ) return FSL_RC_OOM; memcpy(x, b->mem, n < b->used ? n : b->used); x[n] = 0; b->mem = x; b->capacity = n+1; b->used = n; return 0; }else if(n && (b->capacity == n+1)){ b->used = n; b->mem[n] = 0; return 0; }else{ unsigned char * x = (unsigned char *)fsl_realloc( b->mem, n+1/*NUL*/ ); if( ! x ) return FSL_RC_OOM; if(n > b->capacity){ /* zero-fill new parts */ memset( x + b->capacity, 0, n - b->capacity +1/*NUL*/ ); } b->capacity = n + 1 /*NUL*/; b->used = n; b->mem = x; b->mem[b->used] = 0; return 0; } } int fsl_buffer_compare(fsl_buffer const * const lhs, fsl_buffer const * const rhs){ fsl_size_t const szL = lhs->used; fsl_size_t const szR = rhs->used; fsl_size_t const sz = (szL<szR) ? szL : szR; int rc = memcmp(lhs->mem, rhs->mem, sz); if(0 == rc){ rc = (szL==szR) ? 0 : ((szL<szR) ? -1 : 1); } return rc; } /* Compare two blobs in constant time and return zero if they are equal. Constant time comparison only applies for blobs of the same length. If lengths are different, immediately returns 1. */ int fsl_buffer_compare_O1(fsl_buffer const * const lhs, fsl_buffer const * const rhs){ fsl_size_t const szL = lhs->used; fsl_size_t const szR = rhs->used; fsl_size_t i; unsigned char const *buf1; unsigned char const *buf2; unsigned char rc = 0; if( szL!=szR || szL==0 ) return 1; buf1 = lhs->mem; buf2 = rhs->mem; for( i=0; i<szL; i++ ){ rc = rc | (buf1[i] ^ buf2[i]); } return rc; } int fsl_buffer_append( fsl_buffer * const b, void const * const data, fsl_int_t len ){ fsl_size_t sz = b->used; if(len<0) len = (fsl_int_t)fsl_strlen((char const *)data); if(buffer_materialize(b, (fsl_size_t)len + 1)) return FSL_RC_OOM; assert(b->capacity ? !!b->mem : !b->mem); assert(b->used <= b->capacity); sz += len + 1/*NUL*/; int const rc = b->capacity<sz ? fsl_buffer_reserve( b, sz ) : 0; if(!rc){ assert(b->capacity >= sz); if(len>0) memcpy(b->mem + b->used, data, (size_t)len); b->used += len; b->mem[b->used] = 0; } return rc; } int fsl_buffer_appendfv( fsl_buffer * const b, char const * fmt, va_list args){ return fsl_appendfv( fsl_output_f_buffer, b, fmt, args ); } |
︙ | ︙ | |||
3700 3701 3702 3703 3704 3705 3706 | va_start(args,fmt); rc = fsl_buffer_appendfv( b, fmt, args ); va_end(args); return rc; } } | | | | | > | | | | > | | 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 | va_start(args,fmt); rc = fsl_buffer_appendfv( b, fmt, args ); va_end(args); return rc; } } char const * fsl_buffer_cstr(fsl_buffer const * const b){ return b ? (char const *)b->mem : NULL; } char const * fsl_buffer_cstr2(fsl_buffer const * const b, fsl_size_t * const len){ char const * rc = NULL; if(b){ rc = (char const *)b->mem; if(len) *len = b->used; } return rc; } char * fsl_buffer_str(fsl_buffer const * const b){ return (char *)b->mem; } #if 0 fsl_size_t fsl_buffer_size(fsl_buffer const * const b){ return b->used; } fsl_size_t fsl_buffer_capacity(fsl_buffer const * const b){ return b->capacity; } #endif bool fsl_data_is_compressed(unsigned char const * const mem, fsl_size_t len){ if(!mem || (len<6)) return 0; #if 0 else return ('x'==mem[4]) && (0234==mem[5]); /* This check fails for one particular artifact in the tcl core. Notes gathered while debugging... |
︙ | ︙ | |||
3894 3895 3896 3897 3898 3899 3900 | }else{ fsl_buffer_reserve(&temp, 0); } return rc; } } | | | | > > > > > | > > > > > > > > > > > > > > > | | > > > | < > | | | | | | | < > | < > | | | < > | > | > > | | | > > > > > > > > > > > | 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 | }else{ fsl_buffer_reserve(&temp, 0); } return rc; } } int fsl_buffer_uncompress(fsl_buffer const * const pIn, fsl_buffer * const pOut){ unsigned int nOut; unsigned char *inBuf; unsigned int const nIn = pIn->used; fsl_buffer temp = fsl_buffer_empty; int rc; unsigned long int nOut2; if(nIn<=4 || !fsl_data_is_compressed(pIn->mem, pIn->used)){ if(pIn==pOut || !pIn->mem) rc = 0; else{ fsl_buffer_reuse(pOut); rc = fsl_buffer_append(pOut, pIn->mem, pIn->used); } return rc; } inBuf = pIn->mem; nOut = (inBuf[0]<<24) + (inBuf[1]<<16) + (inBuf[2]<<8) + inBuf[3]; /* MARKER(("decompress size: %u\n", nOut)); */ if(pIn!=pOut && pOut->capacity>=nOut+1){ assert(pIn->mem != pOut->mem); #if 0 /* why does this cause corruption (in the form of overwriting a buffer somewhere in the fsl_content_get() constellation)? fsl_repo_rebuild() works but fsl_repo_extract() can trigger it: (FSL_RC_RANGE): Delta: copy extends past end of input */ fsl_buffer_external(&temp, pOut->mem, pOut->capacity); #else fsl_buffer_swap(&temp, pOut); #endif }else{ rc = fsl_buffer_reserve(&temp, nOut+1); if(rc) return rc; temp.mem[nOut] = 0; } nOut2 = (long int)nOut; rc = uncompress(temp.mem, &nOut2, &inBuf[4], nIn - 4) /* In some libz versions (<1.2.4, apparently), valgrind says there's an uninitialized memory access somewhere under uncompress(), _presumably_ for one of these arguments, but i can't find it. fsl_buffer_reserve() always memsets() new bytes to 0. Turns out it's a known problem: https://www.zlib.net/zlib_faq.html#faq36 */; switch(rc){ case 0: /* this is always true but having this assert here makes me nervous: assert(nOut2 == nOut); */ assert(nOut2<=nOut); temp.mem[nOut2] = 0; temp.used = (fsl_size_t)nOut2; #if 1 fsl_buffer_swap(&temp, pOut); #else if(temp.mem!=pOut->mem){ if(pOut->capacity>=temp.capacity){ pOut->used = 0; MARKER(("uncompress() re-using target buffer.\n")); fsl_buffer_append(pOut, temp.mem, temp.capacity); }else{ fsl_buffer_swap(pOut, &temp); } } #endif break; case Z_DATA_ERROR: rc = FSL_RC_CONSISTENCY; break; case Z_MEM_ERROR: rc = FSL_RC_OOM; break; case Z_BUF_ERROR: assert(!"Cannot happen!"); rc = FSL_RC_RANGE; break; default: rc = FSL_RC_ERROR; break; } if(temp.mem!=pOut->mem) fsl_buffer_clear(&temp); return rc; } int fsl_buffer_fill_from( fsl_buffer * const dest, fsl_input_f src, void * const state ) { |
︙ | ︙ | |||
4024 4025 4026 4027 4028 4029 4030 | fsl_buffer const * const src ){ fsl_buffer_reuse(dest); return src->used ? fsl_buffer_append( dest, src->mem, src->used ) : 0; } | | | | | | | < < < > | | | | < | | | < | | | | < | | | < | | | | | | < < | < | | | < | < | < | | 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 | fsl_buffer const * const src ){ fsl_buffer_reuse(dest); return src->used ? fsl_buffer_append( dest, src->mem, src->used ) : 0; } int fsl_buffer_delta_apply2( fsl_buffer const * const orig, fsl_buffer const * const pDelta, fsl_buffer * const pTarget, fsl_error * const pErr){ int rc; fsl_size_t n = 0; fsl_buffer out = fsl_buffer_empty; rc = fsl_delta_applied_size( pDelta->mem, pDelta->used, &n); if(rc){ if(pErr){ fsl_error_set(pErr, rc, "fsl_delta_applied_size() failed."); } return rc; } rc = fsl_buffer_resize( &out, n ); if(rc) return rc; rc = fsl_delta_apply2( orig->mem, orig->used, pDelta->mem, pDelta->used, out.mem, pErr); if(0==rc){ fsl_buffer_swap(&out, pTarget); } fsl_buffer_clear(&out); return rc; } int fsl_buffer_delta_apply( fsl_buffer const * const orig, fsl_buffer const * const pDelta, fsl_buffer * const pTarget){ return fsl_buffer_delta_apply2(orig, pDelta, pTarget, NULL); } void fsl_buffer_defossilize( fsl_buffer * const b ){ fsl_bytes_defossilize( b->mem, &b->used ); } int fsl_buffer_to_filename( fsl_buffer const * const b, char const * fname ){ FILE * f; int rc = 0; if(!b || !fname) return FSL_RC_MISUSE; f = fsl_fopen(fname, "wb"); if(!f) rc = fsl_errno_to_rc(errno, FSL_RC_IO); else{ if(b->used) { size_t const frc = fwrite(b->mem, b->used, 1, f); rc = (1==frc) ? 0 : FSL_RC_IO; } fsl_fclose(f); } return rc; } int fsl_buffer_delta_create( fsl_buffer const * const src, fsl_buffer const * const newVers, fsl_buffer * const delta){ if((src == newVers) || (src==delta) || (newVers==delta)) return FSL_RC_MISUSE; int rc = fsl_buffer_reserve( delta, newVers->used + 60 ); if(!rc){ delta->used = 0; rc = fsl_delta_create( src->mem, src->used, newVers->mem, newVers->used, delta->mem, &delta->used ); } return rc; } int fsl_output_f_buffer( void * state, void const * src, fsl_size_t n ){ return (!state || !src) ? FSL_RC_MISUSE : fsl_buffer_append((fsl_buffer*)state, src, n); } int fsl_finalizer_f_buffer( void * state, void * mem ){ fsl_buffer * b = (fsl_buffer*)mem; fsl_buffer_reserve(b, 0); *b = fsl_buffer_empty; return 0; } int fsl_buffer_strftime(fsl_buffer * const b, char const * format, const struct tm *timeptr){ if(!b || !format || !*format || !timeptr) return FSL_RC_MISUSE; else{ enum {BufSize = 128}; char buf[BufSize]; fsl_size_t const len = fsl_strftime(buf, BufSize, format, timeptr); return len ? fsl_buffer_append(b, buf, (fsl_int_t)len) : FSL_RC_RANGE; } } int fsl_buffer_stream_lines(fsl_output_f fTo, void * const toState, fsl_buffer * const pFrom, fsl_size_t N){ char *z = (char *)pFrom->mem; fsl_size_t i = pFrom->cursor; |
︙ | ︙ | |||
4246 4247 4248 4249 4250 4251 4252 | fsl_buffer_clear(&fc); #endif return rc; } } char * fsl_buffer_take(fsl_buffer * const b){ | > > | | > | 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 | fsl_buffer_clear(&fc); #endif return rc; } } char * fsl_buffer_take(fsl_buffer * const b){ char * z = NULL; if(0==buffer_materialize(b,0)){ z = (char *)b->mem; *b = fsl_buffer_empty; } return z; } fsl_size_t fsl_buffer_seek(fsl_buffer * const b, fsl_int_t offset, fsl_buffer_seek_e whence){ int64_t c = (int64_t)b->cursor; switch(whence){ |
︙ | ︙ | |||
4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 | if(i++) rc = fsl_buffer_append(b, separator, sepLen); if(!rc) rc = fsl_buffer_appendf(b, "%" FSL_ID_T_PFMT, e); } return rc; } int fsl_buffer_append_tcl_literal(fsl_buffer * const b, char const * z, fsl_int_t n){ int rc; if(n<0) n = fsl_strlen(z); rc = fsl_buffer_append(b, "\"", 1); for(fsl_int_t i=0; 0==rc && i<n; ++i){ char c = z[i]; switch( c ){ | > > | > > > | > > | | | 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 | if(i++) rc = fsl_buffer_append(b, separator, sepLen); if(!rc) rc = fsl_buffer_appendf(b, "%" FSL_ID_T_PFMT, e); } return rc; } int fsl_buffer_append_tcl_literal(fsl_buffer * const b, bool escapeSquigglies, char const * z, fsl_int_t n){ int rc; if(n<0) n = fsl_strlen(z); rc = fsl_buffer_append(b, "\"", 1); for(fsl_int_t i=0; 0==rc && i<n; ++i){ char c = z[i]; bool skipSlash = false; switch( c ){ case '\r': c = 'r'; goto slash; case '}': case '{': skipSlash = !escapeSquigglies; /* fall through */ case '[': case ']': case '$': case '"': case '\\': slash: if(!skipSlash && (rc = fsl_buffer_append(b, "\\", 1))) break; /* fall through */ default: rc = fsl_buffer_append(b, &c, 1); } } if(0==rc) rc = fsl_buffer_append(b, "\"", 1); return rc; } #undef MARKER #undef buffer_is_external #undef buffer_materialize /* end of file ./src/buffer.c */ /* start of file ./src/cache.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
4489 4490 4491 4492 4493 4494 4495 | } assert(!"delta-loop in repository"); return fsl_cx_err_set(f, FSL_RC_CONSISTENCY, "Serious problem: delta-loop in repository"); } #undef MARKER | | | | 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 | } assert(!"delta-loop in repository"); return fsl_cx_err_set(f, FSL_RC_CONSISTENCY, "Serious problem: delta-loop in repository"); } #undef MARKER /* end of file ./src/cache.c */ /* start of file ./src/checkin.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
4538 4539 4540 4541 4542 4543 4544 | ignore if (e.g.) the parent content is already a delta of something else. The wise caller will have a transaction in place when calling this. Returns 0 on success. On error rid and uuid are not modified. */ | | > > | | | 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 | ignore if (e.g.) the parent content is already a delta of something else. The wise caller will have a transaction in place when calling this. Returns 0 on success. On error rid and uuid are not modified. */ static int fsl_checkin_import_file( fsl_cx * const f, char const * const zRelName, fsl_id_t parentRid, bool allowMergeConflict, fsl_id_t * const rid, fsl_uuid_str * const uuid){ fsl_buffer * nbuf = fsl__cx_scratchpad(f); fsl_size_t const oldSize = nbuf->used; fsl_buffer * const fbuf = &f->cache.fileContent; char const * fn; int rc; fsl_id_t fnid = 0; fsl_id_t rcRid = 0; assert(!fbuf->used && "Misuse of f->fileContent"); assert(f->ckout.dir); rc = fsl__repo_filename_fnid2(f, zRelName, &fnid, 1); |
︙ | ︙ | |||
4781 4782 4783 4784 4785 4786 4787 | if(rc) fsl_db_transaction_rollback(db); else{ rc = fsl_cx_uplift_db_error2(f, db, fsl_db_transaction_commit(db)); } return rc; } | | | 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 | if(rc) fsl_db_transaction_rollback(db); else{ rc = fsl_cx_uplift_db_error2(f, db, fsl_db_transaction_commit(db)); } return rc; } int fsl_checkin_dequeue(fsl_cx * const f, fsl_checkin_queue_opt const * opt){ fsl_db * const db = fsl_needs_ckout(f); if(!db) return FSL_RC_NOT_A_CKOUT; int rc = fsl_db_transaction_begin(db); if(rc) return fsl_cx_uplift_db_error2(f, db, rc); fsl_id_bag list = fsl_id_bag_empty; fsl_buffer * canon = 0; char const * fn; |
︙ | ︙ | |||
4822 4823 4824 4825 4826 4827 4828 | if(rc) fsl_db_transaction_rollback(db); else{ rc = fsl_cx_uplift_db_error2(f, db, fsl_db_transaction_commit(db)); } return rc; } | | < | | | 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 | if(rc) fsl_db_transaction_rollback(db); else{ rc = fsl_cx_uplift_db_error2(f, db, fsl_db_transaction_commit(db)); } return rc; } bool fsl_checkin_is_enqueued(fsl_cx * const f, char const * zName, bool relativeToCwd){ if(!zName || !*zName) return false; else if(!fsl_cx_db_ckout(f)) return false; else if(!f->ckin.selectedIds.entryCount){ /* Behave like fsl_is_enqueued() SQL function. */ return true; } else { bool rv = false; fsl_buffer * const canon = fsl__cx_scratchpad(f); |
︙ | ︙ | |||
4851 4852 4853 4854 4855 4856 4857 | : false); } fsl__cx_scratchpad_yield(f, canon); return rv; } } | < | | 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 4976 4977 4978 4979 4980 | : false); } fsl__cx_scratchpad_yield(f, canon); return rv; } } void fsl_checkin_discard(fsl_cx * const f){ if(f){ fsl_id_bag_clear(&f->ckin.selectedIds); fsl_deck_finalize(&f->ckin.mf); } } /** |
︙ | ︙ | |||
5675 5676 5677 5678 5679 5680 5681 | "WHERE fsl_is_enqueued(id)", vid, d->rid); if(!rc) rc = fsl__ckout_version_write(f, d->rid, NULL); RC; assert(d->f == f); rc = fsl_checkin_add_unsent(f, d->rid); RC; | | | 5789 5790 5791 5792 5793 5794 5795 5796 5797 5798 5799 5800 5801 5802 5803 | "WHERE fsl_is_enqueued(id)", vid, d->rid); if(!rc) rc = fsl__ckout_version_write(f, d->rid, NULL); RC; assert(d->f == f); rc = fsl_checkin_add_unsent(f, d->rid); RC; rc = fsl__ckout_clear_merge_state(f, true); RC; /* todo(?) from fossil(1) follows. Most of this seems to be what the vfile handling does (above). db_multi_exec("PRAGMA %s.application_id=252006673;", db_name("repository")); db_multi_exec("PRAGMA %s.application_id=252006674;", db_name("localdb")); |
︙ | ︙ | |||
5769 5770 5771 5772 5773 5774 5775 | fsl_checkin_discard(f); fsl_deck_finalize(d); return rc; } #undef MARKER | | | | 5883 5884 5885 5886 5887 5888 5889 5890 5891 5892 5893 5894 5895 5896 5897 5898 | fsl_checkin_discard(f); fsl_deck_finalize(d); return rc; } #undef MARKER /* end of file ./src/checkin.c */ /* start of file ./src/checkout.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
5806 5807 5808 5809 5810 5811 5812 | /** Kludge for type-safe strncmp/strnicmp inconsistency. */ static int fsl_strnicmp_int(char const *zA, char const * zB, fsl_size_t nByte){ return fsl_strnicmp( zA, zB, (fsl_int_t)nByte); } | | | | | 5920 5921 5922 5923 5924 5925 5926 5927 5928 5929 5930 5931 5932 5933 5934 5935 5936 5937 5938 5939 5940 5941 5942 5943 5944 5945 5946 5947 5948 5949 5950 5951 5952 5953 5954 5955 | /** Kludge for type-safe strncmp/strnicmp inconsistency. */ static int fsl_strnicmp_int(char const *zA, char const * zB, fsl_size_t nByte){ return fsl_strnicmp( zA, zB, (fsl_int_t)nByte); } int fsl_ckout_filename_check( fsl_cx * const f, bool relativeToCwd, char const * zOrigName, fsl_buffer * const pOut ){ int rc; if(!zOrigName || !*zOrigName) return FSL_RC_MISUSE; else if(!fsl_needs_ckout(f)/* will update f's error state*/){ return FSL_RC_NOT_A_CKOUT; } #if 0 /* Is this sane? */ else if(fsl_is_simple_pathname(zOrigName,1)){ rc = 0; if(pOut){ rc = fsl_buffer_append(pOut, zOrigName, fsl_strlen(zOrigName)); } } #endif else{ char const * zLocalRoot; char const * zFull; fsl_size_t nLocalRoot; fsl_size_t nFull; fsl_buffer * const full = fsl__cx_scratchpad(f); int (*xCmp)(char const *, char const *,fsl_size_t); bool endsWithSlash; assert(f->ckout.dir); zLocalRoot = f->ckout.dir; assert(zLocalRoot); assert(*zLocalRoot); nLocalRoot = f->ckout.dirLen; |
︙ | ︙ | |||
5853 5854 5855 5856 5857 5858 5859 | "file name: %s\n", rc, fsl_rc_cstr(rc), zOrigName); } goto end; } zFull = fsl_buffer_cstr2(full, &nFull); | | | 5967 5968 5969 5970 5971 5972 5973 5974 5975 5976 5977 5978 5979 5980 5981 | "file name: %s\n", rc, fsl_rc_cstr(rc), zOrigName); } goto end; } zFull = fsl_buffer_cstr2(full, &nFull); xCmp = fsl_cx_is_case_sensitive(f,false) ? fsl_strncmp : fsl_strnicmp_int; assert(zFull); assert(nFull>0); endsWithSlash = '/' == zFull[nFull-1]; if( ((nFull==nLocalRoot-1 || (nFull==nLocalRoot && endsWithSlash)) && xCmp(zLocalRoot, zFull, nFull)==0) |
︙ | ︙ | |||
6033 6034 6035 6036 6037 6038 6039 6040 6041 6042 6043 6044 6045 | return fsl_db_exists(fsl_cx_db_ckout(f), "SELECT 1 FROM vfile" " WHERE vid=%"FSL_ID_T_PFMT " AND pathname=%Q %s", f->ckout.rid, zFilename, fsl_cx_filename_collation(f)); } /** Internal machinery for fsl_ckout_manage(). zFilename MUST be a checkout-relative file which is known to exist. fst MUST be an object populated by fsl_stat()'ing zFilename. isInVFile MUST be the result of having passed zFilename to fsl_co_is_in_vfile(). */ | > > > > > > > > > > | | | | 6147 6148 6149 6150 6151 6152 6153 6154 6155 6156 6157 6158 6159 6160 6161 6162 6163 6164 6165 6166 6167 6168 6169 6170 6171 6172 6173 6174 6175 6176 6177 6178 6179 | return fsl_db_exists(fsl_cx_db_ckout(f), "SELECT 1 FROM vfile" " WHERE vid=%"FSL_ID_T_PFMT " AND pathname=%Q %s", f->ckout.rid, zFilename, fsl_cx_filename_collation(f)); } /** Initialized-with-defaults fsl_ckout_manage_state structure, intended for const-copy initialization. */ #define fsl_ckout_manage_state_empty_m {NULL,NULL,NULL} /** Initialized-with-defaults fsl_ckout_manage_state structure, intended for non-const copy initialization. */ static const fsl_ckout_manage_state fsl_ckout_manage_state_empty = fsl_ckout_manage_state_empty_m; /** Internal machinery for fsl_ckout_manage(). zFilename MUST be a checkout-relative file which is known to exist. fst MUST be an object populated by fsl_stat()'ing zFilename. isInVFile MUST be the result of having passed zFilename to fsl_co_is_in_vfile(). */ static int fsl_ckout_manage_impl(fsl_cx * const f, char const *zFilename, fsl_fstat const *fst, bool isInVFile){ int rc = 0; fsl_db * const db = fsl_needs_ckout(f); assert(fsl_is_simple_pathname(zFilename, true)); if( isInVFile ){ rc = fsl_db_exec(db, "UPDATE vfile SET deleted=0," " mtime=%"PRIi64 " WHERE vid=%"FSL_ID_T_PFMT |
︙ | ︙ | |||
6099 6100 6101 6102 6103 6104 6105 | static int fsl_dircrawl_f_add(fsl_dircrawl_state const *); /** Attempts to add file or directory (recursively) cas->absBuf to the current repository. isCrawling must be true if this is a fsl_dircrawl()-invoked call, else false. */ | | | 6223 6224 6225 6226 6227 6228 6229 6230 6231 6232 6233 6234 6235 6236 6237 | static int fsl_dircrawl_f_add(fsl_dircrawl_state const *); /** Attempts to add file or directory (recursively) cas->absBuf to the current repository. isCrawling must be true if this is a fsl_dircrawl()-invoked call, else false. */ static int co_add_one(CoAddState * const cas, bool isCrawling){ int rc = 0; fsl_buffer_reuse(cas->coRelBuf); rc = fsl_cx_stat2(cas->f, cas->opt->relativeToCwd, fsl_buffer_cstr(cas->absBuf), &cas->fst, fsl_buffer_reuse(cas->coRelBuf), false) /* Reminder: will fail if file is outside of the checkout tree */; if(rc) return rc; |
︙ | ︙ | |||
6130 6131 6132 6133 6134 6135 6136 | }else if(cas->opt->checkIgnoreGlobs){ char const * m = fsl_cx_glob_matches(cas->f, FSL_GLOBS_IGNORE, zCoRel); if(m) skipped = true; } if(!skipped && cas->opt->callback){ bool yes = false; | > | > > | | 6254 6255 6256 6257 6258 6259 6260 6261 6262 6263 6264 6265 6266 6267 6268 6269 6270 6271 6272 | }else if(cas->opt->checkIgnoreGlobs){ char const * m = fsl_cx_glob_matches(cas->f, FSL_GLOBS_IGNORE, zCoRel); if(m) skipped = true; } if(!skipped && cas->opt->callback){ bool yes = false; fsl_ckout_manage_state mst = fsl_ckout_manage_state_empty; mst.opt = cas->opt; mst.filename = zCoRel; mst.f = cas->f; rc = cas->opt->callback( &mst, &yes ); if(rc) goto end; else if(!yes) skipped = true; } } if(skipped){ ++cas->opt->counts.skipped; }else{ |
︙ | ︙ | |||
6177 6178 6179 6180 6181 6182 6183 6184 | "fsl_fstat_type_e #%d", cas->fst.type); break; } end: return rc; } static int fsl_dircrawl_f_add(fsl_dircrawl_state const *dst){ | > > > > > | | | | > > > > > > > | > > | > > > > > > > > > > > > > > > > > > > > > | | | | > | 6304 6305 6306 6307 6308 6309 6310 6311 6312 6313 6314 6315 6316 6317 6318 6319 6320 6321 6322 6323 6324 6325 6326 6327 6328 6329 6330 6331 6332 6333 6334 6335 6336 6337 6338 6339 6340 6341 6342 6343 6344 6345 6346 6347 6348 6349 6350 6351 6352 6353 6354 6355 6356 6357 6358 6359 6360 6361 6362 6363 6364 6365 6366 6367 6368 6369 6370 6371 6372 6373 6374 6375 6376 6377 6378 6379 6380 | "fsl_fstat_type_e #%d", cas->fst.type); break; } end: return rc; } /** fsl_dircrawl_f() impl for fsl_ckout_manage(). */ static int fsl_dircrawl_f_add(fsl_dircrawl_state const *dst){ switch(dst->entryType){ case FSL_FSTAT_TYPE_DIR: case FSL_FSTAT_TYPE_FILE:{ CoAddState * const cas = (CoAddState*)dst->callbackState; int const rc = fsl_buffer_appendf(fsl_buffer_reuse(cas->absBuf), "%s/%s", dst->absoluteDir, dst->entryName); if(rc) return rc; switch(dst->entryType){ case FSL_FSTAT_TYPE_DIR: return fsl_is_top_of_ckout(fsl_buffer_cstr(cas->absBuf)) /* Never recurse into nested checkouts */ ? FSL_RC_NOOP : 0; case FSL_FSTAT_TYPE_FILE: return co_add_one(cas, true); default: fsl__fatal(FSL_RC_ERROR,"Not possible: caught above."); return 0; } } default: return 0; } } /** Returns true if the absolute path zAbsName is f->ckout.dir, disregarding an optional trailing slash on zAbsName. */ static bool fsl__is_ckout_dir(fsl_cx * const f, char const * const zAbsName){ /* Keeping in mind that f->ckout.dir is always slash-terminated...*/ assert(f->ckout.dirLen>0); return (0==fsl_strncmp(zAbsName, f->ckout.dir, f->ckout.dirLen-1) && 0==zAbsName[f->ckout.dirLen-1] /* ==> matches except that zAbsName is NUL-terminated where ckout.dir has a trailing slash. */) || 0==fsl_strcmp(zAbsName, f->ckout.dir); } int fsl_ckout_manage( fsl_cx * const f, fsl_ckout_manage_opt * const opt_ ){ int rc = 0; CoAddState cas = CoAddState_empty; fsl_ckout_manage_opt opt; if(!f) return FSL_RC_MISUSE; else if(!fsl_needs_ckout(f)) return FSL_RC_NOT_A_CKOUT; assert(f->ckout.rid>=0); opt = *opt_ /*use a copy in case the user manages to modify opt_ from a callback. */; cas.absBuf = fsl__cx_scratchpad(f); cas.coRelBuf = fsl__cx_scratchpad(f); rc = fsl_file_canonical_name(opt.filename, cas.absBuf, false); if(!rc){ char const * const zAbs = fsl_buffer_cstr(cas.absBuf); if(!fsl_is_top_of_ckout(zAbs) || fsl__is_ckout_dir(f, zAbs)){ cas.f = f; cas.opt = &opt; rc = co_add_one(&cas, false); opt_->counts = opt.counts; } } fsl__cx_scratchpad_yield(f, cas.absBuf); fsl__cx_scratchpad_yield(f, cas.coRelBuf); return rc; } /** |
︙ | ︙ | |||
6253 6254 6255 6256 6257 6258 6259 6260 6261 6262 6263 6264 6265 6266 | fsl_stmt_finalize(&insId); return rc; dberr: assert(rc); rc = fsl_cx_uplift_db_error2(f, db, rc); goto end; } int fsl_ckout_unmanage(fsl_cx * const f, fsl_ckout_unmanage_opt const * opt){ int rc; fsl_db * const db = fsl_needs_ckout(f); fsl_buffer * fname = 0; fsl_id_t const vid = f->ckout.rid; fsl_stmt q = fsl_stmt_empty; | > > > > > > > > | 6416 6417 6418 6419 6420 6421 6422 6423 6424 6425 6426 6427 6428 6429 6430 6431 6432 6433 6434 6435 6436 6437 | fsl_stmt_finalize(&insId); return rc; dberr: assert(rc); rc = fsl_cx_uplift_db_error2(f, db, rc); goto end; } /** Initialized-with-defaults fsl_ckout_unmanage_state structure, intended for const-copy initialization. */ #define fsl_ckout_unmanage_state_empty_m {NULL,NULL,NULL} /** Initialized-with-defaults fsl_ckout_unmanage_state structure, intended for non-const copy initialization. */ static const fsl_ckout_unmanage_state fsl_ckout_unmanage_state_empty = fsl_ckout_unmanage_state_empty_m; int fsl_ckout_unmanage(fsl_cx * const f, fsl_ckout_unmanage_opt const * opt){ int rc; fsl_db * const db = fsl_needs_ckout(f); fsl_buffer * fname = 0; fsl_id_t const vid = f->ckout.rid; fsl_stmt q = fsl_stmt_empty; |
︙ | ︙ | |||
6336 6337 6338 6339 6340 6341 6342 6343 | "/*%s()*/", vid, zNorm, zNorm, vid, __func__); if(rc) goto dberr; } }/*opt->filename*/ if(q.stmt){ while(FSL_RC_STEP_ROW==fsl_stmt_step(&q)){ | > > > | > > > > | | 6507 6508 6509 6510 6511 6512 6513 6514 6515 6516 6517 6518 6519 6520 6521 6522 6523 6524 6525 6526 6527 6528 6529 6530 | "/*%s()*/", vid, zNorm, zNorm, vid, __func__); if(rc) goto dberr; } }/*opt->filename*/ if(q.stmt){ fsl_ckout_unmanage_state ust = fsl_ckout_unmanage_state_empty; ust.opt = opt; ust.f = f; while(FSL_RC_STEP_ROW==fsl_stmt_step(&q)){ rc = fsl_stmt_get_text(&q, 0, &ust.filename, NULL); if(rc){ rc = fsl_cx_uplift_db_error2(f, db, rc); goto end; } rc = opt->callback(&ust); if(rc) goto end; } fsl_stmt_finalize(&q); } /* Remove rm'd ADDed-but-not-yet-committed entries... */ rc = fsl_db_exec(db, "DELETE FROM vfile WHERE vid=%" FSL_ID_T_PFMT |
︙ | ︙ | |||
6373 6374 6375 6376 6377 6378 6379 | } int fsl_ckout_changes_scan(fsl_cx * const f){ return fsl_vfile_changes_scan(f, -1, 0); } | | | | 6551 6552 6553 6554 6555 6556 6557 6558 6559 6560 6561 6562 6563 6564 6565 6566 6567 6568 6569 6570 6571 6572 6573 6574 6575 | } int fsl_ckout_changes_scan(fsl_cx * const f){ return fsl_vfile_changes_scan(f, -1, 0); } int fsl__ckout_install_schema(fsl_cx * const f, bool dropIfExists){ char const * tNames[] = { "vvar", "vfile", "vmerge", 0 }; int rc; fsl_db * const db = fsl_needs_ckout(f); if(!db) return f->error.code; if(dropIfExists){ char const * t; int i; char const * dbName = fsl_db_role_name(FSL_DBROLE_CKOUT); for(i=0; 0!=(t = tNames[i]); ++i){ rc = fsl_db_exec(db, "DROP TABLE IF EXISTS %s.%s /*%s()*/", dbName, t, __func__); if(rc) break; } if(!rc){ rc = fsl_db_exec(db, "DROP TRIGGER IF EXISTS " |
︙ | ︙ | |||
6414 6415 6416 6417 6418 6419 6420 | return fsl_db_exists(db, "SELECT 1 FROM vfile WHERE chnged " "OR coalesce(origname != pathname, 0) " "/*%s()*/", __func__) || fsl_db_exists(db,"SELECT 1 FROM vmerge /*%s()*/", __func__); } | | < | | < > > > > > > > > > > > | < < < | | 6592 6593 6594 6595 6596 6597 6598 6599 6600 6601 6602 6603 6604 6605 6606 6607 6608 6609 6610 6611 6612 6613 6614 6615 6616 6617 6618 6619 6620 6621 6622 6623 6624 6625 6626 6627 6628 6629 6630 6631 6632 6633 6634 6635 6636 6637 6638 6639 6640 6641 6642 6643 6644 6645 6646 6647 | return fsl_db_exists(db, "SELECT 1 FROM vfile WHERE chnged " "OR coalesce(origname != pathname, 0) " "/*%s()*/", __func__) || fsl_db_exists(db,"SELECT 1 FROM vmerge /*%s()*/", __func__); } int fsl__ckout_clear_merge_state( fsl_cx * const f, bool fullWipe ){ int rc; if(fullWipe){ rc = fsl_cx_exec(f,"DELETE FROM vmerge /*%s()*/", __func__); }else{ rc = fsl_cx_exec_multi(f, "DELETE FROM vmerge WHERE id IN(" "SELECT vm.id FROM vmerge vm, vfile vf " "WHERE vm.id=vf.id AND vf.chnged=0" ");" "DELETE FROM vmerge WHERE NOT EXISTS(" "SELECT 1 FROM vmerge WHERE id>0" ") AND NOT EXISTS (" "SELECT 1 FROM vfile WHERE chnged>1" ");" "/*%s()*/", __func__ ); } return rc; } int fsl_ckout_clear_db(fsl_cx *f){ fsl_db * const db = fsl_needs_ckout(f); if(!db) return f->error.code; return fsl_db_exec_multi(db, "DELETE FROM vfile;" "DELETE FROM vmerge;" "DELETE FROM vvar WHERE name IN" "('checkout','checkout-hash') " "/*%s()*/", __func__); } /** Updates f->ckout.dir and dirLen based on the current state of f->ckout.db. Returns 0 on success, FSL_RC_OOM on allocation error, some other code if canonicalization of the name fails (e.g. filesystem error or cwd cannot be resolved). */ static int fsl_update_ckout_dir(fsl_cx *f){ int rc; fsl_buffer ckDir = fsl_buffer_empty; fsl_db * dbC = fsl__cx_db_for_role(f, FSL_DBROLE_CKOUT); assert(dbC->filename); assert(*dbC->filename); rc = fsl_file_canonical_name(dbC->filename, &ckDir, false); if(rc) return rc; char * zCanon = fsl_buffer_take(&ckDir); //MARKER(("dbC->filename=%s\n", dbC->filename)); //MARKER(("zCanon=%s\n", zCanon)); |
︙ | ︙ | |||
6473 6474 6475 6476 6477 6478 6479 | /*MARKER(("Updated ckout.dir: %d %s\n", (int)f->ckout.dirLen, f->ckout.dir));*/ } return rc; } | | | < < < < < < < > > > > > > > > > | 6657 6658 6659 6660 6661 6662 6663 6664 6665 6666 6667 6668 6669 6670 6671 6672 6673 6674 6675 6676 6677 6678 6679 6680 6681 6682 6683 6684 6685 6686 6687 6688 6689 6690 6691 6692 6693 6694 6695 6696 6697 6698 6699 | /*MARKER(("Updated ckout.dir: %d %s\n", (int)f->ckout.dirLen, f->ckout.dir));*/ } return rc; } int fsl_repo_open_ckout(fsl_cx * const f, const fsl_repo_open_ckout_opt *opt){ fsl_db *dbC = 0; fsl_buffer *cwd = 0; int rc = 0; bool didChdir = false; if(!opt) return FSL_RC_MISUSE; else if(!fsl_needs_repo(f)){ return f->error.code; }else if(fsl_cx_db_ckout(f)){ return fsl_cx_err_set(f, FSL_RC_MISUSE, "A checkout is already attached."); } cwd = fsl__cx_scratchpad(f); assert(!cwd->used); if((rc = fsl_cx_getcwd(f, cwd))){ assert(!cwd->used); fsl__cx_scratchpad_yield(f, cwd); return fsl_cx_err_set(f, rc, "Error %d [%s]: unable to " "determine current directory.", rc, fsl_rc_cstr(rc)); } if(opt->targetDir && *opt->targetDir){ if(fsl_chdir(opt->targetDir)){ fsl__cx_scratchpad_yield(f, cwd); return fsl_cx_err_set(f, FSL_RC_NOT_FOUND, "Directory not found or inaccessible: %s", opt->targetDir); } didChdir = true; } /** AS OF HERE: do not use 'return'. Use goto end so that we can chdir() back to our original cwd! */ if(!fsl_dir_is_empty("."/*we've already chdir'd if we were going to*/)) { |
︙ | ︙ | |||
6542 6543 6544 6545 6546 6547 6548 | /** Create and attach ckout db... */ assert(!fsl_cx_db_ckout(f)); const char * dbName = opt->ckoutDbFile ? opt->ckoutDbFile : fsl_preferred_ckout_db_name(); fsl_cx_err_reset(f); | < < | | < < < | > | > | < | 6728 6729 6730 6731 6732 6733 6734 6735 6736 6737 6738 6739 6740 6741 6742 6743 6744 6745 6746 6747 6748 6749 6750 6751 6752 6753 6754 6755 6756 6757 6758 6759 6760 6761 6762 6763 6764 6765 6766 6767 6768 6769 6770 6771 6772 | /** Create and attach ckout db... */ assert(!fsl_cx_db_ckout(f)); const char * dbName = opt->ckoutDbFile ? opt->ckoutDbFile : fsl_preferred_ckout_db_name(); fsl_cx_err_reset(f); rc = fsl__cx_attach_role(f, dbName, FSL_DBROLE_CKOUT, true); if(rc) goto end; fsl_db * const theDbC = fsl_cx_db_ckout(f); dbC = fsl__cx_db_for_role(f, FSL_DBROLE_CKOUT); assert(dbC->name); assert(dbC->filename); rc = fsl__ckout_install_schema(f, opt->dbOverwritePolicy); if(!rc){ rc = fsl_db_exec(theDbC,"INSERT OR IGNORE INTO " "%s.vvar (name,value) " "VALUES('checkout',0)," "('checkout-hash',null)", dbC->name); } if(rc) rc = fsl_cx_uplift_db_error(f, theDbC); end: if(didChdir){ assert(opt->targetDir && *opt->targetDir); assert(cwd->used /* is this true in the root dir? */); fsl_chdir(fsl_buffer_cstr(cwd)) /* Ignoring error because we have no recovery strategy! */; } fsl__cx_scratchpad_yield(f, cwd); if(!rc){ fsl_db * const dbR = fsl__cx_db_for_role(f, FSL_DBROLE_REPO); assert(dbR); assert(dbR->filename && *dbR->filename); rc = fsl_config_set_text(f, FSL_CONFDB_CKOUT, "repository", dbR->filename); } if(!rc) rc = fsl_update_ckout_dir(f); return rc; } int fsl__is_locally_modified(fsl_cx * const f, const char * zFilename, fsl_size_t origSize, const char * zOrigHash, |
︙ | ︙ | |||
6814 6815 6816 6817 6818 6819 6820 | RepoExtractCkup * const rec = (RepoExtractCkup *)xs->callbackState; const char * zFilename; fsl_ckup_state coState = fsl_ckup_state_empty; fsl_time_t mtime = 0; fsl_fstat fst = fsl_fstat_empty; fsl_ckup_localmod_e modType = FSL_RECO_MOD_UNKNOWN; bool loadedContent = false; | | | 6996 6997 6998 6999 7000 7001 7002 7003 7004 7005 7006 7007 7008 7009 7010 | RepoExtractCkup * const rec = (RepoExtractCkup *)xs->callbackState; const char * zFilename; fsl_ckup_state coState = fsl_ckup_state_empty; fsl_time_t mtime = 0; fsl_fstat fst = fsl_fstat_empty; fsl_ckup_localmod_e modType = FSL_RECO_MOD_UNKNOWN; bool loadedContent = false; fsl_buffer * const content = &f->cache.fileContent; assert(0==content->used && "Internal Misuse of fsl_cx::fileContent buffer."); //assert(xs->content); assert(xs->fCard->uuid && "We shouldn't be getting deletions " "via delta manifests."); rc = fsl_buffer_append(rec->tgtDir, xs->fCard->name, -1); if(rc) return rc; |
︙ | ︙ | |||
7161 7162 7163 7164 7165 7166 7167 | if(rc) goto end; while(FSL_RC_STEP_ROW==(rc = fsl_stmt_step(&q))){ fsl_size_t nFn = 0; char const * fn = fsl_stmt_g_text(&q, 0, &nFn); absPath->used = ckdirLen; rc = fsl_buffer_append(absPath, fn, nFn); if(rc) break; | | | 7343 7344 7345 7346 7347 7348 7349 7350 7351 7352 7353 7354 7355 7356 7357 | if(rc) goto end; while(FSL_RC_STEP_ROW==(rc = fsl_stmt_step(&q))){ fsl_size_t nFn = 0; char const * fn = fsl_stmt_g_text(&q, 0, &nFn); absPath->used = ckdirLen; rc = fsl_buffer_append(absPath, fn, nFn); if(rc) break; fsl__ckout_rm_empty_dirs(f, absPath) /* To see this in action, use (f-co tip) to check out the tip of a repo, then use (f-co rid:1) to back up to the initial empty checkin. It "should" leave you with a directory devoid of anything but .fslckout and any non-SCM'd content. */; } if(FSL_RC_STEP_DONE==rc) rc = 0; |
︙ | ︙ | |||
7277 7278 7279 7280 7281 7282 7283 | if(rc) goto end; } rc = fsl_ckout_manifest_write(f, -1, -1, -1, NULL); end: if(!rc){ rc = fsl_vfile_unload_except(f, cOpt->checkinRid); | | | 7459 7460 7461 7462 7463 7464 7465 7466 7467 7468 7469 7470 7471 7472 7473 | if(rc) goto end; } rc = fsl_ckout_manifest_write(f, -1, -1, -1, NULL); end: if(!rc){ rc = fsl_vfile_unload_except(f, cOpt->checkinRid); if(!rc) rc = fsl__ckout_clear_merge_state(f, true); } /* TODO: if "repo-cksum" config db setting is set, confirm R-card of cOpt->checkinRid against on-disk contents. */ if(cOpt->confirmer.callback){ fsl_cx_confirmer(f, &oldConfirm, NULL); |
︙ | ︙ | |||
7351 7352 7353 7354 7355 7356 7357 | } /* ** The record.fn field is used to match files against each other. The ** FV table contains one row for each each unique filename in ** in the current checkout, the pivot, and the version being merged. */ rc = fsl_db_exec_multi(dbC, | < | | > | 7533 7534 7535 7536 7537 7538 7539 7540 7541 7542 7543 7544 7545 7546 7547 7548 7549 7550 7551 7552 7553 7554 7555 7556 7557 7558 7559 7560 | } /* ** The record.fn field is used to match files against each other. The ** FV table contains one row for each each unique filename in ** in the current checkout, the pivot, and the version being merged. */ rc = fsl_db_exec_multi(dbC, "CREATE TEMP TABLE IF NOT EXISTS fv(" " fn TEXT %s PRIMARY KEY," /* The filename relative to root */ " idv INTEGER," /* VFILE entry for current version */ " idt INTEGER," /* VFILE entry for target version */ " chnged BOOLEAN," /* True if current version has been edited */ " islinkv BOOLEAN," /* True if current file is a link */ " islinkt BOOLEAN," /* True if target file is a link */ " ridv INTEGER," /* Record ID for current version */ " ridt INTEGER," /* Record ID for target */ " isexe BOOLEAN," /* Does target have execute permission? */ " deleted BOOLEAN DEFAULT 0,"/* File marked by "rm" to become unmanaged */ " fnt TEXT %s" /* Filename of same file on target version */ ") /*%s()*/; " "DELETE FROM fv;", collation, collation, __func__ ); if(rc) goto dberr; /* Add files found in the current version */ rc = fsl_db_exec_multi(dbC, "INSERT OR IGNORE INTO fv(" "fn,fnt,idv,idt,ridv," |
︙ | ︙ | |||
7949 7950 7951 7952 7953 7954 7955 | || 0==fsl_strncmp(z,"true",4)){ z = "ru"/*historical default*/; }else if(!fsl_str_bool(z)){ z = ""; } for(;*z;++z){ switch(*z){ | | | | | | | | | 8131 8132 8133 8134 8135 8136 8137 8138 8139 8140 8141 8142 8143 8144 8145 8146 8147 8148 8149 8150 8151 8152 8153 8154 8155 8156 8157 8158 8159 8160 8161 8162 8163 8164 8165 8166 8167 8168 | || 0==fsl_strncmp(z,"true",4)){ z = "ru"/*historical default*/; }else if(!fsl_str_bool(z)){ z = ""; } for(;*z;++z){ switch(*z){ case 'r': *m |= FSL_MANIFEST_MAIN; break; case 'u': *m |= FSL_MANIFEST_UUID; break; case 't': *m |= FSL_MANIFEST_TAGS; break; default: break; } } fsl_free(str); } f->cache.manifestSetting = (short)*m; } int fsl_ckout_manifest_write(fsl_cx * const f, int manifest, int manifestUuid, int manifestTags, int * const wrote){ fsl_db * const db = fsl_needs_ckout(f); if(!db) return FSL_RC_NOT_A_CKOUT; else if(!f->ckout.rid){ return fsl_cx_err_set(f, FSL_RC_RANGE, "Checkout RID is 0, so it has no manifest."); } int W = 0; int rc = 0; fsl_buffer * const b = fsl__cx_scratchpad(f); fsl_buffer * const content = &f->cache.fileContent; char * str = 0; fsl_time_t const mtime = f->ckout.mtime>0 ? fsl_julian_to_unix(f->ckout.mtime) : 0; fsl_buffer_reuse(content); if(manifest<0 || manifestUuid<0 || manifestTags<0){ int setting = 0; |
︙ | ︙ | |||
8192 8193 8194 8195 8196 8197 8198 | (int)errLen, zFilename); } end: fsl__cx_scratchpad_yield(f, fn); return rc; } | | | | 8374 8375 8376 8377 8378 8379 8380 8381 8382 8383 8384 8385 8386 8387 8388 8389 8390 8391 8392 8393 8394 8395 8396 8397 | (int)errLen, zFilename); } end: fsl__cx_scratchpad_yield(f, fn); return rc; } bool fsl_is_rooted_in_ckout(fsl_cx * const f, char const * const zAbsPath){ return f->ckout.dir ? 0==fsl_strncmp(zAbsPath, f->ckout.dir, f->ckout.dirLen) /* ^^^ fossil(1) uses stricmp() there, but that's a bug. However, NOT using stricmp() on case-insensitive filesystems is arguably also a bug. */ : false; } int fsl_is_rooted_in_ckout2(fsl_cx * const f, char const * const zAbsPath){ int rc = 0; if(!fsl_is_rooted_in_ckout(f, zAbsPath)){ rc = fsl_cx_err_set(f, FSL_RC_RANGE, "Path is not rooted " "in the current checkout: %s", zAbsPath); } return rc; |
︙ | ︙ | |||
8239 8240 8241 8242 8243 8244 8245 | } /** Queues the directory part of the given filename into temp table fx_revert_rmdir for an eventual rmdir() attempt on it in fsl_revert_rmdir_fini(). */ | | > | < | | | | < > | | < > < < < | | < | < | < < < < | 8421 8422 8423 8424 8425 8426 8427 8428 8429 8430 8431 8432 8433 8434 8435 8436 8437 8438 8439 8440 8441 8442 8443 8444 8445 8446 8447 8448 8449 8450 8451 8452 8453 8454 8455 8456 8457 8458 8459 8460 8461 8462 8463 8464 8465 8466 8467 8468 8469 8470 8471 8472 8473 8474 8475 8476 8477 | } /** Queues the directory part of the given filename into temp table fx_revert_rmdir for an eventual rmdir() attempt on it in fsl_revert_rmdir_fini(). */ static int fsl_revert_rmdir_queue(fsl_cx * const f, fsl_db * const db, fsl_stmt * const st, char const * zFilename){ int rc = 0; if( !st->stmt ){ rc = fsl_cx_exec(f, "CREATE TEMP TABLE IF NOT EXISTS " "fx_revert_rmdir(n TEXT PRIMARY KEY) " "WITHOUT ROWID /* %s() */", __func__); if(0==rc) rc = fsl_cx_prepare(f, st, "INSERT OR IGNORE INTO " "fx_revert_rmdir(n) " "VALUES(fsl_dirpart(?,0)) /* %s() */", __func__); } if(0==rc){ rc = fsl_stmt_bind_step(st, "s", zFilename); if(rc) rc = fsl_cx_uplift_db_error2(f, db, rc); } return rc; } /** Attempts to rmdir all dirs queued by fsl_revert_rmdir_queue(). Silently ignores rmdir failure but will return non-0 for db errors. */ static int fsl_revert_rmdir_fini(fsl_cx * const f){ int rc; fsl_stmt st = fsl_stmt_empty; fsl_buffer * const b = fsl__cx_scratchpad(f); rc = fsl_cx_prepare(f, &st, "SELECT fsl_ckout_dir()||n " "FROM fx_revert_rmdir " "ORDER BY length(n) DESC /* %s() */", __func__); while(0==rc && FSL_RC_STEP_ROW == fsl_stmt_step(&st)){ fsl_size_t nDir = 0; char const * zDir = fsl_stmt_g_text(&st, 0, &nDir); fsl_buffer_reuse(b); rc = fsl_buffer_append(b, zDir, (fsl_int_t)nDir); if(0==rc) fsl__ckout_rm_empty_dirs(f, b); } fsl__cx_scratchpad_yield(f, b); fsl_stmt_finalize(&st); return rc; } int fsl_ckout_revert( fsl_cx * const f, fsl_ckout_revert_opt const * opt ){ /** Reminder to whoever works on this code: the initial implementation was done almost entirely without the benefit of |
︙ | ︙ | |||
8333 8334 8335 8336 8337 8338 8339 | if(fname->used) fsl_buffer_strip_slashes(fname); if(1==fname->used && '.'==*zNorm){ /* Special case: handle "." from ckout root intuitively */ fsl_buffer_reuse(fname); assert(0==*zNorm); } } | | | | 8506 8507 8508 8509 8510 8511 8512 8513 8514 8515 8516 8517 8518 8519 8520 8521 | if(fname->used) fsl_buffer_strip_slashes(fname); if(1==fname->used && '.'==*zNorm){ /* Special case: handle "." from ckout root intuitively */ fsl_buffer_reuse(fname); assert(0==*zNorm); } } rc = fsl_cx_transaction_begin(f); if(rc) goto end; inTrans = true; if(opt->scanForChanges){ rc = fsl_vfile_changes_scan(f, 0, 0); if(rc) goto end; } sql = fsl__cx_scratchpad(f); rc = fsl_buffer_appendf(sql, |
︙ | ︙ | |||
8373 8374 8375 8376 8377 8378 8379 | " OR deleted<>0" " OR rid=0" " OR coalesce(origname,pathname)" " <>pathname" ")", -1); } assert(!rc); | | < < < | < | | | 8546 8547 8548 8549 8550 8551 8552 8553 8554 8555 8556 8557 8558 8559 8560 8561 8562 8563 8564 8565 8566 8567 8568 8569 8570 8571 8572 8573 8574 8575 8576 | " OR deleted<>0" " OR rid=0" " OR coalesce(origname,pathname)" " <>pathname" ")", -1); } assert(!rc); rc = fsl_cx_prepare(f, &q, "%b /* %s() */", sql, __func__); fsl__cx_scratchpad_yield(f, sql); sql = 0; if(rc) goto end; while((FSL_RC_STEP_ROW==fsl_stmt_step(&q))){ fsl_id_t const id = fsl_stmt_g_id(&q, 0); fsl_id_t const rid = fsl_stmt_g_id(&q, 1); int32_t const deleted = fsl_stmt_g_int32(&q, 2); char const * const zName = fsl_stmt_g_text(&q, 3, NULL); char const * const zNameOrig = fsl_stmt_g_text(&q, 4, NULL); bool const renamed = zNameOrig ? !!fsl_strcmp(zName, zNameOrig) : false; fsl_ckout_revert_e changeType = FSL_REVERT_NONE; if(!rid){ // Added but not yet checked in. rc = fsl_cx_exec(f, "DELETE FROM vfile WHERE id=%" FSL_ID_T_PFMT, id); if(rc) goto end; changeType = FSL_REVERT_UNMANAGE; }else{ int wasWritten = 0; if(renamed){ if((rc=fsl_mkdir_for_file(zNameOrig, true))){ rc = fsl_cx_err_set(f, rc, "mkdir() failed for file: %s", zNameOrig); |
︙ | ︙ | |||
8422 8423 8424 8425 8426 8427 8428 | } } /* Ignore any errors: this operation is an optimization, not a requirement. Worse case, the entry with the old name is left in the filesystem. */ } if(!vfUpdate.stmt){ | | | | 8591 8592 8593 8594 8595 8596 8597 8598 8599 8600 8601 8602 8603 8604 8605 8606 8607 8608 8609 8610 | } } /* Ignore any errors: this operation is an optimization, not a requirement. Worse case, the entry with the old name is left in the filesystem. */ } if(!vfUpdate.stmt){ rc = fsl_cx_prepare(f, &vfUpdate, "UPDATE vfile SET chnged=0, deleted=0, " "pathname=coalesce(origname,pathname), " "origname=NULL " "WHERE id=?1 /*%s()*/", __func__); if(rc) goto end; } rc = fsl_stmt_bind_step(&vfUpdate, "R", id) /* Has to be done before fsl__vfile_to_ckout() because that function writes to vfile.pathname. */; if(rc) goto dberr; rc = fsl__vfile_to_ckout(f, id, &wasWritten); if(rc) break; |
︙ | ︙ | |||
8461 8462 8463 8464 8465 8466 8467 | end: if(fname) fsl__cx_scratchpad_yield(f, fname); if(sql) fsl__cx_scratchpad_yield(f, sql); fsl_stmt_finalize(&q); fsl_stmt_finalize(&vfUpdate); if(qRmdir.stmt){ fsl_stmt_finalize(&qRmdir); | | > > > | 8630 8631 8632 8633 8634 8635 8636 8637 8638 8639 8640 8641 8642 8643 8644 8645 8646 8647 8648 8649 8650 8651 8652 8653 8654 8655 | end: if(fname) fsl__cx_scratchpad_yield(f, fname); if(sql) fsl__cx_scratchpad_yield(f, sql); fsl_stmt_finalize(&q); fsl_stmt_finalize(&vfUpdate); if(qRmdir.stmt){ fsl_stmt_finalize(&qRmdir); if(!rc) rc = fsl_revert_rmdir_fini(f); fsl_db_exec(db, "DROP TABLE IF EXISTS fx_revert_rmdir /* %s() */", __func__); } if(opt->vfileIds){ fsl_db_exec_multi(db, "DROP TABLE IF EXISTS fx_revert_id " "/* %s() */", __func__) /* Ignoring result code */; } if(0==rc){ rc = fsl__ckout_clear_merge_state(f, false); } if(inTrans){ int const rc2 = fsl_db_transaction_end(db, !!rc); if(!rc) rc = rc2; } return rc; dberr: assert(rc); |
︙ | ︙ | |||
8546 8547 8548 8549 8550 8551 8552 | fsl_time_t * repoMtime, fsl_time_t * localMtime){ int rc = 0; fsl_id_t fid = 0; fsl_fstat fst = fsl_fstat_empty; if(!fsl_needs_ckout(f)) return FSL_RC_NOT_A_CKOUT; | | | 8718 8719 8720 8721 8722 8723 8724 8725 8726 8727 8728 8729 8730 8731 8732 | fsl_time_t * repoMtime, fsl_time_t * localMtime){ int rc = 0; fsl_id_t fid = 0; fsl_fstat fst = fsl_fstat_empty; if(!fsl_needs_ckout(f)) return FSL_RC_NOT_A_CKOUT; if(0>=vid){ fsl_ckout_version_info(f, &vid, NULL); } fid = fsl_repo_filename_fnid(f, fc->name); if(fid<=0){ rc = fsl_cx_err_get(f, NULL, NULL); return rc ? rc : fsl_cx_err_set(f, FSL_RC_NOT_FOUND, "Could not resolve filename: %s", |
︙ | ︙ | |||
8575 8576 8577 8578 8579 8580 8581 8582 8583 | } if(repoMtime){ rc = fsl_mtime_of_manifest_file(f, vid, fid, repoMtime); } return rc; } #undef MARKER | > > > > > > > > > > > > > > > > > > > > > > > | | < > > > > > > > > | 8747 8748 8749 8750 8751 8752 8753 8754 8755 8756 8757 8758 8759 8760 8761 8762 8763 8764 8765 8766 8767 8768 8769 8770 8771 8772 8773 8774 8775 8776 8777 8778 8779 8780 8781 8782 8783 8784 8785 8786 8787 8788 8789 8790 8791 8792 8793 8794 8795 8796 8797 8798 8799 8800 8801 8802 8803 8804 8805 8806 8807 8808 | } if(repoMtime){ rc = fsl_mtime_of_manifest_file(f, vid, fid, repoMtime); } return rc; } char const ** fsl_ckout_dbnames(void){ static char const *dbNames[] = {".fslckout", "_FOSSIL_", NULL}; return dbNames; } char const * fsl_is_top_of_ckout(char const *zDirName){ // counterpart of fossil(1)'s vfile_top_of_checkout() enum {BufLen = 2048}; char nameBuf[BufLen]; char * z = &nameBuf[0]; fsl_size_t sz = fsl_strlcpy(z, zDirName, BufLen); if(sz>=(fsl_size_t)BufLen - 11/*_FOSSIL_/.fslckout suffix*/) return NULL; char const **dbNames = fsl_ckout_dbnames(); char const * dbName; z[sz++] = '/'; z[sz] = 0; for( int i = 0; NULL!=(dbName=dbNames[i]); ++i){ fsl_strlcpy(z + sz , dbName, (fsl_size_t)BufLen - sz); if(fsl_file_size(z)>=1024) return dbName; } return NULL; } #undef MARKER /* end of file ./src/checkout.c */ /* start of file ./src/cli.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ #include <string.h> /* for strchr() */ #if !defined(ORG_FOSSIL_SCM_FSL_CORE_H_INCLUDED) /* When not in the amalgamation build, force assert() to always work... */ # if defined(NDEBUG) # undef NDEBUG # define DEBUG 1 # endif #endif #include <assert.h> /* for the benefit of test apps */ /* Only for debugging */ #include <stdio.h> #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) |
︙ | ︙ | |||
8669 8670 8671 8672 8673 8674 8675 | assert(f); if(fcli.transient.repoDbArg){ FCLI_V3(("Trying to open repo db file [%s]...\n", fcli.transient.repoDbArg)); rc = fsl_repo_open( f, fcli.transient.repoDbArg ); } else if(fcli.clientFlags.checkoutDir){ fsl_buffer dir = fsl_buffer_empty; | | < < < < | 8871 8872 8873 8874 8875 8876 8877 8878 8879 8880 8881 8882 8883 8884 8885 | assert(f); if(fcli.transient.repoDbArg){ FCLI_V3(("Trying to open repo db file [%s]...\n", fcli.transient.repoDbArg)); rc = fsl_repo_open( f, fcli.transient.repoDbArg ); } else if(fcli.clientFlags.checkoutDir){ fsl_buffer dir = fsl_buffer_empty; char const * dirName = fcli.clientFlags.checkoutDir; FCLI_V3(("Trying to open checkout from [%s]...\n", dirName)); rc = fsl_ckout_open_dir(f, dirName, true); FCLI_V3(("checkout open rc=%s\n", fsl_rc_cstr(rc))); /* if(FSL_RC_NOT_FOUND==rc) rc = FSL_RC_NOT_A_CKOUT; */ if(rc){ |
︙ | ︙ | |||
8741 8742 8743 8744 8745 8746 8747 | static struct { fsl_list list; } FCliFree = { fsl_list_empty_m }; static void fcli_shutdown(void){ | | | | 8939 8940 8941 8942 8943 8944 8945 8946 8947 8948 8949 8950 8951 8952 8953 8954 8955 8956 8957 8958 8959 8960 8961 8962 8963 8964 8965 8966 8967 8968 8969 8970 | static struct { fsl_list list; } FCliFree = { fsl_list_empty_m }; static void fcli_shutdown(void){ fsl_cx * const f = fcli.f; int rc = 0; fsl_error_clear(&fcli.err); fsl_free(fcli.argv)/*contents are in the FCliFree list*/; if(f){ while(fsl_cx_transaction_level(f)){ MARKER(("WARNING: open db transaction at shutdown-time. " "Rolling back.\n")); fsl_cx_transaction_end(f, true); } if(1 && fsl_cx_db_ckout(f)){ /* For testing/demo only: this is implicit when we call fsl_cx_finalize(). */ rc = fsl_close_scm_dbs(f); FCLI_V3(("Closed checkout/repo db(s). rc=%s\n", fsl_rc_cstr(rc))); //assert(0==rc); } } fsl_list_clear(&FCliFree.list, fsl_list_v_fsl_free, 0); fsl_list_reserve(&FCliFree.list, 0); if(f){ |
︙ | ︙ | |||
8892 8893 8894 8895 8896 8897 8898 | if(fcli.appHelp && fcli.appHelp->callback){ fcli.appHelp->callback(); f_out("\n"); } } if(showGlobal){ if(!showApp){ | | | | | | 9090 9091 9092 9093 9094 9095 9096 9097 9098 9099 9100 9101 9102 9103 9104 9105 9106 9107 9108 9109 9110 9111 9112 9113 | if(fcli.appHelp && fcli.appHelp->callback){ fcli.appHelp->callback(); f_out("\n"); } } if(showGlobal){ if(!showApp){ f_out("Invoke --help three times (or --help -V -V) to list " "both the framework- and app-level options.\n"); }else{ f_out("Invoke --help once to list only the " "app-level flags.\n"); } }else{ f_out("Invoke --help twice (or --help -V) to list the " "framework-level options. Use --help three times " "to list both framework- and app-level options.\n"); } f_out("\nFlags which require values may be passed as " "--flag=value or --flag value.\n\n"); } int fcli_process_flags( fcli_cliflag const * defs ) { fcli_cliflag const * f; |
︙ | ︙ | |||
9366 9367 9368 9369 9370 9371 9372 | fsl_cx_user_set(f, u); fsl_free(u); } } return rc; } | | < | < < < < > > > | > > > > > > > > > | | < < < < | | < | | 9564 9565 9566 9567 9568 9569 9570 9571 9572 9573 9574 9575 9576 9577 9578 9579 9580 9581 9582 9583 9584 9585 9586 9587 9588 9589 9590 9591 9592 9593 9594 9595 9596 9597 9598 9599 9600 9601 9602 9603 9604 9605 9606 9607 9608 9609 9610 9611 9612 9613 9614 9615 9616 9617 9618 9619 9620 9621 9622 9623 9624 9625 9626 9627 9628 9629 9630 9631 9632 9633 9634 9635 9636 9637 9638 | fsl_cx_user_set(f, u); fsl_free(u); } } return rc; } static int check_help_invoked(void){ int rc = 0; if(fcli.transient.helpRequested){ /* Do this last so that we can get the default user name and such for display in the help text. */ fcli_help(); rc = FCLI_RC_HELP; }else if(fcli.transient.versionRequested){ f_out("libfossil version: %s\nCheckin: %s\nCheckin timestamp: %s\n", fsl_library_version(), FSL_LIB_VERSION_HASH, FSL_LIB_VERSION_TIMESTAMP); rc = FCLI_RC_HELP; } return rc; } static int fcli_setup2(int argc, char const * const * argv, const fcli_cliflag * flags){ int rc; FCliHelpState.flags = flags; rc = fcli_setup_common1(false, argc, argv); if(rc) return rc; assert(!fcli__error->code); rc = check_help_invoked(); if(!rc){ rc = fcli_process_flags(flags); if(rc) assert(fcli__error->msg.used); if(!rc){ rc = fcli_setup_common2(); } } return rc; } int fcli_setup_v2(int argc, char const * const * argv, fcli_cliflag const * const cliFlags, fcli_help_info const * const helpInfo ){ if(NULL!=cliFlags) fcli.cliFlags = cliFlags; if(NULL!=helpInfo) fcli.appHelp = helpInfo; if(cliFlags || fcli.cliFlags){ return fcli_setup2(argc, argv, cliFlags ? cliFlags : fcli.cliFlags); } int rc = fcli_setup_common1(true, argc, argv); if(!rc){ rc = check_help_invoked(); if(!rc){ if( fcli_flag2(NULL, "no-checkout", NULL) ){ fcli.clientFlags.checkoutDir = NULL; } fcli_flag2(NULL,"user", &fcli.transient.userArg); fcli.config.traceSql = fcli_flag2(NULL,"trace-sql", NULL); fcli_flag2("R", "repo", &fcli.transient.repoDbArg); rc = fcli_setup_common2(); } } return rc; } int fcli_setup(int argc, char const * const * argv ){ return fcli_setup_v2(argc, argv, fcli.cliFlags, fcli.appHelp); } int fcli_err_report2(bool clear, char const * file, int line){ int errRc = 0; char const * msg = NULL; errRc = fsl_error_get( fcli__error, &msg, NULL ); if(!errRc && fcli.f && fcli.f->interrupted){ |
︙ | ︙ | |||
9640 9641 9642 9643 9644 9645 9646 | f_out(" (aliases: "); while ( *alias!=0 ){ f_out("%s%s", alias, *(strchr(alias, 0) + 1) ? ", " : ")\n"); alias = strchr(alias, 0) + 1; } } | | > | 9840 9841 9842 9843 9844 9845 9846 9847 9848 9849 9850 9851 9852 9853 9854 9855 9856 9857 9858 | f_out(" (aliases: "); while ( *alias!=0 ){ f_out("%s%s", alias, *(strchr(alias, 0) + 1) ? ", " : ")\n"); alias = strchr(alias, 0) + 1; } } void * fcli_fax(void * mem){ if(mem){ fsl_list_append( &FCliFree.list, mem ); } return mem; } int fcli_ckout_show_info(bool useUtc){ fsl_cx * const f = fcli_cx(); int rc = 0; fsl_stmt st = fsl_stmt_empty; fsl_db * const dbR = fsl_cx_db_repo(f); |
︙ | ︙ | |||
9669 9670 9671 9672 9673 9674 9675 | assert((uuid && (rid>0)) || (!uuid && (0==rid))); f_out("%*s %s\n", lblWidth, "repository-db:", fsl_cx_db_file_repo(f, NULL)); f_out("%*s %s\n", lblWidth, "checkout-root:", fsl_cx_ckout_dir_name(f, NULL)); | | | < | | > > > > > > > > > > > > > > > > > > > > > > > > | | < < < < | 9870 9871 9872 9873 9874 9875 9876 9877 9878 9879 9880 9881 9882 9883 9884 9885 9886 9887 9888 9889 9890 9891 9892 9893 9894 9895 9896 9897 9898 9899 9900 9901 9902 9903 9904 9905 9906 9907 9908 9909 9910 9911 9912 9913 9914 9915 9916 9917 9918 9919 9920 9921 9922 9923 9924 9925 9926 9927 9928 9929 9930 9931 9932 9933 9934 9935 9936 9937 9938 9939 9940 9941 9942 9943 9944 9945 9946 9947 9948 9949 9950 9951 9952 9953 9954 9955 9956 9957 9958 9959 9960 9961 9962 9963 9964 9965 9966 9967 9968 9969 9970 9971 9972 9973 9974 9975 9976 9977 9978 9979 9980 9981 9982 9983 9984 9985 | assert((uuid && (rid>0)) || (!uuid && (0==rid))); f_out("%*s %s\n", lblWidth, "repository-db:", fsl_cx_db_file_repo(f, NULL)); f_out("%*s %s\n", lblWidth, "checkout-root:", fsl_cx_ckout_dir_name(f, NULL)); rc = fsl_cx_prepare(f, &st, "SELECT " /*0*/"datetime(event.mtime%s) AS timestampString, " /*1*/"coalesce(euser, user) AS user, " /*2*/"(SELECT group_concat(substr(tagname,5), ', ') FROM tag, tagxref " "WHERE tagname GLOB 'sym-*' AND tag.tagid=tagxref.tagid " "AND tagxref.rid=blob.rid AND tagxref.tagtype>0) as tags, " /*3*/"coalesce(ecomment, comment) AS comment, " /*4*/"uuid AS uuid " "FROM event JOIN blob " "WHERE " "event.type='ci' " "AND blob.rid=%"FSL_ID_T_PFMT" " "AND blob.rid=event.objid " "ORDER BY event.mtime DESC", useUtc ? "" : ", 'localtime'", rid); if(rc) goto end; if( FSL_RC_STEP_ROW != fsl_stmt_step(&st)){ /* fcli_err_set(FSL_RC_ERROR, "Event data for checkout not found."); */ f_out("\nNo 'event' data found. This is only normal for an empty repo.\n"); goto end; } f_out("%*s %s %s %s (RID %"FSL_ID_T_PFMT")\n", lblWidth, "checkout-version:", fsl_stmt_g_text(&st, 4, NULL), fsl_stmt_g_text(&st, 0, NULL), useUtc ? "UTC" : "local", rid ); { /* list parent(s) */ fsl_stmt stP = fsl_stmt_empty; rc = fsl_cx_prepare(f, &stP, "SELECT " "uuid, pid, isprim " "FROM plink JOIN blob ON pid=rid " "WHERE cid=%"FSL_ID_T_PFMT" " "ORDER BY isprim DESC, mtime DESC /*sort*/", rid); if(rc) goto end; while( FSL_RC_STEP_ROW == fsl_stmt_step(&stP) ){ char const * zLabel = fsl_stmt_g_int32(&stP,2) ? "parent:" : "merged-from:"; f_out("%*s %s\n", lblWidth, zLabel, fsl_stmt_g_text(&stP, 0, NULL)); } fsl_stmt_finalize(&stP); } { /* list merge parent(s) */ fsl_stmt stP = fsl_stmt_empty; rc = fsl_cx_prepare(f, &stP, "SELECT " "mhash, id FROm vmerge WHERE id<=0"); if(rc) goto end; while( FSL_RC_STEP_ROW == fsl_stmt_step(&stP) ){ char const * zClass; int32_t const id = fsl_stmt_g_int32(&stP,1); switch(id){ case FSL_MERGE_TYPE_INTEGRATE: zClass = "integrate-merge:"; break; case FSL_MERGE_TYPE_BACKOUT: zClass = "backout-merge:"; break; case FSL_MERGE_TYPE_CHERRYPICK: zClass = "cherrypick-merge:"; break; case FSL_MERGE_TYPE_NORMAL: zClass = "merged-with:"; break; default: fsl__fatal(FSL_RC_RANGE, "Unexpected value %"PRIi32" in vmerge.id",id); break; } f_out("%*s %s\n", lblWidth, zClass, fsl_stmt_g_text(&stP, 0, NULL)); } fsl_stmt_finalize(&stP); } { /* list children */ fsl_stmt stC = fsl_stmt_empty; rc = fsl_cx_prepare(f, &stC, "SELECT " "uuid, cid, isprim " "FROM plink JOIN blob ON cid=rid " "WHERE pid=%"FSL_ID_T_PFMT" " "ORDER BY isprim DESC, mtime DESC /*sort*/", rid); if(rc) goto end; while( FSL_RC_STEP_ROW == fsl_stmt_step(&stC) ){ char const * zLabel = fsl_stmt_g_int32(&stC,2) ? "child:" : "merged-into:"; f_out("%*s %s\n", lblWidth, zLabel, fsl_stmt_g_text(&stC, 0, NULL)); } fsl_stmt_finalize(&stC); } f_out("%*s %s\n", lblWidth, "user:", fsl_stmt_g_text(&st, 1, NULL)); f_out("%*s %s\n", lblWidth, "tags:", fsl_stmt_g_text(&st, 2, NULL)); f_out("%*s %s\n", lblWidth, "comment:", fsl_stmt_g_text(&st, 3, NULL)); end: fsl_stmt_finalize(&st); return rc; } static int fsl_stmt_each_f_ambiguous( fsl_stmt * stmt, void * state ){ |
︙ | ︙ | |||
9819 9820 9821 9822 9823 9824 9825 | fsl_db * fcli_needs_repo(void){ if(fcli.f) return fsl_needs_repo(fcli.f); fcli_err_set(FSL_RC_NOT_A_REPO, "No repository db is opened."); return NULL; } | | > | 10039 10040 10041 10042 10043 10044 10045 10046 10047 10048 10049 10050 10051 10052 10053 10054 | fsl_db * fcli_needs_repo(void){ if(fcli.f) return fsl_needs_repo(fcli.f); fcli_err_set(FSL_RC_NOT_A_REPO, "No repository db is opened."); return NULL; } int fcli_args_to_vfile_ids(fsl_id_bag * const tgt, fsl_id_t vid, bool relativeToCwd, bool changedFilesOnly){ if(!fcli.argc){ return fcli_err_set(FSL_RC_MISUSE, "No file/dir name arguments provided."); } int rc = 0; |
︙ | ︙ | |||
9862 9863 9864 9865 9866 9867 9868 | return zEnd+1; default: break; } } return zEnd; } | | | 10083 10084 10085 10086 10087 10088 10089 10090 10091 10092 10093 10094 10095 10096 10097 | return zEnd+1; default: break; } } return zEnd; } void fcli_diff_colors(fsl_dibu_opt * const tgt, fcli_diff_colors_e theme){ char const * zIns = 0; char const * zEdit = 0; char const * zDel = 0; char const * zReset = 0; switch(theme){ case FCLI_DIFF_COLORS_RG: zIns = "\x1b[32m"; |
︙ | ︙ | |||
9917 9918 9919 9920 9921 9922 9923 | } #undef FCLI_V3 #undef fcli_empty_m #undef fcli__error #undef MARKER #undef FCLI_USE_SIGACTION | | | | 10138 10139 10140 10141 10142 10143 10144 10145 10146 10147 10148 10149 10150 10151 10152 10153 | } #undef FCLI_V3 #undef fcli_empty_m #undef fcli__error #undef MARKER #undef FCLI_USE_SIGACTION /* end of file ./src/cli.c */ /* start of file ./src/content.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
9945 9946 9947 9948 9949 9950 9951 | #include <stdio.h> #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) | | < < | | | | > | | < | | > | < | | | < | < | | | > < | < | | > > > | | > | | | | | > | | | | | > | | | | > | < | | > > > > | > | | | > > > | | | | | | | > | < | | | | < | 10166 10167 10168 10169 10170 10171 10172 10173 10174 10175 10176 10177 10178 10179 10180 10181 10182 10183 10184 10185 10186 10187 10188 10189 10190 10191 10192 10193 10194 10195 10196 10197 10198 10199 10200 10201 10202 10203 10204 10205 10206 10207 10208 10209 10210 10211 10212 10213 10214 10215 10216 10217 10218 10219 10220 10221 10222 10223 10224 10225 10226 10227 10228 10229 10230 10231 10232 10233 10234 10235 10236 10237 10238 10239 10240 10241 10242 10243 10244 10245 10246 10247 10248 10249 10250 10251 10252 10253 10254 10255 10256 10257 10258 10259 10260 10261 10262 10263 10264 10265 10266 10267 10268 10269 10270 10271 10272 10273 10274 10275 10276 10277 10278 10279 10280 10281 10282 10283 10284 10285 10286 10287 | #include <stdio.h> #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) fsl_int_t fsl_content_size( fsl_cx * const f, fsl_id_t blobRid ){ if(blobRid<=0) return -3; else if(!fsl_needs_repo(f)) return -4; else{ int rc = 0; fsl_int_t rv = -2; fsl_stmt * const q = &f->cache.stmt.contentSize; if(!q->stmt){ rc = fsl_cx_prepare(f, q, "SELECT size FROM blob WHERE rid=?1 " "/*%s()*/",__func__); if(rc) return -6; } rc = fsl_stmt_bind_step(q, "R", blobRid); if(FSL_RC_STEP_ROW==rc){ rv = (fsl_int_t)fsl_stmt_g_int64(q, 0); } fsl_stmt_reset(q); return rv; } } static bool fsl_content_is_available(fsl_cx * const f, fsl_id_t rid){ fsl_id_t srcid = 0; int rc = 0, depth = 0 /* Limit delta recursion depth */; while( depth++ < 100000 ){ if( fsl_id_bag_contains(&f->cache.blobContent.missing, rid) ){ return false; }else if( fsl_id_bag_contains(&f->cache.blobContent.available, rid) ){ return true; }else if( fsl_content_size(f, rid)<0 ){ fsl_id_bag_insert(&f->cache.blobContent.missing, rid) /* ignore possible OOM error - not fatal */; return false; } rc = fsl_delta_src_id(f, rid, &srcid); if(rc) break; else if( 0==srcid ){ fsl_id_bag_insert(&f->cache.blobContent.available, rid) /* ignore possible OOM error - not fatal */; return true; } rid = srcid; } if(0==rc){ /* This "cannot happen" (never has historically, and would be indicative of what amounts to corruption in the repo). */ fsl__fatal(FSL_RC_RANGE,"delta-loop in repository"); } return false; } int fsl_content_blob( fsl_cx * const f, fsl_id_t blobRid, fsl_buffer * const tgt ){ fsl_db * const dbR = fsl_needs_repo(f); if(!dbR) return FSL_RC_NOT_A_REPO; else if(blobRid<=0){ return fsl_cx_err_set(f, FSL_RC_RANGE, "Invalid RID for %s().", __func__); } int rc = 0; fsl_stmt * const q = &f->cache.stmt.contentBlob; if(!q->stmt){ rc = fsl_db_prepare( dbR, q, "SELECT content, size FROM blob " "WHERE rid=?1" "/*%s()*/",__func__); if(rc) goto end; } rc = fsl_stmt_bind_id(q, 1, blobRid); if(!rc && (FSL_RC_STEP_ROW==(rc=fsl_stmt_step(q)))){ void const * mem = NULL; fsl_size_t memLen = 0; int64_t const sz = fsl_stmt_g_int64(q, 1); if(sz<0){ rc = fsl_cx_err_set(f, FSL_RC_PHANTOM, "Cannot fetch content for phantom " "blob #%"FSL_ID_T_PFMT".", blobRid); } else if(sz){ rc = fsl_stmt_get_blob(q, 0, &mem, &memLen); if(rc){ rc = fsl_cx_err_set(f, rc, "Error fetching blob content for " "blob #%"FSL_ID_T_PFMT".", blobRid); }else{ fsl_buffer bb = fsl_buffer_empty; assert(memLen>0); fsl_buffer_external(&bb, mem, memLen); rc = fsl_buffer_uncompress(&bb, tgt); } }else{ rc = 0; fsl_buffer_reuse(tgt); } } else if(FSL_RC_STEP_DONE==rc){ rc = fsl_cx_err_set(f, FSL_RC_NOT_FOUND, "No blob found for rid %"FSL_ID_T_PFMT".", blobRid); } end: fsl_stmt_reset(q); if(rc && !f->error.code && dbR->error.code){ rc = fsl_cx_uplift_db_error2(f, dbR, rc); } return rc; } bool fsl_content_is_private(fsl_cx * const f, fsl_id_t rid){ fsl_stmt * s1 = NULL; fsl_db * db = fsl_cx_db_repo(f); int rc = db |
︙ | ︙ | |||
10084 10085 10086 10087 10088 10089 10090 | "Fossil has no repo opened."); } else{ int rc; bool gotIt = 0; fsl_id_t nextRid; fsl__bccache * const ac = &f->cache.blobContent; | < < > | | < | > > | > | > > | | | | > > | | | > < < < < < < < < < < < < | 10313 10314 10315 10316 10317 10318 10319 10320 10321 10322 10323 10324 10325 10326 10327 10328 10329 10330 10331 10332 10333 10334 10335 10336 10337 10338 10339 10340 10341 10342 10343 10344 10345 10346 10347 10348 10349 10350 10351 10352 10353 10354 10355 10356 10357 10358 10359 10360 10361 10362 10363 10364 10365 10366 10367 10368 10369 10370 10371 10372 10373 10374 10375 10376 10377 10378 10379 10380 10381 10382 10383 10384 10385 10386 10387 10388 10389 10390 10391 10392 10393 10394 10395 10396 10397 10398 10399 10400 10401 10402 10403 10404 10405 10406 10407 10408 10409 10410 10411 10412 10413 10414 10415 10416 10417 10418 10419 10420 10421 | "Fossil has no repo opened."); } else{ int rc; bool gotIt = 0; fsl_id_t nextRid; fsl__bccache * const ac = &f->cache.blobContent; if(fsl_id_bag_contains(&ac->missing, rid)){ /* Early out if we know the content is not available */ return FSL_RC_NOT_FOUND; } /* Look for the artifact in the cache first */ if(0!=(FSL_CX_F_BLOB_CACHE & f->flags) && fsl_id_bag_contains(&ac->inCache, rid) ){ fsl_size_t i; fsl__bccache_line * line; for(i=0; i<ac->used; ++i){ line = &ac->list[i]; if( line->rid==rid ){ ++ac->metrics.hits; rc = fsl_buffer_copy(tgt, &line->content); line->age = ac->nextAge++; return rc; } } } fsl_buffer_reuse(tgt); ++ac->metrics.misses; nextRid = 0; rc = fsl_delta_src_id(f, rid, &nextRid); /* MARKER(("rc=%d, nextRid=%"FSL_ID_T_PFMT"\n", rc, nextRid)); */ if(rc) return rc; if( nextRid == 0 ){ /* This is not a delta, so get its raw content. */ rc = fsl_content_blob(f, rid, tgt); gotIt = 0==rc; }else{ /* Looks like a delta, so let's expand it... */ fsl_int_t n /* number of used entries in 'a' */; fsl_int_t mx; fsl_id_t * a = NULL; //fsl_buffer D = fsl_buffer_empty; fsl_buffer * const delta = &f->cache.deltaContent; fsl_buffer next = fsl_buffer_empty /* delta-applied content */ ; assert(nextRid>0); unsigned int nAlloc = 20; a = (fsl_id_t*)fsl_malloc(sizeof(fsl_id_t) * nAlloc); if(!a){ rc = FSL_RC_OOM; goto end_delta; } a[0] = rid; a[1] = nextRid; n = 1; while( !fsl_id_bag_contains(&ac->inCache, nextRid) && 0==(rc=fsl_delta_src_id(f, nextRid, &nextRid)) && (nextRid>0)){ /* Figure out how big n needs to be... */ ++n; if( n >= (fsl_int_t)nAlloc ){ /* Expand 'a' */ void * remem; if( n > fsl_db_g_int64(db, 0, "SELECT max(rid) FROM blob")){ rc = fsl_cx_err_set(f, FSL_RC_RANGE, "Infinite loop in delta table."); goto end_delta; } unsigned int const nAlloc2 = nAlloc * 2; remem = fsl_realloc(a, nAlloc2 * sizeof(fsl_id_t)); if(!remem){ rc = FSL_RC_OOM; goto end_delta; } a = (fsl_id_t*)remem; nAlloc = nAlloc2; /*MARKER(("deltaIds allocated = %u\n", nAlloc));*/ } a[n] = nextRid; } /** Recursively expand deltas to get the content... */ mx = n; rc = fsl_content_get( f, a[n], tgt ); /* MARKER(("Getting content for rid #%"FSL_ID_T_PFMT", rc=%d\n", a[n], rc)); */ --n; for( ; !rc && (n>=0); --n){ rc = fsl_content_blob(f, a[n], delta); /* MARKER(("Getting/applying delta rid #%"FSL_ID_T_PFMT", rc=%d\n", a[n], rc)); */ if(rc) goto end_delta; if(!delta->used){ assert(!"Is this possible? The fossil tree has a similar " "condition but i naively don't believe it's necessary."); continue; } next = fsl_buffer_empty; rc = fsl_buffer_delta_apply2(tgt, delta, &next, &f->error); //assert(FSL_RC_RANGE!=rc); if(rc) goto end_delta; #if 1 /* 2021-03-24: in a debug build, running: f-parseparty -t c -c -q (i.e.: parse and crosslink all checkin artifacts) on the libfossil repo with 2003 checkins takes: |
︙ | ︙ | |||
10221 10222 10223 10224 10225 10226 10227 | #else if(mx){/*unused var*/} fsl_buffer_clear(tgt); #endif *tgt = next; } end_delta: | < > | 10444 10445 10446 10447 10448 10449 10450 10451 10452 10453 10454 10455 10456 10457 10458 10459 | #else if(mx){/*unused var*/} fsl_buffer_clear(tgt); #endif *tgt = next; } end_delta: fsl_free(a); fsl_buffer_reuse(delta); gotIt = 0==rc; } if(!rc){ rc = fsl_id_bag_insert(gotIt ? &f->cache.blobContent.available : &f->cache.blobContent.missing, |
︙ | ︙ | |||
10253 10254 10255 10256 10257 10258 10259 | /** Mark artifact rid as being available now. Update f's cache to show that everything that was formerly unavailable because rid was missing is now available. Returns 0 on success. f must have an opened repo and rid must be valid. */ | | < | | < | 10476 10477 10478 10479 10480 10481 10482 10483 10484 10485 10486 10487 10488 10489 10490 10491 10492 10493 10494 10495 10496 10497 10498 10499 10500 10501 10502 10503 10504 10505 10506 10507 10508 10509 10510 10511 10512 10513 10514 10515 10516 10517 10518 | /** Mark artifact rid as being available now. Update f's cache to show that everything that was formerly unavailable because rid was missing is now available. Returns 0 on success. f must have an opened repo and rid must be valid. */ static int fsl__content_mark_available(fsl_cx * const f, fsl_id_t rid){ fsl_id_bag pending = fsl_id_bag_empty; int rc; fsl_stmt * st = NULL; fsl_db * db = fsl_cx_db_repo(f); assert(f); assert(db); assert(rid>0); if( fsl_id_bag_contains(&f->cache.blobContent.available, rid) ) return 0; rc = fsl_id_bag_insert(&pending, rid); while( 0==rc && (rid = fsl_id_bag_first(&pending))!=0 ){ fsl_id_bag_remove(&pending, rid); rc = fsl_id_bag_insert(&f->cache.blobContent.available, rid); if(rc) break; fsl_id_bag_remove(&f->cache.blobContent.missing, rid); if(!st){ rc = fsl_db_prepare_cached(db, &st, "SELECT rid FROM delta " "WHERE srcid=?" "/*%s()*/",__func__); if(rc) break; } rc = fsl_stmt_bind_id(st, 1, rid); while( !rc && (FSL_RC_STEP_ROW==fsl_stmt_step(st)) ){ fsl_id_t const nx = fsl_stmt_g_id(st,0); assert(nx>0); rc = fsl_id_bag_insert(&pending, nx); } } if(st) fsl_stmt_cached_yield(st); fsl_id_bag_clear(&pending); return rc; } /** When a record is converted from a phantom to a real record, if that |
︙ | ︙ | |||
10589 10590 10591 10592 10593 10594 10595 | if(!rc){ rc = fsl_db_exec(dbR, "DELETE FROM phantom " "WHERE rid=%"FSL_ID_T_PFMT, rid /* FIXME? use cached statement? */); if( !rc && (srcId==0 || 0==fsl__bccache_check_available(f, srcId)) ){ isDephantomize = true; | | | 10810 10811 10812 10813 10814 10815 10816 10817 10818 10819 10820 10821 10822 10823 10824 | if(!rc){ rc = fsl_db_exec(dbR, "DELETE FROM phantom " "WHERE rid=%"FSL_ID_T_PFMT, rid /* FIXME? use cached statement? */); if( !rc && (srcId==0 || 0==fsl__bccache_check_available(f, srcId)) ){ isDephantomize = true; rc = fsl__content_mark_available(f, rid); } } fsl_stmt_cached_yield(s1); s1 = NULL; if(rc) goto end; #endif }else{ |
︙ | ︙ | |||
10653 10654 10655 10656 10657 10658 10659 | if( !isDephantomize && fsl_id_bag_contains(&f->cache.blobContent.missing, rid) && (srcId==0 || (0==fsl__bccache_check_available(f,srcId)))){ /* TODO: document what this is for. TODO: figure out what that is. */ | | | 10874 10875 10876 10877 10878 10879 10880 10881 10882 10883 10884 10885 10886 10887 10888 | if( !isDephantomize && fsl_id_bag_contains(&f->cache.blobContent.missing, rid) && (srcId==0 || (0==fsl__bccache_check_available(f,srcId)))){ /* TODO: document what this is for. TODO: figure out what that is. */ rc = fsl__content_mark_available(f, rid); if(rc) goto end; } if( isDephantomize ){ rc = fsl_after_dephantomize(f, rid, false); if(rc) goto end; } |
︙ | ︙ | |||
10717 10718 10719 10720 10721 10722 10723 | } /* TODO? cached query */ return 1==fsl_db_g_int32( db, 0, "SELECT 1 FROM shun WHERE uuid=%Q", zUuid); } | | | | 10938 10939 10940 10941 10942 10943 10944 10945 10946 10947 10948 10949 10950 10951 10952 10953 | } /* TODO? cached query */ return 1==fsl_db_g_int32( db, 0, "SELECT 1 FROM shun WHERE uuid=%Q", zUuid); } int fsl__content_new( fsl_cx * const f, fsl_uuid_cstr uuid, bool isPrivate, fsl_id_t * const newId ){ fsl_id_t rid = 0; int rc; fsl_db * db = fsl_cx_db_repo(f); fsl_stmt * s1 = NULL, * s2 = NULL; int const uuidLen = uuid ? fsl_is_uuid(uuid) : 0; if(!f || !uuid) return FSL_RC_MISUSE; else if(!uuidLen) return FSL_RC_RANGE; |
︙ | ︙ | |||
10797 10798 10799 10800 10801 10802 10803 | } } return rc; } int fsl__content_undeltify(fsl_cx * const f, fsl_id_t rid){ int rc; | | < | | < < | < < < < | < | | 11018 11019 11020 11021 11022 11023 11024 11025 11026 11027 11028 11029 11030 11031 11032 11033 11034 11035 11036 11037 11038 11039 11040 11041 11042 11043 11044 11045 11046 11047 11048 11049 11050 11051 11052 11053 11054 11055 11056 11057 11058 11059 | } } return rc; } int fsl__content_undeltify(fsl_cx * const f, fsl_id_t rid){ int rc; fsl_db * const db = fsl_needs_repo(f); fsl_id_t srcid = 0; fsl_buffer x = fsl_buffer_empty; fsl_stmt s = fsl_stmt_empty; if(!db) return FSL_RC_NOT_A_REPO; else if(rid<=0) return FSL_RC_RANGE; rc = fsl_db_transaction_begin(db); if(rc) return fsl_cx_uplift_db_error2(f, db, rc); /* Reminder: the original impl does not do this in a transaction, _possibly_ because it's only done from places where a transaction is active (that's unconfirmed). Nested transactions are very cheap, though. */ rc = fsl_delta_src_id( f, rid, &srcid ); if(rc || srcid<=0) goto end; rc = fsl_content_get(f, rid, &x); if( rc || !x.used ) goto end; rc = fsl_db_prepare(db, &s, "UPDATE blob SET content=?," " size=%" FSL_SIZE_T_PFMT " WHERE rid=%" FSL_ID_T_PFMT, x.used, rid); if(rc) goto dberr; rc = fsl_buffer_compress(&x, &x); if(rc) goto end; rc = fsl_stmt_bind_step(&s, "B", &x); if(rc) goto dberr; rc = fsl_db_exec(db, "DELETE FROM delta WHERE rid=%"FSL_ID_T_PFMT, rid); if(rc) goto dberr; #if 0 /* fossil does not do this, but that seems like an inconsistency. On that topic Richard says: |
︙ | ︙ | |||
10870 10871 10872 10873 10874 10875 10876 | } int fsl__content_deltify(fsl_cx * f, fsl_id_t rid, fsl_id_t srcid, bool force){ fsl_id_t s; fsl_buffer data = fsl_buffer_empty; fsl_buffer src = fsl_buffer_empty; | | | < | | 11083 11084 11085 11086 11087 11088 11089 11090 11091 11092 11093 11094 11095 11096 11097 11098 11099 11100 11101 | } int fsl__content_deltify(fsl_cx * f, fsl_id_t rid, fsl_id_t srcid, bool force){ fsl_id_t s; fsl_buffer data = fsl_buffer_empty; fsl_buffer src = fsl_buffer_empty; fsl_buffer * const delta = &f->cache.deltaContent; fsl_db * const db = fsl_needs_repo(f); int rc = 0; enum { MinSizeThreshold = 50 }; if(rid<=0 || srcid<=0) return FSL_RC_RANGE; else if(!db) return FSL_RC_NOT_A_REPO; else if( srcid==rid ) return 0; else if(!fsl_content_is_available(f, rid)){ return 0; } if(!force){ fsl_id_t tmpRid = 0; |
︙ | ︙ | |||
10921 10922 10923 10924 10925 10926 10927 | break; } } if(rc) return rc; /* As of here, don't return on error. Use (goto end) instead, or be really careful, b/c buffers might need cleaning. */ rc = fsl_content_get(f, srcid, &src); | < | | | | | | 11133 11134 11135 11136 11137 11138 11139 11140 11141 11142 11143 11144 11145 11146 11147 11148 11149 11150 11151 11152 11153 11154 11155 11156 11157 11158 11159 11160 11161 11162 11163 | break; } } if(rc) return rc; /* As of here, don't return on error. Use (goto end) instead, or be really careful, b/c buffers might need cleaning. */ rc = fsl_content_get(f, srcid, &src); if(rc || (src.used < MinSizeThreshold) /* See API doc comments about minimum size to delta/undelta. */ ) goto end; rc = fsl_content_get(f, rid, &data); if(rc || (data.used < MinSizeThreshold)) goto end; rc = fsl_buffer_delta_create(&src, &data, delta); if( !rc && (delta->used <= (data.used * 3 / 4 /* 75% */))){ fsl_stmt * s1 = NULL; fsl_stmt * s2 = NULL; rc = fsl_buffer_compress(delta, &data); if(rc) goto end; rc = fsl_db_prepare_cached(db, &s1, "UPDATE blob SET content=? " "WHERE rid=?/*%s()*/",__func__); if(!rc){ fsl_stmt_bind_id(s1, 2, rid); rc = fsl_stmt_bind_blob(s1, 1, data.mem, data.used, 0); if(!rc){ rc = fsl_db_prepare_cached(db, &s2, "REPLACE INTO delta(rid,srcid) " "VALUES(?,?)/*%s()*/",__func__); if(!rc){ fsl_stmt_bind_id(s2, 1, rid); fsl_stmt_bind_id(s2, 2, srcid); |
︙ | ︙ | |||
10969 10970 10971 10972 10973 10974 10975 | } end: if(rc && db->error.code && !f->error.code){ fsl_cx_uplift_db_error(f,db); } fsl_buffer_clear(&src); fsl_buffer_clear(&data); | | | > | | 11180 11181 11182 11183 11184 11185 11186 11187 11188 11189 11190 11191 11192 11193 11194 11195 11196 11197 11198 11199 11200 11201 11202 11203 11204 11205 11206 11207 11208 11209 11210 11211 11212 11213 11214 11215 11216 11217 11218 11219 11220 11221 11222 11223 11224 11225 11226 11227 11228 11229 11230 11231 11232 11233 11234 | } end: if(rc && db->error.code && !f->error.code){ fsl_cx_uplift_db_error(f,db); } fsl_buffer_clear(&src); fsl_buffer_clear(&data); fsl_buffer_reuse(delta); return rc; } /** Removes all entries from the repo's blob table which are listed in the shun table. */ int fsl__repo_shun_artifacts(fsl_cx * const f){ fsl_stmt q = fsl_stmt_empty; int rc; fsl_db * db = f ? fsl_cx_db_repo(f) : NULL; if(!f) return FSL_RC_MISUSE; else if(!db) return FSL_RC_NOT_A_REPO; rc = fsl_db_transaction_begin(db); if(rc) return rc; rc = fsl_db_exec_multi(db, "CREATE TEMP TABLE IF NOT EXISTS " "toshun(rid INTEGER PRIMARY KEY); " "DELETE FROM toshun; " "INSERT INTO toshun SELECT rid FROM blob, shun " "WHERE blob.uuid=shun.uuid;" ); if(rc) goto end; /* Ensure that deltas generated from the to-be-shunned data are unpacked into non-delta form... */ rc = fsl_db_prepare(db, &q, "SELECT rid FROM delta WHERE srcid IN toshun" ); if(rc) goto end; while( !rc && (FSL_RC_STEP_ROW==fsl_stmt_step(&q)) ){ fsl_id_t const srcid = fsl_stmt_g_id(&q, 0); rc = fsl__content_undeltify(f, srcid); } fsl_stmt_finalize(&q); if(!rc){ rc = fsl_db_exec_multi(db, "DELETE FROM delta WHERE rid IN toshun;" "DELETE FROM blob WHERE rid IN toshun;" "DELETE FROM toshun;" "DELETE FROM private " "WHERE NOT EXISTS " "(SELECT 1 FROM blob WHERE rid=private.rid);" ); } end: if(!rc) rc = fsl_db_transaction_commit(db); |
︙ | ︙ | |||
11037 11038 11039 11040 11041 11042 11043 | return rc ? fsl_cx_uplift_db_error(f, db) : 0; } /** Load the record ID rid and up to N-1 closest ancestors into the "fsl_computed_ancestors" table. */ | | | < < < | < < < | > > | > | | | 11249 11250 11251 11252 11253 11254 11255 11256 11257 11258 11259 11260 11261 11262 11263 11264 11265 11266 11267 11268 11269 11270 11271 11272 11273 11274 11275 11276 11277 11278 11279 11280 11281 11282 11283 11284 11285 11286 11287 11288 11289 11290 11291 11292 11293 11294 11295 11296 11297 11298 11299 11300 11301 11302 11303 11304 11305 11306 11307 11308 11309 11310 11311 11312 | return rc ? fsl_cx_uplift_db_error(f, db) : 0; } /** Load the record ID rid and up to N-1 closest ancestors into the "fsl_computed_ancestors" table. */ static int fsl__compute_ancestors( fsl_db * const db, fsl_id_t rid, int N, bool directOnly ){ fsl_stmt st = fsl_stmt_empty; int rc = fsl_db_prepare(db, &st, "WITH RECURSIVE " " ancestor(rid, mtime) AS (" " SELECT ?, mtime " " FROM event WHERE objid=? " " UNION " " SELECT plink.pid, event.mtime" " FROM ancestor, plink, event" " WHERE plink.cid=ancestor.rid" " AND event.objid=plink.pid %s" " ORDER BY mtime DESC LIMIT ?" " )" "INSERT INTO fsl_computed_ancestors" " SELECT rid FROM ancestor;", directOnly ? "AND plink.isPrim" : "" ); if(!rc){ rc = fsl_stmt_bind_step(&st, "RRi", rid, rid, (int32_t)N); } fsl_stmt_finalize(&st); return rc; } int fsl_mtime_of_F_card(fsl_cx * const f, fsl_id_t vid, fsl_card_F const * const fc, fsl_time_t * const pMTime){ if(!f || !fc) return FSL_RC_MISUSE; else if(vid<=0) return FSL_RC_RANGE; else if(!fc->uuid){ if(pMTime) *pMTime = 0; return 0; }else{ fsl_id_t fid = fsl_uuid_to_rid(f, fc->uuid); if(fid<=0){ assert(f->error.code); return f->error.code; }else{ return fsl_mtime_of_manifest_file(f, vid, fid, pMTime); } } } int fsl_mtime_of_manifest_file(fsl_cx * const f, fsl_id_t vid, fsl_id_t fid, fsl_time_t * const pMTime){ fsl_db * const db = fsl_needs_repo(f); fsl_stmt * q = NULL; int rc = 0; if(!db) return FSL_RC_NOT_A_REPO; if(fid<=0){ /* Only fetch the checkin time... */ int64_t i = -1; rc = fsl_db_get_int64(db, &i, "SELECT (mtime-2440587.5)*86400 " |
︙ | ︙ | |||
11115 11116 11117 11118 11119 11120 11121 | /* Computing (and keeping) ancestors is relatively costly, so we keep only the copy associated with f->cache.mtimeManifest around. For the general case, we will be feeding this function files from the same manifest. */ f->cache.mtimeManifest = vid; | | | | > | | 11324 11325 11326 11327 11328 11329 11330 11331 11332 11333 11334 11335 11336 11337 11338 11339 11340 11341 11342 11343 | /* Computing (and keeping) ancestors is relatively costly, so we keep only the copy associated with f->cache.mtimeManifest around. For the general case, we will be feeding this function files from the same manifest. */ f->cache.mtimeManifest = vid; rc = fsl_db_exec_multi(db, "CREATE TEMP TABLE IF NOT EXISTS " "fsl_computed_ancestors" "(x INTEGER PRIMARY KEY); " "DELETE FROM fsl_computed_ancestors;"); if(!rc){ rc = fsl__compute_ancestors(db, vid, 1000000, 1); } if(rc){ fsl_cx_uplift_db_error(f, db); return rc; } } rc = fsl_db_prepare_cached(db, &q, |
︙ | ︙ | |||
11143 11144 11145 11146 11147 11148 11149 11150 11151 11152 11153 11154 | rc = 0; if(pMTime) *pMTime = (fsl_time_t)fsl_stmt_g_int64(q, 0); }else{ assert(rc); if(FSL_RC_STEP_DONE==rc) rc = FSL_RC_NOT_FOUND; } fsl_stmt_cached_yield(q); } return rc; } int fsl_card_F_content( fsl_cx * f, fsl_card_F const * fc, | > > | | 11353 11354 11355 11356 11357 11358 11359 11360 11361 11362 11363 11364 11365 11366 11367 11368 11369 11370 11371 11372 11373 11374 | rc = 0; if(pMTime) *pMTime = (fsl_time_t)fsl_stmt_g_int64(q, 0); }else{ assert(rc); if(FSL_RC_STEP_DONE==rc) rc = FSL_RC_NOT_FOUND; } fsl_stmt_cached_yield(q); /* Reminder: DO NOT clean up fsl_computed ancestors here. Doing so is not only costly later on but also breaks test code. */ } return rc; } int fsl_card_F_content( fsl_cx * f, fsl_card_F const * fc, fsl_buffer * const dest ){ if(!f || !fc || !dest) return FSL_RC_MISUSE; else if(!fc->uuid){ return fsl_cx_err_set(f, FSL_RC_RANGE, "Cannot fetch content of a deleted file " "because it has no UUID."); } else if(!fsl_needs_repo(f)) return FSL_RC_NOT_A_REPO; |
︙ | ︙ | |||
11212 11213 11214 11215 11216 11217 11218 | */ int fsl_import_file( fsl_cx * f, char relativeToCwd, char const * zName, fsl_id_t parentRid, fsl_id_t *rid, fsl_uuid_str * uuid ){ fsl_buffer * canon = 0; // canonicalized filename fsl_buffer * nbuf = 0; // filename buffer | < > < | 11424 11425 11426 11427 11428 11429 11430 11431 11432 11433 11434 11435 11436 11437 11438 11439 11440 11441 11442 11443 11444 11445 11446 11447 11448 11449 11450 | */ int fsl_import_file( fsl_cx * f, char relativeToCwd, char const * zName, fsl_id_t parentRid, fsl_id_t *rid, fsl_uuid_str * uuid ){ fsl_buffer * canon = 0; // canonicalized filename fsl_buffer * nbuf = 0; // filename buffer char const * fn; int rc; fsl_id_t fnid = 0; fsl_id_t rcRid = 0; fsl_db * db = f ? fsl_needs_repo(f) : NULL; char inTrans = 0; if(!zName || !*zName) return FSL_RC_MISUSE; else if(!f->ckout.dir) return FSL_RC_NOT_A_CKOUT; else if(!db) return FSL_RC_NOT_A_REPO; fsl_buffer * const fbuf = fsl__cx_content_buffer(f); canon = fsl__cx_scratchpad(f); nbuf = fsl__cx_scratchpad(f); assert(f->ckout.dir); /* Normalize the name... i often regret having fsl_ckout_filename_check() return checkout-relative paths. */ rc = fsl_ckout_filename_check(f, relativeToCwd, zName, canon); if(rc) goto end; |
︙ | ︙ | |||
11371 11372 11373 11374 11375 11376 11377 | ); end: fsl_stmt_finalize(&q); return rc; } #undef MARKER | | | | 11582 11583 11584 11585 11586 11587 11588 11589 11590 11591 11592 11593 11594 11595 11596 11597 | ); end: fsl_stmt_finalize(&q); return rc; } #undef MARKER /* end of file ./src/content.c */ /* start of file ./src/config.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
12520 12521 12522 12523 12524 12525 12526 | #undef fsl__configs_get_v #undef fsl__configs_get_x1 #undef fsl__configs_get_x2 #undef SELECT_FROM_CONFIG #undef MARKER #undef ARRAYLEN | | | < > > < | 12731 12732 12733 12734 12735 12736 12737 12738 12739 12740 12741 12742 12743 12744 12745 12746 12747 12748 12749 12750 12751 12752 12753 12754 12755 12756 12757 12758 12759 12760 12761 12762 12763 12764 12765 12766 12767 12768 12769 12770 12771 12772 12773 12774 12775 12776 12777 12778 12779 12780 12781 12782 | #undef fsl__configs_get_v #undef fsl__configs_get_x1 #undef fsl__configs_get_x2 #undef SELECT_FROM_CONFIG #undef MARKER #undef ARRAYLEN /* end of file ./src/config.c */ /* start of file ./src/cx.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /************************************************************************* This file houses most of the context-related APIs. */ #if !defined(FSL_ENABLE_SQLITE_REGEXP) # define FSL_ENABLE_SQLITE_REGEXP 0 #endif #if FSL_ENABLE_SQLITE_REGEXP #endif #include <assert.h> #if defined(_WIN32) # include <windows.h> # define F_OK 0 # define W_OK 2 #else # include <unistd.h> /* F_OK */ #endif #include <stdlib.h> #include <string.h> #include <stdio.h> /* FILE class */ #include <errno.h> /* Only for debugging */ #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) /** Number of fsl_cx::scratchpads buffers. */ #define FSL_CX_NSCRATCH \ |
︙ | ︙ | |||
12601 12602 12603 12604 12605 12606 12607 | state or output channel. Results are undefined if !f or f's memory has not been properly initialized. */ static void fsl__cx_reset( fsl_cx * const f, bool closeDatabases ); | < | | 12812 12813 12814 12815 12816 12817 12818 12819 12820 12821 12822 12823 12824 12825 12826 12827 12828 12829 12830 | state or output channel. Results are undefined if !f or f's memory has not been properly initialized. */ static void fsl__cx_reset( fsl_cx * const f, bool closeDatabases ); int fsl_cx_init( fsl_cx ** tgt, fsl_cx_init_opt const * param ){ static fsl_cx_init_opt paramDefaults = fsl_cx_init_opt_default_m; int rc = 0; fsl_cx * f; extern int fsl__cx_install_timeline_crosslinkers(fsl_cx * const f) /*in deck.c*/; if(!tgt) return FSL_RC_MISUSE; else if(!param){ if(!paramDefaults.output.state){ paramDefaults.output.state = stdout; } param = ¶mDefaults; |
︙ | ︙ | |||
12670 12671 12672 12673 12674 12675 12676 | /* Clean up pseudo-leak valgrind complains about: https://www.sqlite.org/c3ref/auto_extension.html */; } #endif #if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE>0 sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER)); #endif | < < | < < < | < < < < < < < | | > > > > > > > > > > > > > > > > > > > > > > | | > > | | > > | < | 12880 12881 12882 12883 12884 12885 12886 12887 12888 12889 12890 12891 12892 12893 12894 12895 12896 12897 12898 12899 12900 12901 12902 12903 12904 12905 12906 12907 12908 12909 12910 12911 12912 12913 12914 12915 12916 12917 12918 12919 12920 12921 12922 12923 12924 12925 12926 12927 12928 12929 12930 12931 12932 12933 12934 12935 12936 12937 12938 12939 12940 12941 12942 12943 12944 12945 12946 12947 12948 12949 12950 12951 12952 12953 12954 12955 12956 12957 12958 12959 12960 12961 12962 12963 12964 12965 12966 12967 12968 12969 12970 12971 12972 | /* Clean up pseudo-leak valgrind complains about: https://www.sqlite.org/c3ref/auto_extension.html */; } #endif #if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE>0 sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER)); #endif if(!rc) rc = fsl__cx_install_timeline_crosslinkers(f); if(!rc){ f->cache.tempDirs = fsl_temp_dirs_get(); if(!f->cache.tempDirs) rc = FSL_RC_OOM; } return rc; } void fsl__cx_mcache_clear(fsl_cx * const f){ const unsigned cacheLen = (unsigned)(sizeof(fsl__mcache_empty.aAge) /sizeof(fsl__mcache_empty.aAge[0])); for(unsigned i = 0; i < cacheLen; ++i){ fsl_deck_finalize(&f->cache.mcache.decks[i]); } f->cache.mcache = fsl__mcache_empty; } void fsl__cx_clear_repo_caches(fsl_cx * const f){ fsl__bccache_reset(&f->cache.blobContent); fsl__cx_mcache_clear(f); fsl__cx_clear_mf_seen(f, false); f->cache.allowSymlinks = f->cache.caseInsensitive = f->cache.seenDeltaManifest = f->cache.manifestSetting = -1; } static void fsl__cx_finalize_cached_stmt(fsl_cx * const f){ #define STMT(X) fsl_stmt_finalize(&f->cache.stmt.X) STMT(deltaSrcId); STMT(uuidToRid); STMT(uuidToRidGlob); STMT(contentSize); STMT(contentBlob); STMT(nextEntry); #undef STMT } static void fsl__cx_reset(fsl_cx * const f, bool closeDatabases){ fsl_checkin_discard(f); fsl__cx_finalize_cached_stmt(f); #define SFREE(X) fsl_free(X); X = NULL if(closeDatabases){ fsl_cx_close_dbs(f); /* Reminder: f->dbMem is NOT closed here: it's an internal detail, not public state. We could arguably close and reopen it here, but then we introduce a potenital error case (OOM) where we currently have none (thus the void return). 2021-11-09: it turns out we've had an error case all along here: if any cached statements are opened for one of the dbs, that can prohibit its detachment. */ SFREE(f->ckout.dir); f->ckout.dirLen = 0; /* assert(NULL==f->dbMain); */ } SFREE(f->repo.user); fsl__cx_ckout_clear(f); SFREE(f->cache.projectCode); SFREE(f->ticket.titleColumn); SFREE(f->ticket.statusColumn); #undef SFREE fsl_error_clear(&f->error); f->interrupted = 0; fsl__card_J_list_free(&f->ticket.customFields, true); fsl_buffer_clear(&f->cache.fileContent); fsl_buffer_clear(&f->cache.deltaContent); for(int i = 0; i < FSL_CX_NSCRATCH; ++i){ fsl_buffer_clear(&f->scratchpads.buf[i]); f->scratchpads.used[i] = false; } fsl__cx_clear_repo_caches(f); fsl__bccache_clear(&f->cache.blobContent); fsl__cx_clear_mf_seen(f, true); fsl_id_bag_clear(&f->cache.leafCheck); fsl_id_bag_clear(&f->cache.toVerify); assert(NULL==f->cache.mfSeen.list); if(f->xlinkers.list){ fsl_free(f->xlinkers.list); f->xlinkers = fsl_xlinker_list_empty; } #define SLIST(L) fsl_list_visit_free(L, 1) #define GLOBL(X) SLIST(&f->cache.globs.X) |
︙ | ︙ | |||
12757 12758 12759 12760 12761 12762 12763 | void fsl__cx_clear_mf_seen(fsl_cx * const f, bool freeMemory){ if(freeMemory) fsl_id_bag_clear(&f->cache.mfSeen); else fsl_id_bag_reset(&f->cache.mfSeen); } void fsl_cx_finalize( fsl_cx * const f ){ | | < > < | 12980 12981 12982 12983 12984 12985 12986 12987 12988 12989 12990 12991 12992 12993 12994 12995 12996 12997 12998 12999 13000 13001 13002 13003 | void fsl__cx_clear_mf_seen(fsl_cx * const f, bool freeMemory){ if(freeMemory) fsl_id_bag_clear(&f->cache.mfSeen); else fsl_id_bag_reset(&f->cache.mfSeen); } void fsl_cx_finalize( fsl_cx * const f ){ void const * const allocStamp = f ? f->allocStamp : NULL; if(!f) return; if(f->clientState.finalize.f){ f->clientState.finalize.f( f->clientState.finalize.state, f->clientState.state ); } f->clientState = fsl_state_empty; f->output = fsl_outputer_empty; fsl_temp_dirs_free(f->cache.tempDirs); fsl__cx_reset(f, true); *f = fsl_cx_empty; if(&fsl_cx_empty == allocStamp){ fsl_free(f); }else{ f->allocStamp = allocStamp; } |
︙ | ︙ | |||
12794 12795 12796 12797 12798 12799 12800 | sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER)); #endif } void fsl_cx_err_reset(fsl_cx * const f){ //f->interrupted = 0; // No! ONLY modify this via fsl_cx_interrupt() fsl_error_reset(&f->error); | < | 13016 13017 13018 13019 13020 13021 13022 13023 13024 13025 13026 13027 13028 13029 | sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER)); #endif } void fsl_cx_err_reset(fsl_cx * const f){ //f->interrupted = 0; // No! ONLY modify this via fsl_cx_interrupt() fsl_error_reset(&f->error); fsl_db_err_reset(&f->repo.db); fsl_db_err_reset(&f->config.db); fsl_db_err_reset(&f->ckout.db); } int fsl_cx_err_set_e( fsl_cx * const f, fsl_error * const err ){ if(!f) return FSL_RC_MISUSE; |
︙ | ︙ | |||
12895 12896 12897 12898 12899 12900 12901 | assert(db && "misuse: no DB handle to uplift error from!"); if(db->error.code) rc = fsl_cx_uplift_db_error(f, db); } return rc; } fsl_db * fsl_cx_db_config( fsl_cx * const f ){ | < < | < < | | 13116 13117 13118 13119 13120 13121 13122 13123 13124 13125 13126 13127 13128 13129 13130 13131 13132 13133 13134 | assert(db && "misuse: no DB handle to uplift error from!"); if(db->error.code) rc = fsl_cx_uplift_db_error(f, db); } return rc; } fsl_db * fsl_cx_db_config( fsl_cx * const f ){ return f->config.db.dbh ? &f->config.db : NULL; } fsl_db * fsl_cx_db_repo( fsl_cx * const f ){ if(f->dbMain && (FSL_DBROLE_REPO & f->dbMain->role)) return f->dbMain; else if(f->repo.db.dbh) return &f->repo.db; else return NULL; } fsl_db * fsl_needs_repo(fsl_cx * const f){ fsl_db * const db = fsl_cx_db_repo(f); if(!db){ |
︙ | ︙ | |||
12927 12928 12929 12930 12931 12932 12933 | fsl_cx_err_set(f, FSL_RC_NOT_A_CKOUT, "Fossil context has no opened checkout db."); } return db; } fsl_db * fsl_cx_db_ckout( fsl_cx * const f ){ | < | | < < < < < < < < < < < < < | | > > > > > > > > > > > > > > > | | > > > | > > | > > > | > | < > > > | | | < > > > > > > > > > > | | | | | | | | | > > > > > > > > > > > > | | < < < < < < | | | | < < < < < < < < < < < < < < < < < < < < | < | | | > < > > > | | < < < | > | | < < < < | > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | > > < | < < | < | > > | | > > > > | > > > > > < | > | < | < | < < < < | < < | < < | > > < < < < < < < < < < < < < < < < < < < < < < < | < | | | 13144 13145 13146 13147 13148 13149 13150 13151 13152 13153 13154 13155 13156 13157 13158 13159 13160 13161 13162 13163 13164 13165 13166 13167 13168 13169 13170 13171 13172 13173 13174 13175 13176 13177 13178 13179 13180 13181 13182 13183 13184 13185 13186 13187 13188 13189 13190 13191 13192 13193 13194 13195 13196 13197 13198 13199 13200 13201 13202 13203 13204 13205 13206 13207 13208 13209 13210 13211 13212 13213 13214 13215 13216 13217 13218 13219 13220 13221 13222 13223 13224 13225 13226 13227 13228 13229 13230 13231 13232 13233 13234 13235 13236 13237 13238 13239 13240 13241 13242 13243 13244 13245 13246 13247 13248 13249 13250 13251 13252 13253 13254 13255 13256 13257 13258 13259 13260 13261 13262 13263 13264 13265 13266 13267 13268 13269 13270 13271 13272 13273 13274 13275 13276 13277 13278 13279 13280 13281 13282 13283 13284 13285 13286 13287 13288 13289 13290 13291 13292 13293 13294 13295 13296 13297 13298 13299 13300 13301 13302 13303 13304 13305 13306 13307 13308 13309 13310 13311 13312 13313 13314 13315 13316 13317 13318 13319 13320 13321 13322 13323 13324 13325 13326 13327 13328 13329 13330 13331 13332 13333 13334 13335 13336 13337 13338 13339 13340 13341 13342 13343 13344 13345 13346 13347 13348 13349 13350 13351 13352 13353 13354 13355 13356 13357 13358 13359 13360 13361 13362 13363 13364 13365 13366 13367 13368 13369 13370 13371 13372 13373 13374 13375 13376 13377 13378 13379 13380 13381 13382 13383 13384 13385 13386 13387 13388 13389 13390 13391 13392 13393 13394 13395 13396 13397 13398 13399 13400 13401 13402 13403 13404 13405 13406 13407 13408 13409 13410 13411 13412 13413 13414 13415 | fsl_cx_err_set(f, FSL_RC_NOT_A_CKOUT, "Fossil context has no opened checkout db."); } return db; } fsl_db * fsl_cx_db_ckout( fsl_cx * const f ){ if(f->dbMain && (FSL_DBROLE_CKOUT & f->dbMain->role)) return f->dbMain; else if(f->ckout.db.dbh) return &f->ckout.db; else return NULL; } fsl_db * fsl_cx_db( fsl_cx * const f ){ return f->dbMain; } fsl_db * fsl__cx_db_for_role(fsl_cx * const f, fsl_dbrole_e r){ switch(r){ case FSL_DBROLE_CONFIG: return &f->config.db; case FSL_DBROLE_REPO: return &f->repo.db; case FSL_DBROLE_CKOUT: return &f->ckout.db; case FSL_DBROLE_MAIN: return f->dbMain; case FSL_DBROLE_NONE: default: return NULL; } } /** Returns the "counterpart" role for the given db role. */ static fsl_dbrole_e fsl__dbrole_counterpart(fsl_dbrole_e r){ switch(r){ case FSL_DBROLE_REPO: return FSL_DBROLE_CKOUT; case FSL_DBROLE_CKOUT: return FSL_DBROLE_REPO; default: fsl__fatal(FSL_RC_MISUSE, "Serious internal API misuse uncovered by %s().", __func__); return FSL_DBROLE_NONE; } } /** Detaches/closes the given db role from f->dbMain and removes the role from f->dbMain->role. If r reflects the current primary db and a secondary db is attached, the secondary gets detached. If r corresponds to the secondary db, only that db is detached. If f->dbMain is the given role then f->dbMain is set to NULL. */ static int fsl__cx_detach_role(fsl_cx * const f, fsl_dbrole_e r){ assert(FSL_DBROLE_CONFIG!=r && "Config db now has its own handle."); assert(FSL_DBROLE_REPO==r || FSL_DBROLE_CKOUT==r); if(NULL==f->dbMain){ assert(!"Internal API misuse: don't try to detach when dbMain is NULL."); return fsl_cx_err_set(f, FSL_RC_MISUSE, "Cannot close/detach db: none opened."); }else if(!(r & f->dbMain->role)){ assert(!"Misuse: cannot detach unattached role."); return fsl_cx_err_set(f, FSL_DBROLE_CKOUT==r ? FSL_RC_NOT_A_CKOUT : FSL_RC_NOT_A_REPO, "Cannot close/detach unattached role: %s", fsl_db_role_name(r)); }else{ fsl_db * const db = fsl__cx_db_for_role(f,r); int rc = 0; switch(r){ case FSL_DBROLE_REPO: fsl__cx_clear_repo_caches(f); break; case FSL_DBROLE_CKOUT: fsl__cx_ckout_clear(f); break; default: fsl__fatal(FSL_RC_ERROR, "Cannot happen. Really."); } fsl__cx_finalize_cached_stmt(f); fsl__db_cached_clear_role(f->dbMain, r) /* Make sure that we destroy any cached statements which are known to be tied to this db role. */; if(db->dbh){ /* This is our MAIN db. CLOSE it. If we still have a secondary/counterpart db open, we'll detach it first. */ fsl_dbrole_e const counterpart = fsl__dbrole_counterpart(r); assert(f->dbMain == db); if(db->role & counterpart){ /* When closing the main db, detach the counterpart db first (if it's attached). We'll ignore any result code here, for sanity's sake. */ assert(fsl__cx_db_for_role(f,counterpart)->filename && "Inconsistent internal db handle state."); fsl__cx_detach_role(f, counterpart); } fsl_db_close(db); f->dbMain = NULL; }else{ /* This is our secondary db. DETACH it. */ assert(f->dbMain != db); rc = fsl_db_detach( f->dbMain, fsl_db_role_name(r) ); //MARKER(("rc=%s %s %s\n", fsl_rc_cstr(rc), fsl_db_role_name(r), // fsl_buffer_cstr(&f->dbMain->error.msg))); if(rc){ fsl_cx_uplift_db_error(f, f->dbMain); }else{ f->dbMain->role &= ~r; fsl__db_clear_strings(db, true); } } return rc; } } int fsl__cx_attach_role(fsl_cx * const f, const char *zDbName, fsl_dbrole_e r, bool createIfNotExists){ char const * dbName = fsl_db_role_name(r); fsl_db * const db = fsl__cx_db_for_role(f, r); int rc; assert(db); assert(!db->dbh && "Internal API misuse: don't call this when db is connected."); assert(!db->filename && "Don't re-attach!"); assert(!db->name && "Don't re-attach!"); assert(dbName); assert(f->dbMain != db && "Don't re-attach the main db!"); switch(r){ case FSL_DBROLE_REPO: case FSL_DBROLE_CKOUT: break; case FSL_DBROLE_CONFIG: case FSL_DBROLE_MAIN: case FSL_DBROLE_NONE: default: assert(!"cannot happen/not legal"); fsl__fatal(FSL_RC_RANGE, "Serious internal API misuse via %s().", __func__); return FSL_RC_RANGE; } db->f = f; db->name = fsl_strdup(dbName); if(!db->name){ rc = FSL_RC_OOM; goto end; } if(!f->dbMain){ // This is our first/main db. OPEN it. rc = fsl_db_open( db, zDbName, createIfNotExists ? FSL_OPEN_F_RWC : FSL_OPEN_F_RW ); if(rc){ rc = fsl_cx_uplift_db_error2(f, db, rc); fsl_db_close(db); goto end; } int const sqrc = sqlite3_db_config(db->dbh, SQLITE_DBCONFIG_MAINDBNAME, dbName); if(sqrc){ rc = fsl__db_errcode(&f->config.db, sqrc); fsl_cx_uplift_db_error2(f, db, rc); fsl_db_close(db); }else{ rc = fsl__cx_init_db(f, db); db->role |= r; assert(db == f->dbMain)/*even on failure*/; /* Should we fsl__cx_detach_role() here? */ } }else{ // This is our secondary db. ATTACH it. assert(db != f->dbMain); db->filename = fsl_strdup(zDbName); if(!db->filename){ rc = FSL_RC_OOM; }else{ bool createdIt = false; if(createIfNotExists && 0!=fsl_file_access( zDbName, F_OK )){ FILE * const cf = fsl_fopen(zDbName, "w"); if(!cf){ rc = fsl_cx_err_set(f, fsl_errno_to_rc(errno, FSL_RC_IO), "Error creating new db file [%s].", zDbName); goto end; } fsl_fclose(cf); createdIt = true; } rc = fsl_db_attach(f->dbMain, zDbName, dbName); if(rc){ fsl_cx_uplift_db_error(f, f->dbMain); fsl_db_close(db)/*cleans up strings*/; db->f = NULL; if(createdIt) fsl_file_unlink(zDbName); }else{ /*MARKER(("Attached %p role %d %s %s\n", (void const *)db, r, db->name, db->filename));*/ f->dbMain->role |= r; } } } end: return rc; } int fsl_config_close( fsl_cx * const f ){ if(fsl_db_transaction_level(&f->config.db)){ return fsl_cx_err_set(f, FSL_RC_MISUSE, "Cannot close config db with an " "opened transaction."); } fsl_db_close(&f->config.db); return 0; } int fsl_close_scm_dbs(fsl_cx * const f){ if(fsl_cx_transaction_level(f)){ /* TODO???: force a full rollback and close it */ //if(f->repo.db.dbh) fsl_db_rollback_force(&f->repo.db); //if(f->ckout.db.dbh) fsl_db_rollback_force(&f->ckout.db); return fsl_cx_err_set(f, FSL_RC_MISUSE, "Cannot close repo or checkout with an " "opened transaction."); }else if(!f->dbMain){ // Make sure that all string resources are cleaned up... fsl_db_close(&f->repo.db); fsl_db_close(&f->ckout.db); return 0; }else{ fsl_db * const dbR = &f->repo.db; return fsl__cx_detach_role(f, f->dbMain == dbR ? FSL_DBROLE_REPO : FSL_DBROLE_CKOUT) /* Will also close the counterpart db. */; } } int fsl_repo_close( fsl_cx * const f ){ return fsl_close_scm_dbs(f); } int fsl_ckout_close( fsl_cx * const f ){ return fsl_close_scm_dbs(f); } /** If zDbName is a valid checkout database file, open it and return 0. If it is not a valid local database file, return a non-0 code. */ static int fsl__cx_ckout_open_db(fsl_cx * f, const char *zDbName){ /* char *zVFileDef; */ int rc; fsl_int_t const lsize = fsl_file_size(zDbName); if( -1 == lsize ){ return FSL_RC_NOT_FOUND /* might be FSL_RC_ACCESS? */; } if( lsize%1024!=0 || lsize<4096 ){ return fsl_cx_err_set(f, FSL_RC_RANGE, "File's size is not correct for a " "checkout db: %s", zDbName); } rc = fsl__cx_attach_role(f, zDbName, FSL_DBROLE_CKOUT, false); return rc; } int fsl_cx_execv( fsl_cx * const f, char const * sql, va_list args ){ int const rc = (f->dbMain && sql) ? fsl_db_execv(f->dbMain, sql, args) |
︙ | ︙ | |||
13247 13248 13249 13250 13251 13252 13253 | schema's tables. */ static int fsl_config_file_reset(fsl_cx * const f, char const * dbName){ fsl_db DB = fsl_db_empty; fsl_db * db = &DB; int rc = 0; bool isAttached = false; | | | | 13488 13489 13490 13491 13492 13493 13494 13495 13496 13497 13498 13499 13500 13501 13502 13503 13504 13505 13506 13507 13508 13509 13510 13511 13512 13513 13514 13515 | schema's tables. */ static int fsl_config_file_reset(fsl_cx * const f, char const * dbName){ fsl_db DB = fsl_db_empty; fsl_db * db = &DB; int rc = 0; bool isAttached = false; const char * zPrefix = fsl_db_role_name(FSL_DBROLE_CONFIG); if(-1 != fsl_file_size(dbName)){ rc = fsl_file_unlink(dbName); if(rc){ return fsl_cx_err_set(f, rc, "Error %s while removing old config file (%s)", fsl_rc_cstr(rc), dbName); } } /** Hoop-jumping: because the schema file has a cfg. prefix for the table(s), and we cannot assign an arbitrary name to an open()'d db, we first open the db (making the the "main" db), then ATTACH it to itself to provide the fsl_db_role_name() alias. */ rc = fsl_db_open(db, dbName, FSL_OPEN_F_RWC); if(rc) goto end; rc = fsl_db_attach(db, dbName, zPrefix); if(rc) goto end; isAttached = true; rc = fsl_db_exec_multi(db, "%s", fsl_schema_config()); |
︙ | ︙ | |||
13344 13345 13346 13347 13348 13349 13350 | int fsl_config_open( fsl_cx * const f, char const * openDbName ){ int rc = 0; const char * zDbName = 0; char * zPrefName = 0; if(fsl_cx_db_config(f)){ if(NULL==openDbName || 0==*openDbName) return 0/*nothing to do*/; | | > | 13585 13586 13587 13588 13589 13590 13591 13592 13593 13594 13595 13596 13597 13598 13599 13600 | int fsl_config_open( fsl_cx * const f, char const * openDbName ){ int rc = 0; const char * zDbName = 0; char * zPrefName = 0; if(fsl_cx_db_config(f)){ if(NULL==openDbName || 0==*openDbName) return 0/*nothing to do*/; fsl_config_close(f); assert(!f->config.db.dbh); } if(openDbName && *openDbName){ zDbName = openDbName; }else{ rc = fsl_config_global_preferred_name(&zPrefName); if(rc) goto end; zDbName = zPrefName; |
︙ | ︙ | |||
13373 13374 13375 13376 13377 13378 13379 | rc = fsl_cx_err_set(f, FSL_RC_ACCESS, "Configuration database [%s] " "must be writeable.", zDbName); goto end; } #endif assert(NULL==fsl_cx_db_config(f)); | > > > > > > > | > > > > > > | 13615 13616 13617 13618 13619 13620 13621 13622 13623 13624 13625 13626 13627 13628 13629 13630 13631 13632 13633 13634 13635 13636 13637 13638 13639 13640 13641 13642 | rc = fsl_cx_err_set(f, FSL_RC_ACCESS, "Configuration database [%s] " "must be writeable.", zDbName); goto end; } #endif assert(NULL==fsl_cx_db_config(f)); rc = fsl_db_open(&f->config.db, zDbName, FSL_OPEN_F_RW | (f->cxConfig.traceSql ? FSL_OPEN_F_TRACE_SQL : 0)); if(0==rc){ int const sqrc = sqlite3_db_config(f->config.db.dbh, SQLITE_DBCONFIG_MAINDBNAME, fsl_db_role_name(FSL_DBROLE_CONFIG)); if(sqrc) rc = fsl__db_errcode(&f->config.db, sqrc); } if(rc){ rc = fsl_cx_uplift_db_error2(f, &f->config.db, rc); fsl_db_close(&f->config.db); } end: fsl_free(zPrefName); return rc; } static void fsl_cx_username_from_repo(fsl_cx * f){ fsl_db * dbR = fsl_cx_db_repo(f); |
︙ | ︙ | |||
13467 13468 13469 13470 13471 13472 13473 13474 13475 13476 13477 13478 13479 13480 13481 13482 13483 13484 13485 | case FSL_HPOLICY_SHA1: p = FSL_HPOLICY_SHA1; break; case FSL_HPOLICY_SHUN_SHA1: p = FSL_HPOLICY_SHUN_SHA1; break; default: p = FSL_HPOLICY_AUTO; break; } f->cxConfig.hashPolicy = p; } int fsl_repo_open( fsl_cx * const f, char const * repoDbFile /* , bool readOnlyCurrentlyIgnored */ ){ if(fsl_cx_db_repo(f)){ return fsl_cx_err_set(f, FSL_RC_ACCESS, "Context already has an opened repository."); }else{ int rc; if(0!=fsl_file_access( repoDbFile, F_OK )){ rc = fsl_cx_err_set(f, FSL_RC_NOT_FOUND, "Repository db [%s] not found or cannot be read.", repoDbFile); }else{ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | < < | 13722 13723 13724 13725 13726 13727 13728 13729 13730 13731 13732 13733 13734 13735 13736 13737 13738 13739 13740 13741 13742 13743 13744 13745 13746 13747 13748 13749 13750 13751 13752 13753 13754 13755 13756 13757 13758 13759 13760 13761 13762 13763 13764 13765 13766 13767 13768 13769 13770 13771 13772 13773 13774 13775 13776 13777 13778 13779 13780 13781 13782 13783 13784 13785 13786 13787 13788 13789 13790 13791 13792 13793 13794 13795 13796 13797 13798 | case FSL_HPOLICY_SHA1: p = FSL_HPOLICY_SHA1; break; case FSL_HPOLICY_SHUN_SHA1: p = FSL_HPOLICY_SHUN_SHA1; break; default: p = FSL_HPOLICY_AUTO; break; } f->cxConfig.hashPolicy = p; } #if 0 /** Return true if the schema is out-of-date. db must be an opened repo db. */ static bool fsl__db_repo_schema_is_outofdate(fsl_db *db){ return fsl_db_exists(db, "SELECT 1 FROM config " "WHERE name='aux-schema' " "AND value<>'%s'", FSL_AUX_SCHEMA); } /* Returns 0 if db appears to have a current repository schema, 1 if it appears to have an out of date schema, and -1 if it appears to not be a repository. */ int fsl__db_repo_verify_schema(fsl_db * const db){ if(fsl__db_repo_schema_is_outofdate(db)) return 1; else return fsl_db_exists(db, "SELECT 1 FROM config " "WHERE name='project-code'") ? 0 : -1; } int fsl_repo_schema_validate(fsl_cx * const f, fsl_db * const db){ int rc = 0; int const check = fsl__db_repo_verify_schema(db); if(0 != check){ rc = (check<0) ? fsl_cx_err_set(f, FSL_RC_NOT_A_REPO, "DB file [%s] does not appear to be " "a repository.", db->filename) : fsl_cx_err_set(f, FSL_RC_REPO_NEEDS_REBUILD, "DB file [%s] appears to be a fossil " "repsitory, but is out-of-date and needs " "a rebuild.", db->filename); } return rc; } #endif int fsl_repo_open( fsl_cx * const f, char const * repoDbFile /* , bool readOnlyCurrentlyIgnored */ ){ if(fsl_cx_db_repo(f)){ return fsl_cx_err_set(f, FSL_RC_ACCESS, "Context already has an opened repository."); }else{ int rc; if(0!=fsl_file_access( repoDbFile, F_OK )){ rc = fsl_cx_err_set(f, FSL_RC_NOT_FOUND, "Repository db [%s] not found or cannot be read.", repoDbFile); }else{ rc = fsl__cx_attach_role(f, repoDbFile, FSL_DBROLE_REPO, false); if(!rc && !(FSL_CX_F_IS_OPENING_CKOUT & f->flags)){ rc = fsl_cx_after_open(f); } if(!rc){ fsl_db * const db = fsl_cx_db_repo(f); fsl_cx_username_from_repo(f); fsl_cx_allows_symlinks(f, true); fsl_cx_is_case_sensitive(f, true); f->cache.seenDeltaManifest = fsl_config_get_int32(f, FSL_CONFDB_REPO, -1, "seen-delta-manifest"); fsl_cx_fetch_hash_policy(f); if(f->cxConfig.hashPolicy==FSL_HPOLICY_AUTO){ if(fsl_db_exists(db, "SELECT 1 FROM blob WHERE length(uuid)>40") || !fsl_db_exists(db, "SELECT 1 FROM blob WHERE length(uuid)==40")){ |
︙ | ︙ | |||
13561 13562 13563 13564 13565 13566 13567 13568 13569 13570 13571 13572 13573 13574 | f->ckout.mtime = f->ckout.rid>0 ? fsl_db_g_double(fsl_cx_db_repo(f), 0.0, "SELECT mtime FROM event " "WHERE objid=%" FSL_ID_T_PFMT, f->ckout.rid) : 0.0; } int fsl__ckout_version_fetch( fsl_cx * const f ){ fsl_id_t rid = 0; int rc = 0; fsl_db * dbC = fsl_cx_db_ckout(f); fsl_db * dbR = dbC ? fsl_needs_repo(f) : NULL; assert(!dbC || (dbC && dbR)); | > > > > > > > < | < < | 13856 13857 13858 13859 13860 13861 13862 13863 13864 13865 13866 13867 13868 13869 13870 13871 13872 13873 13874 13875 13876 13877 13878 13879 13880 13881 13882 13883 13884 | f->ckout.mtime = f->ckout.rid>0 ? fsl_db_g_double(fsl_cx_db_repo(f), 0.0, "SELECT mtime FROM event " "WHERE objid=%" FSL_ID_T_PFMT, f->ckout.rid) : 0.0; } void fsl__cx_ckout_clear( fsl_cx * const f ){ fsl_free(f->ckout.uuid); f->ckout.rid = -1; f->ckout.uuid = NULL; f->ckout.mtime = 0.0; } int fsl__ckout_version_fetch( fsl_cx * const f ){ fsl_id_t rid = 0; int rc = 0; fsl_db * dbC = fsl_cx_db_ckout(f); fsl_db * dbR = dbC ? fsl_needs_repo(f) : NULL; assert(!dbC || (dbC && dbR)); fsl__cx_ckout_clear(f); if(!dbC){ return 0; } fsl_cx_err_reset(f); rid = fsl_config_get_id(f, FSL_CONFDB_CKOUT, -1, "checkout"); //MARKER(("rc=%s rid=%d\n",fsl_rc_cstr(f->error.code), (int)rid)); if(rid>0){ |
︙ | ︙ | |||
13685 13686 13687 13688 13689 13690 13691 | fsl_buffer * const pOut ){ int rc; fsl_int_t dLen = 0, i; enum { DbCount = 2 }; const char aDbName[DbCount][10] = { "_FOSSIL_", ".fslckout" }; fsl_buffer Buf = fsl_buffer_empty; fsl_buffer * buf = &Buf; | < | 13984 13985 13986 13987 13988 13989 13990 13991 13992 13993 13994 13995 13996 13997 | fsl_buffer * const pOut ){ int rc; fsl_int_t dLen = 0, i; enum { DbCount = 2 }; const char aDbName[DbCount][10] = { "_FOSSIL_", ".fslckout" }; fsl_buffer Buf = fsl_buffer_empty; fsl_buffer * buf = &Buf; if(dirName){ dLen = fsl_strlen(dirName); if(0==dLen) return FSL_RC_RANGE; rc = fsl_buffer_reserve( buf, (fsl_size_t)(dLen + 10) ); if(!rc) rc = fsl_buffer_append( buf, dirName, dLen ); if(rc){ fsl_buffer_clear(buf); |
︙ | ︙ | |||
13772 13773 13774 13775 13776 13777 13778 | } } } fsl_buffer_clear(buf); return FSL_RC_NOT_FOUND; } | | | | | | | | > > > > > > < | | | < < < | 14070 14071 14072 14073 14074 14075 14076 14077 14078 14079 14080 14081 14082 14083 14084 14085 14086 14087 14088 14089 14090 14091 14092 14093 14094 14095 14096 14097 14098 14099 14100 14101 14102 14103 14104 14105 14106 14107 14108 14109 14110 14111 14112 14113 14114 14115 14116 14117 14118 14119 14120 14121 14122 14123 14124 14125 14126 14127 | } } } fsl_buffer_clear(buf); return FSL_RC_NOT_FOUND; } int fsl_cx_getcwd(fsl_cx * const f, fsl_buffer * const pOut){ char cwd[FILENAME_MAX] = {0}; fsl_size_t cwdLen = 0; int rc = fsl_getcwd(cwd, (fsl_size_t)sizeof(cwd), &cwdLen); if(rc){ return fsl_cx_err_set(f, rc, "Could not get current working directory!"); } rc = fsl_buffer_append(pOut, cwd, cwdLen); return rc ? fsl_cx_err_set(f, rc/*must be an OOM*/, NULL) : 0; } int fsl_ckout_open_dir( fsl_cx * const f, char const * dirName, bool checkParentDirs ){ int rc; fsl_buffer * const buf = fsl__cx_scratchpad(f); fsl_buffer * const bufD = fsl__cx_scratchpad(f); char const * zName; if(fsl_cx_db_ckout(f)){ rc = fsl_cx_err_set( f, FSL_RC_ACCESS, "A checkout is already opened. " "Close it before opening another."); goto end; }else if(!dirName){ dirName = "."; } rc = fsl_file_canonical_name( dirName, bufD, false ); if(rc) goto end; dirName = fsl_buffer_cstr(bufD); rc = fsl_ckout_db_search(dirName, checkParentDirs, buf); if(rc){ if(FSL_RC_NOT_FOUND==rc){ rc = fsl_cx_err_set(f, FSL_RC_NOT_FOUND, "Could not find checkout under [%s].", dirName ? dirName : "."); } goto end; } assert(buf->used>1 /* "/<FILENAME>" */); zName = fsl_buffer_cstr(buf); rc = fsl__cx_ckout_open_db(f, zName); if(0==rc){ /* Checkout db is now opened. Fiddle some internal bits... */ unsigned char * end = buf->mem+buf->used-1; /* Find dir part */ while(end>buf->mem && (unsigned char)'/'!=*end) --end; assert('/' == (char)*end && "fsl_ckout_db_search() appends '/<DBNAME>'"); |
︙ | ︙ | |||
13838 13839 13840 13841 13842 13843 13844 | rc = fsl_repo_open_for_ckout(f); f->flags &= ~FSL_CX_F_IS_OPENING_CKOUT; if(!rc) rc = fsl_cx_after_open(f); if(rc){ /* Is this sane? Is not doing it sane? */ fsl_ckout_close(f); } | < > > > > | | < | | | > > > | | 14138 14139 14140 14141 14142 14143 14144 14145 14146 14147 14148 14149 14150 14151 14152 14153 14154 14155 14156 14157 14158 14159 14160 14161 14162 14163 14164 14165 14166 14167 14168 14169 14170 14171 14172 14173 14174 14175 14176 14177 14178 14179 14180 | rc = fsl_repo_open_for_ckout(f); f->flags &= ~FSL_CX_F_IS_OPENING_CKOUT; if(!rc) rc = fsl_cx_after_open(f); if(rc){ /* Is this sane? Is not doing it sane? */ fsl_ckout_close(f); } } end: fsl__cx_scratchpad_yield(f, buf); fsl__cx_scratchpad_yield(f, bufD); return rc; } char const * fsl_cx_db_file_for_role(fsl_cx const * f, fsl_dbrole_e r, fsl_size_t * len){ fsl_db const * db = fsl__cx_db_for_role((fsl_cx*)f, r); char const * rc = db ? db->filename : NULL; if(len) *len = fsl_strlen(rc); return rc; } char const * fsl_cx_db_name_for_role(fsl_cx const * f, fsl_dbrole_e r, fsl_size_t * len){ if(FSL_DBROLE_MAIN == r){ if(f->dbMain){ if(len) *len=4; return "main"; }else{ return NULL; } }else{ fsl_db const * db = fsl__cx_db_for_role((fsl_cx*)f, r); char const * rc = db ? db->name : NULL; if(len) *len = rc ? fsl_strlen(rc) : 0; return rc; } } char const * fsl_cx_db_file_config(fsl_cx const * f, |
︙ | ︙ | |||
14071 14072 14073 14074 14075 14076 14077 | } int fsl_cx_stat(fsl_cx * const f, bool relativeToCwd, char const * zName, fsl_fstat * const tgt){ return fsl_cx_stat2(f, relativeToCwd, zName, tgt, NULL, false); } | > > > > | > > > | | | > | > > > > | > > > > | > > > | | | | | | | > | > < < < < < < < < | < < < < < < < < < < < < < | | 14376 14377 14378 14379 14380 14381 14382 14383 14384 14385 14386 14387 14388 14389 14390 14391 14392 14393 14394 14395 14396 14397 14398 14399 14400 14401 14402 14403 14404 14405 14406 14407 14408 14409 14410 14411 14412 14413 14414 14415 14416 14417 14418 14419 14420 14421 14422 14423 14424 14425 14426 14427 14428 14429 14430 14431 14432 14433 14434 14435 14436 14437 14438 14439 14440 14441 14442 14443 14444 14445 14446 14447 | } int fsl_cx_stat(fsl_cx * const f, bool relativeToCwd, char const * zName, fsl_fstat * const tgt){ return fsl_cx_stat2(f, relativeToCwd, zName, tgt, NULL, false); } bool fsl_cx_allows_symlinks(fsl_cx * const f, bool forceRecheck){ if(forceRecheck || f->cache.allowSymlinks<0){ f->cache.allowSymlinks = fsl_config_get_bool(f, FSL_CONFDB_REPO, false, "allow-symlinks"); } return f->cache.allowSymlinks>0; } void fsl_cx_case_sensitive_set(fsl_cx * const f, bool caseSensitive){ f->cache.caseInsensitive = caseSensitive ? 0 : 1; } bool fsl_cx_is_case_sensitive(fsl_cx * const f, bool forceRecheck){ if(forceRecheck || f->cache.caseInsensitive<0){ f->cache.caseInsensitive = fsl_config_get_bool(f, FSL_CONFDB_REPO, true, "case-sensitive") ? 0 : 1; } return f->cache.caseInsensitive <= 0; } char const * fsl_cx_filename_collation(fsl_cx const * f){ return f->cache.caseInsensitive>0 ? "COLLATE nocase" : ""; } fsl_buffer * fsl__cx_content_buffer(fsl_cx * const f){ if(f->cache.fileContent.used){ fsl__fatal(FSL_RC_MISUSE, "Called %s() while the content buffer has bytes in use."); } return &f->cache.fileContent; } void fsl__cx_content_buffer_yield(fsl_cx * const f){ enum { MaxSize = 1024 * 1024 * 10 }; assert(f); if(f->cache.fileContent.capacity>MaxSize){ fsl_buffer_resize(&f->cache.fileContent, MaxSize); assert(f->cache.fileContent.capacity<=MaxSize+1); } fsl_buffer_reuse(&f->cache.fileContent); } fsl_error const * fsl_cx_err_get_e(fsl_cx const * f){ return &f->error; } int fsl_cx_close_dbs( fsl_cx * const f ){ if(fsl_cx_transaction_level(f) || (f->config.db.dbh && fsl_db_transaction_level(&f->config.db))){ /* Is this really necessary? Should we instead force rollback(s) and close the dbs? */ return fsl_cx_err_set(f, FSL_RC_MISUSE, "Cannot close the databases when a " "transaction is pending."); } fsl_config_close(f); return fsl_close_scm_dbs(f); } char const * fsl_cx_glob_matches( fsl_cx * const f, int gtype, char const * str ){ int i, count = 0; char const * rv = NULL; fsl_list const * lists[] = {0,0,0}; |
︙ | ︙ | |||
14186 14187 14188 14189 14190 14191 14192 | } int fsl_cx_hash_filename( fsl_cx * f, bool useAlternate, const char * zFilename, fsl_buffer * pOut){ /* FIXME: reimplement this to stream the content in bite-sized chunks. That requires duplicating most of fsl_buffer_fill_from() and fsl_cx_hash_buffer(). */ | | | 14491 14492 14493 14494 14495 14496 14497 14498 14499 14500 14501 14502 14503 14504 14505 | } int fsl_cx_hash_filename( fsl_cx * f, bool useAlternate, const char * zFilename, fsl_buffer * pOut){ /* FIXME: reimplement this to stream the content in bite-sized chunks. That requires duplicating most of fsl_buffer_fill_from() and fsl_cx_hash_buffer(). */ fsl_buffer * const content = &f->cache.fileContent; int rc; assert(!content->used && "Internal recursive misuse of fsl_cx::fileContent"); fsl_buffer_reuse(content); rc = fsl_buffer_fill_from_filename(content, zFilename); if(!rc){ rc = fsl_cx_hash_buffer(f, useAlternate, content, pOut); } |
︙ | ︙ | |||
14294 14295 14296 14297 14298 14299 14300 | f->cache.seenDeltaManifest = 1; rc = fsl_config_set_bool(f, FSL_CONFDB_REPO, "seen-delta-manifest", 1); } return rc; } | | | | | > > | | 14599 14600 14601 14602 14603 14604 14605 14606 14607 14608 14609 14610 14611 14612 14613 14614 14615 14616 14617 14618 14619 14620 14621 14622 14623 14624 14625 14626 14627 14628 14629 14630 14631 14632 14633 14634 14635 14636 14637 14638 14639 14640 14641 14642 14643 14644 14645 14646 14647 14648 14649 14650 14651 14652 14653 14654 14655 14656 14657 14658 14659 14660 14661 14662 14663 14664 14665 14666 | f->cache.seenDeltaManifest = 1; rc = fsl_config_set_bool(f, FSL_CONFDB_REPO, "seen-delta-manifest", 1); } return rc; } int fsl_reserved_fn_check(fsl_cx * const f, const char *zPath, fsl_int_t nPath, bool relativeToCwd){ static const int errRc = FSL_RC_RANGE; int rc = 0; char const * z1 = 0; if(nPath<0) nPath = (fsl_int_t)fsl_strlen(zPath); if(fsl_is_reserved_fn(zPath, nPath)){ return fsl_cx_err_set(f, errRc, "Filename is reserved, not legal " "for adding to a repository: %.*s", (int)nPath, zPath); } if(!(f->flags & FSL_CX_F_ALLOW_WINDOWS_RESERVED_NAMES) && fsl__is_reserved_fn_windows(zPath, nPath)){ return fsl_cx_err_set(f, errRc, "Filename is a Windows reserved name: %.*s", (int)nPath, zPath); } if((z1 = fsl_cx_db_file_for_role(f, FSL_DBROLE_REPO, NULL))){ fsl_buffer * const c1 = fsl__cx_scratchpad(f); fsl_buffer * const c2 = fsl__cx_scratchpad(f); rc = fsl_file_canonical_name2(relativeToCwd ? NULL : f->ckout.dir/*NULL is okay*/, z1, c1, false); if(!rc) rc = fsl_file_canonical_name2(relativeToCwd ? NULL : f->ckout.dir, zPath, c2, false); //MARKER(("\nzPath=%s\nc1=%s\nc2=%s\n", zPath, //fsl_buffer_cstr(c1), fsl_buffer_cstr(c2))); if(!rc && c1->used == c2->used && 0==fsl_stricmp(fsl_buffer_cstr(c1), fsl_buffer_cstr(c2))){ rc = fsl_cx_err_set(f, errRc, "File is the repository database: %.*s", (int)nPath, zPath); } fsl__cx_scratchpad_yield(f, c1); fsl__cx_scratchpad_yield(f, c2); if(rc) return rc; } assert(!rc); while(true){ /* Check the name against the repo's "manifest" setting and reject any filenames which that setting implies. */ int manifestSetting = 0; fsl_ckout_manifest_setting(f, &manifestSetting); if(!manifestSetting) break; typedef struct { short flag; char const * fn; } MSetting; const MSetting M[] = { {FSL_MANIFEST_MAIN, "manifest"}, {FSL_MANIFEST_UUID, "manifest.uuid"}, {FSL_MANIFEST_TAGS, "manifest.tags"}, {0,0} }; fsl_buffer * const c1 = fsl__cx_scratchpad(f); if(f->ckout.dir){ rc = fsl_ckout_filename_check(f, relativeToCwd, zPath, c1); }else{ rc = fsl_file_canonical_name2("", zPath, c1, false); } if(rc) goto yield; char const * const z = fsl_buffer_cstr(c1); |
︙ | ︙ | |||
14423 14424 14425 14426 14427 14428 14429 | "Fatal internal fsl_cx::scratchpads misuse: " "passed a non-scratchpad buffer."); } /** @internal | | | 14730 14731 14732 14733 14734 14735 14736 14737 14738 14739 14740 14741 14742 14743 14744 | "Fatal internal fsl_cx::scratchpads misuse: " "passed a non-scratchpad buffer."); } /** @internal Don't use this. Use fsl__ckout_rm_empty_dirs() instead. Attempts to remove empty directories from under a checkout, starting with tgtDir and working upwards until it either cannot remove one or it reaches the top of the checkout dir. The first argument must be the canonicalized absolute path to the checkout root. The second is the length of coRoot - if it's |
︙ | ︙ | |||
14446 14447 14448 14449 14450 14451 14452 | Results are undefined if tgtDir is not an absolute path or does not have coRoot as its initial prefix. There are any number of valid reasons removal of a directory might fail, and this routine stops at the first one which does. */ | | > | | | | > | | | < < < < < | | 14753 14754 14755 14756 14757 14758 14759 14760 14761 14762 14763 14764 14765 14766 14767 14768 14769 14770 14771 14772 14773 14774 14775 14776 14777 14778 14779 14780 14781 14782 14783 14784 14785 14786 14787 14788 14789 14790 14791 14792 14793 14794 14795 14796 14797 14798 14799 14800 14801 14802 14803 14804 14805 14806 14807 14808 14809 14810 14811 14812 14813 14814 14815 14816 14817 14818 14819 14820 | Results are undefined if tgtDir is not an absolute path or does not have coRoot as its initial prefix. There are any number of valid reasons removal of a directory might fail, and this routine stops at the first one which does. */ static unsigned fsl__rm_empty_dirs(char const * const coRoot, fsl_int_t rootLen, fsl_buffer const * const tgtDir){ if(rootLen<0) rootLen = (fsl_int_t)fsl_strlen(coRoot); char const * zAbs = fsl_buffer_cstr(tgtDir); char const * zCoDirPart = zAbs + rootLen; char * zEnd = fsl_buffer_str(tgtDir) + tgtDir->used - 1; unsigned rc = 0; assert(coRoot); if(0!=memcmp(coRoot, zAbs, (size_t)rootLen)){ assert(!"Misuse of fsl__rm_empty_dirs()"); return 0; } if(fsl_rmdir(zAbs)) return rc; ++rc; /** Now walk up each dir in the path and try to remove each, stopping when removal of one fails or we reach coRoot. */ while(zEnd>zCoDirPart){ for( ; zEnd>zCoDirPart && '/'!=*zEnd; --zEnd ){} if(zEnd==zCoDirPart) break; else if('/'==*zEnd){ *zEnd = 0; assert(zEnd>zCoDirPart); if(fsl_rmdir(zAbs)) break; ++rc; } } return rc; } unsigned int fsl__ckout_rm_empty_dirs(fsl_cx * const f, fsl_buffer const * const tgtDir){ int rc = f->ckout.dir ? 0 : FSL_RC_NOT_A_CKOUT; if(!rc){ rc = fsl__rm_empty_dirs(f->ckout.dir, f->ckout.dirLen, tgtDir); } return rc; } int fsl__ckout_rm_empty_dirs_for_file(fsl_cx * const f, char const *zAbsPath){ if(!fsl_is_rooted_in_ckout(f, zAbsPath)){ assert(!"Internal API misuse!"); return FSL_RC_MISUSE; }else{ fsl_buffer * const p = fsl__cx_scratchpad(f); fsl_int_t const nAbs = (fsl_int_t)fsl_strlen(zAbsPath); int const rc = fsl_file_dirpart(zAbsPath, nAbs, p, false); if(!rc) fsl__rm_empty_dirs(f->ckout.dir, f->ckout.dirLen, p); fsl__cx_scratchpad_yield(f,p); return rc; } } int fsl_ckout_fingerprint_check(fsl_cx * const f){ fsl_db * const db = fsl_cx_db_ckout(f); if(!db) return 0; int rc = 0; char const * zCkout = 0; char * zRepo = 0; fsl_id_t rcvCkout = 0; fsl_buffer * const buf = fsl__cx_scratchpad(f); |
︙ | ︙ | |||
14594 14595 14596 14597 14598 14599 14600 | struct tm * tm = fsl_cx_localtime(f, &clock); return tm ? mktime(tm) : 0; } #endif #undef MARKER #undef FSL_CX_NSCRATCH | | | | 14898 14899 14900 14901 14902 14903 14904 14905 14906 14907 14908 14909 14910 14911 14912 14913 | struct tm * tm = fsl_cx_localtime(f, &clock); return tm ? mktime(tm) : 0; } #endif #undef MARKER #undef FSL_CX_NSCRATCH /* end of file ./src/cx.c */ /* start of file ./src/db.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
14639 14640 14641 14642 14643 14644 14645 14646 14647 14648 14649 14650 14651 14652 14653 14654 | */ static int fsl_list_v_fsl_stmt_finalize(void * obj, void * visitorState ){ if(obj) fsl_stmt_finalize( (fsl_stmt*)obj ); return 0; } #endif void fsl__db_clear_strings(fsl_db * const db, bool alsoErrorState ){ fsl_free(db->filename); db->filename = NULL; fsl_free(db->name); db->name = NULL; if(alsoErrorState) fsl_error_clear(&db->error); } int fsl_db_err_get( fsl_db const * const db, char const ** msg, fsl_size_t * len ){ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < | < | < < < < < < < < < < < < < < < < < | < | 14943 14944 14945 14946 14947 14948 14949 14950 14951 14952 14953 14954 14955 14956 14957 14958 14959 14960 14961 14962 14963 14964 14965 14966 14967 14968 14969 14970 14971 14972 14973 14974 14975 14976 14977 14978 14979 14980 14981 14982 14983 14984 14985 14986 14987 14988 14989 14990 14991 14992 14993 14994 14995 14996 14997 14998 14999 15000 15001 15002 15003 15004 15005 15006 15007 15008 | */ static int fsl_list_v_fsl_stmt_finalize(void * obj, void * visitorState ){ if(obj) fsl_stmt_finalize( (fsl_stmt*)obj ); return 0; } #endif int fsl__db_errcode(fsl_db * const db, int sqliteCode){ int rc = 0; if(!sqliteCode) sqliteCode = sqlite3_errcode(db->dbh); switch(sqliteCode & 0xff){ case SQLITE_ROW: case SQLITE_DONE: case SQLITE_OK: rc = 0; break; case SQLITE_NOMEM: rc = FSL_RC_OOM; break; case SQLITE_INTERRUPT: rc = FSL_RC_INTERRUPTED; break; case SQLITE_TOOBIG: case SQLITE_FULL: case SQLITE_NOLFS: case SQLITE_RANGE: rc = FSL_RC_RANGE; break; case SQLITE_NOTFOUND: rc = FSL_RC_NOT_FOUND; break; case SQLITE_PERM: case SQLITE_AUTH: case SQLITE_LOCKED: case SQLITE_READONLY: rc = FSL_RC_ACCESS; break; case SQLITE_CORRUPT: rc = FSL_RC_CONSISTENCY; break; case SQLITE_CANTOPEN: case SQLITE_IOERR: rc = FSL_RC_IO; break; default: //MARKER(("sqlite3_errcode()=0x%04x\n", rc)); rc = FSL_RC_DB; break; } return rc ? fsl_error_set(&db->error, rc, "sqlite3 error #%d: %s", sqliteCode, sqlite3_errmsg(db->dbh)) : (fsl_error_reset(&db->error), 0); } void fsl__db_clear_strings(fsl_db * const db, bool alsoErrorState ){ fsl_free(db->filename); db->filename = NULL; fsl_free(db->name); db->name = NULL; if(alsoErrorState) fsl_error_clear(&db->error); } int fsl_db_err_get( fsl_db const * const db, char const ** msg, fsl_size_t * len ){ return fsl_error_get(&db->error, msg, len); } fsl_db * fsl_stmt_db( fsl_stmt * const stmt ){ return stmt->db; } char const * fsl_stmt_sql( fsl_stmt * const stmt, fsl_size_t * const len ){ return fsl_buffer_cstr2(&stmt->sql, len); } char const * fsl_db_filename(fsl_db const * db, fsl_size_t * len){ if(len && db->filename) *len = fsl_strlen(db->filename); return db->filename; } |
︙ | ︙ | |||
14726 14727 14728 14729 14730 14731 14732 | } db->cacheHead = 0; } return rc; } void fsl_db_close( fsl_db * const db ){ | < | > | | | | 15044 15045 15046 15047 15048 15049 15050 15051 15052 15053 15054 15055 15056 15057 15058 15059 15060 15061 15062 15063 15064 15065 15066 15067 15068 15069 15070 15071 15072 15073 15074 15075 15076 15077 15078 15079 15080 15081 | } db->cacheHead = 0; } return rc; } void fsl_db_close( fsl_db * const db ){ void const * const allocStamp = db->allocStamp; fsl_cx * const f = db->f; if(!db->dbh) return; fsl_db_stmt_cache_clear(db); if(db->f && db->f->dbMain==db){ /* Horrible, horrible dependency, and only necessary if the fsl_cx API gets sloppy or repo/checkout/config DBs are otherwised closed improperly (i.e. not via the fsl_cx API). */ assert(0 != db->role); f->dbMain = NULL; } while(db->beginCount>0){ fsl_db_transaction_end(db, 1); } if(0!=db->openStatementCount){ MARKER(("WARNING: %d open statement(s) left on db [%s].\n", (int)db->openStatementCount, db->filename)); } if(db->dbh){ sqlite3_close_v2(db->dbh); /* Ignore results in the style of "destructors may not throw.". */ } fsl__db_clear_strings(db, true); fsl_db_cleanup_beforeCommit(db); fsl_buffer_clear(&db->cachePrepBuf); *db = fsl_db_empty; if(&fsl_db_empty == allocStamp){ fsl_free( db ); |
︙ | ︙ | |||
14789 14790 14791 14792 14793 14794 14795 | char const * fsl_db_name(fsl_db const * const db){ return db ? db->name : NULL; } /** Returns the db name for the given role. */ | | < | 15107 15108 15109 15110 15111 15112 15113 15114 15115 15116 15117 15118 15119 15120 15121 15122 15123 15124 15125 15126 15127 15128 15129 15130 15131 15132 15133 15134 | char const * fsl_db_name(fsl_db const * const db){ return db ? db->name : NULL; } /** Returns the db name for the given role. */ const char * fsl_db_role_name(fsl_dbrole_e r){ switch(r){ case FSL_DBROLE_CONFIG: return "cfg"; case FSL_DBROLE_REPO: return "repo"; case FSL_DBROLE_CKOUT: return "ckout"; case FSL_DBROLE_MAIN: return "main"; case FSL_DBROLE_TEMP: return "temp"; case FSL_DBROLE_NONE: default: return NULL; } } char * fsl_db_julian_to_iso8601( fsl_db * const db, double j, bool msPrecision, bool localTime){ |
︙ | ︙ | |||
15035 15036 15037 15038 15039 15040 15041 | st->flags = FSL_STMT_F_CACHE_HELD; *rv = st; } end: return rc; } | | | 15352 15353 15354 15355 15356 15357 15358 15359 15360 15361 15362 15363 15364 15365 15366 | st->flags = FSL_STMT_F_CACHE_HELD; *rv = st; } end: return rc; } int fsl_db_prepare_cached( fsl_db * const db, fsl_stmt ** st, char const * sql, ... ){ int rc; va_list args; va_start(args,sql); rc = fsl_db_preparev_cached( db, st, sql, args ); va_end(args); return rc; } |
︙ | ︙ | |||
15088 15089 15090 15091 15092 15093 15094 | return rc; } int fsl_stmt_finalize( fsl_stmt * const stmt ){ if(!stmt) return FSL_RC_MISUSE; else{ void const * allocStamp = stmt->allocStamp; | | | 15405 15406 15407 15408 15409 15410 15411 15412 15413 15414 15415 15416 15417 15418 15419 | return rc; } int fsl_stmt_finalize( fsl_stmt * const stmt ){ if(!stmt) return FSL_RC_MISUSE; else{ void const * allocStamp = stmt->allocStamp; fsl_db * const db = stmt->db; if(db){ if(stmt->sql.mem){ /* ^^^ b/c that buffer is set at the same time that openStatementCount is incremented. */ --stmt->db->openStatementCount; } |
︙ | ︙ | |||
15169 15170 15171 15172 15173 15174 15175 | fsl_stmt_finalize(s); break; } return rc; } int fsl_stmt_step( fsl_stmt * const stmt ){ | | < < | | | | | | | | | | 15486 15487 15488 15489 15490 15491 15492 15493 15494 15495 15496 15497 15498 15499 15500 15501 15502 15503 15504 15505 15506 15507 15508 15509 15510 15511 15512 15513 15514 15515 15516 15517 15518 15519 15520 15521 15522 15523 15524 15525 15526 15527 15528 15529 15530 15531 15532 15533 15534 15535 15536 15537 15538 15539 15540 15541 15542 15543 15544 15545 15546 15547 15548 15549 15550 15551 15552 15553 15554 15555 15556 15557 15558 15559 15560 15561 15562 15563 15564 15565 15566 15567 15568 15569 15570 15571 15572 15573 15574 15575 15576 | fsl_stmt_finalize(s); break; } return rc; } int fsl_stmt_step( fsl_stmt * const stmt ){ if(!stmt->stmt) return FSL_RC_MISUSE; else{ int const rc = sqlite3_step(stmt->stmt); assert(stmt->db); switch( rc ){ case SQLITE_ROW: ++stmt->rowCount; return FSL_RC_STEP_ROW; case SQLITE_DONE: return FSL_RC_STEP_DONE; default: return fsl__db_errcode(stmt->db, rc); } } } int fsl_db_eachv( fsl_db * const db, fsl_stmt_each_f callback, void * callbackState, char const * sql, va_list args ){ if(!db->dbh || !callback || !sql) return FSL_RC_MISUSE; else if(!*sql) return FSL_RC_RANGE; else{ fsl_stmt st = fsl_stmt_empty; int rc; rc = fsl_db_preparev( db, &st, sql, args ); if(!rc){ rc = fsl_stmt_each( &st, callback, callbackState ); fsl_stmt_finalize( &st ); } return rc; } } int fsl_db_each( fsl_db * const db, fsl_stmt_each_f callback, void * callbackState, char const * sql, ... ){ int rc; va_list args; va_start(args,sql); rc = fsl_db_eachv( db, callback, callbackState, sql, args ); va_end(args); return rc; } int fsl_stmt_each( fsl_stmt * const stmt, fsl_stmt_each_f callback, void * callbackState ){ if(!callback) return FSL_RC_MISUSE; else{ int strc; int rc = 0; bool doBreak = false; while( !doBreak && (FSL_RC_STEP_ROW == (strc=fsl_stmt_step(stmt)))){ rc = callback( stmt, callbackState ); switch(rc){ case 0: continue; case FSL_RC_BREAK: rc = 0; /* fall through */ default: doBreak = true; break; } } return rc ? rc : ((FSL_RC_STEP_ERROR==strc) ? FSL_RC_DB : 0); } } int fsl_stmt_reset2( fsl_stmt * const stmt, bool resetRowCounter ){ if(!stmt->stmt || !stmt->db) return FSL_RC_MISUSE; else{ int const rc = sqlite3_reset(stmt->stmt); if(resetRowCounter) stmt->rowCount = 0; assert(stmt->db); return rc ? fsl__db_errcode(stmt->db, rc) : 0; } } int fsl_stmt_reset( fsl_stmt * const stmt ){ return fsl_stmt_reset2(stmt, 0); } |
︙ | ︙ | |||
15400 15401 15402 15403 15404 15405 15406 | #define BIND_PARAM_CHECK \ if(!(stmt && stmt->stmt && stmt->db && stmt->db->dbh)) return FSL_RC_MISUSE; else #define BIND_PARAM_CHECK2 BIND_PARAM_CHECK \ if(ndx<1 || ndx>stmt->paramCount) return FSL_RC_RANGE; else int fsl_stmt_bind_null( fsl_stmt * const stmt, int ndx ){ BIND_PARAM_CHECK2 { int const rc = sqlite3_bind_null( stmt->stmt, ndx ); | | | | | | | | | 15715 15716 15717 15718 15719 15720 15721 15722 15723 15724 15725 15726 15727 15728 15729 15730 15731 15732 15733 15734 15735 15736 15737 15738 15739 15740 15741 15742 15743 15744 15745 15746 15747 15748 15749 15750 15751 15752 15753 15754 15755 15756 15757 15758 15759 15760 15761 15762 15763 15764 15765 15766 15767 15768 15769 15770 15771 15772 15773 15774 15775 15776 15777 15778 | #define BIND_PARAM_CHECK \ if(!(stmt && stmt->stmt && stmt->db && stmt->db->dbh)) return FSL_RC_MISUSE; else #define BIND_PARAM_CHECK2 BIND_PARAM_CHECK \ if(ndx<1 || ndx>stmt->paramCount) return FSL_RC_RANGE; else int fsl_stmt_bind_null( fsl_stmt * const stmt, int ndx ){ BIND_PARAM_CHECK2 { int const rc = sqlite3_bind_null( stmt->stmt, ndx ); return rc ? fsl__db_errcode(stmt->db, rc) : 0; } } int fsl_stmt_bind_int32( fsl_stmt * const stmt, int ndx, int32_t v ){ BIND_PARAM_CHECK2 { int const rc = sqlite3_bind_int( stmt->stmt, ndx, (int)v ); return rc ? fsl__db_errcode(stmt->db, rc) : 0; } } int fsl_stmt_bind_int64( fsl_stmt * const stmt, int ndx, int64_t v ){ BIND_PARAM_CHECK2 { int const rc = sqlite3_bind_int64( stmt->stmt, ndx, (sqlite3_int64)v ); return rc ? fsl__db_errcode(stmt->db, rc) : 0; } } int fsl_stmt_bind_id( fsl_stmt * const stmt, int ndx, fsl_id_t v ){ BIND_PARAM_CHECK2 { int const rc = sqlite3_bind_int64( stmt->stmt, ndx, (sqlite3_int64)v ); return rc ? fsl__db_errcode(stmt->db, rc) : 0; } } int fsl_stmt_bind_double( fsl_stmt * const stmt, int ndx, double v ){ BIND_PARAM_CHECK2 { int const rc = sqlite3_bind_double( stmt->stmt, ndx, (double)v ); return rc ? fsl__db_errcode(stmt->db, rc) : 0; } } int fsl_stmt_bind_blob( fsl_stmt * const stmt, int ndx, void const * src, fsl_size_t len, bool makeCopy ){ BIND_PARAM_CHECK2 { int rc; rc = sqlite3_bind_blob( stmt->stmt, ndx, src, (int)len, makeCopy ? SQLITE_TRANSIENT : SQLITE_STATIC ); return rc ? fsl__db_errcode(stmt->db, rc) : 0; } } int fsl_stmt_bind_text( fsl_stmt * const stmt, int ndx, char const * src, fsl_int_t len, bool makeCopy ){ BIND_PARAM_CHECK { int rc; if(len<0) len = fsl_strlen((char const *)src); rc = sqlite3_bind_text( stmt->stmt, ndx, src, len, makeCopy ? SQLITE_TRANSIENT : SQLITE_STATIC ); return rc ? fsl__db_errcode(stmt->db, rc) : 0; } } int fsl_stmt_bind_null_name( fsl_stmt * const stmt, char const * param ){ BIND_PARAM_CHECK{ return fsl_stmt_bind_null( stmt, sqlite3_bind_parameter_index( stmt->stmt, |
︙ | ︙ | |||
15571 15572 15573 15574 15575 15576 15577 | ? sqlite3_column_text(stmt->stmt, ndx) : NULL; if(out) *out = (char const *)t; if(outLen){ int const x = sqlite3_column_bytes(stmt->stmt, ndx); *outLen = (x>0) ? (fsl_size_t)x : 0; } | | | | 15886 15887 15888 15889 15890 15891 15892 15893 15894 15895 15896 15897 15898 15899 15900 15901 15902 15903 15904 15905 15906 15907 15908 15909 15910 15911 15912 15913 15914 15915 15916 15917 15918 | ? sqlite3_column_text(stmt->stmt, ndx) : NULL; if(out) *out = (char const *)t; if(outLen){ int const x = sqlite3_column_bytes(stmt->stmt, ndx); *outLen = (x>0) ? (fsl_size_t)x : 0; } return t ? 0 : fsl__db_errcode(stmt->db, 0); } } int fsl_stmt_get_blob( fsl_stmt * const stmt, int ndx, void const **out, fsl_size_t * outLen ){ GET_CHECK { void const * t = (out || outLen) ? sqlite3_column_blob(stmt->stmt, ndx) : NULL; if(out) *out = t; if(outLen){ if(!t) *outLen = 0; else{ int sz = sqlite3_column_bytes(stmt->stmt, ndx); *outLen = (sz>=0) ? (fsl_size_t)sz : 0; } } return t ? 0 : fsl__db_errcode(stmt->db, 0); } } #undef GET_CHECK fsl_id_t fsl_stmt_g_id( fsl_stmt * const stmt, int index ){ fsl_id_t rv = -1; |
︙ | ︙ | |||
15625 15626 15627 15628 15629 15630 15631 | char const * rv = NULL; fsl_stmt_get_text(stmt, index, &rv, outLen); return rv; } /** | | | | < < < < < < < < < | < < | < < < < < < < < < < < < < < < < < < | < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < | | < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | < < < < < < < < < < < < < < < < < | < < | < < | < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < | < < < < | < < | < < | < < < < | < < < < < < < < < < < < < < < < < | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < | < | < < < | | | | | | | | | | < | 15940 15941 15942 15943 15944 15945 15946 15947 15948 15949 15950 15951 15952 15953 15954 15955 15956 15957 15958 15959 15960 15961 15962 15963 15964 15965 15966 15967 15968 15969 15970 15971 15972 15973 15974 15975 15976 15977 15978 15979 15980 15981 15982 15983 15984 15985 15986 15987 15988 15989 15990 15991 15992 15993 15994 15995 15996 15997 15998 15999 16000 16001 16002 16003 16004 16005 16006 16007 16008 16009 16010 16011 16012 16013 16014 16015 16016 16017 16018 16019 16020 16021 16022 16023 16024 16025 16026 16027 16028 16029 16030 16031 16032 16033 16034 16035 16036 16037 16038 16039 16040 16041 16042 16043 | char const * rv = NULL; fsl_stmt_get_text(stmt, index, &rv, outLen); return rv; } /** This sqlite3_trace_v2() callback outputs tracing info using fsl_fprintf((FILE*)c,...). Defaults to stdout if c is NULL. */ static int fsl__db_sq3TraceV2(unsigned t,void*c,void*p,void*x){ static unsigned int counter = 0; if(c ||p){/*unused*/} switch(t){ case SQLITE_TRACE_STMT:{ char const * zSql = (char const *)x; char * zExp = zSql ? sqlite3_expanded_sql((sqlite3_stmt*)p) : NULL; fsl_fprintf(c ? (FILE*)c : stdout, "SQL TRACE #%u: %s\n", ++counter, zExp ? zExp : (zSql ? zSql : "(NO SQL?)")); sqlite3_free(zExp); break; } default: break; } return 0; } fsl_db * fsl_db_malloc(){ fsl_db * rc = (fsl_db *)fsl_malloc(sizeof(fsl_db)); if(rc){ *rc = fsl_db_empty; rc->allocStamp = &fsl_db_empty; } return rc; } fsl_stmt * fsl_stmt_malloc(){ fsl_stmt * rc = (fsl_stmt *)fsl_malloc(sizeof(fsl_stmt)); if(rc){ *rc = fsl_stmt_empty; rc->allocStamp = &fsl_stmt_empty; } return rc; } /** Callback for use with sqlite3_commit_hook(). The argument must be a (fsl_db*). This function returns 0 only if it surmises that fsl_db_transaction_end() triggered the COMMIT. On error it might assert() or abort() the application, so this really is just a sanity check for something which "must not happen." */ static int fsl_db_verify_begin_was_not_called(void * db_fsl){ fsl_db * const db = (fsl_db *)db_fsl; assert(db && "What else could it be?"); assert(db->dbh && "Else we can't have been called by sqlite3, could we have?"); if(db->beginCount>0){ fsl__fatal(FSL_RC_MISUSE,"SQL: COMMIT was called from " "outside of fsl_db_transaction_end() while a " "fsl_db_transaction_begin()-started transaction " "is pending."); return 2; } return 0; } int fsl_db_open( fsl_db * const db, char const * dbFile, int openFlags ){ int rc; fsl_dbh_t * dbh = NULL; int isMem = 0; if(!db || !dbFile) return FSL_RC_MISUSE; else if(db->dbh) return FSL_RC_MISUSE; else if(!(isMem = (!*dbFile || 0==fsl_strcmp(":memory:", dbFile))) && !(FSL_OPEN_F_CREATE & openFlags) && fsl_file_access(dbFile, 0)){ return fsl_error_set(&db->error, FSL_RC_NOT_FOUND, "DB file not found: %s", dbFile); } else{ int sOpenFlags = 0; if(FSL_OPEN_F_RO & openFlags){ sOpenFlags |= SQLITE_OPEN_READONLY; }else{ if(FSL_OPEN_F_RW & openFlags){ sOpenFlags |= SQLITE_OPEN_READWRITE; } if(FSL_OPEN_F_CREATE & openFlags){ sOpenFlags |= SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE; } if(!sOpenFlags) sOpenFlags = SQLITE_OPEN_READONLY; } rc = sqlite3_open_v2( dbFile, &dbh, sOpenFlags, NULL ); if(rc){ if(dbh){ /* By some complete coincidence, FSL_RC_DB==SQLITE_CANTOPEN. */ rc = fsl_error_set(&db->error, FSL_RC_DB, "Opening db file [%s] failed with " |
︙ | ︙ | |||
16183 16184 16185 16186 16187 16188 16189 | goto end; }else if(!db->filename){ rc = FSL_RC_OOM; goto end; } } db->dbh = dbh; | < < < < < < < < < < < < < < | < < | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < > > > > > > > > > > | > | | | > | > | < | > > | > > | | | > > | > | | | 16071 16072 16073 16074 16075 16076 16077 16078 16079 16080 16081 16082 16083 16084 16085 16086 16087 16088 16089 16090 16091 16092 16093 16094 16095 16096 16097 16098 16099 16100 16101 16102 16103 16104 16105 16106 16107 16108 16109 16110 16111 16112 16113 16114 16115 16116 16117 16118 16119 16120 16121 16122 16123 16124 16125 16126 16127 16128 16129 16130 16131 16132 16133 16134 16135 16136 16137 16138 16139 16140 16141 16142 16143 16144 16145 16146 16147 16148 16149 16150 16151 16152 16153 16154 16155 16156 16157 16158 16159 16160 16161 16162 16163 16164 16165 16166 16167 16168 16169 16170 16171 16172 16173 16174 16175 16176 16177 16178 16179 16180 16181 16182 16183 16184 16185 16186 16187 16188 16189 16190 16191 16192 16193 16194 16195 16196 16197 16198 16199 16200 16201 16202 16203 16204 16205 16206 16207 16208 16209 | goto end; }else if(!db->filename){ rc = FSL_RC_OOM; goto end; } } db->dbh = dbh; sqlite3_extended_result_codes(dbh, 1); sqlite3_commit_hook(dbh, fsl_db_verify_begin_was_not_called, db); if(FSL_OPEN_F_TRACE_SQL & openFlags){ fsl_db_sqltrace_enable(db, stdout); } } end: if(rc){ #if 1 /* This is arguable... */ if(db->f && db->error.code && !db->f->error.code){ /* COPY db's error state as f's. */ fsl_error_copy( &db->error, &db->f->error ); } #endif if(dbh){ sqlite3_close(dbh); db->dbh = NULL; } }else{ assert(db->dbh); } return rc; } static int fsl__db_err_not_opened(fsl_db * const db){ return fsl_error_set(&db->error, FSL_RC_MISUSE, "DB is not opened."); } static int fsl__db_err_sql_empty(fsl_db * const db){ return fsl_error_set(&db->error, FSL_RC_MISUSE, "Empty SQL is not permitted."); } int fsl_db_exec_multiv( fsl_db * const db, const char * sql, va_list args){ if(!db->dbh) return fsl__db_err_not_opened(db); else if(!sql || !*sql) return fsl__db_err_sql_empty(db); else{ fsl_buffer buf = fsl_buffer_empty; int rc = 0; char const * z; char const * zEnd = NULL; rc = fsl_buffer_appendfv( &buf, sql, args ); if(rc){ fsl_buffer_clear(&buf); return rc; } z = fsl_buffer_cstr(&buf); while( (SQLITE_OK==rc) && *z ){ fsl_stmt_t * pStmt = NULL; rc = sqlite3_prepare_v2(db->dbh, z, buf.used, &pStmt, &zEnd); if( SQLITE_OK != rc ){ rc = fsl__db_errcode(db, rc); break; } if(pStmt){ while( SQLITE_ROW == sqlite3_step(pStmt) ){} rc = sqlite3_finalize(pStmt); if(rc) rc = fsl__db_errcode(db, rc); } buf.used -= (zEnd-z); z = zEnd; } fsl_buffer_reserve(&buf, 0); return rc; } } int fsl_db_exec_multi( fsl_db * const db, const char * sql, ...){ if(!db->dbh) return fsl__db_err_not_opened(db); else if(!sql || !*sql) return fsl__db_err_sql_empty(db); else{ int rc; va_list args; va_start(args,sql); rc = fsl_db_exec_multiv( db, sql, args ); va_end(args); return rc; } } int fsl_db_execv( fsl_db * const db, const char * sql, va_list args){ if(!db->dbh) return fsl__db_err_not_opened(db); else if(!sql || !*sql) return fsl__db_err_sql_empty(db); else{ fsl_stmt st = fsl_stmt_empty; int rc = 0; rc = fsl_db_preparev( db, &st, sql, args ); if(0==rc){ //while(FSL_RC_STEP_ROW == (rc=fsl_stmt_step(&st))){} //^^^ why did we historically do this instead of: rc = fsl_stmt_step( &st ); fsl_stmt_finalize(&st); } switch(rc){ case FSL_RC_STEP_DONE: case FSL_RC_STEP_ROW: rc = 0; break; default: break; } return rc; } } int fsl_db_exec( fsl_db * const db, const char * sql, ...){ if(!db->dbh) return fsl__db_err_not_opened(db); else if(!sql || !*sql) return fsl__db_err_sql_empty(db); else{ int rc; va_list args; va_start(args,sql); rc = fsl_db_execv( db, sql, args ); va_end(args); return rc; } } int fsl_db_changes_recent(fsl_db * const db){ return db->dbh ? sqlite3_changes(db->dbh) : 0; } int fsl_db_changes_total(fsl_db * const db){ return db->dbh ? sqlite3_total_changes(db->dbh) : 0; } /** Sets db->priorChanges to sqlite3_total_changes(db->dbh). */ |
︙ | ︙ | |||
16412 16413 16414 16415 16416 16417 16418 | } int fsl_db_transaction_level(fsl_db * const db){ return db->doRollback ? -db->beginCount : db->beginCount; } int fsl_db_transaction_commit(fsl_db * const db){ | | | | > | | > | > > | | | | | | | | | | | | | | | | | | | | | | | | | | > > > > > > > > > > > > > > > > > > > > > > | 16227 16228 16229 16230 16231 16232 16233 16234 16235 16236 16237 16238 16239 16240 16241 16242 16243 16244 16245 16246 16247 16248 16249 16250 16251 16252 16253 16254 16255 16256 16257 16258 16259 16260 16261 16262 16263 16264 16265 16266 16267 16268 16269 16270 16271 16272 16273 16274 16275 16276 16277 16278 16279 16280 16281 16282 16283 16284 16285 16286 16287 16288 16289 16290 16291 16292 16293 16294 16295 16296 16297 16298 16299 16300 16301 16302 16303 16304 16305 16306 16307 16308 16309 16310 16311 16312 16313 16314 16315 16316 16317 16318 16319 16320 16321 16322 16323 16324 16325 16326 16327 16328 16329 16330 16331 16332 | } int fsl_db_transaction_level(fsl_db * const db){ return db->doRollback ? -db->beginCount : db->beginCount; } int fsl_db_transaction_commit(fsl_db * const db){ return db->dbh ? fsl_db_transaction_end(db, 0) : FSL_RC_MISUSE; } int fsl_db_transaction_rollback(fsl_db * const db){ return db->dbh ? fsl_db_transaction_end(db, 1) : FSL_RC_MISUSE; } int fsl_db_rollback_force( fsl_db * const db ){ if(!db->dbh){ return fsl__db_err_not_opened(db); }else{ int rc; db->beginCount = 0; fsl_db_cleanup_beforeCommit(db); rc = fsl_db_exec(db, "ROLLBACK"); fsl_db_reset_change_count(db); return rc; } } int fsl_db_transaction_end(fsl_db * const db, bool doRollback){ int rc = 0; if(!db->dbh){ return fsl__db_err_not_opened(db); }else if (db->beginCount<=0){ return fsl_error_set(&db->error, FSL_RC_RANGE, "No transaction is active."); } if(doRollback) ++db->doRollback /* ACHTUNG: note that db->dbRollback is set before continuing so that if we return due to a non-0 beginCount that the rollback flag propagates through the transaction's stack. */; if(--db->beginCount > 0) return 0; assert(0==db->beginCount && "The commit-hook check relies on this."); assert(db->doRollback>=0); int const changeCount = sqlite3_total_changes(db->dbh) - db->priorChanges; if(0==db->doRollback){ if(changeCount>0){ /* Execute before-commit hooks and leaf checks */ fsl_size_t x = 0; for( ; !rc && (x < db->beforeCommit.used); ++x ){ char const * sql = (char const *)db->beforeCommit.list[x]; /* MARKER(("Running before-commit code: [%s]\n", sql)); */ if(sql) rc = fsl_db_exec_multi( db, "%s", sql ); } if(!rc && db->f && (FSL_DBROLE_REPO & db->role)){ /* i don't like this one bit - this is low-level SCM functionality in an otherwise generic routine. Maybe we need fsl_cx_transaction_begin/end() instead. Much later: we have that routine now but will need to replace all relevant calls to fsl_db_transaction_begin()/end() with those routines before we can consider moving this there. */ rc = fsl__repo_leafdo_pending_checks(db->f); if(!rc && db->f->cache.toVerify.used){ rc = fsl__repo_verify_at_commit(db->f); }else{ fsl_repo_verify_cancel(db->f); } } db->doRollback = rc ? 1 : 0; } } if(db->doRollback && db->f && changeCount>0){ /** If a rollback is underway (from a transaction in which data was written), certain fsl_cx caches might be referring to record IDs which were injected as part of the being-rolled-back transaction. The only(?) reasonably sane way to deal with that is to flush all relevant caches. It is unfortunate that this bit is in the db class, as opposed to the fsl_cx class, but we currently have no hook which would allow us to trigger this from that class. */ #if 1 fsl__bccache_reset(&db->f->cache.blobContent); fsl__cx_mcache_clear(db->f); #else /* This one resets all of ^^^ plus certain repo-side config settings, but it's not yet clear whether that they will be reloaded when needed. */ fsl__cx_clear_repo_caches(d->f); #endif } fsl_db_cleanup_beforeCommit(db); fsl_db_reset_change_count(db); rc = fsl_db_exec(db, db->doRollback ? "ROLLBACK" : "COMMIT"); db->doRollback = 0; return rc; #if 0 |
︙ | ︙ | |||
16552 16553 16554 16555 16556 16557 16558 | va_list args; va_start(args,sql); rc = fsl_db_get_int32v(db, rv, sql, args); va_end(args); return rc; } | | | 16393 16394 16395 16396 16397 16398 16399 16400 16401 16402 16403 16404 16405 16406 16407 | va_list args; va_start(args,sql); rc = fsl_db_get_int32v(db, rv, sql, args); va_end(args); return rc; } int fsl_db_get_int64v( fsl_db * const db, int64_t * rv, char const * sql, va_list args){ if(!db || !db->dbh || !rv || !sql || !*sql) return FSL_RC_MISUSE; else{ fsl_stmt st = fsl_stmt_empty; int rc = 0; rc = fsl_db_preparev( db, &st, sql, args ); if(rc) return rc; |
︙ | ︙ | |||
16577 16578 16579 16580 16581 16582 16583 | break; } fsl_stmt_finalize(&st); return rc; } } | | | < | | | 16418 16419 16420 16421 16422 16423 16424 16425 16426 16427 16428 16429 16430 16431 16432 16433 16434 16435 16436 16437 16438 16439 16440 16441 16442 16443 16444 16445 16446 16447 16448 16449 16450 16451 16452 16453 16454 16455 16456 16457 16458 16459 16460 16461 16462 16463 16464 16465 16466 16467 16468 16469 16470 16471 16472 16473 16474 16475 16476 16477 16478 | break; } fsl_stmt_finalize(&st); return rc; } } int fsl_db_get_int64( fsl_db * const db, int64_t * rv, char const * sql, ... ){ int rc; va_list args; va_start(args,sql); rc = fsl_db_get_int64v(db, rv, sql, args); va_end(args); return rc; } int fsl_db_get_idv( fsl_db * const db, fsl_id_t * rv, char const * sql, va_list args){ if(!db || !db->dbh || !rv || !sql || !*sql) return FSL_RC_MISUSE; else{ fsl_stmt st = fsl_stmt_empty; int rc = 0; rc = fsl_db_preparev( db, &st, sql, args ); if(rc) return rc; rc = fsl_stmt_step( &st ); switch(rc){ case FSL_RC_STEP_ROW: *rv = (fsl_id_t)sqlite3_column_int64(st.stmt, 0); /* Fall through */ case FSL_RC_STEP_DONE: rc = 0; break; default: break; } fsl_stmt_finalize(&st); return rc; } } int fsl_db_get_id( fsl_db * const db, fsl_id_t * rv, char const * sql, ... ){ int rc; va_list args; va_start(args,sql); rc = fsl_db_get_idv(db, rv, sql, args); va_end(args); return rc; } int fsl_db_get_sizev( fsl_db * const db, fsl_size_t * rv, char const * sql, va_list args){ if(!db || !db->dbh || !rv || !sql || !*sql) return FSL_RC_MISUSE; else{ fsl_stmt st = fsl_stmt_empty; int rc = 0; rc = fsl_db_preparev( db, &st, sql, args ); if(rc) return rc; |
︙ | ︙ | |||
16656 16657 16658 16659 16660 16661 16662 | break; } fsl_stmt_finalize(&st); return rc; } } | | | | 16496 16497 16498 16499 16500 16501 16502 16503 16504 16505 16506 16507 16508 16509 16510 16511 16512 16513 16514 16515 16516 16517 16518 16519 16520 16521 | break; } fsl_stmt_finalize(&st); return rc; } } int fsl_db_get_size( fsl_db * const db, fsl_size_t * rv, char const * sql, ... ){ int rc; va_list args; va_start(args,sql); rc = fsl_db_get_sizev(db, rv, sql, args); va_end(args); return rc; } int fsl_db_get_doublev( fsl_db * const db, double * rv, char const * sql, va_list args){ if(!db || !db->dbh || !rv || !sql || !*sql) return FSL_RC_MISUSE; else{ fsl_stmt st = fsl_stmt_empty; int rc = 0; rc = fsl_db_preparev( db, &st, sql, args ); if(rc) return rc; |
︙ | ︙ | |||
16692 16693 16694 16695 16696 16697 16698 | break; } fsl_stmt_finalize(&st); return rc; } } | | | | 16532 16533 16534 16535 16536 16537 16538 16539 16540 16541 16542 16543 16544 16545 16546 16547 16548 16549 16550 16551 16552 16553 16554 16555 16556 16557 16558 | break; } fsl_stmt_finalize(&st); return rc; } } int fsl_db_get_double( fsl_db * const db, double * rv, char const * sql, ... ){ int rc; va_list args; va_start(args,sql); rc = fsl_db_get_doublev(db, rv, sql, args); va_end(args); return rc; } int fsl_db_get_textv( fsl_db * const db, char ** rv, fsl_size_t *rvLen, char const * sql, va_list args){ if(!db || !db->dbh || !rv || !sql || !*sql) return FSL_RC_MISUSE; else{ fsl_stmt st = fsl_stmt_empty; int rc = 0; rc = fsl_db_preparev( db, &st, sql, args ); |
︙ | ︙ | |||
16747 16748 16749 16750 16751 16752 16753 | break; } fsl_stmt_finalize(&st); return rc; } } | | | | 16587 16588 16589 16590 16591 16592 16593 16594 16595 16596 16597 16598 16599 16600 16601 16602 16603 16604 16605 16606 16607 16608 16609 16610 16611 16612 | break; } fsl_stmt_finalize(&st); return rc; } } int fsl_db_get_text( fsl_db * const db, char ** rv, fsl_size_t * rvLen, char const * sql, ... ){ int rc; va_list args; va_start(args,sql); rc = fsl_db_get_textv(db, rv, rvLen, sql, args); va_end(args); return rc; } int fsl_db_get_blobv( fsl_db * const db, void ** rv, fsl_size_t *rvLen, char const * sql, va_list args){ if(!db || !db->dbh || !rv || !sql || !*sql) return FSL_RC_MISUSE; else{ fsl_stmt st = fsl_stmt_empty; int rc = 0; rc = fsl_db_preparev( db, &st, sql, args ); |
︙ | ︙ | |||
16799 16800 16801 16802 16803 16804 16805 | break; } fsl_stmt_finalize(&st); return rc; } } | | | | > > > | | | > < | | | | | | | | | | | 16639 16640 16641 16642 16643 16644 16645 16646 16647 16648 16649 16650 16651 16652 16653 16654 16655 16656 16657 16658 16659 16660 16661 16662 16663 16664 16665 16666 16667 16668 16669 16670 16671 16672 16673 16674 16675 16676 16677 16678 16679 16680 16681 16682 16683 16684 16685 16686 16687 16688 16689 16690 16691 16692 16693 16694 16695 16696 16697 16698 16699 16700 16701 16702 16703 16704 16705 16706 16707 16708 16709 16710 16711 16712 16713 16714 16715 16716 16717 16718 16719 16720 16721 16722 16723 16724 16725 16726 16727 16728 16729 16730 16731 16732 16733 16734 16735 16736 16737 16738 16739 16740 16741 16742 16743 16744 16745 16746 16747 16748 16749 16750 16751 16752 16753 16754 16755 16756 16757 16758 16759 16760 16761 16762 16763 16764 16765 16766 16767 16768 16769 16770 16771 16772 16773 16774 16775 16776 16777 16778 16779 16780 16781 16782 16783 16784 16785 16786 16787 16788 16789 16790 16791 16792 16793 16794 16795 16796 16797 | break; } fsl_stmt_finalize(&st); return rc; } } int fsl_db_get_blob( fsl_db * const db, void ** rv, fsl_size_t * rvLen, char const * sql, ... ){ int rc; va_list args; va_start(args,sql); rc = fsl_db_get_blobv(db, rv, rvLen, sql, args); va_end(args); return rc; } int fsl_db_get_bufferv( fsl_db * const db, fsl_buffer * const b, bool asBlob, char const * sql, va_list args){ if(!db || !db->dbh || !b || !sql || !*sql) return FSL_RC_MISUSE; else{ fsl_stmt st = fsl_stmt_empty; int rc = 0; rc = fsl_db_preparev( db, &st, sql, args ); if(rc) return rc; rc = fsl_stmt_step( &st ); switch(rc){ case FSL_RC_STEP_ROW:{ void const * str = asBlob ? sqlite3_column_blob(st.stmt, 0) : (void const *)sqlite3_column_text(st.stmt, 0); int const len = sqlite3_column_bytes(st.stmt,0); if(len && !str){ rc = FSL_RC_OOM; }else{ rc = 0; b->used = 0; rc = fsl_buffer_append( b, str, len ); } break; } case FSL_RC_STEP_DONE: rc = 0; break; default: break; } fsl_stmt_finalize(&st); return rc; } } int fsl_db_get_buffer( fsl_db * const db, fsl_buffer * const b, bool asBlob, char const * sql, ... ){ int rc; va_list args; va_start(args,sql); rc = fsl_db_get_bufferv(db, b, asBlob, sql, args); va_end(args); return rc; } int32_t fsl_db_g_int32( fsl_db * const db, int32_t dflt, char const * sql, ... ){ int32_t rv = dflt; va_list args; va_start(args,sql); fsl_db_get_int32v(db, &rv, sql, args); va_end(args); return rv; } int64_t fsl_db_g_int64( fsl_db * const db, int64_t dflt, char const * sql, ... ){ int64_t rv = dflt; va_list args; va_start(args,sql); fsl_db_get_int64v(db, &rv, sql, args); va_end(args); return rv; } fsl_id_t fsl_db_g_id( fsl_db * const db, fsl_id_t dflt, char const * sql, ... ){ fsl_id_t rv = dflt; va_list args; va_start(args,sql); fsl_db_get_idv(db, &rv, sql, args); va_end(args); return rv; } fsl_size_t fsl_db_g_size( fsl_db * const db, fsl_size_t dflt, char const * sql, ... ){ fsl_size_t rv = dflt; va_list args; va_start(args,sql); fsl_db_get_sizev(db, &rv, sql, args); va_end(args); return rv; } double fsl_db_g_double( fsl_db * const db, double dflt, char const * sql, ... ){ double rv = dflt; va_list args; va_start(args,sql); fsl_db_get_doublev(db, &rv, sql, args); va_end(args); return rv; } char * fsl_db_g_text( fsl_db * const db, fsl_size_t * len, char const * sql, ... ){ char * rv = NULL; va_list args; va_start(args,sql); fsl_db_get_textv(db, &rv, len, sql, args); va_end(args); return rv; } void * fsl_db_g_blob( fsl_db * const db, fsl_size_t * len, char const * sql, ... ){ void * rv = NULL; va_list args; va_start(args,sql); fsl_db_get_blob(db, &rv, len, sql, args); va_end(args); return rv; } double fsl_db_julian_now(fsl_db * const db){ double rc = -1.0; if(db && db->dbh){ /* TODO? use cached statement? So far not used often enough to justify it. */ fsl_db_get_double( db, &rc, "SELECT julianday('now')"); } return rc; } double fsl_db_string_to_julian(fsl_db * const db, char const * str){ double rc = -1.0; if(db && db->dbh){ /* TODO? use cached statement? So far not used often enough to justify it. */ fsl_db_get_double( db, &rc, "SELECT julianday(%Q)",str); } return rc; |
︙ | ︙ | |||
16978 16979 16980 16981 16982 16983 16984 | return rc; } bool fsl_db_table_exists(fsl_db * const db, fsl_dbrole_e whichDb, const char *zTable ){ | | | 16821 16822 16823 16824 16825 16826 16827 16828 16829 16830 16831 16832 16833 16834 16835 | return rc; } bool fsl_db_table_exists(fsl_db * const db, fsl_dbrole_e whichDb, const char *zTable ){ const char *zDb = fsl_db_role_name( whichDb ); int rc = db->dbh ? sqlite3_table_column_metadata(db->dbh, zDb, zTable, 0, 0, 0, 0, 0, 0) : !SQLITE_OK; return rc==SQLITE_OK ? true : false; } |
︙ | ︙ | |||
17005 17006 17007 17008 17009 17010 17011 | break; } } fsl_stmt_finalize(&q); return rv; } | | | | | > | 16848 16849 16850 16851 16852 16853 16854 16855 16856 16857 16858 16859 16860 16861 16862 16863 16864 16865 16866 16867 16868 16869 16870 16871 16872 16873 16874 16875 16876 16877 16878 16879 16880 16881 16882 | break; } } fsl_stmt_finalize(&q); return rv; } char * fsl_db_random_hex(fsl_db * const db, fsl_size_t n){ if(!db->dbh || !n) return NULL; else{ fsl_size_t rvLen = 0; char * rv = fsl_db_g_text(db, &rvLen, "SELECT lower(hex(" "randomblob(%"FSL_SIZE_T_PFMT")))", (fsl_size_t)(n/2+1)); if(rv){ assert(rvLen>=n); rv[n]=0; } return rv; } } int fsl_db_select_slistv( fsl_db * const db, fsl_list * const tgt, char const * fmt, va_list args ){ if(!db->dbh) return fsl__db_err_not_opened(db); else if(!fmt || !*fmt) return fsl__db_err_sql_empty(db); else if(!*fmt) return FSL_RC_RANGE; else{ int rc; fsl_stmt st = fsl_stmt_empty; fsl_size_t nlen; char const * n; char * cp; |
︙ | ︙ | |||
17048 17049 17050 17051 17052 17053 17054 | } } fsl_stmt_finalize(&st); return rc; } } | | | > | | 16892 16893 16894 16895 16896 16897 16898 16899 16900 16901 16902 16903 16904 16905 16906 16907 16908 16909 16910 16911 16912 16913 16914 16915 16916 16917 16918 16919 | } } fsl_stmt_finalize(&st); return rc; } } int fsl_db_select_slist( fsl_db * const db, fsl_list * const tgt, char const * fmt, ... ){ int rc; va_list va; va_start (va,fmt); rc = fsl_db_select_slistv(db, tgt, fmt, va); va_end(va); return rc; } void fsl_db_sqltrace_enable( fsl_db * const db, FILE * outStream ){ if(db->dbh){ sqlite3_trace_v2(db->dbh, SQLITE_TRACE_STMT, fsl__db_sq3TraceV2, outStream); } } int fsl_db_init( fsl_error * err, char const * zFilename, char const * zSchema, ... ){ |
︙ | ︙ | |||
17128 17129 17130 17131 17132 17133 17134 | } fsl_output(f, "\n", 1); return 0; } #undef MARKER | | | | | | | | < | < < < | < > > | 16973 16974 16975 16976 16977 16978 16979 16980 16981 16982 16983 16984 16985 16986 16987 16988 16989 16990 16991 16992 16993 16994 16995 16996 16997 16998 16999 17000 17001 | } fsl_output(f, "\n", 1); return 0; } #undef MARKER /* end of file ./src/db.c */ /* start of file ./src/deck.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /* This file houses the manifest/control-artifact-related APIs. */ #include <assert.h> #include <stdlib.h> /* qsort() */ #include <memory.h> /* memcmp() */ /* Only for debugging */ |
︙ | ︙ | |||
17174 17175 17176 17177 17178 17179 17180 | FSL_CARD_F_LIST_NEEDS_SORT = 0x01 }; /** Transfers the contents of d into f->cache.mcache. If d is dynamically allocated then it is also freed. In any case, after calling this the caller must behave as if the deck had been passed | | > | | 17016 17017 17018 17019 17020 17021 17022 17023 17024 17025 17026 17027 17028 17029 17030 17031 17032 17033 17034 17035 | FSL_CARD_F_LIST_NEEDS_SORT = 0x01 }; /** Transfers the contents of d into f->cache.mcache. If d is dynamically allocated then it is also freed. In any case, after calling this the caller must behave as if the deck had been passed to fsl_deck_finalize() and (if it is unknown whether d is stack allocated) also freed. If manifest caching is disabled for f, d is immediately finalized. */ static void fsl__cx_mcache_insert(fsl_cx * const f, fsl_deck * d){ if(!(f->flags & FSL_CX_F_MANIFEST_CACHE)){ fsl_deck_finalize(d); return; } static const unsigned cacheLen = (unsigned)(sizeof(fsl__mcache_empty.aAge) /sizeof(fsl__mcache_empty.aAge[0])); |
︙ | ︙ | |||
17214 17215 17216 17217 17218 17219 17220 | mc->decks[i] = *d; *d = fsl_deck_empty; if(&fsl_deck_empty == mc->decks[i].allocStamp){ /* d was fsl_deck_malloc()'d so we need to free it, but cannot send it through fsl_deck_finalize() because that would try to clean up the memory we just transferred ownership of to mc->decks[i]. So... */ | | | 17057 17058 17059 17060 17061 17062 17063 17064 17065 17066 17067 17068 17069 17070 17071 | mc->decks[i] = *d; *d = fsl_deck_empty; if(&fsl_deck_empty == mc->decks[i].allocStamp){ /* d was fsl_deck_malloc()'d so we need to free it, but cannot send it through fsl_deck_finalize() because that would try to clean up the memory we just transferred ownership of to mc->decks[i]. So... */ mc->decks[i].allocStamp = NULL; fsl_free(d); } d = pBaseline; } } /** |
︙ | ︙ | |||
17599 17600 17601 17602 17603 17604 17605 | static void fsl_deck_clean_T(fsl_deck * const m){ fsl_list_clear(&m->T, fsl_list_v_card_T_free, NULL); } static void fsl_deck_clean_U(fsl_deck * const m){ fsl_deck_clean_string(m, &m->U); } static void fsl_deck_clean_W(fsl_deck * const m){ | > | > > > | 17442 17443 17444 17445 17446 17447 17448 17449 17450 17451 17452 17453 17454 17455 17456 17457 17458 17459 17460 | static void fsl_deck_clean_T(fsl_deck * const m){ fsl_list_clear(&m->T, fsl_list_v_card_T_free, NULL); } static void fsl_deck_clean_U(fsl_deck * const m){ fsl_deck_clean_string(m, &m->U); } static void fsl_deck_clean_W(fsl_deck * const m){ if(m->W.capacity/*dynamically-allocated buffer*/){ CBUF(W); }else{/*empty or external buffer pointing into to m->content.mem*/ m->W = fsl_buffer_empty; } } void fsl_deck_clean2(fsl_deck * const m, fsl_buffer * const xferBuf){ if(!m) return; fsl_deck_clean_version(m); fsl_deck_clean_A(m); fsl_deck_clean_B(m); |
︙ | ︙ | |||
17898 17899 17900 17901 17902 17903 17904 | /** If fsl_card_is_legal(d->type, card), returns true, else updates d->f->error with a description of the constraint violation and returns 0. */ | | | 17745 17746 17747 17748 17749 17750 17751 17752 17753 17754 17755 17756 17757 17758 17759 | /** If fsl_card_is_legal(d->type, card), returns true, else updates d->f->error with a description of the constraint violation and returns 0. */ static bool fsl_deck_check_type( fsl_deck * const d, char card ){ if(fsl_card_is_legal(d->type, card)) return true; else{ fsl_cx_err_set(d->f, FSL_RC_TYPE, "Card type '%c' is not allowed " "in artifacts of type %s.", card, fsl_satype_cstr(d->type)); return false; |
︙ | ︙ | |||
18041 18042 18043 18044 18045 18046 18047 | int fsl_deck_I_set( fsl_deck * const mf, fsl_uuid_cstr uuid){ if(uuid && mf->H) return FSL_RC_SYNTAX; int const uLen = uuid ? fsl_is_uuid(uuid) : 0; return fsl_deck_sethex_impl(mf, uuid, 'I', uLen, &mf->I); } | | > | | | | > > > > > > > | 17888 17889 17890 17891 17892 17893 17894 17895 17896 17897 17898 17899 17900 17901 17902 17903 17904 17905 17906 17907 17908 17909 17910 17911 17912 17913 17914 17915 17916 17917 17918 17919 17920 17921 17922 17923 17924 17925 17926 17927 17928 17929 17930 17931 | int fsl_deck_I_set( fsl_deck * const mf, fsl_uuid_cstr uuid){ if(uuid && mf->H) return FSL_RC_SYNTAX; int const uLen = uuid ? fsl_is_uuid(uuid) : 0; return fsl_deck_sethex_impl(mf, uuid, 'I', uLen, &mf->I); } int fsl_deck_J_add( fsl_deck * const mf, bool isAppend, char const * field, char const * value){ if(!field) return FSL_RC_MISUSE; else if(!*field) return FSL_RC_SYNTAX; else if(!fsl_deck_check_type(mf,'J')) return mf->f->error.code; else{ int rc; fsl_card_J * cp = fsl_card_J_malloc(isAppend, field, value); if(!cp) rc = FSL_RC_OOM; else if( 0 != (rc = fsl_list_append(&mf->J, cp))){ fsl_card_J_free(cp); } return rc; } } int fsl_deck_K_set( fsl_deck * const mf, fsl_uuid_cstr uuid){ if(uuid){ int const uLen = fsl_is_uuid(uuid); return uLen ? fsl_deck_sethex_impl(mf, uuid, 'K', uLen, &mf->K) : FSL_RC_SYNTAX; }else{ char buf[FSL_STRLEN_SHA1+1]; unsigned char rnd[FSL_STRLEN_SHA1/20]; fsl_randomness(FSL_STRLEN_SHA1/2, rnd); fsl_sha1_digest_to_base16(rnd, buf); return fsl_deck_sethex_impl(mf, buf, 'K', FSL_STRLEN_SHA1, &mf->K); } } int fsl_deck_L_set( fsl_deck * const mf, char const * v, fsl_int_t n){ return mf ? fsl_deck_set_string(mf, 'L', &mf->L, v, n) : FSL_RC_SYNTAX; } |
︙ | ︙ | |||
18230 18231 18232 18233 18234 18235 18236 | }else if(!mf->F.used){ theHash = FSL_MD5_INITIAL_HASH; /* fall through and set hash */ }else{ int rc = 0; fsl_card_F const * fc; fsl_id_t fileRid; | | | 18085 18086 18087 18088 18089 18090 18091 18092 18093 18094 18095 18096 18097 18098 18099 | }else if(!mf->F.used){ theHash = FSL_MD5_INITIAL_HASH; /* fall through and set hash */ }else{ int rc = 0; fsl_card_F const * fc; fsl_id_t fileRid; fsl_buffer * const buf = &f->cache.fileContent; unsigned char digest[16]; fsl_md5_cx md5 = fsl_md5_cx_empty; enum { NumBufSize = 40 }; char numBuf[NumBufSize] = {0}; assert(!buf->used && "Misuse of f->fileContent buffer."); rc = fsl_deck_F_rewind(mf); if(rc) goto end; |
︙ | ︙ | |||
18388 18389 18390 18391 18392 18393 18394 | unsigned len = 0; for(; z[len]; ++len){ if(z[len] <= 32) return false; } return len>0; } | | | 18243 18244 18245 18246 18247 18248 18249 18250 18251 18252 18253 18254 18255 18256 18257 | unsigned len = 0; for(; z[len]; ++len){ if(z[len] <= 32) return false; } return len>0; } int fsl_deck_branch_set( fsl_deck * const d, char const * branchName ){ if(!fsl_is_valid_branchname(branchName)){ return fsl_cx_err_set(d->f, FSL_RC_RANGE, "Branch name contains " "invalid characters."); } int rc= fsl_deck_T_add(d, FSL_TAGTYPE_PROPAGATING, NULL, "branch", branchName); if(!rc){ |
︙ | ︙ | |||
18544 18545 18546 18547 18548 18549 18550 | if(rc){ fsl_card_F_list_pop(&mf->F); } return rc; } } | | | 18399 18400 18401 18402 18403 18404 18405 18406 18407 18408 18409 18410 18411 18412 18413 | if(rc){ fsl_card_F_list_pop(&mf->F); } return rc; } } int fsl_deck_F_foreach( fsl_deck * const d, fsl_card_F_visitor_f cb, void * const visitorState ){ if(!cb) return FSL_RC_MISUSE; else{ fsl_card_F const * fc; int rc = fsl_deck_F_rewind(d); while( !rc && !(rc=fsl_deck_F_next(d, &fc)) && fc) { rc = cb( fc, visitorState ); } |
︙ | ︙ | |||
18643 18644 18645 18646 18647 18648 18649 | return os->rc; } /** Internal helper for fsl_deck_output(). Appends formatted output to os->out() via fsl_output_f_mf(). Returns os->rc (0 on success). */ | | | | | | | | 18498 18499 18500 18501 18502 18503 18504 18505 18506 18507 18508 18509 18510 18511 18512 18513 18514 18515 18516 18517 18518 18519 18520 18521 18522 18523 18524 18525 18526 18527 18528 18529 18530 18531 18532 18533 18534 18535 18536 18537 18538 18539 18540 18541 18542 18543 18544 18545 18546 18547 18548 18549 18550 18551 18552 18553 18554 18555 18556 18557 18558 18559 18560 18561 18562 18563 18564 18565 18566 18567 18568 18569 18570 18571 18572 18573 | return os->rc; } /** Internal helper for fsl_deck_output(). Appends formatted output to os->out() via fsl_output_f_mf(). Returns os->rc (0 on success). */ static int fsl_deck_append( fsl_deck_out_state * const os, char const * fmt, ... ){ fsl_int_t rc; va_list args; assert(os); assert(fmt && *fmt); va_start(args,fmt); rc = fsl_appendfv( fsl_output_f_mf, os, fmt, args); va_end(args); if(rc<0 && !os->rc) os->rc = FSL_RC_IO; return os->rc; } /** Fossilizes (inp, inp+len] bytes to os->scratch, overwriting any existing contents. Updates and returns os->rc. */ static int fsl_deck_fossilize( fsl_deck_out_state * const os, unsigned char const * inp, fsl_int_t len){ fsl_buffer_reuse(os->scratch); return os->rc = len ? fsl_bytes_fossilize(inp, len, os->scratch) : 0; } /** Confirms that the given card letter is valid for od->d->type, and updates os->rc and os->error if it's not. Returns true if it's valid. */ static bool fsl_deck_out_tcheck(fsl_deck_out_state * const os, char letter){ if(!fsl_card_is_legal(os->d->type, letter)){ os->rc = fsl_error_set(&os->error, FSL_RC_TYPE, "%c-card is not valid for deck type %s.", letter, fsl_satype_cstr(os->d->type)); } return os->rc ? false : true; } /* Appends a UUID-valued card to os from os->d->{{card}} if the given UUID is not NULL, else this is a no-op. */ static int fsl_deck_out_uuid( fsl_deck_out_state * const os, char card, fsl_uuid_str uuid ){ if(uuid && fsl_deck_out_tcheck(os, card)){ if(!fsl_is_uuid(uuid)){ os->rc = fsl_error_set(&os->error, FSL_RC_RANGE, "Malformed UUID in %c card.", card); }else{ fsl_deck_append(os, "%c %s\n", card, uuid); } } return os->rc; } /* Appends the B card to os from os->d->B. */ static int fsl_deck_out_B( fsl_deck_out_state * const os ){ return fsl_deck_out_uuid(os, 'B', os->d->B.uuid); } /* Appends the A card to os from os->d->A. */ static int fsl_deck_out_A( fsl_deck_out_state * const os ){ if(os->d->A.name && fsl_deck_out_tcheck(os, 'A')){ if(!os->d->A.name || !*os->d->A.name){ os->rc = fsl_error_set(&os->error, FSL_RC_SYNTAX, "A-card is missing its name property"); }else if(!os->d->A.tgt || !*os->d->A.tgt){ os->rc = fsl_error_set(&os->error, FSL_RC_SYNTAX, |
︙ | ︙ | |||
18740 18741 18742 18743 18744 18745 18746 | /** Internal helper for outputing cards which are simple strings. str is the card to output (NULL values are ignored), letter is the card letter being output. If doFossilize is true then the output gets fossilize-formatted. */ | | | | | | 18595 18596 18597 18598 18599 18600 18601 18602 18603 18604 18605 18606 18607 18608 18609 18610 18611 18612 18613 18614 18615 18616 18617 18618 18619 18620 18621 18622 18623 18624 18625 18626 18627 18628 18629 18630 18631 18632 18633 18634 18635 18636 18637 18638 18639 18640 18641 18642 18643 18644 18645 18646 | /** Internal helper for outputing cards which are simple strings. str is the card to output (NULL values are ignored), letter is the card letter being output. If doFossilize is true then the output gets fossilize-formatted. */ static int fsl_deck_out_letter_str( fsl_deck_out_state * const os, char letter, char const * str, char doFossilize ){ if(str && fsl_deck_out_tcheck(os, letter)){ if(doFossilize){ fsl_deck_fossilize(os, (unsigned char const *)str, -1); if(!os->rc){ fsl_deck_append(os, "%c %b\n", letter, os->scratch); } }else{ fsl_deck_append(os, "%c %s\n", letter, str); } } return os->rc; } /* Appends the C card to os from os->d->C. */ static int fsl_deck_out_C( fsl_deck_out_state * const os ){ return fsl_deck_out_letter_str( os, 'C', os->d->C, 1 ); } /* Appends the D card to os from os->d->D. */ static int fsl_deck_out_D( fsl_deck_out_state * const os ){ if((os->d->D > 0.0) && fsl_deck_out_tcheck(os, 'D')){ char ds[24]; if(!fsl_julian_to_iso8601(os->d->D, ds, 1)){ os->rc = fsl_error_set(&os->error, FSL_RC_RANGE, "D-card contains invalid " "Julian Day value."); }else{ fsl_deck_append(os, "D %s\n", ds); } } return os->rc; } /* Appends the E card to os from os->d->E. */ static int fsl_deck_out_E( fsl_deck_out_state * const os ){ if(os->d->E.uuid && fsl_deck_out_tcheck(os, 'E')){ char ds[24]; char msPrecision = FSL_SATYPE_EVENT!=os->d->type /* The timestamps on Events historically have seconds precision, not ms. */; if(!fsl_is_uuid(os->d->E.uuid)){ |
︙ | ︙ | |||
18801 18802 18803 18804 18805 18806 18807 | fsl_deck_append(os, "E %s %s\n", ds, os->d->E.uuid); } } return os->rc; } /* Appends the G card to os from os->d->G. */ | | | | | 18656 18657 18658 18659 18660 18661 18662 18663 18664 18665 18666 18667 18668 18669 18670 18671 18672 18673 18674 18675 18676 18677 18678 18679 18680 18681 18682 18683 18684 | fsl_deck_append(os, "E %s %s\n", ds, os->d->E.uuid); } } return os->rc; } /* Appends the G card to os from os->d->G. */ static int fsl_deck_out_G( fsl_deck_out_state * const os ){ return fsl_deck_out_uuid(os, 'G', os->d->G); } /* Appends the H card to os from os->d->H. */ static int fsl_deck_out_H( fsl_deck_out_state * const os ){ if(os->d->H && os->d->I){ return os->rc = fsl_error_set(&os->error, FSL_RC_SYNTAX, "Forum post may not have both H- and I-cards."); } return fsl_deck_out_letter_str( os, 'H', os->d->H, 1 ); } /* Appends the I card to os from os->d->I. */ static int fsl_deck_out_I( fsl_deck_out_state * const os ){ if(os->d->I && os->d->H){ return os->rc = fsl_error_set(&os->error, FSL_RC_SYNTAX, "Forum post may not have both H- and I-cards."); } return fsl_deck_out_uuid(os, 'I', os->d->I); } |
︙ | ︙ | |||
18887 18888 18889 18890 18891 18892 18893 | if(!rc) rc = fsl_deck_append( os, " %b", os->scratch); } } if(!rc) fsl_output_f_mf(os, "\n", 1); return os->rc; } | | | | 18742 18743 18744 18745 18746 18747 18748 18749 18750 18751 18752 18753 18754 18755 18756 18757 18758 18759 18760 18761 18762 18763 18764 18765 18766 | if(!rc) rc = fsl_deck_append( os, " %b", os->scratch); } } if(!rc) fsl_output_f_mf(os, "\n", 1); return os->rc; } static int fsl_deck_out_list_obj( fsl_deck_out_state * const os, char letter, fsl_list const * li, fsl_list_visitor_f visitor){ if(li->used && fsl_deck_out_tcheck(os, letter)){ os->rc = fsl_list_visit( li, 0, visitor, os ); } return os->rc; } static int fsl_deck_out_F( fsl_deck_out_state * const os ){ if(os->d->F.used && fsl_deck_out_tcheck(os, 'F')){ uint32_t i; for(i=0; !os->rc && i <os->d->F.used; ++i){ os->rc = fsl_deck_out_F_one(os, F_at(&os->d->F, i)); } } return os->rc; |
︙ | ︙ | |||
18938 18939 18940 18941 18942 18943 18944 | } /** fsl_list_visitor_f() impl for outputing J cards. obj must be a (fsl_card_J *). */ static int fsl_list_v_mf_output_card_J(void * obj, void * visitorState ){ | | | | | | | | | 18793 18794 18795 18796 18797 18798 18799 18800 18801 18802 18803 18804 18805 18806 18807 18808 18809 18810 18811 18812 18813 18814 18815 18816 18817 18818 18819 18820 18821 18822 18823 18824 18825 18826 18827 18828 18829 18830 18831 18832 18833 18834 18835 18836 18837 18838 18839 18840 18841 18842 18843 18844 18845 18846 18847 18848 18849 18850 18851 18852 18853 18854 18855 18856 18857 18858 18859 18860 18861 18862 18863 18864 18865 18866 18867 18868 18869 18870 18871 18872 18873 18874 18875 18876 18877 18878 18879 | } /** fsl_list_visitor_f() impl for outputing J cards. obj must be a (fsl_card_J *). */ static int fsl_list_v_mf_output_card_J(void * obj, void * visitorState ){ fsl_deck_out_state * const os = (fsl_deck_out_state *)visitorState; fsl_card_J const * c = (fsl_card_J const *)obj; fsl_deck_fossilize( os, (unsigned char const *)c->field, -1 ); if(!os->rc){ fsl_deck_append(os, "J %s%b", c->append ? "+" : "", os->scratch); if(!os->rc){ if(c->value && *c->value){ fsl_deck_fossilize( os, (unsigned char const *)c->value, -1 ); if(!os->rc){ fsl_deck_append(os, " %b\n", os->scratch); } }else{ fsl_deck_append(os, "\n"); } } } return os->rc; } static int fsl_deck_out_J( fsl_deck_out_state * const os ){ return fsl_deck_out_list_obj(os, 'J', &os->d->J, fsl_list_v_mf_output_card_J); } /* Appends the K card to os from os->d->K. */ static int fsl_deck_out_K( fsl_deck_out_state * const os ){ if(os->d->K && fsl_deck_out_tcheck(os, 'K')){ if(!fsl_is_uuid(os->d->K)){ os->rc = fsl_error_set(&os->error, FSL_RC_RANGE, "Invalid UUID in K card."); } else{ fsl_deck_append(os, "K %s\n", os->d->K); } } return os->rc; } /* Appends the L card to os from os->d->L. */ static int fsl_deck_out_L( fsl_deck_out_state * const os ){ return fsl_deck_out_letter_str(os, 'L', os->d->L, 1); } /* Appends the N card to os from os->d->N. */ static int fsl_deck_out_N( fsl_deck_out_state * const os ){ return fsl_deck_out_letter_str( os, 'N', os->d->N, 1 ); } /** fsl_list_visitor_f() impl for outputing P cards. obj must be a (fsl_deck_out_state *) and obj->counter must be set to 0 before running the visit iteration. */ static int fsl_list_v_mf_output_card_P(void * obj, void * visitorState ){ fsl_deck_out_state * const os = (fsl_deck_out_state *)visitorState; char const * uuid = (char const *)obj; int const uLen = uuid ? fsl_is_uuid(uuid) : 0; if(!uLen){ os->rc = fsl_error_set(&os->error, FSL_RC_RANGE, "Invalid UUID in P card."); } else if(!os->counter++) fsl_output_f_mf(os, "P ", 2); else fsl_output_f_mf(os, " ", 1); /* Reminder: fsl_appendf_f_mf() updates os->rc. */ if(!os->rc){ fsl_output_f_mf(os, uuid, (fsl_size_t)uLen); } return os->rc; } static int fsl_deck_out_P( fsl_deck_out_state * const os ){ if(!fsl_deck_out_tcheck(os, 'P')) return os->rc; else if(os->d->P.used){ os->counter = 0; os->rc = fsl_list_visit( &os->d->P, 0, fsl_list_v_mf_output_card_P, os ); assert(os->counter); if(!os->rc) fsl_output_f_mf(os, "\n", 1); } |
︙ | ︙ | |||
19054 19055 19056 19057 19058 19059 19060 | assert(l); assert(r); if(!l) return r ? 1 : 0; else if(!r) return -1; else{ /* Lexical sorting must account for the +/- characters, and a '+' sorts before '-', which is why this next part may seem | | < | | 18909 18910 18911 18912 18913 18914 18915 18916 18917 18918 18919 18920 18921 18922 18923 18924 18925 18926 18927 18928 18929 18930 18931 18932 18933 18934 18935 18936 18937 | assert(l); assert(r); if(!l) return r ? 1 : 0; else if(!r) return -1; else{ /* Lexical sorting must account for the +/- characters, and a '+' sorts before '-', which is why this next part may seem backwards at first. */ assert(l->type); assert(r->type); if(l->type<0 && r->type>0) return 1; else if(l->type>0 && r->type<0) return -1; else return fsl_strcmp(l->target, r->target); } } /** fsl_list_visitor_f() impl for outputing Q cards. obj must be a (fsl_deck_out_state *). */ static int fsl_list_v_mf_output_card_Q(void * obj, void * visitorState ){ fsl_deck_out_state * const os = (fsl_deck_out_state *)visitorState; fsl_card_Q const * cp = (fsl_card_Q const *)obj; char const prefix = (cp->type==FSL_CHERRYPICK_ADD) ? '+' : '-'; assert(cp->type); assert(cp->target); if(cp->type != FSL_CHERRYPICK_ADD && cp->type != FSL_CHERRYPICK_BACKOUT){ |
︙ | ︙ | |||
19101 19102 19103 19104 19105 19106 19107 | } }else{ fsl_deck_append(os, "Q %c%s\n", prefix, cp->target); } return os->rc; } | | | | | 18955 18956 18957 18958 18959 18960 18961 18962 18963 18964 18965 18966 18967 18968 18969 18970 18971 18972 18973 18974 18975 18976 18977 18978 18979 18980 18981 18982 18983 18984 18985 18986 18987 18988 18989 18990 18991 18992 18993 18994 18995 18996 | } }else{ fsl_deck_append(os, "Q %c%s\n", prefix, cp->target); } return os->rc; } static int fsl_deck_out_Q( fsl_deck_out_state * const os ){ return fsl_deck_out_list_obj(os, 'Q', &os->d->Q, fsl_list_v_mf_output_card_Q); } /** Appends the R card from os->d->R to os. */ static int fsl_deck_out_R( fsl_deck_out_state * const os ){ if(os->d->R && fsl_deck_out_tcheck(os, 'R')){ if((FSL_STRLEN_MD5!=fsl_strlen(os->d->R)) || !fsl_validate16(os->d->R, FSL_STRLEN_MD5)){ os->rc = fsl_error_set(&os->error, FSL_RC_RANGE, "Malformed MD5 in R-card."); } else{ fsl_deck_append(os, "R %s\n", os->d->R); } } return os->rc; } /** fsl_list_visitor_f() impl for outputing T cards. obj must be a (fsl_deck_out_state *). */ static int fsl_list_v_mf_output_card_T(void * obj, void * visitorState ){ fsl_deck_out_state * const os = (fsl_deck_out_state *)visitorState; fsl_card_T * t = (fsl_card_T *)obj; char prefix = 0; switch(os->d->type){ case FSL_SATYPE_TECHNOTE: if( t->uuid ){ return os->rc = fsl_error_set(&os->error, FSL_RC_SYNTAX, "Non-self-referential T-card is not " |
︙ | ︙ | |||
19330 19331 19332 19333 19334 19335 19336 | } } return rc; } } /* Appends the T cards to os from os->d->T. */ | | | | | | | | | | | | | | | | 19184 19185 19186 19187 19188 19189 19190 19191 19192 19193 19194 19195 19196 19197 19198 19199 19200 19201 19202 19203 19204 19205 19206 19207 19208 19209 19210 19211 19212 19213 19214 19215 19216 19217 19218 19219 19220 19221 19222 19223 19224 19225 19226 19227 19228 19229 19230 19231 19232 19233 19234 19235 19236 19237 19238 19239 19240 19241 19242 19243 19244 19245 19246 19247 19248 19249 19250 19251 19252 19253 19254 19255 19256 19257 19258 19259 19260 19261 19262 19263 19264 19265 19266 19267 19268 19269 19270 19271 19272 19273 19274 19275 19276 19277 19278 19279 19280 19281 19282 19283 19284 19285 19286 19287 19288 19289 19290 19291 19292 19293 19294 19295 19296 19297 19298 19299 19300 19301 19302 19303 19304 19305 19306 19307 19308 19309 19310 19311 19312 19313 19314 19315 19316 19317 19318 19319 19320 19321 19322 19323 19324 19325 19326 19327 19328 19329 19330 19331 19332 19333 19334 19335 19336 19337 19338 19339 19340 19341 19342 19343 19344 19345 19346 19347 19348 19349 19350 19351 19352 19353 19354 19355 19356 19357 | } } return rc; } } /* Appends the T cards to os from os->d->T. */ static int fsl_deck_out_T( fsl_deck_out_state * const os ){ os->rc = fsl_deck_T_verify_order( os->d, &os->error); return os->rc ? os->rc : fsl_deck_out_list_obj(os, 'T', &os->d->T, fsl_list_v_mf_output_card_T); } /* Appends the U card to os from os->d->U. */ static int fsl_deck_out_U( fsl_deck_out_state * const os ){ return fsl_deck_out_letter_str(os, 'U', os->d->U, 1); } /* Appends the W card to os from os->d->W. */ static int fsl_deck_out_W( fsl_deck_out_state * const os ){ if(os->d->W.used && fsl_deck_out_tcheck(os, 'W')){ fsl_deck_append(os, "W %"FSL_SIZE_T_PFMT"\n%b\n", (fsl_size_t)os->d->W.used, &os->d->W ); } return os->rc; } /* Appends the Z card to os from os' accummulated md5 hash. */ static int fsl_deck_out_Z( fsl_deck_out_state * const os ){ unsigned char digest[16]; char md5[FSL_STRLEN_MD5+1]; fsl_md5_final(&os->md5, digest); fsl_md5_digest_to_base16(digest, md5); assert(!md5[32]); os->md5.isInit = 0 /* Keep further output from updating the MD5 */; return fsl_deck_append(os, "Z %.*s\n", FSL_STRLEN_MD5, md5); } static int qsort_cmp_strings( void const * lhs, void const * rhs ){ char const * l = *((char const **)lhs); char const * r = *((char const **)rhs); return fsl_strcmp(l,r); } static int fsl_list_v_mf_output_card_M(void * obj, void * visitorState ){ fsl_deck_out_state * const os = (fsl_deck_out_state *)visitorState; char const * m = (char const *)obj; return fsl_deck_append(os, "M %s\n", m); } static int fsl_deck_output_cluster( fsl_deck_out_state * const os ){ if(!os->d->M.used){ os->rc = fsl_error_set(&os->error, FSL_RC_RANGE, "M-card list may not be empty."); }else{ fsl_deck_out_list_obj(os, 'M', &os->d->M, fsl_list_v_mf_output_card_M); } return os->rc; } /* Helper for fsl_deck_output_CATYPE() */ #define DOUT(LETTER) rc = fsl_deck_out_##LETTER(os); \ if(rc || os->rc) return os->rc ? os->rc : rc static int fsl_deck_output_control( fsl_deck_out_state * const os ){ int rc; /* Reminder: cards must be output in strict lexical order. */ DOUT(D); DOUT(T); DOUT(U); return os->rc; } static int fsl_deck_output_event( fsl_deck_out_state * const os ){ int rc = 0; /* Reminder: cards must be output in strict lexical order. */ DOUT(C); DOUT(D); DOUT(E); DOUT(N); DOUT(P); DOUT(T); DOUT(U); DOUT(W); return os->rc; } static int fsl_deck_output_mf( fsl_deck_out_state * const os ){ int rc = 0; /* Reminder: cards must be output in strict lexical order. */ DOUT(B); DOUT(C); DOUT(D); DOUT(F); DOUT(K); DOUT(L); DOUT(N); DOUT(P); DOUT(Q); DOUT(R); DOUT(T); DOUT(U); DOUT(W); return os->rc; } static int fsl_deck_output_ticket( fsl_deck_out_state * const os ){ int rc; /* Reminder: cards must be output in strict lexical order. */ DOUT(D); DOUT(J); DOUT(K); DOUT(U); return os->rc; } static int fsl_deck_output_wiki( fsl_deck_out_state * const os ){ int rc; /* Reminder: cards must be output in strict lexical order. */ DOUT(C); DOUT(D); DOUT(L); DOUT(N); DOUT(P); DOUT(U); DOUT(W); return os->rc; } static int fsl_deck_output_attachment( fsl_deck_out_state * const os ){ int rc = 0; /* Reminder: cards must be output in strict lexical order. */ DOUT(A); DOUT(C); DOUT(D); DOUT(N); DOUT(U); return os->rc; } static int fsl_deck_output_forumpost( fsl_deck_out_state * const os ){ int rc; /* Reminder: cards must be output in strict lexical order. */ DOUT(D); DOUT(G); DOUT(H); DOUT(I); DOUT(N); DOUT(P); DOUT(U); DOUT(W); return os->rc; } /** Only for testing/debugging purposes, as it allows constructs which are not semantically legal and are CERTAINLY not legal to stuff in the database. */ static int fsl_deck_output_any( fsl_deck_out_state * const os ){ int rc = 0; /* Reminder: cards must be output in strict lexical order. */ DOUT(B); DOUT(C); DOUT(D); DOUT(E); DOUT(F); |
︙ | ︙ | |||
19513 19514 19515 19516 19517 19518 19519 | DOUT(W); return os->rc; } #undef DOUT | | | 19367 19368 19369 19370 19371 19372 19373 19374 19375 19376 19377 19378 19379 19380 19381 | DOUT(W); return os->rc; } #undef DOUT int fsl_deck_unshuffle( fsl_deck * const d, bool calculateRCard ){ fsl_list * li; int rc = 0; if(!d || !d->f) return FSL_RC_MISUSE; fsl_cx_err_reset(d->f); #define SORT(CARD,CMP) li = &d->CARD; fsl_list_sort(li, CMP) SORT(J,fsl__qsort_cmp_J_cards); SORT(M,qsort_cmp_strings); |
︙ | ︙ | |||
19555 19556 19557 19558 19559 19560 19561 | */; } } } return rc; } | | > > > > > | 19409 19410 19411 19412 19413 19414 19415 19416 19417 19418 19419 19420 19421 19422 19423 19424 19425 19426 19427 19428 19429 19430 19431 19432 19433 19434 19435 19436 19437 19438 19439 | */; } } } return rc; } int fsl_deck_output( fsl_deck * const d, fsl_output_f out, void * outputState ){ static const bool allowTypeAny = false /* Only enable for debugging/testing. Allows outputing decks of type FSL_SATYPE_ANY, which bypasses some validation checks and may trigger other validation assertions. And may allow you to inject garbage into the repo. So be careful. */; fsl_deck_out_state OS = fsl_deck_out_state_empty; fsl_deck_out_state * const os = &OS; fsl_cx * const f = d->f; int rc = 0; if(NULL==out && NULL==outputState && f){ out = f->output.out; outputState = f->output.state; } if(!f || !out) return FSL_RC_MISUSE; else if(FSL_SATYPE_ANY==d->type){ if(!allowTypeAny){ return fsl_cx_err_set(d->f, FSL_RC_TYPE, "Artifact type ANY cannot be" "output unless it is enabled in this " "code (it's dangerous)."); |
︙ | ︙ | |||
19657 19658 19659 19660 19661 19662 19663 | /** Adds a record in the pending_xlink temp table, to be processed when crosslinking is completed. Returns 0 on success, non-0 for db error. */ static int fsl__deck_crosslink_add_pending(fsl_cx * f, char cType, fsl_uuid_cstr uuid){ | < | < < | 19516 19517 19518 19519 19520 19521 19522 19523 19524 19525 19526 19527 19528 19529 19530 19531 19532 19533 19534 | /** Adds a record in the pending_xlink temp table, to be processed when crosslinking is completed. Returns 0 on success, non-0 for db error. */ static int fsl__deck_crosslink_add_pending(fsl_cx * f, char cType, fsl_uuid_cstr uuid){ assert(f->cache.isCrosslinking); return fsl_cx_exec(f, "INSERT OR IGNORE INTO pending_xlink VALUES('%c%q')", cType, uuid); } /** @internal Add a single entry to the mlink table. Also add the filename to the filename table if it is not there already. Parameters: |
︙ | ︙ | |||
19974 19975 19976 19977 19978 19979 19980 | fc->perm = perms; return 0; }else{ return fsl_deck_F_add(d, zName, uuid, perms, priorName); } } | | | > > > > > | 19830 19831 19832 19833 19834 19835 19836 19837 19838 19839 19840 19841 19842 19843 19844 19845 19846 19847 19848 19849 19850 19851 19852 19853 19854 19855 19856 19857 19858 19859 19860 19861 19862 19863 19864 | fc->perm = perms; return 0; }else{ return fsl_deck_F_add(d, zName, uuid, perms, priorName); } } int fsl_deck_F_set_content( fsl_deck * const d, char const * zName, fsl_buffer const * const src, fsl_fileperm_e perm, char const * priorName){ fsl_uuid_str zHash = 0; fsl_id_t rid = 0; fsl_id_t prevRid = 0; int rc = 0; assert(d->f); if(d->rid>0){ return fsl_cx_err_set(d->f, FSL_RC_MISUSE, "%s() cannot be applied to a saved deck.", __func__); }else if(!fsl_cx_transaction_level(d->f)){ return fsl_cx_err_set(d->f, FSL_RC_MISUSE, "%s() requires that a transaction is active.", __func__); }else if(!fsl_is_simple_pathname(zName, true)){ return fsl_cx_err_set(d->f, FSL_RC_RANGE, "Filename is not valid for use as a repository " "entry: %s", zName); } rc = fsl_repo_blob_lookup(d->f, src, &rid, &zHash); if(rc && FSL_RC_NOT_FOUND!=rc) goto end; assert(zHash); if(!rid){ fsl_card_F const * fc; /* This is new content. Save it, then see if we have a previous version |
︙ | ︙ | |||
20727 20728 20729 20730 20731 20732 20733 20734 20735 20736 20737 20738 20739 20740 20741 20742 | } if(!rc && parentId){ rc = fsl__tag_propagate_all(d->f, parentId); } return rc; } /** Overrideable crosslink listener which updates the timeline for attachment records. */ static int fsl_deck_xlink_f_attachment(fsl_deck * const d, void * state){ if(FSL_SATYPE_ATTACHMENT!=d->type) return 0; int rc; fsl_db * const db = fsl_cx_db_repo(d->f); | > > > > > > > > > > > > > > > > > > | | | | | | | | | | | 20588 20589 20590 20591 20592 20593 20594 20595 20596 20597 20598 20599 20600 20601 20602 20603 20604 20605 20606 20607 20608 20609 20610 20611 20612 20613 20614 20615 20616 20617 20618 20619 20620 20621 20622 20623 20624 20625 20626 20627 20628 20629 20630 20631 20632 20633 20634 20635 20636 20637 20638 20639 20640 20641 20642 20643 20644 20645 20646 20647 20648 20649 20650 20651 20652 20653 20654 20655 20656 20657 20658 20659 20660 20661 20662 20663 20664 20665 20666 20667 20668 20669 20670 20671 20672 20673 20674 20675 20676 20677 20678 20679 20680 20681 20682 20683 20684 20685 20686 20687 20688 20689 20690 20691 20692 20693 20694 20695 | } if(!rc && parentId){ rc = fsl__tag_propagate_all(d->f, parentId); } return rc; } int fsl__call_xlink_listeners(fsl_deck * const d){ int rc = 0; fsl_xlinker * xl = NULL; fsl_cx_err_reset(d->f); for( fsl_size_t i = 0; !rc && (i < d->f->xlinkers.used); ++i ){ xl = d->f->xlinkers.list+i; rc = xl->f( d, xl->state ); } if(rc && !d->f->error.code){ assert(xl); rc = fsl_cx_err_set(d->f, rc, "Crosslink callback handler " "'%s' failed with code %d (%s) for " "artifact RID #%" FSL_ID_T_PFMT ".", xl->name, rc, fsl_rc_cstr(rc), d->rid); } return rc; } /** Overrideable crosslink listener which updates the timeline for attachment records. */ static int fsl_deck_xlink_f_attachment(fsl_deck * const d, void * state){ if(FSL_SATYPE_ATTACHMENT!=d->type) return 0; int rc; fsl_db * const db = fsl_cx_db_repo(d->f); fsl_buffer * const comment = fsl__cx_scratchpad(d->f); const bool isAdd = (d->A.src && *d->A.src) ? 1 : 0; char attachToType = 'w' /* Assume wiki until we know otherwise, keeping in mind that the d->A.tgt might not yet be in the blob table, in which case we are unable to know, for certain, what the target is. That only affects the timeline (event table), though, not the crosslinking of the attachment itself. */; assert(db); if(fsl_is_uuid(d->A.tgt)){ if( fsl_db_exists(db, "SELECT 1 FROM tag WHERE tagname='tkt-%q'", d->A.tgt)){ attachToType = 't' /* attach to a known ticket */; }else if( fsl_db_exists(db, "SELECT 1 FROM tag WHERE tagname='event-%q'", d->A.tgt)){ attachToType = 'e' /* attach to a known technote (event) */; } } if('w'==attachToType){ /* Attachment applies to a wiki page */ if(isAdd){ rc = fsl_buffer_appendf(comment, "Add attachment \"%h\" " "to wiki page [%h]", d->A.name, d->A.tgt); }else{ rc = fsl_buffer_appendf(comment, "Delete attachment \"%h\" " "from wiki page [%h]", d->A.name, d->A.tgt); } }else if('e' == attachToType){/*technote*/ if(isAdd){ rc = fsl_buffer_appendf(comment, "Add attachment [/artifact/%!S|%h] to " "tech note [/technote/%!S|%S]", d->A.src, d->A.name, d->A.tgt, d->A.tgt); }else{ rc = fsl_buffer_appendf(comment, "Delete attachment \"/artifact/%!S|%h\" " "from tech note [/technote/%!S|%S]", d->A.name, d->A.name, d->A.tgt, d->A.tgt); } }else{ /* Attachment applies to a ticket */ if(isAdd){ rc = fsl_buffer_appendf(comment, "Add attachment [/artifact/%!S|%h] " "to ticket [%!S|%S]", d->A.src, d->A.name, d->A.tgt, d->A.tgt); }else{ rc = fsl_buffer_appendf(comment, "Delete attachment \"%h\" " "from ticket [%!S|%S]", d->A.name, d->A.tgt, d->A.tgt); } } if(!rc){ rc = fsl_db_exec(db, "REPLACE INTO event(type,mtime,objid,user,comment)" "VALUES(" "'%c',%"FSL_JULIAN_T_PFMT",%"FSL_ID_T_PFMT"," "%Q,%B)", attachToType, d->D, d->rid, d->U, comment); } fsl__cx_scratchpad_yield(d->f, comment); return rc; } /** Overrideable crosslink listener which updates the timeline for checkin records. */ |
︙ | ︙ | |||
20869 20870 20871 20872 20873 20874 20875 | construct. Note that we are using a lot of historical code which hard-codes english-lanuage text and links which only work in fossil(1). i would prefer to farm this out to a crosslink callback, and provide a default implementation which more or less mimics fossil(1). */ int rc = 0; | | | 20748 20749 20750 20751 20752 20753 20754 20755 20756 20757 20758 20759 20760 20761 20762 | construct. Note that we are using a lot of historical code which hard-codes english-lanuage text and links which only work in fossil(1). i would prefer to farm this out to a crosslink callback, and provide a default implementation which more or less mimics fossil(1). */ int rc = 0; fsl_buffer * const comment = fsl__cx_scratchpad(d->f); fsl_size_t i; const char *zName; const char *zValue; const char *zUuid; int branchMove = 0; int const uuidLen = 8; fsl_card_T const * tag = NULL; |
︙ | ︙ | |||
20906 20907 20908 20909 20910 20911 20912 | That said, sorting by UUID would have a nice side-effect on the output of grouping tags by the UUID they tag. So far (201404) such groups of tags have not appeared in the wild because fossil(1) has no mechanism for creating them. */ for( i = 0; !rc && (i < li->used); ++i, prevTag = tag){ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20785 20786 20787 20788 20789 20790 20791 20792 20793 20794 20795 20796 20797 20798 20799 20800 20801 20802 20803 20804 20805 20806 20807 20808 20809 20810 20811 20812 20813 20814 20815 20816 20817 20818 20819 20820 20821 20822 20823 20824 20825 20826 20827 20828 20829 20830 20831 20832 20833 20834 20835 20836 20837 20838 20839 20840 20841 20842 20843 20844 20845 20846 20847 20848 20849 20850 20851 20852 20853 20854 20855 20856 20857 20858 20859 20860 20861 20862 20863 20864 20865 20866 20867 20868 20869 20870 20871 20872 20873 20874 20875 20876 20877 20878 20879 20880 20881 20882 20883 20884 20885 20886 20887 20888 20889 20890 20891 20892 20893 | That said, sorting by UUID would have a nice side-effect on the output of grouping tags by the UUID they tag. So far (201404) such groups of tags have not appeared in the wild because fossil(1) has no mechanism for creating them. */ for( i = 0; !rc && (i < li->used); ++i, prevTag = tag){ bool isProp = 0, isAdd = 0, isCancel = 0; tag = (fsl_card_T const *)li->list[i]; zUuid = tag->uuid; if(!zUuid /*tag on self*/) continue; if( i==0 || 0!=fsl_uuidcmp(tag->uuid, prevTag->uuid)){ rc = fsl_buffer_appendf(comment, " Edit [%.*s]:", uuidLen, zUuid); branchMove = 0; } if(rc) goto end; isProp = FSL_TAGTYPE_PROPAGATING==tag->type; isAdd = FSL_TAGTYPE_ADD==tag->type; isCancel = FSL_TAGTYPE_CANCEL==tag->type; assert(isProp || isAdd || isCancel); zName = tag->name; zValue = tag->value; if( isProp && 0==fsl_strcmp(zName, "branch")){ rc = fsl_buffer_appendf(comment, " Move to branch %s" "[/timeline?r=%h&nd&dp=%.*s | %h].", zValue, zValue, uuidLen, zUuid, zValue); branchMove = 1; }else if( isProp && fsl_strcmp(zName, "bgcolor")==0 ){ rc = fsl_buffer_appendf(comment, " Change branch background color to \"%h\".", zValue); }else if( isAdd && fsl_strcmp(zName, "bgcolor")==0 ){ rc = fsl_buffer_appendf(comment, " Change background color to \"%h\".", zValue); }else if( isCancel && fsl_strcmp(zName, "bgcolor")==0 ){ rc = fsl_buffer_appendf(comment, " Cancel background color."); }else if( isAdd && fsl_strcmp(zName, "comment")==0 ){ rc = fsl_buffer_appendf(comment, " Edit check-in comment."); }else if( isAdd && fsl_strcmp(zName, "user")==0 ){ rc = fsl_buffer_appendf(comment, " Change user to \"%h\".", zValue); }else if( isAdd && fsl_strcmp(zName, "date")==0 ){ rc = fsl_buffer_appendf(comment, " Timestamp %h.", zValue); }else if( isCancel && memcmp(zName, "sym-",4)==0 ){ if( !branchMove ){ rc = fsl_buffer_appendf(comment, " Cancel tag %h.", zName+4); } }else if( isProp && memcmp(zName, "sym-",4)==0 ){ if( !branchMove ){ rc = fsl_buffer_appendf(comment, " Add propagating tag \"%h\".", zName+4); } }else if( isAdd && memcmp(zName, "sym-",4)==0 ){ rc = fsl_buffer_appendf(comment, " Add tag \"%h\".", zName+4); }else if( isCancel && memcmp(zName, "sym-",4)==0 ){ rc = fsl_buffer_appendf(comment, " Cancel tag \"%h\".", zName+4); }else if( isAdd && fsl_strcmp(zName, "closed")==0 ){ rc = fsl_buffer_append(comment, " Marked \"Closed\"", -1); if( !rc && zValue && *zValue ){ rc = fsl_buffer_appendf(comment, " with note \"%h\"", zValue); } if(!rc) rc = fsl_buffer_append(comment, ".", 1); }else if( isCancel && fsl_strcmp(zName, "closed")==0 ){ rc = fsl_buffer_append(comment, " Removed the \"Closed\" mark", -1); if( !rc && zValue && *zValue ){ rc = fsl_buffer_appendf(comment, " with note \"%h\"", zValue); } if(!rc) rc = fsl_buffer_append(comment, ".", 1); }else { if( isCancel ){ rc = fsl_buffer_appendf(comment, " Cancel \"%h\"", zName); }else if( isAdd ){ rc = fsl_buffer_appendf(comment, " Add \"%h\"", zName); }else{ assert(isProp); rc = fsl_buffer_appendf(comment, " Add propagating \"%h\"", zName); } if(rc) goto end; if( zValue && zValue[0] ){ rc = fsl_buffer_appendf(comment, " with value \"%h\".", zValue); }else{ rc = fsl_buffer_append(comment, ".", 1); } } } /* foreach tag loop */ if(!rc){ /* TODO: cached statement */ rc = fsl_db_exec(db, "REPLACE INTO event" "(type,mtime,objid,user,comment) " "VALUES('g'," "%"FSL_JULIAN_T_PFMT"," "%"FSL_ID_T_PFMT"," "%Q,%Q)", mtime, d->rid, d->U, (comment->used>1) ? (fsl_buffer_cstr(comment) +1/*leading space on all entries*/) : NULL); } end: fsl__cx_scratchpad_yield(d->f, comment); return rc; } static int fsl_deck_xlink_f_forum(fsl_deck * const d, void * state){ if(FSL_SATYPE_FORUMPOST!=d->type) return 0; int rc = 0; |
︙ | ︙ | |||
21198 21199 21200 21201 21202 21203 21204 | to do all updates to the event (timeline) table via these crosslinkers and perform the core, UI-agnostic, crosslinking bits in the internal fsl__deck_crosslink_XXX() functions. That should allow clients to override how the timeline is updated without requiring them to understand the rest of the required schema updates. */ | | | 21077 21078 21079 21080 21081 21082 21083 21084 21085 21086 21087 21088 21089 21090 21091 | to do all updates to the event (timeline) table via these crosslinkers and perform the core, UI-agnostic, crosslinking bits in the internal fsl__deck_crosslink_XXX() functions. That should allow clients to override how the timeline is updated without requiring them to understand the rest of the required schema updates. */ int fsl__cx_install_timeline_crosslinkers(fsl_cx * const f){ int rc; assert(!f->xlinkers.used); assert(!f->xlinkers.list); rc = fsl_xlink_listener(f, "fsl/attachment/timeline", fsl_deck_xlink_f_attachment, 0); if(!rc) rc = fsl_xlink_listener(f, "fsl/checkin/timeline", fsl_deck_xlink_f_checkin, 0); |
︙ | ︙ | |||
21500 21501 21502 21503 21504 21505 21506 | end: return rc; } static int fsl__deck_crosslink_ticket(fsl_deck * const d){ int rc; fsl_cx * const f = d->f; | | | | < | > | | | | | | > > > > > > > > > > > > > | > > > > > > > > > > > | | | | < < < > > > > > > | 21379 21380 21381 21382 21383 21384 21385 21386 21387 21388 21389 21390 21391 21392 21393 21394 21395 21396 21397 21398 21399 21400 21401 21402 21403 21404 21405 21406 21407 21408 21409 21410 21411 21412 21413 21414 21415 21416 21417 21418 21419 21420 21421 21422 21423 21424 21425 21426 21427 21428 21429 21430 21431 21432 21433 21434 21435 21436 21437 21438 | end: return rc; } static int fsl__deck_crosslink_ticket(fsl_deck * const d){ int rc; fsl_cx * const f = d->f; char * zTag; fsl_stmt qAtt = fsl_stmt_empty; assert(f->cache.isCrosslinking && "This only works if fsl__crosslink_begin() is active."); zTag = fsl_mprintf("tkt-%s", d->K); if(!zTag) return FSL_RC_OOM; rc = fsl__tag_insert(f, FSL_TAGTYPE_ADD, zTag, NULL, d->rid, d->D, d->rid, NULL); fsl_free(zTag); if(rc) goto end; assert(d->K); rc = fsl__deck_crosslink_add_pending(f, 't', d->K); if(rc) goto end;; /* Locate and update comment for any attachments */ rc = fsl_cx_prepare(f, &qAtt, "SELECT attachid, src, target, filename FROM attachment" " WHERE target=%Q", d->K); while(0==rc && FSL_RC_STEP_ROW==fsl_stmt_step(&qAtt)){ const char *zAttachId = fsl_stmt_g_text(&qAtt, 0, NULL); const char *zSrc = fsl_stmt_g_text(&qAtt, 1, NULL); const char *zTarget = fsl_stmt_g_text(&qAtt, 2, NULL); const char *zName = fsl_stmt_g_text(&qAtt, 3, NULL); const bool isAdd = (zSrc && zSrc[0]) ? true : false; char *zComment; if( isAdd ){ zComment = fsl_mprintf( "Add attachment [/artifact/%!S|%h] to ticket [%!S|%S]", zSrc, zName, zTarget, zTarget); }else{ zComment = fsl_mprintf("Delete attachment \"%h\" from ticket [%!S|%S]", zName, zTarget, zTarget); } if(!zComment){ rc = FSL_RC_OOM; break; } rc = fsl_cx_exec_multi(f, "UPDATE event SET comment=%Q, type='t'" " WHERE objid=%Q", zComment, zAttachId); fsl_free(zComment); } end: fsl_stmt_finalize(&qAtt); return rc; } int fsl__deck_crosslink_one( fsl_deck * const d ){ int rc; assert(d->f && "API misuse:fsl_deck::f == NULL"); rc = fsl__crosslink_begin(d->f); |
︙ | ︙ | |||
21606 21607 21608 21609 21610 21611 21612 | rc = fsl__deck_crosslink_attachment(d); break; /* FSL_SATYPE_CONTROL is handled above except for the timeline update, which is handled by a callback below */ default: break; } | < < | > | | < | < | < < < < < < < < < < < < < < < | < | 21512 21513 21514 21515 21516 21517 21518 21519 21520 21521 21522 21523 21524 21525 21526 21527 21528 21529 21530 21531 21532 21533 21534 21535 21536 21537 21538 21539 21540 21541 21542 21543 | rc = fsl__deck_crosslink_attachment(d); break; /* FSL_SATYPE_CONTROL is handled above except for the timeline update, which is handled by a callback below */ default: break; } /* Call any crosslink callbacks... */ if(0==rc && FSL_SATYPE_TICKET!=d->type){ /* ^^^ the real work of ticket crosslinking is delated until fsl__crosslink_end(), for reasons lost to history, so we'll skip calling the xlink listeners for those until that step. */ rc = fsl__call_xlink_listeners(d); } end: if(!rc){ rc = fsl_db_transaction_end(db, false); }else{ if(db->error.code && !f->error.code){ fsl_cx_uplift_db_error(f,db); } fsl_db_transaction_end(db, true); } return rc ? rc : f->interrupted; }/*end fsl__deck_crosslink()*/ /** Return true if z points to the first character after a blank line. Tolerate either \r\n or \n line endings. As this looks backwards in z, z must point to at least 3 characters past the beginning of a legal string. |
︙ | ︙ | |||
21745 21746 21747 21748 21749 21750 21751 | *pn = (fsl_size_t)n; return; } /** Internal helper for parsing manifests. Holds a source file (memory | | | | | | | > | | > | > > > | | < < < | | | | | | 21632 21633 21634 21635 21636 21637 21638 21639 21640 21641 21642 21643 21644 21645 21646 21647 21648 21649 21650 21651 21652 21653 21654 21655 21656 21657 21658 21659 21660 21661 21662 21663 21664 21665 21666 21667 21668 21669 21670 21671 21672 21673 21674 21675 21676 21677 21678 21679 21680 21681 21682 21683 21684 21685 21686 21687 21688 21689 21690 21691 21692 21693 21694 21695 21696 21697 21698 21699 21700 | *pn = (fsl_size_t)n; return; } /** Internal helper for parsing manifests. Holds a source file (memory range) and gets updated by fsl__deck_next_token() and friends. */ struct fsl__src { /** First char of the next token. */ unsigned char * z; /** One-past-the-end of the manifest. */ unsigned char * zEnd; /** True if z points to the start of a new line. */ bool atEol; }; typedef struct fsl__src fsl__src; static const fsl__src fsl__src_empty = {NULL,NULL,0}; /** Return a pointer to the next token. The token is zero-terminated. Return NULL if there are no more tokens on the current line, but the call after that will return non-NULL unless we have reached the end of the input. If this function returns non-NULL then *pLen is set to the byte length of the new token. Once the end of the input is reached, this function always returns NULL. */ static unsigned char *fsl__deck_next_token(fsl__src * const p, fsl_size_t * const pLen){ if( p->atEol ) return NULL; int c; unsigned char * z = p->z; unsigned char * const zStart = z; while( (c=(*z))!=' ' && c!='\n' ) ++z; *z = 0; p->z = &z[1]; p->atEol = c=='\n'; *pLen = z - zStart; return zStart; } /** Return the card-type for the next card. Return 0 if there are no more cards or if we are not at the end of the current card. */ static unsigned char deck__next_card(fsl__src * const p){ unsigned char c; if( !p->atEol || p->z>=p->zEnd ) return 0; c = p->z[0]; if( p->z[1]==' ' ){ p->z += 2; p->atEol = false; }else if( p->z[1]=='\n' ){ p->z += 2; p->atEol = true; }else{ c = 0; } return c; } /** |
︙ | ︙ | |||
21878 21879 21880 21881 21882 21883 21884 | #ifdef ERROR # undef ERROR #endif #define ERROR(RC,MSG) do{ rc = (RC); zMsg = (MSG); goto bailout; } while(0) #define SYNTAX(MSG) ERROR(rc ? rc : FSL_RC_SYNTAX,MSG) bool isRepeat = 0/* , hasSelfRefTag = 0 */; int rc = 0; | | < | | | < < < < < < < | > | | | | | < | < | < > > | > > < < < < < < | | < < > > > | 21767 21768 21769 21770 21771 21772 21773 21774 21775 21776 21777 21778 21779 21780 21781 21782 21783 21784 21785 21786 21787 21788 21789 21790 21791 21792 21793 21794 21795 21796 21797 21798 21799 21800 21801 21802 21803 21804 21805 21806 21807 21808 21809 21810 21811 21812 21813 21814 21815 21816 21817 21818 21819 21820 21821 21822 21823 21824 21825 21826 21827 21828 21829 21830 21831 21832 21833 21834 21835 21836 21837 21838 21839 21840 21841 21842 21843 21844 21845 21846 | #ifdef ERROR # undef ERROR #endif #define ERROR(RC,MSG) do{ rc = (RC); zMsg = (MSG); goto bailout; } while(0) #define SYNTAX(MSG) ERROR(rc ? rc : FSL_RC_SYNTAX,MSG) bool isRepeat = 0/* , hasSelfRefTag = 0 */; int rc = 0; fsl__src x = fsl__src_empty; char const * zMsg = NULL; char cType = 0, cPrevType = 0; unsigned char * z = src ? src->mem : NULL; fsl_size_t tokLen = 0; unsigned char * token; fsl_size_t n = z ? src->used : 0; unsigned char * uuid; double ts; int cardCount = 0; fsl_cx * const f = d->f; fsl_error * const err = f ? &f->error : 0; int stealBuf = 0 /* gets incremented if we need to steal src->mem. */; unsigned nSelfTag = 0 /* number of T cards which refer to '*' (this artifact). */; unsigned nSimpleTag = 0 /* number of T cards with "+" prefix */; /* lettersSeen keeps track of the card letters we have seen so that we can then relatively quickly figure out what type of manifest we have parsed without having to inspect the card contents. Each index records a count of how many of that card we've seen. */ int lettersSeen[27] = {0/*A*/,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0/*Z*/, 0 /* sentinel element for reasons lost to history but removing it breaks stuff. */}; if(!f || !z) return FSL_RC_MISUSE; if(rid>0 && (fsl__cx_mcache_search2(f, rid, d, FSL_SATYPE_ANY, &rc) || rc)){ if(0==rc){ assert(d->rid == rid); fsl_buffer_clear(src); } return rc; }else if(rid<0){ return fsl_error_set(err, FSL_RC_RANGE, "Invalid (negative) RID %" FSL_ID_T_PFMT " for %s()", rid, __func__); }else if(!*z || !n || ( '\n' != z[n-1]) ){ /* Every control artifact ends with a '\n' character. Exit early if that is not the case for this artifact. */ return fsl_error_set(err, FSL_RC_SYNTAX, "%s.", n ? "Not terminated with \\n" : "Zero-length input"); } if((0==rid) || fsl_id_bag_contains(&f->cache.mfSeen,rid)){ isRepeat = 1; }else{ isRepeat = 0; rc = fsl_id_bag_insert(&f->cache.mfSeen, rid); if(rc){ assert(FSL_RC_OOM==rc); return rc; } } /* Verify that the first few characters of the artifact look like a control artifact. */ if( !fsl_might_be_artifact(src) ){ SYNTAX("Content does not look like a structural artifact"); } fsl_deck_clean(d); fsl_deck_init(f, d, FSL_SATYPE_ANY); /* Strip off the PGP signature if there is one. Example of signed manifest: https://fossil-scm.org/index.html/artifact/28987096ac */ { |
︙ | ︙ | |||
21980 21981 21982 21983 21984 21985 21986 | if( !isRepeat ) g.parseCnt[0]++; */ /* Reminder: parsing modifies the input (to simplify the tokenization/parsing). As of mid-201403, we recycle as much as possible from the source | | | | | | 21858 21859 21860 21861 21862 21863 21864 21865 21866 21867 21868 21869 21870 21871 21872 21873 21874 21875 21876 21877 21878 21879 21880 21881 21882 21883 21884 21885 21886 21887 21888 21889 21890 21891 21892 21893 21894 21895 21896 21897 21898 21899 | if( !isRepeat ) g.parseCnt[0]++; */ /* Reminder: parsing modifies the input (to simplify the tokenization/parsing). As of mid-201403, we recycle as much as possible from the source buffer. */ /* Now parse, card by card... */ x.z = z; x.zEnd = z+n; x.atEol= true; /* Parsing helpers... */ #define TOKEN(DEFOS) tokLen=0; token = fsl__deck_next_token(&x,&tokLen); \ if(token && tokLen && (DEFOS)) fsl_bytes_defossilize(token, &tokLen) #define TOKEN_EXISTS(MSG_IF_NOT) if(!token){ SYNTAX(MSG_IF_NOT); }(void)0 #define TOKEN_CHECKHEX(MSG) if(token && (int)tokLen!=fsl_is_uuid((char const *)token))\ { SYNTAX(MSG); } #define TOKEN_UUID(CARD) TOKEN_CHECKHEX("Malformed UUID in " #CARD "-card") #define TOKEN_MD5(ERRMSG) if(!token || FSL_STRLEN_MD5!=(int)tokLen) \ {SYNTAX(ERRMSG);} /** Reminder: we do not know the type of the manifest at this point, so all of the fsl_deck_add/set() bits below can't do their validation. We have to determine at parse-time (or afterwards) which type of deck it is based on the cards we've seen. We guess the type as early as possible to enable during-parse validation, and do a post-parse check for the legality of cards added before validation became possible. */ #define SEEN(CARD) lettersSeen[*#CARD - 'A'] for( cPrevType=1; !rc && (0 < (cType = deck__next_card(&x))); cPrevType = cType ){ ++cardCount; if(cType<cPrevType){ if(d->E.uuid && 'N'==cType && 'P'==cPrevType){ /* Workaround for a pair of historical fossil bugs which synergized to allow malformed technotes to be saved: |
︙ | ︙ | |||
22029 22030 22031 22032 22033 22034 22035 | ++lettersSeen[cType-'A']; }else{ SYNTAX("Invalid card name"); } switch(cType){ /* A <filename> <target> ?<source>? | | | 21907 21908 21909 21910 21911 21912 21913 21914 21915 21916 21917 21918 21919 21920 21921 | ++lettersSeen[cType-'A']; }else{ SYNTAX("Invalid card name"); } switch(cType){ /* A <filename> <target> ?<source>? Identifies an attachment to either a wiki page, a ticket, or a technote. <source> is the artifact that is the attachment. <source> is omitted to delete an attachment. <target> is the name of a wiki page, technote, or ticket to which that attachment is connected. */ case 'A':{ |
︙ | ︙ | |||
22064 22065 22066 22067 22068 22069 22070 | /*rc = fsl_deck_A_set(d, (char const *)name, (char const *)uuid, (char const *)src);*/ d->type = FSL_SATYPE_ATTACHMENT; break; } /* B <uuid> | | | | | 21942 21943 21944 21945 21946 21947 21948 21949 21950 21951 21952 21953 21954 21955 21956 21957 21958 21959 21960 21961 21962 21963 21964 21965 21966 21967 21968 21969 21970 21971 21972 21973 21974 21975 21976 21977 21978 21979 21980 21981 21982 21983 21984 21985 21986 21987 21988 21989 21990 21991 21992 | /*rc = fsl_deck_A_set(d, (char const *)name, (char const *)uuid, (char const *)src);*/ d->type = FSL_SATYPE_ATTACHMENT; break; } /* B <uuid> A B-line gives the UUID for the baseline of a delta-manifest. */ case 'B':{ if(d->B.uuid){ SYNTAX("Multiple B-cards"); } TOKEN(0); TOKEN_UUID(B); d->B.uuid = (char *)token; ++stealBuf; d->type = FSL_SATYPE_CHECKIN; /* rc = fsl_deck_B_set(d, (char const *)token); */ break; } /* C <comment> Comment text is fossil-encoded. There may be no more than one C line. C lines are required for manifests, are optional for Events and Attachments, and are disallowed on all other control files. */ case 'C':{ if( d->C ){ SYNTAX("more than one C-card"); } TOKEN(1); TOKEN_EXISTS("Missing comment text for C-card"); /* rc = fsl_deck_C_set(d, (char const *)token, (fsl_int_t)tokLen); */ d->C = (char *)token; ++stealBuf; break; } /* D <timestamp> The timestamp should be ISO 8601. YYYY-MM-DDtHH:MM:SS There can be no more than 1 D line. D lines are required for all control files except for clusters. */ case 'D':{ #define TOKEN_DATETIME(LETTER,MEMBER) \ if( d->MEMBER>0.0 ) { SYNTAX("More than one "#LETTER"-card"); } \ |
︙ | ︙ | |||
22123 22124 22125 22126 22127 22128 22129 | TOKEN_DATETIME(D,D); rc = fsl_deck_D_set(d, ts); break; } /* E <timestamp> <uuid> | | | | | > | | | > > | | | | > | < < | 22001 22002 22003 22004 22005 22006 22007 22008 22009 22010 22011 22012 22013 22014 22015 22016 22017 22018 22019 22020 22021 22022 22023 22024 22025 22026 22027 22028 22029 22030 22031 22032 22033 22034 22035 22036 22037 22038 22039 22040 22041 22042 22043 22044 22045 22046 22047 22048 22049 22050 22051 22052 22053 22054 22055 22056 22057 22058 | TOKEN_DATETIME(D,D); rc = fsl_deck_D_set(d, ts); break; } /* E <timestamp> <uuid> An "event" (technote) card that contains the timestamp of the event in the format YYYY-MM-DDtHH:MM:SS and a unique identifier for the event. The event timestamp is distinct from the D timestamp. The D timestamp is when the artifact was created whereas the E timestamp is when the specific event is said to occur. */ case 'E':{ TOKEN_DATETIME(E,E.julian); TOKEN(0); TOKEN_EXISTS("Missing UUID part of E-card"); TOKEN_UUID(E); d->E.julian = ts; d->E.uuid = (char *)token; ++stealBuf; d->type = FSL_SATYPE_EVENT; break; } /* F <filename> ?<uuid>? ?<permissions>? ?<old-name>? Identifies a file in a manifest. Multiple F lines are allowed in a manifest. F lines are not allowed in any other control file. The filename and old-name are fossil-encoded. In delta manifests, deleted files are denoted by the 1-arg form. In baseline manifests, deleted files simply are not in the manifest. */ case 'F':{ char * name; char * perms = NULL; char * priorName = NULL; fsl_fileperm_e perm = FSL_FILE_PERM_REGULAR; fsl_card_F * fc = NULL; rc = 0; if(!d->F.capacity){ /** Basic tests with various repos have shown that the approximate number of F-cards in a manifest is roughly the manifest size/75. We'll use that as an initial alloc size. */ rc = fsl_card_F_list_reserve(&d->F, src->used/75+10); } TOKEN(0); TOKEN_EXISTS("Missing name for F-card"); name = (char *)token; TOKEN(0); TOKEN_UUID(F); |
︙ | ︙ | |||
22195 22196 22197 22198 22199 22200 22201 | /*MARKER(("Unmatched perms string character: %d / %c !", (int)*perms, *perms));*/ SYNTAX("Invalid perms string character"); } TOKEN(0); if(token) priorName = (char *)token; } fsl_bytes_defossilize( (unsigned char *)name, 0 ); | < > | | | | | | 22075 22076 22077 22078 22079 22080 22081 22082 22083 22084 22085 22086 22087 22088 22089 22090 22091 22092 22093 22094 22095 22096 22097 22098 22099 22100 22101 22102 22103 22104 22105 22106 22107 22108 22109 22110 22111 22112 22113 22114 22115 22116 22117 22118 22119 22120 22121 22122 22123 22124 22125 22126 22127 22128 22129 22130 22131 22132 22133 22134 22135 22136 22137 22138 22139 22140 22141 22142 22143 22144 22145 22146 22147 22148 22149 22150 22151 22152 22153 22154 22155 22156 22157 22158 22159 22160 22161 22162 22163 22164 22165 22166 22167 22168 22169 | /*MARKER(("Unmatched perms string character: %d / %c !", (int)*perms, *perms));*/ SYNTAX("Invalid perms string character"); } TOKEN(0); if(token) priorName = (char *)token; } fsl_bytes_defossilize( (unsigned char *)name, 0 ); if(fsl_is_reserved_fn(name, -1)){ /* Some historical (pre-late-2020) manifests contain files they really shouldn't, like _FOSSIL_ and .fslckout. Since late 2020, fossil simply skips over these when parsing manifests, so we'll do the same. */ break; } if(priorName) fsl_bytes_defossilize( (unsigned char *)priorName, 0 ); fc = rc ? 0 : fsl_card_F_list_push(&d->F); if(!fc){ zMsg = "OOM"; goto bailout; } ++stealBuf; assert(d->F.used>1 ? (FSL_CARD_F_LIST_NEEDS_SORT & d->F.flags) : 1); fc->deckOwnsStrings = true; fc->name = name; fc->priorName = priorName; fc->perm = perm; fc->uuid = (fsl_uuid_str)uuid; d->type = FSL_SATYPE_CHECKIN; break; } /* G <uuid> A G-line gives the UUID for the thread root of a forum post. */ case 'G':{ if(d->G){ SYNTAX("Multiple G-cards"); } TOKEN(0); TOKEN_EXISTS("Missing UUID in G-card"); TOKEN_UUID(G); d->G = (char*)token; ++stealBuf; d->type = FSL_SATYPE_FORUMPOST; break; } /* H <forum post title> H text is fossil-encoded. There may be no more than one H line. H lines are optional for forum posts and are disallowed on all other control files. */ case 'H':{ if( d->H ){ SYNTAX("more than one H-card"); } TOKEN(1); TOKEN_EXISTS("Missing text for H-card"); d->H = (char *)token; ++stealBuf; d->type = FSL_SATYPE_FORUMPOST; break; } /* I <uuid> A I-line gives the UUID for the in-response-to UUID for a forum post. */ case 'I':{ if(d->I){ SYNTAX("Multiple I-cards"); } TOKEN(0); TOKEN_EXISTS("Missing UUID in I-card"); TOKEN_UUID(I); d->I = (char*)token; ++stealBuf; d->type = FSL_SATYPE_FORUMPOST; break; } /* J <name> ?<value>? Specifies a name value pair for ticket. If the first character of <name> is "+" then the <value> is appended to any preexisting value. If <value> is omitted then it is understood to be an empty string. */ case 'J':{ char const * field; |
︙ | ︙ | |||
22298 22299 22300 22301 22302 22303 22304 | TOKEN(1); rc = fsl_deck_J_add(d, isAppend, field, (char const *)token); d->type = FSL_SATYPE_TICKET; break; } /* | | | | | | | | | | | | 22178 22179 22180 22181 22182 22183 22184 22185 22186 22187 22188 22189 22190 22191 22192 22193 22194 22195 22196 22197 22198 22199 22200 22201 22202 22203 22204 22205 22206 22207 22208 22209 22210 22211 22212 22213 22214 22215 22216 22217 22218 22219 22220 22221 22222 22223 22224 22225 22226 22227 22228 22229 22230 22231 22232 22233 22234 22235 22236 22237 22238 22239 22240 22241 22242 22243 22244 22245 22246 22247 22248 22249 22250 22251 22252 22253 22254 22255 22256 22257 22258 22259 22260 22261 22262 22263 22264 | TOKEN(1); rc = fsl_deck_J_add(d, isAppend, field, (char const *)token); d->type = FSL_SATYPE_TICKET; break; } /* K <uuid> A K-line gives the UUID for the ticket which this control file is amending. */ case 'K':{ if(d->K){ SYNTAX("Multiple K-cards"); } TOKEN(0); TOKEN_EXISTS("Missing UUID in K-card"); TOKEN_UUID(K); d->K = (char*)token; ++stealBuf; d->type = FSL_SATYPE_TICKET; break; } /* L <wikititle> The wiki page title is fossil-encoded. There may be no more than one L line. */ case 'L':{ if(d->L){ SYNTAX("Multiple L-cards"); } TOKEN(1); TOKEN_EXISTS("Missing text for L-card"); d->L = (char*)token; ++stealBuf; d->type = FSL_SATYPE_WIKI; break; } /* M <uuid> An M-line identifies another artifact by its UUID. M-lines occur in clusters only. */ case 'M':{ TOKEN(0); TOKEN_EXISTS("Missing UUID for M-card"); TOKEN_UUID(M); ++stealBuf; d->type = FSL_SATYPE_CLUSTER; rc = fsl_list_append(&d->M, token); if( !rc && d->M.used>1 && fsl_strcmp((char const *)d->M.list[d->M.used-2], (char const *)token)>=0 ){ SYNTAX("M-card in the wrong order"); } break; } /* N <uuid> An N-line identifies the mimetype of wiki or comment text. */ case 'N':{ if(1<SEEN(N)){ SYNTAX("Multiple N-cards"); } TOKEN(0); TOKEN_EXISTS("Missing UUID on N-card"); ++stealBuf; d->N = (char *)token; break; } /* P <uuid> ... Specify one or more other artifacts which are the parents of this artifact. The first parent is the primary parent. All others are parents by merge. */ case 'P':{ if(1<SEEN(P)){ SYNTAX("More than one P-card"); |
︙ | ︙ | |||
22400 22401 22402 22403 22404 22405 22406 | if(!rc){ TOKEN(0); } } break; } /* | | | | 22280 22281 22282 22283 22284 22285 22286 22287 22288 22289 22290 22291 22292 22293 22294 22295 | if(!rc){ TOKEN(0); } } break; } /* Q (+|-)<uuid> ?<uuid>? Specify one or a range of checkins that are cherrypicked into this checkin ("+") or backed out of this checkin ("-"). */ case 'Q':{ fsl_cherrypick_type_e qType = FSL_CHERRYPICK_INVALID; TOKEN(0); TOKEN_EXISTS("Missing target UUID for Q-card"); |
︙ | ︙ | |||
22428 22429 22430 22431 22432 22433 22434 | } d->type = FSL_SATYPE_CHECKIN; rc = fsl_deck_Q_add(d, qType, (char const *)uuid, (char const *)token); break; } /* | | | | | | | | | | | 22308 22309 22310 22311 22312 22313 22314 22315 22316 22317 22318 22319 22320 22321 22322 22323 22324 22325 22326 22327 22328 22329 22330 22331 22332 22333 22334 22335 22336 22337 22338 22339 22340 22341 22342 22343 22344 22345 22346 22347 22348 22349 22350 22351 | } d->type = FSL_SATYPE_CHECKIN; rc = fsl_deck_Q_add(d, qType, (char const *)uuid, (char const *)token); break; } /* R <md5sum> Specify the MD5 checksum over the name and content of all files in the manifest. */ case 'R':{ if(1<SEEN(R)){ SYNTAX("More than one R-card"); } TOKEN(0); TOKEN_EXISTS("Missing MD5 token in R-card"); TOKEN_MD5("Malformed MD5 token in R-card"); d->R = (char *)token; ++stealBuf; d->type = FSL_SATYPE_CHECKIN; break; } /* T (+|*|-)<tagname> <uuid> ?<value>? Create or cancel a tag or property. The tagname is fossil-encoded. The first character of the name must be either "+" to create a singleton tag, "*" to create a propagating tag, or "-" to create anti-tag that undoes a prior "+" or blocks propagation of of a "*". The tag is applied to <uuid>. If <uuid> is "*" then the tag is applied to the current manifest. If <value> is provided then the tag is really a property with the given value. Tags are not allowed in clusters. Multiple T lines are allowed. */ case 'T':{ unsigned char * name, * value; fsl_tagtype_e tagType = FSL_TAGTYPE_INVALID; TOKEN(1); TOKEN_EXISTS("Missing name for T-card"); |
︙ | ︙ | |||
22494 22495 22496 22497 22498 22499 22500 | case '+': tagType = FSL_TAGTYPE_ADD; ++nSimpleTag; break; case '-': tagType = FSL_TAGTYPE_CANCEL; break; default: SYNTAX("Malformed tag name"); } ++name /* skip type marker byte */; | | | | > > > > > > > > > > > > > > > > > > > > > > > | | | 22374 22375 22376 22377 22378 22379 22380 22381 22382 22383 22384 22385 22386 22387 22388 22389 22390 22391 22392 22393 22394 22395 22396 22397 22398 22399 22400 22401 22402 22403 22404 22405 22406 22407 22408 22409 22410 22411 22412 22413 22414 22415 22416 22417 22418 22419 22420 22421 22422 | case '+': tagType = FSL_TAGTYPE_ADD; ++nSimpleTag; break; case '-': tagType = FSL_TAGTYPE_CANCEL; break; default: SYNTAX("Malformed tag name"); } ++name /* skip type marker byte */; /* Tag order check from: https://fossil-scm.org/home/info/55cacfcace (It was subsequently made stricter so that the same tag type/name/target combination fails.) That's difficult to do here until _after_ we add the new tag to the list... */ rc = fsl_deck_T_add(d, tagType, (fsl_uuid_cstr)uuid, (char const *)name, (char const *)value); if(0==rc && d->T.used>1){ fsl_card_T const * tagPrev = (fsl_card_T const *)d->T.list[d->T.used-2]; fsl_card_T const * tagSelf = (fsl_card_T const *)d->T.list[d->T.used-1]; int const cmp = fsl_card_T_cmp(&tagPrev, &tagSelf); if(cmp>=0){ rc = fsl_cx_err_set(d->f, FSL_RC_SYNTAX, "T-cards are not in lexical order: " "%c%s %s %c%s", fsl_tag_prefix_char(tagPrev->type), tagPrev->name, cmp ? ">=" : "==", fsl_tag_prefix_char(tagSelf->type), tagSelf->name); goto bailout; } } break; } /* U ?<login>? Identify the user who created this control file by their login. Only one U line is allowed. Prohibited in clusters. If the user name is omitted, take that to be "anonymous". */ case 'U':{ if(d->U) SYNTAX("More than one U-card"); TOKEN(1); |
︙ | ︙ | |||
22543 22544 22545 22546 22547 22548 22549 | wlen = fsl_str_to_size((char const *)token); if((fsl_size_t)-1==wlen){ SYNTAX("Wiki size token is invalid"); } if( (&x.z[wlen+1]) > x.zEnd){ SYNTAX("Not enough content after W-card"); } | | | > > | | 22446 22447 22448 22449 22450 22451 22452 22453 22454 22455 22456 22457 22458 22459 22460 22461 22462 22463 22464 22465 22466 22467 22468 22469 22470 22471 22472 22473 22474 | wlen = fsl_str_to_size((char const *)token); if((fsl_size_t)-1==wlen){ SYNTAX("Wiki size token is invalid"); } if( (&x.z[wlen+1]) > x.zEnd){ SYNTAX("Not enough content after W-card"); } //rc = fsl_buffer_append(&d->W, x.z, wlen); //if(rc) goto bailout; fsl_buffer_external(&d->W, x.z, wlen); ++stealBuf; x.z += wlen; if( '\n' != x.z[0] ){ SYNTAX("W-card content not \\n terminated"); } x.z[0] = 0; ++x.z; break; } /* Z <md5sum> MD5 checksum on this control file. The checksum is over all lines (other than PGP-signature lines) prior to the current line. This must be the last record. This card is required for all control file types except for Manifest. It is not required for manifest only for historical compatibility reasons. |
︙ | ︙ | |||
22610 22611 22612 22613 22614 22615 22616 | rc = d->f->error.code; goto bailout; } if(FSL_SATYPE_ANY==d->type){ rc = fsl_cx_err_set(f, FSL_RC_ERROR, "Internal error: could not determine type of " | | < | 22515 22516 22517 22518 22519 22520 22521 22522 22523 22524 22525 22526 22527 22528 22529 | rc = d->f->error.code; goto bailout; } if(FSL_SATYPE_ANY==d->type){ rc = fsl_cx_err_set(f, FSL_RC_ERROR, "Internal error: could not determine type of " "artifact we just (successfully!) parsed."); goto bailout; }else { /* Make sure we didn't pick up any cards which were picked up before d->type was guessed and are invalid for the post-guessed type. */ |
︙ | ︙ | |||
22645 22646 22647 22648 22649 22650 22651 | FSL_SATYPE_FORUMPOST==d->type); assert(0==rc); /* Additional checks based on artifact type */ switch( d->type ){ case FSL_SATYPE_CONTROL: { if( nSelfTag ){ | | | | | | 22549 22550 22551 22552 22553 22554 22555 22556 22557 22558 22559 22560 22561 22562 22563 22564 22565 22566 22567 22568 22569 22570 22571 22572 22573 22574 22575 22576 22577 22578 22579 | FSL_SATYPE_FORUMPOST==d->type); assert(0==rc); /* Additional checks based on artifact type */ switch( d->type ){ case FSL_SATYPE_CONTROL: { if( nSelfTag ){ SYNTAX("Self-referential T-card in control artifact"); } break; } case FSL_SATYPE_TECHNOTE: { if( d->T.used!=nSelfTag ){ SYNTAX("Non-self-referential T-card in technote"); }else if( d->T.used!=nSimpleTag ){ SYNTAX("T-card with '*' or '-' in technote"); } break; } case FSL_SATYPE_FORUMPOST: { if( d->H && d->I ){ SYNTAX("Cannot have I-card and H-card in a forum post"); }else if( d->P.used>1 ){ SYNTAX("Too many arguments to P-card"); } break; } default: break; } assert(!d->content.mem); |
︙ | ︙ | |||
22930 22931 22932 22933 22934 22935 22936 | #undef FCARD } int fsl_deck_save( fsl_deck * const d, bool isPrivate ){ int rc; fsl_cx * const f = d->f; fsl_db * const db = fsl_needs_repo(f); | | | 22834 22835 22836 22837 22838 22839 22840 22841 22842 22843 22844 22845 22846 22847 22848 | #undef FCARD } int fsl_deck_save( fsl_deck * const d, bool isPrivate ){ int rc; fsl_cx * const f = d->f; fsl_db * const db = fsl_needs_repo(f); fsl_buffer * const buf = &d->f->cache.fileContent; fsl_id_t newRid = 0; bool const oldPrivate = f->cache.markPrivate; if(!f || !d ) return FSL_RC_MISUSE; else if(!db) return FSL_RC_NOT_A_REPO; if(d->rid>0){ #if 1 return 0; |
︙ | ︙ | |||
23108 23109 23110 23111 23112 23113 23114 | if(rc) break; } fsl_stmt_finalize(&q); if(rc) goto end; /* Process entries from pending_xlink temp table... */ rc = fsl_cx_prepare(f, &q, "SELECT id FROM pending_xlink"); | < | < | | > | | 23012 23013 23014 23015 23016 23017 23018 23019 23020 23021 23022 23023 23024 23025 23026 23027 23028 23029 23030 23031 23032 23033 23034 23035 23036 23037 23038 23039 23040 23041 23042 23043 | if(rc) break; } fsl_stmt_finalize(&q); if(rc) goto end; /* Process entries from pending_xlink temp table... */ rc = fsl_cx_prepare(f, &q, "SELECT id FROM pending_xlink"); while( 0==rc && FSL_RC_STEP_ROW==fsl_stmt_step(&q) ){ const char *zId = fsl_stmt_g_text(&q, 0, NULL); char cType; if(!zId || !*zId) continue; cType = zId[0]; ++zId; if('t'==cType){ rc = fsl__ticket_rebuild(f, zId); continue; }else if('w'==cType){ /* FSL-MISSING: backlink_wiki_refresh(zId) */ continue; } } fsl_stmt_finalize(&q); if(rc) goto end; rc = fsl_cx_exec(f, "DELETE FROM pending_xlink"); if(rc) goto end; /* If multiple check-ins happen close together in time, adjust their times by a few milliseconds to make sure they appear in chronological order. */ rc = fsl_cx_prepare(f, &q, "UPDATE time_fudge SET m1=m2-:incr " |
︙ | ︙ | |||
23164 23165 23166 23167 23168 23169 23170 | rc = fsl_cx_exec(f, "UPDATE event SET" " mtime=(SELECT m1 FROM time_fudge WHERE mid=objid)" " WHERE objid IN (SELECT mid FROM time_fudge)" " AND (mtime=omtime OR omtime IS NULL)" ); } end: | < | < > | | | > > | | | 23067 23068 23069 23070 23071 23072 23073 23074 23075 23076 23077 23078 23079 23080 23081 23082 23083 23084 23085 23086 23087 23088 23089 23090 23091 23092 23093 23094 23095 23096 23097 23098 23099 23100 23101 23102 23103 23104 23105 23106 23107 23108 23109 23110 23111 23112 23113 23114 23115 23116 23117 23118 23119 23120 23121 | rc = fsl_cx_exec(f, "UPDATE event SET" " mtime=(SELECT m1 FROM time_fudge WHERE mid=objid)" " WHERE objid IN (SELECT mid FROM time_fudge)" " AND (mtime=omtime OR omtime IS NULL)" ); } end: fsl_cx_exec(f, "DELETE FROM time_fudge"); if(rc) fsl_cx_transaction_end(f, true); else rc = fsl_cx_transaction_end(f, false); return rc; } int fsl__crosslink_begin(fsl_cx * const f){ int rc; assert(f); assert(0==f->cache.isCrosslinking); if(f->cache.isCrosslinking){ return fsl_cx_err_set(f, FSL_RC_MISUSE, "Crosslink is already running."); } rc = fsl_cx_transaction_begin(f); if(rc) return rc; rc = fsl_cx_exec_multi(f, "CREATE TEMP TABLE IF NOT EXISTS " "pending_xlink(id TEXT PRIMARY KEY)WITHOUT ROWID;" "CREATE TEMP TABLE IF NOT EXISTS time_fudge(" " mid INTEGER PRIMARY KEY," /* The rid of a manifest */ " m1 REAL," /* The timestamp on mid */ " cid INTEGER," /* A child or mid */ " m2 REAL" /* Timestamp on the child */ ");" "DELETE FROM pending_xlink; " "DELETE FROM time_fudge;"); if(0==rc){ f->cache.isCrosslinking = true; }else{ fsl_cx_transaction_end(f, true); } return rc; } #undef MARKER #undef AGE_FUDGE_WINDOW #undef AGE_ADJUST_INCREMENT #undef F_at /* end of file ./src/deck.c */ /* start of file ./src/delta.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
23454 23455 23456 23457 23458 23459 23460 | unsigned int i, base; unsigned int nHash; /* Number of hash table entries */ unsigned int *landmark; /* Primary hash table */ unsigned int *collide = NULL; /* Collision chain */ int lastRead = -1; /* Last byte of zSrc read by a COPY command */ int rc; /* generic return code checker. */ unsigned int olen = 0; /* current output length. */ | < | | 23358 23359 23360 23361 23362 23363 23364 23365 23366 23367 23368 23369 23370 23371 23372 23373 23374 23375 23376 23377 23378 23379 23380 23381 | unsigned int i, base; unsigned int nHash; /* Number of hash table entries */ unsigned int *landmark; /* Primary hash table */ unsigned int *collide = NULL; /* Collision chain */ int lastRead = -1; /* Last byte of zSrc read by a COPY command */ int rc; /* generic return code checker. */ unsigned int olen = 0; /* current output length. */ fsl_delta_hash h; unsigned char theBuf[IntegerBufSize] = {0,}; unsigned char * intBuf = theBuf; if(!zSrc || !zOut || !out) return FSL_RC_MISUSE; /* Add the target file size to the beginning of the delta */ #ifdef OUT #undef OUT #endif #define OUT(BLOB,LEN) rc=out(outState, BLOB, LEN); if(0 != rc) {fsl_free(collide); return rc;} else (void)0 #define OUTCH(CHAR) OUT(CHAR,1) #define PINT(I) intBuf = theBuf; olen=fsl_delta_int_put(I, &intBuf); OUT(theBuf,olen) PINT(lenOut); OUTCH("\n"); /* If the source file is very small, it means that we have no chance of ever doing a copy command. Just output a single |
︙ | ︙ | |||
23850 23851 23852 23853 23854 23855 23856 | ){ return fsl_delta_apply2(zSrc, lenSrc_, zDelta, lenDelta_, zOut, NULL); } #undef NHASH #undef DEBUG1 #undef DEBUG2 | | | | 23753 23754 23755 23756 23757 23758 23759 23760 23761 23762 23763 23764 23765 23766 23767 23768 | ){ return fsl_delta_apply2(zSrc, lenSrc_, zDelta, lenDelta_, zOut, NULL); } #undef NHASH #undef DEBUG1 #undef DEBUG2 /* end of file ./src/delta.c */ /* start of file ./src/diff.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
23873 23874 23875 23876 23877 23878 23879 | the delta-generation). */ #include <assert.h> #include <memory.h> #include <stdlib.h> #include <string.h> /* for memmove()/strlen() */ | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 23776 23777 23778 23779 23780 23781 23782 23783 23784 23785 23786 23787 23788 23789 23790 23791 23792 23793 23794 23795 23796 | the delta-generation). */ #include <assert.h> #include <memory.h> #include <stdlib.h> #include <string.h> /* for memmove()/strlen() */ /** Length of a dline */ #define LENGTH(X) ((X)->n) /** Minimum of two values */ static int minInt(int a, int b){ return a<b ? a : b; } /** Compute the optimal longest common subsequence (LCS) using an exhaustive search. This version of the LCS is only used for |
︙ | ︙ | |||
24200 24201 24202 24203 24204 24205 24206 24207 24208 24209 24210 24211 24212 24213 24214 24215 | int dist = 0; /* Distance of match from center */ int mid; /* Center of the chng */ int iSXb, iSYb, iEXb, iEYb; /* Best match so far */ int iSXp, iSYp, iEXp, iEYp; /* Previous match */ sqlite3_int64 bestScore; /* Best score so far */ sqlite3_int64 score; /* Score for current candidate LCS */ int span; /* combined width of the input sequences */ span = (iE1 - iS1) + (iE2 - iS2); bestScore = -10000; score = 0; iSXb = iSXp = iS1; iEXb = iEXp = iS1; iSYb = iSYp = iS2; iEYb = iEYp = iS2; mid = (iE1 + iS1)/2; | > > > > | | | | | | | | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < < < < < < < | < < < < | 23866 23867 23868 23869 23870 23871 23872 23873 23874 23875 23876 23877 23878 23879 23880 23881 23882 23883 23884 23885 23886 23887 23888 23889 23890 23891 23892 23893 23894 23895 23896 23897 23898 23899 23900 23901 23902 23903 23904 23905 23906 23907 23908 23909 23910 23911 23912 23913 23914 23915 23916 23917 23918 23919 23920 23921 23922 23923 23924 23925 23926 23927 23928 23929 23930 23931 23932 23933 23934 23935 23936 23937 23938 23939 23940 23941 23942 23943 23944 23945 | int dist = 0; /* Distance of match from center */ int mid; /* Center of the chng */ int iSXb, iSYb, iEXb, iEYb; /* Best match so far */ int iSXp, iSYp, iEXp, iEYp; /* Previous match */ sqlite3_int64 bestScore; /* Best score so far */ sqlite3_int64 score; /* Score for current candidate LCS */ int span; /* combined width of the input sequences */ int cutoff = 4; /* Max hash chain entries to follow */ int nextCutoff = -1; /* Value of cutoff for next iteration */ span = (iE1 - iS1) + (iE2 - iS2); bestScore = -10000; score = 0; iSXb = iSXp = iS1; iEXb = iEXp = iS1; iSYb = iSYp = iS2; iEYb = iEYp = iS2; mid = (iE1 + iS1)/2; do{ nextCutoff = 0; for(i=iS1; i<iE1; i++){ int limit = 0; j = p->aTo[p->aFrom[i].h % p->nTo].iHash; while( j>0 && (j-1<iS2 || j>=iE2 || p->cmpLine(&p->aFrom[i], &p->aTo[j-1])) ){ if( limit++ > cutoff ){ j = 0; nextCutoff = cutoff*4; break; } j = p->aTo[j-1].iNext; } if( j==0 ) continue; assert( i>=iSXb && i>=iSXp ); if( i<iEXb && j>=iSYb && j<iEYb ) continue; if( i<iEXp && j>=iSYp && j<iEYp ) continue; iSX = i; iSY = j-1; pA = &p->aFrom[iSX-1]; pB = &p->aTo[iSY-1]; n = minInt(iSX-iS1, iSY-iS2); for(k=0; k<n && p->cmpLine(pA,pB)==0; k++, pA--, pB--){} iSX -= k; iSY -= k; iEX = i+1; iEY = j; pA = &p->aFrom[iEX]; pB = &p->aTo[iEY]; n = minInt(iE1-iEX, iE2-iEY); for(k=0; k<n && p->cmpLine(pA,pB)==0; k++, pA++, pB++){} iEX += k; iEY += k; skew = (iSX-iS1) - (iSY-iS2); if( skew<0 ) skew = -skew; dist = (iSX+iEX)/2 - mid; if( dist<0 ) dist = -dist; score = (iEX - iSX)*(sqlite3_int64)span - (skew + dist); if( score>bestScore ){ bestScore = score; iSXb = iSX; iSYb = iSY; iEXb = iEX; iEYb = iEY; }else if( iEX>iEXp ){ iSXp = iSX; iSYp = iSY; iEXp = iEX; iEYp = iEY; } } }while( iSXb==iEXb && nextCutoff && (cutoff=nextCutoff)<=64 ); if( iSXb==iEXb && (sqlite3_int64)(iE1-iS1)*(iE2-iS2)<2500 ){ fsl__diff_optimal_lcs(p, iS1, iE1, iS2, iE2, piSX, piEX, piSY, piEY); }else{ *piSX = iSXb; *piSY = iSYb; *piEX = iEXb; *piEY = iEYb; } |
︙ | ︙ | |||
24533 24534 24535 24536 24537 24538 24539 24540 24541 24542 24543 24544 24545 24546 | lnFrom += del; lnTo += ins; } //fsl__dump_triples(p, __FILE__, __LINE__); } /* Given a raw diff p[] in which the p->aEdit[] array has been filled in, compute a context diff into pOut. */ static int contextDiff( fsl__diff_cx *p, /* The difference */ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 24193 24194 24195 24196 24197 24198 24199 24200 24201 24202 24203 24204 24205 24206 24207 24208 24209 24210 24211 24212 24213 24214 24215 24216 24217 24218 24219 24220 24221 24222 24223 24224 24225 24226 24227 24228 24229 24230 24231 24232 24233 24234 24235 24236 24237 24238 24239 24240 24241 24242 24243 24244 24245 24246 24247 24248 24249 24250 24251 24252 24253 24254 24255 24256 24257 24258 24259 24260 24261 24262 24263 24264 24265 24266 24267 24268 24269 24270 24271 24272 24273 24274 24275 24276 24277 24278 24279 24280 24281 24282 24283 24284 24285 24286 24287 24288 24289 24290 24291 24292 24293 24294 24295 24296 24297 24298 24299 24300 24301 24302 24303 24304 24305 24306 24307 24308 24309 24310 24311 24312 24313 24314 24315 24316 24317 24318 24319 24320 24321 24322 24323 24324 24325 24326 24327 24328 24329 24330 24331 24332 24333 24334 24335 24336 24337 24338 24339 24340 24341 24342 24343 24344 24345 24346 24347 24348 24349 24350 24351 24352 24353 24354 24355 24356 24357 24358 24359 24360 24361 24362 24363 24364 24365 24366 24367 24368 24369 24370 24371 24372 24373 24374 24375 24376 24377 24378 24379 24380 24381 24382 24383 24384 24385 24386 24387 24388 24389 24390 24391 24392 24393 24394 24395 24396 24397 24398 24399 24400 24401 24402 24403 24404 24405 24406 24407 24408 24409 24410 24411 24412 24413 24414 24415 24416 24417 24418 24419 24420 24421 24422 24423 24424 24425 24426 24427 24428 24429 24430 24431 24432 24433 24434 24435 24436 24437 24438 24439 24440 | lnFrom += del; lnTo += ins; } //fsl__dump_triples(p, __FILE__, __LINE__); } #if !defined(FSL_OMIT_DEPRECATED) #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) typedef uint64_t u64; typedef void ReCompiled /* porting crutch. i would strongly prefer to replace the regex support with a stateful predicate callback. */; #define DIFF_CONTEXT_MASK ((u64)0x0000ffff) /* Lines of context. Default if 0 */ #define DIFF_WIDTH_MASK ((u64)0x00ff0000) /* side-by-side column width */ #define DIFF_IGNORE_EOLWS ((u64)0x01000000) /* Ignore end-of-line whitespace */ #define DIFF_IGNORE_ALLWS ((u64)0x03000000) /* Ignore all whitespace */ #define DIFF_SIDEBYSIDE ((u64)0x04000000) /* Generate a side-by-side diff */ #define DIFF_VERBOSE ((u64)0x08000000) /* Missing shown as empty files */ #define DIFF_BRIEF ((u64)0x10000000) /* Show filenames only */ #define DIFF_HTML ((u64)0x20000000) /* Render for HTML */ #define DIFF_LINENO ((u64)0x40000000) /* Show line numbers */ #define DIFF_NOOPT (((u64)0x01)<<32) /* Suppress optimizations (debug) */ #define DIFF_INVERT (((u64)0x02)<<32) /* Invert the diff (debug) */ #define DIFF_CONTEXT_EX (((u64)0x04)<<32) /* Use context even if zero */ #define DIFF_NOTTOOBIG (((u64)0x08)<<32) /* Only display if not too big */ #define DIFF_STRIP_EOLCR (((u64)0x10)<<32) /* Strip trailing CR */ /* ANSI escape codes: https://en.wikipedia.org/wiki/ANSI_escape_code */ #define ANSI_COLOR_BLACK(BOLD) ((BOLD) ? "\x1b[30m" : "\x1b[30m") #define ANSI_COLOR_RED(BOLD) ((BOLD) ? "\x1b[31;1m" : "\x1b[31m") #define ANSI_COLOR_GREEN(BOLD) ((BOLD) ? "\x1b[32;1m" : "\x1b[32m") #define ANSI_COLOR_YELLOW(BOLD) ((BOLD) ? "\x1b[33;1m" : "\x1b[33m") #define ANSI_COLOR_BLUE(BOLD) ((BOLD) ? "\x1b[34;1m" : "\x1b[34m") #define ANSI_COLOR_MAGENTA(BOLD) ((BOLD) ? "\x1b[35;1m" : "\x1b[35m") #define ANSI_COLOR_CYAN(BOLD) ((BOLD) ? "\x1b[36;1m" : "\x1b[36m") #define ANSI_COLOR_WHITE(BOLD) ((BOLD) ? "\x1b[37;1m" : "\x1b[37m") #define ANSI_DIFF_ADD(BOLD) ANSI_COLOR_GREEN(BOLD) #define ANSI_DIFF_RM(BOLD) ANSI_COLOR_RED(BOLD) #define ANSI_DIFF_MOD(BOLD) ANSI_COLOR_BLUE(BOLD) #define ANSI_BG_BLACK(BOLD) ((BOLD) ? "\x1b[40;1m" : "\x1b[40m") #define ANSI_BG_RED(BOLD) ((BOLD) ? "\x1b[41;1m" : "\x1b[41m") #define ANSI_BG_GREEN(BOLD) ((BOLD) ? "\x1b[42;1m" : "\x1b[42m") #define ANSI_BG_YELLOW(BOLD) ((BOLD) ? "\x1b[43;1m" : "\x1b[43m") #define ANSI_BG_BLUE(BOLD) ((BOLD) ? "\x1b[44;1m" : "\x1b[44m") #define ANSI_BG_MAGENTA(BOLD) ((BOLD) ? "\x1b[45;1m" : "\x1b[45m") #define ANSI_BG_CYAN(BOLD) ((BOLD) ? "\x1b[46;1m" : "\x1b[46m") #define ANSI_BG_WHITE(BOLD) ((BOLD) ? "\x1b[47;1m" : "\x1b[47m") #define ANSI_RESET_COLOR "\x1b[39;49m" #define ANSI_RESET_ALL "\x1b[0m" #define ANSI_RESET ANSI_RESET_ALL /*#define ANSI_BOLD ";1m"*/ /** Converts mask of public fsl_diff_flag_t (32-bit) values to the Fossil-internal 64-bit bitmask used by the DIFF_xxx macros. Why? (A) fossil(1) uses the macro approach and a low-level encoding of data in the bitmask (e.g. the context lines count). The public API hides the lower-level flags and allows the internal API to take care of the encoding. */ static uint64_t fsl_diff_flags_convert( int mask ){ uint64_t rc = 0U; #define DO(F) if( (mask & F)==F ) rc |= (((u64)F) << 24) DO(FSL_DIFF2_IGNORE_EOLWS); DO(FSL_DIFF2_IGNORE_ALLWS); DO(FSL_DIFF2_LINE_NUMBERS); DO(FSL_DIFF_SIDEBYSIDE); DO(FSL_DIFF2_NOTTOOBIG); DO(FSL_DIFF2_STRIP_EOLCR); DO(FSL_DIFF_VERBOSE); DO(FSL_DIFF_BRIEF); DO(FSL_DIFF_HTML); DO(FSL_DIFF_NOOPT); DO(FSL_DIFF_INVERT); #undef DO return rc; } /** Holds output state for diff generation. */ struct DiffOutState { /** Output callback. */ fsl_output_f out; /** State for this->out(). */ void * oState; /** For propagating output errors. */ int rc; char ansiColor; }; typedef struct DiffOutState DiffOutState; static const DiffOutState DiffOutState_empty = { NULL/*out*/, NULL/*oState*/, 0/*rc*/, 0/*useAnsiColor*/ }; /** Internal helper. Sends src to o->out(). If n is negative, fsl_strlen() is used to determine the length. */ static int diff_out( DiffOutState * const o, void const * src, fsl_int_t n ){ return o->rc = n ? o->out(o->oState, src, n<0 ? fsl_strlen((char const *)src) : (fsl_size_t)n) : 0; } /** fsl_output_f() impl for use with diff_outf(). state must be a (DiffOutState*). */ static int fsl_output_f_diff_out( void * state, void const * src, fsl_size_t n ){ DiffOutState * const os = (DiffOutState *)state; return os->rc = os->out(os->oState, src, n); } static int diff_outf( DiffOutState * o, char const * fmt, ... ){ va_list va; va_start(va,fmt); fsl_appendfv(fsl_output_f_diff_out, o, fmt, va); va_end(va); return o->rc; } /* Append a single line of context-diff output to pOut. */ static int appendDiffLine( DiffOutState *const pOut, /* Where to write the line of output */ char cPrefix, /* One of " ", "+", or "-" */ fsl_dline *pLine, /* The line to be output */ int html, /* True if generating HTML. False for plain text */ ReCompiled *pRe /* Colorize only if line matches this Regex */ ){ int rc = 0; char const * ansiPrefix = !pOut->ansiColor ? NULL : (('+'==cPrefix) ? ANSI_DIFF_ADD(0) : (('-'==cPrefix) ? ANSI_DIFF_RM(0) : NULL)) ; if(ansiPrefix) rc = diff_out(pOut, ansiPrefix, -1 ); if(!rc) rc = diff_out(pOut, &cPrefix, 1); if(rc) return rc; else if( html ){ #if 0 if( pRe /*MISSING: && re_dline_match(pRe, pLine, 1)==0 */ ){ cPrefix = ' '; }else #endif if( cPrefix=='+' ){ rc = diff_out(pOut, "<span class=\"fsl-diff-add\">", -1); }else if( cPrefix=='-' ){ rc = diff_out(pOut, "<span class=\"fsl-diff-rm\">", -1); } if(!rc){ /* unsigned short n = pLine->n; */ /* while( n>0 && (pLine->z[n-1]=='\n' || pLine->z[n-1]=='\r') ) n--; */ rc = pOut->rc = fsl_htmlize(pOut->out, pOut->oState, pLine->z, pLine->n); if( !rc && cPrefix!=' ' ){ rc = diff_out(pOut, "</span>", -1); } } }else{ rc = diff_out(pOut, pLine->z, pLine->n); } if(!rc){ if(ansiPrefix){ rc = diff_out(pOut, ANSI_RESET, -1 ); } if(!rc) rc = diff_out(pOut, "\n", 1); } return rc; } /* Add two line numbers to the beginning of an output line for a context diff. One or the other of the two numbers might be zero, which means to leave that number field blank. The "html" parameter means to format the output for HTML. */ static int appendDiffLineno(DiffOutState *pOut, int lnA, int lnB, int html){ int rc = 0; if( html ){ rc = diff_out(pOut, "<span class=\"fsl-diff-lineno\">", -1); } if(!rc){ if( lnA>0 ){ rc = diff_outf(pOut, "%6d ", lnA); }else{ rc = diff_out(pOut, " ", 7); } } if(!rc){ if( lnB>0 ){ rc = diff_outf(pOut, "%6d ", lnB); }else{ rc = diff_out(pOut, " ", 8); } if( !rc && html ){ rc = diff_out(pOut, "</span>", -1); } } return rc; } /** Extract the number of lines of context from diffFlags. */ static int diff_context_lines(uint64_t diffFlags){ int n = diffFlags & DIFF_CONTEXT_MASK; if( n==0 && (diffFlags & DIFF_CONTEXT_EX)==0 ) n = 5; return n; } /* Extract the width of columns for side-by-side diff. Supply an appropriate default if no width is given. */ static int diff_width(uint64_t diffFlags){ int w = (diffFlags & DIFF_WIDTH_MASK)/(DIFF_CONTEXT_MASK+1); if( w==0 ) w = 80; return w; } /* Given a raw diff p[] in which the p->aEdit[] array has been filled in, compute a context diff into pOut. */ static int contextDiff( fsl__diff_cx *p, /* The difference */ |
︙ | ︙ | |||
25435 25436 25437 25438 25439 25440 25441 | int rc = 0; int a = 0; /* Index of next line in A[] */ int b = 0; /* Index of next line in B[] */ int *R; /* Array of COPY/DELETE/INSERT triples */ int r; /* Index into R[] */ int nr; /* Number of COPY/DELETE/INSERT triples to process */ int mxr; /* Maximum value for r */ | < | 25329 25330 25331 25332 25333 25334 25335 25336 25337 25338 25339 25340 25341 25342 | int rc = 0; int a = 0; /* Index of next line in A[] */ int b = 0; /* Index of next line in B[] */ int *R; /* Array of COPY/DELETE/INSERT triples */ int r; /* Index into R[] */ int nr; /* Number of COPY/DELETE/INSERT triples to process */ int mxr; /* Maximum value for r */ int i, j; /* Loop counters */ int m, ma, mb;/* Number of lines to output */ int skip; /* Number of lines to skip */ static int nChunk = 0; /* Number of chunks of diff output seen so far */ SbsLine s; /* Output line buffer */ int nContext; /* Lines of context above and below each change */ int showDivider = 0; /* True to show the divider */ |
︙ | ︙ | |||
25505 25506 25507 25508 25509 25510 25511 | a = xa; b = xb; continue; } } #endif /* For the current block comprising nr triples, figure out | | < < < < < < < < < < < < < < < < < < | 25398 25399 25400 25401 25402 25403 25404 25405 25406 25407 25408 25409 25410 25411 25412 25413 25414 25415 25416 25417 | a = xa; b = xb; continue; } } #endif /* For the current block comprising nr triples, figure out how many lines to skip. */ if( R[r]>nContext ){ skip = R[r] - nContext; }else{ skip = 0; } /* Draw the separator between blocks */ if( showDivider ){ if( s.escHtml ){ char zLn[10]; fsl_snprintf(zLn, sizeof(zLn), "%d", a+skip+1); rc = sbsWriteSep(&s, strlen(zLn), SBS_LNA); |
︙ | ︙ | |||
25842 25843 25844 25845 25846 25847 25848 | short contextLines, short sbsWidth, int diffFlags ){ return fsl_diff_text_impl(pA, pB, out, outState, contextLines, sbsWidth, diffFlags, NULL ); } | < < | 25717 25718 25719 25720 25721 25722 25723 25724 25725 25726 25727 25728 25729 25730 | short contextLines, short sbsWidth, int diffFlags ){ return fsl_diff_text_impl(pA, pB, out, outState, contextLines, sbsWidth, diffFlags, NULL ); } int fsl_diff_text_to_buffer(fsl_buffer const *pA, fsl_buffer const *pB, fsl_buffer * pOut, short contextLines, short sbsWidth, int diffFlags ){ return (pA && pB && pOut) ? fsl_diff_text_impl(pA, pB, fsl_output_f_buffer, pOut, |
︙ | ︙ | |||
25876 25877 25878 25879 25880 25881 25882 | #undef DIFF_NOTTOOBIG #undef DIFF_STRIP_EOLCR #undef SBS_LNA #undef SBS_TXTA #undef SBS_MKR #undef SBS_LNB #undef SBS_TXTB | < < | 25749 25750 25751 25752 25753 25754 25755 25756 25757 25758 25759 25760 25761 25762 | #undef DIFF_NOTTOOBIG #undef DIFF_STRIP_EOLCR #undef SBS_LNA #undef SBS_TXTA #undef SBS_MKR #undef SBS_LNB #undef SBS_TXTB #undef ANSI_COLOR_BLACK #undef ANSI_COLOR_RED #undef ANSI_COLOR_GREEN #undef ANSI_COLOR_YELLOW #undef ANSI_COLOR_BLUE #undef ANSI_COLOR_MAGENTA |
︙ | ︙ | |||
25901 25902 25903 25904 25905 25906 25907 | #undef ANSI_BG_WHITE #undef ANSI_RESET_COLOR #undef ANSI_RESET_ALL #undef ANSI_RESET #undef ANSI_DIFF_ADD #undef ANSI_DIFF_MOD #undef ANSI_DIFF_RM | > | | < | | | 25772 25773 25774 25775 25776 25777 25778 25779 25780 25781 25782 25783 25784 25785 25786 25787 25788 25789 25790 25791 25792 25793 25794 25795 25796 25797 25798 25799 25800 25801 25802 25803 25804 25805 25806 25807 25808 25809 25810 25811 25812 25813 25814 25815 25816 25817 25818 25819 | #undef ANSI_BG_WHITE #undef ANSI_RESET_COLOR #undef ANSI_RESET_ALL #undef ANSI_RESET #undef ANSI_DIFF_ADD #undef ANSI_DIFF_MOD #undef ANSI_DIFF_RM #endif /*FSL_OMIT_DEPRECATED*/ /* end of file ./src/diff.c */ /* start of file ./src/diff2.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /** This file houses the "2nd generation" diff-generation APIs. This code is a straight port of those algorithms from the Fossil SCM project, initially implemented by D. Richard Hipp, ported and the license re-assigned to this project with this consent. */ #include <memory.h> #include <stdlib.h> #include <string.h> /* for memmove()/strlen() */ #include <stdio.h> #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) const fsl_dibu_opt fsl_dibu_opt_empty = fsl_dibu_opt_empty_m; const fsl_dibu fsl_dibu_empty = fsl_dibu_empty_m; const fsl_dline fsl_dline_empty = fsl_dline_empty_m; const fsl_dline_change fsl_dline_change_empty = fsl_dline_change_empty_m; const fsl__diff_cx fsl__diff_cx_empty = fsl__diff_cx_empty_m; void fsl__diff_cx_clean(fsl__diff_cx * const cx){ fsl_free(cx->aFrom); fsl_free(cx->aTo); |
︙ | ︙ | |||
26387 26388 26389 26390 26391 26392 26393 26394 26395 26396 26397 26398 26399 26400 26401 26402 26403 26404 26405 26406 26407 | /* ** The threshold at which diffBlockAlignment transitions from the ** O(N*N) Wagner minimum-edit-distance algorithm to a less process ** O(NlogN) divide-and-conquer approach. */ #define DIFF_ALIGN_MX 1225 /* ** R[] is an array of six integer, two COPY/DELETE/INSERT triples for a ** pair of adjacent differences. Return true if the gap between these ** two differences is so small that they should be rendered as a single ** edit. */ static int smallGap2(const int *R, int ma, int mb){ int m = R[3]; ma += R[4] + m; mb += R[5] + m; if( ma*mb>DIFF_ALIGN_MX ) return 0; return m<=2 || m<=(R[1]+R[2]+R[4]+R[5])/8; } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | 26258 26259 26260 26261 26262 26263 26264 26265 26266 26267 26268 26269 26270 26271 26272 26273 26274 26275 26276 26277 26278 26279 26280 26281 26282 26283 26284 26285 26286 26287 26288 26289 26290 26291 26292 26293 26294 26295 26296 26297 26298 26299 26300 26301 26302 26303 26304 26305 26306 26307 26308 26309 26310 26311 26312 26313 26314 26315 26316 26317 26318 26319 26320 26321 26322 26323 26324 26325 26326 26327 26328 26329 26330 26331 26332 26333 26334 26335 26336 26337 26338 26339 26340 26341 26342 26343 26344 26345 26346 26347 26348 26349 26350 26351 26352 26353 26354 26355 26356 26357 26358 26359 26360 26361 26362 26363 26364 26365 26366 26367 26368 26369 26370 26371 26372 26373 26374 26375 26376 26377 26378 26379 26380 26381 26382 26383 26384 26385 26386 26387 26388 26389 26390 26391 26392 26393 26394 26395 26396 26397 26398 26399 26400 26401 26402 26403 26404 26405 26406 26407 26408 26409 26410 26411 26412 26413 26414 26415 26416 | /* ** The threshold at which diffBlockAlignment transitions from the ** O(N*N) Wagner minimum-edit-distance algorithm to a less process ** O(NlogN) divide-and-conquer approach. */ #define DIFF_ALIGN_MX 1225 /** FSL_DIFF_SMALL_GAP=0 is a temporary(? as of 2022-01-04) patch for a cosmetic-only (but unsightly) quirk of the diff engine where it produces a pair of identical DELETE/INSERT lines. Richard's preliminary solution for it is to remove the "small gap merging," but he notes (in fossil /chat) that he's not recommending this as "the" fix. PS: we colloquially know this as "the lineno diff" because it was first reported in a diff which resulted in: ``` - int lineno; + int lineno; ``` (No, there are no whitespace changes there.) To reiterate, though: this is not a "bug," in that it does not cause incorrect results when applying the resulting unfified-diff patches. It does, however, cause confusion for human users. Here are two inputs which, when diffed, expose the lineno behavior: #1: ``` struct fnc_diff_view_state { int first_line_onscreen; int last_line_onscreen; int diff_flags; int context; int sbs; int matched_line; int current_line; int lineno; size_t ncols; size_t nlines; off_t *line_offsets; bool eof; bool colour; bool showmeta; bool showln; }; ``` #2: ``` struct fnc_diff_view_state { int first_line_onscreen; int last_line_onscreen; int diff_flags; int context; int sbs; int matched_line; int selected_line; int lineno; int gtl; size_t ncols; size_t nlines; off_t *line_offsets; bool eof; bool colour; bool showmeta; bool showln; }; ``` Result without this patch: ``` Index: X.0 ================================================================== --- X.0 +++ X.1 @@ -3,15 +3,16 @@ int last_line_onscreen; int diff_flags; int context; int sbs; int matched_line; + int selected_line; - int current_line; - int lineno; + int lineno; + int gtl; size_t ncols; size_t nlines; off_t *line_offsets; bool eof; bool colour; bool showmeta; bool showln; }; ``` And with the patch: ``` Index: X.0 ================================================================== --- X.0 +++ X.1 @@ -3,15 +3,16 @@ int last_line_onscreen; int diff_flags; int context; int sbs; int matched_line; - int current_line; + int selected_line; int lineno; + int gtl; size_t ncols; size_t nlines; off_t *line_offsets; bool eof; bool colour; bool showmeta; bool showln; }; ``` */ #define FSL_DIFF_SMALL_GAP 0 #if FSL_DIFF_SMALL_GAP /* ** R[] is an array of six integer, two COPY/DELETE/INSERT triples for a ** pair of adjacent differences. Return true if the gap between these ** two differences is so small that they should be rendered as a single ** edit. */ static int smallGap2(const int *R, int ma, int mb){ int m = R[3]; ma += R[4] + m; mb += R[5] + m; if( ma*mb>DIFF_ALIGN_MX ) return 0; return m<=2 || m<=(R[1]+R[2]+R[4]+R[5])/8; } #endif static unsigned short diff_opt_context_lines(fsl_dibu_opt const * opt){ const unsigned short dflt = 5; unsigned short n = opt ? opt->contextLines : dflt; if( !n && (opt->diffFlags & FSL_DIFF2_CONTEXT_ZERO)==0 ){ n = dflt; } return n; } |
︙ | ︙ | |||
26520 26521 26522 26523 26524 26525 26526 | ** each other. Insertion and deletion costs are 50. Match costs ** are between 0 and 100 where 0 is a perfect match 100 is a complete ** mismatch. */ static int diffBlockAlignment( const fsl_dline *aLeft, int nLeft, /* Text on the left */ const fsl_dline *aRight, int nRight, /* Text on the right */ | | | 26521 26522 26523 26524 26525 26526 26527 26528 26529 26530 26531 26532 26533 26534 26535 | ** each other. Insertion and deletion costs are 50. Match costs ** are between 0 and 100 where 0 is a perfect match 100 is a complete ** mismatch. */ static int diffBlockAlignment( const fsl_dline *aLeft, int nLeft, /* Text on the left */ const fsl_dline *aRight, int nRight, /* Text on the right */ fsl_dibu_opt * const pOpt, /* Configuration options */ unsigned char **pResult, /* Raw result */ unsigned *pNResult /* OUTPUT: length of result */ ){ int i, j, k; /* Loop counters */ int *a = 0; /* One row of the Wagner matrix */ int *pToFree = 0; /* Space that needs to be freed */ unsigned char *aM = 0; /* Wagner result matrix */ |
︙ | ︙ | |||
26703 26704 26705 26706 26707 26708 26709 | end: fsl_free(pToFree); return rc; } /* | | | | | > > | < | | 26704 26705 26706 26707 26708 26709 26710 26711 26712 26713 26714 26715 26716 26717 26718 26719 26720 26721 26722 26723 26724 26725 26726 26727 26728 26729 26730 26731 26732 26733 26734 26735 26736 26737 26738 26739 26740 26741 26742 26743 26744 26745 26746 26747 26748 26749 26750 26751 26752 26753 26754 26755 26756 26757 26758 26759 26760 26761 26762 26763 26764 26765 26766 26767 | end: fsl_free(pToFree); return rc; } /* ** Format a diff using a fsl_dibu object */ static int fdb__format( fsl__diff_cx * const cx, fsl_dibu * const pBuilder ){ const fsl_dline *A; /* Left side of the diff */ const fsl_dline *B; /* Right side of the diff */ fsl_dibu_opt * const pOpt = pBuilder->opt; const int *R; /* Array of COPY/DELETE/INSERT triples */ unsigned int a; /* Index of next line in A[] */ unsigned int b; /* Index of next line in B[] */ unsigned int r; /* Index into R[] */ unsigned int nr; /* Number of COPY/DELETE/INSERT triples to process */ unsigned int mxr; /* Maximum value for r */ unsigned int na, nb; /* Number of lines shown from A and B */ unsigned int i, j; /* Loop counters */ unsigned int m, ma, mb;/* Number of lines to output */ signed int skip; /* Number of lines to skip */ unsigned int contextLines; /* Lines of context above and below each change */ unsigned short passNumber = 0; int rc = 0; #define RC if(rc) goto end #define METRIC(M) if(1==passNumber) ++pBuilder->metrics.M pass_again: contextLines = diff_opt_context_lines(pOpt); skip = 0; a = b = 0; A = cx->aFrom; B = cx->aTo; R = cx->aEdit; mxr = cx->nEdit; //MARKER(("contextLines=%u, nEdit = %d, mxr=%u\n", contextLines, cx->nEdit, mxr)); while( mxr>2 && R[mxr-1]==0 && R[mxr-2]==0 ){ mxr -= 3; } pBuilder->lnLHS = pBuilder->lnRHS = 0; ++passNumber; if(pBuilder->start){ pBuilder->passNumber = passNumber; rc = pBuilder->start(pBuilder); RC; } for(r=0; r<mxr; r += 3*nr){ /* Figure out how many triples to show in a single block */ for(nr=1; R[r+nr*3]>0 && R[r+nr*3]<(int)contextLines*2; nr++){} #if 0 /* MISSING: this "should" be replaced by a stateful predicate function, probably in the fsl_dibu_opt class. */ /* If there is a regex, skip this block (generate no diff output) ** if the regex matches or does not match both insert and delete. ** Only display the block if one side matches but the other side does ** not. */ if( pOpt->pRe ){ int hideBlock = 1; |
︙ | ︙ | |||
26806 26807 26808 26809 26810 26811 26812 | for(i=1; i<nr; i++){ na += R[r+i*3]; nb += R[r+i*3]; } //MARKER(("Chunk header... a=%u, b=%u, na=%u, nb=%u, skip=%d\n", a, b, na, nb, skip)); if(pBuilder->chunkHeader | < | | | > > > > | > > > > > > > > > > > | 26808 26809 26810 26811 26812 26813 26814 26815 26816 26817 26818 26819 26820 26821 26822 26823 26824 26825 26826 26827 26828 26829 26830 26831 26832 26833 26834 26835 26836 26837 26838 26839 26840 | for(i=1; i<nr; i++){ na += R[r+i*3]; nb += R[r+i*3]; } //MARKER(("Chunk header... a=%u, b=%u, na=%u, nb=%u, skip=%d\n", a, b, na, nb, skip)); if(pBuilder->chunkHeader /* The following bit is a kludge to keep from injecting a chunk header between chunks which are directly adjacent. The problem, however, is that we cannot skip _reliably_ without also knowing how the next chunk aligns. If we skip it here, the _previous_ chunk header may well be telling the user a lie with regards to line numbers. Fossil itself does not have this issue because it generates these chunk headers directly in this routine, instead of in the diff builder, depending on a specific flag being set in builder->opt. Also (related), in that implementation, fossil will collapse chunks which are separated by less than the context distance into contiguous chunks (see below). Because we farm out the chunkHeader lines to the builder, we cannot reliably do that here. */ #if 0 && !skip #endif ){ rc = pBuilder->chunkHeader(pBuilder, (uint32_t)(na ? a+skip+1 : a+skip), (uint32_t)na, (uint32_t)(nb ? b+skip+1 : b+skip), (uint32_t)nb); |
︙ | ︙ | |||
26834 26835 26836 26837 26838 26839 26840 | //MARKER(("Show the initial common... a=%u, b=%u, m=%u, r=%u, skip=%d\n", a, b, m, r, skip)); if( skip>0 ){ if( NULL==pBuilder->chunkHeader && skip<(int)contextLines ){ /* 2021-09-27: BUG: this is incompatible with unified diff format. The generated header lines say we're skipping X lines but we then end up including lines which that header says to skip. As a workaround, we'll only run this when | | | > > | 26850 26851 26852 26853 26854 26855 26856 26857 26858 26859 26860 26861 26862 26863 26864 26865 26866 26867 | //MARKER(("Show the initial common... a=%u, b=%u, m=%u, r=%u, skip=%d\n", a, b, m, r, skip)); if( skip>0 ){ if( NULL==pBuilder->chunkHeader && skip<(int)contextLines ){ /* 2021-09-27: BUG: this is incompatible with unified diff format. The generated header lines say we're skipping X lines but we then end up including lines which that header says to skip. As a workaround, we'll only run this when pBuilder->chunkHeader is NULL, noting that fossil's diff builder interface does not have that method (and thus doesn't have this issue, instead generating chunk headers directly in this algorithm). Without this block, our "utxt" diff builder can mimic fossil's non-diff builder unified diff format, except that we add Index lines (feature or bug?). With this block, the header values output above are wrong. */ /* If the amount to skip is less that the context band, then |
︙ | ︙ | |||
26871 26872 26873 26874 26875 26876 26877 | /* Show the differences */ for(i=0; i<nr; i++){ unsigned int nAlign; unsigned char *alignment = 0; ma = R[r+i*3+1]; /* Lines on left but not on right */ mb = R[r+i*3+2]; /* Lines on right but not on left */ | > | > > > | > > | 26889 26890 26891 26892 26893 26894 26895 26896 26897 26898 26899 26900 26901 26902 26903 26904 26905 26906 26907 26908 26909 26910 26911 26912 26913 26914 26915 26916 26917 26918 26919 26920 26921 26922 26923 26924 26925 26926 26927 26928 26929 26930 26931 26932 26933 26934 26935 26936 26937 26938 26939 26940 26941 26942 26943 26944 26945 26946 26947 26948 26949 26950 26951 26952 26953 26954 26955 26956 26957 26958 26959 | /* Show the differences */ for(i=0; i<nr; i++){ unsigned int nAlign; unsigned char *alignment = 0; ma = R[r+i*3+1]; /* Lines on left but not on right */ mb = R[r+i*3+2]; /* Lines on right but not on left */ #if FSL_DIFF_SMALL_GAP /* Try merging the current block with subsequent blocks, if the ** subsequent blocks are nearby and their result isn't too big. */ while( i<nr-1 && smallGap2(&R[r+i*3],ma,mb) ){ i++; m = R[r+i*3]; ma += R[r+i*3+1] + m; mb += R[r+i*3+2] + m; } #endif /* Try to find an alignment for the lines within this one block */ rc = diffBlockAlignment(&A[a], ma, &B[b], mb, pOpt, &alignment, &nAlign); RC; for(j=0; ma+mb>0; j++){ assert( j<nAlign ); switch( alignment[j] ){ case 1: { /* Delete one line from the left */ METRIC(deletions); rc = pBuilder->deletion(pBuilder, &A[a]); if(rc) goto bail; ma--; a++; break; } case 2: { /* Insert one line on the right */ METRIC(insertions); rc = pBuilder->insertion(pBuilder, &B[b]); if(rc) goto bail; assert( mb>0 ); mb--; b++; break; } case 3: { /* The left line is changed into the right line */ if( 0==cx->cmpLine(&A[a], &B[b]) ){ rc = pBuilder->common(pBuilder, &A[a]); }else{ METRIC(edits); rc = pBuilder->edit(pBuilder, &A[a], &B[b]); } if(rc) goto bail; assert( ma>0 && mb>0 ); ma--; mb--; a++; b++; break; } case 4: { /* Delete from left then separately insert on the right */ METRIC(replacements); rc = pBuilder->replacement(pBuilder, &A[a], &B[b]); if(rc) goto bail; ma--; a++; mb--; b++; break; |
︙ | ︙ | |||
26966 26967 26968 26969 26970 26971 26972 26973 26974 26975 26976 26977 26978 26979 | RC; } if( R[r]>(int)contextLines ){ rc = pBuilder->skip(pBuilder, R[r] - contextLines); } end: #undef RC if(0==rc){ if(pBuilder->finish) pBuilder->finish(pBuilder); if(pBuilder->twoPass && 1==passNumber){ goto pass_again; } } return rc; | > | 26990 26991 26992 26993 26994 26995 26996 26997 26998 26999 27000 27001 27002 27003 27004 | RC; } if( R[r]>(int)contextLines ){ rc = pBuilder->skip(pBuilder, R[r] - contextLines); } end: #undef RC #undef METRIC if(0==rc){ if(pBuilder->finish) pBuilder->finish(pBuilder); if(pBuilder->twoPass && 1==passNumber){ goto pass_again; } } return rc; |
︙ | ︙ | |||
26994 26995 26996 26997 26998 26999 27000 | it. On error, *outRaw is not modified but pBuilder may have emitted partial output. That is not knowable for the general case. Ownership of pBuilder is not changed. If pBuilder is not NULL then pBuilder->opt must be non-NULL. */ static int fsl_diff2_text_impl(fsl_buffer const *pA, fsl_buffer const *pB, | | | | | 27019 27020 27021 27022 27023 27024 27025 27026 27027 27028 27029 27030 27031 27032 27033 27034 27035 27036 27037 27038 27039 27040 | it. On error, *outRaw is not modified but pBuilder may have emitted partial output. That is not knowable for the general case. Ownership of pBuilder is not changed. If pBuilder is not NULL then pBuilder->opt must be non-NULL. */ static int fsl_diff2_text_impl(fsl_buffer const *pA, fsl_buffer const *pB, fsl_dibu * const pBuilder, fsl_dibu_opt const * const opt_, int ** outRaw){ int rc = 0; fsl__diff_cx c = fsl__diff_cx_empty; bool ignoreWs = false; int ansiOptCount = 0; fsl_dibu_opt opt = *opt_ /*we need a copy for the sake of the FSL_DIFF2_INVERT flag*/; if(!pA || !pB || (pBuilder && outRaw)) return FSL_RC_MISUSE; blob_to_utf8_no_bom(pA, 0); blob_to_utf8_no_bom(pB, 0); if( opt.diffFlags & FSL_DIFF2_INVERT ){ |
︙ | ︙ | |||
27082 27083 27084 27085 27086 27087 27088 | - DIFF_NUMSTAT flag is not implemented. For that matter, flags which result in output going anywhere except for pBuilder->out are not implemented here, e.g. DIFF_RAW. That last point makes this impl tiny compared to the original! */ if(pBuilder){ | | | | | > > < < < < < | | | | | | | > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > > > > > > > > > > | > > > > > | | | > > > > > > > | | | | | > | | > > > > > > | | | > | > > > > > | | | > | > > > > > | | | | | > > > | > > | | > > > > > > | | | | > | | | > > > > > > > > > > > > > > > < < | | | | | | | > | > > > > > > | > | > > > > > > | > | | > > | | > | > | > > | 27107 27108 27109 27110 27111 27112 27113 27114 27115 27116 27117 27118 27119 27120 27121 27122 27123 27124 27125 27126 27127 27128 27129 27130 27131 27132 27133 27134 27135 27136 27137 27138 27139 27140 27141 27142 27143 27144 27145 27146 27147 27148 27149 27150 27151 27152 27153 27154 27155 27156 27157 27158 27159 27160 27161 27162 27163 27164 27165 27166 27167 27168 27169 27170 27171 27172 27173 27174 27175 27176 27177 27178 27179 27180 27181 27182 27183 27184 27185 27186 27187 27188 27189 27190 27191 27192 27193 27194 27195 27196 27197 27198 27199 27200 27201 27202 27203 27204 27205 27206 27207 27208 27209 27210 27211 27212 27213 27214 27215 27216 27217 27218 27219 27220 27221 27222 27223 27224 27225 27226 27227 27228 27229 27230 27231 27232 27233 27234 27235 27236 27237 27238 27239 27240 27241 27242 27243 27244 27245 27246 27247 27248 27249 27250 27251 27252 27253 27254 27255 27256 27257 27258 27259 27260 27261 27262 27263 27264 27265 27266 27267 27268 27269 27270 27271 27272 27273 27274 27275 27276 27277 27278 27279 27280 27281 27282 27283 27284 27285 27286 27287 27288 27289 27290 27291 27292 27293 27294 27295 27296 27297 27298 27299 27300 27301 27302 27303 27304 27305 27306 27307 27308 27309 27310 27311 27312 27313 27314 27315 27316 27317 27318 27319 27320 27321 27322 27323 27324 27325 27326 27327 27328 27329 27330 27331 27332 27333 27334 27335 27336 27337 27338 27339 27340 27341 27342 27343 27344 27345 27346 27347 27348 27349 27350 27351 27352 27353 27354 27355 27356 27357 27358 27359 27360 27361 27362 27363 27364 27365 27366 27367 27368 27369 27370 27371 27372 27373 27374 27375 27376 27377 27378 27379 27380 27381 27382 27383 27384 27385 27386 27387 27388 27389 27390 27391 27392 27393 27394 27395 27396 27397 27398 27399 27400 27401 27402 27403 27404 27405 27406 27407 27408 27409 27410 27411 27412 27413 27414 27415 27416 27417 27418 27419 27420 27421 27422 27423 27424 27425 27426 27427 27428 27429 27430 27431 27432 27433 27434 27435 27436 27437 27438 27439 27440 27441 27442 27443 27444 27445 27446 27447 27448 27449 27450 27451 27452 27453 27454 27455 27456 27457 27458 27459 27460 27461 27462 27463 27464 27465 27466 27467 27468 27469 27470 27471 27472 27473 27474 27475 27476 27477 27478 27479 27480 27481 27482 27483 27484 27485 27486 27487 27488 27489 27490 27491 27492 27493 27494 27495 27496 27497 27498 27499 27500 27501 27502 27503 27504 27505 27506 27507 27508 27509 27510 27511 27512 | - DIFF_NUMSTAT flag is not implemented. For that matter, flags which result in output going anywhere except for pBuilder->out are not implemented here, e.g. DIFF_RAW. That last point makes this impl tiny compared to the original! */ if(pBuilder){ fsl_dibu_opt * const oldOpt = pBuilder->opt; pBuilder->opt = &opt; rc = fdb__format(&c, pBuilder); pBuilder->opt = oldOpt; } end: if(0==rc && outRaw){ *outRaw = c.aEdit; c.aEdit = 0; } fsl__diff_cx_clean(&c); return rc; } int fsl_diff_v2(fsl_buffer const * pv1, fsl_buffer const * pv2, fsl_dibu * const pBuilder){ return fsl_diff2_text_impl(pv1, pv2, pBuilder, pBuilder->opt, NULL); } int fsl_diff_v2_raw(fsl_buffer const * pv1, fsl_buffer const * pv2, fsl_dibu_opt const * const opt, int **outRaw ){ return fsl_diff2_text_impl(pv1, pv2, NULL, opt ? opt : &fsl_dibu_opt_empty, outRaw); } fsl_dibu * fsl_dibu_alloc(fsl_size_t extra){ fsl_dibu * rc = (fsl_dibu*)fsl_malloc(sizeof(fsl_dibu) + extra); if(rc){ *rc = fsl_dibu_empty; if(extra){ rc->pimpl = ((unsigned char *)rc)+sizeof(fsl_dibu); } } return rc; } static int fdb__out(fsl_dibu *const b, char const *z, fsl_int_t n){ if(n<0) n = (fsl_int_t)fsl_strlen(z); return b->opt->out(b->opt->outState, z, (fsl_size_t)n); } static int fdb__outf(fsl_dibu * const b, char const *fmt, ...){ int rc = 0; va_list va; assert(b->opt->out); va_start(va,fmt); rc = fsl_appendfv(b->opt->out, b->opt->outState, fmt, va); va_end(va); return rc; } /** Column indexes for DiffCounter::cols. */ enum DiffCounterCols { DICO_NUM1 = 0, DICO_TEXT1, DICO_MOD, DICO_NUM2, DICO_TEXT2, DICO_count }; /** Internal state for the text-mode split diff builder. Used for calculating column widths in the builder's first pass so that the second pass can output everything in a uniform width. */ struct DiffCounter { /** Largest column width we've yet seen. These are only updated for DICO_TEXT1 and DICO_TEXT2. The others currently have fixed widths. FIXME: these are in bytes, not text columns. The current code may truncate multibyte characters. */ uint32_t maxWidths[DICO_count]; /** Max line numbers seen for the LHS/RHS input files. This is likely much higher than the number of diff lines. This can be used, e.g., to size and allocate a curses PAD in the second pass of the start() method. */ uint32_t lineCount[2]; /** The actual number of lines needed for rendering the file. */ uint32_t displayLines; }; typedef struct DiffCounter DiffCounter; static const DiffCounter DiffCounter_empty = {{1,10,3,1,10},{0,0},0}; #define DICOSTATE(VNAME) DiffCounter * const VNAME = (DiffCounter *)b->pimpl static int maxColWidth(fsl_dibu const * const b, DiffCounter const * const sst, int mwIndex){ static const short minColWidth = 10/*b->opt.columnWidth values smaller than this are treated as this value*/; switch(mwIndex){ case DICO_NUM1: case DICO_NUM2: case DICO_MOD: return sst->maxWidths[mwIndex]; case DICO_TEXT1: case DICO_TEXT2: break; default: assert(!"internal API misuse: invalid column index."); break; } int const y = (b->opt->columnWidth>0 && b->opt->columnWidth<=sst->maxWidths[mwIndex]) ? (int)b->opt->columnWidth : (int)sst->maxWidths[mwIndex]; return minColWidth > y ? minColWidth : y; } static void fdb__dico_update_maxlen(DiffCounter * const sst, int col, char const * const z, uint32_t n){ if(sst->maxWidths[col]<n){ #if 0 sst->maxWidths[col] = n; #else n = (uint32_t)fsl_strlen_utf8(z, (fsl_int_t)n); if(sst->maxWidths[col]<n) sst->maxWidths[col] = n; #endif } } static int fdb__debug_start(fsl_dibu * const b){ int rc = fdb__outf(b, "DEBUG builder starting pass #%d.\n", b->passNumber); if(1==b->passNumber){ DICOSTATE(sst); *sst = DiffCounter_empty; if(b->opt->nameLHS) ++sst->displayLines; if(b->opt->nameRHS) ++sst->displayLines; if(b->opt->hashLHS) ++sst->displayLines; if(b->opt->hashRHS) ++sst->displayLines; ++b->fileCount; return rc; } if(0==rc && b->opt->nameLHS){ rc = fdb__outf(b,"LHS: %s\n", b->opt->nameLHS); } if(0==rc && b->opt->nameRHS){ rc = fdb__outf(b,"RHS: %s\n", b->opt->nameRHS); } if(0==rc && b->opt->hashLHS){ rc = fdb__outf(b,"LHS hash: %s\n", b->opt->hashLHS); } if(0==rc && b->opt->hashRHS){ rc = fdb__outf(b,"RHS hash: %s\n", b->opt->hashRHS); } return rc; } static int fdb__debug_chunkHeader(fsl_dibu* const b, uint32_t lnnoLHS, uint32_t linesLHS, uint32_t lnnoRHS, uint32_t linesRHS ){ #if 1 if(1==b->passNumber){ DICOSTATE(sst); ++sst->displayLines; return 0; } return fdb__outf(b, "@@ -%" PRIu32 ",%" PRIu32 " +%" PRIu32 ",%" PRIu32 " @@\n", lnnoLHS, linesLHS, lnnoRHS, linesRHS); #else return 0; #endif } static int fdb__debug_skip(fsl_dibu * const b, uint32_t n){ if(1==b->passNumber){ DICOSTATE(sst); b->lnLHS += n; b->lnRHS += n; ++sst->displayLines; return 0; } const int rc = fdb__outf(b, "SKIP %u (%u..%u left and %u..%u right)\n", n, b->lnLHS+1, b->lnLHS+n, b->lnRHS+1, b->lnRHS+n); b->lnLHS += n; b->lnRHS += n; return rc; } static int fdb__debug_common(fsl_dibu * const b, fsl_dline const * pLine){ DICOSTATE(sst); ++b->lnLHS; ++b->lnRHS; if(1==b->passNumber){ ++sst->displayLines; fdb__dico_update_maxlen(sst, DICO_TEXT1, pLine->z, pLine->n); fdb__dico_update_maxlen(sst, DICO_TEXT2, pLine->z, pLine->n); return 0; } return fdb__outf(b, "COMMON %8u %8u %.*s\n", b->lnLHS, b->lnRHS, (int)pLine->n, pLine->z); } static int fdb__debug_insertion(fsl_dibu * const b, fsl_dline const * pLine){ DICOSTATE(sst); ++b->lnRHS; if(1==b->passNumber){ ++sst->displayLines; fdb__dico_update_maxlen(sst, DICO_TEXT1, pLine->z, pLine->n); return 0; } return fdb__outf(b, "INSERT %8u %.*s\n", b->lnRHS, (int)pLine->n, pLine->z); } static int fdb__debug_deletion(fsl_dibu * const b, fsl_dline const * pLine){ DICOSTATE(sst); ++b->lnLHS; if(1==b->passNumber){ ++sst->displayLines; fdb__dico_update_maxlen(sst, DICO_TEXT2, pLine->z, pLine->n); return 0; } return fdb__outf(b, "DELETE %8u %.*s\n", b->lnLHS, (int)pLine->n, pLine->z); } static int fdb__debug_replacement(fsl_dibu * const b, fsl_dline const * lineLhs, fsl_dline const * lineRhs) { #if 0 int rc = b->deletion(b, lineLhs); if(0==rc) rc = b->insertion(b, lineRhs); return rc; #else DICOSTATE(sst); ++b->lnLHS; ++b->lnRHS; if(1==b->passNumber){ ++sst->displayLines; fdb__dico_update_maxlen(sst, DICO_TEXT1, lineLhs->z, lineLhs->n); fdb__dico_update_maxlen(sst, DICO_TEXT2, lineRhs->z, lineRhs->n); return 0; } int rc = fdb__outf(b, "REPLACE %8u %.*s\n", b->lnLHS, (int)lineLhs->n, lineLhs->z); if(!rc){ rc = fdb__outf(b, " %8u %.*s\n", b->lnRHS, (int)lineRhs->n, lineRhs->z); } return rc; #endif } static int fdb__debug_edit(fsl_dibu * const b, fsl_dline const * lineLHS, fsl_dline const * lineRHS){ #if 0 int rc = b->deletion(b, lineLHS); if(0==rc) rc = b->insertion(b, lineRHS); return rc; #else int rc = 0; DICOSTATE(sst); ++b->lnLHS; ++b->lnRHS; if(1==b->passNumber){ sst->displayLines += 4 /* this is actually 3 or 4, but we don't know that from here */; fdb__dico_update_maxlen(sst, DICO_TEXT1, lineLHS->z, lineLHS->n); fdb__dico_update_maxlen(sst, DICO_TEXT2, lineRHS->z, lineRHS->n); return 0; } int i, j; int x; fsl_dline_change chng = fsl_dline_change_empty; #define RC if(rc) goto end rc = fdb__outf(b, "EDIT %8u %.*s\n", b->lnLHS, (int)lineLHS->n, lineLHS->z); RC; fsl_dline_change_spans(lineLHS, lineRHS, &chng); for(i=x=0; i<chng.n; i++){ int ofst = chng.a[i].iStart1; int len = chng.a[i].iLen1; if( len ){ char c = '0' + i; if( x==0 ){ rc = fdb__outf(b, "%*s", 26, ""); RC; } while( ofst > x ){ if( (lineLHS->z[x]&0xc0)!=0x80 ){ rc = fdb__out(b, " ", 1); RC; } x++; } for(j=0; j<len; j++, x++){ if( (lineLHS->z[x]&0xc0)!=0x80 ){ rc = fdb__out(b, &c, 1); RC; } } } } if( x ){ rc = fdb__out(b, "\n", 1); RC; } rc = fdb__outf(b, " %8u %.*s\n", b->lnRHS, (int)lineRHS->n, lineRHS->z); RC; for(i=x=0; i<chng.n; i++){ int ofst = chng.a[i].iStart2; int len = chng.a[i].iLen2; if( len ){ char c = '0' + i; if( x==0 ){ rc = fdb__outf(b, "%*s", 26, ""); RC; } while( ofst > x ){ if( (lineRHS->z[x]&0xc0)!=0x80 ){ rc = fdb__out(b, " ", 1); RC; } x++; } for(j=0; j<len; j++, x++){ if( (lineRHS->z[x]&0xc0)!=0x80 ){ rc = fdb__out(b, &c, 1); RC; } } } } if( x ){ rc = fdb__out(b, "\n", 1); } end: #undef RC return rc; #endif } static int fdb__debug_finish(fsl_dibu * const b){ DICOSTATE(sst); if(1==b->passNumber){ sst->lineCount[0] = b->lnLHS; sst->lineCount[1] = b->lnRHS; return 0; } int rc = fdb__outf(b, "END with %u LHS file lines " "and %u RHS lines (max. %u display lines)\n", b->lnLHS, b->lnRHS, sst->displayLines); if(0==rc){ rc = fdb__outf(b,"Col widths: num left=%u, col left=%u, " "modifier=%u, num right=%u, col right=%u\n", sst->maxWidths[0], sst->maxWidths[1], sst->maxWidths[2], sst->maxWidths[3], sst->maxWidths[4]); } return rc; } void fsl_dibu_finalizer(fsl_dibu * const b){ *b = fsl_dibu_empty; fsl_free(b); } static fsl_dibu * fsl__diff_builder_debug(void){ fsl_dibu * rc = fsl_dibu_alloc((fsl_size_t)sizeof(DiffCounter)); if(rc){ rc->chunkHeader = fdb__debug_chunkHeader; rc->start = fdb__debug_start; rc->skip = fdb__debug_skip; rc->common = fdb__debug_common; rc->insertion = fdb__debug_insertion; rc->deletion = fdb__debug_deletion; rc->replacement = fdb__debug_replacement; rc->edit = fdb__debug_edit; rc->finish = fdb__debug_finish; rc->finalize = fsl_dibu_finalizer; rc->twoPass = true; assert(0!=rc->pimpl); DiffCounter * const sst = (DiffCounter*)rc->pimpl; *sst = DiffCounter_empty; assert(0==rc->implFlags); assert(0==rc->lnLHS); assert(0==rc->lnRHS); assert(NULL==rc->opt); } return rc; } |
︙ | ︙ | |||
27342 27343 27344 27345 27346 27347 27348 | ** ** The SUBARRAY is an array of 3*N+1 strings with N>=0. The triples ** represent common-text, left-text, and right-text. The last string ** in SUBARRAY is the common-suffix. Any string can be empty if it does ** not apply. */ | | | | | | | | | | | | > > > | | | | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > | | | | > > | > | > | > > > > > | > | | | | | > > > | > > | > > > | | | | > | > | > > | | | > > | > | > > > > > > > > | | | | | > > > | > > > > | | > | | > > > > > > > | > > | > > > | > > > | > | | | | > > | < > > > > | | | | | | | | | | | | | | | | > | > > > > > > > > > > > | | | | | > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | | | | | | | | | | | | | | | < < < < < < < < < < < < < < | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > | > | | | 27530 27531 27532 27533 27534 27535 27536 27537 27538 27539 27540 27541 27542 27543 27544 27545 27546 27547 27548 27549 27550 27551 27552 27553 27554 27555 27556 27557 27558 27559 27560 27561 27562 27563 27564 27565 27566 27567 27568 27569 27570 27571 27572 27573 27574 27575 27576 27577 27578 27579 27580 27581 27582 27583 27584 27585 27586 27587 27588 27589 27590 27591 27592 27593 27594 27595 27596 27597 27598 27599 27600 27601 27602 27603 27604 27605 27606 27607 27608 27609 27610 27611 27612 27613 27614 27615 27616 27617 27618 27619 27620 27621 27622 27623 27624 27625 27626 27627 27628 27629 27630 27631 27632 27633 27634 27635 27636 27637 27638 27639 27640 27641 27642 27643 27644 27645 27646 27647 27648 27649 27650 27651 27652 27653 27654 27655 27656 27657 27658 27659 27660 27661 27662 27663 27664 27665 27666 27667 27668 27669 27670 27671 27672 27673 27674 27675 27676 27677 27678 27679 27680 27681 27682 27683 27684 27685 27686 27687 27688 27689 27690 27691 27692 27693 27694 27695 27696 27697 27698 27699 27700 27701 27702 27703 27704 27705 27706 27707 27708 27709 27710 27711 27712 27713 27714 27715 27716 27717 27718 27719 27720 27721 27722 27723 27724 27725 27726 27727 27728 27729 27730 27731 27732 27733 27734 27735 27736 27737 27738 27739 27740 27741 27742 27743 27744 27745 27746 27747 27748 27749 27750 27751 27752 27753 27754 27755 27756 27757 27758 27759 27760 27761 27762 27763 27764 27765 27766 27767 27768 27769 27770 27771 27772 27773 27774 27775 27776 27777 27778 27779 27780 27781 27782 27783 27784 27785 27786 27787 27788 27789 27790 27791 27792 27793 27794 27795 27796 27797 27798 27799 27800 27801 27802 27803 27804 27805 27806 27807 27808 27809 27810 27811 27812 27813 27814 27815 27816 27817 27818 27819 27820 27821 27822 27823 27824 27825 27826 27827 27828 27829 27830 27831 27832 27833 27834 27835 27836 27837 27838 27839 27840 27841 27842 27843 27844 27845 27846 27847 27848 27849 27850 27851 27852 27853 27854 27855 27856 27857 27858 27859 27860 27861 27862 27863 27864 27865 27866 27867 27868 27869 27870 27871 27872 27873 27874 27875 27876 27877 27878 27879 27880 27881 27882 27883 27884 27885 27886 27887 27888 27889 27890 27891 27892 27893 27894 27895 27896 27897 27898 27899 27900 27901 27902 27903 27904 27905 27906 27907 27908 27909 27910 27911 27912 27913 27914 27915 27916 27917 27918 27919 27920 27921 27922 27923 27924 27925 27926 27927 27928 27929 27930 27931 27932 27933 27934 27935 27936 27937 27938 27939 27940 27941 27942 27943 27944 27945 27946 27947 27948 27949 27950 27951 27952 27953 27954 27955 27956 27957 27958 27959 27960 27961 27962 27963 27964 27965 27966 27967 27968 27969 27970 27971 27972 27973 27974 27975 27976 27977 27978 27979 27980 27981 27982 27983 27984 27985 27986 27987 27988 27989 27990 27991 27992 27993 27994 27995 27996 27997 27998 27999 28000 28001 28002 28003 28004 28005 28006 28007 28008 28009 28010 28011 28012 28013 28014 28015 28016 28017 28018 28019 28020 28021 28022 28023 28024 28025 28026 28027 28028 28029 28030 28031 28032 28033 28034 28035 28036 28037 28038 28039 28040 28041 28042 28043 28044 28045 28046 28047 28048 28049 28050 28051 28052 28053 28054 28055 28056 28057 28058 28059 28060 28061 28062 28063 28064 28065 28066 28067 28068 28069 28070 28071 28072 28073 28074 28075 28076 28077 28078 28079 28080 28081 28082 28083 28084 28085 28086 28087 28088 28089 28090 28091 28092 28093 28094 28095 28096 28097 28098 28099 28100 28101 28102 28103 28104 28105 28106 28107 28108 28109 28110 28111 28112 28113 28114 28115 28116 28117 28118 28119 28120 28121 28122 28123 28124 28125 28126 28127 28128 28129 28130 28131 28132 28133 28134 28135 28136 28137 28138 28139 28140 28141 28142 28143 28144 28145 28146 28147 28148 28149 28150 28151 28152 28153 28154 28155 28156 28157 28158 28159 28160 28161 28162 28163 28164 28165 28166 28167 28168 28169 28170 28171 28172 28173 28174 28175 28176 28177 28178 28179 28180 28181 28182 28183 28184 28185 28186 28187 28188 28189 28190 28191 28192 28193 28194 28195 28196 28197 28198 28199 28200 28201 28202 28203 28204 28205 28206 28207 28208 28209 28210 28211 28212 28213 28214 28215 28216 28217 28218 28219 28220 28221 28222 28223 28224 28225 28226 28227 28228 28229 28230 28231 28232 28233 28234 28235 28236 28237 28238 28239 28240 28241 28242 28243 28244 28245 28246 28247 28248 28249 28250 28251 28252 28253 28254 28255 28256 28257 28258 28259 28260 28261 28262 28263 28264 28265 28266 28267 28268 28269 28270 28271 28272 28273 28274 28275 28276 28277 28278 28279 28280 28281 28282 28283 28284 28285 28286 28287 28288 28289 28290 28291 28292 28293 28294 28295 28296 28297 28298 28299 28300 28301 28302 28303 28304 28305 28306 28307 28308 28309 28310 28311 28312 28313 28314 28315 28316 28317 28318 28319 28320 28321 28322 28323 28324 28325 28326 28327 28328 28329 28330 28331 28332 28333 28334 28335 28336 28337 28338 28339 28340 28341 28342 28343 28344 28345 28346 28347 28348 28349 28350 28351 28352 28353 28354 28355 28356 | ** ** The SUBARRAY is an array of 3*N+1 strings with N>=0. The triples ** represent common-text, left-text, and right-text. The last string ** in SUBARRAY is the common-suffix. Any string can be empty if it does ** not apply. */ static int fdb__outj(fsl_dibu * const b, char const *zJson, int n){ return n<0 ? fdb__outf(b, "%!j", zJson) : fdb__outf(b, "%!.*j", n, zJson); } static int fdb__json1_start(fsl_dibu * const b){ int rc = fdb__outf(b, "{\"hashLHS\": %!j, \"hashRHS\": %!j, ", b->opt->hashLHS, b->opt->hashRHS); if(0==rc && b->opt->nameLHS){ rc = fdb__outf(b, "\"nameLHS\": %!j, ", b->opt->nameLHS); } if(0==rc && b->opt->nameRHS){ rc = fdb__outf(b, "\"nameRHS\": %!j, ", b->opt->nameRHS); } if(0==rc){ rc = fdb__out(b, "\"diff\":[", 8); } return rc; } static int fdb__json1_skip(fsl_dibu * const b, uint32_t n){ return fdb__outf(b, "1,%" PRIu32 ",\n", n); } static int fdb__json1_common(fsl_dibu * const b, fsl_dline const * pLine){ int rc = fdb__out(b, "2,",2); if(!rc) { rc = fdb__outj(b, pLine->z, (int)pLine->n); if(!rc) rc = fdb__out(b, ",\n",2); } return rc; } static int fdb__json1_insertion(fsl_dibu * const b, fsl_dline const * pLine){ int rc = fdb__out(b, "3,",2); if(!rc){ rc = fdb__outj(b, pLine->z, (int)pLine->n); if(!rc) rc = fdb__out(b, ",\n",2); } return rc; } static int fdb__json1_deletion(fsl_dibu * const b, fsl_dline const * pLine){ int rc = fdb__out(b, "4,",2); if(!rc){ rc = fdb__outj(b, pLine->z, (int)pLine->n); if(!rc) rc = fdb__out(b, ",\n",2); } return rc; } static int fdb__json1_replacement(fsl_dibu * const b, fsl_dline const * lineLhs, fsl_dline const * lineRhs) { int rc = fdb__out(b, "5,[\"\",",6); if(!rc) rc = fdb__outf(b,"%!.*j", (int)lineLhs->n, lineLhs->z); if(!rc) rc = fdb__out(b, ",", 1); if(!rc) rc = fdb__outf(b,"%!.*j", (int)lineRhs->n, lineRhs->z); if(!rc) rc = fdb__out(b, ",\"\"],\n",6); return rc; } static int fdb__json1_edit(fsl_dibu * const b, fsl_dline const * lineLHS, fsl_dline const * lineRHS){ int rc = 0; int i,x; fsl_dline_change chng = fsl_dline_change_empty; #define RC if(rc) goto end rc = fdb__out(b, "5,[", 3); RC; fsl_dline_change_spans(lineLHS, lineRHS, &chng); for(i=x=0; i<(int)chng.n; i++){ if(i>0){ rc = fdb__out(b, ",", 1); RC; } rc = fdb__outj(b, lineLHS->z + x, (int)chng.a[i].iStart1 - x); RC; x = chng.a[i].iStart1; rc = fdb__out(b, ",", 1); RC; rc = fdb__outj(b, lineLHS->z + x, (int)chng.a[i].iLen1); RC; x += chng.a[i].iLen1; rc = fdb__out(b, ",", 1); RC; rc = fdb__outj(b, lineRHS->z + chng.a[i].iStart2, (int)chng.a[i].iLen2); RC; } rc = fdb__out(b, ",", 1); RC; rc = fdb__outj(b, lineLHS->z + x, (int)(lineLHS->n - x)); RC; rc = fdb__out(b, "],\n",3); RC; end: return rc; #undef RC } static int fdb__json1_finish(fsl_dibu * const b){ return fdb__out(b, "0]}", 3); } static fsl_dibu * fsl__diff_builder_json1(void){ fsl_dibu * rc = fsl_dibu_alloc(0); if(rc){ rc->chunkHeader = NULL; rc->start = fdb__json1_start; rc->skip = fdb__json1_skip; rc->common = fdb__json1_common; rc->insertion = fdb__json1_insertion; rc->deletion = fdb__json1_deletion; rc->replacement = fdb__json1_replacement; rc->edit = fdb__json1_edit; rc->finish = fdb__json1_finish; rc->finalize = fsl_dibu_finalizer; assert(!rc->pimpl); assert(0==rc->implFlags); assert(0==rc->lnLHS); assert(0==rc->lnRHS); assert(NULL==rc->opt); } return rc; } /** State for the text-mode unified(-ish) diff builder. We do some hoop-jumping here in order to combine runs of delete/insert pairs into a group of deletes followed by a group of inserts. It's a cosmetic detail only but it makes for more readable output. */ struct DiBuUnified { /** True if currently processing a block of deletes, else false. */ bool deleting; /** Buffer for insertion lines which are part of delete/insert pairs. */ fsl_buffer bufIns; }; typedef struct DiBuUnified DiBuUnified; #define UIMPL(V) DiBuUnified * const V = (DiBuUnified*)b->pimpl /** If utxt diff builder b has any INSERT lines to flush, this flushes them. Sets b->impl->deleting to false. Returns non-0 on output error. */ static int fdb__utxt_flush_ins(fsl_dibu * const b){ int rc = 0; UIMPL(p); p->deleting = false; if(p->bufIns.used>0){ rc = fdb__out(b, fsl_buffer_cstr(&p->bufIns), p->bufIns.used); fsl_buffer_reuse(&p->bufIns); } return rc; } static int fdb__utxt_start(fsl_dibu * const b){ int rc = 0; UIMPL(p); p->deleting = false; if(p->bufIns.mem) fsl_buffer_reuse(&p->bufIns); else fsl_buffer_reserve(&p->bufIns, 1024 * 2); if(0==(FSL_DIFF2_NOINDEX & b->opt->diffFlags)){ rc = fdb__outf(b,"Index: %s\n%.66c\n", b->opt->nameLHS/*RHS?*/, '='); } if(0==rc){ rc = fdb__outf(b, "--- %s\n+++ %s\n", b->opt->nameLHS, b->opt->nameRHS); } return rc; } static int fdb__utxt_chunkHeader(fsl_dibu* const b, uint32_t lnnoLHS, uint32_t linesLHS, uint32_t lnnoRHS, uint32_t linesRHS ){ /* Annoying cosmetic bug: the libf impl of this diff will sometimes render two directly-adjecent chunks with a separator, e.g.: */ // $ f-vdiff --forat u 072d63965188 a725befe5863 -l '*vdiff*' | head -30 // Index: f-apps/f-vdiff.c // ================================================================== // --- f-apps/f-vdiff.c // +++ f-apps/f-vdiff.c // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // 36 36 fsl_buffer fname; // 37 37 fsl_buffer fcontent1; // 38 38 fsl_buffer fcontent2; // 39 39 fsl_buffer fhash; // 40 40 fsl_list globs; // 41 + fsl_dibu_opt diffOpt; // 42 + fsl_diff_builder * diffBuilder; // 41 43 } VDiffApp = { // 42 44 NULL/*glob*/, // 43 45 5/*contextLines*/, // 44 46 0/*sbsWidth*/, // 45 47 0/*diffFlags*/, // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // 46 48 0/*brief*/, // 47 49 fsl_buffer_empty_m/*fname*/, // 48 50 fsl_buffer_empty_m/*fcontent1*/, /* Note now the chunks before/after the second ~~~ line are consecutive lines of code. In fossil(1) that case is accounted for in the higher-level diff engine, which can not only collapse adjacent blocks but also does the rendering of chunk headers in that main algorithm (something we cannot do in the library because we need the fsl_dibu to be able to output to arbitrary distinations). We can only _partially_ account for it here, eliminating the extraneous ~~~ line when we're in line-number mode. In non-line-number mode we have to output the chunk header as-is. If we skip it then the _previous_ chunk header, if any, will contain incorrect numbers for the chunk, invaliding the diff for purposes of tools which import unified-format diffs. */ int rc = fdb__utxt_flush_ins(b); if(0==rc){ if(FSL_DIFF2_LINE_NUMBERS & b->opt->diffFlags){ rc = (lnnoLHS == b->lnLHS+1 && lnnoRHS == b->lnRHS+1) ? 0 : fdb__outf(b, "%.40c\n", '~'); }else{ rc = fdb__outf(b, "@@ -%" PRIu32 ",%" PRIu32 " +%" PRIu32 ",%" PRIu32 " @@\n", lnnoLHS, linesLHS, lnnoRHS, linesRHS); } } return rc; } static int fdb__utxt_skip(fsl_dibu * const b, uint32_t n){ //MARKER(("SKIP\n")); int rc = fdb__utxt_flush_ins(b); b->lnLHS += n; b->lnRHS += n; return rc; } /** Outputs line numbers, if configured to, to b->opt->out. - 2 line numbers = common lines - lnL only = deletion - lnR only = insertion */ static int fdb__utxt_lineno(fsl_dibu * const b, uint32_t lnL, uint32_t lnR){ int rc = 0; if(FSL_DIFF2_LINE_NUMBERS & b->opt->diffFlags){ UIMPL(p); if(lnL){ // common or delete rc = fdb__outf(b, "%s%6" PRIu32 "%s ", (lnR ? "" : b->opt->ansiColor.deletion), lnL, (lnR ? "" : b->opt->ansiColor.reset)); }else if(p->deleting){ // insert during deletion grouping rc = fsl_buffer_append(&p->bufIns, " ", 7); }else{ // insert w/o deleting grouping rc = fdb__out(b, " ", 7); } if(0==rc){ if(!lnL && lnR && p->deleting){ // insert during deletion grouping rc = fsl_buffer_appendf(&p->bufIns, "%s%6" PRIu32 "%s ", b->opt->ansiColor.insertion, lnR, b->opt->ansiColor.reset); }else if(lnR){ // common or insert w/o deletion grouping. rc = fdb__outf(b, "%s%6" PRIu32 "%s ", (lnL ? "" : b->opt->ansiColor.insertion), lnR, (lnL ? "" : b->opt->ansiColor.reset)); }else{ // deletion rc = fdb__out(b, " ", 7); } } } return rc; } static int fdb__utxt_common(fsl_dibu * const b, fsl_dline const * pLine){ //MARKER(("COMMON\n")); int rc = fdb__utxt_flush_ins(b); if(0==rc){ ++b->lnLHS; ++b->lnRHS; rc = fdb__utxt_lineno(b, b->lnLHS, b->lnRHS); } return rc ? rc : fdb__outf(b, " %.*s\n", (int)pLine->n, pLine->z); } static int fdb__utxt_insertion(fsl_dibu * const b, fsl_dline const * pLine){ //MARKER(("INSERT\n")); int rc; ++b->lnRHS; rc = fdb__utxt_lineno(b, 0, b->lnRHS); if(0==rc){ UIMPL(p); if(p->deleting){ rc = fsl_buffer_appendf(&p->bufIns, "%s+%.*s%s\n", b->opt->ansiColor.insertion, (int)pLine->n, pLine->z, b->opt->ansiColor.reset); }else{ rc = fdb__outf(b, "%s+%.*s%s\n", b->opt->ansiColor.insertion, (int)pLine->n, pLine->z, b->opt->ansiColor.reset); } } return rc; } static int fdb__utxt_deletion(fsl_dibu * const b, fsl_dline const * pLine){ //MARKER(("DELETE\n")); UIMPL(p); int rc = p->deleting ? 0 : fdb__utxt_flush_ins(b); if(0==rc){ p->deleting = true; ++b->lnLHS; rc = fdb__utxt_lineno(b, b->lnLHS, 0); } return rc ? rc : fdb__outf(b, "%s-%.*s%s\n", b->opt->ansiColor.deletion, (int)pLine->n, pLine->z, b->opt->ansiColor.reset); } static int fdb__utxt_replacement(fsl_dibu * const b, fsl_dline const * lineLhs, fsl_dline const * lineRhs) { //MARKER(("REPLACE\n")); int rc = b->deletion(b, lineLhs); if(0==rc) rc = b->insertion(b, lineRhs); return rc; } static int fdb__utxt_edit(fsl_dibu * const b, fsl_dline const * lineLhs, fsl_dline const * lineRhs){ //MARKER(("EDIT\n")); int rc = b->deletion(b, lineLhs); if(0==rc) rc = b->insertion(b, lineRhs); return rc; } static int fdb__utxt_finish(fsl_dibu * const b){ int rc = fdb__utxt_flush_ins(b); UIMPL(p); fsl_buffer_reuse(&p->bufIns); return rc; } static void fdb__utxt_finalize(fsl_dibu * const b){ UIMPL(p); fsl_buffer_clear(&p->bufIns); fsl_free(b); } static fsl_dibu * fsl__diff_builder_utxt(void){ const DiBuUnified DiBuUnified_empty = { false, fsl_buffer_empty_m }; fsl_dibu * rc = fsl_dibu_alloc(sizeof(DiBuUnified)); if(!rc) return NULL; assert(NULL!=rc->pimpl); assert(NULL==rc->finally); *((DiBuUnified*)rc->pimpl) = DiBuUnified_empty; rc->chunkHeader = fdb__utxt_chunkHeader; rc->start = fdb__utxt_start; rc->skip = fdb__utxt_skip; rc->common = fdb__utxt_common; rc->insertion = fdb__utxt_insertion; rc->deletion = fdb__utxt_deletion; rc->replacement = fdb__utxt_replacement; rc->edit = fdb__utxt_edit; rc->finish = fdb__utxt_finish; rc->finalize = fdb__utxt_finalize; return rc; } #undef UIMPL struct DiBuTcl { /** Buffer for TCL-format string conversion */ fsl_buffer str; }; typedef struct DiBuTcl DiBuTcl; static const DiBuTcl DiBuTcl_empty = {fsl_buffer_empty_m}; #define BR_OPEN if(FSL_DIBU_TCL_BRACES & b->implFlags) \ rc = fdb__out(b, "{", 1) #define BR_CLOSE if(FSL_DIBU_TCL_BRACES & b->implFlags) \ rc = fdb__out(b, "}", 1) #define DTCL_BUFFER(B) &((DiBuTcl*)(B)->pimpl)->str static int fdb__outtcl(fsl_dibu * const b, char const *z, unsigned int n, char chAppend ){ int rc; fsl_buffer * const o = DTCL_BUFFER(b); fsl_buffer_reuse(o); rc = fsl_buffer_append_tcl_literal(o, (b->implFlags & FSL_DIBU_TCL_BRACES_ESC), z, n); if(0==rc) rc = fdb__out(b, (char const *)o->mem, o->used); if(chAppend && 0==rc) rc = fdb__out(b, &chAppend, 1); return rc; } static int fdb__tcl_start(fsl_dibu * const b){ int rc = 0; fsl_buffer_reuse(DTCL_BUFFER(b)); if(1==++b->fileCount && FSL_DIBU_TCL_TK==(b->implFlags & FSL_DIBU_TCL_TK)){ rc = fdb__out(b, "set difftxt {\n", -1); } if(0==rc && b->fileCount>1) rc = fdb__out(b, "\n", 1); if(0==rc && b->opt->nameLHS){ char const * zRHS = b->opt->nameRHS ? b->opt->nameRHS : b->opt->nameLHS; BR_OPEN; if(0==rc) rc = fdb__out(b, "FILE ", 5); if(0==rc) rc = fdb__outtcl(b, b->opt->nameLHS, (unsigned)fsl_strlen(b->opt->nameLHS), ' '); if(0==rc) rc = fdb__outtcl(b, zRHS, (unsigned)fsl_strlen(zRHS), 0); if(0==rc) {BR_CLOSE;} if(0==rc) rc = fdb__out(b, "\n", 1); } return rc; } static int fdb__tcl_skip(fsl_dibu * const b, uint32_t n){ int rc = 0; BR_OPEN; if(0==rc) rc = fdb__outf(b, "SKIP %" PRIu32, n); if(0==rc) {BR_CLOSE;} if(0==rc) rc = fdb__outf(b, "\n", 1); return rc; } static int fdb__tcl_common(fsl_dibu * const b, fsl_dline const * pLine){ int rc = 0; BR_OPEN; if(0==rc) rc = fdb__out(b, "COM ", 5); if(0==rc) rc= fdb__outtcl(b, pLine->z, pLine->n, 0); if(0==rc) {BR_CLOSE;} if(0==rc) rc = fdb__outf(b, "\n", 1); return rc; } static int fdb__tcl_insertion(fsl_dibu * const b, fsl_dline const * pLine){ int rc = 0; BR_OPEN; if(0==rc) rc = fdb__out(b, "INS ", 5); if(0==rc) rc = fdb__outtcl(b, pLine->z, pLine->n, 0); if(0==rc) {BR_CLOSE;} if(0==rc) rc = fdb__outf(b, "\n", 1); return rc; } static int fdb__tcl_deletion(fsl_dibu * const b, fsl_dline const * pLine){ int rc = 0; BR_OPEN; if(0==rc) rc = fdb__out(b, "DEL ", 5); if(0==rc) rc = fdb__outtcl(b, pLine->z, pLine->n, 0); if(0==rc) {BR_CLOSE;} if(0==rc) rc = fdb__outf(b, "\n", 1); return rc; } static int fdb__tcl_replacement(fsl_dibu * const b, fsl_dline const * lineLhs, fsl_dline const * lineRhs) { int rc = 0; BR_OPEN; if(0==rc) rc = fdb__out(b, "EDIT \"\" ", 8); if(0==rc) rc = fdb__outtcl(b, lineLhs->z, lineLhs->n, ' '); if(0==rc) rc = fdb__outtcl(b, lineRhs->z, lineRhs->n, 0); if(0==rc) {BR_CLOSE;} if(0==rc) rc = fdb__outf(b, "\n", 1); return rc; } static int fdb__tcl_edit(fsl_dibu * const b, fsl_dline const * lineLHS, fsl_dline const * lineRHS){ int rc = 0; int i, x; fsl_dline_change chng = fsl_dline_change_empty; #define RC if(rc) goto end BR_OPEN; rc = fdb__out(b, "EDIT", 4); RC; fsl_dline_change_spans(lineLHS, lineRHS, &chng); for(i=x=0; i<chng.n; i++){ rc = fdb__out(b, " ", 1); RC; rc = fdb__outtcl(b, lineLHS->z + x, chng.a[i].iStart1 - x, ' '); RC; x = chng.a[i].iStart1; rc = fdb__outtcl(b, lineLHS->z + x, chng.a[i].iLen1, ' '); RC; x += chng.a[i].iLen1; rc = fdb__outtcl(b, lineRHS->z + chng.a[i].iStart2, chng.a[i].iLen2, 0); RC; } assert(0==rc); if( x < lineLHS->n ){ rc = fdb__out(b, " ", 1); RC; rc = fdb__outtcl(b, lineLHS->z + x, lineLHS->n - x, 0); RC; } BR_CLOSE; RC; rc = fdb__out(b, "\n", 1); end: #undef RC return rc; } static int fdb__tcl_finish(fsl_dibu * const b){ int rc = 0; #if 0 BR_CLOSE; if(0==rc && FSL_DIBU_TCL_BRACES & b->implFlags){ rc = fdb__out(b, "\n", 1); } #endif return rc; } static int fdb__tcl_finally(fsl_dibu * const b){ int rc = 0; if(FSL_DIBU_TCL_TK==(b->implFlags & FSL_DIBU_TCL_TK)){ extern char const * fsl_difftk_cstr; rc = fdb__out(b, "}\nset fossilcmd {}\n", -1); if(0==rc) fdb__out(b, fsl_difftk_cstr, -1); } return rc; } #undef BR_OPEN #undef BR_CLOSE static void fdb__tcl_finalize(fsl_dibu * const b){ fsl_buffer_clear( &((DiBuTcl*)b->pimpl)->str ); *b = fsl_dibu_empty; fsl_free(b); } static fsl_dibu * fsl__diff_builder_tcl(void){ fsl_dibu * rc = fsl_dibu_alloc((fsl_size_t)sizeof(DiBuTcl)); if(rc){ rc->chunkHeader = NULL; rc->start = fdb__tcl_start; rc->skip = fdb__tcl_skip; rc->common = fdb__tcl_common; rc->insertion = fdb__tcl_insertion; rc->deletion = fdb__tcl_deletion; rc->replacement = fdb__tcl_replacement; rc->edit = fdb__tcl_edit; rc->finish = fdb__tcl_finish; rc->finally = fdb__tcl_finally; rc->finalize = fdb__tcl_finalize; assert(0!=rc->pimpl); DiBuTcl * const dbt = (DiBuTcl*)rc->pimpl; *dbt = DiBuTcl_empty; if(fsl_buffer_reserve(&dbt->str, 120)){ rc->finalize(rc); rc = 0; } } return rc; } static int fdb__splittxt_mod(fsl_dibu * const b, char ch){ assert(2==b->passNumber); return fdb__outf(b, " %c ", ch); } static int fdb__splittxt_lineno(fsl_dibu * const b, DiffCounter const * const sst, bool isLeft, uint32_t n){ assert(2==b->passNumber); int const col = isLeft ? DICO_NUM1 : DICO_NUM2; return n ? fdb__outf(b, "%*" PRIu32 " ", sst->maxWidths[col], n) : fdb__outf(b, "%.*c ", sst->maxWidths[col], ' '); } static int fdb__splittxt_start(fsl_dibu * const b){ int rc = 0; if(1==b->passNumber){ DICOSTATE(sst); *sst = DiffCounter_empty; ++b->fileCount; return rc; } if(b->fileCount>1){ rc = fdb__out(b, "\n", 1); } if(0==rc){ fsl_dibu_opt const * const o = b->opt; if(o->nameLHS || o->nameRHS || o->hashLHS || o->hashRHS){ rc = fdb__outf(b, "--- %s%s%s\n+++ %s%s%s\n", o->nameLHS ? o->nameLHS : "", (o->nameLHS && o->hashLHS) ? " " : "", o->hashLHS ? o->hashLHS : "", o->nameRHS ? o->nameRHS : "", (o->nameRHS && o->hashRHS) ? " " : "", o->hashRHS ? o->hashRHS : ""); } } return rc; } static int fdb__splittxt_skip(fsl_dibu * const b, uint32_t n){ b->lnLHS += n; b->lnRHS += n; if(1==b->passNumber) return 0; DICOSTATE(sst); int const maxWidth1 = maxColWidth(b, sst, DICO_TEXT1); int const maxWidth2 = maxColWidth(b, sst, DICO_TEXT2); return fdb__outf(b, "%.*c %.*c %.*c %.*c\n", sst->maxWidths[DICO_NUM1], '~', maxWidth1, '~', sst->maxWidths[DICO_NUM2], '~', maxWidth2, '~'); } static int fdb__splittxt_color(fsl_dibu * const b, int modType){ char const *z = 0; switch(modType){ case (int)'i': z = b->opt->ansiColor.insertion; break; case (int)'d': z = b->opt->ansiColor.deletion; break; case (int)'r'/*replacement*/: case (int)'e': z = b->opt->ansiColor.edit; break; case 0: z = b->opt->ansiColor.reset; break; default: assert(!"invalid color op!"); } return z&&*z ? fdb__outf(b, "%s", z) : 0; } static int fdb__splittxt_side(fsl_dibu * const b, DiffCounter * const sst, bool isLeft, fsl_dline const * const pLine){ int rc = fdb__splittxt_lineno(b, sst, isLeft, pLine ? (isLeft ? b->lnLHS : b->lnRHS) : 0U); if(0==rc){ uint32_t const w = maxColWidth(b, sst, isLeft ? DICO_TEXT1 : DICO_TEXT2); if(pLine){ fsl_size_t const nU = /* Measure column width in UTF8 characters, not bytes! */ fsl_strlen_utf8(pLine->z, (fsl_int_t)pLine->n); rc = fdb__outf(b, "%#.*s", (int)(w < nU ? w : nU), pLine->z); if(0==rc && w>nU){ rc = fdb__outf(b, "%.*c", (int)(w - nU), ' '); } }else{ rc = fdb__outf(b, "%.*c", (int)w, ' '); } if(0==rc && !isLeft) rc = fdb__out(b, "\n", 1); } return rc; } static int fdb__splittxt_common(fsl_dibu * const b, fsl_dline const * const pLine){ int rc = 0; DICOSTATE(sst); ++b->lnLHS; ++b->lnRHS; if(1==b->passNumber){ fdb__dico_update_maxlen(sst, DICO_TEXT1, pLine->z, pLine->n); fdb__dico_update_maxlen(sst, DICO_TEXT2, pLine->z, pLine->n); return 0; } rc = fdb__splittxt_side(b, sst, true, pLine); if(0==rc) rc = fdb__splittxt_mod(b, ' '); if(0==rc) rc = fdb__splittxt_side(b, sst, false, pLine); return rc; } static int fdb__splittxt_insertion(fsl_dibu * const b, fsl_dline const * const pLine){ int rc = 0; DICOSTATE(sst); ++b->lnRHS; if(1==b->passNumber){ fdb__dico_update_maxlen(sst, DICO_TEXT1, pLine->z, pLine->n); return rc; } rc = fdb__splittxt_color(b, 'i'); if(0==rc) rc = fdb__splittxt_side(b, sst, true, NULL); if(0==rc) rc = fdb__splittxt_mod(b, '>'); if(0==rc) rc = fdb__splittxt_side(b, sst, false, pLine); if(0==rc) rc = fdb__splittxt_color(b, 0); return rc; } static int fdb__splittxt_deletion(fsl_dibu * const b, fsl_dline const * const pLine){ int rc = 0; DICOSTATE(sst); ++b->lnLHS; if(1==b->passNumber){ fdb__dico_update_maxlen(sst, DICO_TEXT2, pLine->z, pLine->n); return rc; } rc = fdb__splittxt_color(b, 'd'); if(0==rc) rc = fdb__splittxt_side(b, sst, true, pLine); if(0==rc) rc = fdb__splittxt_mod(b, '<'); if(0==rc) rc = fdb__splittxt_side(b, sst, false, NULL); if(0==rc) rc = fdb__splittxt_color(b, 0); return rc; } static int fdb__splittxt_replacement(fsl_dibu * const b, fsl_dline const * const lineLhs, fsl_dline const * const lineRhs) { #if 0 int rc = b->deletion(b, lineLhs); if(0==rc) rc = b->insertion(b, lineRhs); return rc; #else int rc = 0; DICOSTATE(sst); ++b->lnLHS; ++b->lnRHS; if(1==b->passNumber){ fdb__dico_update_maxlen(sst, DICO_TEXT1, lineLhs->z, lineLhs->n); fdb__dico_update_maxlen(sst, DICO_TEXT2, lineRhs->z, lineRhs->n); return 0; } rc = fdb__splittxt_color(b, 'e'); if(0==rc) rc = fdb__splittxt_side(b, sst, true, lineLhs); if(0==rc) rc = fdb__splittxt_mod(b, '|'); if(0==rc) rc = fdb__splittxt_side(b, sst, false, lineRhs); if(0==rc) rc = fdb__splittxt_color(b, 0); return rc; #endif } static int fdb__splittxt_finish(fsl_dibu * const b){ int rc = 0; if(1==b->passNumber){ DICOSTATE(sst); uint32_t ln = b->lnLHS; /* Calculate width of line number columns. */ sst->maxWidths[DICO_NUM1] = sst->maxWidths[DICO_NUM2] = 1; for(; ln>=10; ln/=10) ++sst->maxWidths[DICO_NUM1]; ln = b->lnRHS; for(; ln>=10; ln/=10) ++sst->maxWidths[DICO_NUM2]; } return rc; } static void fdb__splittxt_finalize(fsl_dibu * const b){ *b = fsl_dibu_empty; fsl_free(b); } static fsl_dibu * fsl__diff_builder_splittxt(void){ fsl_dibu * rc = fsl_dibu_alloc((fsl_size_t)sizeof(DiffCounter)); if(rc){ rc->twoPass = true; rc->chunkHeader = NULL; rc->start = fdb__splittxt_start; rc->skip = fdb__splittxt_skip; rc->common = fdb__splittxt_common; rc->insertion = fdb__splittxt_insertion; rc->deletion = fdb__splittxt_deletion; rc->replacement = fdb__splittxt_replacement; rc->edit = fdb__splittxt_replacement; rc->finish = fdb__splittxt_finish; rc->finalize = fdb__splittxt_finalize; assert(0!=rc->pimpl); DiffCounter * const sst = (DiffCounter*)rc->pimpl; *sst = DiffCounter_empty; } return rc; } int fsl_dibu_factory( fsl_dibu_e type, fsl_dibu **pOut ){ int rc = FSL_RC_TYPE; fsl_dibu * (*factory)(void) = NULL; switch(type){ case FSL_DIBU_DEBUG: factory = fsl__diff_builder_debug; break; case FSL_DIBU_JSON1: factory = fsl__diff_builder_json1; break; case FSL_DIBU_UNIFIED_TEXT: factory = fsl__diff_builder_utxt; break; case FSL_DIBU_TCL: factory = fsl__diff_builder_tcl; break; case FSL_DIBU_SPLIT_TEXT: factory = fsl__diff_builder_splittxt; break; case FSL_DIBU_INVALID: break; } if(NULL!=factory){ *pOut = factory(); rc = *pOut ? 0 : FSL_RC_OOM; } return rc; } #undef DIFF_ALIGN_MX #undef DIFF_CANNOT_COMPUTE_BINARY #undef DIFF_CANNOT_COMPUTE_SYMLINK #undef DIFF_TOO_MANY_CHANGES #undef DIFF_WHITESPACE_ONLY #undef fsl_dline_empty_m #undef MARKER #undef DTCL_BUFFER #undef blob_to_utf8_no_bom #undef DICOSTATE #undef FSL_DIFF_SMALL_GAP /* end of file ./src/diff2.c */ /* start of file ./src/encode.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
28347 28348 28349 28350 28351 28352 28353 | return (char *)b.mem /* transfer ownership */; }else{ fsl_buffer_clear(&b); return NULL; } } | | | | 28621 28622 28623 28624 28625 28626 28627 28628 28629 28630 28631 28632 28633 28634 28635 28636 | return (char *)b.mem /* transfer ownership */; }else{ fsl_buffer_clear(&b); return NULL; } } /* end of file ./src/encode.c */ /* start of file ./src/event.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
28394 28395 28396 28397 28398 28399 28400 | } return rc; } } #undef MARKER | | | | 28668 28669 28670 28671 28672 28673 28674 28675 28676 28677 28678 28679 28680 28681 28682 28683 | } return rc; } } #undef MARKER /* end of file ./src/event.c */ /* start of file ./src/fs.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
28418 28419 28420 28421 28422 28423 28424 | #include <assert.h> #include <string.h> /* strlen() */ #include <stddef.h> /* NULL on linux */ #include <ctype.h> #include <errno.h> #include <dirent.h> | | | | 28692 28693 28694 28695 28696 28697 28698 28699 28700 28701 28702 28703 28704 28705 28706 28707 28708 28709 28710 28711 28712 28713 28714 28715 28716 28717 28718 28719 | #include <assert.h> #include <string.h> /* strlen() */ #include <stddef.h> /* NULL on linux */ #include <ctype.h> #include <errno.h> #include <dirent.h> #if FSL_PLATFORM_IS_WINDOWS # define DIR _WDIR # define dirent _wdirent # define opendir _wopendir # define readdir _wreaddir # define closedir _wclosedir # include <direct.h> # include <windows.h> # include <sys/utime.h> # if !defined(ELOOP) # define ELOOP 114 /* Missing in MinGW */ # endif #else # include <unistd.h> /* access(2), readlink(2) */ # include <sys/types.h> # include <sys/time.h> #endif #include <sys/stat.h> /* Only for debugging */ #include <stdio.h> |
︙ | ︙ | |||
28534 28535 28536 28537 28538 28539 28540 | memcpy(zBuf, zPwdUtf8, nPwd+1); fsl_filename_free(zPwdUtf8); if(outLen) *outLen = nPwd; return 0; #else if(!zBuf) return FSL_RC_MISUSE; else if(!nBuf) return FSL_RC_RANGE; | | < | 28808 28809 28810 28811 28812 28813 28814 28815 28816 28817 28818 28819 28820 28821 28822 | memcpy(zBuf, zPwdUtf8, nPwd+1); fsl_filename_free(zPwdUtf8); if(outLen) *outLen = nPwd; return 0; #else if(!zBuf) return FSL_RC_MISUSE; else if(!nBuf) return FSL_RC_RANGE; else if( NULL==getcwd(zBuf,nBuf) ){ return fsl_errno_to_rc(errno, FSL_RC_IO); }else{ if(outLen) *outLen = fsl_strlen(zBuf); return 0; } #endif } |
︙ | ︙ | |||
28564 28565 28566 28567 28568 28569 28570 | #if !defined(S_ISLNK) # define S_ISLNK(x) (0) #endif /* Reminder: the semantics of the 3rd parameter are reversed from v1's fossil_stat(). */ | | | 28837 28838 28839 28840 28841 28842 28843 28844 28845 28846 28847 28848 28849 28850 28851 | #if !defined(S_ISLNK) # define S_ISLNK(x) (0) #endif /* Reminder: the semantics of the 3rd parameter are reversed from v1's fossil_stat(). */ int fsl_stat(const char *zFilename, fsl_fstat * const fst, bool derefSymlinks){ /* FIXME: port in fossil(1) win32_stat() */ if(!zFilename) return FSL_RC_MISUSE; else if(!*zFilename) return FSL_RC_RANGE; else{ int rc; struct stat buf; |
︙ | ︙ | |||
28663 28664 28665 28666 28667 28668 28669 28670 | fsl_fstat fst; return ( 0 != fsl_stat(zFilename, &fst, 1) ) ? false : (FSL_FSTAT_TYPE_FILE == fst.type); } bool fsl_is_symlink(const char *zFilename){ fsl_fstat fst; | > > > > | < | > > | 28936 28937 28938 28939 28940 28941 28942 28943 28944 28945 28946 28947 28948 28949 28950 28951 28952 28953 28954 28955 28956 28957 28958 | fsl_fstat fst; return ( 0 != fsl_stat(zFilename, &fst, 1) ) ? false : (FSL_FSTAT_TYPE_FILE == fst.type); } bool fsl_is_symlink(const char *zFilename){ #if FSL_PLATFORM_IS_WINDOWS if(zFilename){/*unused var*/} return false; #else fsl_fstat fst; return (0 == fsl_stat(zFilename, &fst, 0)) ? (FSL_FSTAT_TYPE_LINK == fst.type) : false; #endif } /* Return true if zPath is an absolute pathname. Return false if it is relative. */ bool fsl_is_absolute_path(const char *zPath){ |
︙ | ︙ | |||
28777 28778 28779 28780 28781 28782 28783 28784 28785 28786 28787 28788 28789 28790 | fsl_size_t fsl_file_simplify_name(char *z, fsl_int_t n_, bool slash){ fsl_size_t i; fsl_size_t n = (n_<0) ? fsl_strlen(z) : (fsl_size_t)n_; fsl_int_t j; /* On windows and cygwin convert all \ characters to / */ #if defined(_WIN32) || defined(__CYGWIN__) for(i=0; i<n; i++){ if( z[i]=='\\' ) z[i] = '/'; } #endif /* Removing trailing "/" characters */ | > < | < | 29055 29056 29057 29058 29059 29060 29061 29062 29063 29064 29065 29066 29067 29068 29069 29070 29071 29072 29073 29074 29075 29076 29077 | fsl_size_t fsl_file_simplify_name(char *z, fsl_int_t n_, bool slash){ fsl_size_t i; fsl_size_t n = (n_<0) ? fsl_strlen(z) : (fsl_size_t)n_; fsl_int_t j; bool const hadSlash = n && (z[n-1]=='/'); /* On windows and cygwin convert all \ characters to / */ #if defined(_WIN32) || defined(__CYGWIN__) for(i=0; i<n; i++){ if( z[i]=='\\' ) z[i] = '/'; } #endif /* Removing trailing "/" characters */ while( n>1 && z[n-1]=='/' ){--n;} /* Remove duplicate '/' characters. Except, two // at the beginning of a pathname is allowed since this is important on windows. */ for(i=j=1; i<n; i++){ z[j++] = z[i]; while( z[i]=='/' && i<n-1 && z[i+1]=='/' ) i++; } |
︙ | ︙ | |||
28822 28823 28824 28825 28826 28827 28828 28829 28830 28831 28832 28833 28834 | continue; } } if( j>=0 ) z[j] = z[i]; j++; } if( j==0 ) z[j++] = '.'; z[j] = 0; return (fsl_size_t)j; } int fsl_file_canonical_name2(const char *zRoot, const char *zOrigName, | > | | 29099 29100 29101 29102 29103 29104 29105 29106 29107 29108 29109 29110 29111 29112 29113 29114 29115 29116 29117 29118 29119 29120 | continue; } } if( j>=0 ) z[j] = z[i]; j++; } if( j==0 ) z[j++] = '.'; if(slash && hadSlash && '/'!=z[j-1]) z[j++] = '/'; z[j] = 0; return (fsl_size_t)j; } int fsl_file_canonical_name2(const char *zRoot, const char *zOrigName, fsl_buffer * const pOut, bool slash){ int rc; if(!zOrigName || !pOut) return FSL_RC_MISUSE; else if( fsl_is_absolute_path(zOrigName) || (zRoot && !*zRoot)){ rc = fsl_buffer_append( pOut, zOrigName, -1 ); #if defined(_WIN32) || defined(__CYGWIN__) if(!rc){ char *zOut; |
︙ | ︙ | |||
28880 28881 28882 28883 28884 28885 28886 | pOut->used = newLen; } return rc; } int fsl_file_canonical_name(const char *zOrigName, | > | | | 29158 29159 29160 29161 29162 29163 29164 29165 29166 29167 29168 29169 29170 29171 29172 29173 29174 29175 29176 29177 29178 29179 | pOut->used = newLen; } return rc; } int fsl_file_canonical_name(const char *zOrigName, fsl_buffer * const pOut, bool slash){ return fsl_file_canonical_name2(NULL, zOrigName, pOut, slash); } int fsl_file_dirpart(char const * zFilename, fsl_int_t nLen, fsl_buffer * const pOut, bool leaveSlash){ if(!zFilename || !*zFilename || !pOut) return FSL_RC_MISUSE; else if(!nLen) return FSL_RC_RANGE; else{ fsl_size_t n = (nLen>0) ? (fsl_size_t)nLen : fsl_strlen(zFilename); char const * z = zFilename + n; char doBreak = 0; |
︙ | ︙ | |||
29165 29166 29167 29168 29169 29170 29171 29172 29173 29174 29175 29176 29177 29178 | FILE_ATTRIBUTE_ENCRYPTED | FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED ); return dwAttributes==FILE_ATTRIBUTE_DIRECTORY; } #endif int fsl_rmdir(const char *zFilename){ int rc = fsl_dir_check(zFilename); if(rc<1) return rc ? FSL_RC_TYPE : FSL_RC_NOT_FOUND; #ifdef _WIN32 wchar_t *z = (wchar_t*)fsl_utf8_to_filename(zFilename); if(w32_file_is_normal_dir(z)){ | > > > > > > | 29444 29445 29446 29447 29448 29449 29450 29451 29452 29453 29454 29455 29456 29457 29458 29459 29460 29461 29462 29463 | FILE_ATTRIBUTE_ENCRYPTED | FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED ); return dwAttributes==FILE_ATTRIBUTE_DIRECTORY; } #endif bool fsl_file_isexec(const char *zFilename){ fsl_fstat st = fsl_fstat_empty; int const s = fsl_stat(zFilename, &st, true); return 0==s ? (st.perm & FSL_FSTAT_PERM_EXE) : false; } int fsl_rmdir(const char *zFilename){ int rc = fsl_dir_check(zFilename); if(rc<1) return rc ? FSL_RC_TYPE : FSL_RC_NOT_FOUND; #ifdef _WIN32 wchar_t *z = (wchar_t*)fsl_utf8_to_filename(zFilename); if(w32_file_is_normal_dir(z)){ |
︙ | ︙ | |||
29517 29518 29519 29520 29521 29522 29523 | } } if(err) rc = fsl_errno_to_rc(errno, FSL_RC_IO); return rc; #endif } | > > > > | | | | 29802 29803 29804 29805 29806 29807 29808 29809 29810 29811 29812 29813 29814 29815 29816 29817 29818 29819 29820 29821 29822 | } } if(err) rc = fsl_errno_to_rc(errno, FSL_RC_IO); return rc; #endif } /** fsl_dircrawl() part for handling a single directory. fst must be valid state from a freshly-fsl_fstat()'d DIRECTORY. */ static int fsl_dircrawl_impl(fsl_buffer * const dbuf, fsl_fstat * const fst, fsl_dircrawl_f cb, void * const cbState, fsl_dircrawl_state * const dst, unsigned int depth){ int rc = 0; DIR *dir = opendir(fsl_buffer_cstr(dbuf)); struct dirent * dent = 0; fsl_size_t const dPos = dbuf->used; if(!dir){ return fsl_errno_to_rc(errno, FSL_RC_IO); |
︙ | ︙ | |||
29567 29568 29569 29570 29571 29572 29573 29574 29575 29576 29577 29578 29579 29580 | rc = cb( dst ); if(!rc){ dbuf->mem[dbuf->used] = '/'; dbuf->used = newLen; if(FSL_FSTAT_TYPE_DIR==fst->type){ rc = fsl_dircrawl_impl( dbuf, fst, cb, cbState, dst, depth+1 ); } } } closedir(dir); return rc; } int fsl_dircrawl(char const * dirName, fsl_dircrawl_f callback, | > > | 29856 29857 29858 29859 29860 29861 29862 29863 29864 29865 29866 29867 29868 29869 29870 29871 | rc = cb( dst ); if(!rc){ dbuf->mem[dbuf->used] = '/'; dbuf->used = newLen; if(FSL_FSTAT_TYPE_DIR==fst->type){ rc = fsl_dircrawl_impl( dbuf, fst, cb, cbState, dst, depth+1 ); } }else if(FSL_RC_NOOP == rc){ rc = 0; } } closedir(dir); return rc; } int fsl_dircrawl(char const * dirName, fsl_dircrawl_f callback, |
︙ | ︙ | |||
29601 29602 29603 29604 29605 29606 29607 | } fsl_buffer_clear(&dbuf); return rc; } bool fsl_is_file_or_link(const char *zFilename){ fsl_fstat fst = fsl_fstat_empty; | | > | | | 29892 29893 29894 29895 29896 29897 29898 29899 29900 29901 29902 29903 29904 29905 29906 29907 29908 29909 | } fsl_buffer_clear(&dbuf); return rc; } bool fsl_is_file_or_link(const char *zFilename){ fsl_fstat fst = fsl_fstat_empty; return fsl_stat(zFilename, &fst, false) ? false : (fst.type==FSL_FSTAT_TYPE_FILE || fst.type==FSL_FSTAT_TYPE_LINK); } fsl_size_t fsl_strip_trailing_slashes(char * name, fsl_int_t nameLen){ fsl_size_t rc = 0; if(nameLen < 0) nameLen = (fsl_int_t)fsl_strlen(name); if(nameLen){ char * z = name + nameLen - 1; |
︙ | ︙ | |||
29628 29629 29630 29631 29632 29633 29634 | (fsl_int_t)b->used); } int fsl_file_rename(const char *zFrom, const char *zTo){ int rc; #if defined(_WIN32) /** 2021-03-24: fossil's impl of this routine has 2 additional | | > | | < | < < | < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > | > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 29920 29921 29922 29923 29924 29925 29926 29927 29928 29929 29930 29931 29932 29933 29934 29935 29936 29937 29938 29939 29940 29941 29942 29943 29944 29945 29946 29947 29948 29949 29950 29951 29952 29953 29954 29955 29956 29957 29958 29959 29960 29961 29962 29963 29964 29965 29966 29967 29968 29969 29970 29971 29972 29973 29974 29975 29976 29977 29978 29979 29980 29981 29982 29983 29984 29985 29986 29987 29988 29989 29990 29991 29992 29993 29994 29995 29996 29997 29998 29999 30000 30001 30002 30003 30004 30005 30006 30007 30008 30009 30010 30011 30012 30013 30014 30015 30016 30017 30018 30019 30020 30021 30022 30023 30024 30025 30026 30027 30028 30029 30030 30031 30032 30033 30034 30035 30036 30037 30038 30039 30040 30041 30042 30043 30044 30045 30046 30047 30048 30049 30050 30051 30052 30053 30054 30055 30056 30057 30058 30059 30060 30061 30062 30063 30064 30065 30066 30067 30068 30069 30070 30071 30072 30073 30074 30075 30076 30077 30078 30079 30080 30081 30082 30083 30084 30085 30086 30087 30088 30089 30090 30091 30092 30093 30094 30095 30096 30097 30098 30099 30100 30101 30102 30103 30104 30105 30106 30107 30108 30109 30110 30111 30112 30113 30114 30115 30116 30117 30118 30119 30120 30121 30122 30123 30124 30125 30126 30127 30128 30129 30130 30131 30132 30133 30134 30135 30136 30137 30138 30139 30140 30141 30142 30143 30144 30145 30146 30147 30148 30149 30150 30151 30152 30153 30154 30155 30156 30157 30158 | (fsl_int_t)b->used); } int fsl_file_rename(const char *zFrom, const char *zTo){ int rc; #if defined(_WIN32) /** 2021-03-24: fossil's impl of this routine has 2 additional params (bool isFromDir, bool isToDir), which are passed on to fsl_utf8_to_filename(), only used on Windows platforms, and are only to allow for 12 bytes of edge case in MAX_PATH handling. We don't need them. */ wchar_t *zMbcsFrom = fsl_utf8_to_filename(zFrom); wchar_t *zMbcsTo = zMbcsFrom ? fsl_utf8_to_filename(zTo) : 0; rc = zMbcsTo ? _wrename(zMbcsFrom, zMbcsTo) : FSL_RC_OOM; #else char *zMbcsFrom = fsl_utf8_to_filename(zFrom); char *zMbcsTo = zMbcsFrom ? fsl_utf8_to_filename(zTo) : 0; rc = zMbcsTo ? rename(zMbcsFrom, zMbcsTo) : FSL_RC_OOM; #endif fsl_filename_free(zMbcsTo); fsl_filename_free(zMbcsFrom); return -1==rc ? fsl_errno_to_rc(errno, FSL_RC_IO) : rc; } char ** fsl_temp_dirs_get(void){ #if FSL_PLATFORM_IS_WINDOWS const char *azDirs[] = { ".", NULL }; unsigned int const nDirs = 4 /* GetTempPath(), $TEMP, $TMP, azDirs */; #else const char *azDirs[] = { "/var/tmp", "/usr/tmp", "/tmp", "/temp", ".", NULL }; unsigned int const nDirs = 6 /* $TMPDIR, azDirs */; #endif char *z; char const *zC; char ** zDirs = NULL; unsigned int i, n = 0; zDirs = (char **)fsl_malloc(sizeof(char*) * (nDirs + 1)); if(!zDirs) return NULL; for(i = 0; i<=nDirs; ++i) zDirs[i] = NULL; #define DOZ \ if(z && fsl_dir_check(z)>0) zDirs[n++] = z; \ else if(z) fsl_filename_free(z) #if FSL_PLATFORM_IS_WINDOWS wchar_t zTmpPath[MAX_PATH]; if( GetTempPathW(MAX_PATH, zTmpPath) ){ z = fsl_filename_to_utf8(zTmpPath); DOZ; } z = fsl_getenv("TEMP"); DOZ; z = fsl_getenv("TMP"); DOZ; #else /* Unix-like */ z = fsl_getenv("TMPDIR"); DOZ; #endif for( i = 0; (zC = azDirs[i]); ++i ){ z = fsl_filename_to_utf8(azDirs[i]); DOZ; } #undef DOZ /* Strip any trailing slashes unless the only character is a slash. Note that we ignore the root-dir case on Windows here, mainly because this developer can't test it and secondarily because it's a highly unlikely case. */ for(i = 0; i < n; ++i ){ fsl_size_t len; z = zDirs[i]; len = fsl_strlen(z); while(len>1 && (z[len-1]=='/' || z[len-1]=='\\')){ z[--len] = 0; } } return zDirs; } void fsl_temp_dirs_free(char **aDirs){ if(aDirs){ char * z; for(unsigned i = 0; (z = aDirs[i]); ++i){ fsl_filename_free(z); aDirs[i] = NULL; } fsl_free(aDirs); } } int fsl_file_tempname(fsl_buffer * const tgt, char const *zPrefix, char * const * const dirs){ int rc = 0; unsigned int tries = 0; const unsigned char zChars[] = "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "0123456789_"; enum { RandSize = 24 }; char zRand[RandSize + 1]; int i; char const * zDir = ""; if(dirs){ for(i = 0; (zDir=dirs[i++]); ){ /* We repeat this check, performed in fsl_temp_dirs_get(), for the sake of long-lived apps where a given temp dir might disappear at some point. */ if(fsl_dir_check(zDir)>0) break; } if(!zDir) return FSL_RC_NOT_FOUND; } if(!zPrefix) zPrefix = "libfossil"; fsl_buffer_reuse(tgt); /* Pre-fill buffer to allocate it in advance and remember the length of the base filename part so that we don't have to re-write the prefix each iteration below. */ rc = fsl_buffer_appendf(tgt, "%/%s%s%s%.*cZ", zDir, *zDir ? "/" : "", zPrefix, *zPrefix ? "~" : "", (int)RandSize, 'X'); fsl_size_t const baseLen = rc ? 0 : (tgt->used - RandSize - 1); do{ if(++tries == 20){ rc = FSL_RC_RANGE; break; } fsl_randomness(RandSize, zRand); for( i=0; i < RandSize; ++i ){ zRand[i] = (char)zChars[ ((unsigned char)zRand[i])%(sizeof(zChars)-1) ]; } zRand[RandSize] = 0; tgt->used = baseLen; rc = fsl_buffer_append(tgt, zRand, (fsl_int_t)RandSize); assert(0==rc && "We pre-allocated the buffer above."); }while(0==rc && fsl_file_size(fsl_buffer_cstr(tgt)) >= 0); return rc; } int fsl_file_copy(char const *zFrom, char const *zTo){ FILE * in = 0, *out = 0; int rc; in = fsl_fopen(zFrom, "rb"); if(!in) return fsl_errno_to_rc(errno, FSL_RC_IO); rc = fsl_mkdir_for_file(zTo, false); if(rc) goto end; out = fsl_fopen(zTo, "wb"); rc = out ? fsl_stream(fsl_input_f_FILE, in, fsl_output_f_FILE, out) : fsl_errno_to_rc(errno, FSL_RC_IO); end: if(in) fsl_fclose(in); if(out) fsl_fclose(out); if(0==rc && fsl_file_isexec(zFrom)){ fsl_file_exec_set(zTo, true); } return rc; } int fsl_symlink_read(fsl_buffer * const tgt, char const * zFilename){ #if FSL_PLATFORM_IS_WINDOWS fsl_buffer_reuse(tgt); return 0; #else enum { BufLen = 1024 * 2 }; char buf[BufLen]; int rc; ssize_t const len = readlink(zFilename, buf, BufLen-1); if(len<0) rc = fsl_errno_to_rc(errno, FSL_RC_IO); else{ fsl_buffer_reuse(tgt); rc = fsl_buffer_append(tgt, buf, (fsl_size_t)len); } return rc; #endif } int fsl_symlink_create(const char *zTargetFile, const char *zLinkFile, bool realLink){ int rc; #if !FSL_PLATFORM_IS_WINDOWS if( realLink ){ char *zName, zBuf[1024 * 2]; fsl_size_t nName = fsl_strlen(zLinkFile); if( nName>=sizeof(zBuf) ){ zName = fsl_mprintf("%s", zLinkFile); if(!zName) return FSL_RC_OOM; }else{ zName = zBuf; memcpy(zName, zLinkFile, nName+1); } nName = fsl_file_simplify_name(zName, (fsl_int_t)nName, false); rc = fsl_mkdir_for_file(zName, false); if(0==rc && 0!=symlink(zTargetFile, zName) ){ rc = fsl_errno_to_rc(errno, FSL_RC_IO); } if( zName!=zBuf ) fsl_free(zName); }else #endif { rc = fsl_mkdir_for_file(zLinkFile, false); if(0==rc){ fsl_buffer content = fsl_buffer_empty; fsl_buffer_external(&content, zTargetFile, -1); fsl_file_unlink(zLinkFile) /* in case it's already a symlink, we don't want the following to overwrite the symlinked-to file */; rc = fsl_buffer_to_filename(&content, zLinkFile); } } return rc; } int fsl__symlink_copy(char const *zFrom, char const *zTo, bool realLink){ int rc; fsl_buffer b = fsl_buffer_empty; rc = fsl_symlink_read(&b, zFrom); if(0==rc){ rc = fsl_symlink_create(fsl_buffer_cstr(&b), zTo, realLink); } fsl_buffer_clear(&b); return rc; } #if 0 int fsl_file_relative_name( char const * zRoot, char const * zPath, fsl_buffer * pOut, char retainSlash ){ int rc = FSL_RC_NYI; char * zPath; |
︙ | ︙ | |||
29672 29673 29674 29675 29676 29677 29678 | #ifdef _WIN32 # undef DIR # undef dirent # undef opendir # undef readdir # undef closedir #endif | | | | 30169 30170 30171 30172 30173 30174 30175 30176 30177 30178 30179 30180 30181 30182 30183 30184 | #ifdef _WIN32 # undef DIR # undef dirent # undef opendir # undef readdir # undef closedir #endif /* end of file ./src/fs.c */ /* start of file ./src/forum.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
29718 29719 29720 29721 29722 29723 29724 | } return rc; } #undef MARKER | | | | 30215 30216 30217 30218 30219 30220 30221 30222 30223 30224 30225 30226 30227 30228 30229 30230 | } return rc; } #undef MARKER /* end of file ./src/forum.c */ /* start of file ./src/glob.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
29807 29808 29809 29810 29811 29812 29813 | } } return *z==0; #endif } | | | | 30304 30305 30306 30307 30308 30309 30310 30311 30312 30313 30314 30315 30316 30317 30318 30319 | } } return *z==0; #endif } int fsl_glob_list_parse( fsl_list * const tgt, char const * zPatternList ){ fsl_size_t i; /* Loop counter */ char const *z = zPatternList; char * cp; char delimiter; /* '\'' or '\"' or 0 */ int rc = 0; char const * end; if( !tgt || !zPatternList ) return FSL_RC_MISUSE; else if(!*zPatternList) return 0; |
︙ | ︙ | |||
29864 29865 29866 29867 29868 29869 29870 | glob = (char const *)globList->list[i]; if( fsl_str_glob( glob, zNeedle ) ) return glob; } return NULL; } } | | | | | 30361 30362 30363 30364 30365 30366 30367 30368 30369 30370 30371 30372 30373 30374 30375 30376 30377 30378 30379 30380 30381 30382 30383 30384 30385 30386 30387 30388 30389 30390 30391 30392 30393 30394 | glob = (char const *)globList->list[i]; if( fsl_str_glob( glob, zNeedle ) ) return glob; } return NULL; } } int fsl_glob_list_append( fsl_list * const tgt, char const * zGlob ){ if(!tgt || !zGlob || !*zGlob) return FSL_RC_MISUSE; else{ char * cp = fsl_strdup(zGlob); int rc = cp ? 0 : FSL_RC_OOM; if(!rc){ rc = fsl_list_append(tgt, cp); if(rc) fsl_free(cp); } return rc; } } void fsl_glob_list_clear( fsl_list * const globList ){ if(globList) fsl_list_visit_free(globList, 1); } /* end of file ./src/glob.c */ /* start of file ./src/io.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
30023 30024 30025 30026 30027 30028 30029 | if(rc) break; rn1 = rn2 = BufSize; } return rc; } #undef MARKER | | | | 30520 30521 30522 30523 30524 30525 30526 30527 30528 30529 30530 30531 30532 30533 30534 30535 | if(rc) break; rn1 = rn2 = BufSize; } return rc; } #undef MARKER /* end of file ./src/io.c */ /* start of file ./src/leaf.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
30050 30051 30052 30053 30054 30055 30056 | /* Only for debugging */ #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) | | | | > | 30547 30548 30549 30550 30551 30552 30553 30554 30555 30556 30557 30558 30559 30560 30561 30562 30563 30564 30565 30566 30567 30568 30569 30570 30571 30572 30573 30574 30575 | /* Only for debugging */ #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) int fsl_repo_leaves_rebuild(fsl_cx * const f){ fsl_db * const db = fsl_cx_db_repo(f); int rc = fsl_db_exec_multi(db, "DELETE FROM leaf;" "INSERT OR IGNORE INTO leaf" " SELECT cid FROM plink" " EXCEPT" " SELECT pid FROM plink" " WHERE coalesce((SELECT value FROM tagxref" " WHERE tagid=%d AND rid=plink.pid),'trunk')" " == coalesce((SELECT value FROM tagxref" " WHERE tagid=%d AND rid=plink.cid),'trunk')", FSL_TAGID_BRANCH, FSL_TAGID_BRANCH ); return rc ? fsl_cx_uplift_db_error2(f, db, rc) : 0; } fsl_int_t fsl_count_nonbranch_children(fsl_cx * const f, fsl_id_t rid){ int32_t rv = 0; int rc; fsl_db * const db = fsl_cx_db_repo(f); if(!db || !db->dbh || (rid<=0)) return -1; |
︙ | ︙ | |||
30201 30202 30203 30204 30205 30206 30207 | !rc && rid; rid=fsl_id_bag_next(&f->cache.leafCheck,rid)){ rc = fsl__repo_leafcheck(f, rid); } fsl_id_bag_reset(&f->cache.leafCheck); return rc; } | | | 30699 30700 30701 30702 30703 30704 30705 30706 30707 30708 30709 30710 30711 30712 30713 | !rc && rid; rid=fsl_id_bag_next(&f->cache.leafCheck,rid)){ rc = fsl__repo_leafcheck(f, rid); } fsl_id_bag_reset(&f->cache.leafCheck); return rc; } int fsl_leaves_compute(fsl_cx * const f, fsl_id_t vid, fsl_leaves_compute_e closeMode){ fsl_db * const db = fsl_needs_repo(f); if(!db) return FSL_RC_NOT_A_REPO; int rc = 0; /* Create the LEAVES table if it does not already exist. Make sure ** it is empty. |
︙ | ︙ | |||
30343 30344 30345 30346 30347 30348 30349 | return rc; dberr: assert(rc); rc = fsl_cx_uplift_db_error2(f, db, rc); goto end; } | | | | | | | | | > > > > > | | | | 30841 30842 30843 30844 30845 30846 30847 30848 30849 30850 30851 30852 30853 30854 30855 30856 30857 30858 30859 30860 30861 30862 30863 30864 30865 30866 30867 30868 30869 30870 30871 30872 30873 30874 30875 30876 30877 30878 30879 30880 30881 30882 30883 30884 30885 30886 30887 30888 30889 30890 30891 30892 30893 30894 30895 30896 30897 30898 30899 30900 30901 30902 30903 30904 30905 30906 30907 30908 30909 30910 30911 30912 30913 30914 30915 30916 30917 30918 30919 30920 30921 30922 | return rc; dberr: assert(rc); rc = fsl_cx_uplift_db_error2(f, db, rc); goto end; } bool fsl_leaves_computed_has(fsl_cx * const f){ return fsl_db_exists(fsl_cx_db_repo(f), "SELECT 1 FROM leaves"); } fsl_int_t fsl_leaves_computed_count(fsl_cx * const f){ int32_t rv = -1; fsl_db * const db = fsl_cx_db_repo(f); int const rc = fsl_db_get_int32(db, &rv, "SELECT COUNT(*) FROM leaves"); if(rc){ fsl_cx_uplift_db_error2(f, db, rc); assert(-1==rv); }else{ assert(rv>=0); } return rv; } fsl_id_t fsl_leaves_computed_latest(fsl_cx * const f){ fsl_id_t rv = 0; fsl_db * const db = fsl_cx_db_repo(f); int const rc = fsl_db_get_id(db, &rv, "SELECT rid FROM leaves, event" " WHERE event.objid=leaves.rid" " ORDER BY event.mtime DESC"); if(rc){ fsl_cx_uplift_db_error2(f, db, rc); assert(!rv); }else{ assert(rv>=0); } return rv; } void fsl_leaves_computed_cleanup(fsl_cx * const f){ if(fsl_cx_exec(f, "DROP TABLE IF EXISTS temp.leaves")){ /** Naively assume that locking is keeping us from dropping it, and simply empty it instead. */ fsl_cx_exec(f, "DELETE FROM temp.leaves"); } } #undef MARKER /* end of file ./src/leaf.c */ /* start of file ./src/list.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /************************************************************************ This file houses the implementations for the fsl_list routines. */ #include <assert.h> #include <stdlib.h> /* malloc() and friends, qsort() */ #include <memory.h> /* memset() */ int fsl_list_reserve( fsl_list * const self, fsl_size_t n ) { if( !self ) return FSL_RC_MISUSE; else if(0 == n){ if(0 == self->capacity) return 0; fsl_free(self->list); *self = fsl_list_empty; return 0; |
︙ | ︙ | |||
30428 30429 30430 30431 30432 30433 30434 | memset( m + self->capacity, 0, (sizeof(void*)*(n-self->capacity))); self->capacity = n; self->list = m; return 0; } } | | | | | | 30931 30932 30933 30934 30935 30936 30937 30938 30939 30940 30941 30942 30943 30944 30945 30946 30947 30948 30949 30950 30951 30952 30953 30954 30955 30956 30957 30958 30959 30960 30961 30962 30963 30964 30965 30966 30967 30968 30969 30970 30971 30972 30973 30974 30975 30976 30977 30978 30979 30980 30981 30982 30983 30984 30985 | memset( m + self->capacity, 0, (sizeof(void*)*(n-self->capacity))); self->capacity = n; self->list = m; return 0; } } void fsl_list_swap( fsl_list * const lhs, fsl_list * const rhs ){ fsl_list tmp = *lhs; *rhs = *lhs; *lhs = tmp; } int fsl_list_append( fsl_list * const self, void* cp ){ if( !self ) return FSL_RC_MISUSE; assert(self->used <= self->capacity); if(self->used == self->capacity){ int rc; fsl_size_t const cap = self->capacity ? (self->capacity * 2) : 10; rc = fsl_list_reserve(self, cap); if(rc) return rc; } self->list[self->used++] = cp; if(self->used<self->capacity) self->list[self->used]=NULL; return 0; } int fsl_list_v_fsl_free(void * obj, void * visitorState ){ if(obj) fsl_free( obj ); return 0; } int fsl_list_clear( fsl_list * const self, fsl_list_visitor_f childFinalizer, void * finalizerState ){ /* TODO: manually traverse the list and set each list entry for which the finalizer succeeds to NULL, so that we can provide well-defined behaviour if childFinalizer() fails and we abort the loop. */ int rc = fsl_list_visit(self, 0, childFinalizer, finalizerState ); if(!rc) fsl_list_reserve(self, 0); return rc; } void fsl_list_visit_free( fsl_list * const self, bool freeListMem ){ fsl_list_visit(self, 0, fsl_list_v_fsl_free, NULL ); if(freeListMem) fsl_list_reserve(self, 0); else self->used = 0; } int fsl_list_visit( fsl_list const * self, int order, |
︙ | ︙ | |||
30497 30498 30499 30500 30501 30502 30503 | } } } return rc; } | | | 31000 31001 31002 31003 31004 31005 31006 31007 31008 31009 31010 31011 31012 31013 31014 | } } } return rc; } int fsl_list_visit_p( fsl_list * const self, int order, bool shiftIfNulled, fsl_list_visitor_f visitor, void * visitorState ) { int rc = FSL_RC_OK; if( self && self->used && visitor ){ fsl_int_t i = 0; fsl_int_t pos = (order<0) ? self->used-1 : 0; |
︙ | ︙ | |||
30529 30530 30531 30532 30533 30534 30535 | } } } } return rc; } | | | 31032 31033 31034 31035 31036 31037 31038 31039 31040 31041 31042 31043 31044 31045 31046 | } } } } return rc; } void fsl_list_sort( fsl_list * const li, fsl_generic_cmp_f cmp){ if(li && li->used>1){ qsort( li->list, li->used, sizeof(void*), cmp ); } } |
︙ | ︙ | |||
30561 30562 30563 30564 30565 30566 30567 | } fsl_int_t fsl_list_index_of_cstr( fsl_list const * li, char const * key ){ return fsl_list_index_of(li, key, fsl_strcmp_cmp); } | | | | 31064 31065 31066 31067 31068 31069 31070 31071 31072 31073 31074 31075 31076 31077 31078 31079 | } fsl_int_t fsl_list_index_of_cstr( fsl_list const * li, char const * key ){ return fsl_list_index_of(li, key, fsl_strcmp_cmp); } /* end of file ./src/list.c */ /* start of file ./src/lookslike.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
30619 30620 30621 30622 30623 30624 30625 30626 30627 30628 30629 30630 30631 30632 | #undef US2B #undef US3A #undef US3B #undef US4A #undef US4B #undef US4C #undef US0A int fsl_looks_like_utf8(fsl_buffer const * const b, int stopFlags){ fsl_size_t n = 0; const char *z = fsl_buffer_cstr2(b, &n); int j, c, flags = FSL_LOOKSLIKE_NONE; /* Assume UTF-8 text, prove otherwise */ if( n==0 ) return flags; /* Empty file -> text */ | > > > > > | 31122 31123 31124 31125 31126 31127 31128 31129 31130 31131 31132 31133 31134 31135 31136 31137 31138 31139 31140 | #undef US2B #undef US3A #undef US3B #undef US4A #undef US4B #undef US4C #undef US0A bool fsl_looks_like_binary(fsl_buffer const * const b){ return (fsl_looks_like_utf8(b, FSL_LOOKSLIKE_BINARY) & FSL_LOOKSLIKE_BINARY) != FSL_LOOKSLIKE_NONE; } int fsl_looks_like_utf8(fsl_buffer const * const b, int stopFlags){ fsl_size_t n = 0; const char *z = fsl_buffer_cstr2(b, &n); int j, c, flags = FSL_LOOKSLIKE_NONE; /* Assume UTF-8 text, prove otherwise */ if( n==0 ) return flags; /* Empty file -> text */ |
︙ | ︙ | |||
30709 30710 30711 30712 30713 30714 30715 | c = (c>=0xC0) ? (c|3) : ' '; /* determine next lead byte */ } else { c = *++z; } } return c<0x80 /* Final lead byte must be ASCII. */; } | | | | 31217 31218 31219 31220 31221 31222 31223 31224 31225 31226 31227 31228 31229 31230 31231 31232 | c = (c>=0xC0) ? (c|3) : ' '; /* determine next lead byte */ } else { c = *++z; } } return c<0x80 /* Final lead byte must be ASCII. */; } /* end of file ./src/lookslike.c */ /* start of file ./src/md5.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* The code is modified for use in fossil (then libfossil). The original header comment follows: */ /* * This code implements the MD5 message-digest algorithm. |
︙ | ︙ | |||
31152 31153 31154 31155 31156 31157 31158 | #undef F1 #undef F2 #undef F3 #undef F4 #undef MD5STEP #undef byteReverse | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | 31660 31661 31662 31663 31664 31665 31666 31667 31668 31669 31670 31671 31672 31673 31674 31675 31676 31677 31678 31679 31680 31681 31682 31683 31684 31685 31686 31687 31688 31689 31690 31691 31692 31693 31694 31695 31696 31697 31698 31699 31700 31701 31702 31703 31704 31705 31706 31707 31708 31709 31710 31711 31712 31713 31714 31715 31716 31717 31718 31719 31720 31721 31722 31723 31724 31725 31726 31727 31728 31729 31730 31731 31732 31733 31734 31735 31736 31737 31738 31739 31740 31741 31742 31743 31744 31745 31746 31747 31748 31749 31750 31751 31752 31753 31754 31755 31756 31757 31758 31759 31760 31761 31762 31763 31764 31765 31766 31767 31768 31769 31770 31771 31772 31773 31774 31775 31776 31777 31778 31779 31780 31781 31782 31783 31784 31785 31786 31787 31788 31789 31790 31791 31792 31793 31794 31795 31796 31797 31798 31799 31800 31801 31802 31803 31804 31805 31806 31807 31808 31809 31810 31811 31812 31813 31814 31815 31816 31817 31818 31819 31820 31821 31822 31823 31824 31825 31826 31827 31828 31829 31830 31831 31832 31833 31834 31835 31836 31837 31838 31839 31840 31841 31842 31843 31844 31845 31846 31847 31848 31849 31850 31851 31852 31853 31854 31855 31856 31857 31858 31859 31860 31861 31862 31863 31864 31865 31866 31867 31868 31869 31870 31871 31872 31873 31874 31875 31876 31877 31878 31879 31880 31881 31882 31883 31884 31885 31886 31887 31888 31889 31890 31891 31892 31893 31894 31895 31896 31897 31898 31899 31900 31901 31902 31903 31904 31905 31906 31907 31908 31909 31910 31911 31912 31913 31914 31915 31916 31917 31918 31919 31920 31921 31922 31923 31924 31925 31926 31927 31928 31929 31930 31931 31932 31933 31934 31935 31936 31937 31938 31939 31940 31941 31942 31943 31944 31945 31946 31947 31948 31949 31950 31951 31952 31953 31954 31955 31956 31957 31958 31959 31960 31961 31962 31963 31964 31965 31966 31967 31968 31969 31970 31971 31972 31973 31974 31975 31976 31977 31978 31979 31980 31981 31982 31983 31984 31985 31986 31987 31988 31989 31990 31991 31992 31993 31994 31995 31996 31997 31998 31999 32000 32001 32002 32003 32004 32005 32006 32007 32008 32009 32010 32011 32012 32013 32014 32015 32016 32017 32018 32019 32020 32021 32022 32023 32024 32025 32026 32027 32028 32029 32030 32031 32032 32033 32034 32035 32036 32037 32038 32039 32040 32041 32042 32043 32044 32045 32046 32047 32048 32049 32050 32051 32052 32053 32054 32055 32056 32057 32058 32059 32060 32061 32062 32063 32064 32065 32066 32067 32068 32069 32070 32071 32072 32073 32074 32075 32076 32077 32078 32079 32080 32081 32082 32083 32084 32085 32086 32087 32088 32089 32090 32091 32092 32093 32094 32095 32096 32097 32098 32099 32100 32101 32102 32103 32104 32105 32106 32107 32108 32109 32110 32111 32112 32113 32114 32115 32116 32117 32118 32119 32120 32121 32122 32123 32124 32125 32126 32127 32128 32129 32130 32131 32132 32133 32134 32135 32136 32137 32138 32139 32140 32141 32142 32143 32144 32145 32146 32147 32148 32149 32150 32151 32152 32153 32154 32155 32156 32157 32158 32159 32160 32161 32162 32163 32164 32165 32166 32167 32168 32169 32170 32171 32172 32173 32174 32175 32176 32177 32178 32179 32180 32181 32182 32183 32184 32185 32186 32187 32188 32189 32190 32191 32192 32193 32194 32195 32196 32197 32198 32199 32200 32201 32202 32203 32204 32205 32206 32207 32208 32209 32210 32211 32212 32213 32214 32215 32216 32217 32218 32219 32220 32221 32222 32223 32224 32225 32226 32227 32228 32229 32230 32231 32232 32233 32234 32235 32236 32237 32238 32239 32240 32241 32242 32243 32244 32245 32246 32247 32248 32249 32250 32251 32252 32253 32254 32255 32256 32257 32258 32259 32260 32261 32262 32263 32264 32265 32266 32267 32268 32269 32270 32271 32272 32273 32274 32275 32276 32277 32278 32279 32280 32281 32282 32283 32284 32285 32286 32287 32288 32289 32290 32291 32292 32293 32294 32295 32296 32297 32298 32299 32300 32301 32302 32303 32304 32305 32306 32307 32308 32309 32310 32311 32312 32313 32314 32315 32316 32317 32318 32319 32320 32321 32322 32323 32324 32325 32326 32327 32328 32329 32330 32331 32332 32333 32334 32335 32336 32337 32338 32339 32340 32341 32342 32343 32344 32345 32346 32347 32348 32349 32350 32351 32352 32353 32354 32355 32356 32357 32358 32359 32360 32361 32362 32363 32364 32365 32366 32367 32368 32369 32370 32371 32372 32373 32374 32375 32376 32377 32378 32379 32380 32381 32382 32383 32384 32385 32386 32387 32388 32389 32390 32391 32392 32393 32394 32395 32396 32397 32398 32399 32400 32401 32402 32403 32404 32405 32406 32407 32408 32409 32410 32411 32412 32413 32414 32415 32416 32417 32418 32419 32420 32421 32422 32423 32424 32425 32426 32427 32428 32429 32430 32431 32432 32433 32434 32435 32436 32437 32438 32439 32440 32441 32442 32443 32444 32445 32446 32447 32448 32449 32450 32451 32452 32453 32454 32455 32456 32457 32458 32459 32460 32461 32462 32463 32464 32465 32466 32467 32468 32469 32470 32471 32472 32473 32474 32475 32476 32477 32478 32479 32480 32481 32482 32483 32484 32485 32486 32487 32488 32489 32490 32491 32492 32493 32494 32495 32496 32497 32498 32499 32500 32501 32502 32503 32504 32505 32506 32507 32508 32509 32510 32511 32512 32513 32514 32515 32516 32517 32518 32519 32520 32521 32522 32523 32524 32525 32526 32527 32528 32529 32530 32531 32532 32533 32534 32535 32536 32537 32538 32539 32540 32541 32542 32543 32544 32545 32546 32547 32548 32549 32550 32551 32552 32553 32554 32555 32556 32557 32558 32559 32560 32561 32562 32563 32564 32565 32566 32567 32568 32569 32570 32571 32572 32573 32574 32575 32576 32577 32578 32579 32580 32581 32582 32583 32584 32585 32586 32587 32588 32589 32590 32591 32592 32593 32594 32595 32596 32597 32598 32599 32600 32601 32602 32603 32604 32605 32606 32607 32608 32609 32610 32611 32612 32613 32614 32615 32616 32617 32618 32619 32620 32621 32622 32623 32624 32625 32626 32627 32628 32629 32630 32631 32632 32633 32634 32635 32636 32637 32638 32639 32640 32641 32642 32643 32644 32645 32646 32647 32648 32649 32650 32651 32652 32653 32654 32655 32656 32657 32658 32659 32660 32661 32662 32663 32664 32665 32666 32667 32668 32669 32670 32671 32672 32673 32674 32675 32676 32677 32678 32679 32680 32681 32682 32683 32684 32685 32686 32687 32688 32689 32690 32691 32692 32693 32694 32695 32696 32697 32698 32699 32700 32701 32702 32703 32704 32705 32706 32707 32708 32709 32710 32711 32712 32713 32714 32715 32716 32717 32718 32719 32720 32721 32722 32723 32724 32725 32726 32727 32728 32729 32730 32731 32732 32733 32734 32735 32736 32737 32738 32739 32740 32741 32742 32743 32744 32745 32746 32747 32748 32749 32750 32751 32752 32753 32754 32755 32756 32757 32758 32759 32760 32761 32762 32763 32764 32765 32766 32767 32768 32769 32770 32771 32772 32773 32774 32775 32776 32777 32778 32779 32780 32781 32782 32783 32784 32785 32786 32787 32788 32789 32790 32791 32792 32793 32794 32795 32796 32797 32798 32799 32800 32801 32802 32803 32804 32805 32806 32807 32808 32809 32810 32811 32812 32813 32814 32815 32816 32817 32818 32819 32820 32821 32822 32823 32824 32825 32826 32827 32828 32829 32830 32831 32832 32833 32834 32835 32836 32837 32838 32839 32840 32841 32842 32843 32844 32845 32846 32847 32848 32849 32850 32851 32852 32853 32854 32855 32856 32857 32858 32859 32860 32861 32862 32863 32864 32865 32866 32867 32868 32869 32870 32871 32872 32873 32874 32875 32876 32877 32878 32879 32880 32881 32882 32883 32884 32885 32886 32887 32888 32889 32890 32891 32892 32893 32894 32895 32896 32897 32898 32899 32900 32901 32902 32903 32904 32905 32906 32907 32908 32909 32910 32911 32912 32913 32914 32915 32916 32917 32918 32919 32920 32921 32922 32923 32924 32925 32926 32927 32928 32929 32930 32931 32932 32933 32934 32935 32936 32937 32938 32939 32940 32941 32942 32943 32944 32945 32946 32947 32948 | #undef F1 #undef F2 #undef F3 #undef F4 #undef MD5STEP #undef byteReverse /* end of file ./src/md5.c */ /* start of file ./src/merge.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ #include <assert.h> #include <memory.h> #include <stdlib.h> #include <string.h> /* memmove()/strlen() */ #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) #define FSL__TABLE_PIVOT "aqueue" /** Sets the primary version of a merge. The primary version is one of the two files that have a common ancestor. The other file is the secondary. There can be multiple secondaries but only a single primary. The primary must be set first. In the merge algorithm, the file being merged in is the primary. The current check-out or other files that have been merged into the current checkout are the secondaries. The act of setting the primary resets the pivot-finding algorithm. Returns 0 on success, non-0 on serious error. This works using a TEMP db, so does not strictly require a repo or checkout. @see fsl__pivot_set_secondary() @see fsl__pivot_find() */ static int fsl__pivot_set_primary(fsl_cx * const f, fsl_id_t rid){ /* Set up table used to do the search */ int rc = fsl_cx_exec_multi(f, "CREATE TEMP TABLE IF NOT EXISTS " FSL__TABLE_PIVOT "(" " rid INTEGER," /* The record id for this version */ " mtime REAL," /* Time when this version was created */ " pending BOOLEAN," /* True if we have not check this one yet */ " src BOOLEAN," /* 1 for primary. 0 for others */ " PRIMARY KEY(rid,src)" ") WITHOUT ROWID;" "DELETE FROM " FSL__TABLE_PIVOT ";" "CREATE INDEX IF NOT EXISTS " FSL__TABLE_PIVOT "_idx1 ON " FSL__TABLE_PIVOT "(pending, mtime);" ); if(0==rc){ /* Insert the primary record */ rc = fsl_cx_exec(f, "INSERT INTO " FSL__TABLE_PIVOT "(rid, mtime, pending, src)" " SELECT %" FSL_ID_T_PFMT ", mtime, 1, 1 " " FROM event WHERE objid=%" FSL_ID_T_PFMT " AND type='ci' LIMIT 1", rid, rid ); } return rc; } /** Set a secondary file of a merge. The primary file must be set first. There must be at least one secondary but there can be more than one if desired. Returns 0 on success, non-0 on db error. @see fsl__pivot_set_primary() @see fsl__pivot_find() */ static int fsl__pivot_set_secondary(fsl_cx * const f, fsl_id_t rid){ return fsl_cx_exec(f, "INSERT OR IGNORE INTO " FSL__TABLE_PIVOT "(rid, mtime, pending, src)" " SELECT %" FSL_ID_T_PFMT ", mtime, 1, 0 " "FROM event WHERE objid=%" FSL_ID_T_PFMT " AND type='ci'", rid, rid ); } /** Searches for the most recent common ancestor of the primary and one of the secondaries in a merge. On success, *outRid is set to its value and 0 is returned. If no match is found, *outRid is set to 0 and 0 is returned. Returns non-0 on error, indicating either a lower-level db error or an allocation error. If ignoreMerges is true, it follows only "primary" parent links. @see fsl__pivot_set_primary() @see fsl__pivot_set_secondary() */ static int fsl__pivot_find(fsl_cx * const f, bool ignoreMerges, fsl_id_t *outRid){ fsl_db * const db = fsl_cx_db(f); int rc; fsl_stmt q1 = fsl_stmt_empty, q2 = fsl_stmt_empty, u1 = fsl_stmt_empty, i1 = fsl_stmt_empty; fsl_id_t rid = 0; if(fsl_db_g_int32(db, 0, "SELECT COUNT(distinct src) FROM " FSL__TABLE_PIVOT "")<2){ return fsl_cx_err_set(f, FSL_RC_MISUSE, "Pivot list [" FSL__TABLE_PIVOT "] contains neither primary " "nor secondary entries."); } /* Prepare queries we will be needing ** ** The first query finds the oldest pending version on the ** FSL__TABLE_PIVOT. This will be next one searched. */ rc = fsl_cx_prepare(f, &q1, "SELECT rid FROM " FSL__TABLE_PIVOT " WHERE pending" " ORDER BY pending DESC, mtime DESC"); if(rc) goto end; /* Check to see if the record :rid is a common ancestor. The result ** set contains one or more rows if it is and is the empty set if it ** is not. */ rc = fsl_cx_prepare(f, &q2, "SELECT 1 FROM " FSL__TABLE_PIVOT " A, plink, " FSL__TABLE_PIVOT " B" " WHERE plink.pid=?1" " AND plink.cid=B.rid" " AND A.rid=?1" " AND A.src!=B.src %s", ignoreMerges ? "AND plink.isprim" : "" ); if(rc) goto end; /* Mark the :rid record has having been checked. It is not the ** common ancestor. */ rc = fsl_cx_prepare(f, &u1, "UPDATE " FSL__TABLE_PIVOT " SET pending=0 WHERE rid=?1" ); if(rc) goto end; /* Add to the queue all ancestors of :rid. */ rc = fsl_cx_prepare(f, &i1, "REPLACE INTO " FSL__TABLE_PIVOT " " "SELECT plink.pid," " coalesce((SELECT mtime FROM event X WHERE X.objid=plink.pid), 0.0)," " 1," " " FSL__TABLE_PIVOT ".src " " FROM plink, " FSL__TABLE_PIVOT " WHERE plink.cid=?1" " AND " FSL__TABLE_PIVOT ".rid=?1 %s", ignoreMerges ? "AND plink.isprim" : "" ); if(rc) goto end; while(FSL_RC_STEP_ROW==(rc = fsl_stmt_step(&q1))){ rid = fsl_stmt_g_id(&q1, 0); fsl_stmt_reset(&q1); rc = fsl_stmt_bind_step(&q2, "R", rid); if(rc) break/*error or found match*/; rc = fsl_stmt_bind_step(&i1, "R", rid); assert(FSL_RC_STEP_ROW!=rc); if(0==rc) rc = fsl_stmt_bind_step(&u1, "R", rid); if(rc) break; assert(FSL_RC_STEP_ROW!=rc); rid = 0; } switch(rc){ case 0: break; case FSL_RC_STEP_ROW: case FSL_RC_STEP_DONE: rc = 0; break; default: rc = fsl_cx_uplift_db_error2(f, NULL, rc); break; } end: fsl_stmt_finalize(&q1); fsl_stmt_finalize(&q2); fsl_stmt_finalize(&u1); fsl_stmt_finalize(&i1); if(0==rc && rid) *outRid = rid; return rc; } /** Searches f's current repository for the nearest fork related to version vid. More specifically: this looks for the most recent leaf that is (1) not equal to vid and (2) has not already been merged into vid and (3) the leaf is not closed and (4) the leaf is in the same branch as vid. If checkVmerge is true then the current checkout database is also checked (via the vmerge table), in which case a checkout must be opened. On success, returns 0 and assigns *outRid to the resulting RID. On error: - FSL_RC_NOT_A_REPO or FSL_RC_NOT_A_CKOUT if called when no repo or (if checkVmerge is true) no checkout. - FSL_RC_NOT_FOUND: no closest merge was found. - FSL_RC_OOM: on allocation error - Any number of potential other errors from the db layer. f's error state will contain more information about errors reported here. */ /*static*/ int fsl__find_nearest_fork(fsl_cx * const f, fsl_id_t vid, bool checkVmerge, fsl_id_t * outRid){ fsl_db * const db = checkVmerge ? fsl_needs_ckout(f) : fsl_needs_repo(f); fsl_buffer * const sql = fsl__cx_scratchpad(f); fsl_stmt q; if(!db){ return checkVmerge ? FSL_RC_NOT_A_CKOUT : FSL_RC_NOT_A_REPO; } q = fsl_stmt_empty; int rc = fsl_buffer_appendf(sql, "SELECT leaf.rid" " FROM leaf, event" " WHERE leaf.rid=event.objid" " AND leaf.rid!=%" FSL_ID_T_PFMT, /* Constraint (1) */ vid ); if(rc) goto end; if( checkVmerge ){ rc = fsl_buffer_append(sql, " AND leaf.rid NOT IN (SELECT merge FROM vmerge)" /* Constraint (2) */, -1 ); if(rc) goto end; } rc = fsl_buffer_appendf(sql, " AND NOT EXISTS(SELECT 1 FROM tagxref" /* Constraint (3) */ " WHERE rid=leaf.rid" " AND tagid=%d" " AND tagtype>0)" " AND (SELECT value FROM tagxref" /* Constraint (4) */ " WHERE tagid=%d AND rid=%" FSL_ID_T_PFMT " AND tagtype>0) =" " (SELECT value FROM tagxref" " WHERE tagid=%d AND rid=leaf.rid AND tagtype>0)" " ORDER BY event.mtime DESC LIMIT 1", FSL_TAGID_CLOSED, FSL_TAGID_BRANCH, vid, FSL_TAGID_BRANCH ); if(rc) goto end; rc = fsl_db_prepare(db, &q, "%b", sql); if(rc){ rc = fsl_cx_uplift_db_error2(f, db, rc); goto end; } rc = fsl_stmt_step(&q); switch(rc){ case FSL_RC_STEP_ROW: rc = 0; *outRid = fsl_stmt_g_id(&q, 0); assert(*outRid>0); break; case FSL_RC_STEP_DONE: rc = fsl_cx_err_set(f, FSL_RC_NOT_FOUND, "Cannot find nearest fork of RID #%" FSL_ID_T_PFMT ".", vid); break; default: rc = fsl_cx_uplift_db_error2(f, db, rc); break; } end: fsl_stmt_finalize(&q); fsl__cx_scratchpad_yield(f, sql); return rc; } /** Name for the merge algo's version of the fv table, noting that it differs enough from the update algo's version that they do not map 1-to-1 without some degree of pain which might make sense once merge is in the library and working. */ #define FSL__TABLE_FVM "fvm" static int fsl__renames_init(fsl_cx * const f){ char const * const coll = fsl_cx_filename_collation(f); return fsl_cx_exec_multi(f, "CREATE TEMP TABLE IF NOT EXISTS " FSL__TABLE_FVM "(\n" " fn TEXT UNIQUE %s,\n" /* The filename */ " idv INTEGER DEFAULT 0,\n" /* VFILE entry for current version */ " idp INTEGER DEFAULT 0,\n" /* VFILE entry for the pivot */ " idm INTEGER DEFAULT 0,\n" /* VFILE entry for version merging in */ " chnged BOOLEAN,\n" /* True if current version has been edited */ " ridv INTEGER DEFAULT 0,\n" /* Record ID for current version */ " ridp INTEGER DEFAULT 0,\n" /* Record ID for pivot */ " ridm INTEGER DEFAULT 0,\n" /* Record ID for merge */ " isexe BOOLEAN,\n" /* Execute permission enabled */ " fnp TEXT UNIQUE %s,\n" /* The filename in the pivot */ " fnm TEXT UNIQUE %s,\n" /* The filename in the merged version */ " fnn TEXT UNIQUE %s,\n" /* The filename in the name pivot */ " islinkv BOOLEAN,\n" /* True if current version is a symlink */ " islinkm BOOLEAN\n" /* True if merged version in is a symlink */ ");" "DELETE FROM " FSL__TABLE_FVM ";", coll, coll, coll, coll); } static int fsl__renames_finalize(fsl_cx * const f){ return fsl_cx_exec(f, //"DROP TABLE IF EXISTS " FSL__TABLE_FVM "DELETE FROM " FSL__TABLE_FVM); } static int fsl__renames_add(fsl_cx * const f, char const * zFnCol, fsl_id_t vid, fsl_id_t nid, bool reverseOk){ int rc; uint32_t i; /* loop counter */ uint32_t nChng; /* # of entries in aChng */ fsl_id_t * aChng = 0; /* Array of filename changes */ fsl_stmt q1 = fsl_stmt_empty, q2 = fsl_stmt_empty; fsl_db * const db = fsl_cx_db_repo(f); rc = fsl__find_filename_changes(f, nid, vid, reverseOk, &nChng, &aChng); if(rc) goto end; else if(0==nChng) return 0; rc = fsl_cx_prepare(f, &q1, "SELECT name FROM filename WHERE fnid=?1"); if(0==rc){ rc = fsl_cx_prepare(f, &q2, "SELECT name FROM filename WHERE fnid=?1"); } for(i=0; 0==rc && i < nChng; ++i){ char const *zN; char const *zV; rc = fsl_stmt_bind_step(&q1, "R", aChng[i*2]); if(FSL_RC_STEP_ROW==rc){ rc = fsl_stmt_bind_step(&q2, "R", aChng[i*2+1]); if(FSL_RC_STEP_ROW==rc) rc = 0; } if(rc){ rc = fsl_cx_uplift_db_error2(f, NULL, rc); break; } rc = fsl_stmt_get_text(&q1, 0, &zN, NULL); if(0==rc) rc = fsl_stmt_get_text(&q2, 0, &zV, NULL); if(rc){ rc = fsl_cx_uplift_db_error2(f, db, rc); break; } rc = fsl_cx_exec(f,"INSERT OR IGNORE INTO " FSL__TABLE_FVM "(%s,fnn) VALUES(%Q,%Q)", zFnCol, zV, zN); if(0==rc && 0==fsl_db_changes_recent(db)){ rc = fsl_cx_exec_multi(f, "UPDATE " FSL__TABLE_FVM " SET %s=%Q WHERE fnn=%Q", zFnCol, zV, zN); } } end: fsl_stmt_finalize(&q1); fsl_stmt_finalize(&q2); fsl_free(aChng); return rc; } /** Part of fsl_ckout_merge() related to collecting filenames and setting up renames. Returns 0 on success. */ static int fsl__renames_tweak(fsl_cx * const f, fsl_id_t mid, fsl_id_t pid, fsl_id_t vid, fsl_id_t nid, fsl_merge_opt const * const mOpt){ int rc = 0; char vAncestor = 'p'; /* If P is an ancestor of V then 'p', else 'n' */ rc = fsl__renames_init(f); if(0==rc) rc = fsl__renames_add(f, "fn", vid, nid, false); if(0==rc) rc = fsl__renames_add(f, "fnp", pid, nid, false); if(0==rc) rc = fsl__renames_add(f, "fnm", mid, nid, FSL_MERGE_TYPE_BACKOUT==mOpt->mergeType); /* It goes without saying that all of the SQL wizardry which follows was implemented by D. Richard Hipp. Its usage here does not imply any real understanding of it on the fossil-to-libfossil porter's part. */ if(rc) goto end; else if(nid!=pid){ /* See forum thread https://fossil-scm.org/forum/forumpost/549700437b ** ** If a filename changes between nid and one of the other check-ins ** pid, vid, or mid, then it might not have changed for all of them. ** try to fill in the appropriate filename in all slots where the ** name is missing. ** ** This does not work if ** (1) The filename changes more than once in between nid and vid/mid ** (2) Two or more filenames swap places - for example if A is renamed ** to B and B is renamed to A. ** The Fossil merge algorithm breaks down in those cases. It will need ** to be completely rewritten to handle such complex cases. Such cases ** appear to be rare, and also confusing to humans. */ rc = fsl_cx_exec(f, "UPDATE OR IGNORE " FSL__TABLE_FVM " SET fnp=vfile.pathname FROM vfile" " WHERE fnp IS NULL" " AND vfile.pathname = " FSL__TABLE_FVM ".fnn" " AND vfile.vid=%" FSL_ID_T_PFMT, pid ); if(rc) goto end; rc = fsl_cx_exec(f, "UPDATE OR IGNORE " FSL__TABLE_FVM " SET fn=vfile.pathname FROM vfile" " WHERE fn IS NULL" " AND vfile.pathname = " " coalesce(" FSL__TABLE_FVM ".fnp," FSL__TABLE_FVM ".fnn)" " AND vfile.vid=%" FSL_ID_T_PFMT, vid ); if(rc) goto end; rc = fsl_cx_exec(f, "UPDATE OR IGNORE " FSL__TABLE_FVM " SET fnm=vfile.pathname FROM vfile" " WHERE fnm IS NULL" " AND vfile.pathname =" " coalesce(" FSL__TABLE_FVM ".fnp," FSL__TABLE_FVM ".fnn)" " AND vfile.vid=%" FSL_ID_T_PFMT, mid ); if(rc) goto end; rc = fsl_cx_exec(f, "UPDATE OR IGNORE " FSL__TABLE_FVM " SET fnp=vfile.pathname FROM vfile" " WHERE fnp IS NULL" " AND vfile.pathname" " IN (" FSL__TABLE_FVM ".fnm," FSL__TABLE_FVM ".fn)" " AND vfile.vid=%" FSL_ID_T_PFMT, pid ); if(rc) goto end; rc = fsl_cx_exec(f, "UPDATE OR IGNORE " FSL__TABLE_FVM " SET fn=vfile.pathname FROM vfile" " WHERE fn IS NULL" " AND vfile.pathname = " FSL__TABLE_FVM ".fnm" " AND vfile.vid=%" FSL_ID_T_PFMT, vid ); if(rc) goto end; rc = fsl_cx_exec(f, "UPDATE OR IGNORE " FSL__TABLE_FVM " SET fnm=vfile.pathname FROM vfile" " WHERE fnm IS NULL" " AND vfile.pathname = " FSL__TABLE_FVM ".fn" " AND vfile.vid=%" FSL_ID_T_PFMT, mid ); if(rc) goto end; } assert(0==rc); if(mOpt->baselineRid>0){ fsl_db * const db = fsl_cx_db_repo(f); fsl_db_err_reset(db); vAncestor = fsl_db_exists(db, "WITH RECURSIVE ancestor(id) AS (" " VALUES(%" FSL_ID_T_PFMT ")" " UNION" " SELECT pid FROM plink, ancestor" " WHERE cid=ancestor.id" " AND pid!=%" FSL_ID_T_PFMT " AND cid!=%" FSL_ID_T_PFMT ")" "SELECT 1 FROM ancestor" " WHERE id=%" FSL_ID_T_PFMT " LIMIT 1", vid, nid, pid, pid ) ? 'p' : 'n'; assert(0==fsl_db_err_get(db, NULL, NULL)); } /* ** Add files found in V */ rc = fsl_cx_exec_multi(f, "UPDATE OR IGNORE " FSL__TABLE_FVM " SET fn=coalesce(fn%c,fnn) WHERE fn IS NULL;" "REPLACE INTO " FSL__TABLE_FVM "(fn,fnp,fnm,fnn,idv,ridv,islinkv,isexe,chnged)" " SELECT pathname, fnp, fnm, fnn, id, rid, islink, vf.isexe, vf.chnged" " FROM vfile vf" " LEFT JOIN " FSL__TABLE_FVM " ON fn=coalesce(origname,pathname)" " AND rid>0 AND vf.chnged NOT IN (3,5)" " WHERE vid=%" FSL_ID_T_PFMT ";", vAncestor, vid ); if(rc) goto end; /* ** Add files found in P */ rc = fsl_cx_exec_multi(f, "UPDATE OR IGNORE " FSL__TABLE_FVM " SET fnp=coalesce(fnn," " (SELECT coalesce(origname,pathname) FROM vfile WHERE id=idv))" " WHERE fnp IS NULL;" "INSERT OR IGNORE INTO " FSL__TABLE_FVM "(fnp)" " SELECT coalesce(origname,pathname) FROM vfile WHERE vid=%" FSL_ID_T_PFMT ";", pid ); if(rc) goto end; /* ** Add files found in M */ rc = fsl_cx_exec_multi(f, "UPDATE OR IGNORE " FSL__TABLE_FVM " SET fnm=fnp WHERE fnm IS NULL;" "INSERT OR IGNORE INTO " FSL__TABLE_FVM "(fnm)" " SELECT pathname FROM vfile WHERE vid=%" FSL_ID_T_PFMT ";", mid ); if(rc) goto end; /* ** Compute the file version ids for P and M */ if( pid==vid ){ rc = fsl_cx_exec_multi(f, "UPDATE " FSL__TABLE_FVM " SET idp=idv, ridp=ridv" " WHERE ridv>0 AND chnged NOT IN (3,5)" ); }else{ rc = fsl_cx_exec_multi(f, "UPDATE " FSL__TABLE_FVM " SET idp=coalesce(vfile.id,0), ridp=coalesce(vfile.rid,0)" " FROM vfile" " WHERE vfile.vid=%" FSL_ID_T_PFMT " AND " FSL__TABLE_FVM ".fnp=vfile.pathname", pid ); } if(rc) goto end; rc = fsl_cx_exec_multi(f, "UPDATE " FSL__TABLE_FVM " SET" " idm=coalesce(vfile.id,0)," " ridm=coalesce(vfile.rid,0)," " islinkm=coalesce(vfile.islink,0)," " isexe=coalesce(vfile.isexe," FSL__TABLE_FVM ".isexe)" " FROM vfile" " WHERE vid=%" FSL_ID_T_PFMT " AND fnm=pathname", mid ); if(rc) goto end; /* ** Update the execute bit on files where it's changed from P->M but ** not P->V */ if(!mOpt->dryRun){ fsl_stmt q = fsl_stmt_empty; rc = fsl_cx_prepare(f, &q, "SELECT idv, fn, " FSL__TABLE_FVM ".isexe " "FROM " FSL__TABLE_FVM ", vfile p, vfile v" " WHERE p.id=idp AND v.id=idv AND " FSL__TABLE_FVM ".isexe!=p.isexe" " AND v.isexe=p.isexe" ); if(rc) goto end; fsl_buffer * const fnAbs = fsl__cx_scratchpad(f)/*absolute filenames*/; rc = fsl_buffer_reserve(fnAbs, f->ckout.dirLen + 256); if(0==rc){ rc = fsl_buffer_append(fnAbs, f->ckout.dir, f->ckout.dirLen); } while( 0==rc && FSL_RC_STEP_ROW==fsl_stmt_step(&q) ){ fsl_id_t const idv = fsl_stmt_g_id(&q, 0); int const isExe = fsl_stmt_g_int32(&q, 2); fsl_size_t nName = 0; const char *zName = 0; rc = fsl_stmt_get_text(&q, 1, &zName, &nName); if(rc) break; fnAbs->mem[f->ckout.dirLen] = 0; fnAbs->used = f->ckout.dirLen; rc = fsl_buffer_append(fnAbs, zName, (fsl_int_t)nName); if(rc) break; fsl_file_exec_set( fsl_buffer_cstr(fnAbs), !!isExe ) /* Ignoring error */; rc = fsl_cx_exec(f, "UPDATE vfile SET isexe=%d " "WHERE id=%" FSL_ID_T_PFMT, isExe, idv); } fsl__cx_scratchpad_yield(f, fnAbs); fsl_stmt_finalize(&q); } end: return rc; }/*fsl__renames_tweak()*/ /** Adds an an entry in the vmerge table for the given id and rid. Returns 0 on success, uplifts any db error into f's error state. */ static int fsl__vmerge_insert(fsl_cx * const f, fsl_id_t id, fsl_id_t rid){ return fsl_cx_exec(f, "INSERT OR IGNORE INTO vmerge(id,merge,mhash)" "VALUES(%" FSL_ID_T_PFMT ",%" FSL_ID_T_PFMT ",(SELECT uuid FROM blob WHERE rid=%" FSL_ID_T_PFMT "))", id, rid, rid ); } #define fsl_merge_state_empty_m { \ NULL/*f*/, \ NULL/*opt*/, \ NULL/*filename*/, \ NULL/*prevName*/, \ FSL_MERGE_FCHANGE_NONE/*fileChangeType*/ \ } /** Initialized-with-defaults fsl_merge_state instance, intended for use in non-const copy initialization. */ const fsl_merge_state fsl_merge_state_empty = fsl_merge_state_empty_m; int fsl_ckout_merge(fsl_cx * const f, fsl_merge_opt const * const opt){ /** Notation: V (vid) The current checkout M (mid) The version being merged in P (pid) The "pivot" - the most recent common ancestor of V and M. N (nid) The "name pivot" - for detecting renames What follows was initially based on: https://fossil-scm.org/home/file/src/merge.c?ci=e340af58a249dc09&ln=331-1065 */ int rc = 0; fsl_db * const db = fsl_needs_ckout(f); bool inTrans = false; fsl_id_t const vid = f->ckout.rid /* current checkout (V) */; fsl_id_t pid = 0 /* pivot RID (P): most recent common ancestor of V and M*/; fsl_id_t mid = opt->mergeRid /* merge-in version (M) */; fsl_id_t nid = 0 /* "name pivot" version (N) */; bool doIntegrate = FSL_MERGE_TYPE_INTEGRATE==opt->mergeType; fsl_stmt q = fsl_stmt_empty; fsl_buffer * const absPath = fsl__cx_scratchpad(f); fsl_merge_state mState = fsl_merge_state_empty; if(!db) rc = FSL_RC_NOT_A_CKOUT; else if(0==vid){ rc = fsl_cx_err_set(f, FSL_RC_MISUSE, "Cannot merge into empty top-level checkin."); }else if(FSL_MERGE_TYPE_CHERRYPICK==opt->mergeType && opt->baselineRid>0){ rc = fsl_cx_err_set(f, FSL_RC_MISUSE, "Cannot use the baselineRid option " "with a cherry-pick merge."); } if(!rc) rc = fsl_cx_transaction_begin(f); if(rc) goto end; inTrans = true; if((pid = opt->baselineRid)>0){ if(!fsl_rid_is_version(f, pid)){ rc = fsl_cx_err_set(f, FSL_RC_TYPE, "Baseline RID #%" FSL_ID_T_PFMT " does not refer to a checkin version."); goto end; } } if(FSL_MERGE_TYPE_CHERRYPICK==opt->mergeType || FSL_MERGE_TYPE_BACKOUT==opt->mergeType){ pid = fsl_db_g_id(db, 0, "SELECT pid FROM plink WHERE cid=%" FSL_ID_T_PFMT " AND isprim", mid); if(0==pid){ rc = fsl_cx_err_set(f, FSL_RC_NOT_FOUND, "Cannot find an ancestor " "for to-merge RID #%" FSL_ID_T_PFMT ".", mid); goto end; } }else{ if(opt->baselineRid<=0){ fsl_stmt q = fsl_stmt_empty; rc = fsl__pivot_set_primary(f, mid); if(0==rc) rc = fsl__pivot_set_secondary(f, vid); if(rc) goto end; rc = fsl_cx_prepare(f, &q, "SELECT merge FROM vmerge WHERE id=0"); while( 0==rc && FSL_RC_STEP_ROW==fsl_stmt_step(&q) ){ rc = fsl__pivot_set_secondary(f, fsl_stmt_g_id(&q, 0)); } fsl_stmt_finalize(&q); if(0==rc) rc = fsl__pivot_find(f, false, &pid); if(rc) goto end; else if( pid<=0 ){ rc = fsl_cx_err_set(f, FSL_RC_NOT_FOUND, "Cannot find a common ancestor between " "RID #%" FSL_ID_T_PFMT " and RID #%" FSL_ID_T_PFMT ".", pid, vid); goto end; } } rc = fsl__pivot_set_primary(f, mid); if(0==rc) rc = fsl__pivot_set_secondary(f, vid); if(0==rc) rc = fsl__pivot_find(f, true, &nid); if(rc) goto end; else if( nid!=pid ){ rc = fsl__pivot_set_primary(f, nid); if(0==rc) rc = fsl__pivot_set_secondary(f, pid); if(0==rc) rc = fsl__pivot_find(f, true, &nid); if(rc) goto end; } /* ^^^ the above block is a great example of much error checking intrudes on the library API compared to fossil(1). */ } if( FSL_MERGE_TYPE_BACKOUT == opt->mergeType ){ fsl_id_t const t = pid; pid = mid; mid = t; } if(0==nid) nid = pid; if(opt->debug){ MARKER(("pid=%" FSL_ID_T_PFMT ", mid=%" FSL_ID_T_PFMT ", nid=%" FSL_ID_T_PFMT ", vid=%" FSL_ID_T_PFMT " integrate=%d\n", pid, mid, nid, vid, doIntegrate)); } if(mid == pid){ rc = fsl_cx_err_set(f, FSL_RC_RANGE, "Cowardly refusing to perform " "no-op merge from/to RID #%" FSL_ID_T_PFMT ".", mid); goto end; }else if(mid == vid){ rc = fsl_cx_err_set(f, FSL_RC_RANGE, "Cowardly refusing to merge " "version [%S] into itself.", f->ckout.uuid); goto end; }else if(!fsl_rid_is_version(f, pid)){ rc = fsl_cx_err_set(f, FSL_RC_TYPE, "RID #%" FSL_ID_T_PFMT " does not refer " "to a checkin version.", pid); goto end; }else{ uint32_t missing = 0; rc = fsl_vfile_load(f, mid, false, &missing); if(0==rc && 0==missing){ rc = fsl_vfile_load(f, pid, false, &missing); } if(0==rc && missing){ rc = fsl_cx_err_set(f, FSL_RC_PHANTOM, "Cannot merge due to missing content in one " "or more participating versions."); } if(rc) goto end; } if( doIntegrate && (fsl_content_is_private(f, mid) || !fsl_rid_is_leaf(f, mid)) ){ doIntegrate = false; } if(opt->scanForChanges){ rc = fsl_vfile_changes_scan(f, vid, FSL_VFILE_CKSIG_ENOTFILE); if(rc) goto end; } rc = fsl__renames_tweak(f, mid, pid, vid, nid, opt); if(rc) goto end; if(opt->debug){ MARKER(("pid=%" FSL_ID_T_PFMT ", mid=%" FSL_ID_T_PFMT ", nid=%" FSL_ID_T_PFMT ", vid=%" FSL_ID_T_PFMT " integrate=%d\n", pid, mid, nid, vid, doIntegrate)); MARKER(("Contents of " FSL__TABLE_FVM ":\n")); if(1==opt->debug){ fsl_db_each(db, fsl_stmt_each_f_dump, NULL, "SELECT fn,fnp,fnm,chnged,ridv,ridp,ridm, " " isexe,islinkv islinkm, fnn " " FROM " FSL__TABLE_FVM " WHERE chnged OR (ridv!=ridm AND ridm!=ridp)" " ORDER BY fn, fnp, fnm "); }else{ fsl_db_each(db, fsl_stmt_each_f_dump, NULL, "SELECT * FROM " FSL__TABLE_FVM " ORDER BY fn, fnp, fnm"); } MARKER(("Contents of " FSL__TABLE_PIVOT ":\n")); fsl_db_each(db, fsl_stmt_each_f_dump, NULL, "SELECT * FROM " FSL__TABLE_PIVOT " ORDER BY src DESC, rid, pending, src"); MARKER(("Contents of [vmerge]:\n")); fsl_db_each(db, fsl_stmt_each_f_dump, NULL, "SELECT * FROM vmerge order by merge"); } mState.f = f; mState.opt = opt; #define MCB(FCT,RMI,FN) \ mState.fileChangeType = FCT; \ mState.fileRmInfo = RMI; \ mState.filename = FN; \ rc = opt->callback(&mState); \ mState.priorName = NULL #define MCB2(FCT,FN) MCB(FCT,FSL_CKUP_RM_NOT,FN) /************************************************************************ ** All of the information needed to do the merge is now contained in the ** FV table. Starting here, we begin to actually carry out the merge. ** ** First, find files in M and V but not in P and report conflicts. ** The file in M will be ignored. It will be treated as if it ** does not exist. */ rc = fsl_cx_prepare(f, &q, "SELECT idm FROM " FSL__TABLE_FVM " WHERE idp=0 AND idv>0 AND idm>0"); if(rc) goto end; while( 0==rc && FSL_RC_STEP_ROW==(rc = fsl_stmt_step(&q)) ){ fsl_id_t const idm = fsl_stmt_g_id(&q, 0); rc = fsl_cx_exec(f, "UPDATE " FSL__TABLE_FVM " SET idm=0 WHERE idm=%" FSL_ID_T_PFMT, idm); if(0==rc && opt->callback){ fsl_buffer * const bName = fsl__cx_scratchpad(f); rc = fsl_db_get_buffer(db, bName, false, "SELECT pathname FROM vfile WHERE id=%" FSL_ID_T_PFMT, idm); if(0==rc){ MCB2(FSL_MERGE_FCHANGE_CONFLICT_ANCESTOR, fsl_buffer_cstr(bName)); } fsl__cx_scratchpad_yield(f, bName); } } fsl_stmt_finalize(&q); switch(rc){ case 0: case FSL_RC_STEP_DONE: rc = 0; break; default: goto end; } /* ** Find files that have changed from P->M but not P->V. ** Copy the M content over into V. */ rc = fsl_cx_prepare(f, &q, "SELECT idv, ridm, fn, islinkm FROM " FSL__TABLE_FVM " WHERE idp>0 AND idv>0 AND idm>0" " AND ridm!=ridp AND ridv=ridp AND NOT chnged" ); if(rc) goto end; while( 0==rc && (FSL_RC_STEP_ROW==fsl_stmt_step(&q)) ){ fsl_id_t const idv = fsl_stmt_g_id(&q, 0); fsl_id_t const ridm = fsl_stmt_g_id(&q, 1); int const islinkm = fsl_stmt_g_int32(&q, 3); /* Copy content from idm over into idv. Overwrite idv. */ if(opt->debug){ const char *zName = fsl_stmt_g_text(&q, 2, NULL); MARKER(("COPIED (M)=>(V) %s\n", zName)); } if( !opt->dryRun ){ //undo_save(zName); rc = fsl_cx_exec(f, "UPDATE vfile SET mtime=0, mrid=%" FSL_ID_T_PFMT ", chnged=%d, islink=%d," " mhash=CASE WHEN rid<>%" FSL_ID_T_PFMT " THEN (SELECT uuid FROM blob WHERE blob.rid=%" FSL_ID_T_PFMT ") END" " WHERE id=%" FSL_ID_T_PFMT, ridm, doIntegrate ? 4 : 2, islinkm, ridm, ridm, idv ); if(0==rc) rc = fsl__vfile_to_ckout(f, idv, NULL); } if(0==rc && opt->callback){ const char *zName = 0; rc = fsl_stmt_get_text(&q, 2, &zName, NULL); if(0==rc){ MCB2(FSL_MERGE_FCHANGE_COPIED,zName); } } } fsl_stmt_finalize(&q); switch(rc){ case 0: case FSL_RC_STEP_DONE: rc = 0; break; default: goto end; } /* ** Do a three-way merge on files that have changes on both P->M and P->V. */ rc = fsl_cx_prepare(f, &q, "SELECT ridm, idv, ridp, ridv," " FSL_GLOB('binary-glob'," FSL__TABLE_FVM ".fn)," " fn, isexe, islinkv, islinkm FROM " FSL__TABLE_FVM " WHERE idp>0 AND idv>0 AND idm>0" " AND ridm!=ridp AND (ridv!=ridp OR chnged)" ); if(0==rc){ rc = fsl_buffer_append( absPath, f->ckout.dir, (fsl_int_t)f->ckout.dirLen); } while( 0==rc && (FSL_RC_STEP_ROW==fsl_stmt_step(&q)) ){ fsl_id_t const ridm = fsl_stmt_g_id(&q, 0); fsl_id_t const idv = fsl_stmt_g_id(&q, 1); fsl_id_t const ridp = fsl_stmt_g_id(&q, 2); fsl_id_t const ridv = fsl_stmt_g_id(&q, 3); int32_t isBinary = fsl_stmt_g_int32(&q, 4); int32_t const isExe = fsl_stmt_g_int32(&q, 6); int32_t const islinkv = fsl_stmt_g_int32(&q, 7); int32_t const islinkm = fsl_stmt_g_int32(&q, 8); char const *zFullPath; const char *zName = NULL; fsl_size_t nName = 0; rc = fsl_stmt_get_text(&q, 5, &zName, &nName); if(rc){ rc = fsl_cx_uplift_db_error2(f, NULL, rc); break; } /* Do a 3-way merge of idp->idm into idp->idv. The results go into idv. */ if(opt->debug){ MARKER(("MERGE %s (pivot=%d v1=%d v2=%d)\n", zName, (int)ridp, (int)ridm, (int)ridv)); } if( islinkv || islinkm ){ //MARKER(("***** Cannot merge symlink %s\n", zName)); if(opt->callback){ MCB2(FSL_MERGE_FCHANGE_CONFLICT_SYMLINK,zName); } }else if(isBinary){ if(opt->callback){ MCB2(FSL_MERGE_FCHANGE_CONFLICT_BINARY,zName); } }else{ fsl_buffer m = fsl_buffer_empty; fsl_buffer p = fsl_buffer_empty; fsl_buffer r = fsl_buffer_empty; //if( !dryRunFlag ) undo_save(zName); if(opt->debug){ MARKER(("Merge: %s\n", zName)); } absPath->used = f->ckout.dirLen; rc = fsl_buffer_append(absPath, zName, (fsl_int_t)nName); if(rc) break; zFullPath = fsl_buffer_cstr(absPath); rc = fsl_content_get(f, ridp, &p); if(0==rc) rc = fsl_content_get(f, ridm, &m); if(0==rc){ //unsigned mergeFlags = dryRunFlag ? MERGE_DRYRUN : 0; //if(keepMergeFlag!=0) mergeFlags |= MERGE_KEEP_FILES; //rc = merge_3way(&p, zFullPath, &m, &r, mergeFlags); unsigned int nConflict = 0; fsl_buffer * const contentLocal = fsl__cx_content_buffer(f); rc = fsl_buffer_fill_from_filename(contentLocal, zFullPath); if(0==rc){ rc = fsl_buffer_merge3( &p, contentLocal, &m, &r, &nConflict ); switch(rc){ case 0: if(opt->debug){ MARKER(("%swriting merged file w/ %u conflict(s): %s\n", opt->dryRun ? "Not " : "", nConflict, zName)); } if(!opt->dryRun){ rc = fsl_buffer_to_filename(&r, zFullPath); if(0==rc) fsl_file_exec_set(zFullPath, !!isExe); } break; case FSL_RC_DIFF_BINARY: case FSL_RC_TYPE: /* 2021-12-15: fsl_buffer_merge3() currently returns FSL_RC_TYPE for binary, but "should" return FSL_RC_DIFF_BINARY. Changing that is TODO. */ rc = 0; isBinary = 1; break; default: break; } } fsl__cx_content_buffer_yield(f); if(0==rc && !isBinary){ rc = fsl_cx_exec(f, "UPDATE vfile " "SET mtime=0 WHERE id=%" FSL_ID_T_PFMT, idv); } if(0==rc && opt->callback){ fsl_merge_fchange_e const fce = isBinary ? FSL_MERGE_FCHANGE_CONFLICT_BINARY : (nConflict ? FSL_MERGE_FCHANGE_CONFLICT_MERGED : FSL_MERGE_FCHANGE_MERGED); MCB2(fce,zName); } } fsl_buffer_clear(&p); fsl_buffer_clear(&m); fsl_buffer_clear(&r); } if(0==rc) rc = fsl__vmerge_insert(f, idv, ridm); } fsl_stmt_finalize(&q); switch(rc){ case 0: case FSL_RC_STEP_DONE: rc = 0; break; default: goto end; } /* ** Drop files that are in P and V but not in M */ rc = fsl_cx_prepare(f, &q, "SELECT idv, fn, chnged FROM " FSL__TABLE_FVM " WHERE idp>0 AND idv>0 AND idm=0" ); while( 0==rc && FSL_RC_STEP_ROW==(rc=fsl_stmt_step(&q)) ){ fsl_id_t const idv = fsl_stmt_g_id(&q, 0); int32_t const chnged = fsl_stmt_g_int32(&q, 2); const char *zName; fsl_size_t nName = 0; rc = fsl_stmt_get_text(&q, 1, &zName, &nName); if(rc) break; /* Delete the file idv */ if(opt->debug){ MARKER(("DELETE %s\n", zName)); } if( chnged ){ if(opt->debug){ MARKER(("WARNING: local edits lost for %s", zName)); } } //if( !dryRunFlag ) undo_save(zName); rc = fsl_cx_exec(f, "UPDATE vfile SET deleted=1 WHERE id=%" FSL_ID_T_PFMT, idv ); if(!chnged && !opt->dryRun ){ /* ^^^ this differs from fossil(1), which always deletes the local file regardless of whether it has local changes. */ absPath->used = f->ckout.dirLen; rc = fsl_buffer_append(absPath, zName, (fsl_int_t)nName); if(0==rc) fsl_file_unlink(fsl_buffer_cstr(absPath)); } if(opt->callback){ fsl_ckup_rm_state_e const rme = chnged ? FSL_CKUP_RM_KEPT : FSL_CKUP_RM; MCB(FSL_MERGE_FCHANGE_RM,rme,zName); } } fsl_stmt_finalize(&q); switch(rc){ case 0: case FSL_RC_STEP_DONE: rc = 0; break; default: goto end; } /* For certain sets of renames (e.g. A -> B and B -> A), a file that is ** being renamed must first be moved to a temporary location to avoid ** being overwritten by another rename operation. A row is added to the ** TMPRN table for each of these temporary renames. */ rc = fsl_cx_exec_multi(f, "CREATE TEMP TABLE IF NOT EXISTS tmprn(fn UNIQUE, tmpfn);" "DELETE FROM tmprn;" ); /* ** Rename files that have taken a rename on P->M but which keep the same ** name on P->V. If a file is renamed on P->V only or on both P->V and ** P->M then we retain the V name of the file. */ rc = fsl_cx_prepare(f, &q, "SELECT idv, fnp, fnm, isexe FROM " FSL__TABLE_FVM " WHERE idv>0 AND idp>0 AND idm>0 AND fnp=fn AND fnm!=fnp" ); while( 0==rc && FSL_RC_STEP_ROW==(rc=fsl_stmt_step(&q)) ){ fsl_id_t const idv = fsl_stmt_g_id(&q, 0); int32_t const isExe = fsl_stmt_g_int32(&q, 3); const char *zOldName; const char *zNewName; rc = fsl_stmt_get_text(&q, 1, &zOldName, NULL); if(0==rc) rc = fsl_stmt_get_text(&q, 2, &zNewName, NULL); if(rc) break; if(opt->debug){ MARKER(("RENAME %s -> %s\n", zOldName, zNewName)); } //if( !dryRunFlag ) undo_save(zOldName); //if( !dryRunFlag ) undo_save(zNewName); rc = fsl_cx_exec_multi(f, "UPDATE vfile SET pathname=NULL, origname=pathname" " WHERE vid=%" FSL_ID_T_PFMT " AND pathname=%Q;" "UPDATE vfile SET pathname=%Q, origname=coalesce(origname,pathname)" " WHERE id=%" FSL_ID_T_PFMT ";", vid, zNewName, zNewName, idv ); if(rc) break; if( !opt->dryRun ){ fsl_buffer * const bFullOld = fsl__cx_scratchpad(f); fsl_buffer * const bFullNew = fsl__cx_scratchpad(f); fsl_buffer * const bTmp = fsl__cx_scratchpad(f); char const *zFullOldPath; char const *zFullNewPath; bool const realSymlinks = fsl_cx_allows_symlinks(f, false); rc = fsl_db_get_buffer(db, bFullOld, false, "SELECT tmpfn FROM tmprn WHERE fn=%Q", zOldName); if(!rc && !bFullOld->used){ rc = fsl_buffer_appendf(bFullOld, "%s%s", f->ckout.dir, zOldName); } if(0==rc) rc = fsl_buffer_appendf(bFullNew, "%s%s", f->ckout.dir, zNewName); if(rc) goto merge_rename_end; zFullOldPath = fsl_buffer_cstr(bFullOld); zFullNewPath = fsl_buffer_cstr(bFullNew); if( fsl_file_size(zFullNewPath)>=0 ){ rc = fsl_file_tempname(bTmp, "", NULL); if(rc) goto merge_rename_end; rc = fsl_cx_exec(f, "INSERT INTO tmprn(fn,tmpfn) VALUES(%Q,%B)", zNewName, bTmp); if(rc) goto merge_rename_end; rc = fsl_is_symlink(zFullNewPath) ? fsl__symlink_copy(zFullNewPath, fsl_buffer_cstr(bTmp), realSymlinks) : fsl_file_copy(zFullNewPath, fsl_buffer_cstr(bTmp)); if(rc){ rc = fsl_cx_err_set(f, rc, "Error copying file [%s].", zFullNewPath); } if(rc) goto merge_rename_end; } rc = fsl_is_symlink(zFullOldPath) ? fsl__symlink_copy(zFullOldPath, zFullNewPath, realSymlinks) : fsl_file_copy(zFullOldPath, zFullNewPath); if(0==rc){ fsl_file_exec_set(zFullNewPath, !!isExe); fsl_file_unlink(zFullOldPath); /* ^^^ Ignore errors: not critical here */ } merge_rename_end: fsl__cx_scratchpad_yield(f, bFullOld); fsl__cx_scratchpad_yield(f, bFullNew); fsl__cx_scratchpad_yield(f, bTmp); } if(0==rc && opt->callback){ mState.priorName = zOldName; MCB2(FSL_MERGE_FCHANGE_RENAMED,zNewName); } } fsl_stmt_finalize(&q); switch(rc){ case 0: case FSL_RC_STEP_DONE: rc = 0; break; default: goto end; } /** TODO??? The above loop can leave temp files laying around. We should(?) to (for each tmpfn in tmprn => unlink(tmpfn)). fossil(1) does not do that, but that seems like a bug. */ /* A file that has been deleted and replaced by a renamed file will have a ** NULL pathname. Change it to something that makes the output of "status" ** and similar commands make sense for such files and that will (most likely) ** not be an actual existing pathname. */ rc = fsl_cx_exec(f, "UPDATE vfile SET pathname=origname || ' (overwritten by rename)'" " WHERE pathname IS NULL" ); if(rc) goto end; /* ** Insert into V any files that are not in V or P but are in M. */ rc = fsl_cx_prepare(f, &q, "SELECT idm, fnm FROM " FSL__TABLE_FVM " WHERE idp=0 AND idv=0 AND idm>0" ); while( 0==rc && FSL_RC_STEP_ROW==(rc=fsl_stmt_step(&q)) ){ fsl_id_t const idm = fsl_stmt_g_id(&q, 0); const char *zName; fsl_buffer * const bFullName = fsl__cx_scratchpad(f); rc = fsl_cx_exec(f, "REPLACE INTO vfile(vid,chnged,deleted,rid,mrid," "isexe,islink,pathname,mhash)" " SELECT %" FSL_ID_T_PFMT ",%d,0,rid,mrid,isexe,islink,pathname," "CASE WHEN rid<>mrid" " THEN (SELECT uuid FROM blob WHERE blob.rid=vfile.mrid) END " "FROM vfile WHERE id=%" FSL_ID_T_PFMT, vid, doIntegrate ? FSL_VFILE_CHANGE_INTEGRATE_MOD : FSL_VFILE_CHANGE_MERGE_ADD, idm); if(0==rc) rc = fsl_stmt_get_text(&q, 1, &zName, NULL); if(0==rc) rc = fsl_buffer_appendf(bFullName, "%s%s", f->ckout.dir, zName); if(rc) goto merge_add_end; fsl_merge_fchange_e fchange; if( fsl_is_file_or_link(fsl_buffer_cstr(bFullName)) && !fsl_db_exists(db, "SELECT 1 FROM fv WHERE fn=%Q", zName) ){ if(opt->debug){ MARKER(("ADDED %s (overwrites an unmanaged file)\n", zName)); } fchange = FSL_MERGE_FCHANGE_CONFLICT_ADDED_UNMANAGED; }else{ if(opt->debug){ MARKER(("ADDED %s\n", zName)); } fchange = FSL_MERGE_FCHANGE_ADDED; } if( !opt->dryRun ){ //undo_save(zName); rc = fsl__vfile_to_ckout(f, idm, NULL); } merge_add_end: fsl__cx_scratchpad_yield(f, bFullName); if(0==rc && opt->callback){ MCB2(fchange,zName); } } fsl_stmt_finalize(&q); switch(rc){ case 0: case FSL_RC_STEP_DONE: rc = 0; break; default: goto end; } fsl_id_t vmergeWho = 0; switch(opt->mergeType){ case FSL_MERGE_TYPE_CHERRYPICK: vmergeWho = mid; /* For a cherry-pick merge, make the default check-in comment the same ** as the check-in comment on the check-in that is being merged in. */ if(0==rc){ rc = fsl_cx_exec(f, "REPLACE INTO vvar(name,value)" " SELECT 'ci-comment', coalesce(ecomment,comment) FROM event" " WHERE type='ci' AND objid=%" FSL_ID_T_PFMT, mid); } break; case FSL_MERGE_TYPE_BACKOUT: vmergeWho = pid; break; case FSL_MERGE_TYPE_INTEGRATE: case FSL_MERGE_TYPE_NORMAL: vmergeWho = mid; break; } if(0==rc){ rc = fsl__vmerge_insert(f, (int)opt->mergeType, vmergeWho); } #undef MCB #undef MCB2 end: if(opt->debug){ MARKER(("fsl_ckout_merge() made it to the end with rc %s.\n", fsl_rc_cstr(rc))); } fsl__cx_scratchpad_yield(f, absPath); if(0==rc){ fsl__renames_finalize(f); } fsl_stmt_finalize(&q); if(inTrans){ if(0==rc){ rc = fsl_vfile_unload_except(f, vid); // ^^^ not strictly needed unless we're NOT rolling back } int const rc2 = fsl_cx_transaction_end(f, 0!=rc); if(rc2 && 0==rc) rc = rc2; } return rc; } #undef FSL__TABLE_PIVOT #undef FSL__TABLE_FVM #undef MARKER /* end of file ./src/merge.c */ /* start of file ./src/merge3.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
31269 31270 31271 31272 31273 31274 31275 | sz -= aC[1]; aC += 3; } return true; } /** | | | | | | > | > > > > | > > | 33050 33051 33052 33053 33054 33055 33056 33057 33058 33059 33060 33061 33062 33063 33064 33065 33066 33067 33068 33069 33070 33071 33072 33073 33074 33075 33076 33077 33078 33079 33080 33081 33082 33083 33084 33085 33086 33087 33088 33089 33090 33091 33092 33093 33094 33095 33096 33097 33098 33099 33100 33101 33102 33103 33104 | sz -= aC[1]; aC += 3; } return true; } /** pSrc contains an edited file where aC[] describes the edit, starting at index i. Part of pSrc has already been output. This routine outputs additional lines of pSrc - lines that correspond to the next sz lines of the original unedited file. Note that sz counts the number of lines of text in the original file, but text is output from the edited file, so the number of lines transfer to pOut might be different from sz. Fewer lines appear in pOut if there are deletes. More lines appear if there are inserts. The aC[] array is updated and the new index into aC[] is returned via the newIndex. The running line number count is updated via pLn. Returns 0 on success, FSL_RC_OOM on allocation error. */ static int output_one_side(fsl_buffer *pOut, fsl_buffer *pSrc, int *aC, int i, int sz, int *newIndex, int *pLn){ int rc = 0; while( sz>0 ){ if( aC[i]==0 && aC[i+1]==0 && aC[i+2]==0 ) break; if( aC[i]>=sz ){ rc = fsl_buffer_copy_lines(pOut, pSrc, sz); *pLn += sz; if(rc) break; aC[i] -= sz; break; } rc = fsl_buffer_copy_lines(pOut, pSrc, aC[i]); *pLn += aC[i]; if(!rc){ rc = fsl_buffer_copy_lines(pOut, pSrc, aC[i+2]); *pLn += aC[i+2]; } if(rc) break; sz -= aC[i] + aC[i+1]; i += 3; } if(!rc) *newIndex = i; return rc; } |
︙ | ︙ | |||
31338 31339 31340 31341 31342 31343 31344 | } /** Ensure that the text in p, if not empty, ends with a new line. If useCrLf is true adds "\r\n" otherwise "\n". Returns 0 on success or p is empty, and FSL_RC_OOM on OOM. */ | < | | 33126 33127 33128 33129 33130 33131 33132 33133 33134 33135 33136 33137 33138 33139 33140 | } /** Ensure that the text in p, if not empty, ends with a new line. If useCrLf is true adds "\r\n" otherwise "\n". Returns 0 on success or p is empty, and FSL_RC_OOM on OOM. */ static int ensure_line_end(fsl_buffer *p, bool useCrLf){ int rc = 0; if( !p->used ) return 0; if( p->mem[p->used-1]!='\n' ){ rc = fsl_buffer_append(p, useCrLf ? "\r\n" : "\n", useCrLf ? 2 : 1); } return rc; } |
︙ | ︙ | |||
31386 31387 31388 31389 31390 31391 31392 | NEVER, EVER change these. They MUST match the ones used by fossil. */ static const char *const mergeMarker[] = { /*123456789 123456789 123456789 123456789 123456789 123456789 123456789*/ | | | | | | > > > > > > > | < | | | | > > > > > > > > > > > > > > > > | > | | 33173 33174 33175 33176 33177 33178 33179 33180 33181 33182 33183 33184 33185 33186 33187 33188 33189 33190 33191 33192 33193 33194 33195 33196 33197 33198 33199 33200 33201 33202 33203 33204 33205 33206 33207 33208 33209 33210 33211 33212 33213 33214 33215 33216 33217 33218 33219 33220 33221 33222 33223 33224 33225 33226 33227 33228 33229 33230 33231 33232 33233 33234 33235 33236 33237 33238 33239 33240 33241 33242 33243 | NEVER, EVER change these. They MUST match the ones used by fossil. */ static const char *const mergeMarker[] = { /*123456789 123456789 123456789 123456789 123456789 123456789 123456789*/ "<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<", "||||||| COMMON ANCESTOR content follows |||||||||||||||||||||||||", "======= MERGED IN content follows ===============================", ">>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" }; enum { /* strlen() of each mergeMarker entry. */ MEMA_LENGTH = 65 }; /** Asserts, the first time it is called, that all mergeMarker entries are of the same length and returns that length. */ static inline fsl_int_t assert_mema_lengths(){ static bool once = true; if(once){ once = false; assert(sizeof(mergeMarker)/sizeof(mergeMarker[0]) == 4); assert((fsl_int_t)fsl_strlen(mergeMarker[0])==MEMA_LENGTH); assert((fsl_int_t)fsl_strlen(mergeMarker[1])==MEMA_LENGTH); assert((fsl_int_t)fsl_strlen(mergeMarker[2])==MEMA_LENGTH); assert((fsl_int_t)fsl_strlen(mergeMarker[3])==MEMA_LENGTH); } return MEMA_LENGTH; } /* ** Write out mergeMarker[iMark] to pOut, along with the given line ** number (if>0). Returns 0 on success, FSL_RC_OOM on allocation ** error. */ static int append_merge_mark(fsl_buffer * const pOut, int iMark, int ln, bool useCrLf){ int rc = ensure_line_end(pOut, useCrLf); if(0==rc){ rc = fsl_buffer_append(pOut, mergeMarker[iMark], MEMA_LENGTH); if( 0==rc && ln>0 ) rc = fsl_buffer_appendf(pOut, " (line %d)", ln); if(0==rc) rc = ensure_line_end(pOut, useCrLf); } return rc; } int fsl_buffer_merge3(fsl_buffer * const pPivot, fsl_buffer * const pV1, fsl_buffer * const pV2, fsl_buffer * const pOut, unsigned int * const conflictCount){ int *aC1 = 0; /* Changes from pPivot to pV1 */ int *aC2 = 0; /* Changes from pPivot to pV2 */ int i1, i2; /* Index into aC1[] and aC2[] */ int nCpy, nDel, nIns; /* Number of lines to copy, delete, or insert */ int limit1, limit2; /* Sizes of aC1[] and aC2[] */ int rc = 0; unsigned int nConflict = 0; /* Number of merge conflicts seen so far */ bool useCrLf = false; int ln1, ln2, lnPivot; /* Line numbers for all files */ assert_mema_lengths(); #define RC if(rc) { \ MARKER(("rc=%s\n", fsl_rc_cstr(rc))); goto end; } (void)0 fsl_buffer_reuse(pOut); /* Merge results stored in pOut */ /* If both pV1 and pV2 start with a UTF-8 byte-order-mark (BOM), ** keep it in the output. This should be secure enough not to cause |
︙ | ︙ | |||
31451 31452 31453 31454 31455 31456 31457 | ** and pPivot => pV2 (into aC2). Each of the aC1 and aC2 arrays is ** an array of integer triples. Within each triple, the first integer ** is the number of lines of text to copy directly from the pivot, ** the second integer is the number of lines of text to omit from the ** pivot, and the third integer is the number of lines of text that are ** inserted. The edit array ends with a triple of 0,0,0. */ | | | | 33261 33262 33263 33264 33265 33266 33267 33268 33269 33270 33271 33272 33273 33274 33275 33276 | ** and pPivot => pV2 (into aC2). Each of the aC1 and aC2 arrays is ** an array of integer triples. Within each triple, the first integer ** is the number of lines of text to copy directly from the pivot, ** the second integer is the number of lines of text to omit from the ** pivot, and the third integer is the number of lines of text that are ** inserted. The edit array ends with a triple of 0,0,0. */ rc = fsl_diff_v2_raw(pPivot, pV1, NULL, &aC1); if(!rc) rc = fsl_diff_v2_raw(pPivot, pV2, NULL, &aC2); RC; assert(aC1 && aC2); /* Rewind inputs: Needed to reconstruct output */ fsl_buffer_rewind(pV1); fsl_buffer_rewind(pV2); fsl_buffer_rewind(pPivot); |
︙ | ︙ | |||
31482 31483 31484 31485 31486 31487 31488 31489 31490 31491 31492 31493 31494 31495 31496 31497 31498 31499 31500 31501 31502 31503 31504 31505 31506 31507 31508 31509 31510 31511 31512 31513 31514 31515 31516 31517 31518 31519 31520 31521 31522 31523 31524 31525 31526 31527 31528 31529 31530 31531 31532 31533 31534 31535 31536 31537 31538 | /* Loop over the two edit vectors and use them to compute merged text ** which is written into pOut. i1 and i2 are multiples of 3 which are ** indices into aC1[] and aC2[] to the edit triple currently being ** processed */ i1 = i2 = 0; while( i1<limit1 && i2<limit2 ){ FDEBUG( printf("%d: %2d %2d %2d %d: %2d %2d %2d\n", i1/3, aC1[i1], aC1[i1+1], aC1[i1+2], i2/3, aC2[i2], aC2[i2+1], aC2[i2+2]); ) if( aC1[i1]>0 && aC2[i2]>0 ){ /* Output text that is unchanged in both V1 and V2 */ nCpy = mymin(aC1[i1], aC2[i2]); FDEBUG( printf("COPY %d\n", nCpy); ) rc = fsl_buffer_copy_lines(pOut, pPivot, (fsl_size_t)nCpy); if(!rc) rc = fsl_buffer_copy_lines(0, pV1, (fsl_size_t)nCpy); if(!rc) rc = fsl_buffer_copy_lines(0, pV2, (fsl_size_t)nCpy); RC; aC1[i1] -= nCpy; aC2[i2] -= nCpy; }else if( aC1[i1] >= aC2[i2+1] && aC1[i1]>0 && aC2[i2+1]+aC2[i2+2]>0 ){ /* Output edits to V2 that occurs within unchanged regions of V1 */ nDel = aC2[i2+1]; nIns = aC2[i2+2]; FDEBUG( printf("EDIT -%d+%d left\n", nDel, nIns); ) rc = fsl_buffer_copy_lines(0, pPivot, (fsl_size_t)nDel); if(!rc) rc = fsl_buffer_copy_lines(0, pV1, (fsl_size_t)nDel); if(!rc) rc = fsl_buffer_copy_lines(pOut, pV2, (fsl_size_t)nIns); RC; aC1[i1] -= nDel; i2 += 3; }else if( aC2[i2] >= aC1[i1+1] && aC2[i2]>0 && aC1[i1+1]+aC1[i1+2]>0 ){ /* Output edits to V1 that occur within unchanged regions of V2 */ nDel = aC1[i1+1]; nIns = aC1[i1+2]; FDEBUG( printf("EDIT -%d+%d right\n", nDel, nIns); ) rc = fsl_buffer_copy_lines(0, pPivot, (fsl_size_t)nDel); if(!rc) fsl_buffer_copy_lines(0, pV2, (fsl_size_t)nDel); if(!rc) fsl_buffer_copy_lines(pOut, pV1, (fsl_size_t)nIns); aC2[i2] -= nDel; i1 += 3; }else if( sameEdit(&aC1[i1], &aC2[i2], pV1, pV2) ){ /* Output edits that are identical in both V1 and V2. */ assert( aC1[i1]==0 ); nDel = aC1[i1+1]; nIns = aC1[i1+2]; FDEBUG( printf("EDIT -%d+%d both\n", nDel, nIns); ) rc = fsl_buffer_copy_lines(0, pPivot, (fsl_size_t)nDel); if(!rc) fsl_buffer_copy_lines(pOut, pV1, (fsl_size_t)nIns); if(!rc) fsl_buffer_copy_lines(0, pV2, (fsl_size_t)nIns); i1 += 3; i2 += 3; | > > > > > > > > > > > > > | < | < < < | < | | < > | | | | < < < | | 33292 33293 33294 33295 33296 33297 33298 33299 33300 33301 33302 33303 33304 33305 33306 33307 33308 33309 33310 33311 33312 33313 33314 33315 33316 33317 33318 33319 33320 33321 33322 33323 33324 33325 33326 33327 33328 33329 33330 33331 33332 33333 33334 33335 33336 33337 33338 33339 33340 33341 33342 33343 33344 33345 33346 33347 33348 33349 33350 33351 33352 33353 33354 33355 33356 33357 33358 33359 33360 33361 33362 33363 33364 33365 33366 33367 33368 33369 33370 33371 33372 33373 33374 33375 33376 33377 33378 33379 33380 33381 33382 33383 33384 33385 33386 33387 33388 33389 33390 33391 33392 33393 | /* Loop over the two edit vectors and use them to compute merged text ** which is written into pOut. i1 and i2 are multiples of 3 which are ** indices into aC1[] and aC2[] to the edit triple currently being ** processed */ i1 = i2 = 0; ln1 = ln2 = lnPivot = 1; while( i1<limit1 && i2<limit2 ){ FDEBUG( printf("%d: %2d %2d %2d %d: %2d %2d %2d\n", i1/3, aC1[i1], aC1[i1+1], aC1[i1+2], i2/3, aC2[i2], aC2[i2+1], aC2[i2+2]); ) if( aC1[i1]>0 && aC2[i2]>0 ){ /* Output text that is unchanged in both V1 and V2 */ nCpy = mymin(aC1[i1], aC2[i2]); FDEBUG( printf("COPY %d\n", nCpy); ) rc = fsl_buffer_copy_lines(pOut, pPivot, (fsl_size_t)nCpy); lnPivot += nCpy; if(!rc) rc = fsl_buffer_copy_lines(0, pV1, (fsl_size_t)nCpy); ln1 += nCpy; if(!rc) rc = fsl_buffer_copy_lines(0, pV2, (fsl_size_t)nCpy); ln2 += nCpy; RC; aC1[i1] -= nCpy; aC2[i2] -= nCpy; }else if( aC1[i1] >= aC2[i2+1] && aC1[i1]>0 && aC2[i2+1]+aC2[i2+2]>0 ){ /* Output edits to V2 that occurs within unchanged regions of V1 */ nDel = aC2[i2+1]; nIns = aC2[i2+2]; FDEBUG( printf("EDIT -%d+%d left\n", nDel, nIns); ) rc = fsl_buffer_copy_lines(0, pPivot, (fsl_size_t)nDel); lnPivot += nDel; if(!rc) rc = fsl_buffer_copy_lines(0, pV1, (fsl_size_t)nDel); ln1 += nDel; if(!rc) rc = fsl_buffer_copy_lines(pOut, pV2, (fsl_size_t)nIns); ln2 += nIns; RC; aC1[i1] -= nDel; i2 += 3; }else if( aC2[i2] >= aC1[i1+1] && aC2[i2]>0 && aC1[i1+1]+aC1[i1+2]>0 ){ /* Output edits to V1 that occur within unchanged regions of V2 */ nDel = aC1[i1+1]; nIns = aC1[i1+2]; FDEBUG( printf("EDIT -%d+%d right\n", nDel, nIns); ) rc = fsl_buffer_copy_lines(0, pPivot, (fsl_size_t)nDel); lnPivot += nDel; if(!rc) fsl_buffer_copy_lines(0, pV2, (fsl_size_t)nDel); ln2 += nDel; if(!rc) fsl_buffer_copy_lines(pOut, pV1, (fsl_size_t)nIns); ln1 += nIns; aC2[i2] -= nDel; i1 += 3; }else if( sameEdit(&aC1[i1], &aC2[i2], pV1, pV2) ){ /* Output edits that are identical in both V1 and V2. */ assert( aC1[i1]==0 ); nDel = aC1[i1+1]; nIns = aC1[i1+2]; FDEBUG( printf("EDIT -%d+%d both\n", nDel, nIns); ) rc = fsl_buffer_copy_lines(0, pPivot, (fsl_size_t)nDel); lnPivot += nDel; if(!rc) fsl_buffer_copy_lines(pOut, pV1, (fsl_size_t)nIns); ln1 += nIns; if(!rc) fsl_buffer_copy_lines(0, pV2, (fsl_size_t)nIns); ln2 += nIns; i1 += 3; i2 += 3; }else{ /* We have found a region where different edits to V1 and V2 overlap. ** This is a merge conflict. Find the size of the conflict, then ** output both possible edits separated by distinctive marks. */ int sz = 1; /* Size of the conflict in lines */ ++nConflict; while( !ends_at_CPY(&aC1[i1], sz) || !ends_at_CPY(&aC2[i2], sz) ){ ++sz; } FDEBUG( printf("CONFLICT %d\n", sz); ) rc = append_merge_mark(pOut, 0, ln1, useCrLf); if(!rc) rc = output_one_side(pOut, pV1, aC1, i1, sz, &i1, &ln1); RC; rc = append_merge_mark(pOut, 1, lnPivot, useCrLf); if(!rc) rc = fsl_buffer_copy_lines(pOut, pPivot, sz); lnPivot += sz; RC; rc = append_merge_mark(pOut, 2, ln2, useCrLf); if(!rc) rc = output_one_side(pOut, pV2, aC2, i2, sz, &i2, &ln2); if(!rc) rc = append_merge_mark(pOut, 3, -1, useCrLf); RC; } /* If we are finished with an edit triple, advance to the next ** triple. */ if( i1<limit1 && aC1[i1]==0 && aC1[i1+1]==0 && aC1[i1+2]==0 ) i1+=3; if( i2<limit2 && aC2[i2]==0 && aC2[i2+1]==0 && aC2[i2+2]==0 ) i2+=3; } |
︙ | ︙ | |||
31609 31610 31611 31612 31613 31614 31615 | fsl_size_t const len = (fsl_size_t)assert_mema_lengths(); if(p->used <= len) return false; fsl_size_t j; const char * const z = (const char *)p->mem; fsl_size_t const n = p->used - len + 1; for(i=0; i<n; ){ for(j=0; j<4; ++j){ | | | > | | | 33424 33425 33426 33427 33428 33429 33430 33431 33432 33433 33434 33435 33436 33437 33438 33439 33440 33441 33442 33443 33444 33445 33446 33447 33448 33449 33450 33451 33452 33453 | fsl_size_t const len = (fsl_size_t)assert_mema_lengths(); if(p->used <= len) return false; fsl_size_t j; const char * const z = (const char *)p->mem; fsl_size_t const n = p->used - len + 1; for(i=0; i<n; ){ for(j=0; j<4; ++j){ if( 0==memcmp(&z[i], mergeMarker[j], len) ){ return true; } } while( i<n && z[i]!='\n' ){ ++i; } while( i<n && (z[i]=='\n' || z[i]=='\r') ){ ++i; } } return false; } #undef mymin #undef FDEBUG #undef ISFDEBUG #undef MARKER /* end of file ./src/merge3.c */ /* start of file ./src/popen.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* ** Copyright (c) 2010 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the Simplified BSD License (also |
︙ | ︙ | |||
31651 31652 31653 31654 31655 31656 31657 | */ /************************************************************************* This copy has been modified slightly for use in the libfossil project. */ #undef __STRICT_ANSI__ #include <errno.h> | | < < < < < < | 33467 33468 33469 33470 33471 33472 33473 33474 33475 33476 33477 33478 33479 33480 33481 33482 33483 | */ /************************************************************************* This copy has been modified slightly for use in the libfossil project. */ #undef __STRICT_ANSI__ #include <errno.h> #if FSL_PLATFORM_IS_WINDOWS #include <windows.h> #include <fcntl.h> #else #include <unistd.h> #include <signal.h> #include <sys/wait.h> #endif /* |
︙ | ︙ | |||
31694 31695 31696 31697 31698 31699 31700 | # define PTR_TO_INT(X) ((int)(intptr_t)(X)) #else /* Generates a warning - but it always works */ # define INT_TO_PTR(X) ((void*)(X)) # define PTR_TO_INT(X) ((int)(X)) #endif | | | 33504 33505 33506 33507 33508 33509 33510 33511 33512 33513 33514 33515 33516 33517 33518 | # define PTR_TO_INT(X) ((int)(intptr_t)(X)) #else /* Generates a warning - but it always works */ # define INT_TO_PTR(X) ((void*)(X)) # define PTR_TO_INT(X) ((int)(X)) #endif #if FSL_PLATFORM_IS_WINDOWS /* On windows, create a child process and specify the stdin, stdout, and stderr channels for that process to use. Return the number of errors. */ static int win32_create_child_process( |
︙ | ︙ | |||
31738 31739 31740 31741 31742 31743 31744 | &pi /* Process Info */ ); if( rc ){ CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); *pChildPid = pi.dwProcessId; }else{ | | > | | > | > | 33548 33549 33550 33551 33552 33553 33554 33555 33556 33557 33558 33559 33560 33561 33562 33563 33564 33565 33566 33567 33568 33569 33570 33571 33572 33573 33574 33575 33576 33577 33578 33579 33580 33581 33582 33583 33584 33585 33586 33587 33588 33589 33590 33591 33592 33593 33594 33595 33596 33597 33598 33599 33600 33601 33602 33603 | &pi /* Process Info */ ); if( rc ){ CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); *pChildPid = pi.dwProcessId; }else{ //fsl__fatal(FSL_RC_ERROR, "cannot create child process"); rc = FSL_RC_ERROR; } return rc!=0; } #endif /** Create a child process running shell command "zCmd". *ppOut gets assigned to a FILE that becomes the standard input of the child process. (The caller writes to *ppOut in order to send text to the child.) *pfdIn gets assigned to the stdout from the child process. (The caller reads from *pfdIn in order to receive input from the child.) Note that *pfdIn is an unbuffered file descriptor, not a FILE. The process ID of the child is written into *pChildPid. On success the values returned via *pfdIn, *ppOut, and *pChildPid must be passed to fsl_pclose2() to properly clean up. Return 0 on success, non-0 on error. */ int fsl_popen2(const char *zCmd, int *pfdIn, FILE **ppOut, int *pChildPid){ #if FSL_PLATFORM_IS_WINDOWS /* FIXME: port these win32_fatal_error() bits to error codes. */ HANDLE hStdinRd, hStdinWr, hStdoutRd, hStdoutWr, hStderr; SECURITY_ATTRIBUTES saAttr; DWORD childPid = 0; int fd; saAttr.nLength = sizeof(saAttr); saAttr.bInheritHandle = TRUE; saAttr.lpSecurityDescriptor = NULL; hStderr = GetStdHandle(STD_ERROR_HANDLE); if( !CreatePipe(&hStdoutRd, &hStdoutWr, &saAttr, 4096) ){ //win32_fatal_error("cannot create pipe for stdout"); return FSL_RC_IO; } SetHandleInformation( hStdoutRd, HANDLE_FLAG_INHERIT, FALSE); if( !CreatePipe(&hStdinRd, &hStdinWr, &saAttr, 4096) ){ //win32_fatal_error("cannot create pipe for stdin"); return FSL_RC_IO; } SetHandleInformation( hStdinWr, HANDLE_FLAG_INHERIT, FALSE); win32_create_child_process(fsl_utf8_to_unicode(zCmd), hStdinRd, hStdoutWr, hStderr,&childPid); *pChildPid = childPid; *pfdIn = _open_osfhandle(PTR_TO_INT(hStdoutRd), 0); |
︙ | ︙ | |||
31830 31831 31832 31833 31834 31835 31836 | close(pout[0]); close(pout[1]); close(1); fd = dup(pin[1]); if( fd!=1 ) nErr++; close(pin[0]); close(pin[1]); | | > > > > | > > > > > | > | | | | | 33643 33644 33645 33646 33647 33648 33649 33650 33651 33652 33653 33654 33655 33656 33657 33658 33659 33660 33661 33662 33663 33664 33665 33666 33667 33668 33669 33670 33671 33672 33673 33674 33675 33676 33677 33678 33679 33680 33681 33682 33683 33684 33685 33686 33687 33688 33689 33690 33691 33692 33693 33694 33695 33696 33697 33698 33699 33700 | close(pout[0]); close(pout[1]); close(1); fd = dup(pin[1]); if( fd!=1 ) nErr++; close(pin[0]); close(pin[1]); execl("/bin/sh", "/bin/sh", "-c", zCmd, (char*)0) /* doesn't return on success */; return fsl_errno_to_rc(errno, FSL_RC_ERROR); }else{ /* This is the parent process */ close(pin[1]); *pfdIn = pin[0]; close(pout[0]); *ppOut = fdopen(pout[1], "w"); return 0; } #endif } /** Close the connection to a child process previously created using fsl_popen2(). All 3 arguments are assumed to values returned via fsl_popen2()'s output parameters: the input file descriptor, output FILE handle, and child process PID. If childPid is not zero, that process is killed with SIGINT before the I/O channels are closed. On Windows platforms, killing of the child process is not implemented. (Patches are welcomed.) */ void fsl_pclose2(int fdIn, FILE *pOut, int childPid){ #if FSL_PLATFORM_IS_WINDOWS /* Not implemented, yet */ close(fdIn); fclose(pOut); #else if(childPid>0) kill(childPid, SIGINT); close(fdIn); fclose(pOut); while( waitpid(childPid>0 ? (pid_t)childPid : (pid_t)0, NULL, WNOHANG)>0 ) {} #endif } #undef PTR_TO_INT #undef INT_TO_PTR /* end of file ./src/popen.c */ /* start of file ./src/pq.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
31939 31940 31941 31942 31943 31944 31945 | if( pp ) *pp = p->list[0].data; for(i=0; i<((fsl_id_t)p->used-1); ++i){ p->list[i] = p->list[i+1]; } --p->used; return e; } | | | | 33762 33763 33764 33765 33766 33767 33768 33769 33770 33771 33772 33773 33774 33775 33776 33777 | if( pp ) *pp = p->list[0].data; for(i=0; i<((fsl_id_t)p->used-1); ++i){ p->list[i] = p->list[i+1]; } --p->used; return e; } /* end of file ./src/pq.c */ /* start of file ./src/repo.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
32002 32003 32004 32005 32006 32007 32008 | " WHERE tagid=%d AND tagxref.rid=ancestor.rid" " AND value=%Q AND tagtype>0)" " LIMIT 1", rid, rid, FSL_TAGID_BRANCH, zBranch ); } | < < < < | | < < < | > | | | | < < | | < | | > | > | > | > > > | | 33825 33826 33827 33828 33829 33830 33831 33832 33833 33834 33835 33836 33837 33838 33839 33840 33841 33842 33843 33844 33845 33846 33847 33848 33849 33850 33851 33852 33853 33854 33855 33856 33857 33858 33859 33860 33861 33862 33863 33864 33865 33866 33867 33868 | " WHERE tagid=%d AND tagxref.rid=ancestor.rid" " AND value=%Q AND tagtype>0)" " LIMIT 1", rid, rid, FSL_TAGID_BRANCH, zBranch ); } int fsl_branch_of_rid(fsl_cx * const f, fsl_int_t rid, bool doFallback, char ** zOut ){ char *zBr = 0; fsl_db * const db = fsl_cx_db_repo(f); fsl_stmt st = fsl_stmt_empty; int rc; if(!fsl_needs_repo(f)) return FSL_RC_NOT_A_REPO; assert(db); rc = fsl_cx_prepare(f, &st, "SELECT value FROM tagxref " "WHERE rid=%" FSL_ID_T_PFMT " AND tagid=%d " "AND tagtype>0 " "/*%s()*/", rid, FSL_TAGID_BRANCH,__func__); if(rc) return rc; if( fsl_stmt_step(&st)==FSL_RC_STEP_ROW ){ zBr = fsl_strdup(fsl_stmt_g_text(&st,0,0)); if(!zBr) rc = FSL_RC_OOM; } fsl_stmt_finalize(&st); if( !rc ){ if( zBr==0 && doFallback ){ zBr = fsl_config_get_text(f, FSL_CONFDB_REPO, "main-branch", 0); if(!zBr){ zBr = fsl_strdup("trunk"); if(!zBr) rc = FSL_RC_OOM; } } if(0==rc) *zOut = zBr; } return rc; } /** morewt ==> most recent event with tag Comments from original fossil implementation: |
︙ | ︙ | |||
32115 32116 32117 32118 32119 32120 32121 | */ static fsl_id_t fsl_start_of_branch(fsl_cx * f, fsl_id_t rid, enum fsl_stobr_type eType){ fsl_db * db; fsl_stmt q = fsl_stmt_empty; int rc; fsl_id_t ans = rid; | > | | < < | 33935 33936 33937 33938 33939 33940 33941 33942 33943 33944 33945 33946 33947 33948 33949 33950 33951 | */ static fsl_id_t fsl_start_of_branch(fsl_cx * f, fsl_id_t rid, enum fsl_stobr_type eType){ fsl_db * db; fsl_stmt q = fsl_stmt_empty; int rc; fsl_id_t ans = rid; char * zBr = 0; rc = fsl_branch_of_rid(f, rid, true, &zBr); if(rc) return rc; db = fsl_cx_db_repo(f); assert(db); rc = fsl_db_prepare(db, &q, "SELECT pid, EXISTS(SELECT 1 FROM tagxref" " WHERE tagid=%d AND tagtype>0" " AND value=%Q AND rid=plink.pid)" " FROM plink" |
︙ | ︙ | |||
32150 32151 32152 32153 32154 32155 32156 | break; } ans = fsl_stmt_g_id(&q, 0); }while( fsl_stmt_g_int32(&q, 1)==1 && ans>0 ); fsl_stmt_finalize(&q); end: if( ans>0 && eType==FSL_STOBR_YOAN ){ | | | > < < | 33969 33970 33971 33972 33973 33974 33975 33976 33977 33978 33979 33980 33981 33982 33983 33984 33985 33986 33987 | break; } ans = fsl_stmt_g_id(&q, 0); }while( fsl_stmt_g_int32(&q, 1)==1 && ans>0 ); fsl_stmt_finalize(&q); end: if( ans>0 && eType==FSL_STOBR_YOAN ){ rc = fsl_branch_of_rid(f, ans, true, &zBr); if(rc) goto oom; else{ ans = fsl_youngest_ancestor_in_branch(f, rid, zBr); fsl_free(zBr); } } return ans; oom: if(!f->error.code){ fsl_cx_err_set(f, FSL_RC_OOM, NULL); }/* Else assume the OOM is really a misleading |
︙ | ︙ | |||
32457 32458 32459 32460 32461 32462 32463 | } else if(uuidLen>FSL_STRLEN_K256){ fsl_cx_err_set(f, FSL_RC_RANGE, "UUID is too long: %s", uuid); return -4; } else { fsl_id_t rid = -5; | < | | | < | < | < < < > | | | > > > > > | | < | < < < < > | | | | | | | < | | | < | | | | | | | | | | | | | | | > | | | | < | | | | | | | | | < | | | < | < | 34275 34276 34277 34278 34279 34280 34281 34282 34283 34284 34285 34286 34287 34288 34289 34290 34291 34292 34293 34294 34295 34296 34297 34298 34299 34300 34301 34302 34303 34304 34305 34306 34307 34308 34309 34310 34311 34312 34313 34314 34315 34316 34317 34318 34319 34320 34321 34322 34323 34324 34325 34326 34327 34328 34329 34330 34331 34332 34333 34334 34335 34336 34337 34338 34339 34340 34341 34342 34343 34344 34345 34346 34347 34348 34349 34350 | } else if(uuidLen>FSL_STRLEN_K256){ fsl_cx_err_set(f, FSL_RC_RANGE, "UUID is too long: %s", uuid); return -4; } else { fsl_id_t rid = -5; fsl_stmt * q = NULL; int rc = 0; bool const isGlob = !fsl_is_uuid_len((int)uuidLen); if(isGlob){ q = &f->cache.stmt.uuidToRidGlob; if(!q->stmt){ rc = fsl_cx_prepare(f, q, "SELECT rid FROM blob WHERE " "uuid GLOB ?1 || '*' /*%s()*/",__func__); } }else{ /* Optimization for the common internally-used case.*/ q = &f->cache.stmt.uuidToRid; if(!q->stmt){ rc = fsl_cx_prepare(f, q, "SELECT rid FROM blob WHERE " "uuid=?1 /*%s()*/",__func__); } } if(rc) return -10; rc = fsl_stmt_bind_step(q, "s", uuid); switch(rc){ case FSL_RC_STEP_ROW: rc = 0; rid = fsl_stmt_g_id(q, 0); if(isGlob){ /* Check for an ambiguous result. We don't need this for the !isGlob case because that one does an exact match on a unique key. */ rc = fsl_stmt_step(q); switch(rc){ case FSL_RC_STEP_ROW: rc = 0; fsl_cx_err_set(f, FSL_RC_AMBIGUOUS, "UUID prefix is ambiguous: %s", uuid); rid = -6; break; case FSL_RC_STEP_DONE: /* Unambiguous UUID */ rc = 0; break; default: assert(db->error.code); break; /* fall through and uplift the db error below... */ } } break; case 0: /* No entry found */ rid = 0; rc = 0; break; default: assert(db->error.code); rid = -7; break; } if(rc && db->error.code && !f->error.code){ fsl_cx_uplift_db_error(f, db); } fsl_stmt_reset(q); return rid; } } fsl_id_t fsl_repo_filename_fnid( fsl_cx * f, char const * fn ){ fsl_id_t rv = 0; int const rc = fsl__repo_filename_fnid2(f, fn, &rv, false); |
︙ | ︙ | |||
32601 32602 32603 32604 32605 32606 32607 | }else if(db->error.code){ fsl_cx_uplift_db_error(f, db); } return rc; } int fsl_delta_src_id( fsl_cx * const f, fsl_id_t deltaRid, | | < < | | < | | > | | | | > | | | | | > | | | > > > | < | < | < | 34410 34411 34412 34413 34414 34415 34416 34417 34418 34419 34420 34421 34422 34423 34424 34425 34426 34427 34428 34429 34430 34431 34432 34433 34434 34435 34436 34437 34438 34439 34440 34441 34442 34443 34444 34445 34446 34447 34448 34449 | }else if(db->error.code){ fsl_cx_uplift_db_error(f, db); } return rc; } int fsl_delta_src_id( fsl_cx * const f, fsl_id_t deltaRid, fsl_id_t * const rv ){ if(deltaRid<=0) return FSL_RC_RANGE; if(!fsl_needs_repo(f)) return FSL_RC_NOT_A_REPO; int rc = 0; fsl_stmt * const q = &f->cache.stmt.deltaSrcId; if(!q->stmt){ rc = fsl_cx_prepare(f, q, "SELECT srcid FROM delta " "WHERE rid=? /*%s()*/",__func__); if(rc) return rc; } rc = fsl_stmt_bind_step(q, "R", deltaRid); switch(rc){ case FSL_RC_STEP_ROW: rc = 0; *rv = fsl_stmt_g_id(q, 0); break; case 0: rc = 0; *rv = 0; default: fsl_cx_uplift_db_error(f, q->db); break; } fsl_stmt_reset(q); return rc; } int fsl__repo_verify_before_commit( fsl_cx * const f, fsl_id_t rid ){ if(0){ /* |
︙ | ︙ | |||
32868 32869 32870 32871 32872 32873 32874 | int fsl_repo_create(fsl_cx * f, fsl_repo_create_opt const * opt ){ fsl_db * db = 0; fsl_cx F = fsl_cx_empty /* used if !f */; int rc = 0; char const * userName = 0; fsl_time_t const unixNow = (fsl_time_t)time(0); | | | < < < < < < < < < < < < < < < < | > | 34677 34678 34679 34680 34681 34682 34683 34684 34685 34686 34687 34688 34689 34690 34691 34692 34693 34694 34695 34696 34697 34698 34699 34700 34701 34702 34703 34704 34705 34706 34707 34708 34709 34710 34711 34712 34713 34714 34715 34716 34717 34718 34719 34720 34721 34722 34723 34724 34725 34726 34727 34728 34729 34730 34731 34732 | int fsl_repo_create(fsl_cx * f, fsl_repo_create_opt const * opt ){ fsl_db * db = 0; fsl_cx F = fsl_cx_empty /* used if !f */; int rc = 0; char const * userName = 0; fsl_time_t const unixNow = (fsl_time_t)time(0); bool fileExists; bool inTrans = 0; if(!opt || !opt->filename) return FSL_RC_MISUSE; fileExists = 0 == fsl_file_access(opt->filename,0); if(fileExists && !opt->allowOverwrite){ return f ? fsl_cx_err_set(f, FSL_RC_ALREADY_EXISTS, "File already exists and " "allowOverwrite is false: %s", opt->filename) : FSL_RC_ALREADY_EXISTS; } if(f){ rc = fsl_ckout_close(f) /* Will fail if a transaction is active! */; switch(rc){ case 0: break; default: return rc; } }else{ f = &F; rc = fsl_cx_init( &f, NULL ); if(rc){ fsl_cx_finalize(f); return rc; } } /* We probably should truncate/unlink the file here before continuing, to ensure a clean slate. */ if(fileExists){ rc = fsl_file_unlink(opt->filename); if(rc){ rc = fsl_cx_err_set(f, rc, "Cannot unlink existing repo file: %s", opt->filename); goto end2; } } rc = fsl__cx_attach_role(f, opt->filename, FSL_DBROLE_REPO, true); MARKER(("attach role rc=%s\n", fsl_rc_cstr(rc))); if(rc){ goto end2; } db = fsl_cx_db(f); if(!f->repo.user){ f->repo.user = fsl_user_name_guess() /* Ignore OOM error here - we'll use 'root' |
︙ | ︙ | |||
32959 32960 32961 32962 32963 32964 32965 | in fossil this is optional, so we will presumably eventually have to make it so here as well. Not yet sure where this routine is used in fossil (i.e. whether the option is actually exercised). */ rc = fsl_db_exec_multi(db, | | | | | < < | | | 34753 34754 34755 34756 34757 34758 34759 34760 34761 34762 34763 34764 34765 34766 34767 34768 34769 34770 34771 34772 34773 34774 34775 34776 34777 34778 34779 34780 34781 34782 34783 34784 34785 34786 | in fossil this is optional, so we will presumably eventually have to make it so here as well. Not yet sure where this routine is used in fossil (i.e. whether the option is actually exercised). */ rc = fsl_db_exec_multi(db, "INSERT OR IGNORE INTO %q.config (name,value,mtime) " "VALUES ('server-code'," "lower(hex(randomblob(20)))," "%"PRIi64");" "INSERT OR IGNORE INTO %q.config (name,value,mtime) " "VALUES ('project-code'," "lower(hex(randomblob(20)))," "%"PRIi64");", db->name, (int64_t)unixNow, db->name, (int64_t)unixNow); if(rc) goto end1; } /* Set some config vars ... */ { fsl_stmt st = fsl_stmt_empty; rc = fsl_db_prepare(db, &st, "INSERT INTO %q.config (name,value,mtime) " "VALUES (?,?,%"PRIi64")", db->name, (int64_t)unixNow); if(!rc){ fsl_stmt_bind_int64(&st, 3, unixNow); #define DBSET_STR(KEY,VAL) \ fsl_stmt_bind_text(&st, 1, KEY, -1, 0); \ fsl_stmt_bind_text(&st, 2, VAL, -1, 0); \ fsl_stmt_step(&st); \ fsl_stmt_reset(&st) |
︙ | ︙ | |||
33019 33020 33021 33022 33023 33024 33025 | rc = fsl_cx_uplift_db_error(f, db); } if(inTrans){ if(!rc) rc = fsl_db_transaction_end(db, 0); else fsl_db_transaction_end(db, 1); inTrans = 0; } | | | 34811 34812 34813 34814 34815 34816 34817 34818 34819 34820 34821 34822 34823 34824 34825 | rc = fsl_cx_uplift_db_error(f, db); } if(inTrans){ if(!rc) rc = fsl_db_transaction_end(db, 0); else fsl_db_transaction_end(db, 1); inTrans = 0; } fsl_close_scm_dbs(f); db = 0; if(rc) goto end2; /** In order for injection of the first commit to go through cleanly (==without any ugly kludging of f->dbMain), we need to now open the new db so that it gets connected |
︙ | ︙ | |||
33076 33077 33078 33079 33080 33081 33082 | goto detach; } inTrans2 = 1; /* Copy all settings from the supplied template repository. */ rc = fsl_db_exec(db, | | | | | > | | | < | < < < < < < < < < | 34868 34869 34870 34871 34872 34873 34874 34875 34876 34877 34878 34879 34880 34881 34882 34883 34884 34885 34886 34887 34888 34889 34890 34891 34892 34893 34894 34895 34896 34897 34898 34899 34900 34901 34902 34903 34904 34905 34906 34907 34908 34909 34910 34911 34912 34913 34914 34915 34916 34917 34918 34919 34920 34921 34922 34923 34924 34925 34926 34927 | goto detach; } inTrans2 = 1; /* Copy all settings from the supplied template repository. */ rc = fsl_db_exec(db, "INSERT OR REPLACE INTO %q.config" " SELECT name,value,mtime FROM settingSrc.config" " WHERE (name IN %s OR name IN %s)" " AND name NOT GLOB 'project-*';", db->name, inopConfig, inopDb); if(rc) goto detach; rc = fsl_db_exec(db, "REPLACE INTO %q.reportfmt " "SELECT * FROM settingSrc.reportfmt;", db->name); if(rc) goto detach; /* Copy the user permissions, contact information, last modified time, and photo for all the "system" users from the supplied template repository into the one being setup. The other columns are not copied because they contain security information or other data specific to the other repository. The list of columns copied by this SQL statement may need to be revised in the future. */ rc = fsl_db_exec(db, "UPDATE %q.user SET" " cap = (SELECT u2.cap FROM settingSrc.user u2" " WHERE u2.login = user.login)," " info = (SELECT u2.info FROM settingSrc.user u2" " WHERE u2.login = user.login)," " mtime = (SELECT u2.mtime FROM settingSrc.user u2" " WHERE u2.login = user.login)," " photo = (SELECT u2.photo FROM settingSrc.user u2" " WHERE u2.login = user.login)" " WHERE user.login IN ('anonymous','nobody','developer','reader');", db->name); detach: fsl_free(inopConfig); fsl_free(inopDb); if(inTrans2){ if(!rc) rc = fsl_db_transaction_end(db,0); else fsl_db_transaction_end(db,1); } fsl_db_detach(db, "settingSrc"); if(rc) goto end2; } if(opt->commitMessage && *opt->commitMessage){ /* Set up initial commit. */ fsl_deck d = fsl_deck_empty; fsl_cx_err_reset(f); fsl_deck_init(f, &d, FSL_SATYPE_CHECKIN); rc = fsl_deck_C_set(&d, opt->commitMessage, -1); if(!rc) rc = fsl_deck_D_set(&d, fsl_db_julian_now(db)); if(!rc) rc = fsl_deck_R_set(&d, FSL_MD5_INITIAL_HASH); if(!rc && opt->commitMessageMimetype && *opt->commitMessageMimetype){ |
︙ | ︙ | |||
33161 33162 33163 33164 33165 33166 33167 | if(f == &F){ fsl_cx_finalize(f); if(rc) fsl_file_unlink(opt->filename); } return rc; } | | > | 34944 34945 34946 34947 34948 34949 34950 34951 34952 34953 34954 34955 34956 34957 34958 34959 | if(f == &F){ fsl_cx_finalize(f); if(rc) fsl_file_unlink(opt->filename); } return rc; } static int fsl_repo_dir_names_rid( fsl_cx * const f, fsl_id_t rid, fsl_list * const tgt, bool addSlash){ fsl_db * dbR = fsl_needs_repo(f); fsl_deck D = fsl_deck_empty; fsl_deck * d = &D; int rc = 0; fsl_stmt st = fsl_stmt_empty; fsl_buffer tname = fsl_buffer_empty; |
︙ | ︙ | |||
33188 33189 33190 33191 33192 33193 33194 | } rc = fsl_buffer_appendf(&tname, "tmp_filelist_for_rid_%d", (int)rid); if(rc) goto end; rc = fsl_deck_F_rewind(d); while( !rc && !(rc=fsl_deck_F_next(d, &fc)) && fc ){ | < | | | 34972 34973 34974 34975 34976 34977 34978 34979 34980 34981 34982 34983 34984 34985 34986 34987 34988 34989 34990 34991 34992 34993 | } rc = fsl_buffer_appendf(&tname, "tmp_filelist_for_rid_%d", (int)rid); if(rc) goto end; rc = fsl_deck_F_rewind(d); while( !rc && !(rc=fsl_deck_F_next(d, &fc)) && fc ){ assert(fc->name && *fc->name); if(!st.stmt){ rc = fsl_db_exec(dbR, "CREATE TEMP TABLE IF NOT EXISTS " "\"%b\"(n TEXT UNIQUE ON CONFLICT IGNORE)", &tname); if(!rc){ rc = fsl_db_prepare(dbR, &st, "INSERT INTO \"%b\"(n) " "VALUES(fsl_dirpart(?,%d))", &tname, addSlash ? 1 : 0); } if(rc) goto end; assert(st.stmt); } rc = fsl_stmt_bind_text(&st, 1, fc->name, -1, 0); |
︙ | ︙ | |||
33218 33219 33220 33221 33222 33223 33224 | fsl_stmt_reset(&st); fc = 0; } if(!rc && (count>0)){ fsl_stmt_finalize(&st); rc = fsl_db_prepare(dbR, &st, | | | 35001 35002 35003 35004 35005 35006 35007 35008 35009 35010 35011 35012 35013 35014 35015 | fsl_stmt_reset(&st); fc = 0; } if(!rc && (count>0)){ fsl_stmt_finalize(&st); rc = fsl_db_prepare(dbR, &st, "SELECT n FROM \"%b\" WHERE n " "IS NOT NULL ORDER BY n %s", &tname, fsl_cx_filename_collation(f)); while( !rc && (FSL_RC_STEP_ROW==(rc=fsl_stmt_step(&st))) ){ fsl_size_t nLen = 0; char const * name = fsl_stmt_g_text(&st, 0, &nLen); rc = 0; |
︙ | ︙ | |||
33251 33252 33253 33254 33255 33256 33257 | end: if(rc && !f->error.code && dbR->error.code){ fsl_cx_uplift_db_error(f, dbR); } fsl_stmt_finalize(&st); fsl_deck_clean(d); if(tname.used){ | | | | < | > | 35034 35035 35036 35037 35038 35039 35040 35041 35042 35043 35044 35045 35046 35047 35048 35049 35050 35051 35052 35053 35054 35055 35056 35057 35058 | end: if(rc && !f->error.code && dbR->error.code){ fsl_cx_uplift_db_error(f, dbR); } fsl_stmt_finalize(&st); fsl_deck_clean(d); if(tname.used){ fsl_db_exec(dbR, "DROP TABLE IF EXISTS \"%b\"", &tname); } fsl_buffer_clear(&tname); return rc; } int fsl_repo_dir_names( fsl_cx * const f, fsl_id_t rid, fsl_list * const tgt, bool addSlash ){ fsl_db * const db = fsl_needs_repo(f); if(!db) return FSL_RC_NOT_A_REPO; else if(!tgt) return FSL_RC_MISUSE; else { int rc; if(rid>=0){ if(!rid){ /* Dir list for current checkout version */ if(f->ckout.rid>0){ rid = f->ckout.rid; |
︙ | ︙ | |||
33315 33316 33317 33318 33319 33320 33321 | /* UNTESTED */ char fsl_repo_is_readonly(fsl_cx const * f){ if(!f || !f->dbMain) return 0; else{ int const roleId = f->ckout.db.dbh ? FSL_DBROLE_MAIN : FSL_DBROLE_REPO /* If CKOUT is attached, it is the main DB and REPO is ATTACHed. */ ; | | | 35098 35099 35100 35101 35102 35103 35104 35105 35106 35107 35108 35109 35110 35111 35112 | /* UNTESTED */ char fsl_repo_is_readonly(fsl_cx const * f){ if(!f || !f->dbMain) return 0; else{ int const roleId = f->ckout.db.dbh ? FSL_DBROLE_MAIN : FSL_DBROLE_REPO /* If CKOUT is attached, it is the main DB and REPO is ATTACHed. */ ; char const * zRole = fsl_db_role_name(roleId); assert(f->dbMain); return sqlite3_db_readonly(f->dbMain->dbh, zRole) ? 1 : 0; } } int fsl__repo_record_filename(fsl_cx * const f){ fsl_db * dbR = fsl_needs_repo(f); |
︙ | ︙ | |||
33348 33349 33350 33351 33352 33353 33354 | dbConf = fsl_cx_db_config(f); if(dbConf){ int const dbRole = (f->dbMain==&f->config.db) ? FSL_DBROLE_MAIN : FSL_DBROLE_CONFIG; rc = fsl_db_exec(dbConf, "INSERT OR IGNORE INTO %s.global_config(name,value) " "VALUES('repo:%q',1)", | | | > > > | | | | 35131 35132 35133 35134 35135 35136 35137 35138 35139 35140 35141 35142 35143 35144 35145 35146 35147 35148 35149 35150 35151 35152 35153 35154 35155 35156 35157 35158 35159 35160 35161 35162 35163 35164 35165 35166 35167 35168 35169 35170 35171 35172 35173 35174 35175 35176 35177 35178 35179 35180 35181 35182 35183 35184 35185 | dbConf = fsl_cx_db_config(f); if(dbConf){ int const dbRole = (f->dbMain==&f->config.db) ? FSL_DBROLE_MAIN : FSL_DBROLE_CONFIG; rc = fsl_db_exec(dbConf, "INSERT OR IGNORE INTO %s.global_config(name,value) " "VALUES('repo:%q',1)", fsl_db_role_name(dbRole), fsl_buffer_cstr(full)); if(rc){ fsl_cx_uplift_db_error(f, dbConf); goto end; } } dbC = fsl_cx_db_ckout(f); if(dbC && (zCDir=f->ckout.dir)){ /* If we have a checkout, update its repo's list of checkouts... */ /* Assumption: if we have an opened checkout, dbR is ATTACHed with the role REPO. */ int ro; assert(dbR); ro = sqlite3_db_readonly(dbR->dbh, fsl_db_role_name(FSL_DBROLE_REPO)); assert(ro>=0); if(!ro){ fsl_buffer localRoot = fsl_buffer_empty; rc = fsl_file_canonical_name(zCDir, &localRoot, 1); if(0==rc){ if(dbConf){ /* If global config is open, write the checkout db's name to it. */ int const dbRole = (f->dbMain==&f->config.db) ? FSL_DBROLE_MAIN : FSL_DBROLE_CONFIG; rc = fsl_db_exec(dbConf, "REPLACE INTO INTO %s.global_config(name,value) " "VALUES('ckout:%q',1)", fsl_db_role_name(dbRole), fsl_buffer_cstr(&localRoot)); } if(0==rc){ /* We know that repo is ATTACHed to ckout here. */ assert(dbR == dbC); rc = fsl_db_exec(dbR, "REPLACE INTO %s.config(name, value, mtime) " "VALUES('ckout:%q', 1, now())", fsl_db_role_name(FSL_DBROLE_REPO), fsl_buffer_cstr(&localRoot)); } } fsl_buffer_clear(&localRoot); } } |
︙ | ︙ | |||
33433 33434 33435 33436 33437 33438 33439 | if(db->error.code){ fsl_cx_uplift_db_error(f, db); } return rv; } } | | | | | 35219 35220 35221 35222 35223 35224 35225 35226 35227 35228 35229 35230 35231 35232 35233 35234 35235 35236 35237 35238 35239 35240 35241 35242 | if(db->error.code){ fsl_cx_uplift_db_error(f, db); } return rv; } } int fsl_repo_extract( fsl_cx * const f, fsl_repo_extract_opt const * const opt_ ){ if(!f || !opt_->callback) return FSL_RC_MISUSE; else if(!fsl_needs_repo(f)) return FSL_RC_NOT_A_REPO; else if(opt_->checkinRid<=0){ return fsl_cx_err_set(f, FSL_RC_RANGE, "RID must be positive."); }else{ int rc; fsl_deck mf = fsl_deck_empty; fsl_buffer * const content = opt_->extractContent ? &f->cache.fileContent : NULL; fsl_id_t fid; fsl_repo_extract_state xst = fsl_repo_extract_state_empty; fsl_card_F const * fc = NULL; fsl_repo_extract_opt const opt = *opt_ /* Copy in case the caller modifies it via their callback. If we find an interesting use for such modification then we can |
︙ | ︙ | |||
33489 33490 33491 33492 33493 33494 33495 33496 33497 33498 33499 33500 33501 33502 | }else if(!fid){ rc = fsl_cx_err_set(f, FSL_RC_NOT_FOUND, "Could not resolve RID for UUID: %s", fc->uuid); }else if(opt.extractContent){ fsl_buffer_reuse(content); rc = fsl_content_get(f, fid, content); } if(!rc){ /** Call the callback. */ xst.fCard = fc; assert(fid>0); xst.content = content; xst.fileRid = fid; | > | 35275 35276 35277 35278 35279 35280 35281 35282 35283 35284 35285 35286 35287 35288 35289 | }else if(!fid){ rc = fsl_cx_err_set(f, FSL_RC_NOT_FOUND, "Could not resolve RID for UUID: %s", fc->uuid); }else if(opt.extractContent){ fsl_buffer_reuse(content); rc = fsl_content_get(f, fid, content); //assert(FSL_RC_RANGE!=rc); } if(!rc){ /** Call the callback. */ xst.fCard = fc; assert(fid>0); xst.content = content; xst.fileRid = fid; |
︙ | ︙ | |||
33556 33557 33558 33559 33560 33561 33562 | rid, uuid ); assert(cursorKludge.mem == in->mem); return rc; } } | | | | 35343 35344 35345 35346 35347 35348 35349 35350 35351 35352 35353 35354 35355 35356 35357 35358 | rid, uuid ); assert(cursorKludge.mem == in->mem); return rc; } } int fsl_repo_blob_lookup( fsl_cx * const f, fsl_buffer const * const src, fsl_id_t * const ridOut, fsl_uuid_str * hashOut ){ int rc; fsl_buffer hash_ = fsl_buffer_empty; fsl_buffer * hash; fsl_id_t rid = 0; if(!fsl_cx_db_repo(f)) return FSL_RC_NOT_A_REPO; hash = hashOut ? &hash_ : fsl__cx_scratchpad(f); /* First check the auxiliary hash to see if there is already an artifact |
︙ | ︙ | |||
33680 33681 33682 33683 33684 33685 33686 | } end: fsl__cx_scratchpad_yield(f, sql); fsl_stmt_finalize(&q); return rc; } | | | 35467 35468 35469 35470 35471 35472 35473 35474 35475 35476 35477 35478 35479 35480 35481 | } end: fsl__cx_scratchpad_yield(f, sql); fsl_stmt_finalize(&q); return rc; } int fsl_repo_manifest_write(fsl_cx * const f, fsl_id_t manifestRid, fsl_buffer * const pManifest, fsl_buffer * const pHash, fsl_buffer * const pTags) { fsl_db * const db = fsl_needs_repo(f); if(!db) return FSL_RC_NOT_A_REPO; if(manifestRid<=0){ |
︙ | ︙ | |||
33820 33821 33822 33823 33824 33825 33826 | /** Update the repository schema for Fossil version 2.0. (2017-02-28) (1) Change the CHECK constraint on BLOB.UUID so that the length is greater than or equal to 40, not exactly equal to 40. */ zBlobSchema = fsl_db_g_text(frs->db, NULL, "SELECT sql FROM %!Q.sqlite_schema" | | | 35607 35608 35609 35610 35611 35612 35613 35614 35615 35616 35617 35618 35619 35620 35621 | /** Update the repository schema for Fossil version 2.0. (2017-02-28) (1) Change the CHECK constraint on BLOB.UUID so that the length is greater than or equal to 40, not exactly equal to 40. */ zBlobSchema = fsl_db_g_text(frs->db, NULL, "SELECT sql FROM %!Q.sqlite_schema" " WHERE name='blob'", fsl_db_role_name(FSL_DBROLE_REPO)); if(!zBlobSchema){ /* ^^^^ reminder: fossil(1) simply ignores this case, silently doing nothing instead. */ rc = fsl_cx_uplift_db_error(frs->f, frs->db); if(!rc){ rc = fsl_cx_err_set(frs->f, FSL_RC_DB, "Unknown error fetching blob table schema."); |
︙ | ︙ | |||
33843 33844 33845 33846 33847 33848 33849 | int rc2 = 0; zBlobSchema[i] = '>'; sqlite3_db_config(frs->db->dbh, SQLITE_DBCONFIG_DEFENSIVE, 0, &rc2); rc = fsl_cx_exec_multi(frs->f, "PRAGMA writable_schema=ON;" "UPDATE %!Q.sqlite_schema SET sql=%Q WHERE name LIKE 'blob';" "PRAGMA writable_schema=OFF;", | | | | 35630 35631 35632 35633 35634 35635 35636 35637 35638 35639 35640 35641 35642 35643 35644 35645 35646 35647 35648 35649 35650 35651 35652 35653 35654 35655 35656 | int rc2 = 0; zBlobSchema[i] = '>'; sqlite3_db_config(frs->db->dbh, SQLITE_DBCONFIG_DEFENSIVE, 0, &rc2); rc = fsl_cx_exec_multi(frs->f, "PRAGMA writable_schema=ON;" "UPDATE %!Q.sqlite_schema SET sql=%Q WHERE name LIKE 'blob';" "PRAGMA writable_schema=OFF;", fsl_db_role_name(FSL_DBROLE_REPO), zBlobSchema ); sqlite3_db_config(frs->db->dbh, SQLITE_DBCONFIG_DEFENSIVE, 1, &rc2); break; } } if(rc) goto end; rc = fsl_cx_exec(frs->f, "CREATE VIEW IF NOT EXISTS " " %!Q.artifact(rid,rcvid,size,atype,srcid,hash,content) AS " " SELECT blob.rid,rcvid,size,1,srcid,uuid,content" " FROM blob LEFT JOIN delta ON (blob.rid=delta.rid);", fsl_db_role_name(FSL_DBROLE_REPO) ); end: fsl_free(zBlobSchema); return rc; } |
︙ | ︙ | |||
34024 34025 34026 34027 34028 34029 34030 | fsl_stmt_bind_id(&frs->qChild, 1, cid); if( FSL_RC_STEP_ROW==fsl_stmt_step(&frs->qChild) && (sz = fsl_stmt_g_int64(&frs->qChild, 1))>=0 ){ fsl_buffer next = fsl_buffer_empty; fsl_buffer delta = fsl_buffer_empty; void const * blob = 0; fsl_size_t deltaBlobSize = 0; | | < < < < < < < | < > | 35811 35812 35813 35814 35815 35816 35817 35818 35819 35820 35821 35822 35823 35824 35825 35826 35827 35828 35829 35830 35831 | fsl_stmt_bind_id(&frs->qChild, 1, cid); if( FSL_RC_STEP_ROW==fsl_stmt_step(&frs->qChild) && (sz = fsl_stmt_g_int64(&frs->qChild, 1))>=0 ){ fsl_buffer next = fsl_buffer_empty; fsl_buffer delta = fsl_buffer_empty; void const * blob = 0; fsl_size_t deltaBlobSize = 0; rc = INTCHECK fsl_stmt_get_blob(&frs->qChild, 0, &blob, &deltaBlobSize); if(rc) goto outro; fsl_buffer_external(&delta, blob, (fsl_int_t)deltaBlobSize); rc = INTCHECK fsl_buffer_uncompress(&delta, &delta); if(rc) goto outro; rc = INTCHECK fsl_buffer_delta_apply(content, &delta, &next); fsl_stmt_reset(&frs->qChild); fsl_buffer_clear(&delta); if(rc){ if(FSL_RC_OOM!=rc){ rc = fsl_cx_err_set(frs->f, rc, "Error applying delta #%" FSL_ID_T_PFMT " to parent #%" FSL_ID_T_PFMT, cid, rid); } |
︙ | ︙ | |||
34133 34134 34135 34136 34137 34138 34139 | } fsl__cx_scratchpad_yield(frs->f, b); return rc; } | < < < | | > > < < | | | | < < | 35913 35914 35915 35916 35917 35918 35919 35920 35921 35922 35923 35924 35925 35926 35927 35928 35929 35930 35931 35932 35933 35934 35935 35936 35937 35938 35939 35940 35941 35942 35943 35944 35945 35946 35947 35948 35949 35950 35951 35952 35953 35954 35955 35956 35957 35958 35959 35960 35961 35962 35963 35964 35965 35966 35967 35968 35969 35970 | } fsl__cx_scratchpad_yield(frs->f, b); return rc; } static int fsl__rebuild(fsl_cx * const f, fsl_rebuild_opt const * const opt){ fsl_stmt s = fsl_stmt_empty; fsl_stmt q = fsl_stmt_empty; fsl_db * const db = fsl_cx_db_repo(f); int rc; FslRebuildState frs = FslRebuildState_empty; fsl_buffer * const sql = fsl__cx_scratchpad(f); assert(db); frs.f = frs.step.f = f; frs.db = db; frs.opt = frs.step.opt = opt; rc = fsl__rebuild_update_schema(&frs); if(!rc) rc = fsl_buffer_reserve(sql, 1024 * 4); if(rc) goto end; fsl__cx_clear_mf_seen(f, false); /* DROP all tables which are not part of our One True Vision of the repo db... */ rc = fsl_cx_prepare(f, &q, "SELECT name FROM %!Q.sqlite_schema /*scan*/" " WHERE type='table'" " AND name NOT IN ('admin_log', 'blob','delta','rcvfrom','user','alias'," "'config','shun','private','reportfmt'," "'concealed','accesslog','modreq'," "'purgeevent','purgeitem','unversioned'," "'ticket','ticketchng'," "'subscriber','pending_alert','chat'" ")" " AND name NOT GLOB 'sqlite_*'" " AND name NOT GLOB 'fx_*'", fsl_db_role_name(FSL_DBROLE_REPO) ); while( 0==rc && FSL_RC_STEP_ROW==fsl_stmt_step(&q) ){ rc = fsl_buffer_appendf(sql, "DROP TABLE IF EXISTS %!Q;\n", fsl_stmt_g_text(&q, 0, NULL)); } fsl_stmt_finalize(&q); if(0==rc && fsl_buffer_size(sql)){ rc = fsl_cx_exec_multi(f, "%b", sql); } if(rc) goto end; rc = fsl_cx_exec_multi(f, "%s", fsl_schema_repo2()); if(0==rc) rc = fsl__cx_ticket_create_table(f); if(0==rc) rc = fsl__shunned_remove(f); if(0==rc){ rc = fsl_cx_exec_multi(f, "INSERT INTO unclustered" " SELECT rid FROM blob EXCEPT SELECT rid FROM private;" "DELETE FROM unclustered" " WHERE rid IN (SELECT rid FROM shun JOIN blob USING(uuid));" |
︙ | ︙ | |||
34211 34212 34213 34214 34215 34216 34217 34218 34219 34220 34221 34222 34223 34224 | } //totalSize += incrSize*2; rc = fsl_cx_prepare(f, &s, "SELECT rid, size FROM blob /*scan*/" " WHERE NOT EXISTS(SELECT 1 FROM shun WHERE uuid=blob.uuid)" " AND NOT EXISTS(SELECT 1 FROM delta WHERE rid=blob.rid)" ); if(rc) goto end; rc = fsl__crosslink_begin(f) /* Maintenace reminder: if this call succeeds, BE SURE that we do not skip past the fsl__crosslink_end() call via (goto end). Doing so would get the transaction stack out of sync. */; | > | 35986 35987 35988 35989 35990 35991 35992 35993 35994 35995 35996 35997 35998 35999 36000 | } //totalSize += incrSize*2; rc = fsl_cx_prepare(f, &s, "SELECT rid, size FROM blob /*scan*/" " WHERE NOT EXISTS(SELECT 1 FROM shun WHERE uuid=blob.uuid)" " AND NOT EXISTS(SELECT 1 FROM delta WHERE rid=blob.rid)" "%s", opt->randomize ? " ORDER BY RANDOM()" : "" ); if(rc) goto end; rc = fsl__crosslink_begin(f) /* Maintenace reminder: if this call succeeds, BE SURE that we do not skip past the fsl__crosslink_end() call via (goto end). Doing so would get the transaction stack out of sync. */; |
︙ | ︙ | |||
34237 34238 34239 34240 34241 34242 34243 34244 34245 34246 34247 34248 34249 34250 34251 34252 34253 34254 34255 34256 34257 34258 34259 34260 34261 34262 34263 34264 34265 34266 34267 34268 34269 34270 34271 34272 34273 | } } fsl_stmt_finalize(&s); if(rc) goto crosslink_end; rc = fsl_cx_prepare(f, &s, "SELECT rid, size FROM blob" " WHERE NOT EXISTS(SELECT 1 FROM shun WHERE uuid=blob.uuid)" ); while( 0==rc && FSL_RC_STEP_ROW==fsl_stmt_step(&s) ){ fsl_id_t const rid = fsl_stmt_g_id(&s, 0); int64_t const size = fsl_stmt_g_int64(&s, 1); if( size>=0 ){ if( !fsl_id_bag_contains(&frs.idsDone, rid) ){ fsl_buffer content = fsl_buffer_empty; rc = fsl_content_get(f, rid, &content); if(0==rc){ rc = fsl__rebuild_step(&frs, rid, size, &content); assert(!content.mem); } fsl_buffer_clear(&content); } }else{ rc = fsl_cx_exec_multi(f, "INSERT OR IGNORE INTO phantom " "VALUES(%" FSL_ID_T_PFMT ")", rid); if(0==rc){ frs.step.blobSize = -1; frs.step.artifactType = FSL_SATYPE_INVALID; rc = fsl__rebuild_step_done(&frs, rid); } } } fsl_stmt_finalize(&s); crosslink_end: rc = fsl__crosslink_end(f, rc); if(rc) goto end; rc = fsl__rebuild_tag_trunk(&frs); if(rc) goto end; | > > > > > > > > > > > > > > > > > > > > > > > > | > < | 36013 36014 36015 36016 36017 36018 36019 36020 36021 36022 36023 36024 36025 36026 36027 36028 36029 36030 36031 36032 36033 36034 36035 36036 36037 36038 36039 36040 36041 36042 36043 36044 36045 36046 36047 36048 36049 36050 36051 36052 36053 36054 36055 36056 36057 36058 36059 36060 36061 36062 36063 36064 36065 36066 36067 36068 36069 36070 36071 36072 36073 36074 36075 36076 36077 36078 36079 36080 36081 36082 36083 36084 36085 36086 36087 36088 36089 36090 36091 36092 36093 36094 36095 36096 | } } fsl_stmt_finalize(&s); if(rc) goto crosslink_end; rc = fsl_cx_prepare(f, &s, "SELECT rid, size FROM blob" " WHERE NOT EXISTS(SELECT 1 FROM shun WHERE uuid=blob.uuid)" "%s", opt->randomize ? " ORDER BY RANDOM()" : "" ); while( 0==rc && FSL_RC_STEP_ROW==fsl_stmt_step(&s) ){ fsl_id_t const rid = fsl_stmt_g_id(&s, 0); int64_t const size = fsl_stmt_g_int64(&s, 1); if( size>=0 ){ if( !fsl_id_bag_contains(&frs.idsDone, rid) ){ fsl_buffer content = fsl_buffer_empty; rc = fsl_content_get(f, rid, &content); if(0==rc){ rc = fsl__rebuild_step(&frs, rid, size, &content); assert(!content.mem); } /* 2021-12-17: hmmm... while debugging the problem reported here: https://fossil-scm.org/forum/forumpost/f4cc31863179f843 It was discovered that fossil will simply skip any content it cannot read in this step, even if it's skipped over because of a broken blob-to-delta mapping (whereas fossil's test-integrity command will catch that case). If such a case happens to us, fsl_content_get() fails with FSL_RC_PHANTOM. That seems to me to be the right thing to do, as such a case is indicative of db corruption. However, if we skip over these then we cannot rebuild a repo which has such (invalid) state. Feature or bug? For now let's keep it strict and fail if we can't fetch the content. We can reevaluate that decision later if needed. We can add a fsl_rebuild_opt::ignorePhantomFailure (better name pending!) flag which tells us how the user would prefer to deal with this. */ fsl_buffer_clear(&content); } }else{ rc = fsl_cx_exec_multi(f, "INSERT OR IGNORE INTO phantom " "VALUES(%" FSL_ID_T_PFMT ")", rid); if(0==rc){ frs.step.blobSize = -1; frs.step.artifactType = FSL_SATYPE_INVALID; rc = fsl__rebuild_step_done(&frs, rid); } } } fsl_stmt_finalize(&s); crosslink_end: rc = fsl__crosslink_end(f, rc); if(rc) goto end; rc = fsl__rebuild_tag_trunk(&frs); if(rc) goto end; //if( opt->createClusters ) rc = fsl__create_cluster(f); rc = fsl_cx_exec_multi(f, "REPLACE INTO config(name,value,mtime) VALUES('content-schema',%Q,now());" "REPLACE INTO config(name,value,mtime) VALUES('aux-schema',%Q,now());" "REPLACE INTO config(name,value,mtime) VALUES('rebuilt',%Q,now());", FSL_CONTENT_SCHEMA, FSL_AUX_SCHEMA, "libfossil " FSL_LIB_VERSION_HASH " " FSL_LIB_VERSION_TIMESTAMP ); end: fsl__cx_scratchpad_yield(f, sql); if(0==rc && frs.opt->callback){ frs.step.stepNumber = 0; frs.step.rid = 0; frs.step.blobSize = 0; rc = frs.opt->callback(&frs.step); } fsl_stmt_finalize(&s); fsl_stmt_finalize(&frs.qDeltas); fsl_stmt_finalize(&frs.qSize); fsl_stmt_finalize(&frs.qChild); fsl_id_bag_clear(&frs.idsDone); return rc; } |
︙ | ︙ | |||
34305 34306 34307 34308 34309 34310 34311 | int const rc2 = fsl_cx_transaction_end(f, opt->dryRun || rc!=0); if(0==rc && 0!=rc2) rc = rc2; } fsl_cx_interrupt(f, 0, NULL); return rc; } | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | 36105 36106 36107 36108 36109 36110 36111 36112 36113 36114 36115 36116 36117 36118 36119 36120 36121 36122 36123 36124 36125 36126 36127 36128 36129 36130 36131 36132 36133 36134 36135 36136 36137 36138 36139 36140 36141 36142 36143 36144 36145 36146 36147 36148 36149 36150 36151 36152 36153 36154 36155 36156 36157 36158 36159 36160 36161 36162 36163 36164 36165 36166 36167 36168 36169 36170 36171 36172 36173 36174 36175 36176 36177 36178 36179 36180 36181 36182 36183 36184 36185 36186 36187 36188 36189 36190 36191 36192 36193 36194 36195 36196 36197 36198 36199 36200 36201 36202 36203 36204 36205 36206 36207 36208 36209 36210 36211 36212 36213 36214 36215 36216 36217 36218 36219 36220 36221 36222 | int const rc2 = fsl_cx_transaction_end(f, opt->dryRun || rc!=0); if(0==rc && 0!=rc2) rc = rc2; } fsl_cx_interrupt(f, 0, NULL); return rc; } int fsl_cidiff(fsl_cx * const f, fsl_cidiff_opt const * const opt){ fsl_deck d1 = fsl_deck_empty; fsl_deck d2 = fsl_deck_empty; fsl_card_F const * fc1; fsl_card_F const * fc2; int rc; fsl_cidiff_state cst = fsl_cidiff_state_empty; if(!fsl_needs_repo(f)) return FSL_RC_NOT_A_REPO; rc = fsl_deck_load_rid(f, &d1, opt->v1, FSL_SATYPE_CHECKIN); if(rc) goto end; rc = fsl_deck_load_rid(f, &d2, opt->v2, FSL_SATYPE_CHECKIN); if(rc) goto end; rc = fsl_deck_F_rewind(&d1); if(0==rc) rc = fsl_deck_F_rewind(&d2); if(rc) goto end; fsl_deck_F_next(&d1, &fc1); fsl_deck_F_next(&d2, &fc2); cst.f = f; cst.opt = opt; cst.d1 = &d1; cst.d2 = &d2; rc = opt->callback(&cst); cst.stepType = FSL_RC_STEP_ROW; while(0==rc && (fc1 || fc2)){ int nameCmp; cst.changes = FSL_CIDIFF_NONE; if(!fc1) nameCmp = 1; else if(!fc2) nameCmp = -1; else{ nameCmp = fsl_strcmp(fc1->name, fc2->name); if(fc2->priorName){ if(0==nameCmp){ cst.changes |= FSL_CIDIFF_FILE_RENAMED; }else if(0==fsl_strcmp(fc1->name, fc2->priorName)){ /** Treat these as being the same file for this purpose. We ostensibly know that fc1 was renamed to fc2->name here BUT there's a corner case we can't sensibly determine here: file A renamed to B and file C renamed to A. If both of those F-cards just happen to align at this point in this loop, we're mis-informing the user. Reliably catching that type of complex situation requires significant hoop-jumping, as can be witness in fsl_ckout_merge() (which still misses some convoluted cases). */ nameCmp = 0; cst.changes |= FSL_CIDIFF_FILE_RENAMED; } } if(fc1->perm!=fc2->perm){ cst.changes |= FSL_CIDIFF_FILE_PERMS; } } if(nameCmp<0){ nameCmp = -1/*see below*/; assert(fc1); cst.changes |= FSL_CIDIFF_FILE_REMOVED; cst.fc1 = fc1; cst.fc2 = NULL; }else if(nameCmp>0){ nameCmp = 1/*see below*/; cst.changes |= FSL_CIDIFF_FILE_ADDED; cst.fc1 = NULL; cst.fc2 = fc2; }else{ cst.fc1 = fc1; cst.fc2 = fc2; } if(fc1 && fc2 && 0!=fsl_strcmp(fc1->uuid, fc2->uuid)){ cst.changes |= FSL_CIDIFF_FILE_MODIFIED; } rc = opt->callback(&cst); switch(rc ? 2 : nameCmp){ case 2: break; case -1: rc = fsl_deck_F_next(&d1, &fc1); break; case 1: rc = fsl_deck_F_next(&d2, &fc2); break; case 0: rc = fsl_deck_F_next(&d1, &fc1); if(0==rc) rc = fsl_deck_F_next(&d2, &fc2); break; default: fsl__fatal(FSL_RC_MISUSE,"Internal API misuse."); } }/*while(f-cards)*/ if(0==rc){ cst.fc1 = cst.fc2 = NULL; cst.stepType = FSL_RC_STEP_DONE; rc = opt->callback(&cst); } end: fsl_deck_finalize(&d1); fsl_deck_finalize(&d2); return rc; } bool fsl_repo_forbids_delta_manifests(fsl_cx * const f){ return fsl_config_get_bool(f, FSL_CONFDB_REPO, false, "forbid-delta-manifests"); } #undef MARKER /* end of file ./src/repo.c */ /* start of file ./src/schema.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 Stephan Beal (https://wanderinghorse.net). |
︙ | ︙ | |||
34364 34365 34366 34367 34368 34369 34370 | return fsl_schema_ticket_cstr; } char const * fsl_schema_forum(){ extern char const * fsl_schema_forum_cstr; return fsl_schema_forum_cstr; } | | | | 36264 36265 36266 36267 36268 36269 36270 36271 36272 36273 36274 36275 36276 36277 36278 36279 | return fsl_schema_ticket_cstr; } char const * fsl_schema_forum(){ extern char const * fsl_schema_forum_cstr; return fsl_schema_forum_cstr; } /* end of file ./src/schema.c */ /* start of file ./src/search.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
34465 34466 34467 34468 34469 34470 34471 | /* All forum posts are always indexed */ end: return rc; #endif } #undef MARKER | | | | 36365 36366 36367 36368 36369 36370 36371 36372 36373 36374 36375 36376 36377 36378 36379 36380 | /* All forum posts are always indexed */ end: return rc; #endif } #undef MARKER /* end of file ./src/search.c */ /* start of file ./src/sha1.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #include <assert.h> #include <string.h> /* strlen() */ #include <stddef.h> /* NULL on linux */ #include <sys/types.h> |
︙ | ︙ | |||
36369 36370 36371 36372 36373 36374 36375 | fsl_sha1_init(&ctx); fsl_sha1_update(&ctx, zIn, (len<0) ? fsl_strlen(zIn) : (fsl_size_t)len); fsl_sha1_final_hex(&ctx, zHex); return zHex; } } | | | | 38269 38270 38271 38272 38273 38274 38275 38276 38277 38278 38279 38280 38281 38282 38283 38284 | fsl_sha1_init(&ctx); fsl_sha1_update(&ctx, zIn, (len<0) ? fsl_strlen(zIn) : (fsl_size_t)len); fsl_sha1_final_hex(&ctx, zHex); return zHex; } } /* end of file ./src/sha1.c */ /* start of file ./src/sha3.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* ** Copyright (c) 2017 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the Simplified BSD License (also |
︙ | ︙ | |||
37004 37005 37006 37007 37008 37009 37010 37011 37012 37013 | fsl_sha3_end(&ctx); rc = fsl_buffer_append(pCksum, ctx.hex, fsl_strlen(ctx.hex)); return rc; #endif } } #undef SHA3_BYTEORDER #undef MARKER | > > > > > > > > > > > > > > > > > > > > > > > > > > | | | 38904 38905 38906 38907 38908 38909 38910 38911 38912 38913 38914 38915 38916 38917 38918 38919 38920 38921 38922 38923 38924 38925 38926 38927 38928 38929 38930 38931 38932 38933 38934 38935 38936 38937 38938 38939 38940 38941 38942 38943 38944 38945 38946 38947 38948 | fsl_sha3_end(&ctx); rc = fsl_buffer_append(pCksum, ctx.hex, fsl_strlen(ctx.hex)); return rc; #endif } } #undef A00 #undef A01 #undef A02 #undef A03 #undef A04 #undef A10 #undef A11 #undef A12 #undef A13 #undef A14 #undef A20 #undef A21 #undef A22 #undef A23 #undef A24 #undef A30 #undef A31 #undef A32 #undef A33 #undef A34 #undef A40 #undef A41 #undef A42 #undef A43 #undef A44 #undef ROL64 #undef SHA3_BYTEORDER #undef MARKER /* end of file ./src/sha3.c */ /* start of file ./src/strftime.c */ /******************************************************************************* * The Elm Mail System - $Revision: 1.3 $ $State: Exp $ * * Public-domain relatively quick-and-dirty implemenation of * ANSI library routine for System V Unix systems. * * Arnold Robbins |
︙ | ︙ | |||
37619 37620 37621 37622 37623 37624 37625 | */ fsl_size_t fsl_strftime_unix(char * dest, fsl_size_t destLen, char const * format, fsl_time_t epochTime, bool convertToLocal){ time_t orig = (time_t)epochTime; struct tm * tim = convertToLocal ? localtime(&orig) : gmtime(&orig); return fsl_strftime( dest, destLen, format, tim ); } | | | | 39545 39546 39547 39548 39549 39550 39551 39552 39553 39554 39555 39556 39557 39558 39559 39560 | */ fsl_size_t fsl_strftime_unix(char * dest, fsl_size_t destLen, char const * format, fsl_time_t epochTime, bool convertToLocal){ time_t orig = (time_t)epochTime; struct tm * tim = convertToLocal ? localtime(&orig) : gmtime(&orig); return fsl_strftime( dest, destLen, format, tim ); } /* end of file ./src/strftime.c */ /* start of file ./src/tag.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
38258 38259 38260 38261 38262 38263 38264 | fsl_deck_finalize(&parent); fsl_deck_finalize(&deck); return rc; } #undef MARKER | | | | 40184 40185 40186 40187 40188 40189 40190 40191 40192 40193 40194 40195 40196 40197 40198 40199 | fsl_deck_finalize(&parent); fsl_deck_finalize(&deck); return rc; } #undef MARKER /* end of file ./src/tag.c */ /* start of file ./src/ticket.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
38287 38288 38289 38290 38291 38292 38293 | int rc; if(!db) return FSL_RC_NOT_A_REPO; rc = fsl_cx_exec_multi(f, "DROP TABLE IF EXISTS ticket;" "DROP TABLE IF EXISTS ticketchng;" ); if(!rc){ | | | < < | < < | < | > > > | > > > > > > | > > > > > > | | 40213 40214 40215 40216 40217 40218 40219 40220 40221 40222 40223 40224 40225 40226 40227 40228 40229 40230 40231 40232 40233 40234 40235 40236 40237 40238 40239 40240 40241 40242 40243 40244 40245 40246 40247 40248 40249 40250 40251 40252 40253 40254 40255 40256 40257 40258 40259 40260 40261 40262 40263 40264 40265 40266 40267 40268 40269 40270 40271 40272 40273 40274 40275 40276 40277 40278 40279 40280 40281 40282 40283 40284 40285 40286 40287 40288 40289 40290 40291 40292 40293 40294 40295 40296 40297 40298 40299 40300 | int rc; if(!db) return FSL_RC_NOT_A_REPO; rc = fsl_cx_exec_multi(f, "DROP TABLE IF EXISTS ticket;" "DROP TABLE IF EXISTS ticketchng;" ); if(!rc){ fsl_buffer * const buf = &f->cache.fileContent; fsl_buffer_reuse(buf); rc = fsl_cx_schema_ticket(f, buf); if(!rc) rc = fsl_cx_exec_multi(f, "%b", buf); } return rc; } static int fsl__tkt_field_id(fsl_list const * jli, const char *zFieldName){ int i; fsl_card_J const * jc; for(i=0; i<(int)jli->used; ++i){ jc = (fsl_card_J const *)jli->list[i]; if( !fsl_strcmp(zFieldName, jc->field) ) return i; } return -1; } int fsl__cx_ticket_load_fields(fsl_cx * const f, bool forceReload){ fsl_list * const li = &f->ticket.customFields; if(li->used){ if(!forceReload) return 0; fsl__card_J_list_free(li, false); /* Fall through and reload ... */ }else if( !fsl_needs_repo(f) ){ return FSL_RC_NOT_A_REPO; } fsl_card_J * jc; fsl_stmt q = fsl_stmt_empty; int i; int rc = fsl_cx_prepare(f, &q, "PRAGMA table_info(ticket)"); if(!rc) while( FSL_RC_STEP_ROW==fsl_stmt_step(&q) ){ char const * zFieldName = fsl_stmt_g_text(&q, 1, NULL); if(!zFieldName){ rc = FSL_RC_OOM; break; } f->ticket.hasTicket = 1; if( 0==memcmp(zFieldName,"tkt_", 4)){ if( 0==fsl_strcmp(zFieldName,"tkt_ctime")) f->ticket.hasCTime = 1; /* These are core field names, part of every fossil ticket table. */ continue; } jc = fsl_card_J_malloc(0, zFieldName, NULL); if(!jc){ rc = FSL_RC_OOM; break; } jc->flags = FSL_CARD_J_TICKET; rc = fsl_list_append(li, jc); if(rc){ fsl_card_J_free(jc); break; } } fsl_stmt_finalize(&q); if(rc) goto end; rc = fsl_cx_prepare(f, &q, "PRAGMA table_info(ticketchng)"); if(!rc) while( FSL_RC_STEP_ROW==fsl_stmt_step(&q) ){ char const * zFieldName = fsl_stmt_g_text(&q, 1, NULL); if(!zFieldName){ rc = FSL_RC_OOM; break; } f->ticket.hasChng = 1; if( 0==memcmp(zFieldName,"tkt_", 4)){ if( 0==fsl_strcmp(zFieldName,"tkt_rid")) f->ticket.hasChngRid = 1; /* These are core field names, part of every fossil ticketchng table. */ continue; } if( (i=fsl__tkt_field_id(li, zFieldName)) >= 0){ jc = (fsl_card_J*)li->list[i]; jc->flags |= FSL_CARD_J_CHNG; continue; } jc = fsl_card_J_malloc(0, zFieldName, NULL); if(!jc){ rc = FSL_RC_OOM; |
︙ | ︙ | |||
38374 38375 38376 38377 38378 38379 38380 | fsl_stmt_finalize(&q); end: if(!rc){ fsl_list_sort(li, fsl__qsort_cmp_J_cards); } return rc; } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | 40310 40311 40312 40313 40314 40315 40316 40317 40318 40319 40320 40321 40322 40323 40324 40325 40326 40327 40328 40329 40330 40331 40332 40333 40334 40335 40336 40337 40338 40339 40340 40341 40342 40343 40344 40345 40346 40347 40348 40349 40350 40351 40352 40353 40354 40355 40356 40357 40358 40359 40360 40361 40362 40363 40364 40365 40366 40367 40368 40369 40370 40371 40372 40373 40374 40375 40376 40377 40378 40379 40380 40381 40382 40383 40384 40385 40386 40387 40388 40389 40390 40391 40392 40393 40394 40395 40396 40397 40398 40399 40400 40401 40402 40403 40404 40405 40406 40407 40408 40409 40410 40411 40412 40413 40414 40415 40416 40417 40418 40419 40420 40421 40422 40423 40424 40425 40426 40427 40428 40429 40430 40431 40432 40433 40434 40435 40436 40437 40438 40439 40440 40441 40442 40443 40444 40445 40446 40447 40448 40449 40450 40451 40452 40453 40454 40455 40456 40457 40458 40459 40460 40461 40462 40463 40464 40465 40466 40467 40468 40469 40470 40471 40472 40473 40474 40475 40476 40477 40478 40479 40480 40481 40482 40483 40484 40485 40486 40487 40488 40489 40490 40491 40492 40493 40494 40495 40496 40497 40498 40499 40500 40501 40502 40503 40504 40505 40506 40507 40508 40509 40510 40511 40512 40513 40514 40515 40516 40517 40518 40519 40520 40521 40522 40523 40524 40525 40526 40527 40528 40529 40530 40531 40532 40533 40534 40535 40536 40537 40538 40539 40540 40541 40542 40543 40544 40545 40546 40547 40548 40549 40550 40551 40552 40553 40554 40555 40556 40557 40558 40559 40560 40561 40562 40563 40564 40565 40566 40567 40568 40569 40570 40571 40572 40573 40574 40575 40576 40577 40578 40579 40580 40581 40582 40583 40584 40585 40586 40587 40588 40589 40590 40591 40592 40593 40594 40595 40596 40597 40598 40599 40600 40601 40602 40603 40604 40605 40606 40607 40608 40609 40610 40611 40612 40613 40614 40615 40616 40617 40618 40619 40620 40621 40622 40623 40624 40625 40626 40627 40628 40629 40630 40631 40632 40633 40634 40635 40636 40637 40638 40639 40640 40641 40642 40643 40644 40645 40646 40647 40648 40649 40650 40651 40652 40653 40654 40655 40656 40657 40658 40659 40660 40661 40662 40663 40664 40665 40666 40667 40668 40669 40670 40671 40672 40673 40674 40675 40676 40677 40678 40679 40680 40681 40682 40683 40684 40685 40686 40687 40688 40689 40690 40691 40692 40693 40694 40695 40696 40697 40698 40699 40700 40701 40702 40703 40704 40705 40706 40707 40708 40709 40710 40711 40712 40713 40714 40715 40716 40717 40718 40719 40720 40721 40722 40723 40724 40725 40726 40727 40728 40729 40730 40731 40732 40733 40734 40735 40736 40737 40738 40739 40740 40741 40742 40743 40744 40745 40746 40747 40748 40749 40750 40751 40752 40753 40754 40755 40756 40757 40758 40759 40760 40761 40762 40763 40764 40765 40766 40767 40768 40769 40770 40771 40772 40773 40774 40775 40776 40777 40778 40779 40780 40781 40782 40783 40784 40785 40786 40787 40788 40789 40790 40791 40792 40793 40794 40795 40796 40797 40798 40799 40800 40801 40802 40803 40804 40805 40806 40807 40808 40809 40810 40811 40812 40813 40814 40815 40816 40817 40818 40819 40820 40821 40822 40823 40824 40825 40826 40827 40828 40829 40830 40831 40832 40833 40834 40835 40836 40837 40838 40839 40840 40841 40842 40843 40844 40845 40846 40847 40848 40849 40850 40851 40852 40853 40854 40855 40856 40857 40858 40859 40860 40861 40862 40863 40864 40865 40866 40867 40868 40869 40870 40871 40872 40873 40874 40875 40876 40877 40878 40879 40880 40881 40882 40883 40884 40885 40886 40887 40888 40889 40890 40891 40892 40893 40894 40895 40896 40897 40898 40899 40900 40901 40902 40903 40904 40905 40906 40907 40908 40909 40910 40911 40912 40913 40914 40915 40916 40917 40918 40919 40920 40921 40922 40923 40924 40925 40926 40927 40928 40929 40930 40931 40932 40933 40934 40935 40936 40937 40938 40939 40940 40941 40942 40943 40944 40945 40946 40947 40948 40949 40950 40951 40952 40953 40954 40955 40956 40957 40958 40959 40960 40961 40962 40963 40964 40965 40966 40967 40968 40969 40970 40971 40972 40973 40974 40975 40976 40977 40978 40979 40980 40981 40982 40983 40984 40985 40986 40987 40988 40989 40990 40991 40992 40993 40994 40995 40996 40997 40998 40999 41000 41001 41002 41003 41004 41005 41006 41007 41008 41009 41010 41011 41012 41013 41014 41015 41016 41017 41018 41019 41020 41021 41022 41023 41024 41025 41026 41027 41028 41029 41030 41031 41032 41033 41034 41035 41036 41037 41038 41039 41040 41041 41042 41043 41044 41045 41046 41047 41048 41049 41050 41051 41052 41053 41054 41055 41056 41057 41058 41059 41060 41061 41062 41063 41064 41065 41066 41067 41068 41069 41070 41071 41072 41073 41074 41075 41076 41077 41078 41079 41080 41081 41082 41083 41084 41085 41086 41087 41088 41089 41090 41091 41092 41093 41094 41095 41096 41097 41098 41099 41100 41101 41102 41103 41104 41105 41106 41107 41108 41109 41110 41111 41112 41113 41114 41115 41116 41117 41118 41119 41120 41121 41122 41123 41124 41125 41126 41127 41128 41129 41130 41131 41132 41133 41134 41135 41136 41137 41138 41139 41140 41141 41142 41143 | fsl_stmt_finalize(&q); end: if(!rc){ fsl_list_sort(li, fsl__qsort_cmp_J_cards); } return rc; } static int fsl__ticket_insert(fsl_deck * const d, fsl_id_t tktId, fsl_id_t * const tgtId){ /* Derived from fossil(1) tkt.c:ticket_insert() */; fsl_cx * const f = d->f; fsl_id_t const rid = d->rid; int rc = 0; fsl_buffer * const sql1 = fsl__cx_scratchpad(f); fsl_buffer * const sql2 = fsl__cx_scratchpad(f); fsl_buffer * const sql3 = fsl__cx_scratchpad(f); fsl_db * const db = fsl_cx_db_repo(f); fsl_list const * const cf = &f->ticket.customFields; fsl_size_t i; //char const * zMimetype = NULL; fsl_stmt q = fsl_stmt_empty; char aUsed[cf->used]; assert(rid>0 && f!=NULL && db); if(0==tktId){ rc = fsl_cx_exec_multi(f, "INSERT INTO ticket(tkt_uuid, tkt_mtime) " "VALUES(%Q, 0)", d->K); if(rc) goto end; tktId = fsl_db_last_insert_id(db); } rc = fsl_buffer_append(sql1, "UPDATE OR REPLACE ticket SET tkt_mtime=?1", -1); if(0==rc && f->ticket.hasCTime){ rc = fsl_buffer_append(sql1, ", tkt_ctime=coalesce(tkt_ctime,?1)", -1); } if(rc) goto end; memset(aUsed, 0, cf->used); for(i = 0; 0==rc && i < d->J.used; ++i){ fsl_card_J const * const dJC = (fsl_card_J*)d->J.list[i]; int const j = fsl__tkt_field_id(cf, dJC->field); if(j<0){ /* Ticket has a field which this repo does not have. Skip it. */ continue; } aUsed[j] = FSL_CARD_J_TICKET; fsl_card_J const * const rJC = (fsl_card_J*)cf->list[j]; if(rJC->flags & FSL_CARD_J_TICKET){ if(dJC->append){ rc = fsl_buffer_appendf(sql1, ", %!Q=coalesce(%!Q,'') || %Q", dJC->field, dJC->field, dJC->value); }else{ rc = fsl_buffer_appendf(sql1, ", %!Q=%Q", dJC->field, dJC->value); } if(rc) break; } if(rJC->flags & FSL_CARD_J_CHNG){ rc = fsl_buffer_appendf(sql2, ",%!Q", dJC->field); if(0==rc) rc = fsl_buffer_appendf(sql3, ",%Q", dJC->value); if(rc) break; } #if 0 if(0==fsl_strcmp(dJC->field, "mimetype")){ zMimetype = dJC->value; } #endif } if(rc) goto end; /* MISSING: a block from fossil(1) tkt.c which extracts backlinks: if( rid>0 ){ for(i=0; i<p->nField; i++){ const char *zName = p->aField[i].zName; const char *zBaseName = zName[0]=='+' ? zName+1 : zName; j = fieldId(zBaseName); if( j<0 ) continue; backlink_extract(p->aField[i].zValue, zMimetype, rid, BKLNK_TICKET, p->rDate, i==0); } } That's not critical for core ticket functionality. */ rc = fsl_buffer_appendf(sql1, " WHERE tkt_id=%" FSL_ID_T_PFMT, tktId); if(rc) goto end; rc = fsl_cx_prepare(f, &q, "%b", sql1); if(rc) goto end; rc = fsl_stmt_bind_step(&q, "f", d->D); fsl_stmt_finalize(&q); if(rc) goto end; fsl_buffer_reuse(sql1); if(f->ticket.hasChngRid || sql2->used){ bool fromTkt = false; if(f->ticket.hasChngRid){ rc = fsl_buffer_append(sql2, ",tkt_rid", -1); if(0==rc) rc = fsl_buffer_appendf(sql3, ",%" FSL_ID_T_PFMT, d->rid); if(rc) goto end; } for(i = 0; 0==rc && i < cf->used; ++i){ fsl_card_J const * const rJC = (fsl_card_J*)cf->list[i]; if(0==aUsed[i] && (rJC->flags & FSL_CARD_J_BOTH)==FSL_CARD_J_BOTH){ fromTkt = true; rc = fsl_buffer_appendf(sql2, ",%!Q", rJC->field); if(0==rc) rc = fsl_buffer_appendf(sql3, ",%!Q", rJC->field); } } if(rc) goto end; if(fromTkt){ rc = fsl_cx_prepare(f, &q, "INSERT INTO ticketchng(tkt_id,tkt_mtime%b)" "SELECT %"FSL_ID_T_PFMT",?1%b " "FROM ticket WHERE tkt_id=%"FSL_ID_T_PFMT, sql2, tktId, sql3, tktId); }else{ rc = fsl_cx_prepare(f, &q, "INSERT INTO ticketchng(tkt_id,tkt_mtime%b)" "VALUES(%"FSL_ID_T_PFMT",?1%b)", sql2, tktId, sql3); } if(0==rc) rc = fsl_stmt_bind_step(&q, "f", d->D); } end: fsl_stmt_finalize(&q); fsl__cx_scratchpad_yield(f, sql1); fsl__cx_scratchpad_yield(f, sql2); fsl__cx_scratchpad_yield(f, sql3); *tgtId = tktId; return rc; } static int fsl__ticket_timeline_entry(fsl_deck * const d, bool isNew, fsl_id_t tagId){ /* Derived from fossil(1) manifest.c:mainfest_ticket_event() */; int rc; fsl_buffer * const comment = fsl__cx_scratchpad(d->f); fsl_buffer * const brief = fsl__cx_scratchpad(d->f); char * zTitle = 0; char * zNewStatus = 0; fsl_db * const db = fsl_cx_db_repo(d->f); fsl_cx * const f = d->f; if(!f->ticket.titleColumn){ assert(!f->ticket.statusColumn); rc = fsl_db_get_text(db, &f->ticket.titleColumn, NULL, "SELECT coalesce(" "(SELECT value FROM config WHERE name='ticket-title-expr')," "'title')"); if(0==rc){ rc = fsl_db_get_text(db, &f->ticket.statusColumn, NULL, "SELECT coalesce(" "(SELECT value FROM config WHERE name='ticket-status-column')," "'status')"); } if(rc) return fsl_cx_uplift_db_error( f, db ); } rc = fsl_db_get_text(db, &zTitle, NULL, "SELECT coalesce(%!Q,'unknown') " "FROM ticket WHERE tkt_uuid=%Q", f->ticket.titleColumn, d->K); if(rc){ fsl_cx_uplift_db_error(d->f, db); goto end; } if(isNew){ rc = fsl_buffer_appendf(comment, "New ticket [%!S|%S] <i>%h</i>.", d->K, d->K, zTitle); if(0==rc){ rc = fsl_buffer_appendf(brief, "New ticket [%!S|%S].", d->K, d->K); } if(rc) goto end; }else{ // Update an existing ticket... char * zNewStatus = 0; for(fsl_size_t i = 0; i < d->J.used; ++i){ fsl_card_J const * const jc = (fsl_card_J*)d->J.list[i]; if(0==fsl_strcmp(jc->field, f->ticket.statusColumn)){ zNewStatus = jc->value; break; } } if(zNewStatus){ rc = fsl_buffer_appendf(comment, "%h ticket [%!S|%S]: <i>%h</i>", zNewStatus, d->K, d->K, zTitle); if(!rc && d->J.used>1){ rc = fsl_buffer_appendf(comment, " plus %d other change%s", (int)d->J.used-1, d->J.used==2 ? "" : "s"); } if(0==rc) rc = fsl_buffer_appendf(brief, "%h ticket [%!S|%S].", zNewStatus, d->K, d->K); if(rc) goto end; }else{ rc = fsl_db_get_text(db, &zNewStatus, NULL, "SELECT coalesce(%!Q,'unknown') " "FROM ticket WHERE tkt_uuid=%Q", f->ticket.statusColumn, d->K); if(rc){ rc = fsl_cx_uplift_db_error2(f, db, rc); goto end; } rc = fsl_buffer_appendf(comment, "Ticket [%!S|%S] <i>%h</i> " "status still %h with %d other change%s", d->K, d->K, zTitle, zNewStatus, (int)d->J.used, 1==d->J.used ? "" : "s"); fsl_free(zNewStatus); if(rc) goto end; rc = fsl_buffer_appendf(brief, "Ticket [%!S|%S]: %d change%s", d->K, d->K, (int)d->J.used, 1==d->J.used ? "" : "s"); if(rc) goto end; } } assert(0==rc); // MISSING: manifest_create_event_triggers() rc = fsl_cx_exec(d->f, "REPLACE INTO event" "(type, tagid, mtime, objid, user, comment, brief) " "VALUES('t', %"FSL_ID_T_PFMT", %"FSL_JULIAN_T_PFMT", " "%"FSL_ID_T_PFMT",%Q,%B,%B)", tagId, d->D, d->rid, d->U, comment, brief); end: fsl_free(zTitle); fsl_free(zNewStatus); fsl__cx_scratchpad_yield(d->f, comment); fsl__cx_scratchpad_yield(d->f, brief); return rc; } int fsl__ticket_rebuild(fsl_cx * const f, char const * zTktKCard){ int rc; fsl_id_t tktId; fsl_id_t tagId; fsl_db * const db = fsl_needs_repo(f); fsl_stmt q = fsl_stmt_empty; if(!db) return FSL_RC_NOT_A_REPO; assert(!f->cache.isCrosslinking); rc = fsl__cx_ticket_load_fields(f, false); if(rc) goto end; else if(!f->ticket.hasTicket) return 0; char * const zTag = fsl_mprintf("tkt-%s", zTktKCard); if(!zTag){ rc = FSL_RC_OOM; goto end; } tagId = fsl_tag_id(f, zTag, true); fsl_free(zTag); if(tagId<0){ rc = f->error.code; assert(0!=rc); goto end; } tktId = fsl_db_g_id(db, 0, "SELECT tkt_id FROM ticket " "WHERE tkt_uuid=%Q", zTktKCard); if(tktId>0){ if(f->ticket.hasChng){ rc = fsl_cx_exec(f, "DELETE FROM ticketchng " "WHERE tkt_id=%" FSL_ID_T_PFMT, tktId); } if(!rc) rc = fsl_cx_exec(f, "DELETE FROM ticket " "WHERE tkt_id=%" FSL_ID_T_PFMT, tktId); if(rc) goto end; } tktId = 0; rc = fsl_cx_prepare(f, &q, "SELECT rid FROM tagxref " "WHERE tagid=%" FSL_ID_T_PFMT " ORDER BY mtime", tagId); int counter = 0; /* Potential TODO (fossil does not do this): DELETE FROM EVENT WHERE tagid=${tagId} */ while(0==rc && FSL_RC_STEP_ROW==fsl_stmt_step(&q)){ fsl_deck deck = fsl_deck_empty; fsl_id_t const rid = fsl_stmt_g_id(&q, 0); rc = fsl_deck_load_rid(f, &deck, rid, FSL_SATYPE_TICKET); if(rc) goto outro; assert(deck.rid==rid); rc = fsl__ticket_insert(&deck, tktId, &tktId); if(0==rc){ rc = fsl__ticket_timeline_entry(&deck, 0==counter++, tagId); if(0==rc) rc = fsl__call_xlink_listeners(&deck); } outro: fsl_deck_finalize(&deck); } end: fsl_stmt_finalize(&q); return rc; } /* end of file ./src/ticket.c */ /* start of file ./src/udf.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /************************************************************************* This file houses fsl_cx-related sqlite3 User Defined Functions (UDFs). */ #if !defined(FSL_ENABLE_SQLITE_REGEXP) # define FSL_ENABLE_SQLITE_REGEXP 0 #endif #if FSL_ENABLE_SQLITE_REGEXP #endif #include <assert.h> /* Only for debugging */ #include <stdio.h> #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) /** SQL function for debugging. The print() function writes its arguments to fsl_output() if the bound fsl_cx->cxConfig.sqlPrint flag is true. */ static void fsl_db_sql_print( sqlite3_context *context, int argc, sqlite3_value **argv ){ fsl_cx * f = (fsl_cx*)sqlite3_user_data(context); assert(f); if( f->cxConfig.sqlPrint ){ int i; for(i=0; i<argc; i++){ char c = i==argc-1 ? '\n' : ' '; fsl_outputf(f, "%s%c", sqlite3_value_text(argv[i]), c); } } } /** SQL function to return the number of seconds since 1970. This is the same as strftime('%s','now') but is more compact. */ static void fsl_db_now_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ sqlite3_result_int64(context, (sqlite3_int64)time(0)); } /** SQL function to convert a Julian Day to a Unix timestamp. */ static void fsl_db_j2u_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ double const jd = (double)sqlite3_value_double(argv[0]); sqlite3_result_int64(context, (sqlite3_int64)fsl_julian_to_unix(jd)); } /** SQL function FSL_CKOUT_DIR([bool includeTrailingSlash=1]) returns the top-level checkout directory, optionally (by default) with a trailing slash. Returns NULL if the fsl_cx instance bound to sqlite3_user_data() has no checkout. */ static void fsl_db_cx_chkout_dir_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ fsl_cx * f = (fsl_cx*)sqlite3_user_data(context); int const includeSlash = argc ? sqlite3_value_int(argv[0]) : 1; if(f && f->ckout.dir && f->ckout.dirLen){ sqlite3_result_text(context, f->ckout.dir, (int)f->ckout.dirLen - (includeSlash ? 0 : 1), SQLITE_TRANSIENT); }else{ sqlite3_result_null(context); } } /** SQL Function to return the check-in time for a file. Requires (vid,fid) RID arguments, as described for fsl_mtime_of_manifest_file(). */ static void fsl_db_checkin_mtime_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ fsl_cx * f = (fsl_cx*)sqlite3_user_data(context); fsl_time_t mtime = 0; int rc; fsl_id_t vid, fid; assert(f); vid = (fsl_id_t)sqlite3_value_int(argv[0]); fid = (fsl_id_t)sqlite3_value_int(argv[1]); rc = fsl_mtime_of_manifest_file(f, vid, fid, &mtime); if( rc==0 ){ sqlite3_result_int64(context, mtime); }else{ sqlite3_result_error(context, "fsl_mtime_of_manifest_file() failed", -1); } } /** SQL UDF binding for fsl_content_get(). FSL_CONTENT(RID INTEGER | SYMBOLIC_NAME) returns the undeltified/uncompressed content of the [blob] record identified by the given RID or symbolic name. */ static void fsl_db_content_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ fsl_cx * const f = (fsl_cx*)sqlite3_user_data(context); fsl_id_t rid = 0; char const * arg; int rc; fsl_buffer b = fsl_buffer_empty; assert(f); if(1 != argc){ sqlite3_result_error(context, "Expecting one argument", -1); return; } if(SQLITE_INTEGER==sqlite3_value_type(argv[0])){ rid = (fsl_id_t)sqlite3_value_int64(argv[0]); arg = NULL; }else{ arg = (const char*)sqlite3_value_text(argv[0]); if(!arg){ sqlite3_result_error(context, "Invalid argument", -1); return; } rc = fsl_sym_to_rid(f, arg, FSL_SATYPE_ANY, &rid); if(rc) goto cx_err; else if(!rid){ sqlite3_result_error(context, "No blob found", -1); return; } } rc = fsl_content_get(f, rid, &b); if(rc) goto cx_err; /* Curiously, i'm seeing no difference in allocation counts here whether we copy the blob here or pass off ownership... */ sqlite3_result_blob(context, b.mem, (int)b.used, fsl_free); b = fsl_buffer_empty; return; cx_err: fsl_buffer_clear(&b); assert(f->error.msg.used); if(FSL_RC_OOM==rc){ sqlite3_result_error_nomem(context); }else{ assert(f->error.msg.used); sqlite3_result_error(context, (char const *)f->error.msg.mem, (int)f->error.msg.used); } } /** SQL UDF FSL_SYM2RID(SYMBOLIC_NAME) resolves the name to a [blob].[rid] value or triggers an error if it cannot be resolved. */ static void fsl_db_sym2rid_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ fsl_cx * const f = (fsl_cx*)sqlite3_user_data(context); char const * arg; assert(f); if(1 != argc){ sqlite3_result_error(context, "Expecting one argument", -1); return; } arg = (const char*)sqlite3_value_text(argv[0]); if(!arg){ sqlite3_result_error(context, "Expecting a STRING argument", -1); }else{ fsl_id_t rid = 0; int const rc = fsl_sym_to_rid(f, arg, FSL_SATYPE_ANY, &rid); if(rc){ if(FSL_RC_OOM==rc){ sqlite3_result_error_nomem(context); }else{ assert(f->error.msg.used); sqlite3_result_error(context, (char const *)f->error.msg.mem, (int)f->error.msg.used); } fsl_cx_err_reset(f) /* This is arguable but keeps this error from poluting down-stream code (seen it happen in unit tests). The irony is, it's very possible/likely that the error will propagate back up into f->error at some point. */; }else{ assert(rid>0); sqlite3_result_int64(context, rid); } } } static void fsl_db_dirpart_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ char const * arg; int rc; fsl_buffer b = fsl_buffer_empty; int fSlash = 0; if(argc<1 || argc>2){ sqlite3_result_error(context, "Expecting (string) or (string,bool) arguments", -1); return; } arg = (const char*)sqlite3_value_text(argv[0]); if(!arg){ sqlite3_result_error(context, "Invalid argument", -1); return; } if(argc>1){ fSlash = sqlite3_value_int(argv[1]); } rc = fsl_file_dirpart(arg, -1, &b, fSlash ? 1 : 0); if(!rc){ if(b.used && *b.mem){ #if 0 sqlite3_result_text(context, (char const *)b.mem, (int)b.used, SQLITE_TRANSIENT); #else sqlite3_result_text(context, (char const *)b.mem, (int)b.used, fsl_free); b = fsl_buffer_empty /* we passed ^^^^^ on ownership of b.mem */; #endif }else{ sqlite3_result_null(context); } }else{ if(FSL_RC_OOM==rc){ sqlite3_result_error_nomem(context); }else{ sqlite3_result_error(context, "fsl_dirpart() failed!", -1); } } fsl_buffer_clear(&b); } /* Implement the user() SQL function. user() takes no arguments and returns the user ID of the current user. */ static void fsl_db_user_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ fsl_cx * f = (fsl_cx*)sqlite3_user_data(context); assert(f); if(f->repo.user){ sqlite3_result_text(context, f->repo.user, -1, SQLITE_STATIC); }else{ sqlite3_result_null(context); } } /** SQL function: fsl_is_enqueued(vfile.id) fsl_if_enqueued(vfile.id, X, Y) On the commit command, when filenames are specified (in order to do a partial commit) the vfile.id values for the named files are loaded into the fsl_cx state. This function looks at that state to see if a file is named in that list. In the first form (1 argument) return TRUE if either no files are named (meaning that all changes are to be committed) or if id is found in the list. In the second form (3 arguments) return argument X if true and Y if false unless Y is NULL, in which case always return X. */ static void fsl_db_selected_for_checkin_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ int rc = 0; fsl_cx * f = (fsl_cx*)sqlite3_user_data(context); fsl_id_bag * bag = &f->ckin.selectedIds; assert(argc==1 || argc==3); if( bag->entryCount ){ fsl_id_t const iId = (fsl_id_t)sqlite3_value_int64(argv[0]); rc = iId ? (fsl_id_bag_contains(bag, iId) ? 1 : 0) : 0; }else{ rc = 1; } if(1==argc){ sqlite3_result_int(context, rc); }else{ assert(3 == argc); assert( rc==0 || rc==1 ); if( sqlite3_value_type(argv[2-rc])==SQLITE_NULL ) rc = 1-rc; sqlite3_result_value(context, argv[2-rc]); } } /** fsl_match_vfile_or_dir(p1,p2) A helper for resolving expressions like: WHERE pathname='X' C OR (pathname>'X/' C AND pathname<'X0' C) i.e. is 'X' a match for the LHS or is it a directory prefix of LHS? C = empty or COLLATE NOCASE, depending on the case-sensitivity setting of the fsl_cx instance associated with sqlite3_user_data(context). p1 is typically vfile.pathname or vfile.origname, and p2 is the string being compared against that. Resolves to NULL if either argument is NULL, 0 if the comparison shown above is false, 1 if the comparison is an exact match, or 2 if p2 is a directory prefix part of p1. */ static void fsl_db_match_vfile_or_dir( sqlite3_context *context, int argc, sqlite3_value **argv ){ fsl_cx * f = (fsl_cx*)sqlite3_user_data(context); char const * p1; char const * p2; fsl_buffer * b = 0; int rc = 0; assert(f); if(2 != argc){ sqlite3_result_error(context, "Expecting two arguments", -1); return; } p1 = (const char*)sqlite3_value_text(argv[0]); p2 = (const char*)sqlite3_value_text(argv[1]); if(!p1 || !p2){ sqlite3_result_null(context); return; } int (*cmp)(char const *, char const *) = f->cache.caseInsensitive ? fsl_stricmp : fsl_strcmp; if(0==cmp(p1, p2)){ sqlite3_result_int(context, 1); return; } b = fsl__cx_scratchpad(f); rc = fsl_buffer_appendf(b, "%s/", p2); if(rc) goto oom; else if(cmp(p1, fsl_buffer_cstr(b))>0){ b->mem[b->used-1] = '0'; if(cmp(p1, fsl_buffer_cstr(b))<0) rc = 2; } assert(0==rc || 2==rc); sqlite3_result_int(context, rc); end: fsl__cx_scratchpad_yield(f, b); return; oom: sqlite3_result_error_nomem(context); goto end; } /** F(glob-list-name, filename) Returns 1 if the 2nd argument matches any glob in the fossil glob list named by the first argument. The first argument must be a name resolvable via fsl_glob_name_to_category() or an error is triggered. The second value is intended to be a string, but NULL is accepted (but never matches anything). If no match is found, 0 is returned. An empty glob list never matches anything. */ static void fsl_db_cx_glob_udf( sqlite3_context *context, int argc, sqlite3_value **argv ){ fsl_cx * const f = (fsl_cx*)sqlite3_user_data(context); fsl_list * li = NULL; fsl_glob_category_e globType; char const * p1; char const * p2; p2 = (const char*)sqlite3_value_text(argv[1])/*value to check*/; if(NULL==p2 || 0==p2[0]){ sqlite3_result_int(context, 0); return; } p1 = (const char*)sqlite3_value_text(argv[0])/*glob set name*/; globType = fsl_glob_name_to_category(p1); if(FSL_GLOBS_INVALID==globType){ char buf[100] = {0}; buf[sizeof(buf)-1] = 0; fsl_snprintf(buf, (fsl_size_t)sizeof(buf)-1, "Unknown glob pattern name: %#.*s", 50, p1 ? p1 : "NULL"); sqlite3_result_error(context, buf, -1); return; } fsl_cx_glob_list(f, globType, &li, false); assert(li); sqlite3_result_int(context, fsl_glob_list_matches(li, p2) ? 1 : 0); } /** Plug in fsl_cx-specific db functionality into the given db handle. This must only be passed the MAIN db handle for the context. */ int fsl__cx_init_db(fsl_cx * const f, fsl_db * const db){ int rc; assert(!f->dbMain); if(f->cxConfig.traceSql){ fsl_db_sqltrace_enable(db, stdout); } f->dbMain = db; db->role = FSL_DBROLE_MAIN; /* This all comes from db.c:db_open()... */ /* FIXME: check result codes here. */ sqlite3 * const dbh = db->dbh; sqlite3_busy_timeout(dbh, 5000 /* historical value */); sqlite3_wal_autocheckpoint(dbh, 1); /* Set to checkpoint frequently */ rc = fsl_cx_exec_multi(f, "PRAGMA foreign_keys=OFF;" // ^^^ vmerge table relies on this for its magical // vmerge.id values. //"PRAGMA main.temp_store=FILE;" //"PRAGMA main.journal_mode=TRUNCATE;" // ^^^ note that WAL is not possible on a TEMP db // and OFF leads to undefined behaviour if // ROLLBACK is used! ); if(rc) goto end; sqlite3_create_function(dbh, "now", 0, SQLITE_ANY, 0, fsl_db_now_udf, 0, 0); sqlite3_create_function(dbh, "fsl_ci_mtime", 2, SQLITE_ANY | SQLITE_DETERMINISTIC, f, fsl_db_checkin_mtime_udf, 0, 0); sqlite3_create_function(dbh, "fsl_user", 0, SQLITE_ANY | SQLITE_DETERMINISTIC, f, fsl_db_user_udf, 0, 0); sqlite3_create_function(dbh, "fsl_print", -1, SQLITE_UTF8 /* not strictly SQLITE_DETERMINISTIC because it produces output */, f, fsl_db_sql_print,0,0); sqlite3_create_function(dbh, "fsl_content", 1, SQLITE_ANY | SQLITE_DETERMINISTIC, f, fsl_db_content_udf, 0, 0); sqlite3_create_function(dbh, "fsl_sym2rid", 1, SQLITE_ANY | SQLITE_DETERMINISTIC, f, fsl_db_sym2rid_udf, 0, 0); sqlite3_create_function(dbh, "fsl_dirpart", 1, SQLITE_UTF8 | SQLITE_DETERMINISTIC, NULL, fsl_db_dirpart_udf, 0, 0); sqlite3_create_function(dbh, "fsl_dirpart", 2, SQLITE_UTF8 | SQLITE_DETERMINISTIC, NULL, fsl_db_dirpart_udf, 0, 0); sqlite3_create_function(dbh, "fsl_j2u", 1, SQLITE_ANY | SQLITE_DETERMINISTIC, NULL, fsl_db_j2u_udf, 0, 0); /* fsl_i[sf]_selected() both require access to the f's list of files being considered for commit. */ sqlite3_create_function(dbh, "fsl_is_enqueued", 1, SQLITE_UTF8, f, fsl_db_selected_for_checkin_udf,0,0 ); sqlite3_create_function(dbh, "fsl_if_enqueued", 3, SQLITE_UTF8, f, fsl_db_selected_for_checkin_udf,0,0 ); sqlite3_create_function(dbh, "fsl_ckout_dir", -1, SQLITE_UTF8 | SQLITE_DETERMINISTIC, f, fsl_db_cx_chkout_dir_udf,0,0 ); sqlite3_create_function(dbh, "fsl_match_vfile_or_dir", 2, SQLITE_UTF8 | SQLITE_DETERMINISTIC, f, fsl_db_match_vfile_or_dir,0,0 ); sqlite3_create_function(dbh, "fsl_glob", 2, SQLITE_UTF8 | SQLITE_DETERMINISTIC, /* noting that ^^^^^ it's only deterministic for a given statement execution IF no SQL triggers an effect which forces the globs to reload. That "shouldn't ever happen." */ f, fsl_db_cx_glob_udf, 0, 0 ); #if 0 /* functions registered in v1 by db.c:db_open(). */ /* porting cgi() requires access to the HTTP/CGI layer. i.e. this belongs downstream. */ sqlite3_create_function(dbh, "cgi", 1, SQLITE_ANY, 0, db_sql_cgi, 0, 0); sqlite3_create_function(dbh, "cgi", 2, SQLITE_ANY, 0, db_sql_cgi, 0, 0); re_add_sql_func(db) /* Requires the regex bits. */; #endif end: return rc; } #undef MARKER /* end of file ./src/udf.c */ /* start of file ./src/utf8.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* ** Copyright (c) 2017 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the Simplified BSD License (also |
︙ | ︙ | |||
38642 38643 38644 38645 38646 38647 38648 | p[-1] = '/'; } } } return zPath; #elif defined(__APPLE__) && !defined(WITHOUT_ICONV) return fsl_strdup(zUtf8) | | < > | 41396 41397 41398 41399 41400 41401 41402 41403 41404 41405 41406 41407 41408 41409 41410 41411 | p[-1] = '/'; } } } return zPath; #elif defined(__APPLE__) && !defined(WITHOUT_ICONV) return fsl_strdup(zUtf8) /* Why? Why not just act like Unix? Much later: so that fsl_filename_free() can DTRT. */; #else return (void *)zUtf8; /* No-op on unix */ #endif } char *fsl_getenv(const char *zName){ |
︙ | ︙ | |||
38692 38693 38694 38695 38696 38697 38698 | default: break; } } return rc; } } | | | | 41446 41447 41448 41449 41450 41451 41452 41453 41454 41455 41456 41457 41458 41459 41460 41461 | default: break; } } return rc; } } /* end of file ./src/utf8.c */ /* start of file ./src/vfile.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
38890 38891 38892 38893 38894 38895 38896 | } int fsl_vfile_changes_scan(fsl_cx * const f, fsl_id_t vid, unsigned cksigFlags){ fsl_stmt * stUpdate = NULL; fsl_stmt q = fsl_stmt_empty; int rc = 0; | < | | | | 41644 41645 41646 41647 41648 41649 41650 41651 41652 41653 41654 41655 41656 41657 41658 41659 41660 41661 41662 41663 41664 41665 41666 41667 41668 41669 41670 41671 41672 41673 41674 41675 41676 41677 41678 41679 41680 41681 41682 41683 41684 41685 41686 41687 41688 41689 41690 41691 | } int fsl_vfile_changes_scan(fsl_cx * const f, fsl_id_t vid, unsigned cksigFlags){ fsl_stmt * stUpdate = NULL; fsl_stmt q = fsl_stmt_empty; int rc = 0; fsl_fstat fst = fsl_fstat_empty; fsl_size_t rootLen; fsl_buffer * fileCksum = fsl__cx_scratchpad(f); bool const useMtime = (cksigFlags & FSL_VFILE_CKSIG_HASH)==0 && fsl_config_get_bool(f, FSL_CONFDB_REPO, true, "mtime-changes"); if(!fsl_needs_ckout(f)) return FSL_RC_NOT_A_CKOUT; assert(f->ckout.dir); if(vid<=0) vid = f->ckout.rid; assert(vid>=0); rootLen = fsl_strlen(f->ckout.dir); assert(rootLen); rc = fsl_cx_transaction_begin(f); if(rc) return rc; if(f->ckout.rid != vid){ rc = fsl_vfile_load(f, vid, (FSL_VFILE_CKSIG_KEEP_OTHERS & cksigFlags) ? false : true, NULL); } if(rc) goto end; #if 0 MARKER(("changed/deleted vfile contents post load-from-rid:\n")); fsl_db_each( fsl_cx_db_ckout(f), fsl_stmt_each_f_dump, NULL, "SELECT vf.id, substr(b.uuid,0,8) hash, chnged, " "deleted, vf.pathname " "FROM vfile vf LEFT JOIN blob b " "ON b.rid=vf.rid " "WHERE vf.vid=%"FSL_ID_T_PFMT" " "AND (chnged<>0 OR pathname<>origname OR deleted<>0)" "ORDER BY vf.id", vid); #endif rc = fsl_cx_prepare(f, &q, "SELECT " /*0*/"id," /*1*/"%Q || pathname," /*2*/"vfile.mrid," /*3*/"deleted," /*4*/"chnged," /*5*/"uuid," /*6*/"size," |
︙ | ︙ | |||
39085 39086 39087 39088 39089 39090 39091 | }else if( origPerm==FSL_FILE_PERM_LINK ){ changed = FSL_VFILE_CHANGE_NOT_SYMLINK; } } #endif if( currentMtime!=oldMtime || changed!=oldChanged ){ if(!stUpdate){ | | < < < < < | | < > > > < < | | < < < | 41838 41839 41840 41841 41842 41843 41844 41845 41846 41847 41848 41849 41850 41851 41852 41853 41854 41855 41856 41857 41858 41859 41860 41861 41862 41863 41864 41865 41866 41867 41868 41869 41870 41871 41872 41873 41874 41875 41876 41877 41878 41879 41880 41881 41882 41883 41884 41885 41886 41887 41888 | }else if( origPerm==FSL_FILE_PERM_LINK ){ changed = FSL_VFILE_CHANGE_NOT_SYMLINK; } } #endif if( currentMtime!=oldMtime || changed!=oldChanged ){ if(!stUpdate){ rc = fsl_cx_prepare_cached(f, &stUpdate, "UPDATE vfile SET " "mtime=?1, chnged=?2 " "WHERE id=?3 " "/*%s()*/",__func__); if(rc) goto end; } rc = fsl_stmt_bind_step(stUpdate, "IiR", currentMtime, changed, id); if(rc) goto end; /* MARKER(("UPDATED vfile.(mtime,chnged) for: %s\n", zName)); */ } }/*while(step)*/ #if 0 MARKER(("changed/deleted vfile contents post vfile scan:\n")); fsl_db_each( fsl_cx_db_ckout(f), fsl_stmt_each_f_dump, NULL, "SELECT vf.id, substr(b.uuid,0,8) hash, chnged, " "deleted, vf.pathname " "FROM vfile vf LEFT JOIN blob b " "ON b.rid=vf.rid " "WHERE vf.vid=%"FSL_ID_T_PFMT" " "AND (chnged<>0 OR pathname<>origname OR deleted<>0)" "ORDER BY vf.id", vid); #endif end: fsl__cx_scratchpad_yield(f, fileCksum); if(!rc){ rc = fsl__ckout_clear_merge_state(f, false); } if(!rc && (cksigFlags & FSL_VFILE_CKSIG_WRITE_CKOUT_VERSION) && (f->ckout.rid != vid)){ rc = fsl__ckout_version_write(f, vid, 0); } if(rc) { fsl_cx_transaction_end(f, true); }else{ rc = fsl_cx_transaction_end(f, false); } fsl_stmt_cached_yield(stUpdate); fsl_stmt_finalize(&q); return rc; } int fsl__vfile_to_ckout(fsl_cx * const f, fsl_id_t vfileId, |
︙ | ︙ | |||
39277 39278 39279 39280 39281 39282 39283 | end: fsl_buffer_clear(&content); fsl_stmt_finalize(&q); return rc; } #undef MARKER | | | | 42022 42023 42024 42025 42026 42027 42028 42029 42030 42031 42032 42033 42034 42035 42036 42037 | end: fsl_buffer_clear(&content); fsl_stmt_finalize(&q); return rc; } #undef MARKER /* end of file ./src/vfile.c */ /* start of file ./src/vpath.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
39483 39484 39485 39486 39487 39488 39489 | fsl_stmt_finalize(&s); fsl_vpath_clear(path); return rc; } /** Creates, if needed, the [ancestor] table, else clears its | | > | | 42228 42229 42230 42231 42232 42233 42234 42235 42236 42237 42238 42239 42240 42241 42242 42243 42244 | fsl_stmt_finalize(&s); fsl_vpath_clear(path); return rc; } /** Creates, if needed, the [ancestor] table, else clears its contents. Returns 0 on success, non-0 on db error (in which case f's error state is updated). */ static int fsl__init_ancestor(fsl_cx * const f){ fsl_db * const db = fsl_cx_db_repo(f); int rc; if(db){ rc = fsl_db_exec_multi(db, "CREATE TEMP TABLE IF NOT EXISTS ancestor(" " rid INT UNIQUE," |
︙ | ︙ | |||
39721 39722 39723 39724 39725 39726 39727 | dberr: assert(rc); rc = fsl_cx_uplift_db_error2(f, db, rc); goto end; } #undef MARKER | | | | 42467 42468 42469 42470 42471 42472 42473 42474 42475 42476 42477 42478 42479 42480 42481 42482 | dberr: assert(rc); rc = fsl_cx_uplift_db_error2(f, db, rc); goto end; } #undef MARKER /* end of file ./src/vpath.c */ /* start of file ./src/wiki.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors |
︙ | ︙ | |||
39748 39749 39750 39751 39752 39753 39754 | #include <stdio.h> #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) | | | > > | | | < | | | | | | > > | < < | < | | | | | > | | | | | | | < > | 42494 42495 42496 42497 42498 42499 42500 42501 42502 42503 42504 42505 42506 42507 42508 42509 42510 42511 42512 42513 42514 42515 42516 42517 42518 42519 42520 42521 42522 42523 42524 42525 42526 42527 42528 42529 42530 42531 42532 42533 42534 42535 42536 42537 42538 42539 42540 42541 42542 42543 42544 42545 42546 42547 42548 42549 42550 42551 42552 42553 42554 42555 42556 42557 42558 42559 42560 42561 42562 42563 42564 42565 42566 42567 42568 42569 42570 42571 42572 42573 42574 42575 42576 42577 42578 42579 42580 42581 42582 42583 42584 42585 42586 42587 42588 42589 42590 42591 42592 42593 42594 42595 42596 42597 42598 42599 42600 42601 42602 42603 42604 | #include <stdio.h> #define MARKER(pfexp) \ do{ printf("MARKER: %s:%d:%s():\t",__FILE__,__LINE__,__func__); \ printf pfexp; \ } while(0) int fsl_wiki_names_get( fsl_cx * const f, fsl_list * const tgt ){ fsl_db * db = fsl_needs_repo(f); if(!f || !tgt) return FSL_RC_MISUSE; else if(!db) return FSL_RC_NOT_A_REPO; else { int rc = fsl_db_select_slist( db, tgt, "SELECT substr(tagname,6) AS name " "FROM tag " "WHERE tagname GLOB 'wiki-*' " "ORDER BY lower(name)"); if(rc && db->error.code && !f->error.code){ fsl_cx_uplift_db_error(f, db); } return rc; } } int fsl_wiki_latest_rid( fsl_cx * const f, char const * pageName, fsl_id_t * const rid ){ fsl_db * db = f ? fsl_needs_repo(f) : NULL; if(!f || !pageName) return FSL_RC_MISUSE; else if(!*pageName) return FSL_RC_RANGE; else if(!db) return FSL_RC_NOT_A_REPO; else return fsl_db_get_id(db, rid, "SELECT x.rid FROM tag t, tagxref x " "WHERE x.tagid=t.tagid " "AND t.tagname='wiki-%q' " "AND TYPEOF(x.value+0)='integer' " // ^^^^ only 'wiki-%' tags which are wiki pages "ORDER BY mtime DESC LIMIT 1", pageName); } bool fsl_wiki_page_exists(fsl_cx * const f, char const * pageName){ fsl_id_t rid = 0; return (0==fsl_wiki_latest_rid(f, pageName, &rid)) && (rid>0); } int fsl_wiki_load_latest( fsl_cx * const f, char const * pageName, fsl_deck * d ){ fsl_db * db = f ? fsl_needs_repo(f) : NULL; if(!f || !pageName || !d) return FSL_RC_MISUSE; else if(!*pageName) return FSL_RC_RANGE; else if(!db) return FSL_RC_NOT_A_REPO; else{ fsl_id_t rid = 0; int rc = fsl_wiki_latest_rid(f, pageName, &rid); if(rc) return rc; else if(0==rid) return FSL_RC_NOT_FOUND; return fsl_deck_load_rid( f, d, rid, FSL_SATYPE_WIKI); } } int fsl_wiki_foreach_page( fsl_cx * const f, fsl_deck_visitor_f cb, void * state ){ if(!cb) return FSL_RC_MISUSE; else if(!fsl_needs_repo(f)) return FSL_RC_NOT_A_REPO; else{ fsl_stmt st = fsl_stmt_empty; fsl_stmt names = fsl_stmt_empty; int rc; bool doBreak = false; rc = fsl_cx_prepare(f, &names, "SELECT substr(tagname,6) AS name " "FROM tag " "WHERE tagname GLOB 'wiki-*' " "ORDER BY lower(name)"); if(rc) return rc; while( !doBreak && !rc && (FSL_RC_STEP_ROW==fsl_stmt_step(&names))){ fsl_size_t nameLen = 0; char const * pageName = fsl_stmt_g_text(&names, 0, &nameLen); if(!st.stmt){ rc = fsl_cx_prepare(f, &st, "SELECT x.rid AS mrid FROM tag t, tagxref x " "WHERE x.tagid=t.tagid " "AND t.tagname='wiki-'||?1 " "AND TYPEOF(x.value+0)='integer' " // ^^^^ only 'wiki-%' tags which are wiki pages "ORDER BY x.mtime DESC LIMIT 1"); if(rc) goto end; } rc = fsl_stmt_bind_step(&st, "s", pageName); if(rc!=FSL_RC_STEP_ROW) continue; fsl_deck d = fsl_deck_empty; fsl_id_t const rid = fsl_stmt_g_id(&st, 0); rc = fsl_deck_load_rid( f, &d, rid, FSL_SATYPE_WIKI); if(!rc){ assert(d.rid==rid); rc = cb(f, &d, state); if(FSL_RC_BREAK==rc){ rc = 0; doBreak = true; } } fsl_deck_finalize(&d); fsl_stmt_reset(&st); } end: fsl_stmt_finalize(&st); fsl_stmt_finalize(&names); return rc; } } |
︙ | ︙ | |||
39919 39920 39921 39922 39923 39924 39925 | end: fsl_deck_finalize(&d); return rc; } } #undef MARKER | | | | 42666 42667 42668 42669 42670 42671 42672 42673 42674 42675 42676 42677 42678 42679 42680 42681 | end: fsl_deck_finalize(&d); return rc; } } #undef MARKER /* end of file ./src/wiki.c */ /* start of file ./src/zip.c */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ /* ** Copyright (c) 2017 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the Simplified BSD License (also |
︙ | ︙ | |||
40392 40393 40394 40395 40396 40397 40398 | } } } return rc; } | | | 43139 43140 43141 43142 43143 43144 43145 43146 43147 43148 43149 43150 43151 43152 43153 | } } } return rc; } int fsl_repo_zip_sym_to_filename( fsl_cx * const f, char const * sym, char const * rootDir, char const * fileName, fsl_card_F_visitor_f progress, void * progressState ){ int rc; fsl_deck mf = fsl_deck_empty; ZipState zs = ZipState_empty; |
︙ | ︙ | |||
40441 40442 40443 40444 40445 40446 40447 | } /** Always write the manifest files to the zip, regardless of the repo-level settings. This decision is up for debate. */ if(rc) goto end; else { | | | 43188 43189 43190 43191 43192 43193 43194 43195 43196 43197 43198 43199 43200 43201 43202 | } /** Always write the manifest files to the zip, regardless of the repo-level settings. This decision is up for debate. */ if(rc) goto end; else { fsl_buffer * const bManifest = &f->cache.fileContent; fsl_buffer * const bHash = fsl__cx_scratchpad(f); fsl_buffer * const bTags = fsl__cx_scratchpad(f); fsl_buffer_reuse(bManifest); rc = fsl_repo_manifest_write(f, mf.rid, bManifest, bHash, bTags); if(rc) goto mf_end; rc = fsl_zip_file_add(&zs.z, "manifest", bManifest, FSL_FILE_PERM_REGULAR); |
︙ | ︙ | |||
40478 40479 40480 40481 40482 40483 40484 | fsl_deck_clean(&mf); return rc; } #undef MARKER | | | < | | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | < > | | | < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | < < < | 43225 43226 43227 43228 43229 43230 43231 43232 43233 43234 43235 43236 43237 43238 43239 43240 43241 43242 43243 43244 43245 43246 43247 43248 43249 43250 43251 43252 43253 43254 43255 43256 43257 43258 43259 43260 43261 43262 43263 43264 43265 43266 43267 43268 43269 43270 43271 43272 43273 43274 43275 43276 43277 43278 43279 43280 43281 43282 43283 43284 43285 43286 43287 43288 43289 43290 43291 43292 43293 43294 43295 43296 43297 43298 43299 43300 43301 43302 43303 43304 43305 43306 43307 43308 43309 43310 43311 43312 43313 43314 43315 43316 43317 43318 43319 43320 43321 43322 43323 43324 43325 43326 43327 43328 43329 43330 43331 43332 43333 43334 43335 43336 43337 43338 43339 43340 43341 43342 43343 43344 43345 43346 43347 43348 43349 43350 43351 43352 43353 43354 43355 43356 43357 43358 43359 43360 43361 43362 43363 43364 43365 43366 43367 43368 43369 43370 43371 43372 43373 43374 43375 43376 43377 43378 43379 43380 43381 43382 43383 43384 43385 43386 43387 43388 43389 43390 43391 43392 43393 43394 43395 43396 43397 43398 43399 43400 43401 43402 43403 43404 43405 43406 43407 43408 43409 43410 43411 43412 43413 43414 43415 43416 43417 43418 43419 43420 43421 43422 43423 43424 43425 43426 43427 43428 43429 43430 43431 43432 43433 43434 43435 43436 43437 43438 43439 43440 43441 43442 43443 43444 43445 43446 43447 43448 43449 43450 43451 43452 43453 43454 43455 43456 43457 43458 43459 43460 43461 43462 43463 43464 43465 43466 43467 43468 43469 43470 43471 43472 43473 43474 43475 43476 43477 43478 43479 43480 43481 43482 43483 43484 43485 43486 43487 43488 43489 43490 43491 43492 43493 43494 43495 43496 43497 43498 43499 43500 43501 43502 43503 43504 43505 43506 43507 43508 43509 43510 43511 43512 43513 43514 43515 43516 43517 43518 43519 43520 43521 43522 43523 43524 43525 43526 43527 43528 43529 43530 43531 43532 43533 43534 43535 43536 43537 43538 43539 43540 43541 43542 43543 43544 43545 43546 43547 43548 43549 43550 43551 43552 43553 43554 43555 43556 43557 43558 43559 43560 43561 43562 43563 43564 43565 43566 43567 43568 43569 43570 43571 43572 43573 43574 43575 43576 43577 43578 43579 43580 43581 43582 43583 43584 43585 43586 43587 43588 43589 43590 43591 43592 43593 43594 43595 43596 43597 43598 43599 43600 43601 43602 43603 43604 43605 43606 43607 43608 43609 43610 43611 43612 43613 43614 43615 43616 43617 43618 43619 43620 43621 43622 43623 43624 43625 43626 43627 43628 43629 43630 43631 43632 43633 43634 43635 43636 43637 43638 43639 43640 43641 43642 43643 43644 43645 43646 43647 43648 43649 43650 43651 43652 43653 43654 43655 43656 43657 43658 43659 43660 43661 43662 43663 43664 43665 43666 43667 43668 43669 43670 43671 43672 43673 43674 43675 43676 43677 43678 43679 43680 43681 43682 43683 43684 43685 43686 43687 43688 43689 43690 43691 43692 43693 43694 43695 43696 43697 43698 43699 43700 43701 43702 43703 43704 43705 43706 43707 43708 43709 43710 43711 43712 43713 43714 43715 43716 43717 43718 43719 43720 43721 43722 43723 43724 43725 43726 43727 43728 43729 43730 43731 43732 43733 43734 43735 43736 43737 43738 43739 43740 43741 43742 43743 43744 43745 43746 43747 43748 43749 43750 43751 43752 43753 43754 43755 43756 43757 43758 43759 43760 43761 43762 43763 43764 43765 43766 43767 43768 43769 43770 43771 43772 43773 43774 43775 43776 43777 43778 43779 43780 43781 43782 43783 43784 43785 43786 43787 43788 43789 43790 43791 43792 43793 43794 43795 43796 43797 43798 43799 43800 43801 43802 43803 43804 43805 43806 43807 43808 43809 43810 43811 43812 43813 43814 43815 43816 43817 43818 43819 43820 43821 43822 43823 43824 43825 43826 43827 43828 43829 43830 43831 43832 43833 43834 43835 43836 43837 43838 43839 43840 43841 43842 43843 43844 43845 43846 43847 43848 43849 43850 43851 43852 43853 43854 43855 43856 43857 43858 43859 43860 43861 43862 43863 43864 43865 43866 43867 43868 43869 43870 43871 43872 43873 43874 43875 43876 43877 43878 43879 43880 43881 43882 43883 43884 43885 43886 43887 43888 43889 43890 43891 43892 43893 43894 43895 43896 43897 43898 43899 43900 43901 43902 43903 43904 43905 43906 43907 43908 43909 43910 43911 43912 43913 43914 43915 43916 43917 43918 43919 43920 43921 43922 43923 43924 43925 43926 43927 43928 43929 43930 43931 43932 43933 43934 43935 43936 43937 43938 43939 43940 43941 43942 43943 43944 43945 43946 43947 43948 43949 43950 43951 43952 43953 43954 43955 | fsl_deck_clean(&mf); return rc; } #undef MARKER /* end of file ./src/zip.c */ /* start of file ./src/difftk_cstr.c */ /** @page page_difftk_cstr difftk.tcl Binary form of file ./src/difftk.tcl. */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_difftk_cstr_a[] = { 35, 32, 84, 104, 105, 115, 32, 115, 99, 114, 105, 112, 116, 32, 119, 97, 115, 32, 116, 97, 107, 101, 110, 32, 118, 101, 114, 98, 97, 116, 105, 109, 32, 102, 114, 111, 109, 32, 116, 104, 101, 32, 70, 111, 115, 115, 105, 108, 32, 83, 67, 77, 32, 112, 114, 111, 106, 101, 99, 116, 46, 32, 32, 73, 116, 32, 105, 115, 10, 35, 32, 110, 111, 116, 32, 115, 116, 97, 110, 100, 97, 108, 111, 110, 101, 58, 32, 105, 116, 32, 105, 115, 32, 105, 110, 116, 101, 110, 100, 101, 100, 32, 116, 111, 32, 98, 101, 32, 101, 109, 98, 101, 100, 100, 101, 100, 32, 105, 110, 32, 111, 117, 116, 112, 117, 116, 32, 103, 101, 110, 101, 114, 97, 116, 101, 100, 32, 98, 121, 10, 35, 32, 102, 45, 118, 100, 105, 102, 102, 32, 40, 111, 114, 32, 115, 105, 109, 105, 108, 97, 114, 41, 46, 10, 115, 101, 116, 32, 112, 114, 111, 103, 32, 123, 10, 112, 97, 99, 107, 97, 103, 101, 32, 114, 101, 113, 117, 105, 114, 101, 32, 84, 107, 10, 10, 97, 114, 114, 97, 121, 32, 115, 101, 116, 32, 67, 70, 71, 32, 123, 10, 32, 32, 84, 73, 84, 76, 69, 32, 32, 32, 32, 32, 32, 123, 70, 111, 115, 115, 105, 108, 32, 68, 105, 102, 102, 125, 10, 32, 32, 76, 78, 95, 67, 79, 76, 95, 66, 71, 32, 32, 35, 100, 100, 100, 100, 100, 100, 10, 32, 32, 76, 78, 95, 67, 79, 76, 95, 70, 71, 32, 32, 35, 52, 52, 52, 52, 52, 52, 10, 32, 32, 84, 88, 84, 95, 67, 79, 76, 95, 66, 71, 32, 35, 102, 102, 102, 102, 102, 102, 10, 32, 32, 84, 88, 84, 95, 67, 79, 76, 95, 70, 71, 32, 35, 48, 48, 48, 48, 48, 48, 10, 32, 32, 77, 75, 82, 95, 67, 79, 76, 95, 66, 71, 32, 35, 52, 52, 52, 52, 52, 52, 10, 32, 32, 77, 75, 82, 95, 67, 79, 76, 95, 70, 71, 32, 35, 100, 100, 100, 100, 100, 100, 10, 32, 32, 67, 72, 78, 71, 95, 66, 71, 32, 32, 32, 32, 35, 100, 48, 100, 48, 102, 102, 10, 32, 32, 65, 68, 68, 95, 66, 71, 32, 32, 32, 32, 32, 35, 99, 48, 102, 102, 99, 48, 10, 32, 32, 82, 77, 95, 66, 71, 32, 32, 32, 32, 32, 32, 35, 102, 102, 99, 48, 99, 48, 10, 32, 32, 72, 82, 95, 70, 71, 32, 32, 32, 32, 32, 32, 35, 52, 52, 52, 52, 52, 52, 10, 32, 32, 72, 82, 95, 80, 65, 68, 95, 84, 79, 80, 32, 52, 10, 32, 32, 72, 82, 95, 80, 65, 68, 95, 66, 84, 77, 32, 56, 10, 32, 32, 70, 78, 95, 66, 71, 32, 32, 32, 32, 32, 32, 35, 52, 52, 52, 52, 52, 52, 10, 32, 32, 70, 78, 95, 70, 71, 32, 32, 32, 32, 32, 32, 35, 102, 102, 102, 102, 102, 102, 10, 32, 32, 70, 78, 95, 80, 65, 68, 32, 32, 32, 32, 32, 53, 10, 32, 32, 69, 82, 82, 95, 70, 71, 32, 32, 32, 32, 32, 35, 101, 101, 48, 48, 48, 48, 10, 32, 32, 80, 65, 68, 88, 32, 32, 32, 32, 32, 32, 32, 53, 10, 32, 32, 87, 73, 68, 84, 72, 32, 32, 32, 32, 32, 32, 56, 48, 10, 32, 32, 72, 69, 73, 71, 72, 84, 32, 32, 32, 32, 32, 52, 53, 10, 32, 32, 76, 66, 95, 72, 69, 73, 71, 72, 84, 32, 32, 50, 53, 10, 125, 10, 10, 105, 102, 32, 123, 33, 91, 110, 97, 109, 101, 115, 112, 97, 99, 101, 32, 101, 120, 105, 115, 116, 115, 32, 116, 116, 107, 93, 125, 32, 123, 10, 32, 32, 105, 110, 116, 101, 114, 112, 32, 97, 108, 105, 97, 115, 32, 123, 125, 32, 58, 58, 116, 116, 107, 58, 58, 115, 99, 114, 111, 108, 108, 98, 97, 114, 32, 123, 125, 32, 58, 58, 115, 99, 114, 111, 108, 108, 98, 97, 114, 10, 32, 32, 105, 110, 116, 101, 114, 112, 32, 97, 108, 105, 97, 115, 32, 123, 125, 32, 58, 58, 116, 116, 107, 58, 58, 109, 101, 110, 117, 98, 117, 116, 116, 111, 110, 32, 123, 125, 32, 58, 58, 109, 101, 110, 117, 98, 117, 116, 116, 111, 110, 10, 125, 10, 10, 112, 114, 111, 99, 32, 100, 101, 104, 116, 109, 108, 32, 123, 120, 125, 32, 123, 10, 32, 32, 115, 101, 116, 32, 120, 32, 91, 114, 101, 103, 115, 117, 98, 32, 45, 97, 108, 108, 32, 123, 60, 91, 94, 62, 93, 42, 62, 125, 32, 36, 120, 32, 123, 125, 93, 10, 32, 32, 114, 101, 116, 117, 114, 110, 32, 91, 115, 116, 114, 105, 110, 103, 32, 109, 97, 112, 32, 123, 38, 97, 109, 112, 59, 32, 38, 32, 38, 108, 116, 59, 32, 60, 32, 38, 103, 116, 59, 32, 62, 32, 38, 35, 51, 57, 59, 32, 39, 32, 38, 113, 117, 111, 116, 59, 32, 92, 34, 125, 32, 36, 120, 93, 10, 125, 10, 10, 112, 114, 111, 99, 32, 99, 111, 108, 115, 32, 123, 125, 32, 123, 10, 32, 32, 114, 101, 116, 117, 114, 110, 32, 91, 108, 105, 115, 116, 32, 46, 108, 110, 65, 32, 46, 116, 120, 116, 65, 32, 46, 109, 107, 114, 32, 46, 108, 110, 66, 32, 46, 116, 120, 116, 66, 93, 10, 125, 10, 10, 112, 114, 111, 99, 32, 99, 111, 108, 84, 121, 112, 101, 32, 123, 99, 125, 32, 123, 10, 32, 32, 114, 101, 103, 101, 120, 112, 32, 123, 91, 97, 45, 122, 93, 43, 125, 32, 36, 99, 32, 116, 121, 112, 101, 10, 32, 32, 114, 101, 116, 117, 114, 110, 32, 36, 116, 121, 112, 101, 10, 125, 10, 10, 112, 114, 111, 99, 32, 103, 101, 116, 76, 105, 110, 101, 32, 123, 100, 105, 102, 102, 116, 120, 116, 32, 78, 32, 105, 105, 118, 97, 114, 125, 32, 123, 10, 32, 32, 117, 112, 118, 97, 114, 32, 36, 105, 105, 118, 97, 114, 32, 105, 105, 10, 32, 32, 105, 102, 32, 123, 36, 105, 105, 62, 61, 36, 78, 125, 32, 123, 114, 101, 116, 117, 114, 110, 32, 45, 49, 125, 10, 32, 32, 115, 101, 116, 32, 120, 32, 91, 108, 105, 110, 100, 101, 120, 32, 36, 100, 105, 102, 102, 116, 120, 116, 32, 36, 105, 105, 93, 10, 32, 32, 105, 110, 99, 114, 32, 105, 105, 10, 32, 32, 114, 101, 116, 117, 114, 110, 32, 36, 120, 10, 125, 10, 10, 112, 114, 111, 99, 32, 114, 101, 97, 100, 68, 105, 102, 102, 115, 32, 123, 102, 111, 115, 115, 105, 108, 99, 109, 100, 125, 32, 123, 10, 32, 32, 103, 108, 111, 98, 97, 108, 32, 100, 105, 102, 102, 116, 120, 116, 10, 32, 32, 105, 102, 32, 123, 33, 91, 105, 110, 102, 111, 32, 101, 120, 105, 115, 116, 115, 32, 100, 105, 102, 102, 116, 120, 116, 93, 125, 32, 123, 10, 32, 32, 32, 32, 115, 101, 116, 32, 105, 110, 32, 91, 111, 112, 101, 110, 32, 36, 102, 111, 115, 115, 105, 108, 99, 109, 100, 32, 114, 93, 10, 32, 32, 32, 32, 102, 99, 111, 110, 102, 105, 103, 117, 114, 101, 32, 36, 105, 110, 32, 45, 101, 110, 99, 111, 100, 105, 110, 103, 32, 117, 116, 102, 45, 56, 10, 32, 32, 32, 32, 115, 101, 116, 32, 100, 105, 102, 102, 116, 120, 116, 32, 91, 115, 112, 108, 105, 116, 32, 91, 114, 101, 97, 100, 32, 36, 105, 110, 93, 32, 92, 110, 93, 10, 32, 32, 32, 32, 99, 108, 111, 115, 101, 32, 36, 105, 110, 10, 32, 32, 125, 10, 32, 32, 115, 101, 116, 32, 78, 32, 91, 108, 108, 101, 110, 103, 116, 104, 32, 36, 100, 105, 102, 102, 116, 120, 116, 93, 10, 32, 32, 115, 101, 116, 32, 105, 105, 32, 48, 10, 32, 32, 115, 101, 116, 32, 110, 68, 105, 102, 102, 115, 32, 48, 10, 32, 32, 115, 101, 116, 32, 110, 49, 32, 48, 10, 32, 32, 115, 101, 116, 32, 110, 50, 32, 48, 32, 32, 10, 32, 32, 97, 114, 114, 97, 121, 32, 115, 101, 116, 32, 119, 105, 100, 116, 104, 115, 32, 123, 116, 120, 116, 32, 51, 32, 108, 110, 32, 51, 32, 109, 107, 114, 32, 49, 125, 10, 32, 32, 119, 104, 105, 108, 101, 32, 123, 91, 115, 101, 116, 32, 108, 105, 110, 101, 32, 91, 103, 101, 116, 76, 105, 110, 101, 32, 36, 100, 105, 102, 102, 116, 120, 116, 32, 36, 78, 32, 105, 105, 93, 93, 32, 33, 61, 32, 45, 49, 125, 32, 123, 10, 32, 32, 32, 32, 115, 119, 105, 116, 99, 104, 32, 45, 45, 32, 91, 108, 105, 110, 100, 101, 120, 32, 36, 108, 105, 110, 101, 32, 48, 93, 32, 123, 10, 32, 32, 32, 32, 32, 32, 70, 73, 76, 69, 32, 123, 10, 32, 32, 32, 32, 32, 32, 32, 32, 105, 110, 99, 114, 32, 110, 68, 105, 102, 102, 115, 10, 32, 32, 32, 32, 32, 32, 32, 32, 102, 111, 114, 101, 97, 99, 104, 32, 119, 120, 32, 91, 108, 105, 115, 116, 32, 91, 115, 116, 114, 105, 110, 103, 32, 108, 101, 110, 103, 116, 104, 32, 36, 110, 49, 93, 32, 91, 115, 116, 114, 105, 110, 103, 32, 108, 101, 110, 103, 116, 104, 32, 36, 110, 50, 93, 93, 32, 123, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 105, 102, 32, 123, 36, 119, 120, 62, 36, 119, 105, 100, 116, 104, 115, 40, 108, 110, 41, 125, 32, 123, 115, 101, 116, 32, 119, 105, 100, 116, 104, 115, 40, 108, 110, 41, 32, 36, 119, 120, 125, 10, 32, 32, 32, 32, 32, 32, 32, 32, 125, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 108, 110, 65, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 92, 110, 32, 102, 110, 32, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 65, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 91, 108, 105, 110, 100, 101, 120, 32, 36, 108, 105, 110, 101, 32, 49, 93, 92, 110, 32, 102, 110, 32, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 109, 107, 114, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 92, 110, 32, 102, 110, 32, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 108, 110, 66, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 92, 110, 32, 102, 110, 32, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 66, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 91, 108, 105, 110, 100, 101, 120, 32, 36, 108, 105, 110, 101, 32, 50, 93, 92, 110, 32, 102, 110, 32, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 119, 102, 105, 108, 101, 115, 46, 108, 98, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 91, 108, 105, 110, 100, 101, 120, 32, 36, 108, 105, 110, 101, 32, 50, 93, 10, 32, 32, 32, 32, 32, 32, 32, 32, 115, 101, 116, 32, 110, 49, 32, 48, 10, 32, 32, 32, 32, 32, 32, 32, 32, 115, 101, 116, 32, 110, 50, 32, 48, 10, 32, 32, 32, 32, 32, 32, 125, 10, 32, 32, 32, 32, 32, 32, 83, 75, 73, 80, 32, 123, 10, 32, 32, 32, 32, 32, 32, 32, 32, 115, 101, 116, 32, 110, 32, 91, 108, 105, 110, 100, 101, 120, 32, 36, 108, 105, 110, 101, 32, 49, 93, 10, 32, 32, 32, 32, 32, 32, 32, 32, 105, 110, 99, 114, 32, 110, 49, 32, 36, 110, 10, 32, 32, 32, 32, 32, 32, 32, 32, 105, 110, 99, 114, 32, 110, 50, 32, 36, 110, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 108, 110, 65, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 46, 46, 46, 92, 110, 32, 104, 114, 108, 110, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 65, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 91, 115, 116, 114, 105, 110, 103, 32, 114, 101, 112, 101, 97, 116, 32, 46, 32, 51, 48, 93, 92, 110, 32, 104, 114, 116, 120, 116, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 109, 107, 114, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 92, 110, 32, 104, 114, 108, 110, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 108, 110, 66, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 46, 46, 46, 92, 110, 32, 104, 114, 108, 110, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 66, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 91, 115, 116, 114, 105, 110, 103, 32, 114, 101, 112, 101, 97, 116, 32, 46, 32, 51, 48, 93, 92, 110, 32, 104, 114, 116, 120, 116, 10, 32, 32, 32, 32, 32, 32, 125, 10, 32, 32, 32, 32, 32, 32, 67, 79, 77, 32, 123, 10, 32, 32, 32, 32, 32, 32, 32, 32, 115, 101, 116, 32, 120, 32, 91, 108, 105, 110, 100, 101, 120, 32, 36, 108, 105, 110, 101, 32, 49, 93, 10, 32, 32, 32, 32, 32, 32, 32, 32, 105, 110, 99, 114, 32, 110, 49, 10, 32, 32, 32, 32, 32, 32, 32, 32, 105, 110, 99, 114, 32, 110, 50, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 108, 110, 65, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 36, 110, 49, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 65, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 36, 120, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 109, 107, 114, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 108, 110, 66, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 36, 110, 50, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 66, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 36, 120, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 125, 10, 32, 32, 32, 32, 32, 32, 73, 78, 83, 32, 123, 10, 32, 32, 32, 32, 32, 32, 32, 32, 115, 101, 116, 32, 120, 32, 91, 108, 105, 110, 100, 101, 120, 32, 36, 108, 105, 110, 101, 32, 49, 93, 10, 32, 32, 32, 32, 32, 32, 32, 32, 105, 110, 99, 114, 32, 110, 50, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 108, 110, 65, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 65, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 109, 107, 114, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 62, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 108, 110, 66, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 36, 110, 50, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 66, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 36, 120, 32, 97, 100, 100, 32, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 125, 10, 32, 32, 32, 32, 32, 32, 68, 69, 76, 32, 123, 10, 32, 32, 32, 32, 32, 32, 32, 32, 115, 101, 116, 32, 120, 32, 91, 108, 105, 110, 100, 101, 120, 32, 36, 108, 105, 110, 101, 32, 49, 93, 10, 32, 32, 32, 32, 32, 32, 32, 32, 105, 110, 99, 114, 32, 110, 49, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 108, 110, 65, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 36, 110, 49, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 65, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 36, 120, 32, 114, 109, 32, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 109, 107, 114, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 60, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 108, 110, 66, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 66, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 125, 10, 32, 32, 32, 32, 32, 32, 69, 68, 73, 84, 32, 123, 10, 32, 32, 32, 32, 32, 32, 32, 32, 105, 110, 99, 114, 32, 110, 49, 10, 32, 32, 32, 32, 32, 32, 32, 32, 105, 110, 99, 114, 32, 110, 50, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 108, 110, 65, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 36, 110, 49, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 108, 110, 66, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 36, 110, 50, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 109, 107, 114, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 124, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 115, 101, 116, 32, 110, 110, 32, 91, 108, 108, 101, 110, 103, 116, 104, 32, 36, 108, 105, 110, 101, 93, 10, 32, 32, 32, 32, 32, 32, 32, 32, 102, 111, 114, 32, 123, 115, 101, 116, 32, 105, 32, 49, 125, 32, 123, 36, 105, 60, 36, 110, 110, 125, 32, 123, 105, 110, 99, 114, 32, 105, 32, 51, 125, 32, 123, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 115, 101, 116, 32, 120, 32, 91, 108, 105, 110, 100, 101, 120, 32, 36, 108, 105, 110, 101, 32, 36, 105, 93, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 105, 102, 32, 123, 36, 120, 32, 110, 101, 32, 34, 34, 125, 32, 123, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 65, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 36, 120, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 66, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 36, 120, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 125, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 105, 102, 32, 123, 36, 105, 43, 50, 60, 36, 110, 110, 125, 32, 123, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 115, 101, 116, 32, 120, 49, 32, 91, 108, 105, 110, 100, 101, 120, 32, 36, 108, 105, 110, 101, 32, 91, 101, 120, 112, 114, 32, 123, 36, 105, 43, 49, 125, 93, 93, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 115, 101, 116, 32, 120, 50, 32, 91, 108, 105, 110, 100, 101, 120, 32, 36, 108, 105, 110, 101, 32, 91, 101, 120, 112, 114, 32, 123, 36, 105, 43, 50, 125, 93, 93, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 105, 102, 32, 123, 34, 36, 120, 49, 34, 32, 101, 113, 32, 34, 34, 125, 32, 123, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 66, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 36, 120, 50, 32, 97, 100, 100, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 125, 32, 101, 108, 115, 101, 105, 102, 32, 123, 34, 36, 120, 50, 34, 32, 101, 113, 32, 34, 34, 125, 32, 123, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 65, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 36, 120, 49, 32, 114, 109, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 125, 32, 101, 108, 115, 101, 32, 123, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 65, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 36, 120, 49, 32, 99, 104, 110, 103, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 66, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 36, 120, 50, 32, 99, 104, 110, 103, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 125, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 125, 10, 32, 32, 32, 32, 32, 32, 32, 32, 125, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 65, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 66, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 125, 10, 32, 32, 32, 32, 32, 32, 34, 34, 32, 123, 10, 32, 32, 32, 32, 32, 32, 32, 32, 102, 111, 114, 101, 97, 99, 104, 32, 119, 120, 32, 91, 108, 105, 115, 116, 32, 91, 115, 116, 114, 105, 110, 103, 32, 108, 101, 110, 103, 116, 104, 32, 36, 110, 49, 93, 32, 91, 115, 116, 114, 105, 110, 103, 32, 108, 101, 110, 103, 116, 104, 32, 36, 110, 50, 93, 93, 32, 123, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 105, 102, 32, 123, 36, 119, 120, 62, 36, 119, 105, 100, 116, 104, 115, 40, 108, 110, 41, 125, 32, 123, 115, 101, 116, 32, 119, 105, 100, 116, 104, 115, 40, 108, 110, 41, 32, 36, 119, 120, 125, 10, 32, 32, 32, 32, 32, 32, 32, 32, 125, 10, 32, 32, 32, 32, 32, 32, 125, 10, 32, 32, 32, 32, 32, 32, 100, 101, 102, 97, 117, 108, 116, 32, 123, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 108, 110, 65, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 65, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 36, 108, 105, 110, 101, 92, 110, 32, 101, 114, 114, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 109, 107, 114, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 108, 110, 66, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 92, 110, 32, 45, 10, 32, 32, 32, 32, 32, 32, 32, 32, 46, 116, 120, 116, 66, 32, 105, 110, 115, 101, 114, 116, 32, 101, 110, 100, 32, 36, 108, 105, 110, 101, 92, 110, 32, 101, 114, 114, 10, 32, 32, 32, 32, 32, 32, 125, 10, 32, 32, 32, 32, 125, 10, 32, 32, 125, 10, 10, 32, 32, 102, 111, 114, 101, 97, 99, 104, 32, 99, 32, 91, 99, 111, 108, 115, 93, 32, 123, 10, 32, 32, 32, 32, 115, 101, 116, 32, 116, 121, 112, 101, 32, 91, 99, 111, 108, 84, 121, 112, 101, 32, 36, 99, 93, 10, 32, 32, 32, 32, 105, 102, 32, 123, 36, 116, 121, 112, 101, 32, 110, 101, 32, 34, 116, 120, 116, 34, 125, 32, 123, 10, 32, 32, 32, 32, 32, 32, 36, 99, 32, 99, 111, 110, 102, 105, 103, 32, 45, 119, 105, 100, 116, 104, 32, 36, 119, 105, 100, 116, 104, 115, 40, 36, 116, 121, 112, 101, 41, 10, 32, 32, 32, 32, 125, 10, 32, 32, 32, 32, 36, 99, 32, 99, 111, 110, 102, 105, 103, 32, 45, 115, 116, 97, 116, 101, 32, 100, 105, 115, 97, 98, 108, 101, 100, 10, 32, 32, 125, 10, 32, 32, 105, 102, 32, 123, 36, 110, 68, 105, 102, 102, 115, 32, 60, 61, 32, 91, 46, 119, 102, 105, 108, 101, 115, 46, 108, 98, 32, 99, 103, 101, 116, 32, 45, 104, 101, 105, 103, 104, 116, 93, 125, 32, 123, 10, 32, 32, 32, 32, 46, 119, 102, 105, 108, 101, 115, 46, 108, 98, 32, 99, 111, 110, 102, 105, 103, 32, 45, 104, 101, 105, 103, 104, 116, 32, 36, 110, 68, 105, 102, 102, 115, 10, 32, 32, 32, 32, 103, 114, 105, 100, 32, 114, 101, 109, 111, 118, 101, 32, 46, 119, 102, 105, 108, 101, 115, 46, 115, 98, 10, 32, 32, 125, 10, 10, 32, 32, 114, 101, 116, 117, 114, 110, 32, 36, 110, 68, 105, 102, 102, 115, 10, 125, 10, 10, 112, 114, 111, 99, 32, 118, 105, 101, 119, 68, 105, 102, 102, 32, 123, 105, 100, 120, 125, 32, 123, 10, 32, 32, 46, 116, 120, 116, 65, 32, 121, 118, 105, 101, 119, 32, 36, 105, 100, 120, 10, 32, 32, 46, 116, 120, 116, 65, 32, 120, 118, 105, 101, 119, 32, 109, 111, 118, 101, 116, 111, 32, 48, 10, 125, 10, 10, 112, 114, 111, 99, 32, 99, 121, 99, 108, 101, 68, 105, 102, 102, 115, 32, 123, 123, 114, 101, 118, 101, 114, 115, 101, 32, 48, 125, 125, 32, 123, 10, 32, 32, 105, 102, 32, 123, 36, 114, 101, 118, 101, 114, 115, 101, 125, 32, 123, 10, 32, 32, 32, 32, 115, 101, 116, 32, 114, 97, 110, 103, 101, 32, 91, 46, 116, 120, 116, 65, 32, 116, 97, 103, 32, 112, 114, 101, 118, 114, 97, 110, 103, 101, 32, 102, 110, 32, 64, 48, 44, 48, 32, 49, 46, 48, 93, 10, 32, 32, 32, 32, 105, 102, 32, 123, 36, 114, 97, 110, 103, 101, 32, 101, 113, 32, 34, 34, 125, 32, 123, 10, 32, 32, 32, 32, 32, 32, 118, 105, 101, 119, 68, 105, 102, 102, 32, 123, 102, 110, 46, 108, 97, 115, 116, 32, 45, 49, 99, 125, 10, 32, 32, 32, 32, 125, 32, 101, 108, 115, 101, 32, 123, 10, 32, 32, 32, 32, 32, 32, 118, 105, 101, 119, 68, 105, 102, 102, 32, 91, 108, 105, 110, 100, 101, 120, 32, 36, 114, 97, 110, 103, 101, 32, 48, 93, 10, 32, 32, 32, 32, 125, 10, 32, 32, 125, 32, 101, 108, 115, 101, 32, 123, 10, 32, 32, 32, 32, 115, 101, 116, 32, 114, 97, 110, 103, 101, 32, 91, 46, 116, 120, 116, 65, 32, 116, 97, 103, 32, 110, 101, 120, 116, 114, 97, 110, 103, 101, 32, 102, 110, 32, 123, 64, 48, 44, 48, 32, 43, 49, 99, 125, 32, 101, 110, 100, 93, 10, 32, 32, 32, 32, 105, 102, 32, 123, 36, 114, 97, 110, 103, 101, 32, 101, 113, 32, 34, 34, 32, 124, 124, 32, 91, 108, 105, 110, 100, 101, 120, 32, 91, 46, 116, 120, 116, 65, 32, 121, 118, 105, 101, 119, 93, 32, 49, 93, 32, 61, 61, 32, 49, 125, 32, 123, 10, 32, 32, 32, 32, 32, 32, 118, 105, 101, 119, 68, 105, 102, 102, 32, 102, 110, 46, 102, 105, 114, 115, 116, 10, 32, 32, 32, 32, 125, 32, 101, 108, 115, 101, 32, 123, 10, 32, 32, 32, 32, 32, 32, 118, 105, 101, 119, 68, 105, 102, 102, 32, 91, 108, 105, 110, 100, 101, 120, 32, 36, 114, 97, 110, 103, 101, 32, 48, 93, 10, 32, 32, 32, 32, 125, 10, 32, 32, 125, 10, 125, 10, 10, 112, 114, 111, 99, 32, 120, 118, 105, 115, 32, 123, 99, 111, 108, 125, 32, 123, 10, 32, 32, 115, 101, 116, 32, 118, 105, 101, 119, 32, 91, 36, 99, 111, 108, 32, 120, 118, 105, 101, 119, 93, 10, 32, 32, 114, 101, 116, 117, 114, 110, 32, 91, 101, 120, 112, 114, 32, 123, 91, 108, 105, 110, 100, 101, 120, 32, 36, 118, 105, 101, 119, 32, 49, 93, 45, 91, 108, 105, 110, 100, 101, 120, 32, 36, 118, 105, 101, 119, 32, 48, 93, 125, 93, 10, 125, 10, 10, 112, 114, 111, 99, 32, 115, 99, 114, 111, 108, 108, 45, 120, 32, 123, 97, 114, 103, 115, 125, 32, 123, 10, 32, 32, 115, 101, 116, 32, 99, 32, 46, 116, 120, 116, 91, 101, 120, 112, 114, 32, 123, 91, 120, 118, 105, 115, 32, 46, 116, 120, 116, 65, 93, 32, 60, 32, 91, 120, 118, 105, 115, 32, 46, 116, 120, 116, 66, 93, 32, 63, 32, 34, 65, 34, 32, 58, 32, 34, 66, 34, 125, 93, 10, 32, 32, 101, 118, 97, 108, 32, 36, 99, 32, 120, 118, 105, 101, 119, 32, 36, 97, 114, 103, 115, 10, 125, 10, 10, 105, 110, 116, 101, 114, 112, 32, 97, 108, 105, 97, 115, 32, 123, 125, 32, 115, 99, 114, 111, 108, 108, 45, 121, 32, 123, 125, 32, 46, 116, 120, 116, 65, 32, 121, 118, 105, 101, 119, 10, 10, 112, 114, 111, 99, 32, 110, 111, 111, 112, 32, 123, 97, 114, 103, 115, 125, 32, 123, 125, 10, 10, 112, 114, 111, 99, 32, 101, 110, 97, 98, 108, 101, 83, 121, 110, 99, 32, 123, 97, 120, 105, 115, 125, 32, 123, 10, 32, 32, 117, 112, 100, 97, 116, 101, 32, 105, 100, 108, 101, 116, 97, 115, 107, 115, 10, 32, 32, 105, 110, 116, 101, 114, 112, 32, 97, 108, 105, 97, 115, 32, 123, 125, 32, 115, 121, 110, 99, 45, 36, 97, 120, 105, 115, 32, 123, 125, 10, 32, 32, 114, 101, 110, 97, 109, 101, 32, 95, 115, 121, 110, 99, 45, 36, 97, 120, 105, 115, 32, 115, 121, 110, 99, 45, 36, 97, 120, 105, 115, 10, 125, 10, 10, 112, 114, 111, 99, 32, 100, 105, 115, 97, 98, 108, 101, 83, 121, 110, 99, 32, 123, 97, 120, 105, 115, 125, 32, 123, 10, 32, 32, 114, 101, 110, 97, 109, 101, 32, 115, 121, 110, 99, 45, 36, 97, 120, 105, 115, 32, 95, 115, 121, 110, 99, 45, 36, 97, 120, 105, 115, 10, 32, 32, 105, 110, 116, 101, 114, 112, 32, 97, 108, 105, 97, 115, 32, 123, 125, 32, 115, 121, 110, 99, 45, 36, 97, 120, 105, 115, 32, 123, 125, 32, 110, 111, 111, 112, 10, 125, 10, 10, 112, 114, 111, 99, 32, 115, 121, 110, 99, 45, 120, 32, 123, 99, 111, 108, 32, 102, 105, 114, 115, 116, 32, 108, 97, 115, 116, 125, 32, 123, 10, 32, 32, 100, 105, 115, 97, 98, 108, 101, 83, 121, 110, 99, 32, 120, 10, 32, 32, 36, 99, 111, 108, 32, 120, 118, 105, 101, 119, 32, 109, 111, 118, 101, 116, 111, 32, 91, 101, 120, 112, 114, 32, 123, 36, 102, 105, 114, 115, 116, 42, 91, 120, 118, 105, 115, 32, 36, 99, 111, 108, 93, 47, 40, 36, 108, 97, 115, 116, 45, 36, 102, 105, 114, 115, 116, 41, 125, 93, 10, 32, 32, 102, 111, 114, 101, 97, 99, 104, 32, 115, 105, 100, 101, 32, 123, 65, 32, 66, 125, 32, 123, 10, 32, 32, 32, 32, 115, 101, 116, 32, 115, 98, 32, 46, 115, 98, 120, 36, 115, 105, 100, 101, 10, 32, 32, 32, 32, 115, 101, 116, 32, 120, 118, 105, 101, 119, 32, 91, 46, 116, 120, 116, 36, 115, 105, 100, 101, 32, 120, 118, 105, 101, 119, 93, 10, 32, 32, 32, 32, 105, 102, 32, 123, 91, 108, 105, 110, 100, 101, 120, 32, 36, 120, 118, 105, 101, 119, 32, 48, 93, 32, 62, 32, 48, 32, 124, 124, 32, 91, 108, 105, 110, 100, 101, 120, 32, 36, 120, 118, 105, 101, 119, 32, 49, 93, 32, 60, 32, 49, 125, 32, 123, 10, 32, 32, 32, 32, 32, 32, 103, 114, 105, 100, 32, 36, 115, 98, 10, 32, 32, 32, 32, 32, 32, 101, 118, 97, 108, 32, 36, 115, 98, 32, 115, 101, 116, 32, 36, 120, 118, 105, 101, 119, 10, 32, 32, 32, 32, 125, 32, 101, 108, 115, 101, 32, 123, 10, 32, 32, 32, 32, 32, 32, 103, 114, 105, 100, 32, 114, 101, 109, 111, 118, 101, 32, 36, 115, 98, 10, 32, 32, 32, 32, 125, 10, 32, 32, 125, 10, 32, 32, 101, 110, 97, 98, 108, 101, 83, 121, 110, 99, 32, 120, 10, 125, 10, 10, 112, 114, 111, 99, 32, 115, 121, 110, 99, 45, 121, 32, 123, 102, 105, 114, 115, 116, 32, 108, 97, 115, 116, 125, 32, 123, 10, 32, 32, 100, 105, 115, 97, 98, 108, 101, 83, 121, 110, 99, 32, 121, 10, 32, 32, 102, 111, 114, 101, 97, 99, 104, 32, 99, 32, 91, 99, 111, 108, 115, 93, 32, 123, 10, 32, 32, 32, 32, 36, 99, 32, 121, 118, 105, 101, 119, 32, 109, 111, 118, 101, 116, 111, 32, 36, 102, 105, 114, 115, 116, 10, 32, 32, 125, 10, 32, 32, 105, 102, 32, 123, 36, 102, 105, 114, 115, 116, 32, 62, 32, 48, 32, 124, 124, 32, 36, 108, 97, 115, 116, 32, 60, 32, 49, 125, 32, 123, 10, 32, 32, 32, 32, 103, 114, 105, 100, 32, 46, 115, 98, 121, 10, 32, 32, 32, 32, 46, 115, 98, 121, 32, 115, 101, 116, 32, 36, 102, 105, 114, 115, 116, 32, 36, 108, 97, 115, 116, 10, 32, 32, 125, 32, 101, 108, 115, 101, 32, 123, 10, 32, 32, 32, 32, 103, 114, 105, 100, 32, 114, 101, 109, 111, 118, 101, 32, 46, 115, 98, 121, 10, 32, 32, 125, 10, 32, 32, 101, 110, 97, 98, 108, 101, 83, 121, 110, 99, 32, 121, 10, 125, 10, 10, 119, 109, 32, 119, 105, 116, 104, 100, 114, 97, 119, 32, 46, 10, 119, 109, 32, 116, 105, 116, 108, 101, 32, 46, 32, 36, 67, 70, 71, 40, 84, 73, 84, 76, 69, 41, 10, 119, 109, 32, 105, 99, 111, 110, 110, 97, 109, 101, 32, 46, 32, 36, 67, 70, 71, 40, 84, 73, 84, 76, 69, 41, 10, 35, 32, 75, 101, 121, 115, 116, 114, 111, 107, 101, 32, 98, 105, 110, 100, 105, 110, 103, 115, 32, 102, 111, 114, 32, 111, 110, 32, 116, 104, 101, 32, 116, 111, 112, 45, 108, 101, 118, 101, 108, 32, 119, 105, 110, 100, 111, 119, 32, 102, 111, 114, 32, 110, 97, 118, 105, 103, 97, 116, 105, 111, 110, 32, 97, 110, 100, 10, 35, 32, 99, 111, 110, 116, 114, 111, 108, 32, 97, 108, 115, 111, 32, 102, 105, 114, 101, 32, 119, 104, 101, 110, 32, 116, 104, 111, 115, 101, 32, 115, 97, 109, 101, 32, 107, 101, 121, 115, 116, 114, 111, 107, 101, 115, 32, 97, 114, 101, 32, 112, 114, 101, 115, 115, 101, 100, 32, 105, 110, 32, 116, 104, 101, 10, 35, 32, 83, 101, 97, 114, 99, 104, 32, 101, 110, 116, 114, 121, 32, 98, 111, 120, 46, 32, 32, 68, 105, 115, 97, 98, 108, 101, 32, 116, 104, 101, 109, 44, 32, 116, 111, 32, 112, 114, 101, 118, 101, 110, 116, 32, 116, 104, 101, 32, 100, 105, 102, 102, 32, 115, 99, 114, 101, 101, 110, 32, 102, 114, 111, 109, 10, 35, 32, 100, 105, 115, 97, 112, 112, 101, 97, 114, 105, 110, 103, 32, 97, 98, 114, 117, 112, 116, 108, 121, 32, 97, 110, 100, 32, 117, 110, 101, 120, 112, 101, 99, 116, 101, 100, 108, 121, 32, 119, 104, 101, 110, 32, 115, 101, 97, 114, 99, 104, 105, 110, 103, 32, 102, 111, 114, 32, 34, 113, 34, 46, 10, 35, 10, 98, 105, 110, 100, 32, 46, 32, 60, 67, 111, 110, 116, 114, 111, 108, 45, 113, 62, 32, 101, 120, 105, 116, 10, 98, 105, 110, 100, 32, 46, 32, 60, 67, 111, 110, 116, 114, 111, 108, 45, 112, 62, 32, 123, 99, 97, 116, 99, 104, 32, 115, 101, 97, 114, 99, 104, 80, 114, 101, 118, 59, 32, 98, 114, 101, 97, 107, 125, 10, 98, 105, 110, 100, 32, 46, 32, 60, 67, 111, 110, 116, 114, 111, 108, 45, 110, 62, 32, 123, 99, 97, 116, 99, 104, 32, 115, 101, 97, 114, 99, 104, 78, 101, 120, 116, 59, 32, 98, 114, 101, 97, 107, 125, 10, 98, 105, 110, 100, 32, 46, 32, 60, 69, 115, 99, 97, 112, 101, 62, 60, 69, 115, 99, 97, 112, 101, 62, 32, 101, 120, 105, 116, 10, 98, 105, 110, 100, 32, 46, 32, 60, 68, 101, 115, 116, 114, 111, 121, 62, 32, 123, 97, 102, 116, 101, 114, 32, 48, 32, 101, 120, 105, 116, 125, 10, 98, 105, 110, 100, 32, 46, 32, 60, 84, 97, 98, 62, 32, 123, 99, 121, 99, 108, 101, 68, 105, 102, 102, 115, 59, 32, 98, 114, 101, 97, 107, 125, 10, 98, 105, 110, 100, 32, 46, 32, 60, 60, 80, 114, 101, 118, 87, 105, 110, 100, 111, 119, 62, 62, 32, 123, 99, 121, 99, 108, 101, 68, 105, 102, 102, 115, 32, 49, 59, 32, 98, 114, 101, 97, 107, 125, 10, 98, 105, 110, 100, 32, 46, 32, 60, 67, 111, 110, 116, 114, 111, 108, 45, 102, 62, 32, 123, 115, 101, 97, 114, 99, 104, 79, 110, 79, 102, 102, 59, 32, 98, 114, 101, 97, 107, 125, 10, 98, 105, 110, 100, 32, 46, 32, 60, 67, 111, 110, 116, 114, 111, 108, 45, 103, 62, 32, 123, 99, 97, 116, 99, 104, 32, 115, 101, 97, 114, 99, 104, 78, 101, 120, 116, 59, 32, 98, 114, 101, 97, 107, 125, 10, 98, 105, 110, 100, 32, 46, 32, 60, 82, 101, 116, 117, 114, 110, 62, 32, 123, 10, 32, 32, 101, 118, 101, 110, 116, 32, 103, 101, 110, 101, 114, 97, 116, 101, 32, 46, 98, 98, 46, 102, 105, 108, 101, 115, 32, 60, 49, 62, 10, 32, 32, 101, 118, 101, 110, 116, 32, 103, 101, 110, 101, 114, 97, 116, 101, 32, 46, 98, 98, 46, 102, 105, 108, 101, 115, 32, 60, 66, 117, 116, 116, 111, 110, 82, 101, 108, 101, 97, 115, 101, 45, 49, 62, 10, 32, 32, 98, 114, 101, 97, 107, 10, 125, 10, 102, 111, 114, 101, 97, 99, 104, 32, 123, 107, 101, 121, 32, 97, 120, 105, 115, 32, 97, 114, 103, 115, 125, 32, 123, 10, 32, 32, 85, 112, 32, 32, 32, 32, 121, 32, 123, 115, 99, 114, 111, 108, 108, 32, 45, 53, 32, 117, 110, 105, 116, 115, 125, 10, 32, 32, 107, 32, 32, 32, 32, 32, 121, 32, 123, 115, 99, 114, 111, 108, 108, 32, 45, 53, 32, 117, 110, 105, 116, 115, 125, 10, 32, 32, 68, 111, 119, 110, 32, 32, 121, 32, 123, 115, 99, 114, 111, 108, 108, 32, 53, 32, 117, 110, 105, 116, 115, 125, 10, 32, 32, 106, 32, 32, 32, 32, 32, 121, 32, 123, 115, 99, 114, 111, 108, 108, 32, 53, 32, 117, 110, 105, 116, 115, 125, 10, 32, 32, 76, 101, 102, 116, 32, 32, 120, 32, 123, 115, 99, 114, 111, 108, 108, 32, 45, 53, 32, 117, 110, 105, 116, 115, 125, 10, 32, 32, 104, 32, 32, 32, 32, 32, 120, 32, 123, 115, 99, 114, 111, 108, 108, 32, 45, 53, 32, 117, 110, 105, 116, 115, 125, 10, 32, 32, 82, 105, 103, 104, 116, 32, 120, 32, 123, 115, 99, 114, 111, 108, 108, 32, 53, 32, 117, 110, 105, 116, 115, 125, 10, 32, 32, 108, 32, 32, 32, 32, 32, 120, 32, 123, 115, 99, 114, 111, 108, 108, 32, 53, 32, 117, 110, 105, 116, 115, 125, 10, 32, 32, 80, 114, 105, 111, 114, 32, 121, 32, 123, 115, 99, 114, 111, 108, 108, 32, 45, 49, 32, 112, 97, 103, 101, 125, 10, 32, 32, 98, 32, 32, 32, 32, 32, 121, 32, 123, 115, 99, 114, 111, 108, 108, 32, 45, 49, 32, 112, 97, 103, 101, 125, 10, 32, 32, 78, 101, 120, 116, 32, 32, 121, 32, 123, 115, 99, 114, 111, 108, 108, 32, 49, 32, 112, 97, 103, 101, 125, 10, 32, 32, 115, 112, 97, 99, 101, 32, 121, 32, 123, 115, 99, 114, 111, 108, 108, 32, 49, 32, 112, 97, 103, 101, 125, 10, 32, 32, 72, 111, 109, 101, 32, 32, 121, 32, 123, 109, 111, 118, 101, 116, 111, 32, 48, 125, 10, 32, 32, 103, 32, 32, 32, 32, 32, 121, 32, 123, 109, 111, 118, 101, 116, 111, 32, 48, 125, 10, 32, 32, 69, 110, 100, 32, 32, 32, 121, 32, 123, 109, 111, 118, 101, 116, 111, 32, 49, 125, 10, 125, 32, 123, 10, 32, 32, 98, 105, 110, 100, 32, 46, 32, 60, 36, 107, 101, 121, 62, 32, 34, 115, 99, 114, 111, 108, 108, 45, 36, 97, 120, 105, 115, 32, 36, 97, 114, 103, 115, 59, 32, 98, 114, 101, 97, 107, 34, 10, 32, 32, 98, 105, 110, 100, 32, 46, 32, 60, 83, 104, 105, 102, 116, 45, 36, 107, 101, 121, 62, 32, 99, 111, 110, 116, 105, 110, 117, 101, 10, 125, 10, 10, 102, 114, 97, 109, 101, 32, 46, 98, 98, 10, 58, 58, 116, 116, 107, 58, 58, 109, 101, 110, 117, 98, 117, 116, 116, 111, 110, 32, 46, 98, 98, 46, 102, 105, 108, 101, 115, 32, 45, 116, 101, 120, 116, 32, 34, 70, 105, 108, 101, 115, 34, 10, 105, 102, 32, 123, 91, 116, 107, 32, 119, 105, 110, 100, 111, 119, 105, 110, 103, 115, 121, 115, 116, 101, 109, 93, 32, 101, 113, 32, 34, 119, 105, 110, 51, 50, 34, 125, 32, 123, 10, 32, 32, 58, 58, 116, 116, 107, 58, 58, 115, 116, 121, 108, 101, 32, 116, 104, 101, 109, 101, 32, 117, 115, 101, 32, 119, 105, 110, 110, 97, 116, 105, 118, 101, 10, 32, 32, 46, 98, 98, 46, 102, 105, 108, 101, 115, 32, 99, 111, 110, 102, 105, 103, 117, 114, 101, 32, 45, 112, 97, 100, 100, 105, 110, 103, 32, 123, 50, 48, 32, 49, 32, 49, 48, 32, 50, 125, 10, 125, 10, 116, 111, 112, 108, 101, 118, 101, 108, 32, 46, 119, 102, 105, 108, 101, 115, 10, 119, 109, 32, 119, 105, 116, 104, 100, 114, 97, 119, 32, 46, 119, 102, 105, 108, 101, 115, 10, 117, 112, 100, 97, 116, 101, 32, 105, 100, 108, 101, 116, 97, 115, 107, 115, 10, 119, 109, 32, 116, 114, 97, 110, 115, 105, 101, 110, 116, 32, 46, 119, 102, 105, 108, 101, 115, 32, 46, 10, 119, 109, 32, 111, 118, 101, 114, 114, 105, 100, 101, 114, 101, 100, 105, 114, 101, 99, 116, 32, 46, 119, 102, 105, 108, 101, 115, 32, 49, 10, 108, 105, 115, 116, 98, 111, 120, 32, 46, 119, 102, 105, 108, 101, 115, 46, 108, 98, 32, 45, 119, 105, 100, 116, 104, 32, 48, 32, 45, 104, 101, 105, 103, 104, 116, 32, 36, 67, 70, 71, 40, 76, 66, 95, 72, 69, 73, 71, 72, 84, 41, 32, 45, 97, 99, 116, 105, 118, 101, 115, 116, 121, 108, 101, 32, 110, 111, 110, 101, 32, 92, 10, 32, 32, 45, 121, 115, 99, 114, 111, 108, 108, 32, 123, 46, 119, 102, 105, 108, 101, 115, 46, 115, 98, 32, 115, 101, 116, 125, 10, 58, 58, 116, 116, 107, 58, 58, 115, 99, 114, 111, 108, 108, 98, 97, 114, 32, 46, 119, 102, 105, 108, 101, 115, 46, 115, 98, 32, 45, 99, 111, 109, 109, 97, 110, 100, 32, 123, 46, 119, 102, 105, 108, 101, 115, 46, 108, 98, 32, 121, 118, 105, 101, 119, 125, 10, 103, 114, 105, 100, 32, 46, 119, 102, 105, 108, 101, 115, 46, 108, 98, 32, 46, 119, 102, 105, 108, 101, 115, 46, 115, 98, 32, 45, 115, 116, 105, 99, 107, 121, 32, 110, 115, 10, 98, 105, 110, 100, 32, 46, 98, 98, 46, 102, 105, 108, 101, 115, 32, 60, 49, 62, 32, 123, 10, 32, 32, 115, 101, 116, 32, 120, 32, 91, 119, 105, 110, 102, 111, 32, 114, 111, 111, 116, 120, 32, 37, 87, 93, 10, 32, 32, 115, 101, 116, 32, 121, 32, 91, 101, 120, 112, 114, 32, 123, 91, 119, 105, 110, 102, 111, 32, 114, 111, 111, 116, 121, 32, 37, 87, 93, 43, 91, 119, 105, 110, 102, 111, 32, 104, 101, 105, 103, 104, 116, 32, 37, 87, 93, 125, 93, 10, 32, 32, 119, 109, 32, 103, 101, 111, 109, 101, 116, 114, 121, 32, 46, 119, 102, 105, 108, 101, 115, 32, 43, 36, 120, 43, 36, 121, 10, 32, 32, 119, 109, 32, 100, 101, 105, 99, 111, 110, 105, 102, 121, 32, 46, 119, 102, 105, 108, 101, 115, 10, 32, 32, 102, 111, 99, 117, 115, 32, 46, 119, 102, 105, 108, 101, 115, 46, 108, 98, 10, 125, 10, 98, 105, 110, 100, 32, 46, 119, 102, 105, 108, 101, 115, 32, 60, 70, 111, 99, 117, 115, 79, 117, 116, 62, 32, 123, 119, 109, 32, 119, 105, 116, 104, 100, 114, 97, 119, 32, 46, 119, 102, 105, 108, 101, 115, 125, 10, 98, 105, 110, 100, 32, 46, 119, 102, 105, 108, 101, 115, 32, 60, 69, 115, 99, 97, 112, 101, 62, 32, 123, 102, 111, 99, 117, 115, 32, 46, 125, 10, 102, 111, 114, 101, 97, 99, 104, 32, 101, 118, 116, 32, 123, 49, 32, 82, 101, 116, 117, 114, 110, 125, 32, 123, 10, 32, 32, 98, 105, 110, 100, 32, 46, 119, 102, 105, 108, 101, 115, 46, 108, 98, 32, 60, 36, 101, 118, 116, 62, 32, 123, 10, 32, 32, 32, 32, 99, 97, 116, 99, 104, 32, 123, 10, 32, 32, 32, 32, 32, 32, 115, 101, 116, 32, 105, 100, 120, 32, 91, 108, 105, 110, 100, 101, 120, 32, 91, 46, 116, 120, 116, 65, 32, 116, 97, 103, 32, 114, 97, 110, 103, 101, 115, 32, 102, 110, 93, 32, 91, 101, 120, 112, 114, 32, 123, 91, 37, 87, 32, 99, 117, 114, 115, 101, 108, 101, 99, 116, 105, 111, 110, 93, 42, 50, 125, 93, 93, 10, 32, 32, 32, 32, 32, 32, 118, 105, 101, 119, 68, 105, 102, 102, 32, 36, 105, 100, 120, 10, 32, 32, 32, 32, 125, 10, 32, 32, 32, 32, 102, 111, 99, 117, 115, 32, 46, 10, 32, 32, 32, 32, 98, 114, 101, 97, 107, 10, 32, 32, 125, 10, 125, 10, 98, 105, 110, 100, 32, 46, 119, 102, 105, 108, 101, 115, 46, 108, 98, 32, 60, 77, 111, 116, 105, 111, 110, 62, 32, 123, 10, 32, 32, 37, 87, 32, 115, 101, 108, 101, 99, 116, 105, 111, 110, 32, 99, 108, 101, 97, 114, 32, 48, 32, 101, 110, 100, 10, 32, 32, 37, 87, 32, 115, 101, 108, 101, 99, 116, 105, 111, 110, 32, 115, 101, 116, 32, 64, 37, 120, 44, 37, 121, 10, 125, 10, 10, 102, 111, 114, 101, 97, 99, 104, 32, 123, 115, 105, 100, 101, 32, 115, 121, 110, 99, 67, 111, 108, 125, 32, 123, 65, 32, 46, 116, 120, 116, 66, 32, 66, 32, 46, 116, 120, 116, 65, 125, 32, 123, 10, 32, 32, 115, 101, 116, 32, 108, 110, 32, 46, 108, 110, 36, 115, 105, 100, 101, 10, 32, 32, 116, 101, 120, 116, 32, 36, 108, 110, 10, 32, 32, 36, 108, 110, 32, 116, 97, 103, 32, 99, 111, 110, 102, 105, 103, 32, 45, 32, 45, 106, 117, 115, 116, 105, 102, 121, 32, 114, 105, 103, 104, 116, 10, 10, 32, 32, 115, 101, 116, 32, 116, 120, 116, 32, 46, 116, 120, 116, 36, 115, 105, 100, 101, 10, 32, 32, 116, 101, 120, 116, 32, 36, 116, 120, 116, 32, 45, 119, 105, 100, 116, 104, 32, 36, 67, 70, 71, 40, 87, 73, 68, 84, 72, 41, 32, 45, 104, 101, 105, 103, 104, 116, 32, 36, 67, 70, 71, 40, 72, 69, 73, 71, 72, 84, 41, 32, 45, 119, 114, 97, 112, 32, 110, 111, 110, 101, 32, 92, 10, 32, 32, 32, 32, 45, 120, 115, 99, 114, 111, 108, 108, 32, 34, 115, 121, 110, 99, 45, 120, 32, 36, 115, 121, 110, 99, 67, 111, 108, 34, 10, 32, 32, 99, 97, 116, 99, 104, 32, 123, 36, 116, 120, 116, 32, 99, 111, 110, 102, 105, 103, 32, 45, 116, 97, 98, 115, 116, 121, 108, 101, 32, 119, 111, 114, 100, 112, 114, 111, 99, 101, 115, 115, 111, 114, 125, 32, 59, 35, 32, 82, 101, 113, 117, 105, 114, 101, 100, 32, 102, 111, 114, 32, 84, 107, 62, 61, 56, 46, 53, 10, 32, 32, 102, 111, 114, 101, 97, 99, 104, 32, 116, 97, 103, 32, 123, 97, 100, 100, 32, 114, 109, 32, 99, 104, 110, 103, 125, 32, 123, 10, 32, 32, 32, 32, 36, 116, 120, 116, 32, 116, 97, 103, 32, 99, 111, 110, 102, 105, 103, 32, 36, 116, 97, 103, 32, 45, 98, 97, 99, 107, 103, 114, 111, 117, 110, 100, 32, 36, 67, 70, 71, 40, 91, 115, 116, 114, 105, 110, 103, 32, 116, 111, 117, 112, 112, 101, 114, 32, 36, 116, 97, 103, 93, 95, 66, 71, 41, 10, 32, 32, 32, 32, 36, 116, 120, 116, 32, 116, 97, 103, 32, 108, 111, 119, 101, 114, 32, 36, 116, 97, 103, 10, 32, 32, 125, 10, 32, 32, 36, 116, 120, 116, 32, 116, 97, 103, 32, 99, 111, 110, 102, 105, 103, 32, 102, 110, 32, 45, 98, 97, 99, 107, 103, 114, 111, 117, 110, 100, 32, 36, 67, 70, 71, 40, 70, 78, 95, 66, 71, 41, 32, 45, 102, 111, 114, 101, 103, 114, 111, 117, 110, 100, 32, 36, 67, 70, 71, 40, 70, 78, 95, 70, 71, 41, 32, 92, 10, 32, 32, 32, 32, 45, 106, 117, 115, 116, 105, 102, 121, 32, 99, 101, 110, 116, 101, 114, 10, 32, 32, 36, 116, 120, 116, 32, 116, 97, 103, 32, 99, 111, 110, 102, 105, 103, 32, 101, 114, 114, 32, 45, 102, 111, 114, 101, 103, 114, 111, 117, 110, 100, 32, 36, 67, 70, 71, 40, 69, 82, 82, 95, 70, 71, 41, 10, 125, 10, 116, 101, 120, 116, 32, 46, 109, 107, 114, 10, 10, 102, 111, 114, 101, 97, 99, 104, 32, 99, 32, 91, 99, 111, 108, 115, 93, 32, 123, 10, 32, 32, 115, 101, 116, 32, 107, 101, 121, 80, 114, 101, 102, 105, 120, 32, 91, 115, 116, 114, 105, 110, 103, 32, 116, 111, 117, 112, 112, 101, 114, 32, 91, 99, 111, 108, 84, 121, 112, 101, 32, 36, 99, 93, 93, 95, 67, 79, 76, 95, 10, 32, 32, 105, 102, 32, 123, 91, 116, 107, 32, 119, 105, 110, 100, 111, 119, 105, 110, 103, 115, 121, 115, 116, 101, 109, 93, 32, 101, 113, 32, 34, 119, 105, 110, 51, 50, 34, 125, 32, 123, 36, 99, 32, 99, 111, 110, 102, 105, 103, 32, 45, 102, 111, 110, 116, 32, 123, 99, 111, 117, 114, 105, 101, 114, 32, 57, 125, 125, 10, 32, 32, 36, 99, 32, 99, 111, 110, 102, 105, 103, 32, 45, 98, 103, 32, 36, 67, 70, 71, 40, 36, 123, 107, 101, 121, 80, 114, 101, 102, 105, 120, 125, 66, 71, 41, 32, 45, 102, 103, 32, 36, 67, 70, 71, 40, 36, 123, 107, 101, 121, 80, 114, 101, 102, 105, 120, 125, 70, 71, 41, 32, 45, 98, 111, 114, 100, 101, 114, 119, 105, 100, 116, 104, 32, 48, 32, 92, 10, 32, 32, 32, 32, 45, 112, 97, 100, 120, 32, 36, 67, 70, 71, 40, 80, 65, 68, 88, 41, 32, 45, 121, 115, 99, 114, 111, 108, 108, 32, 115, 121, 110, 99, 45, 121, 10, 32, 32, 36, 99, 32, 116, 97, 103, 32, 99, 111, 110, 102, 105, 103, 32, 104, 114, 108, 110, 32, 45, 115, 112, 97, 99, 105, 110, 103, 49, 32, 36, 67, 70, 71, 40, 72, 82, 95, 80, 65, 68, 95, 84, 79, 80, 41, 32, 45, 115, 112, 97, 99, 105, 110, 103, 51, 32, 36, 67, 70, 71, 40, 72, 82, 95, 80, 65, 68, 95, 66, 84, 77, 41, 32, 92, 10, 32, 32, 32, 32, 32, 45, 102, 111, 114, 101, 103, 114, 111, 117, 110, 100, 32, 36, 67, 70, 71, 40, 72, 82, 95, 70, 71, 41, 32, 45, 106, 117, 115, 116, 105, 102, 121, 32, 114, 105, 103, 104, 116, 10, 32, 32, 36, 99, 32, 116, 97, 103, 32, 99, 111, 110, 102, 105, 103, 32, 104, 114, 116, 120, 116, 32, 32, 45, 115, 112, 97, 99, 105, 110, 103, 49, 32, 36, 67, 70, 71, 40, 72, 82, 95, 80, 65, 68, 95, 84, 79, 80, 41, 32, 45, 115, 112, 97, 99, 105, 110, 103, 51, 32, 36, 67, 70, 71, 40, 72, 82, 95, 80, 65, 68, 95, 66, 84, 77, 41, 32, 92, 10, 32, 32, 32, 32, 32, 45, 102, 111, 114, 101, 103, 114, 111, 117, 110, 100, 32, 36, 67, 70, 71, 40, 72, 82, 95, 70, 71, 41, 32, 45, 106, 117, 115, 116, 105, 102, 121, 32, 99, 101, 110, 116, 101, 114, 10, 32, 32, 36, 99, 32, 116, 97, 103, 32, 99, 111, 110, 102, 105, 103, 32, 102, 110, 32, 45, 115, 112, 97, 99, 105, 110, 103, 49, 32, 36, 67, 70, 71, 40, 70, 78, 95, 80, 65, 68, 41, 32, 45, 115, 112, 97, 99, 105, 110, 103, 51, 32, 36, 67, 70, 71, 40, 70, 78, 95, 80, 65, 68, 41, 10, 32, 32, 98, 105, 110, 100, 116, 97, 103, 115, 32, 36, 99, 32, 34, 46, 32, 36, 99, 32, 84, 101, 120, 116, 32, 97, 108, 108, 34, 10, 32, 32, 98, 105, 110, 100, 32, 36, 99, 32, 60, 49, 62, 32, 123, 102, 111, 99, 117, 115, 32, 37, 87, 125, 10, 125, 10, 10, 58, 58, 116, 116, 107, 58, 58, 115, 99, 114, 111, 108, 108, 98, 97, 114, 32, 46, 115, 98, 121, 32, 45, 99, 111, 109, 109, 97, 110, 100, 32, 123, 46, 116, 120, 116, 65, 32, 121, 118, 105, 101, 119, 125, 32, 45, 111, 114, 105, 101, 110, 116, 32, 118, 101, 114, 116, 105, 99, 97, 108, 10, 58, 58, 116, 116, 107, 58, 58, 115, 99, 114, 111, 108, 108, 98, 97, 114, 32, 46, 115, 98, 120, 65, 32, 45, 99, 111, 109, 109, 97, 110, 100, 32, 123, 46, 116, 120, 116, 65, 32, 120, 118, 105, 101, 119, 125, 32, 45, 111, 114, 105, 101, 110, 116, 32, 104, 111, 114, 105, 122, 111, 110, 116, 97, 108, 10, 58, 58, 116, 116, 107, 58, 58, 115, 99, 114, 111, 108, 108, 98, 97, 114, 32, 46, 115, 98, 120, 66, 32, 45, 99, 111, 109, 109, 97, 110, 100, 32, 123, 46, 116, 120, 116, 66, 32, 120, 118, 105, 101, 119, 125, 32, 45, 111, 114, 105, 101, 110, 116, 32, 104, 111, 114, 105, 122, 111, 110, 116, 97, 108, 10, 102, 114, 97, 109, 101, 32, 46, 115, 112, 97, 99, 101, 114, 10, 10, 105, 102, 32, 123, 91, 114, 101, 97, 100, 68, 105, 102, 102, 115, 32, 36, 102, 111, 115, 115, 105, 108, 99, 109, 100, 93, 32, 61, 61, 32, 48, 125, 32, 123, 10, 32, 32, 116, 107, 95, 109, 101, 115, 115, 97, 103, 101, 66, 111, 120, 32, 45, 116, 121, 112, 101, 32, 111, 107, 32, 45, 116, 105, 116, 108, 101, 32, 36, 67, 70, 71, 40, 84, 73, 84, 76, 69, 41, 32, 45, 109, 101, 115, 115, 97, 103, 101, 32, 34, 78, 111, 32, 99, 104, 97, 110, 103, 101, 115, 34, 10, 32, 32, 101, 120, 105, 116, 10, 125, 10, 117, 112, 100, 97, 116, 101, 32, 105, 100, 108, 101, 116, 97, 115, 107, 115, 10, 10, 112, 114, 111, 99, 32, 115, 97, 118, 101, 68, 105, 102, 102, 32, 123, 125, 32, 123, 10, 32, 32, 115, 101, 116, 32, 102, 110, 32, 91, 116, 107, 95, 103, 101, 116, 83, 97, 118, 101, 70, 105, 108, 101, 93, 10, 32, 32, 105, 102, 32, 123, 36, 102, 110, 61, 61, 34, 34, 125, 32, 114, 101, 116, 117, 114, 110, 10, 32, 32, 115, 101, 116, 32, 111, 117, 116, 32, 91, 111, 112, 101, 110, 32, 36, 102, 110, 32, 119, 98, 93, 10, 32, 32, 112, 117, 116, 115, 32, 36, 111, 117, 116, 32, 34, 35, 33, 47, 117, 115, 114, 47, 98, 105, 110, 47, 116, 99, 108, 115, 104, 92, 110, 35, 92, 110, 35, 32, 82, 117, 110, 32, 116, 104, 105, 115, 32, 115, 99, 114, 105, 112, 116, 32, 117, 115, 105, 110, 103, 32, 39, 116, 99, 108, 115, 104, 39, 32, 111, 114, 32, 39, 119, 105, 115, 104, 39, 34, 10, 32, 32, 112, 117, 116, 115, 32, 36, 111, 117, 116, 32, 34, 35, 32, 116, 111, 32, 115, 101, 101, 32, 116, 104, 101, 32, 103, 114, 97, 112, 104, 105, 99, 97, 108, 32, 100, 105, 102, 102, 46, 92, 110, 35, 34, 10, 32, 32, 112, 117, 116, 115, 32, 36, 111, 117, 116, 32, 34, 115, 101, 116, 32, 102, 111, 115, 115, 105, 108, 99, 109, 100, 32, 123, 125, 34, 10, 32, 32, 112, 117, 116, 115, 32, 36, 111, 117, 116, 32, 34, 115, 101, 116, 32, 112, 114, 111, 103, 32, 91, 108, 105, 115, 116, 32, 36, 58, 58, 112, 114, 111, 103, 93, 34, 10, 32, 32, 112, 117, 116, 115, 32, 36, 111, 117, 116, 32, 34, 115, 101, 116, 32, 100, 105, 102, 102, 116, 120, 116, 32, 92, 49, 55, 51, 34, 10, 32, 32, 102, 111, 114, 101, 97, 99, 104, 32, 101, 32, 36, 58, 58, 100, 105, 102, 102, 116, 120, 116, 32, 123, 112, 117, 116, 115, 32, 36, 111, 117, 116, 32, 91, 108, 105, 115, 116, 32, 36, 101, 93, 125, 10, 32, 32, 112, 117, 116, 115, 32, 36, 111, 117, 116, 32, 34, 92, 49, 55, 53, 34, 10, 32, 32, 112, 117, 116, 115, 32, 36, 111, 117, 116, 32, 34, 101, 118, 97, 108, 32, 92, 36, 112, 114, 111, 103, 34, 10, 32, 32, 99, 108, 111, 115, 101, 32, 36, 111, 117, 116, 10, 125, 10, 112, 114, 111, 99, 32, 105, 110, 118, 101, 114, 116, 68, 105, 102, 102, 32, 123, 125, 32, 123, 10, 32, 32, 103, 108, 111, 98, 97, 108, 32, 67, 70, 71, 10, 32, 32, 97, 114, 114, 97, 121, 32, 115, 101, 116, 32, 120, 32, 91, 103, 114, 105, 100, 32, 105, 110, 102, 111, 32, 46, 116, 120, 116, 65, 93, 10, 32, 32, 105, 102, 32, 123, 36, 120, 40, 45, 99, 111, 108, 117, 109, 110, 41, 61, 61, 49, 125, 32, 123, 10, 32, 32, 32, 32, 103, 114, 105, 100, 32, 99, 111, 110, 102, 105, 103, 32, 46, 108, 110, 66, 32, 45, 99, 111, 108, 117, 109, 110, 32, 48, 10, 32, 32, 32, 32, 103, 114, 105, 100, 32, 99, 111, 110, 102, 105, 103, 32, 46, 116, 120, 116, 66, 32, 45, 99, 111, 108, 117, 109, 110, 32, 49, 10, 32, 32, 32, 32, 46, 116, 120, 116, 66, 32, 116, 97, 103, 32, 99, 111, 110, 102, 105, 103, 32, 97, 100, 100, 32, 45, 98, 97, 99, 107, 103, 114, 111, 117, 110, 100, 32, 36, 67, 70, 71, 40, 82, 77, 95, 66, 71, 41, 10, 32, 32, 32, 32, 103, 114, 105, 100, 32, 99, 111, 110, 102, 105, 103, 32, 46, 108, 110, 65, 32, 45, 99, 111, 108, 117, 109, 110, 32, 51, 10, 32, 32, 32, 32, 103, 114, 105, 100, 32, 99, 111, 110, 102, 105, 103, 32, 46, 116, 120, 116, 65, 32, 45, 99, 111, 108, 117, 109, 110, 32, 52, 10, 32, 32, 32, 32, 46, 116, 120, 116, 65, 32, 116, 97, 103, 32, 99, 111, 110, 102, 105, 103, 32, 114, 109, 32, 45, 98, 97, 99, 107, 103, 114, 111, 117, 110, 100, 32, 36, 67, 70, 71, 40, 65, 68, 68, 95, 66, 71, 41, 10, 32, 32, 32, 32, 46, 98, 98, 46, 105, 110, 118, 101, 114, 116, 32, 99, 111, 110, 102, 105, 103, 32, 45, 116, 101, 120, 116, 32, 85, 110, 105, 110, 118, 101, 114, 116, 10, 32, 32, 125, 32, 101, 108, 115, 101, 32, 123, 10, 32, 32, 32, 32, 103, 114, 105, 100, 32, 99, 111, 110, 102, 105, 103, 32, 46, 108, 110, 65, 32, 45, 99, 111, 108, 117, 109, 110, 32, 48, 10, 32, 32, 32, 32, 103, 114, 105, 100, 32, 99, 111, 110, 102, 105, 103, 32, 46, 116, 120, 116, 65, 32, 45, 99, 111, 108, 117, 109, 110, 32, 49, 10, 32, 32, 32, 32, 46, 116, 120, 116, 65, 32, 116, 97, 103, 32, 99, 111, 110, 102, 105, 103, 32, 114, 109, 32, 45, 98, 97, 99, 107, 103, 114, 111, 117, 110, 100, 32, 36, 67, 70, 71, 40, 82, 77, 95, 66, 71, 41, 10, 32, 32, 32, 32, 103, 114, 105, 100, 32, 99, 111, 110, 102, 105, 103, 32, 46, 108, 110, 66, 32, 45, 99, 111, 108, 117, 109, 110, 32, 51, 10, 32, 32, 32, 32, 103, 114, 105, 100, 32, 99, 111, 110, 102, 105, 103, 32, 46, 116, 120, 116, 66, 32, 45, 99, 111, 108, 117, 109, 110, 32, 52, 10, 32, 32, 32, 32, 46, 116, 120, 116, 66, 32, 116, 97, 103, 32, 99, 111, 110, 102, 105, 103, 32, 97, 100, 100, 32, 45, 98, 97, 99, 107, 103, 114, 111, 117, 110, 100, 32, 36, 67, 70, 71, 40, 65, 68, 68, 95, 66, 71, 41, 10, 32, 32, 32, 32, 46, 98, 98, 46, 105, 110, 118, 101, 114, 116, 32, 99, 111, 110, 102, 105, 103, 32, 45, 116, 101, 120, 116, 32, 73, 110, 118, 101, 114, 116, 10, 32, 32, 125, 10, 32, 32, 46, 109, 107, 114, 32, 99, 111, 110, 102, 105, 103, 32, 45, 115, 116, 97, 116, 101, 32, 110, 111, 114, 109, 97, 108, 10, 32, 32, 115, 101, 116, 32, 99, 108, 116, 32, 91, 46, 109, 107, 114, 32, 115, 101, 97, 114, 99, 104, 32, 45, 97, 108, 108, 32, 60, 32, 49, 46, 48, 32, 101, 110, 100, 93, 10, 32, 32, 115, 101, 116, 32, 99, 103, 116, 32, 91, 46, 109, 107, 114, 32, 115, 101, 97, 114, 99, 104, 32, 45, 97, 108, 108, 32, 62, 32, 49, 46, 48, 32, 101, 110, 100, 93, 10, 32, 32, 102, 111, 114, 101, 97, 99, 104, 32, 99, 32, 36, 99, 108, 116, 32, 123, 46, 109, 107, 114, 32, 114, 101, 112, 108, 97, 99, 101, 32, 36, 99, 32, 34, 36, 99, 32, 43, 49, 32, 99, 104, 97, 114, 115, 34, 32, 62, 125, 10, 32, 32, 102, 111, 114, 101, 97, 99, 104, 32, 99, 32, 36, 99, 103, 116, 32, 123, 46, 109, 107, 114, 32, 114, 101, 112, 108, 97, 99, 101, 32, 36, 99, 32, 34, 36, 99, 32, 43, 49, 32, 99, 104, 97, 114, 115, 34, 32, 60, 125, 10, 32, 32, 46, 109, 107, 114, 32, 99, 111, 110, 102, 105, 103, 32, 45, 115, 116, 97, 116, 101, 32, 100, 105, 115, 97, 98, 108, 101, 100, 10, 125, 10, 112, 114, 111, 99, 32, 115, 101, 97, 114, 99, 104, 79, 110, 79, 102, 102, 32, 123, 125, 32, 123, 10, 32, 32, 105, 102, 32, 123, 91, 105, 110, 102, 111, 32, 101, 120, 105, 115, 116, 115, 32, 58, 58, 115, 101, 97, 114, 99, 104, 93, 125, 32, 123, 10, 32, 32, 32, 32, 117, 110, 115, 101, 116, 32, 58, 58, 115, 101, 97, 114, 99, 104, 10, 32, 32, 32, 32, 46, 116, 120, 116, 65, 32, 116, 97, 103, 32, 114, 101, 109, 111, 118, 101, 32, 115, 101, 97, 114, 99, 104, 32, 49, 46, 48, 32, 101, 110, 100, 10, 32, 32, 32, 32, 46, 116, 120, 116, 66, 32, 116, 97, 103, 32, 114, 101, 109, 111, 118, 101, 32, 115, 101, 97, 114, 99, 104, 32, 49, 46, 48, 32, 101, 110, 100, 10, 32, 32, 32, 32, 112, 97, 99, 107, 32, 102, 111, 114, 103, 101, 116, 32, 46, 98, 98, 46, 115, 102, 114, 97, 109, 101, 10, 32, 32, 32, 32, 102, 111, 99, 117, 115, 32, 46, 10, 32, 32, 125, 32, 101, 108, 115, 101, 32, 123, 10, 32, 32, 32, 32, 115, 101, 116, 32, 58, 58, 115, 101, 97, 114, 99, 104, 32, 46, 116, 120, 116, 65, 10, 32, 32, 32, 32, 105, 102, 32, 123, 33, 91, 119, 105, 110, 102, 111, 32, 101, 120, 105, 115, 116, 115, 32, 46, 98, 98, 46, 115, 102, 114, 97, 109, 101, 93, 125, 32, 123, 10, 32, 32, 32, 32, 32, 32, 102, 114, 97, 109, 101, 32, 46, 98, 98, 46, 115, 102, 114, 97, 109, 101, 10, 32, 32, 32, 32, 32, 32, 58, 58, 116, 116, 107, 58, 58, 101, 110, 116, 114, 121, 32, 46, 98, 98, 46, 115, 102, 114, 97, 109, 101, 46, 101, 32, 45, 119, 105, 100, 116, 104, 32, 49, 48, 10, 32, 32, 32, 32, 32, 32, 112, 97, 99, 107, 32, 46, 98, 98, 46, 115, 102, 114, 97, 109, 101, 46, 101, 32, 45, 115, 105, 100, 101, 32, 108, 101, 102, 116, 32, 45, 102, 105, 108, 108, 32, 121, 32, 45, 101, 120, 112, 97, 110, 100, 32, 49, 10, 32, 32, 32, 32, 32, 32, 98, 105, 110, 100, 32, 46, 98, 98, 46, 115, 102, 114, 97, 109, 101, 46, 101, 32, 60, 82, 101, 116, 117, 114, 110, 62, 32, 123, 115, 101, 97, 114, 99, 104, 78, 101, 120, 116, 59, 32, 98, 114, 101, 97, 107, 125, 10, 32, 32, 32, 32, 32, 32, 58, 58, 116, 116, 107, 58, 58, 98, 117, 116, 116, 111, 110, 32, 46, 98, 98, 46, 115, 102, 114, 97, 109, 101, 46, 110, 120, 32, 45, 116, 101, 120, 116, 32, 92, 117, 50, 49, 57, 51, 32, 45, 119, 105, 100, 116, 104, 32, 49, 32, 45, 99, 111, 109, 109, 97, 110, 100, 32, 115, 101, 97, 114, 99, 104, 78, 101, 120, 116, 10, 32, 32, 32, 32, 32, 32, 58, 58, 116, 116, 107, 58, 58, 98, 117, 116, 116, 111, 110, 32, 46, 98, 98, 46, 115, 102, 114, 97, 109, 101, 46, 112, 118, 32, 45, 116, 101, 120, 116, 32, 92, 117, 50, 49, 57, 49, 32, 45, 119, 105, 100, 116, 104, 32, 49, 32, 45, 99, 111, 109, 109, 97, 110, 100, 32, 115, 101, 97, 114, 99, 104, 80, 114, 101, 118, 10, 32, 32, 32, 32, 32, 32, 116, 107, 95, 111, 112, 116, 105, 111, 110, 77, 101, 110, 117, 32, 46, 98, 98, 46, 115, 102, 114, 97, 109, 101, 46, 116, 121, 112, 32, 58, 58, 115, 101, 97, 114, 99, 104, 95, 116, 121, 112, 101, 32, 92, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 69, 120, 97, 99, 116, 32, 123, 78, 111, 32, 67, 97, 115, 101, 125, 32, 123, 82, 101, 103, 69, 120, 112, 125, 32, 123, 87, 104, 111, 108, 101, 32, 87, 111, 114, 100, 125, 10, 32, 32, 32, 32, 32, 32, 46, 98, 98, 46, 115, 102, 114, 97, 109, 101, 46, 116, 121, 112, 32, 99, 111, 110, 102, 105, 103, 32, 45, 119, 105, 100, 116, 104, 32, 49, 48, 10, 32, 32, 32, 32, 32, 32, 115, 101, 116, 32, 58, 58, 115, 101, 97, 114, 99, 104, 95, 116, 121, 112, 101, 32, 69, 120, 97, 99, 116, 10, 32, 32, 32, 32, 32, 32, 112, 97, 99, 107, 32, 46, 98, 98, 46, 115, 102, 114, 97, 109, 101, 46, 110, 120, 32, 46, 98, 98, 46, 115, 102, 114, 97, 109, 101, 46, 112, 118, 32, 46, 98, 98, 46, 115, 102, 114, 97, 109, 101, 46, 116, 121, 112, 32, 45, 115, 105, 100, 101, 32, 108, 101, 102, 116, 10, 32, 32, 32, 32, 125, 10, 32, 32, 32, 32, 112, 97, 99, 107, 32, 46, 98, 98, 46, 115, 102, 114, 97, 109, 101, 32, 45, 115, 105, 100, 101, 32, 108, 101, 102, 116, 10, 32, 32, 32, 32, 97, 102, 116, 101, 114, 32, 105, 100, 108, 101, 32, 123, 102, 111, 99, 117, 115, 32, 46, 98, 98, 46, 115, 102, 114, 97, 109, 101, 46, 101, 125, 10, 32, 32, 125, 10, 125, 10, 112, 114, 111, 99, 32, 115, 101, 97, 114, 99, 104, 78, 101, 120, 116, 32, 123, 125, 32, 123, 115, 101, 97, 114, 99, 104, 83, 116, 101, 112, 32, 45, 102, 111, 114, 119, 97, 114, 100, 115, 32, 43, 49, 32, 49, 46, 48, 32, 101, 110, 100, 125, 10, 112, 114, 111, 99, 32, 115, 101, 97, 114, 99, 104, 80, 114, 101, 118, 32, 123, 125, 32, 123, 115, 101, 97, 114, 99, 104, 83, 116, 101, 112, 32, 45, 98, 97, 99, 107, 119, 97, 114, 100, 115, 32, 45, 49, 32, 101, 110, 100, 32, 49, 46, 48, 125, 10, 112, 114, 111, 99, 32, 115, 101, 97, 114, 99, 104, 83, 116, 101, 112, 32, 123, 100, 105, 114, 101, 99, 116, 105, 111, 110, 32, 105, 110, 99, 114, 32, 115, 116, 97, 114, 116, 32, 115, 116, 111, 112, 125, 32, 123, 10, 32, 32, 115, 101, 116, 32, 112, 97, 116, 116, 101, 114, 110, 32, 91, 46, 98, 98, 46, 115, 102, 114, 97, 109, 101, 46, 101, 32, 103, 101, 116, 93, 10, 32, 32, 105, 102, 32, 123, 36, 112, 97, 116, 116, 101, 114, 110, 61, 61, 34, 34, 125, 32, 114, 101, 116, 117, 114, 110, 10, 32, 32, 115, 101, 116, 32, 99, 111, 117, 110, 116, 32, 48, 10, 32, 32, 115, 101, 116, 32, 119, 32, 36, 58, 58, 115, 101, 97, 114, 99, 104, 10, 32, 32, 105, 102, 32, 123, 34, 36, 119, 34, 61, 61, 34, 46, 116, 120, 116, 65, 34, 125, 32, 123, 115, 101, 116, 32, 111, 116, 104, 101, 114, 32, 46, 116, 120, 116, 66, 125, 32, 123, 115, 101, 116, 32, 111, 116, 104, 101, 114, 32, 46, 116, 120, 116, 65, 125, 10, 32, 32, 105, 102, 32, 123, 91, 108, 115, 101, 97, 114, 99, 104, 32, 91, 36, 119, 32, 109, 97, 114, 107, 32, 110, 97, 109, 101, 115, 93, 32, 115, 101, 97, 114, 99, 104, 93, 60, 48, 125, 32, 123, 10, 32, 32, 32, 32, 36, 119, 32, 109, 97, 114, 107, 32, 115, 101, 116, 32, 115, 101, 97, 114, 99, 104, 32, 36, 115, 116, 97, 114, 116, 10, 32, 32, 125, 10, 32, 32, 115, 119, 105, 116, 99, 104, 32, 36, 58, 58, 115, 101, 97, 114, 99, 104, 95, 116, 121, 112, 101, 32, 123, 10, 32, 32, 32, 32, 69, 120, 97, 99, 116, 32, 32, 32, 32, 32, 32, 32, 32, 123, 115, 101, 116, 32, 115, 116, 32, 45, 101, 120, 97, 99, 116, 125, 10, 32, 32, 32, 32, 123, 78, 111, 32, 67, 97, 115, 101, 125, 32, 32, 32, 32, 123, 115, 101, 116, 32, 115, 116, 32, 45, 110, 111, 99, 97, 115, 101, 125, 10, 32, 32, 32, 32, 123, 82, 101, 103, 69, 120, 112, 125, 32, 32, 32, 32, 32, 123, 115, 101, 116, 32, 115, 116, 32, 45, 114, 101, 103, 101, 120, 112, 125, 10, 32, 32, 32, 32, 123, 87, 104, 111, 108, 101, 32, 87, 111, 114, 100, 125, 32, 123, 115, 101, 116, 32, 115, 116, 32, 45, 114, 101, 103, 101, 120, 112, 59, 32, 115, 101, 116, 32, 112, 97, 116, 116, 101, 114, 110, 32, 92, 92, 121, 36, 112, 97, 116, 116, 101, 114, 110, 92, 92, 121, 125, 10, 32, 32, 125, 10, 32, 32, 115, 101, 116, 32, 105, 100, 120, 32, 91, 36, 119, 32, 115, 101, 97, 114, 99, 104, 32, 45, 99, 111, 117, 110, 116, 32, 99, 111, 117, 110, 116, 32, 36, 100, 105, 114, 101, 99, 116, 105, 111, 110, 32, 36, 115, 116, 32, 45, 45, 32, 92, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 36, 112, 97, 116, 116, 101, 114, 110, 32, 34, 115, 101, 97, 114, 99, 104, 32, 36, 105, 110, 99, 114, 32, 99, 104, 97, 114, 115, 34, 32, 36, 115, 116, 111, 112, 93, 10, 32, 32, 105, 102, 32, 123, 34, 36, 105, 100, 120, 34, 61, 61, 34, 34, 125, 32, 123, 10, 32, 32, 32, 32, 115, 101, 116, 32, 105, 100, 120, 32, 91, 36, 111, 116, 104, 101, 114, 32, 115, 101, 97, 114, 99, 104, 32, 45, 99, 111, 117, 110, 116, 32, 99, 111, 117, 110, 116, 32, 36, 100, 105, 114, 101, 99, 116, 105, 111, 110, 32, 36, 115, 116, 32, 45, 45, 32, 36, 112, 97, 116, 116, 101, 114, 110, 32, 36, 115, 116, 97, 114, 116, 32, 36, 115, 116, 111, 112, 93, 10, 32, 32, 32, 32, 105, 102, 32, 123, 34, 36, 105, 100, 120, 34, 33, 61, 34, 34, 125, 32, 123, 10, 32, 32, 32, 32, 32, 32, 115, 101, 116, 32, 116, 104, 105, 115, 32, 36, 119, 10, 32, 32, 32, 32, 32, 32, 115, 101, 116, 32, 119, 32, 36, 111, 116, 104, 101, 114, 10, 32, 32, 32, 32, 32, 32, 115, 101, 116, 32, 111, 116, 104, 101, 114, 32, 36, 116, 104, 105, 115, 10, 32, 32, 32, 32, 125, 32, 101, 108, 115, 101, 32, 123, 10, 32, 32, 32, 32, 32, 32, 115, 101, 116, 32, 105, 100, 120, 32, 91, 36, 119, 32, 115, 101, 97, 114, 99, 104, 32, 45, 99, 111, 117, 110, 116, 32, 99, 111, 117, 110, 116, 32, 36, 100, 105, 114, 101, 99, 116, 105, 111, 110, 32, 36, 115, 116, 32, 45, 45, 32, 36, 112, 97, 116, 116, 101, 114, 110, 32, 36, 115, 116, 97, 114, 116, 32, 36, 115, 116, 111, 112, 93, 10, 32, 32, 32, 32, 125, 10, 32, 32, 125, 10, 32, 32, 36, 119, 32, 116, 97, 103, 32, 114, 101, 109, 111, 118, 101, 32, 115, 101, 97, 114, 99, 104, 32, 49, 46, 48, 32, 101, 110, 100, 10, 32, 32, 36, 119, 32, 109, 97, 114, 107, 32, 117, 110, 115, 101, 116, 32, 115, 101, 97, 114, 99, 104, 10, 32, 32, 36, 111, 116, 104, 101, 114, 32, 116, 97, 103, 32, 114, 101, 109, 111, 118, 101, 32, 115, 101, 97, 114, 99, 104, 32, 49, 46, 48, 32, 101, 110, 100, 10, 32, 32, 36, 111, 116, 104, 101, 114, 32, 109, 97, 114, 107, 32, 117, 110, 115, 101, 116, 32, 115, 101, 97, 114, 99, 104, 10, 32, 32, 105, 102, 32, 123, 34, 36, 105, 100, 120, 34, 33, 61, 34, 34, 125, 32, 123, 10, 32, 32, 32, 32, 36, 119, 32, 109, 97, 114, 107, 32, 115, 101, 116, 32, 115, 101, 97, 114, 99, 104, 32, 36, 105, 100, 120, 10, 32, 32, 32, 32, 36, 119, 32, 121, 118, 105, 101, 119, 32, 45, 112, 105, 99, 107, 112, 108, 97, 99, 101, 32, 36, 105, 100, 120, 10, 32, 32, 32, 32, 36, 119, 32, 116, 97, 103, 32, 97, 100, 100, 32, 115, 101, 97, 114, 99, 104, 32, 115, 101, 97, 114, 99, 104, 32, 34, 36, 105, 100, 120, 32, 43, 36, 99, 111, 117, 110, 116, 32, 99, 104, 97, 114, 115, 34, 10, 32, 32, 32, 32, 36, 119, 32, 116, 97, 103, 32, 99, 111, 110, 102, 105, 103, 32, 115, 101, 97, 114, 99, 104, 32, 45, 98, 97, 99, 107, 103, 114, 111, 117, 110, 100, 32, 123, 35, 102, 99, 99, 48, 48, 48, 125, 10, 32, 32, 125, 10, 32, 32, 115, 101, 116, 32, 58, 58, 115, 101, 97, 114, 99, 104, 32, 36, 119, 10, 125, 10, 58, 58, 116, 116, 107, 58, 58, 98, 117, 116, 116, 111, 110, 32, 46, 98, 98, 46, 113, 117, 105, 116, 32, 45, 116, 101, 120, 116, 32, 123, 81, 117, 105, 116, 125, 32, 45, 99, 111, 109, 109, 97, 110, 100, 32, 101, 120, 105, 116, 10, 58, 58, 116, 116, 107, 58, 58, 98, 117, 116, 116, 111, 110, 32, 46, 98, 98, 46, 105, 110, 118, 101, 114, 116, 32, 45, 116, 101, 120, 116, 32, 123, 73, 110, 118, 101, 114, 116, 125, 32, 45, 99, 111, 109, 109, 97, 110, 100, 32, 105, 110, 118, 101, 114, 116, 68, 105, 102, 102, 10, 58, 58, 116, 116, 107, 58, 58, 98, 117, 116, 116, 111, 110, 32, 46, 98, 98, 46, 115, 97, 118, 101, 32, 45, 116, 101, 120, 116, 32, 123, 83, 97, 118, 101, 32, 65, 115, 46, 46, 46, 125, 32, 45, 99, 111, 109, 109, 97, 110, 100, 32, 115, 97, 118, 101, 68, 105, 102, 102, 10, 58, 58, 116, 116, 107, 58, 58, 98, 117, 116, 116, 111, 110, 32, 46, 98, 98, 46, 115, 101, 97, 114, 99, 104, 32, 45, 116, 101, 120, 116, 32, 123, 83, 101, 97, 114, 99, 104, 125, 32, 45, 99, 111, 109, 109, 97, 110, 100, 32, 115, 101, 97, 114, 99, 104, 79, 110, 79, 102, 102, 10, 112, 97, 99, 107, 32, 46, 98, 98, 46, 113, 117, 105, 116, 32, 46, 98, 98, 46, 105, 110, 118, 101, 114, 116, 32, 45, 115, 105, 100, 101, 32, 108, 101, 102, 116, 10, 105, 102, 32, 123, 36, 102, 111, 115, 115, 105, 108, 99, 109, 100, 33, 61, 34, 34, 125, 32, 123, 112, 97, 99, 107, 32, 46, 98, 98, 46, 115, 97, 118, 101, 32, 45, 115, 105, 100, 101, 32, 108, 101, 102, 116, 125, 10, 112, 97, 99, 107, 32, 46, 98, 98, 46, 102, 105, 108, 101, 115, 32, 46, 98, 98, 46, 115, 101, 97, 114, 99, 104, 32, 45, 115, 105, 100, 101, 32, 108, 101, 102, 116, 10, 103, 114, 105, 100, 32, 114, 111, 119, 99, 111, 110, 102, 105, 103, 117, 114, 101, 32, 46, 32, 49, 32, 45, 119, 101, 105, 103, 104, 116, 32, 49, 10, 103, 114, 105, 100, 32, 99, 111, 108, 117, 109, 110, 99, 111, 110, 102, 105, 103, 117, 114, 101, 32, 46, 32, 49, 32, 45, 119, 101, 105, 103, 104, 116, 32, 49, 10, 103, 114, 105, 100, 32, 99, 111, 108, 117, 109, 110, 99, 111, 110, 102, 105, 103, 117, 114, 101, 32, 46, 32, 52, 32, 45, 119, 101, 105, 103, 104, 116, 32, 49, 10, 103, 114, 105, 100, 32, 46, 98, 98, 32, 45, 114, 111, 119, 32, 48, 32, 45, 99, 111, 108, 117, 109, 110, 115, 112, 97, 110, 32, 54, 10, 101, 118, 97, 108, 32, 103, 114, 105, 100, 32, 91, 99, 111, 108, 115, 93, 32, 45, 114, 111, 119, 32, 49, 32, 45, 115, 116, 105, 99, 107, 121, 32, 110, 115, 101, 119, 10, 103, 114, 105, 100, 32, 46, 115, 98, 121, 32, 45, 114, 111, 119, 32, 49, 32, 45, 99, 111, 108, 117, 109, 110, 32, 53, 32, 45, 115, 116, 105, 99, 107, 121, 32, 110, 115, 10, 103, 114, 105, 100, 32, 46, 115, 98, 120, 65, 32, 45, 114, 111, 119, 32, 50, 32, 45, 99, 111, 108, 117, 109, 110, 115, 112, 97, 110, 32, 50, 32, 45, 115, 116, 105, 99, 107, 121, 32, 101, 119, 10, 103, 114, 105, 100, 32, 46, 115, 112, 97, 99, 101, 114, 32, 45, 114, 111, 119, 32, 50, 32, 45, 99, 111, 108, 117, 109, 110, 32, 50, 10, 103, 114, 105, 100, 32, 46, 115, 98, 120, 66, 32, 45, 114, 111, 119, 32, 50, 32, 45, 99, 111, 108, 117, 109, 110, 32, 51, 32, 45, 99, 111, 108, 117, 109, 110, 115, 112, 97, 110, 32, 50, 32, 45, 115, 116, 105, 99, 107, 121, 32, 101, 119, 10, 10, 46, 115, 112, 97, 99, 101, 114, 32, 99, 111, 110, 102, 105, 103, 32, 45, 104, 101, 105, 103, 104, 116, 32, 91, 119, 105, 110, 102, 111, 32, 104, 101, 105, 103, 104, 116, 32, 46, 115, 98, 120, 65, 93, 10, 119, 109, 32, 100, 101, 105, 99, 111, 110, 105, 102, 121, 32, 46, 10, 125, 10, 101, 118, 97, 108, 32, 36, 112, 114, 111, 103, 10, 0}; char const * fsl_difftk_cstr = fsl_difftk_cstr_a; /* end of ./src/difftk.tcl */ /* end of file ./src/difftk_cstr.c */ /* start of file ./src/schema_config_cstr.c */ /** @page page_schema_config_cstr config.sql Binary form of file ./sql/config.sql. */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_config_cstr_a[] = { 45, 45, 32, 84, 104, 105, 115, 32, 102, 105, 108, 101, 32, 99, 111, 110, 116, 97, 105, 110, 115, 32, 116, 104, 101, 32, 115, 99, 104, 101, 109, 97, 32, 102, 111, 114, 32, 116, 104, 101, 32, 100, 97, 116, 97, 98, 97, 115, 101, 32, 116, 104, 97, 116, 32, 105, 115, 32, 107, 101, 112, 116, 32, 105, 110, 32, 116, 104, 101, 10, 45, 45, 32, 126, 47, 46, 102, 111, 115, 115, |
︙ | ︙ | |||
40518 40519 40520 40521 40522 40523 40524 | 105, 108, 101, 32, 116, 121, 112, 101, 46, 10, 45, 45, 32, 84, 104, 101, 32, 105, 110, 116, 101, 103, 101, 114, 32, 105, 115, 32, 116, 104, 101, 32, 115, 97, 109, 101, 32, 97, 115, 32, 39, 70, 83, 76, 71, 39, 46, 10, 80, 82, 65, 71, 77, 65, 32, 99, 102, 103, 46, 97, 112, 112, 108, 105, 99, 97, 116, 105, 111, 110, 95, 105, 100, 61, 50, 53, 50, 48, 48, 54, 54, 55, 53, 59, 10, 0}; char const * fsl_schema_config_cstr = fsl_schema_config_cstr_a; | | | | < | < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 43964 43965 43966 43967 43968 43969 43970 43971 43972 43973 43974 43975 43976 43977 43978 43979 43980 43981 43982 43983 43984 | 105, 108, 101, 32, 116, 121, 112, 101, 46, 10, 45, 45, 32, 84, 104, 101, 32, 105, 110, 116, 101, 103, 101, 114, 32, 105, 115, 32, 116, 104, 101, 32, 115, 97, 109, 101, 32, 97, 115, 32, 39, 70, 83, 76, 71, 39, 46, 10, 80, 82, 65, 71, 77, 65, 32, 99, 102, 103, 46, 97, 112, 112, 108, 105, 99, 97, 116, 105, 111, 110, 95, 105, 100, 61, 50, 53, 50, 48, 48, 54, 54, 55, 53, 59, 10, 0}; char const * fsl_schema_config_cstr = fsl_schema_config_cstr_a; /* end of ./sql/config.sql */ /* end of file ./src/schema_config_cstr.c */ /* start of file ./src/schema_repo1_cstr.c */ /** @page page_schema_repo1_cstr repo-static.sql Binary form of file ./sql/repo-static.sql. */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_repo1_cstr_a[] = { 45, 45, 32, 84, 104, 105, 115, 32, 102, 105, 108, 101, 32, 99, 111, 110, 116, 97, 105, 110, 115, 32, 112, 97, 114, 116, 115, 32, 111, 102, 32, 116, 104, 101, 32, 115, 99, 104, 101, 109, 97, 32, 116, 104, 97, 116, 32, 97, 114, 101, 32, 102, 105, 120, 101, 100, 32, 97, 110, 100, 10, 45, 45, 32, 117, 110, 99, 104, 97, 110, 103, 105, 110, 103, 32, 97, 99, 114, 111, 115, |
︙ | ︙ | |||
40949 40950 40951 40952 40953 40954 40955 | 32, 99, 111, 109, 109, 97, 110, 100, 32, 116, 111, 32, 105, 100, 101, 110, 116, 105, 102, 121, 32, 116, 104, 101, 10, 45, 45, 32, 100, 97, 116, 97, 98, 97, 115, 101, 32, 97, 115, 32, 97, 32, 102, 111, 115, 115, 105, 108, 32, 114, 101, 112, 111, 115, 105, 116, 111, 114, 121, 46, 10, 80, 82, 65, 71, 77, 65, 32, 114, 101, 112, 111, 46, 97, 112, 112, 108, 105, 99, 97, 116, 105, 111, 110, 95, 105, 100, 61, 50, 53, 50, 48, 48, 54, 54, 55, 51, 59, 10, 0}; char const * fsl_schema_repo1_cstr = fsl_schema_repo1_cstr_a; | | | | < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 44261 44262 44263 44264 44265 44266 44267 44268 44269 44270 44271 44272 44273 44274 44275 44276 44277 44278 44279 44280 44281 | 32, 99, 111, 109, 109, 97, 110, 100, 32, 116, 111, 32, 105, 100, 101, 110, 116, 105, 102, 121, 32, 116, 104, 101, 10, 45, 45, 32, 100, 97, 116, 97, 98, 97, 115, 101, 32, 97, 115, 32, 97, 32, 102, 111, 115, 115, 105, 108, 32, 114, 101, 112, 111, 115, 105, 116, 111, 114, 121, 46, 10, 80, 82, 65, 71, 77, 65, 32, 114, 101, 112, 111, 46, 97, 112, 112, 108, 105, 99, 97, 116, 105, 111, 110, 95, 105, 100, 61, 50, 53, 50, 48, 48, 54, 54, 55, 51, 59, 10, 0}; char const * fsl_schema_repo1_cstr = fsl_schema_repo1_cstr_a; /* end of ./sql/repo-static.sql */ /* end of file ./src/schema_repo1_cstr.c */ /* start of file ./src/schema_repo2_cstr.c */ /** @page page_schema_repo2_cstr repo-transient.sql Binary form of file ./sql/repo-transient.sql. */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_repo2_cstr_a[] = { 45, 45, 32, 84, 104, 105, 115, 32, 102, 105, 108, 101, 32, 99, 111, 110, 116, 97, 105, 110, 115, 32, 112, 97, 114, 116, 115, 32, 111, 102, 32, 116, 104, 101, 32, 115, 99, 104, 101, 109, 97, 32, 116, 104, 97, 116, 32, 99, 97, 110, 32, 99, 104, 97, 110, 103, 101, 32, 102, 114, 111, 109, 32, 111, 110, 101, 10, 45, 45, 32, 118, 101, 114, 115, 105, 111, 110, 32, 116, 111, |
︙ | ︙ | |||
41660 41661 41662 41663 41664 41665 41666 | 105, 108, 100, 105, 100, 41, 10, 41, 32, 87, 73, 84, 72, 79, 85, 84, 32, 82, 79, 87, 73, 68, 59, 10, 67, 82, 69, 65, 84, 69, 32, 73, 78, 68, 69, 88, 32, 114, 101, 112, 111, 46, 99, 104, 101, 114, 114, 121, 112, 105, 99, 107, 95, 99, 105, 100, 32, 79, 78, 32, 99, 104, 101, 114, 114, 121, 112, 105, 99, 107, 40, 99, 104, 105, 108, 100, 105, 100, 41, 59, 10, 0}; char const * fsl_schema_repo2_cstr = fsl_schema_repo2_cstr_a; | | | | < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 44757 44758 44759 44760 44761 44762 44763 44764 44765 44766 44767 44768 44769 44770 44771 44772 44773 44774 44775 44776 44777 | 105, 108, 100, 105, 100, 41, 10, 41, 32, 87, 73, 84, 72, 79, 85, 84, 32, 82, 79, 87, 73, 68, 59, 10, 67, 82, 69, 65, 84, 69, 32, 73, 78, 68, 69, 88, 32, 114, 101, 112, 111, 46, 99, 104, 101, 114, 114, 121, 112, 105, 99, 107, 95, 99, 105, 100, 32, 79, 78, 32, 99, 104, 101, 114, 114, 121, 112, 105, 99, 107, 40, 99, 104, 105, 108, 100, 105, 100, 41, 59, 10, 0}; char const * fsl_schema_repo2_cstr = fsl_schema_repo2_cstr_a; /* end of ./sql/repo-transient.sql */ /* end of file ./src/schema_repo2_cstr.c */ /* start of file ./src/schema_ckout_cstr.c */ /** @page page_schema_ckout_cstr checkout.sql Binary form of file ./sql/checkout.sql. */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_ckout_cstr_a[] = { 45, 45, 32, 84, 104, 101, 32, 86, 86, 65, 82, 32, 116, 97, 98, 108, 101, 32, 104, 111, 108, 100, 115, 32, 109, 105, 115, 99, 101, 108, 108, 97, 110, 111, 117, 115, 32, 105, 110, 102, 111, 114, 109, 97, 116, 105, 111, 110, 32, 97, 98, 111, 117, 116, 32, 116, 104, 101, 32, 108, 111, 99, 97, 108, 32, 100, 97, 116, 97, 98, 97, 115, 101, 10, 45, 45, 32, 105, 110, 32, |
︙ | ︙ | |||
41931 41932 41933 41934 41935 41936 41937 | 115, 32, 102, 105, 108, 101, 32, 116, 121, 112, 101, 46, 10, 45, 45, 32, 84, 104, 101, 32, 105, 110, 116, 101, 103, 101, 114, 32, 105, 115, 32, 116, 104, 101, 32, 115, 97, 109, 101, 32, 97, 115, 32, 39, 70, 83, 76, 67, 39, 46, 10, 80, 82, 65, 71, 77, 65, 32, 99, 107, 111, 117, 116, 46, 97, 112, 112, 108, 105, 99, 97, 116, 105, 111, 110, 95, 105, 100, 61, 50, 53, 50, 48, 48, 54, 54, 55, 52, 59, 10, 0}; char const * fsl_schema_ckout_cstr = fsl_schema_ckout_cstr_a; | | | | < | | < | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 44951 44952 44953 44954 44955 44956 44957 44958 44959 44960 44961 44962 44963 44964 44965 44966 44967 44968 44969 44970 44971 | 115, 32, 102, 105, 108, 101, 32, 116, 121, 112, 101, 46, 10, 45, 45, 32, 84, 104, 101, 32, 105, 110, 116, 101, 103, 101, 114, 32, 105, 115, 32, 116, 104, 101, 32, 115, 97, 109, 101, 32, 97, 115, 32, 39, 70, 83, 76, 67, 39, 46, 10, 80, 82, 65, 71, 77, 65, 32, 99, 107, 111, 117, 116, 46, 97, 112, 112, 108, 105, 99, 97, 116, 105, 111, 110, 95, 105, 100, 61, 50, 53, 50, 48, 48, 54, 54, 55, 52, 59, 10, 0}; char const * fsl_schema_ckout_cstr = fsl_schema_ckout_cstr_a; /* end of ./sql/checkout.sql */ /* end of file ./src/schema_ckout_cstr.c */ /* start of file ./src/schema_ticket_cstr.c */ /** @page page_schema_ticket_cstr ticket.sql Binary form of file ./sql/ticket.sql. */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_ticket_cstr_a[] = { 45, 45, 32, 84, 101, 109, 112, 108, 97, 116, 101, 32, 102, 111, 114, 32, 116, 104, 101, 32, 84, 73, 67, 75, 69, 84, 32, 116, 97, 98, 108, 101, 10, 67, 82, 69, 65, 84, 69, 32, 84, 65, 66, 76, 69, 32, 114, 101, 112, 111, 46, 116, 105, 99, 107, 101, 116, 40, 10, 32, 32, 45, 45, 32, 68, 111, 32, 110, 111, 116, 32, 99, 104, 97, 110, 103, 101, 32, 97, 110, |
︙ | ︙ | |||
42015 42016 42017 42018 42019 42020 42021 | 109, 101, 110, 116, 32, 84, 69, 88, 84, 10, 41, 59, 10, 67, 82, 69, 65, 84, 69, 32, 73, 78, 68, 69, 88, 32, 114, 101, 112, 111, 46, 116, 105, 99, 107, 101, 116, 99, 104, 110, 103, 95, 105, 100, 120, 49, 32, 79, 78, 32, 116, 105, 99, 107, 101, 116, 99, 104, 110, 103, 40, 116, 107, 116, 95, 105, 100, 44, 32, 116, 107, 116, 95, 109, 116, 105, 109, 101, 41, 59, 10, 0}; char const * fsl_schema_ticket_cstr = fsl_schema_ticket_cstr_a; | | | | < | | < < < < < < < < < < < < < < < < < < < < | | < | 45003 45004 45005 45006 45007 45008 45009 45010 45011 45012 45013 45014 45015 45016 45017 45018 45019 45020 45021 45022 45023 | 109, 101, 110, 116, 32, 84, 69, 88, 84, 10, 41, 59, 10, 67, 82, 69, 65, 84, 69, 32, 73, 78, 68, 69, 88, 32, 114, 101, 112, 111, 46, 116, 105, 99, 107, 101, 116, 99, 104, 110, 103, 95, 105, 100, 120, 49, 32, 79, 78, 32, 116, 105, 99, 107, 101, 116, 99, 104, 110, 103, 40, 116, 107, 116, 95, 105, 100, 44, 32, 116, 107, 116, 95, 109, 116, 105, 109, 101, 41, 59, 10, 0}; char const * fsl_schema_ticket_cstr = fsl_schema_ticket_cstr_a; /* end of ./sql/ticket.sql */ /* end of file ./src/schema_ticket_cstr.c */ /* start of file ./src/schema_ticket_reports_cstr.c */ /** @page page_schema_ticket_reports_cstr ticket-reports.sql Binary form of file ./sql/ticket-reports.sql. */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_ticket_reports_cstr_a[] = { 73, 78, 83, 69, 82, 84, 32, 73, 78, 84, 79, 32, 114, 101, 112, 111, 114, 116, 102, 109, 116, 40, 116, 105, 116, 108, 101, 44, 109, 116, 105, 109, 101, 44, 99, 111, 108, 115, 44, 115, 113, 108, 99, 111, 100, 101, 41, 32, 10, 86, 65, 76, 85, 69, 83, 40, 39, 65, 108, 108, 32, 84, 105, 99, 107, 101, 116, 115, 39, 44, 106, 117, 108, 105, 97, 110, 100, 97, 121, 40, |
︙ | ︙ | |||
42081 42082 42083 42084 42085 42086 42087 | 100, 97, 116, 101, 116, 105, 109, 101, 40, 116, 107, 116, 95, 109, 116, 105, 109, 101, 41, 32, 65, 83, 32, 39, 39, 109, 116, 105, 109, 101, 39, 39, 44, 10, 32, 32, 116, 121, 112, 101, 44, 10, 32, 32, 115, 116, 97, 116, 117, 115, 44, 10, 32, 32, 115, 117, 98, 115, 121, 115, 116, 101, 109, 44, 10, 32, 32, 116, 105, 116, 108, 101, 10, 70, 82, 79, 77, 32, 116, 105, 99, 107, 101, 116, 39, 41, 59, 10, 0}; char const * fsl_schema_ticket_reports_cstr = fsl_schema_ticket_reports_cstr_a; | | | | < | | > | < < < < < < < < < | 45047 45048 45049 45050 45051 45052 45053 45054 45055 45056 45057 45058 45059 45060 45061 45062 45063 45064 45065 45066 45067 | 100, 97, 116, 101, 116, 105, 109, 101, 40, 116, 107, 116, 95, 109, 116, 105, 109, 101, 41, 32, 65, 83, 32, 39, 39, 109, 116, 105, 109, 101, 39, 39, 44, 10, 32, 32, 116, 121, 112, 101, 44, 10, 32, 32, 115, 116, 97, 116, 117, 115, 44, 10, 32, 32, 115, 117, 98, 115, 121, 115, 116, 101, 109, 44, 10, 32, 32, 116, 105, 116, 108, 101, 10, 70, 82, 79, 77, 32, 116, 105, 99, 107, 101, 116, 39, 41, 59, 10, 0}; char const * fsl_schema_ticket_reports_cstr = fsl_schema_ticket_reports_cstr_a; /* end of ./sql/ticket-reports.sql */ /* end of file ./src/schema_ticket_reports_cstr.c */ /* start of file ./src/schema_forum_cstr.c */ /** @page page_schema_forum_cstr forum.sql Binary form of file ./sql/forum.sql. */ /* auto-generated code - edit at your own risk! (Good luck with that!) */ static char const fsl_schema_forum_cstr_a[] = { 67, 82, 69, 65, 84, 69, 32, 84, 65, 66, 76, 69, 32, 114, 101, 112, 111, 46, 102, 111, 114, 117, 109, 112, 111, 115, 116, 40, 10, 32, 32, 102, 112, 105, 100, 32, 73, 78, 84, 69, 71, 69, 82, 32, 80, 82, 73, 77, 65, 82, 89, 32, 75, 69, 89, 44, 32, 32, 45, 45, 32, 66, 76, 79, 66, 46, 114, 105, 100, 32, 102, 111, 114, 32, 116, 104, 101, 32, 97, 114, |
︙ | ︙ | |||
42122 42123 42124 42125 42126 42127 42128 | 104, 101, 110, 32, 112, 111, 115, 116, 101, 100, 46, 32, 32, 74, 117, 108, 105, 97, 110, 32, 100, 97, 121, 10, 41, 59, 10, 67, 82, 69, 65, 84, 69, 32, 73, 78, 68, 69, 88, 32, 114, 101, 112, 111, 46, 102, 111, 114, 117, 109, 116, 104, 114, 101, 97, 100, 32, 79, 78, 32, 102, 111, 114, 117, 109, 112, 111, 115, 116, 40, 102, 114, 111, 111, 116, 44, 102, 109, 116, 105, 109, 101, 41, 59, 10, 0}; char const * fsl_schema_forum_cstr = fsl_schema_forum_cstr_a; | | | | 45079 45080 45081 45082 45083 45084 45085 45086 45087 | 104, 101, 110, 32, 112, 111, 115, 116, 101, 100, 46, 32, 32, 74, 117, 108, 105, 97, 110, 32, 100, 97, 121, 10, 41, 59, 10, 67, 82, 69, 65, 84, 69, 32, 73, 78, 68, 69, 88, 32, 114, 101, 112, 111, 46, 102, 111, 114, 117, 109, 116, 104, 114, 101, 97, 100, 32, 79, 78, 32, 102, 111, 114, 117, 109, 112, 111, 115, 116, 40, 102, 114, 111, 111, 116, 44, 102, 109, 116, 105, 109, 101, 41, 59, 10, 0}; char const * fsl_schema_forum_cstr = fsl_schema_forum_cstr_a; /* end of ./sql/forum.sql */ /* end of file ./src/schema_forum_cstr.c */ |
Changes to lib/libfossil.h.
1 2 3 4 5 6 7 | #if !defined(FSL_AMALGAMATION_BUILD) #define FSL_AMALGAMATION_BUILD 1 #endif #if defined(HAVE_CONFIG_H) # include "config.h" #endif #include "libfossil-config.h" | > | < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | #if !defined(FSL_AMALGAMATION_BUILD) #define FSL_AMALGAMATION_BUILD 1 #endif #if defined(HAVE_CONFIG_H) # include "config.h" #endif #include "libfossil-config.h" #include "sqlite3.h" /* start of file ./include/fossil-scm/config.h */ #if !defined (ORG_FOSSIL_SCM_FSL_CONFIG_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_CONFIG_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ #if defined(_MSC_VER) && !defined(FSL_AMALGAMATION_BUILD) #else #endif #if !defined(_ISOC99_SOURCE) /* glibc apparently guards snprintf() on this #define, even though snprintf() is part of C99 and we're building in C99 mode. */ # define _ISOC99_SOURCE |
︙ | ︙ | |||
246 247 248 249 250 251 252 | otherwise they do not. */ #define FSL_CONFIG_ENABLE_TIMER 1 #endif /* ORG_FOSSIL_SCM_FSL_CONFIG_H_INCLUDED */ | < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < | | 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 | otherwise they do not. */ #define FSL_CONFIG_ENABLE_TIMER 1 #endif /* ORG_FOSSIL_SCM_FSL_CONFIG_H_INCLUDED */ /* end of file ./include/fossil-scm/config.h */ /* start of file ./include/fossil-scm/util.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_UTIL_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_UTIL_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /** @file util.h This file declares a number of utility classes and routines used by libfossil. All of them considered "public", suitable for direct use by client code. */ #include <stdio.h> /* FILE type */ |
︙ | ︙ | |||
862 863 864 865 866 867 868 | initialize them properly leads to undefined behaviour. - ALWAYS fsl_buffer_clear() buffers when done with them. Remember that failed routines which output to buffers might partially populate the buffer, so be sure to clean up on error cases. | | | > > > | | | > > | | | | | > > > < | < | < < < < < < < < < < < | | > > | > > > | > > > > > > > > > > > > | | | | > > > > > | 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 | initialize them properly leads to undefined behaviour. - ALWAYS fsl_buffer_clear() buffers when done with them. Remember that failed routines which output to buffers might partially populate the buffer, so be sure to clean up on error cases. - The `capacity` member specifies how much memory the buffer current holds in its `mem` member. If `capacity` is 0 and `mem` is not then the memory is expected to refer to `used` bytes of memory owned elsewhere. (See fsl_buffer_external() and fsl_buffer_materialize().) - The `used` member specifies how much of the memory is actually "in use" by the client. - As a rule, the public APIs keep (`used`<`capacity`) and always (unless documented otherwise) tries to keep the memory buffer NUL-terminated (if it has any memory at all). The notable potential exception to that is that "external" buffers may not be NUL-terminated (see fsl_buffer_external()). - Use fsl_buffer_reuse() to keep memory around and reset the `used` amount to 0. Most library-wide routines which write to buffers will re-use that memory if they can, rather than re-allocating. This example demonstrates the difference between `used` and `capacity` (error checking reduced to assert()ions for clarity): ``` fsl_buffer b = fsl_buffer_empty; // ALWAYS init via copying fsl_buffer_empty or (depending on // the context) fsl_buffer_empty_m. The latter is used for // in-struct initialization of struct members. int rc = fsl_buffer_reserve(&b, 20); assert(0==rc); assert(b.capacity>=20); // it may reserve more! assert(0==b.used); rc = fsl_buffer_append(&b, "abc", 3); assert(0==rc); assert(3==b.used); assert(0==b.mem[b.used]); // API always NUL-terminates ``` @see fsl_buffer_reserve() @see fsl_buffer_resize() @see fsl_buffer_external() @see fsl_buffer_materialize() @see fsl_buffer_append() @see fsl_buffer_appendf() @see fsl_buffer_cstr() @see fsl_buffer_size() @see fsl_buffer_capacity() @see fsl_buffer_clear() @see fsl_buffer_reuse() */ struct fsl_buffer { /** The raw memory pointed to by this buffer. There are two ways of using this member: - If `this->capacity` is non-0 then the first `this->capacity` bytes of `this->mem` are owned by this buffer instance. The API docs call this state "managed" buffers. - `If this->capacity` is 0 and this->mem is not NULL then the memory is owned by "somewhere else" and this API will treat it as _immutable_ (so it may safely point to const data). Its lifetime must exceed this object's and any attempt made via this API to write to it will cause the memory to be copied (effectively a copy-on-write op). The API calls this state "external" buffers and refers to the copy-on-write of such buffers as "materializing" them. See fsl_buffer_external() and fsl_buffer_materialize(). `this->used` bytes are treated as the "used" part of the buffer (as opposed to its capacity). When `this->capacity>0` the difference beween (`this->capacity - this->used`) represents space the buffer has available for use before it will require another expansion/reallocation. */ unsigned char * mem; /** Number of bytes allocated for this buffer. If capacity is 0 and `this->mem` is not NULL then this buffer's memory is assumed to be owned "elsewhere" and will be considered immutable by the API. Any attempt to modify it will result in a copy-on-write operation */ fsl_size_t capacity; /** Number of "used" bytes in the buffer. This is generally interpreted as the string length of this->mem, and the buffer APIs which add data to a buffer always ensure that this->capacity is large enough to account for a trailing NUL byte in this->mem. |
︙ | ︙ | |||
1161 1162 1163 1164 1165 1166 1167 | z need not be NUL terminated - this function does not read past the first invalid byte. Thus is can be used on, e.g., full ISO8601-format strings. If z is NULL, 0 is returned. */ FSL_EXPORT int fsl_str_is_date2(const char *z); | < > > > > > > > > > > > > > > | | | | > | > > | > > | > > > > > > > > > > > > > > | > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > | > > > | > > > > > > > > > > | > > | | 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 | z need not be NUL terminated - this function does not read past the first invalid byte. Thus is can be used on, e.g., full ISO8601-format strings. If z is NULL, 0 is returned. */ FSL_EXPORT int fsl_str_is_date2(const char *z); /** Reserves at least n bytes of capacity in buf. Returns 0 on success, FSL_RC_OOM if allocation fails, FSL_RC_MISUSE if !buf. If b is an external buffer then: - If n is 0, this disassociates b->mem from b, effectively clearing the buffer's state. Else... - The buffer is materialized, transformed into a managed buffer. This happens even if n is less than b->used because this routine is always used in preparation for writing to the buffer. - If n>0 then the greater of (n, b->used) bytes of memory are allocated, b->used bytes are copied from b->mem (its external memory) to the new block, and b->mem is replaced with the new block. Afterwards, b->capacity will be non-0. This does not change b->used, nor will it shrink the buffer (reduce buf->capacity) unless n is 0, in which case it immediately frees b->mem (if b is a managed buffer) and sets b->capacity and buf->used to 0. @see fsl_buffer_resize() @see fsl_buffer_materialize() @see fsl_buffer_clear() */ FSL_EXPORT int fsl_buffer_reserve( fsl_buffer * const b, fsl_size_t n ); /** If b is a "managed" buffer, this is a no-op and returns 0, else b is an "external" buffer and it... - Allocates enough memory to store b->used bytes plus a NUL terminator. - Copies b->mem to the new block. - NUL-terminates the new block. b is thereby transformed to a managed buffer. Returns 0 on success, FSL_RC_OOM on allocation error. Note that materialization happens automatically on demand by fsl_buffer APIs which write to the buffer but clients can use this to ensure that it is managed memory before they manipulate b->mem directly. @see fsl_buffer_external() */ FSL_EXPORT int fsl_buffer_materialize( fsl_buffer * const b ); /** Initializes b to be an "external" buffer pointing to n bytes of the given memory. If n is negative, the equivalent of fsl_strlen() is used to count its length. The buffer API treats external buffers as immutable. If asked to write to one, the API will first "materialize" the buffer, as documented for fsl_buffer_materialize(). Either mem must be guaranteed to outlive b or b must be materialized before mem goes out of scope. ACHTUNG: it is NEVER legal to pass a pointer which may get reallocated, as doing so may change its address, invaliding the resulting `b->mem` pointer. Similarly, it is never legal to pass it scope-local memory unless b's lifetime is limited to that scope. If b->mem is not NULL, this function first passes the buffer to fsl_buffer_clear() to ensure that this routine does not leak any dynamic memory it may already own. Results are undefined if mem is NULL, but n may be 0. Results are undefined if passed a completely uninitialized buffer object. _Always_ initialize new buffer objects by copying fsl_buffer_empty or (when appropriate) fsl_buffer_empty_m. @see fsl_buffer_materialize() */ FSL_EXPORT void fsl_buffer_external( fsl_buffer * const b, void const * mem, fsl_int_t n ); /** Convenience equivalent of fsl_buffer_reserve(b,0). */ FSL_EXPORT void fsl_buffer_clear( fsl_buffer * const b ); /** If b is a managed buffer, this resets b->used, b->cursor, and b->mem[0] (if b->mem is not NULL) to 0. If b is an external buffer, this clears all state from the buffer, behaving like fsl_buffer_clear() (making it available for reuse as a managed or external buffer). This does not (de)allocate memory, only changes the logical "used" size of the buffer. Returns its argument. Returns b. Achtung for fossil(1) porters: this function's semantics are much different from the fossil's blob_reset(). To get those semantics, use fsl_buffer_reserve(buf, 0) or its convenience form fsl_buffer_clear(). (This function _used_ to be called fsl_buffer_reset(), but it was renamed in the hope of avoiding related confusion.) */ FSL_EXPORT fsl_buffer * fsl_buffer_reuse( fsl_buffer * const b ); /** Similar to fsl_buffer_reserve() except that... For managed buffers: - It does not free all memory when n==0. Instead it essentially makes the memory a length-0, NUL-terminated string. - It will try to shrink (realloc) buf's memory if (n<buf->capacity). - It sets buf->capacity to (n+1) and buf->used to n. This routine allocates one extra byte to ensure that buf is always NUL-terminated. - On success it always NUL-terminates the buffer at offset buf->used. For external buffers it behaves slightly differently: - If n==buf->used, this is a no-op and returns 0. - If n==0 then it behaves like fsl_buffer_external(buf,"",0) and returns 0. - Else it materializes the buffer, as per fsl_buffer_materialize(), copies the lesser of (n, buf->used) bytes from buf->mem to that memory, NUL-terminates the new block, replaces buf->mem with the new block, sets buf->used to n and buf->capacity to n+1. Returns 0 on success or FSL_RC_OOM if a (re)allocation fails. On allocation error, the buffer's memory state is unchanged. @see fsl_buffer_reserve() @see fsl_buffer_materialize() @see fsl_buffer_clear() */ FSL_EXPORT int fsl_buffer_resize( fsl_buffer * const buf, fsl_size_t n ); /** Swaps the contents of the left and right arguments. Results are undefined if either argument is NULL or points to uninitialized memory. */ FSL_EXPORT void fsl_buffer_swap( fsl_buffer * left, fsl_buffer * right ); |
︙ | ︙ | |||
1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 | int clearWhich ); /** Appends the first n bytes of src, plus a NUL byte, to b, expanding b as necessary and incrementing b->used by n. If n is less than 0 then the equivalent of fsl_strlen((char const*)src) is used to calculate the length. If n is 0 (or negative and !*src), this function ensures that b->mem is not NULL and is NUL-terminated, so it may allocate to have space for that NUL byte. | > > > > > < < < < | | | < | | 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 | int clearWhich ); /** Appends the first n bytes of src, plus a NUL byte, to b, expanding b as necessary and incrementing b->used by n. If n is less than 0 then the equivalent of fsl_strlen((char const*)src) is used to calculate the length. If b is an external buffer, it is first transformed into a managed buffer. Results are undefined if b or src are NULL. If n is 0 (or negative and !*src), this function ensures that b->mem is not NULL and is NUL-terminated, so it may allocate to have space for that NUL byte. Returns 0 on success, FSL_RC_OOM if allocation of memory fails. If this function succeeds, it guarantees that it NUL-terminates the buffer (but that the NUL terminator is not counted in b->used). @see fsl_buffer_appendf() @see fsl_buffer_reserve() */ FSL_EXPORT int fsl_buffer_append( fsl_buffer * const b, void const * src, fsl_int_t n ); /** Uses fsl_appendf() to append formatted output to the given buffer. Returns 0 on success and FSL_RC_OOM if an allocation fails while expanding dest. Results are undefined if either of the first two arguments are NULL. |
︙ | ︙ | |||
1346 1347 1348 1349 1350 1351 1352 | */ FSL_EXPORT int fsl_buffer_compress2(fsl_buffer const *pIn1, fsl_buffer const *pIn2, fsl_buffer *pOut); /** Uncompress buffer pIn and store the result in pOut. It is ok for | | | > > | > > | > > | > > | > | | | | | | | | > > | | < | | | > > > > > > > > > > | > > > | > > > > | > > | > > > | | | | 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 | */ FSL_EXPORT int fsl_buffer_compress2(fsl_buffer const *pIn1, fsl_buffer const *pIn2, fsl_buffer *pOut); /** Uncompress buffer pIn and store the result in pOut. It is ok for pIn and pOut to be the same buffer. Returns 0 on success. If pIn!=pOut then on error, depending on the type of error, pOut may have been partially written so the state of its contents are unspecified (but its state as a buffer object is still valid). pOut must be either cleanly initialized/empty or the same object as pIn. If it has any current memory, it will be reused if it's large enough and it is not the same pointer as pIn. Results are undefined if any argument is NULL. Returns 0 on success, FSL_RC_OOM on allocation error, and some other code if the lower-level decompression routines fail. Note that the decompression process, though computationally costly, is a no-op if pIn is not actually compressed. As a special case, if pIn==pOut and fsl_buffer_is_compressed() returns false for pIn then this is a no-op. @see fsl_buffer_compress() @see fsl_buffer_compress2() @see fsl_buffer_is_compressed() */ FSL_EXPORT int fsl_buffer_uncompress(fsl_buffer const * const pIn, fsl_buffer * const pOut); /** Returns true if this function believes that mem (which must be at least len bytes of valid memory long) appears to have been compressed by fsl_buffer_compress() or equivalent. This is not a 100% reliable check - it could potentially have false positives on certain inputs, but that is thought to be unlikely (at least for text data). Returns 0 if mem is NULL. */ FSL_EXPORT bool fsl_data_is_compressed(unsigned char const * const mem, fsl_size_t len); /** Equivalent to fsl_data_is_compressed(buf->mem, buf->used). */ FSL_EXPORT bool fsl_buffer_is_compressed(fsl_buffer const * buf); /** If fsl_data_is_compressed(mem,len) returns true then this function returns the uncompressed size of the data, else it returns a negative value. */ FSL_EXPORT fsl_int_t fsl_data_uncompressed_size(unsigned char const *mem, fsl_size_t len); /** The fsl_buffer counterpart of fsl_data_uncompressed_size(). */ FSL_EXPORT fsl_int_t fsl_buffer_uncompressed_size(fsl_buffer const * b); /** Equivalent to ((char const *)b->mem). The returned string is effectively b->used bytes long unless the user decides to apply his own conventions. Note that the buffer APIs generally assure that buffers are NUL-terminated, meaning that strings returned from this function can (for the vast majority of cases) assume that the returned string is NUL-terminated (with a string length of b->used _bytes_). It is, however, possible for client code to violate that convention via direct manipulation of the buffer or using non-NUL-terminated extranal buffers. @see fsl_buffer_str() @see fsl_buffer_cstr2() */ FSL_EXPORT char const * fsl_buffer_cstr(fsl_buffer const * const b); /** If b has any memory allocated to it, that memory is returned. If len is not NULL then *len is set to b->used. If b has no memory then NULL is returned and *len (if len is not NULL) is set to 0. @see fsl_buffer_str() @see fsl_buffer_cstr() */ FSL_EXPORT char const * fsl_buffer_cstr2(fsl_buffer const * const b, fsl_size_t * const len); /** Equivalent to ((char *)b->mem). The returned memory is effectively b->used bytes long unless the user decides to apply their own conventions. Care must be taken to only write to the returned pointer for memory owned or write-proxied by this buffer. More specifically, results are undefined if b is an external buffer proxying const bytes. When in doubt about whether b is external, use fsl_buffer_materialize() to transform it to a managed buffer before using this routine, noting that any of the public fsl_buffer APIs which write to a buffer will materialize it on demand if needed. @see fsl_buffer_take() */ FSL_EXPORT char * fsl_buffer_str(fsl_buffer const * const b); /** "Takes" the memory refered to by the given buffer, transfering ownership to the caller. After calling this, b's state will be empty. If b is an external buffer, this will materialize it first and return NULL if that fails. @see fsl_buffer_materialize() @see fsl_buffer_str() @see fsl_buffer_cstr() @see fsl_buffer_cstr2() */ FSL_EXPORT char * fsl_buffer_take(fsl_buffer * const b); /** Returns the "used" size of b, or 0 if !b. */ #define fsl_buffer_size(b) (b)->used #if 0 FSL_EXPORT fsl_size_t fsl_buffer_size(fsl_buffer const * const b); #endif /** Returns the current capacity of b, or 0 if !b. */ #define fsl_buffer_capacity(b) (b)->capacity #if 0 FSL_EXPORT fsl_size_t fsl_buffer_capacity(fsl_buffer const * const b); #endif /** Compares the contents of buffers lhs and rhs using memcmp(3) semantics. Return negative, zero, or positive if the first buffer is less then, equal to, or greater than the second. Results are undefined if either argument is NULL. When buffers of different length match on the first N bytes, where N is the shorter of the two buffers' lengths, it treats the shorter buffer as being "less than" the longer one. */ FSL_EXPORT int fsl_buffer_compare(fsl_buffer const * const lhs, fsl_buffer const * const rhs); /** Bitwise-compares the contents of b against the file named by zFile. Returns 0 if they have the same size and contents, else non-zero. This function has no way to report if zFile cannot be opened, and any error results in a non-0 return value. No interpretation/canonicalization of zFile is performed - it is |
︙ | ︙ | |||
1485 1486 1487 1488 1489 1490 1491 | where the timing/duration of fsl_buffer_compare() (or an equivalent memcmp()) might inadvertently leak security-relevant information. Specifically, it address the concern that attackers can use timing differences to check for password misses, to narrow down an attack to passwords of a specific length or content properties. */ | | | 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 | where the timing/duration of fsl_buffer_compare() (or an equivalent memcmp()) might inadvertently leak security-relevant information. Specifically, it address the concern that attackers can use timing differences to check for password misses, to narrow down an attack to passwords of a specific length or content properties. */ FSL_EXPORT int fsl_buffer_compare_O1(fsl_buffer const * const lhs, fsl_buffer const * const rhs); /** Overwrites dest's contents with a copy of those from src (reusing dest's memory if it has any). Results are undefined if either pointer is NULL or invalid. Returns 0 on success, FSL_RC_OOM on allocation error. */ |
︙ | ︙ | |||
1510 1511 1512 1513 1514 1515 1516 | Return 0 on success. @see fsl_buffer_delta_apply() @see fsl_delta_apply() @see fsl_delta_apply2() */ | | | | | | | | | 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 | Return 0 on success. @see fsl_buffer_delta_apply() @see fsl_delta_apply() @see fsl_delta_apply2() */ FSL_EXPORT int fsl_buffer_delta_apply( fsl_buffer const * const pOriginal, fsl_buffer const * const pDelta, fsl_buffer * const pTarget); /** Identical to fsl_buffer_delta_apply() except that if delta application fails then any error messages/codes are written to pErr if it is not NULL. It is rare that delta application fails (only if the inputs are invalid, e.g. do not belong together or are corrupt), but when it does, having error information can be useful. @see fsl_buffer_delta_apply() @see fsl_delta_apply() @see fsl_delta_apply2() */ FSL_EXPORT int fsl_buffer_delta_apply2( fsl_buffer const * const pOriginal, fsl_buffer const * const pDelta, fsl_buffer * const pTarget, fsl_error * const pErr); /** Uses a fsl_input_f() function to buffer input into a fsl_buffer. dest must be a non-NULL, initialized (though possibly empty) fsl_buffer object. Its contents, if any, will be overwritten by |
︙ | ︙ | |||
1631 1632 1633 1634 1635 1636 1637 | /** Writes the given buffer to the given filename. Returns 0 on success, FSL_RC_MISUSE if !b or !fname, FSL_RC_IO if opening or writing fails. Uses fsl_fopen() to open the file, so it supports the name '-' as an alias for stdout. */ | | | 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 | /** Writes the given buffer to the given filename. Returns 0 on success, FSL_RC_MISUSE if !b or !fname, FSL_RC_IO if opening or writing fails. Uses fsl_fopen() to open the file, so it supports the name '-' as an alias for stdout. */ FSL_EXPORT int fsl_buffer_to_filename( fsl_buffer const * const b, char const * fname ); /** Copy N lines of text from pFrom into pTo. The copy begins at the current pFrom->cursor position. pFrom->cursor is left pointing at the first character past the last `\n` copied. (Modification of the cursor is why pFrom is not const.) |
︙ | ︙ | |||
1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 | */ FSL_EXPORT int fsl_strncmp(const char *zA, const char *zB, fsl_size_t nByte); /** BSD strlcpy() variant which is less error prone than strncpy. Copy up to dstsz - 1 characters from src to dst and NUL-terminate the resulting string if dstsz is not 0. */ FSL_EXPORT fsl_size_t fsl_strlcpy(char *dst, const char *src, fsl_size_t dstsz); /** BSD strlcat() variant which is less error prone than strncat. Append src to the end of dst. Append at most dstsz - strlen(dst - 1) characters, and NUL-terminate unless dstsize is 0 or the passed in dst string was longer than dstsz to begin with. */ FSL_EXPORT fsl_size_t fsl_strlcat(char *dst, const char *src, fsl_size_t dstsz); /** Equivalent to fsl_strncmp(lhs, rhs, X), where X is either FSL_STRLEN_SHA1 or FSL_STRLEN_K256: if both lhs and rhs are longer than FSL_STRLEN_SHA1 then they are assumed to be | > > > > > > > | 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 | */ FSL_EXPORT int fsl_strncmp(const char *zA, const char *zB, fsl_size_t nByte); /** BSD strlcpy() variant which is less error prone than strncpy. Copy up to dstsz - 1 characters from src to dst and NUL-terminate the resulting string if dstsz is not 0. Returns the length of the string it writes to dst. If it returns a value equal to or greater than its 3rd argument then the output was truncated. */ FSL_EXPORT fsl_size_t fsl_strlcpy(char *dst, const char *src, fsl_size_t dstsz); /** BSD strlcat() variant which is less error prone than strncat. Append src to the end of dst. Append at most dstsz - strlen(dst - 1) characters, and NUL-terminate unless dstsize is 0 or the passed in dst string was longer than dstsz to begin with. Returns the initial string-length of dest plus the length src. If it returns a value equal to or greater than its 3rd argument then the output was truncated. */ FSL_EXPORT fsl_size_t fsl_strlcat(char *dst, const char *src, fsl_size_t dstsz); /** Equivalent to fsl_strncmp(lhs, rhs, X), where X is either FSL_STRLEN_SHA1 or FSL_STRLEN_K256: if both lhs and rhs are longer than FSL_STRLEN_SHA1 then they are assumed to be |
︙ | ︙ | |||
2045 2046 2047 2048 2049 2050 2051 | int const rc = fsl_list_reserve( myList, n ); if( rc ) { ... error ... } ``` @see fsl_list_clear() @see fsl_list_visit_free() */ | | | | | 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 | int const rc = fsl_list_reserve( myList, n ); if( rc ) { ... error ... } ``` @see fsl_list_clear() @see fsl_list_visit_free() */ FSL_EXPORT int fsl_list_reserve( fsl_list * const self, fsl_size_t n ); /** Appends a bitwise copy of cp to self->list, expanding the list as necessary and adjusting self->used. Ownership of cp is unchanged by this call. cp may not be NULL. Returns 0 on success, FSL_RC_MISUSE if any argument is NULL, or FSL_RC_OOM on allocation error. */ FSL_EXPORT int fsl_list_append( fsl_list * const self, void * cp ); /** Swaps all contents of both lhs and rhs. Results are undefined if lhs or rhs are NULL or not properly initialized (via initial copy initialization from fsl_list_empty resp. fsl_list_empty_m). */ FSL_EXPORT void fsl_list_swap( fsl_list * const lhs, fsl_list * const rhs ); /** @typedef typedef int (*fsl_list_visitor_f)(void * p, void * visitorState ) Generic visitor interface for fsl_list lists. Used by fsl_list_visit(). p is the pointer held by that list entry and visitorState is the 4th argument passed to fsl_list_visit(). |
︙ | ︙ | |||
2129 2130 2131 2132 2133 2134 2135 | the client has no way (unless the finalizer somehow accounts for it) to know which entries in the list were cleaned up. Thus it is highly recommended that finalizer functions follow the conventional wisdom of "destructors do not throw." @see fsl_list_visit_free() */ | | > | | > | | 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 | the client has no way (unless the finalizer somehow accounts for it) to know which entries in the list were cleaned up. Thus it is highly recommended that finalizer functions follow the conventional wisdom of "destructors do not throw." @see fsl_list_visit_free() */ FSL_EXPORT int fsl_list_clear( fsl_list * const list, fsl_list_visitor_f childFinalizer, void * finalizerState ); /** Similar to fsl_list_clear(list, fsl_list_v_fsl_free, NULL), but only frees list->list if the second argument is true, otherwise it sets the list's length to 0 but keep the list->list memory intact for later use. Note that this function never frees the list argument, only its contents. Be sure only to use this on lists of types for which fsl_free() is legal. i.e. don't use it on a list of fsl_deck objects or other types which have their own finalizers. Results are undefined if list is NULL. @see fsl_list_clear() */ FSL_EXPORT void fsl_list_visit_free( fsl_list * const list, bool freeListMem ); /** Works similarly to the visit operation without the _p suffix except that the pointer the visitor function gets is a (**) pointing back to the entry within this list. That means that callers can assign the entry in the list to another value during the traversal process (e.g. set it to 0). If shiftIfNulled is true then if the callback sets the list's value to 0 then it is removed from the list and self->used is adjusted (self->capacity is not changed). */ FSL_EXPORT int fsl_list_visit_p( fsl_list * const self, int order, bool shiftIfNulled, fsl_list_visitor_f visitor, void * visitorState ); /** Sorts the given list using the given comparison function. Neither argument may be NULL. The arugments passed to the comparison function will be pointers to pointers to the original entries, and may (depending on how the list is used) point to NULL. */ FSL_EXPORT void fsl_list_sort( fsl_list * const li, fsl_generic_cmp_f cmp); /** Searches for a value in the given list, using the given comparison function to determine equivalence. The comparison function will never be passed a NULL value by this function - if value is NULL then only a NULL entry will compare equal to it. Results are undefined if li or cmpf are NULL. |
︙ | ︙ | |||
2245 2246 2247 2248 2249 2250 2251 | } assert(0 == fsl_strcmp( "/a/b/foo.bar, fsl_buffer_cstr(&buf))); fsl_buffer_clear(&buf); ``` */ FSL_EXPORT int fsl_file_canonical_name2(const char *zRoot, const char *zOrigName, | > | | | 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 | } assert(0 == fsl_strcmp( "/a/b/foo.bar, fsl_buffer_cstr(&buf))); fsl_buffer_clear(&buf); ``` */ FSL_EXPORT int fsl_file_canonical_name2(const char *zRoot, const char *zOrigName, fsl_buffer * const pOut, bool slash); /** Equivalent to fsl_file_canonical_name2(NULL, zOrigName, pOut, slash). @see fsl_file_canonical_name2() */ FSL_EXPORT int fsl_file_canonical_name(const char *zOrigName, fsl_buffer * const pOut, bool slash); /** Calculates the "directory part" of zFilename and _appends_ it to pOut. The directory part is all parts up to the final path separator ('\\' or '/'). If leaveSlash is true (non-0) then the separator part is appended to pOut, otherwise it is not. This function only examines the first nLen bytes of zFilename. If |
︙ | ︙ | |||
2281 2282 2283 2284 2285 2286 2287 | separator and leaveSlash is false then only a NUL terminator is appended to pOut if it is not already NUL-terminated. This function does no filesystem-level validation of the the given path - only string evaluation. */ FSL_EXPORT int fsl_file_dirpart(char const * zFilename, fsl_int_t nLen, | | | 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 | separator and leaveSlash is false then only a NUL terminator is appended to pOut if it is not already NUL-terminated. This function does no filesystem-level validation of the the given path - only string evaluation. */ FSL_EXPORT int fsl_file_dirpart(char const * zFilename, fsl_int_t nLen, fsl_buffer * const pOut, bool leaveSlash); /** Writes the absolute path name of the current directory to zBuf, which must be at least nBuf bytes long (nBuf includes the space for a trailing NUL terminator). |
︙ | ︙ | |||
2372 2373 2374 2375 2376 2377 2378 | for directories, devices, fifos, symlinks, etc. The name may be absolute or relative to the current working dir. */ FSL_EXPORT bool fsl_is_file(const char *zFilename); /** Returns true if the given file is a symlink, else false. The name | | > | 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 | for directories, devices, fifos, symlinks, etc. The name may be absolute or relative to the current working dir. */ FSL_EXPORT bool fsl_is_file(const char *zFilename); /** Returns true if the given file is a symlink, else false. The name may be absolute or relative to the current working dir. On Windows platforms this always returns false. */ FSL_EXPORT bool fsl_is_symlink(const char *zFilename); /** Returns true if the given filename refers to a plain file or symlink, else returns false. The name may be absolute or relative to the current working dir. |
︙ | ︙ | |||
2399 2400 2401 2402 2403 2404 2405 | Simplify a filename by: * converting all \ into / on windows and cygwin * removing any trailing and duplicate / * removing /./ * removing /A/../ | | | | | > > > > > > > | 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 | Simplify a filename by: * converting all \ into / on windows and cygwin * removing any trailing and duplicate / * removing /./ * removing /A/../ Changes are made in-place. Return the new name length. If n is <0 then fsl_strlen() is used to calculate the length. If the slash parameter is true, the trailing slash, if any, is retained, else any trailing slash is removed. As a special case, if the input string (simplified) is "/" then the output string will be "/", regardless of the value of the final argument. That behavior is debatable but this API is really intended to be used for paths deeper than the root directory. */ FSL_EXPORT fsl_size_t fsl_file_simplify_name(char *z, fsl_int_t n_, bool slash); /** Return true (non-zero) if string z matches glob pattern zGlob and zero if the pattern does not match. Always returns 0 if either argument is NULL. Supports all globbing rules |
︙ | ︙ | |||
2447 2448 2449 2450 2451 2452 2453 | "*.c *.h, *.sh, '*.in'" ``` @see fsl_glob_list_append() @see fsl_glob_list_matches() @see fsl_glob_list_clear() */ | | | | 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 | "*.c *.h, *.sh, '*.in'" ``` @see fsl_glob_list_append() @see fsl_glob_list_matches() @see fsl_glob_list_clear() */ FSL_EXPORT int fsl_glob_list_parse( fsl_list * const tgt, char const * zPatternList ); /** Appends a single blob pattern to tgt, in the form of a new (char *) owned by tgt. This function copies zGlob and appends that copy to tgt. Returns 0 on success, FSL_RC_MISUSE if !tgt or !zGlob or !*zGlob, FSL_RC_OOM if appending to the list fails. @see fsl_glob_list_parse() @see fsl_glob_list_matches() @see fsl_glob_list_clear() */ FSL_EXPORT int fsl_glob_list_append( fsl_list * const tgt, char const * zGlob ); /** Assumes globList is a list of (char [const] *) glob values and tries to match each one against zNeedle using fsl_str_glob(). If any glob matches, it returns a pointer to the matched globList->list entry. If no matches are found, or if any argument is invalid, NULL is returned. |
︙ | ︙ | |||
2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 | the more widespread OSes often have to be converted to something portable and this requires allocation on such platforms, but not on Unix. For API transparency, that means all platforms get the copy(-like) behaviour. */ FSL_EXPORT char *fsl_getenv(const char *zName); /** Returns a positive value if zFilename is a directory, 0 if zFilename does not exist, or a negative value if zFilename exists but is something other than a directory. Results are undefined if zFilename is NULL. This function expects zFilename to be a well-formed path - | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 | the more widespread OSes often have to be converted to something portable and this requires allocation on such platforms, but not on Unix. For API transparency, that means all platforms get the copy(-like) behaviour. */ FSL_EXPORT char *fsl_getenv(const char *zName); /** Collects a list of directories intended to use as temp dirs in the current environment. The returned array ends with a NULL element to mark its end. The memory's ownership is a bit awkward and therefore it must be eventually freed by passing it to fsl_temp_dirs_free(). No entries in the returned list contain a trailing slash unless the entry is itself a reference to a Unix-style root directory (which would be highly unusual). The list of directories varies by platform: Windows: - `GetTempPath()`, `$TEMP`, `$TMP`, "." Non-Windows: - `$TMPDIR`, "/var/tmp", "/usr/tmp", "/tmp", "/temp", "." (`$X` refers to the value of environment variable `X`.) Noting that only directories in those lists which actually exist (at the time this is called) are added to the list (also noting that "." always exists unless CWD is deleted while the app is active). If no suitable directories are found, an empty array (with a leading `NULL` element) is returned, but this would indicate that, e.g., even CWD does not exist (so the app has bigger problems). `NULL` is only returned if allocation of the containing array fails. Failure to allocate memory for a given directory name (as those require conversion on some platforms) is ignored and such entries are simply skipped over. @see fsl_temp_dirs_free() @see fsl_file_tempname() */ FSL_EXPORT char ** fsl_temp_dirs_get(void); /** If aDirs is not NULL then it is expected to be an array created by fsl_temp_dirs_get() and it frees the list's entries and the list itself. After calling this, the argument's memory is invalidated and any use of it leads to undefined results. This is a harmless no-op if the argument is NULL. @see fsl_temp_dirs_get() @see fsl_file_tempname() */ FSL_EXPORT void fsl_temp_dirs_free(char **aDirs); /** Creates a semi-random temp filename and populates the given buffer with it. The second argument is an optional string to prefix each filename with. If it is NULL then a library-wide default is used. If it is empty then no prefix is used. The final argument is expected to be NULL or a list of directories in the format constructed by fsl_temp_dirs_get(). If it is not NULL, this function uses the first entry in dirs which refers to an existing directory. If it is NULL then the buffer is filled with the new name with no directory prefix. Returns... - 0 on success, in which case tgt is populated with the new name. - FSL_RC_NOT_FOUND if dirs is empty or refers only to non-existent directories. - FSL_RC_OOM if allocating memory for the target buffer fails. - FSL_RC_RANGE if, after some hard-coded number of attempts, it is unable to construct a unique filename due to name collisions in the target directory. That "shouldn't ever happen." Sidebars: - This function does no translation or validation of the 2nd argument other than to check if it is NULL. It "should" be either a file base name, with no path component, or a relative path component for which the caller has already created the directory. e.g. use the base name of the application, e.g. "my-app". - This function does not actually write to the filesystem, it just constructs a name. There is hypothetically a window of opportunity for another file with the same name to be created before the caller has a chance to create the file, but the chances of that actually happening are close enough to zero to rule them out for all practical purposes. - The RNG is officially unspecified. (That said: sqlite3_randomness().) @see fsl_temp_dirs_get() @see fsl_temp_dirs_free() */ FSL_EXPORT int fsl_file_tempname(fsl_buffer * const tgt, char const *zPrefix, char * const * const dirs); /** Returns a positive value if zFilename is a directory, 0 if zFilename does not exist, or a negative value if zFilename exists but is something other than a directory. Results are undefined if zFilename is NULL. This function expects zFilename to be a well-formed path - |
︙ | ︙ | |||
2690 2691 2692 2693 2694 2695 2696 | Results are undefined if zFilename is NULL. Potential TODO: if it refers to a dir, forward the call to fsl_rmdir(). */ FSL_EXPORT int fsl_file_unlink(const char *zFilename); | < > > | < | | | | 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 | Results are undefined if zFilename is NULL. Potential TODO: if it refers to a dir, forward the call to fsl_rmdir(). */ FSL_EXPORT int fsl_file_unlink(const char *zFilename); /** Renames file zFrom to zTo using the OS's equivalent of `rename(2)`. Both files must be in the same filesystem and any directory parts of zTo must already exist. Returns 0 on success, FSL_RC_OOM if a filename conversion allocation fails (on platforms which do that), or a FSL_RC_xxx counterpart of an `errno` value if the `rename(2)` call fails (as per fsl_errno_to_rc()). */ FSL_EXPORT int fsl_file_rename(const char *zFrom, const char *zTo); /** Deletes an empty directory from the filesystem. Returns 0 on success. There are any number of reasons why deletion of a directory can fail, some of which include: |
︙ | ︙ | |||
2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 | returning 0. If the target is a directory or a symlink, this is a no-op and returns 0. */ FSL_EXPORT int fsl_file_exec_set(const char *zFilename, bool isExec); /** Create the directory with the given name if it does not already exist. If forceFlag is true, delete any prior non-directory object with the same name. Return 0 on success, non-0 on error. | > > > > > > > > > > > > > > > > > > > > > | 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 | returning 0. If the target is a directory or a symlink, this is a no-op and returns 0. */ FSL_EXPORT int fsl_file_exec_set(const char *zFilename, bool isExec); /** Returns true if the argument is fsl_stat()'able and has the executable bit set, else false. */ FSL_EXPORT bool fsl_file_isexec(const char *zFilename); /** Makes a bitwise copy of the file zFrom to file zTo, creating any directories needed for the target file's if they do not already exist. If the source file is executable then the target file will also be made so, but any failure to do so (e.g. because the target filesystem does not support it) is silently ignored. Returns 0 on success. On error it may return any number of result codes if opening a file fails, if a mkdir fails (see fsl_mkdir_for_file()), or if any I/O fails. Results are undefined if the source and target refer to the same file. */ FSL_EXPORT int fsl_file_copy(char const *zFrom, char const *zTo); /** Create the directory with the given name if it does not already exist. If forceFlag is true, delete any prior non-directory object with the same name. Return 0 on success, non-0 on error. |
︙ | ︙ | |||
2794 2795 2796 2797 2798 2799 2800 | "/foo/bar" creates (if needed) /foo, but assumes "bar" is a file component. "/foo/bar/" creates /foo/bar. However "foo" will not create a directory - because the string has no path component, it is assumed to be a filename. Both "/foo/bar/my.doc" and "/foo/bar/" result in the directories | | > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > | 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 | "/foo/bar" creates (if needed) /foo, but assumes "bar" is a file component. "/foo/bar/" creates /foo/bar. However "foo" will not create a directory - because the string has no path component, it is assumed to be a filename. Both "/foo/bar/my.doc" and "/foo/bar/" result in the directories "/foo/bar". */ FSL_EXPORT int fsl_mkdir_for_file(char const *zName, bool forceFlag); /** This function expects its second argument to refer to a symlink (and that the caller has already validated that it is one). The `readlink(2)` system call is used to fetch the contents of that link and the target buffer is populated with those contents (reusing any memory the buffer may already own). Returns 0 on success, FSL_RC_OOM if copying to the target buffer fails due to an allocation error, or an error propagated from `readlink()` in the form of a fsl_errno_to_rc() result. Caveat: on Windows platforms this function simply passes the buffer to fsl_buffer_reuse() and returns 0. It should arguably read the contents of zFilename into the buffer in that case, on the assumption that the file is a pseudo-symlink. That decision may be re-evaluated if/when the library claims to have fossil-compatible symlink support. Bugs: - This function has a limited internal buffer as a target for `readlink()`. It "should be" long enough for any "reasonable" uses in the scope of this library, but there's bound to be some user out there who wants to use it for other contexts. */ FSL_EXPORT int fsl_symlink_read(fsl_buffer * const tgt, char const * zFilename); /** Creates a symlink or pseudo-symlink named zLinkFile linking to zTargetFile. If realLink is true and this is a non-Windows platform then: - fsl_file_simplify_name() is used to normalize zLinkFile. - `symlink(2)` is used to link zTargetFile to a new link named the simplified form of zLinkFile. If zLinkFile already exists, this will fail. If realLink is false or this is a Windows platform, a file is created named zLinkFile containing the string zTargetFile as its contents. If a file or symlink named zLinkFile already exists, it is removed before writing the new contents. In both cases, the parent directories for zLinkFile are created, if needed but that process will fail if any non-directory components with conflicting names are found in the to-be-mkdir'd path. Returns 0 on success or some lower-level result code if creation/writing of a directory, a symlink, or pseudo-symlink fails. */ FSL_EXPORT int fsl_symlink_create(char const *zTargetFile, char const * zLinkFile, bool realLink); /** Uses fsl_getenv() to look for the environment variables (FOSSIL_USER, (Windows: USERNAME), (Unix: USER, LOGNAME)). If it finds one it returns a copy of that value, which must eventually be passed to fsl_free() to free it (NOT fsl_filename_free(), though fsl_getenv() requires that one). If |
︙ | ︙ | |||
2948 2949 2950 2951 2952 2953 2954 | #define fsl_fstat_empty_m {FSL_FSTAT_TYPE_UNKNOWN,0,0,-1,0} /** Empty-initialized fsl_fstat instance, intended for non-const copy construction. */ FSL_EXPORT const fsl_fstat fsl_fstat_empty; /** | | | 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 | #define fsl_fstat_empty_m {FSL_FSTAT_TYPE_UNKNOWN,0,0,-1,0} /** Empty-initialized fsl_fstat instance, intended for non-const copy construction. */ FSL_EXPORT const fsl_fstat fsl_fstat_empty; /** Runs the OS's stat(2) equivalent to populate fst (if not NULL) with information about the given file. Returns 0 on success, FSL_RC_MISUSE if zFilename is NULL, and FSL_RC_RANGE if zFilename starts with a NUL byte. Returns FSL_RC_NOT_FOUND if no filesystem entry is found for the given name. Returns FSL_RC_IO if the underlying stat() (or equivalent) fails for undetermined reasons inside the underlying |
︙ | ︙ | |||
2971 2972 2973 2974 2975 2976 2977 | to differentiate between symlinks and files. The fsl_fstat_type_e family of flags can be used to determine the type of the filesystem object being stat()'d (file, directory, or symlink). It does not apply any special logic for platform-specific oddities other than symlinks (e.g. character devices and such). */ | | | 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 | to differentiate between symlinks and files. The fsl_fstat_type_e family of flags can be used to determine the type of the filesystem object being stat()'d (file, directory, or symlink). It does not apply any special logic for platform-specific oddities other than symlinks (e.g. character devices and such). */ FSL_EXPORT int fsl_stat(const char *zFilename, fsl_fstat * const fst, bool derefSymlinks); /** Create a new delta between the memory zIn and zOut. The delta is written into a preallocated buffer, zDelta, which must be at least 60 bytes longer than the target memory, zOut. |
︙ | ︙ | |||
3066 3067 3068 3069 3070 3071 3072 | number of times to emit delta output. Each time it is called it should append the new bytes to its output channel. The semantics of the return value and the first four arguments are identical to fsl_delta_create(), with these ammendments regarding the return value: | | | | | | | > | | | | 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 | number of times to emit delta output. Each time it is called it should append the new bytes to its output channel. The semantics of the return value and the first four arguments are identical to fsl_delta_create(), with these ammendments regarding the return value: - Returns FSL_RC_MISUSE if any of (zV1, zV2, out) are NULL. - If out() returns non-0 at any time, delta generation is aborted and that code is returned. Example usage: ``` int rc = fsl_delta_create( v1, v1len, v2, v2len, fsl_output_f_FILE, stdout); ``` */ FSL_EXPORT int fsl_delta_create2( unsigned char const *zV1, fsl_size_t lenV1, unsigned char const *zV2, fsl_size_t lenV2, fsl_output_f out, void * outState); /** A fsl_delta_create() wrapper which uses the first two arguments as the original and "new" content versions to delta, and outputs the delta to the 3rd argument (overwriting any existing contents and re-using any memory it had allocated). If the output buffer (delta) is the same as src or newVers, FSL_RC_MISUSE is returned, and results are undefined if delta indirectly refers to the same buffer as either src or newVers or if any argument is NULL. Returns 0 on success. */ FSL_EXPORT int fsl_buffer_delta_create( fsl_buffer const * const src, fsl_buffer const * const newVers, fsl_buffer * const delta); /** Apply a delta created using fsl_delta_create(). The output buffer must be big enough to hold the whole output file and a NUL terminator at the end. The fsl_delta_applied_size() routine can be used to determine that |
︙ | ︙ | |||
3218 3219 3220 3221 3222 3223 3224 | */ FSL_EXPORT void fsl_bytes_defossilize( unsigned char * inp, fsl_size_t * resultLen ); /** Defossilizes the contents of b. Equivalent to: fsl_bytes_defossilize( b->mem, &b->used ); */ | | | 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 | */ FSL_EXPORT void fsl_bytes_defossilize( unsigned char * inp, fsl_size_t * resultLen ); /** Defossilizes the contents of b. Equivalent to: fsl_bytes_defossilize( b->mem, &b->used ); */ FSL_EXPORT void fsl_buffer_defossilize( fsl_buffer * const b ); /** Returns true if the input string contains only valid lower-case base-16 digits. If any invalid characters appear in the string, false is returned. */ FSL_EXPORT bool fsl_validate16(const char *zIn, fsl_size_t nIn); |
︙ | ︙ | |||
3342 3343 3344 3345 3346 3347 3348 | untransformed characters and the strlen of *xlate for others. Bytes returned via xlate are static and immutable. Results are undefined if xlate is NULL. */ FSL_EXPORT fsl_size_t fsl_htmlize_xlate(int c, char const ** xlate); | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | > > | > > > > > > > > > > > > > | 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 | untransformed characters and the strlen of *xlate for others. Bytes returned via xlate are static and immutable. Results are undefined if xlate is NULL. */ FSL_EXPORT fsl_size_t fsl_htmlize_xlate(int c, char const ** xlate); /** @enum fsl_diff2_flag_e Flags for use with the 2021-era text-diff generation APIs (fsl_dibu and friends). This set of flags may still change considerably. Maintenance reminders: - Some of these values are holy and must not be changed without also changing the corresponding code in diff2.c. - Where these entries semantically overlap with their older/deprecated fsl_diff_flag_e counterparts, they MUST (for the sake of avoiding client-side Grief) have the same values because some internal APIs are used by both of the diff APIs. @see fsl_dibu_impl_flags_e TODO?: - Move the diff-builder-specific flags from here to, possibly, the fsl_dibu::implFlags member or a new flag member dedicated to this type of flag. */ enum fsl_diff2_flag_e { /** Ignore end-of-line whitespace. Applies to all diff builders. */ FSL_DIFF2_IGNORE_EOLWS = 0x01, /** Ignore end-of-line whitespace. Applies to all diff builders. */ |
︙ | ︙ | |||
3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 | FSL_RC_RANGE. */ FSL_DIFF2_NOTTOOBIG = 0x0800, /** Strip trailing CR before diffing. Applies to all diff builders. */ FSL_DIFF2_STRIP_EOLCR = 0x1000, /** More precise but slower side-by-side diff algorithm, for diffs which use that. */ | > > > > | < < < < < < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 | FSL_RC_RANGE. */ FSL_DIFF2_NOTTOOBIG = 0x0800, /** Strip trailing CR before diffing. Applies to all diff builders. */ FSL_DIFF2_STRIP_EOLCR = 0x1000, /* ACHTUNG: do not use 0x2000 because it would semantically collide with FSL_DIFF_ANSI_COLOR. */ /** More precise but slower side-by-side diff algorithm, for diffs which use that. */ FSL_DIFF2_SLOW_SBS = 0x4000, /** Tells diff builders which support it to include line numbers in their output. */ FSL_DIFF2_LINE_NUMBERS = 0x10000, /** Tells diff builders which optionally support an "index" line to NOT include it in their output. */ FSL_DIFF2_NOINDEX = 0x20000, /** Reserved for client-defined diff builder use. */ FSL_DIFF2_CLIENT1 = 0x01000000, /** Reserved for client-defined diff builder use. */ FSL_DIFF2_CLIENT2 = 0x02000000, /** Reserved for client-defined diff builder use. */ FSL_DIFF2_CLIENT3 = 0x04000000, /** Reserved for client-defined diff builder use. */ FSL_DIFF2_CLIENT4 = 0x08000000 }; /** Flags for use with various concrete fsl_dibu implementations. Specifically, these are flags for fsl_dibu::implFlags (as opposed to fsl_dibu::pimplFlags, which must not be modified by clients). Note that it is perfectly legitimate for different entries to have the same values, but different semantics, so long as the different entries are specific to different fsl_dibu types. */ enum fsl_dibu_impl_flags_e { /** Tells the TCL diff builder that the complete output and each line should be wrapped in {...}. */ FSL_DIBU_TCL_BRACES = 0x01, /** Tells the TCL diff builder that the squiggly braces embedded in any output (as opposed to the braces added by FSL_DIBU_TCL_BRACES) need to be backslash-escaped. Whether this is required depends on how the output will be used. */ FSL_DIBU_TCL_BRACES_ESC = 0x02, /** Tells the TCL diff builder to generate a complete TCL/TK app as output. The resulting script can (if tcl and tk are installed) be run with tclsh to get a graphical diff. Note that this flag includes both FSL_DIBU_TCL_BRACES and FSL_DIBU_TCL_BRACES_ESC. */ FSL_DIBU_TCL_TK = 0x07 }; /** An instance of this class is used to convey certain state to fsl_dibu objects. Some of this state is configuration provided by the client and some is volatile, used for communicating common state to diff builder instances during the diff rendering process. Certain fsl_dibu implementations may require that some ostensibly optional fields be filled out. Documenting that is TODO, as the builders get developed. */ struct fsl_dibu_opt { /** Flags from the fsl_diff2_flag_e enum. */ uint32_t diffFlags; /** Number of lines of diff context (number of lines common to the LHS and RHS of the diff). Library-wide default is 5. */ unsigned short contextLines; /** Maximum column width hint for side-by-side, a.k.a. split, diffs. FSL_DIBU_SPLIT_TEXT truncates its content columns (as opposed to line numbers and its modification marker) to, at most, this width. By default it uses as much width as is necessary to render whole lines. It treats this limit as UTF8 characters, not bytes. This is a hint, not a rule. A given diff builder is free to ignore it or to ignore values which are arbitrarily deemed "too |
︙ | ︙ | |||
3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 | may be NULL. */ const char * hashRHS; /** Output destination. Any given builder might, depending on how it actually constructs the diff, buffer output and delay calling this until its finish() method is called. */ fsl_output_f out; /** State for this->out(). Ownership is unspecified by this interface: it is for use by this->out() but what is supposed to happen to it after this object is done with it depends on higher-level code. */ void * outState; | > > > > > < | | 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 | may be NULL. */ const char * hashRHS; /** Output destination. Any given builder might, depending on how it actually constructs the diff, buffer output and delay calling this until its finish() method is called. Note that not all diff builders use this. e.g. a diff builder which outputs to an ncurses widget cannot do so via this method and instead has to use the drawing methods of that API. Thus is is legal for this method to be NULL for some builders. */ fsl_output_f out; /** State for this->out(). Ownership is unspecified by this interface: it is for use by this->out() but what is supposed to happen to it after this object is done with it depends on higher-level code. */ void * outState; /** EXPERIMENTAL AND SUBJECT TO CHANGE. Optional ANSI color control sequences to be injected into text-mode diff output by diff builders which support them. All members of this struct must either be NULL, an empty string, or a valid ANSI escape sequence. The reset option must be the escape sequence to reset either just the color or to reset all ANSI control attributes, depending on how the other members are set. If any member other than reset is set, all must be set. The diff driver will treat any members of this which are NULL as empty strings to simplify diff builder color integration. The exception is the reset member - see its docs for details. */ struct fsl_dibu_opt_ansi { /** Color escape sequence for inserted lines. */ char const * insertion; /** Color escape sequence for edited or replaced lines. This option might be ignored, depending on how the renderer works. Some |
︙ | ︙ | |||
3647 3648 3649 3650 3651 3652 3653 | were the ANSI code to reset all color attributes. */ char const * reset; } ansiColor; }; /** Convenience typedef. */ | | | | | | | | 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 | were the ANSI code to reset all color attributes. */ char const * reset; } ansiColor; }; /** Convenience typedef. */ typedef struct fsl_dibu_opt fsl_dibu_opt; /** Initialized-with-defaults fsl_dibu_opt structure, intended for const-copy initialization. */ #define fsl_dibu_opt_empty_m {\ 0/*diffFlags*/, 5/*contextLines*/, 0/*columnWidth*/,\ NULL/*nameLHS*/,NULL/*hashLHS*/, \ NULL/*nameRHS*/, NULL/*hashRHS*/, \ NULL/*out*/, NULL/*outState*/, \ {/*ansiColor*/ ""/*insertion*/,""/*edit*/,""/*deletion*/,\ ""/*reset*/} \ } /** Initialized-with-defaults fsl_dibu_opt structure, intended for non-const copy initialization. */ extern const fsl_dibu_opt fsl_dibu_opt_empty; /** Information about each line of a file being diffed. This type is only in the public API for use by the fsl_dibu interface, specifically for use with fsl_dline_change_spans(). It is not otherwise intended for public use. None of its members are considered even remotely public except for this->z and this->n. */ struct fsl_dline { /** The text of the line. Owned by higher-level code. Not |
︙ | ︙ | |||
3715 3716 3717 3718 3719 3720 3721 | */ #define fsl_dline_change_max_spans 8 /** This "mostly-internal" type describes zero or more (up to fsl_dline_change_max_spans) areas of difference between two lines of text. This type is only in the public API for use with concrete | | | 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 | */ #define fsl_dline_change_max_spans 8 /** This "mostly-internal" type describes zero or more (up to fsl_dline_change_max_spans) areas of difference between two lines of text. This type is only in the public API for use with concrete fsl_dibu implementations. */ struct fsl_dline_change { /** Number of change spans (number of used elements in this->a). */ unsigned char n; /** Array of change spans, in left-to-right order */ struct fsl_dline_change_span { /* Reminder: int instead of uint b/c some ported-in algos use |
︙ | ︙ | |||
3763 3764 3765 3766 3767 3768 3769 | Given two lines of a diff, this routine computes a set of changes between those lines for display purposes and writes a description of those changes into the 3rd argument. After returning, p->n contains the number of elements in p->a which were populated by this routine. This function is only in the public API for use with | | | 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 | Given two lines of a diff, this routine computes a set of changes between those lines for display purposes and writes a description of those changes into the 3rd argument. After returning, p->n contains the number of elements in p->a which were populated by this routine. This function is only in the public API for use with fsl_dibu objects. It is not a requirement for such objects but can be used to provide more detailed diff changes than marking whole lines as simply changed or not. */ FSL_EXPORT void fsl_dline_change_spans(const fsl_dline *pLeft, const fsl_dline *pRight, fsl_dline_change * const p); |
︙ | ︙ | |||
3819 3820 3821 3822 3823 3824 3825 | - FSL_RC_OOM on allocation error. */ FSL_EXPORT int fsl_break_into_dlines(const char *z, fsl_int_t n, uint32_t *pnLine, fsl_dline **pOut, uint64_t diff2Flags); /** Convenience typedef. */ | | | > < < < < < < < < < < < | | > > > > > > | | | | | | > > | | 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 | - FSL_RC_OOM on allocation error. */ FSL_EXPORT int fsl_break_into_dlines(const char *z, fsl_int_t n, uint32_t *pnLine, fsl_dline **pOut, uint64_t diff2Flags); /** Convenience typedef. */ typedef struct fsl_dibu fsl_dibu; /** This class is the basis of libfossil's port of the diff engine added to fossil(1) in 2021-09, colloquially known as the "diff builder." A diff builder is an object responsible for formatting low-level diff info another form, typically for human readability but also for machine readability (patches). The library generates a low-level diff then feeds that through an algorithm which determines which methods of this class to call, delegating all rendering of the diff to an instance of this class. The internal APIs which drive each instance of this class guaranty that if any method of this class returns non-0 (an error code) then no futher methods will be called except for finalize(). */ struct fsl_dibu { /** Config info, owned by higher-level routines. Every diff builder requires one of these. Builders are prohibited from modifying these but the diff driver will. Note that the diff driver may make a bitwise copy of this object and use _that_ one for the actual diff generation. That is, methods of this class must never assume that this member's pointer refers to a specific object. (This leeway is necessary in order to implement diff inversion (swapping the LHS/RHS of a diff).) */ fsl_dibu_opt * opt; /** Can optionally be set by factory functions to some internal opaque value, so that non-member routines specific to that type can determine whether any given builder is of the proper type. */ void const * typeID; /** If not NULL, this is called once per pass per diff to give the builder a chance to perform any bootstrapping initialization or header output. At the point this is called, this->cfg is assumed to have been filled out properly. Diff builder implementations which require dynamic resource allocation may perform it here or in their factory routine(s). b->lnLHS and b->lnRHS will be set to 0 before each call. This method should also reset any dynamic state of a builder so that it may be reused for subsequent diffs. This enables the API to use a single builder for a collection of logically grouped files without having to destroy and reallocate the builder. Must return 0 on success, non-0 on error. If it returns non-0, the only other method of the instance which may be legally called is finalize(). The diff driver sets this->lnLHS and this->lnRHS to 0 before calling this. */ int (*start)(fsl_dibu * const b); /** If this is not NULL, it is called one time at the start of each chunk of diff for a given file and is passed the line number of each half of the diff and the number of lines in that chunk for that half (including insertions and deletions). This is primarily intended for generating conventional unified diff chunk headers |
︙ | ︙ | |||
3906 3907 3908 3909 3910 3911 3912 | those two chunks together. That "readability optimization" is skipped when this method is set because this method may otherwise report that lines are being skipped which then subsequently get output by the driver. Must return 0 on success, non-0 on error. */ | | | | | | | | > > > > > > | > > > > > > > > > > > > > < < < < | < < | | > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | | > | | | | > > > > | | | 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 | those two chunks together. That "readability optimization" is skipped when this method is set because this method may otherwise report that lines are being skipped which then subsequently get output by the driver. Must return 0 on success, non-0 on error. */ int (*chunkHeader)(fsl_dibu* const, uint32_t A, uint32_t B, uint32_t C, uint32_t D); /** Tells the builder that n lines of common output are to be skipped. How it represents this is up to the impl. Must return 0 on success, non-0 on error. Typical common implementation details: - Increment both this->lnLHS and this->lnRHS by n. */ int (*skip)(fsl_dibu* const, uint32_t n); /** Tells the builder that the given line represents one line of common output. Must return 0 on success, non-0 on error. Typical common implementation details: - Increment both this->lnLHS and this->lnRHS by 1. */ int (*common)(fsl_dibu* const, fsl_dline const * line); /** Tells the builder that the given line represents an "insert" into the RHS. Must return 0 on success, non-0 on error. Typical common implementation details: - Increment this->lnRHS by 1. */ int (*insertion)(fsl_dibu* const, fsl_dline const * line); /** Tells the builder that the given line represents a "deletion" - a line removed from the LHS. Must return 0 on success, non-0 on error. Typical common implementation details: - Increment this->lnLHS by 1. */ int (*deletion)(fsl_dibu* const, fsl_dline const * line); /** Tells the builder that the given line represents a replacement from the LHS to the RHS. Must return 0 on success, non-0 on error. This differs from an "edit" in that the line being replaced seems to have on relationship to the replacement. Even so, builders are free to represent replacements and edits identically, and are free to represent either or both as a pair of deletion/insertion operations. Typical common implementation details: - Increment both this->lnLHS and this->lnRHS by 1. */ int (*replacement)(fsl_dibu* const, fsl_dline const * lineLhs, fsl_dline const * lineRhs); /** Tells the builder that the given line represents an "edit" from the LHS to the RHS. Must return 0 on success, non-0 on error. Builders are free, syntax permitting, to usse the fsl_dline_change_spans() API to elaborate on edits for display purposes, to treat it identically to this->replacement(), or to treat this as a single pair of calls to this->deletion() and this->insertion(). In the latter case they simply need to pass lineLhs to this->deletion() and lineRhs to this->insertion(). Typical common implementation details: - Increment both this->lnLHS and this->lnRHS by 1. */ int (*edit)(fsl_dibu* const, fsl_dline const * lineLhs, fsl_dline const * lineRhs); /** Must "finish" the diff process. Depending on the diff impl, this might flush any pending output or may be a no-op. This is only called if the rest of the diff was generated without producing an error result. This member may be NULL. Implementations are free to collect all of their output in an internal representation and delay flushing it until this routine is called. Must return 0 on success, non-0 on error (e.g. output flushing fails). Minor achtung: for a multi-file diff run, this gets called after each file. The library does not have enough information to know when a builder is "done for good" and if a custom builder requires, e.g., extra post-diff-loop processing, the client will have to take care of that themselves. */ int (*finish)(fsl_dibu* const b); /** This optional method is similar to this->finish() but it is not called by the library. It is intended to be called, if it's not NULL, by the client after they are done, e.g., looping over a series of diffs with the same builder. Some builders can use this to flush any final state, e.g. dumping out change count totals or some such. As an example, the TCL/TK-based builder, when the FSL_DIBU_TCL_TK flag is set on this->implFlag, embeds a TK script in the output from this method. */ int (*finally)(fsl_dibu* const b); /** Must free any state owned by this builder, including the builder object. It must not generate any output. */ void (*finalize)(fsl_dibu* const); /** If true, this builder gets passed through the diff generation process twice. See this->passNumber for details. */ bool twoPass; /** Gets set to the "pass number" immediately before this->start() is called, starting with pass number 1. This value is only relevant for two-pass builders, which can use this to control their mode of operation, e.g. data collection in pass 1 and actual work in pass 2. Note that all of the diff-building API methods are called for both passes, including start() and finish(). Only finalize() and finally() are not affected by this. */ unsigned short passNumber; /** Impl-specific diff-generation state. If it is owned by this instance then this->finalize() must clean it up. */ void * pimpl; /** Space for private, implementation-specific flags, e.g. for tracking basic output state, e.g. of opening/closing tags. This must not be modified by clients. */ unsigned int pimplFlags; /** Space for implementation-specific flags which clients may set to modify the dibu's behaviour. This is different from fsl_dibu_opt::diffFlags in that these flags are specific to a given dibu type. See the fsl_dibu_impl_flags_e enum for the list of flags for the library-provided diff builders. */ unsigned int implFlags; /** A place to store the number of files seen by this builder so far, for builders which need to distinguish that somehow (e.g. adding a separator before each file after the first). Implementations which use this should increment it in their start() method. Maintenance reminder/TODO: we can't increment this from the main diff driver because... we possibly could, but we'd need to patch the various diff builders which currently do this themselves. The main diff driver doesn't have enough info to know when to set it, though. That "could" be done in this->finally() but that method is optional. */ uint32_t fileCount; /** Number of lines seen of the LHS content. It is up to the concrete builder impl to update this if it's needed. The core diff driver sets this to 0 before calling this->start(). */ uint32_t lnLHS; /** Number of lines seen of the RHS content. It is up to the concrete builder impl to update this if it's needed. The core diff driver sets this to 0 before calling this->start(). */ uint32_t lnRHS; /** Metrics maintained by the core diff algorithm. These are updated during the first pass through a given fsl_diff_v2() run. They are NEVER reset by the builder algo because it cannot know if the user wants a running total or a per-file total. Clients running diffs in a loop may want to reset them on each loop. The simplest way is to cop fsl_dibu_empty.metrics over them. It is legal for a given builder to reset these in their start(), finish(), or finally() methods, depending on how the builder is used. Note that all metrics apply to the RHS version, not the LHS. */ struct { /** Number of lines inserted performed so far. */ uint32_t insertions; /** Number of lines deleted so far. */ uint32_t deletions; /** Number of line-level edits performed so far. */ uint32_t edits; /** Number of line replacements performed so far. These are different from edits in that the whole line differs in the LHS/RHS. */ uint32_t replacements; } metrics; }; /** Initialized-with-defaults fsl_dibu structure, intended for const-copy initialization. */ #define fsl_dibu_empty_m { \ NULL/*opt*/,NULL/*typeID*/, \ NULL/*start()*/,NULL/*chunkHeader()*/,NULL/*skip()*/, NULL/*common()*/, \ NULL/*insertion()*/,NULL/*deletion()*/, NULL/*replacement()*/, \ NULL/*edit()*/, NULL/*finish()*/, NULL/*finally()*/,NULL/*finalize()*/, \ false/*twoPass*/,0U/*passNumber*/, \ NULL/*pimpl*/, 0U/*pimplFlags*/,0U/*implFlags*/,0U/*fileCount*/, \ 0/*lnLHS*/,0/*lnRHS*/, \ {/*metric*/0,0,0} \ } /** Initialized-with-defaults fsl_dibu structure, intended for non-const copy initialization. */ extern const fsl_dibu fsl_dibu_empty; /** Type IDs for use with fsl_dibu_factory(). */ enum fsl_dibu_e { /** Sentinel entry. */ FSL_DIBU_INVALID = 0, /** A "dummy" diff builder intended only for testing the fsl_dibu interface and related APIs. It does not produce output which is generically useful. */ FSL_DIBU_DEBUG = 1, /** Generates diffs in a compact low(ist)-level form originally designed for use by diff renderers implemented in JavaScript. This diff builder outputs a JSON object with the following properties: |
︙ | ︙ | |||
4117 4118 4119 4120 4121 4122 4123 | ``` The SUBARRAY is an array of 3*N+1 strings with N>=0. The triples represent common-text, left-text, and right-text. The last string in SUBARRAY is the common-suffix. Any string can be empty if it does not apply. */ | | | | | | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 | ``` The SUBARRAY is an array of 3*N+1 strings with N>=0. The triples represent common-text, left-text, and right-text. The last string in SUBARRAY is the common-suffix. Any string can be empty if it does not apply. */ FSL_DIBU_JSON1, /** A diff builder which produces output compatible with the patch(1) command. Its output is functionally identical to fossil(1)'s default diff output except that by default includes an Index line at the top of each file (use the FSL_DIFF2_NOINDEX flag in its fsl_dibu_opt::diffFlags to disable that). Supported flags: - FSL_DIFF2_LINE_NUMBERS (makes it incompatible with patch(1)) - FSL_DIFF2_NOINDEX */ FSL_DIBU_UNIFIED_TEXT, /** A diff builder which outputs a description of the diff in a TCL-readable form. It requires external TCL code in order to function. TODO: a flag which includes the tcl/tk script as part of the output. We first need to compile fossil's diff.tcl into the library. */ FSL_DIBU_TCL, /** A pain-text side-by-side (a.k.a. split) diff view. This diff always behaves as if the FSL_DIFF2_LINE_NUMBERS flag were set because its output is fairly useless without line numbers. It optionally supports ANSI coloring. */ FSL_DIBU_SPLIT_TEXT }; typedef enum fsl_dibu_e fsl_dibu_e; /** A factory for creating fsl_dibu instances of types which are built in to the library. This does not preclude the creation of client-side diff builders (e.g. ones which write to ncurses widgets or similar special-case output). On success, returns 0 and assigns *pOut to a new builder instance which must eventually be freed by calling its pOut->finalize() method. On error, returns non-0 and *pOut is not modified. Error codes include FSL_RC_OOM (alloc failed) and FSL_RC_TYPE (unknown type ID), FSL_RC_TYPE (type is not (or not yet) implemented). */ FSL_EXPORT int fsl_dibu_factory( fsl_dibu_e type, fsl_dibu **pOut ); /** Base allocator for fsl_dibu instances. If extra is >0 then that much extra space is allocated as part of the same memory block and the pimpl member of the returned object is pointed to that space. Example (OOM handling elided for legibility): ``` struct MyState { int x; int y; }; typedef struct MyState MyState; fsl_dibu * b = fsl_dibu_alloc(sizeof(MyState)); MyState * my = (MyState*)b->pimpl; my->x = 1; my->y = 2; ... populate b's members ... ... use b, then clean it up ... b->finalize(b); ``` From within b's methods, the custom state can be accessed via its `pimpl` member. @see fsl_dibu_finalizer() */ FSL_EXPORT fsl_dibu * fsl_dibu_alloc(fsl_size_t extra); /** This is a generic finalizer function for use as a fsl_dibu::finalize() method. It simply zeroes out b and passes it fsl_free(). This is suitable for builders created using fsl_dibu_alloc() _only_ if their custom state manages no extra memory. If they manage any custom memory then the require a custom, type-specific finalizer method. */ FSL_EXPORT void fsl_dibu_finalizer(fsl_dibu * const b); /** This counterpart of fsl_diff_text() defines its output format in terms of a fsl_dibu instance which the caller must provide. The caller is responsible for pointing pBuilder->cfg to a configuration object suitable for the desired diff. In particular, pBuilder->cfg->out and (if necessary) pBuilder->cfg->outState must be set to non-NULL values. This function generates a low-level diff of two versions of content, contained in the given buffers, and passes that diff through the |
︙ | ︙ | |||
4197 4198 4199 4200 4201 4202 4203 | - FSL_RC_DIFF_BINARY if the to-diff content appears to be binary, noting that "appears to be" is heuristric-driven and subject to false positives. Specifically, files with extremely long lines will be recognized as binary (and are, in any case, generally less than useful for most graphical diff purposes). | | | | > > | < | 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 | - FSL_RC_DIFF_BINARY if the to-diff content appears to be binary, noting that "appears to be" is heuristric-driven and subject to false positives. Specifically, files with extremely long lines will be recognized as binary (and are, in any case, generally less than useful for most graphical diff purposes). @see fsl_dibu_factory() @see fsl_diff_text() @see fsl_diff_v2_raw() */ FSL_EXPORT int fsl_diff_v2(fsl_buffer const * pv1, fsl_buffer const * pv2, fsl_dibu * const pBuilder); /** Performs a diff, as for fsl_diff_v2(), but returns the results in the form of an array of COPY, DELETE, INSERT triples terminated by 3 entries with the value 0. Each triple in the list specifies how many *lines* of each half of the diff (the first 2 arguments to this function) to COPY as-is (common code), DELETE (exists in the LHS but not in the RHS), and INSERT (exists in the RHS but not in the LHS). By breaking the input into lines and following these values, a line-level text-mode diff of the two blobs can be generated. See fsl_diff_v2() for the details, all of which apply except for the output: - cfg may be NULL, in which case fsl_dibu_opt_empty is used. - cfg->out is ignored. - On success, *outRaw is assigned to the output array and ownership of it is transfered to the caller, who must eventually pass it to fsl_free() to free it. */ FSL_EXPORT int fsl_diff_v2_raw(fsl_buffer const * pv1, fsl_buffer const * pv2, fsl_dibu_opt const * const cfg, int **outRaw ); /** If zDate is an ISO8601-format string, optionally with a .NNN fractional suffix, then this function returns true and sets *pOut (if pOut is not NULL) to the corresponding Julian value. If zDate is not an ISO8601-format string then this returns false and pOut is not modified. |
︙ | ︙ | |||
5035 5036 5037 5038 5039 5040 5041 | FSL_EXPORT fsl_size_t fsl_simplify_sql( char * sql, fsl_int_t len ); /** Convenience form of fsl_simplify_sql() which assumes b holds an SQL string. It gets processed by fsl_simplify_sql() and its 'used' length potentially gets adjusted to match the adjusted SQL string. */ | | < | | | > > | < | 5366 5367 5368 5369 5370 5371 5372 5373 5374 5375 5376 5377 5378 5379 5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 | FSL_EXPORT fsl_size_t fsl_simplify_sql( char * sql, fsl_int_t len ); /** Convenience form of fsl_simplify_sql() which assumes b holds an SQL string. It gets processed by fsl_simplify_sql() and its 'used' length potentially gets adjusted to match the adjusted SQL string. */ FSL_EXPORT fsl_size_t fsl_simplify_sql_buffer( fsl_buffer * const b ); /** Returns the result of calling the platform's equivalent of isatty(fd). e.g. on Windows this is _isatty() and on Unix isatty(). i.e. it returns true if it thinks that the given file descriptor value is attached to an interactive terminal, else it returns false. The standard file descriptors are: 0=stdin, 1=stdout, and 2=stderr. */ FSL_EXPORT bool fsl_isatty(int fd); /** A container type for lists of db record IDs. This is used in several places as a cache for record IDs, to keep track of ones we know about, ones we know that we don't know about, and to avoid duplicate processing in some contexts. |
︙ | ︙ | |||
5198 5199 5200 5201 5202 5203 5204 | If merge conflicts are encountered, it continues as best as it can and injects "indiscrete" markers in the output to denote the nature of each conflict. If conflictCount is not NULL then on success the number of merge conflicts is written to *conflictCount. Returns 0 on success, FSL_RC_OOM on OOM, FSL_RC_TYPE if any input | | > > > > > > > > > > | 5529 5530 5531 5532 5533 5534 5535 5536 5537 5538 5539 5540 5541 5542 5543 5544 5545 5546 5547 5548 5549 5550 5551 5552 5553 5554 5555 5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 | If merge conflicts are encountered, it continues as best as it can and injects "indiscrete" markers in the output to denote the nature of each conflict. If conflictCount is not NULL then on success the number of merge conflicts is written to *conflictCount. Returns 0 on success, FSL_RC_OOM on OOM, FSL_RC_TYPE if any input appears to be binary. FIXME/TODO: return FSL_RC_DIFF_BINARY instead of FSL_RC_TYPE when encountering binary inputs. @see fsl_buffer_contains_merge_marker() */ FSL_EXPORT int fsl_buffer_merge3(fsl_buffer * const pPivot, fsl_buffer * const pV1, fsl_buffer * const pV2, fsl_buffer * const pOut, unsigned int * const conflictCount); /** Appends the first n bytes of string z to buffer b in the form of TCL-format string literal. If n<0 then fsl_strlen() is used to determine the length. Returns 0 on success, FSL_RC_OOM on error. If the 2nd argument is true, squiggly braces within the string are escaped, else they are not. Whether that's required or not depends on how the resulting TCL will be used. If it will be eval'd directly, it must be escaped. If it will be read as a file and tokenized, it needn't be. */ FSL_EXPORT int fsl_buffer_append_tcl_literal(fsl_buffer * const b, bool escapeSquigglies, char const * z, fsl_int_t n); /** Event IDs for use with fsl_confirm_callback_f implementations. The idea here is to send, via callback, events from the library to |
︙ | ︙ | |||
5520 5521 5522 5523 5524 5525 5526 | typedef struct fsl_dircrawl_state fsl_dircrawl_state; /** Callback type for use with fsl_dircrawl(). It gets passed the absolute name of the target directory, the name of the directory entry (no path part), the type of the entry, and the client state pointer which is passed to that routine. It must return 0 on | | > > > | | > > > | 5861 5862 5863 5864 5865 5866 5867 5868 5869 5870 5871 5872 5873 5874 5875 5876 5877 5878 5879 5880 5881 5882 5883 | typedef struct fsl_dircrawl_state fsl_dircrawl_state; /** Callback type for use with fsl_dircrawl(). It gets passed the absolute name of the target directory, the name of the directory entry (no path part), the type of the entry, and the client state pointer which is passed to that routine. It must return 0 on success or another FSL_RC_xxx value on error. Special return values: - FSL_RC_BREAK will cause directory-crawling to stop without an error (returning 0). - Returning FSL_RC_NOOP will cause recursion into a directory to be skipped, but traversal to otherwise continue. All pointers in the state argument are owned by fsl_dircrawl() and will be invalidated as soon as the callback returns, thus they must be copied if they are needed for later. */ typedef int (*fsl_dircrawl_f)(fsl_dircrawl_state const *); |
︙ | ︙ | |||
5562 5563 5564 5565 5566 5567 5568 | but libfossil does not.) It silently skips any files for which stat() fails or is not of a "basic" file type (e.g. character devices and such). Returns 0 on success, FSL_RC_TYPE if the given name is not a directory, and FSL_RC_RANGE if it recurses "too deep," (some | | | | > | 5909 5910 5911 5912 5913 5914 5915 5916 5917 5918 5919 5920 5921 5922 5923 5924 5925 5926 5927 5928 5929 | but libfossil does not.) It silently skips any files for which stat() fails or is not of a "basic" file type (e.g. character devices and such). Returns 0 on success, FSL_RC_TYPE if the given name is not a directory, and FSL_RC_RANGE if it recurses "too deep," (some "reasonable" internally hard-coded limit), in order to help avoid a stack overflow. If the callback returns non-0, iteration stops and returns that result code unless the result is FSL_RC_BREAK or FSL_RC_NOOP, with those codes being treated specially, as documented for fsl_dircrawl_f() callbacks. */ FSL_EXPORT int fsl_dircrawl(char const * dirName, fsl_dircrawl_f callback, void * callbackState); /** Strips any trailing slashes ('/') from the given string by assigning those bytes to NUL and returns the number of slashes |
︙ | ︙ | |||
5629 5630 5631 5632 5633 5634 5635 | FSL_LOOKSLIKE_BINARY = FSL_LOOKSLIKE_NUL | FSL_LOOKSLIKE_LONG | FSL_LOOKSLIKE_SHORT, /* Line separators. */ FSL_LOOKSLIKE_EOL = (FSL_LOOKSLIKE_LONE_CR | FSL_LOOKSLIKE_LONE_LF | FSL_LOOKSLIKE_CRLF) }; /** Returns true if b appears to contain "binary" (non-UTF8/16) content, | | | 5977 5978 5979 5980 5981 5982 5983 5984 5985 5986 5987 5988 5989 5990 5991 | FSL_LOOKSLIKE_BINARY = FSL_LOOKSLIKE_NUL | FSL_LOOKSLIKE_LONG | FSL_LOOKSLIKE_SHORT, /* Line separators. */ FSL_LOOKSLIKE_EOL = (FSL_LOOKSLIKE_LONE_CR | FSL_LOOKSLIKE_LONE_LF | FSL_LOOKSLIKE_CRLF) }; /** Returns true if b appears to contain "binary" (non-UTF8/16) content, else returns false. */ FSL_EXPORT bool fsl_looks_like_binary(fsl_buffer const * const b); /** If b appears to contain any non-UTF8 content, returns a truthy value: one or more values from the fsl_lookslike_e enum indicating which sort of data was seen which triggered its conclusion: |
︙ | ︙ | |||
5697 5698 5699 5700 5701 5702 5703 5704 5705 5706 5707 5708 5709 5710 | Returns true if b starts with a UTF8 BOM. If the 2nd argument is not NULL, *pBomSize is set to the number of bytes in the BOM (always 3), regardless of whether or not the function returns true or false. */ FSL_EXPORT bool fsl_starts_with_bom_utf8(fsl_buffer const * const b, unsigned int *pBomSize); #if 0 /** The UTF16 counterpart of fsl_looks_like_utf8(), with the addition that the 2nd argument, if true, specifies that the 2nd argument is true then the contents of the buffer are byte-swapped for checking purposes. This is not validate that the blob is valid UTF16. It assumes that all | > > > > > > > > | 6045 6046 6047 6048 6049 6050 6051 6052 6053 6054 6055 6056 6057 6058 6059 6060 6061 6062 6063 6064 6065 6066 | Returns true if b starts with a UTF8 BOM. If the 2nd argument is not NULL, *pBomSize is set to the number of bytes in the BOM (always 3), regardless of whether or not the function returns true or false. */ FSL_EXPORT bool fsl_starts_with_bom_utf8(fsl_buffer const * const b, unsigned int *pBomSize); /** Populates the first n bytes of tgt with random bytes. Note that n must be 31 bits or less (2GB). The exact source of randomness is not guaranteed by the API, but the implementation currently uses sqlite3_randomness(). */ FSL_EXPORT void fsl_randomness(unsigned int n, void *tgt); #if 0 /** The UTF16 counterpart of fsl_looks_like_utf8(), with the addition that the 2nd argument, if true, specifies that the 2nd argument is true then the contents of the buffer are byte-swapped for checking purposes. This is not validate that the blob is valid UTF16. It assumes that all |
︙ | ︙ | |||
5732 5733 5734 5735 5736 5737 5738 | /* ^^^^ UTF-16 interfaces */ #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_UTIL_H_INCLUDED */ | | | | | 6088 6089 6090 6091 6092 6093 6094 6095 6096 6097 6098 6099 6100 6101 6102 6103 6104 6105 6106 6107 6108 6109 6110 6111 6112 6113 6114 6115 6116 6117 6118 6119 | /* ^^^^ UTF-16 interfaces */ #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_UTIL_H_INCLUDED */ /* end of file ./include/fossil-scm/util.h */ /* start of file ./include/fossil-scm/core.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_CORE_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_CORE_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /** @file core.h This file declares the core SCM-related public APIs. */ #include <time.h> /* struct tm, time_t */ #if defined(__cplusplus) /** |
︙ | ︙ | |||
5852 5853 5854 5855 5856 5857 5858 | fsl_cx_db_repo() and fsl_cx_db_ckout() will always return the same database handle, but they can tell whether a given role has been attached or not and will fail in their documented ways when the role's corresponding database has not yet been attached. e.g. `fsl_cx_db_repo()` will return `NULL` if a repo database is not attached. | | < | 6208 6209 6210 6211 6212 6213 6214 6215 6216 6217 6218 6219 6220 6221 6222 | fsl_cx_db_repo() and fsl_cx_db_ckout() will always return the same database handle, but they can tell whether a given role has been attached or not and will fail in their documented ways when the role's corresponding database has not yet been attached. e.g. `fsl_cx_db_repo()` will return `NULL` if a repo database is not attached. @see fsl_db_role_name() @see fsl_cx_db_file_for_role() */ enum fsl_dbrole_e { /** Sentinel "no role" value. */ FSL_DBROLE_NONE = 0, |
︙ | ︙ | |||
5949 5950 5951 5952 5953 5954 5955 5956 5957 5958 5959 5960 5961 5962 | FSL_CX_F_CALC_R_CARD = 0x01, /** When encounting artifact types in the crosslinking phase which the library does not currently support crosslinking for, skip over them instead of generating an error. For day-to-day use this is, perhaps counter-intuitively, generally desirable. */ FSL_CX_F_SKIP_UNKNOWN_CROSSLINKS = 0x02, /** By default, fsl_reserved_fn_check() will fail if the given filename is reserved on Windows platforms because such filenames cannot be checked out on Windows. This flag removes that limitation. It | > > > > | 6304 6305 6306 6307 6308 6309 6310 6311 6312 6313 6314 6315 6316 6317 6318 6319 6320 6321 | FSL_CX_F_CALC_R_CARD = 0x01, /** When encounting artifact types in the crosslinking phase which the library does not currently support crosslinking for, skip over them instead of generating an error. For day-to-day use this is, perhaps counter-intuitively, generally desirable. As of 2021-12-04, crosslinking of all core fossil artifact types is supported, so this flag is effectively a no-op until/unless a new artifact type is added to fossil. */ FSL_CX_F_SKIP_UNKNOWN_CROSSLINKS = 0x02, /** By default, fsl_reserved_fn_check() will fail if the given filename is reserved on Windows platforms because such filenames cannot be checked out on Windows. This flag removes that limitation. It |
︙ | ︙ | |||
6263 6264 6265 6266 6267 6268 6269 | Special case of FSL_RC_TYPE triggered in some diff APIs, indicating that the API cannot diff what appears to be binary data. */ FSL_RC_DIFF_BINARY, /** Triggered by some diff APIs to indicate that only whitespace changes we found and the diff was requested to ignore whitespace. | | | 6622 6623 6624 6625 6626 6627 6628 6629 6630 6631 6632 6633 6634 6635 6636 | Special case of FSL_RC_TYPE triggered in some diff APIs, indicating that the API cannot diff what appears to be binary data. */ FSL_RC_DIFF_BINARY, /** Triggered by some diff APIs to indicate that only whitespace changes we found and the diff was requested to ignore whitespace. */ FSL_RC_DIFF_WS_ONLY, /** Intended to be used with fsl_cx_interrupt() by signal handlers and UI threads. */ FSL_RC_INTERRUPTED, |
︙ | ︙ | |||
6318 6319 6320 6321 6322 6323 6324 | /** Returns the value of FSL_LIBRARY_VERSION used to compile the library. If this value differs from the value the caller was compiled with, Chaos might ensue. The API does not yet have any mechanism for determining | | | | | > > | 6677 6678 6679 6680 6681 6682 6683 6684 6685 6686 6687 6688 6689 6690 6691 6692 6693 6694 6695 6696 6697 6698 6699 6700 | /** Returns the value of FSL_LIBRARY_VERSION used to compile the library. If this value differs from the value the caller was compiled with, Chaos might ensue. The API does not yet have any mechanism for determining compatibility between library versions and it also currently does no explicit checking to disallow incompatible versions. */ FSL_EXPORT char const * fsl_library_version(); /** Returns true (non-0) if yourLibVersion compares lexically equal to FSL_LIBRARY_VERSION, else it returns false (0). It is intended to be passed the FSL_LIBRARY_VERSION string the client code was built with. */ FSL_EXPORT bool fsl_library_version_matches(char const * yourLibVersion); /** This type, accessible to clients via the ::fsl_lib_configurable global, contains configuration-related data for the library which can be swapped out by clients. |
︙ | ︙ | |||
6364 6365 6366 6367 6368 6369 6370 | /** A part of the configuration used by fsl_cx_init() and friends. */ struct fsl_cx_config { /** If true, all SQL which goes through the fossil engine | | > > | 6725 6726 6727 6728 6729 6730 6731 6732 6733 6734 6735 6736 6737 6738 6739 6740 6741 | /** A part of the configuration used by fsl_cx_init() and friends. */ struct fsl_cx_config { /** If true, all SQL which goes through the fossil engine will be traced to stdout. TODO: replace this with a FILE pointer. */ bool traceSql; /** If true, the fsl_print() SQL function will output its output to the fsl_output()-configured channel, else it is a no-op. */ bool sqlPrint; |
︙ | ︙ | |||
6553 6554 6555 6556 6557 6558 6559 | of the parameters and return value. */ FSL_EXPORT int fsl_cx_err_get( fsl_cx * const f, char const ** str, fsl_size_t * len ); /** Returns f's error state object. This pointer is guaranteed by the API to be stable until f is finalized, but its contents are | | < < | 6916 6917 6918 6919 6920 6921 6922 6923 6924 6925 6926 6927 6928 6929 6930 | of the parameters and return value. */ FSL_EXPORT int fsl_cx_err_get( fsl_cx * const f, char const ** str, fsl_size_t * len ); /** Returns f's error state object. This pointer is guaranteed by the API to be stable until f is finalized, but its contents are modified by many routines as part of the error reporting process. */ FSL_EXPORT fsl_error const * fsl_cx_err_get_e(fsl_cx const * f); /** Resets's f's error state, basically equivalent to fsl_cx_err_set(f,0,NULL). This may be necessary for apps if they rely on looking at fsl_cx_err_get() at the end of their |
︙ | ︙ | |||
6676 6677 6678 6679 6680 6681 6682 | FSL_EXPORT int fsl_outputf( fsl_cx * const f, char const * fmt, ... ); /** va_list counterpart to fsl_outputf(). */ FSL_EXPORT int fsl_outputfv( fsl_cx * const f, char const * fmt, va_list args ); | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 7037 7038 7039 7040 7041 7042 7043 7044 7045 7046 7047 7048 7049 7050 | FSL_EXPORT int fsl_outputf( fsl_cx * const f, char const * fmt, ... ); /** va_list counterpart to fsl_outputf(). */ FSL_EXPORT int fsl_outputfv( fsl_cx * const f, char const * fmt, va_list args ); /** Sets or clears (if userName is NULL or empty) the default repository user name for operations which require one. Returns 0 on success, FSL_RC_MISUSE if f is NULL, FSL_RC_OOM if copying of the userName fails. |
︙ | ︙ | |||
6779 6780 6781 6782 6783 6784 6785 | be invalidated by any future calls to fsl_cx_user_set(). @see fsl_cx_user_guess() */ FSL_EXPORT char const * fsl_cx_user_get( fsl_cx const * const f ); /** | < < < < | < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | 7080 7081 7082 7083 7084 7085 7086 7087 7088 7089 7090 7091 7092 7093 7094 7095 7096 7097 | be invalidated by any future calls to fsl_cx_user_set(). @see fsl_cx_user_guess() */ FSL_EXPORT char const * fsl_cx_user_get( fsl_cx const * const f ); /** Functionally equivalent to calling fsl_config_close() and fsl_close_scm_dbs(). This will fail if any transactions are pending. Any databases which are already closed are silently skipped. This will fail if any cached statements are currently active for the being-closed db(s). "Active" means that fsl_db_prepare_cached() was used without a corresponding call to fsl_stmt_cached_yield(). */ FSL_EXPORT int fsl_cx_close_dbs( fsl_cx * const f ); |
︙ | ︙ | |||
7106 7107 7108 7109 7110 7111 7112 | Note that the role of FSL_DBROLE_TEMP is invalid here. */ FSL_EXPORT char const * fsl_cx_db_file_for_role(fsl_cx const * f, fsl_dbrole_e r, fsl_size_t * len); | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 7143 7144 7145 7146 7147 7148 7149 7150 7151 7152 7153 7154 7155 7156 | Note that the role of FSL_DBROLE_TEMP is invalid here. */ FSL_EXPORT char const * fsl_cx_db_file_for_role(fsl_cx const * f, fsl_dbrole_e r, fsl_size_t * len); /** If f has an opened checkout db (from fsl_ckout_open_dir()) then this function returns the directory part of the path for the checkout, including (for historical and internal convenience reasons) a trailing slash. The returned bytes are valid until that db connection is closed. If len is not NULL then *len is (on success) assigned to the length of the returned string, in bytes. |
︙ | ︙ | |||
7157 7158 7159 7160 7161 7162 7163 | */ FSL_EXPORT char const * fsl_cx_ckout_dir_name(fsl_cx const * f, fsl_size_t * len); /** Returns a handle to f's main db (which may or may not have any relationship to the repo/checkout/config databases - that's | | | > > > > | | | | > | 7164 7165 7166 7167 7168 7169 7170 7171 7172 7173 7174 7175 7176 7177 7178 7179 7180 7181 7182 7183 7184 7185 7186 7187 7188 7189 7190 7191 7192 7193 7194 7195 7196 7197 7198 7199 7200 7201 7202 7203 7204 7205 7206 | */ FSL_EXPORT char const * fsl_cx_ckout_dir_name(fsl_cx const * f, fsl_size_t * len); /** Returns a handle to f's main db (which may or may not have any relationship to the repo/checkout/config databases - that's unspecified!), or NULL if f has no opened repo or checkout db. The returned object is owned by f and the client MUST NOT do any of the following: - Close the db handle. - Use transactions without using fsl_db_transaction_begin() and friends. - Fiddle with the handle's internals. Doing so might confuse its owning context. Clients MAY add new user-defined functions, use the handle with fsl_db_prepare(), and other "mundane" db-related tasks. Note that the global config db uses a separate db handle accessible via fsl_cx_db_config(). Design notes: The current architecture uses an in-memory db as the "main" db and attaches the repo and checkout dbs using well-defined names. Even so, it uses separate fsl_db instances to track each one so that we "could," if needed, switch back to a multi-db-instance approach if needed. @see fsl_cx_db_repo() @see fsl_cx_db_ckout() @see fsl_cx_db_config() */ FSL_EXPORT fsl_db * fsl_cx_db( fsl_cx * const f ); /** If f is not NULL and has had its repo opened via fsl_repo_open(), fsl_ckout_open_dir(), or similar, this returns a pointer to that database, else it returns NULL. |
︙ | ︙ | |||
7241 7242 7243 7244 7245 7246 7247 | /** Opens the given database file as f's configuration database. If f already has a config database opened then: 1) If passed a NULL dbName or dbName is an empty string then this | | < < < < < < < < < | > > > | | > > > | | | | > > > | | > > > | 7253 7254 7255 7256 7257 7258 7259 7260 7261 7262 7263 7264 7265 7266 7267 7268 7269 7270 7271 7272 7273 7274 7275 7276 7277 7278 7279 7280 7281 7282 7283 7284 7285 7286 7287 7288 7289 7290 7291 7292 7293 7294 7295 7296 7297 7298 7299 7300 7301 7302 7303 7304 7305 7306 7307 7308 7309 7310 7311 7312 7313 7314 7315 7316 7317 | /** Opens the given database file as f's configuration database. If f already has a config database opened then: 1) If passed a NULL dbName or dbName is an empty string then this function returns 0 without side-effects. 2) If passed a non-NULL/non-empty dbName, any existing config db is closed before opening the named one. The database is created and populated with an initial schema if needed. If dbName is NULL or empty then it uses a default db name, "probably" under the user's home directory (see fsl_config_global_preferred_name()). To get the name of the database after it has been opened/attached, use fsl_cx_db_file_config(). Results are undefined if f is NULL or not properly initialized. @see fsl_cx_db_config() @see fsl_config_close() @see fsl_config_global_preferred_name() */ FSL_EXPORT int fsl_config_open( fsl_cx * const f, char const * dbName ); /** Closes/detaches the database connection opened by fsl_config_open(). If the config db is not opened, this is a harmless no-op. Note that it does not propagate db-closing errors because there is no sensible recovery strategy from such cases. This operation only fails if the config db is opened and has an active transaction, in which case f's error state is updated to reflect that cause of the error. ACHTUNG: it is imperative that any prepared statements compiled against the config db be finalized before closing the db. Any statements prepared using fsl_db_prepare_cached() against the config db will be automatically finalized by the closing process. Potential TODO: if a transaction is pending, force a rollback and close the db anyway. If we do that, this function will change to return void. @see fsl_cx_db_config() @see fsl_config_open() */ FSL_EXPORT int fsl_config_close( fsl_cx * const f ); /** If f has an opened configuration db then its handle is returned, else 0 is returned. For API consistency's sake, the db handle's "MAIN" name is aliased to fsl_db_role_name(FSL_DBROLE_CONFIG). @see fsl_config_open() @see fsl_config_close() */ FSL_EXPORT fsl_db * fsl_cx_db_config( fsl_cx * const f ); /** |
︙ | ︙ | |||
7417 7418 7419 7420 7421 7422 7423 | Returns 0 on success. On stat() error, nameOut is not updated, but after stat()'ing, allocation of memory for nameOut's buffer may fail. If zName ends with a trailing slash, that slash is retained in nameOut. | | | | | | > > > > | | | > > > | | 7432 7433 7434 7435 7436 7437 7438 7439 7440 7441 7442 7443 7444 7445 7446 7447 7448 7449 7450 7451 7452 7453 7454 7455 7456 7457 7458 7459 7460 7461 7462 7463 7464 7465 7466 7467 7468 7469 7470 7471 7472 7473 7474 7475 7476 7477 7478 7479 7480 7481 | Returns 0 on success. On stat() error, nameOut is not updated, but after stat()'ing, allocation of memory for nameOut's buffer may fail. If zName ends with a trailing slash, that slash is retained in nameOut. This function DOES NOT resolve symlinks, stat()ing the link instead of what it points to. @see fsl_cx_stat() */ FSL_EXPORT int fsl_cx_stat2( fsl_cx * const f, bool relativeToCwd, char const * zName, fsl_fstat * const tgt, fsl_buffer * const nameOut, bool fullPath); /** Sets the case-sensitivity flag for f to the given value. This flag alters how some filename-search/comparison operations operate. This option is only intended to have an effect on plaforms with case-insensitive filesystems. Note that this does not save the option in the config database (repo-level "case-sensitive" boolean config option). It arguably should, and this behavior may change in the future. @see fsl_cx_is_case_sensitive() */ FSL_EXPORT void fsl_cx_case_sensitive_set(fsl_cx * const f, bool caseSensitive); /** Returns true if f is set for case-sensitive filename handling, else false. This setting is cached when a repository is opened, but passing true for the second argument forces the config option to be re-loaded from the repository db. Results are undefined if !f. @see fsl_cx_case_sensitive_set() */ FSL_EXPORT bool fsl_cx_is_case_sensitive(fsl_cx * const f, bool forceRecheck); /** If f is set to use case-sensitive filename handling, returns a pointer to an empty string, otherwise a pointer to the string "COLLATE nocase" is returned. Results are undefined if f is NULL. The returned bytes are static. |
︙ | ︙ | |||
7649 7650 7651 7652 7653 7654 7655 | - "ignore-glob" = FSL_GLOBS_IGNORE - "binary-glob" = FSL_GLOBS_BINARY - "crnl-glob" = FSL_GLOBS_CRNL - Anything else = FSL_GLOBS_INVALID To simplify this function's use via an SQL-accessible UDF, the `*-glob` names may be passed in without their `-glob` suffix, | | | 7671 7672 7673 7674 7675 7676 7677 7678 7679 7680 7681 7682 7683 7684 7685 | - "ignore-glob" = FSL_GLOBS_IGNORE - "binary-glob" = FSL_GLOBS_BINARY - "crnl-glob" = FSL_GLOBS_CRNL - Anything else = FSL_GLOBS_INVALID To simplify this function's use via an SQL-accessible UDF, the `*-glob` names may be passed in without their `-glob` suffix, e.g. `"ignore"` instead of `"ignore-glob"`. */ FSL_EXPORT fsl_glob_category_e fsl_glob_name_to_category(char const * str); /** Fetches f's glob list of the given category. If forceReload is true then the context will check whether the list has had any content added to its source since it was initially loaded. |
︙ | ︙ | |||
7736 7737 7738 7739 7740 7741 7742 | const char * zFilename, fsl_buffer * pOut); /** Works like fsl_getcwd() but updates f's error state on error and appends the current directory's name to the given buffer. Returns 0 on success. */ | | | 7758 7759 7760 7761 7762 7763 7764 7765 7766 7767 7768 7769 7770 7771 7772 | const char * zFilename, fsl_buffer * pOut); /** Works like fsl_getcwd() but updates f's error state on error and appends the current directory's name to the given buffer. Returns 0 on success. */ FSL_EXPORT int fsl_cx_getcwd(fsl_cx * const f, fsl_buffer * const pOut); /** Returns the same as passing fsl_cx_db() to fsl_db_transaction_level(), or 0 if f has no db opened. @see fsl_cx_db() */ |
︙ | ︙ | |||
7885 7886 7887 7888 7889 7890 7891 | The va_list counterpart of fsl_cx_interrupt(). */ FSL_EXPORT int fsl_cx_interruptv(fsl_cx * const f, int code, char const * fmt, va_list args); /** If f's is-interrupted flag is set, this function returns its value. Note that there is inherently a race condition when calling | | > > > > > > > > > > > > > > > > > > > | 7907 7908 7909 7910 7911 7912 7913 7914 7915 7916 7917 7918 7919 7920 7921 7922 7923 7924 7925 7926 7927 7928 7929 7930 7931 7932 7933 7934 7935 7936 7937 7938 7939 7940 7941 7942 7943 7944 | The va_list counterpart of fsl_cx_interrupt(). */ FSL_EXPORT int fsl_cx_interruptv(fsl_cx * const f, int code, char const * fmt, va_list args); /** If f's is-interrupted flag is set, this function returns its value. Note that there is inherently a race condition when calling fsl_cx_interrupt() (to set the flag) from another thread (e.g. a UI thread while showing a progress indicator). */ FSL_EXPORT int fsl_cx_interrupted(fsl_cx const * const f); /** Returns true if f has the "allow-symlinks" repo-level configuration option set to a truthy value, else returns false. That setting is cached to avoid performing a db lookup on each call, but passing true for the second argument causes the repository to be re-checked. */ FSL_EXPORT bool fsl_cx_allows_symlinks(fsl_cx * const f, bool forceRecheck); /** Closes any opened repository and/or checkout database(s) opened by f. Returns 0 on success or if no dbs are opened (noting that this does NOT close the separate global configuration db: see fsl_config_close()). Returns FSL_RC_MISUSE if the opened SCM db(s) have an opened transaction, but that behaviour may change in the future to force a rollback and close the database(s). */ FSL_EXPORT int fsl_close_scm_dbs(fsl_cx * const f); #if 0 /** DO NOT USE - not yet tested and ready. Returns the result of either localtime(clock) or gmtime(clock), depending on f: |
︙ | ︙ | |||
7929 7930 7931 7932 7933 7934 7935 | */ FSL_EXPORT time_t fsl_cx_time_adj(fsl_cx const * f, time_t clock); #endif #if defined(__cplusplus) } /*extern "C"*/ #endif | < | | | | 7970 7971 7972 7973 7974 7975 7976 7977 7978 7979 7980 7981 7982 7983 7984 7985 7986 | */ FSL_EXPORT time_t fsl_cx_time_adj(fsl_cx const * f, time_t clock); #endif #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_CORE_H_INCLUDED */ /* end of file ./include/fossil-scm/core.h */ /* start of file ./include/fossil-scm/db.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_DB_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_DB_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt |
︙ | ︙ | |||
7958 7959 7960 7961 7962 7963 7964 | */ /* We don't _really_ want to include sqlite3.h at this point, but if we do not then we have to typedef the sqlite3 struct here and that breaks when client code includes both this file and sqlite3.h. */ | < | 7998 7999 8000 8001 8002 8003 8004 8005 8006 8007 8008 8009 8010 8011 | */ /* We don't _really_ want to include sqlite3.h at this point, but if we do not then we have to typedef the sqlite3 struct here and that breaks when client code includes both this file and sqlite3.h. */ #if defined(__cplusplus) extern "C" { #endif #if 0 /** |
︙ | ︙ | |||
7983 7984 7985 7986 7987 7988 7989 | #define fsl_commit_hook_empty_m {NULL,0,NULL} typedef struct fsl_commit_hook fsl_commit_hook; /* extern const fsl_commit_hook fsl_commit_hook_empty; */ /** Potential TODO. */ | | | 8022 8023 8024 8025 8026 8027 8028 8029 8030 8031 8032 8033 8034 8035 8036 | #define fsl_commit_hook_empty_m {NULL,0,NULL} typedef struct fsl_commit_hook fsl_commit_hook; /* extern const fsl_commit_hook fsl_commit_hook_empty; */ /** Potential TODO. */ FSL_EXPORT int fsl_db_before_commit_hook( fsl_db * const db, fsl_commit_hook_f f, int sequence, void * state ); #endif #if 0 /* We can't do this because it breaks when clients include both this header and sqlite3.h. Is there a solution which lets us _not_ include sqlite3.h from this file and also compiles when |
︙ | ︙ | |||
8026 8027 8028 8029 8030 8031 8032 8033 8034 8035 8036 8037 8038 8039 | in read-write mode, but should not create the db if it does not already exist. */ FSL_OPEN_F_RW = 0x02, /** Flag for fsl_db_open() specifying that the db should be opened in read-write mode, creating the db if it does not already exist. */ FSL_OPEN_F_CREATE = 0x04, /** Shorthand for RW+CREATE flags. */ FSL_OPEN_F_RWC = FSL_OPEN_F_RW | FSL_OPEN_F_CREATE, /** | > > > > > > > > > > > > > | | > | | 8065 8066 8067 8068 8069 8070 8071 8072 8073 8074 8075 8076 8077 8078 8079 8080 8081 8082 8083 8084 8085 8086 8087 8088 8089 8090 8091 8092 8093 8094 8095 8096 8097 8098 8099 8100 8101 8102 8103 8104 8105 8106 | in read-write mode, but should not create the db if it does not already exist. */ FSL_OPEN_F_RW = 0x02, /** Flag for fsl_db_open() specifying that the db should be opened in read-write mode, creating the db if it does not already exist. ACHTUNG: this flag propagates from an OPEN'd db handle to the ATTACH SQL command run via that handle, such that ATTACHing a non-existing db file will fail if the FSL_OPEN_F_CREATE flag is _not_ used. Historically (prior to 2022-01-01), fsl_db_open() would automatically apply this flag to DBs named ":memory:" or "" (unnamed temp dbs), but that ended up causing a full day of confusion, hair-pulling, and bug-hunting when lib-level code was migrated from an anonymous temp db to a "real" db and ATTACH suddenly failed. As of 2022-01-01, fsl_db_open() always takes the open-mode flags as provided by the client, regardless of the DB name, and never automatically rewrites them to include FSL_OPEN_F_CREATE. */ FSL_OPEN_F_CREATE = 0x04, /** Shorthand for RW+CREATE flags. */ FSL_OPEN_F_RWC = FSL_OPEN_F_RW | FSL_OPEN_F_CREATE, /** Currently unused. It "should" be used to tell fsl_repo_open_xxx() to confirm that the db is a repository, but how to propagate that through the corresponding APIs is not currently clear. */ FSL_OPEN_F_SCHEMA_VALIDATE = 0x20, /** Used by fsl_db_open() to to tell the underlying db connection to trace all SQL to stdout. This is often useful for testing, debugging, and learning about what's going on behind the scenes. */ FSL_OPEN_F_TRACE_SQL = 0x40 }; /** |
︙ | ︙ | |||
8437 8438 8439 8440 8441 8442 8443 | Returns NULL on allocation error. */ FSL_EXPORT fsl_stmt * fsl_stmt_malloc(); /** | | | < | 8490 8491 8492 8493 8494 8495 8496 8497 8498 8499 8500 8501 8502 8503 8504 8505 | Returns NULL on allocation error. */ FSL_EXPORT fsl_stmt * fsl_stmt_malloc(); /** Behaves like fsl_error_get(), using the db's underlying error state. Results are undefined if !db. */ FSL_EXPORT int fsl_db_err_get( fsl_db const * const db, char const ** msg, fsl_size_t * len ); /** Resets any error state in db, but might keep the string memory allocated for later use. |
︙ | ︙ | |||
8653 8654 8655 8656 8657 8658 8659 | copying fsl_stmt_empty so that this function knows whether or not to fsl_free() them). Returns FSL_RC_MISUSE if !stmt or it has already been finalized (but was not freed). */ FSL_EXPORT int fsl_stmt_finalize( fsl_stmt * const stmt ); /** | | | > > > | | | | > > > | 8705 8706 8707 8708 8709 8710 8711 8712 8713 8714 8715 8716 8717 8718 8719 8720 8721 8722 8723 8724 8725 8726 8727 8728 8729 8730 8731 8732 8733 8734 8735 8736 8737 8738 | copying fsl_stmt_empty so that this function knows whether or not to fsl_free() them). Returns FSL_RC_MISUSE if !stmt or it has already been finalized (but was not freed). */ FSL_EXPORT int fsl_stmt_finalize( fsl_stmt * const stmt ); /** "Steps" the given SQL cursor one time. The return values FSL_RC_STEP_ROW and FSL_RC_STEP_DONE are both success cases, the former indicating that one row has been fetched and the latter indicating that either no rows are left to fetch or the statement is a non-fetching query. On error some other non-zero code will be returned. On a db error this will update the underlying db's error state. This function increments stmt->rowCount by 1 if it returns FSL_RC_STEP_ROW. Returns FSL_RC_MISUSE if !stmt or stmt has not been prepared. It is only legal to call the fsl_stmt_g_xxx() and fsl_stmt_get_xxx() functions if this functon returns FSL_RC_STEP_ROW. FSL_RC_STEP_DONE is returned upon successfully ending iteration or if there is no iteration to perform (e.g. typically an UPDATE or INSERT, but see the next paragraph). Though the historical definition of non-fetching query was pretty clear, the addition of the RETURNING keyword to sqlite3's dialect means that even an INSERT or DELETE can return data. @see fsl_stmt_reset() @see fsl_stmt_reset2() @see fsl_stmt_each() */ FSL_EXPORT int fsl_stmt_step( fsl_stmt * const stmt ); |
︙ | ︙ | |||
8739 8740 8741 8742 8743 8744 8745 | /** Equivalent to fsl_stmt_reset2(stmt, 0). */ FSL_EXPORT int fsl_stmt_reset( fsl_stmt * const stmt ); /** Returns the db handle which prepared the given statement, or | | | | | | | | 8797 8798 8799 8800 8801 8802 8803 8804 8805 8806 8807 8808 8809 8810 8811 8812 8813 8814 8815 8816 8817 8818 8819 8820 | /** Equivalent to fsl_stmt_reset2(stmt, 0). */ FSL_EXPORT int fsl_stmt_reset( fsl_stmt * const stmt ); /** Returns the db handle which prepared the given statement, or NULL if stmt has not been prepared. */ FSL_EXPORT fsl_db * fsl_stmt_db( fsl_stmt * const stmt ); /** Returns the SQL string used to prepare the given statement, or NULL if stmt has not been prepared. If len is not NULL then *len is set to the length of the returned string (which is NUL-terminated). The returned bytes are owned by stmt and are invalidated when it is finalized. */ FSL_EXPORT char const * fsl_stmt_sql( fsl_stmt * const stmt, fsl_size_t * const len ); /** Returns the name of the given 0-based result column index, or NULL if !stmt, stmt is not prepared, or index is out out of |
︙ | ︙ | |||
8775 8776 8777 8778 8779 8780 8781 | */ FSL_EXPORT char const * fsl_stmt_col_name(fsl_stmt * const stmt, int index); /** Returns the result column count for the given statement, or -1 if !stmt or it has not been prepared. Note that this value is cached when the statement is created. Note that non-fetching queries | | | > | | 8833 8834 8835 8836 8837 8838 8839 8840 8841 8842 8843 8844 8845 8846 8847 8848 8849 8850 | */ FSL_EXPORT char const * fsl_stmt_col_name(fsl_stmt * const stmt, int index); /** Returns the result column count for the given statement, or -1 if !stmt or it has not been prepared. Note that this value is cached when the statement is created. Note that non-fetching queries (e.g. INSERT and UPDATE) have a column count of 0 unless they have a RETURNING clause. Some non-SELECT constructs, e.g. PRAGMA table_info(tname) and INSERT/UPDATE/DELETE with a RETURNING clause, behave like a SELECT and have a positive column count. @see fsl_stmt_param_count() @see fsl_stmt_col_name() */ FSL_EXPORT int fsl_stmt_col_count( fsl_stmt const * const stmt ); /** |
︙ | ︙ | |||
8976 8977 8978 8979 8980 8981 8982 | Gets a string value from the given 0-based result set column, assigns *out (if out is not NULL) to that value, assigns *outLen (if outLen is not NULL) to *out's length in bytes, and returns 0 on success. Ownership of the string memory is unchanged - it is owned by the statement and the caller should immediately copy it if it will be needed for much longer. | | | > > | | > > | | | > > > | 9035 9036 9037 9038 9039 9040 9041 9042 9043 9044 9045 9046 9047 9048 9049 9050 9051 9052 9053 9054 9055 9056 9057 9058 9059 9060 9061 9062 9063 9064 9065 9066 9067 9068 9069 9070 9071 9072 9073 9074 9075 9076 9077 9078 9079 9080 9081 9082 9083 9084 9085 9086 9087 9088 | Gets a string value from the given 0-based result set column, assigns *out (if out is not NULL) to that value, assigns *outLen (if outLen is not NULL) to *out's length in bytes, and returns 0 on success. Ownership of the string memory is unchanged - it is owned by the statement and the caller should immediately copy it if it will be needed for much longer. Returns FSL_RC_RANGE if index is out of range for stmt, FSL_RC_MISUSE if stmt has no result columns. Returns FSL_RC_OOM if fetching the text from the underlying statement handle fails due to an allocation error. */ FSL_EXPORT int fsl_stmt_get_text( fsl_stmt * const stmt, int index, char const **out, fsl_size_t * outLen ); /** The Blob counterpart of fsl_stmt_get_text(). Identical to that function except that its output result (3rd paramter) type differs, and it fetches the data as a raw blob, without any sort of string interpretation. Returns FSL_RC_RANGE if index is out of range for stmt, FSL_RC_MISUSE if stmt has no result columns. Returns FSL_RC_OOM if fetching the text from the underlying statement handle fails due to an allocation error. */ FSL_EXPORT int fsl_stmt_get_blob( fsl_stmt * const stmt, int index, void const **out, fsl_size_t * outLen ); /** Executes multiple SQL statements, ignoring any results they might collect. Returns 0 on success, non-0 on error. On error db->error might be updated to report the problem. */ FSL_EXPORT int fsl_db_exec_multi( fsl_db * const db, const char * sql, ...); /** va_list counterpart of db_exec_multi(). */ FSL_EXPORT int fsl_db_exec_multiv( fsl_db * const db, const char * sql, va_list args); /** Executes a single SQL statement, skipping over any results it may have. Returns 0 on success. On error db's error state may be updated. Note that this function translates FSL_RC_STEP_DONE and FSL_RC_STEP_ROW to 0. For cases where those particular result codes are significant, use fsl_db_prepare() and fsl_stmt_step() (for which this function is just a proxy). */ FSL_EXPORT int fsl_db_exec( fsl_db * const db, char const * sql, ... ); /** va_list counterpart of fs_db_exec(). */ FSL_EXPORT int fsl_db_execv( fsl_db * const db, char const * sql, va_list args ); |
︙ | ︙ | |||
9066 9067 9068 9069 9070 9071 9072 | /** Equivalent to fsl_db_transaction_end(db, 1). */ FSL_EXPORT int fsl_db_transaction_rollback(fsl_db * const db); /** | | | | | | | | > > > > | | | | < | | | > > > > > > > > > > > > > > | 9132 9133 9134 9135 9136 9137 9138 9139 9140 9141 9142 9143 9144 9145 9146 9147 9148 9149 9150 9151 9152 9153 9154 9155 9156 9157 9158 9159 9160 9161 9162 9163 9164 9165 9166 9167 9168 9169 9170 9171 9172 9173 9174 9175 9176 9177 9178 9179 9180 9181 9182 9183 9184 9185 9186 9187 9188 9189 9190 9191 9192 9193 9194 9195 9196 9197 9198 9199 | /** Equivalent to fsl_db_transaction_end(db, 1). */ FSL_EXPORT int fsl_db_transaction_rollback(fsl_db * const db); /** Forces a rollback of any pending transaction in db, regardless of the internal transaction begin/end counter. Returns FSL_RC_MISUSE if db is not opened, else returns the value of the underlying ROLLBACK call. This also re-sets/frees any transaction-related state held by db (e.g. db->beforeCommit). Use with care, as this mucks about with db state in a way which is not all that pretty and it may confuse downstream code. Returns 0 on success. Never, ever use this. In 8+ years it has never proven necessary to use this function, and doing so can easily lead to a mismatch in transaction-using code and the transaction stack level. */ FSL_EXPORT int fsl_db_rollback_force(fsl_db * const db); /** Decrements the transaction counter incremented by fsl_db_transaction_begin() and commits or rolls back the transaction if the counter goes to 0. If doRollback is true then this rolls back (or schedules a rollback of) a transaction started by fsl_db_transaction_begin(). If doRollback is false is commits (or schedules a commit). If db fsl_db_transaction_begin() is used in a nested manner and doRollback is true for any one of the nested calls, then that value will be remembered, such that the downstream calls to this function within the same transaction will behave like a rollback even if they pass 0 for the second argument. Returns FSL_RC_MISUSE if db is not opened, 0 if the transaction counter is above 0, else the result of the (potentially many) underlying database operations. Unfortunate low-level co-dependency: if db->f is not NULL then this function may perform extra repository-related post-processing on any commit, and checking the result code is particularly important for those cases. Sidebar: this APIs pseudo-nested transaction support was initially a direct port of that from fossil(1). sqlite3 added SAVEPOINT support, which is essentially named, nested transaction, much later on. That support may have been a better basis for this API, but it didn't exist at the time and an overhaul would be both time-consuming and risk all sorts of new bugs. SAVEPOINTS: https://sqlite.org/lang_savepoint.html Though this API does not prohibit the use of savepoints (like it does direct use of BEGIN/COMMIT/ROLLBACK from SQL code), it is untested with them and undesired side effects vis a vis this API's transaction support cannot be entirely ruled out. */ FSL_EXPORT int fsl_db_transaction_end(fsl_db * const db, bool doRollback); /** Returns the given db's current transaction depth. If the value is negative, its absolute value represents the depth but indicates that a rollback is pending. If it is positive, the transaction is |
︙ | ︙ | |||
9164 9165 9166 9167 9168 9169 9170 | int32_t defaultValue, char const * sql, ... ); /** The int64 counterpart of fsl_db_get_int32(). See that function for the semantics. */ | | | | | | | | | | > | | | | | | | | | | | | | | | | | | | | | 9247 9248 9249 9250 9251 9252 9253 9254 9255 9256 9257 9258 9259 9260 9261 9262 9263 9264 9265 9266 9267 9268 9269 9270 9271 9272 9273 9274 9275 9276 9277 9278 9279 9280 9281 9282 9283 9284 9285 9286 9287 9288 9289 9290 9291 9292 9293 9294 9295 9296 9297 9298 9299 9300 9301 9302 9303 9304 9305 9306 9307 9308 9309 9310 9311 9312 9313 9314 9315 9316 9317 9318 9319 9320 9321 9322 9323 9324 9325 9326 9327 9328 9329 9330 9331 9332 9333 9334 9335 9336 9337 9338 9339 9340 9341 9342 9343 9344 9345 9346 9347 9348 9349 9350 9351 9352 9353 9354 9355 9356 9357 9358 9359 9360 9361 9362 9363 9364 9365 9366 9367 9368 9369 9370 9371 9372 9373 9374 9375 9376 9377 9378 9379 9380 9381 9382 9383 9384 9385 9386 9387 9388 9389 9390 9391 9392 9393 9394 9395 9396 9397 9398 9399 9400 9401 9402 9403 9404 9405 9406 9407 9408 9409 9410 9411 9412 9413 9414 9415 9416 9417 9418 9419 9420 9421 9422 9423 9424 9425 9426 9427 9428 9429 9430 9431 9432 9433 9434 9435 9436 9437 9438 9439 9440 9441 9442 9443 9444 9445 9446 9447 | int32_t defaultValue, char const * sql, ... ); /** The int64 counterpart of fsl_db_get_int32(). See that function for the semantics. */ FSL_EXPORT int fsl_db_get_int64( fsl_db * const db, int64_t * rv, char const * sql, ... ); /** va_list counterpart of fsl_db_get_int64(). */ FSL_EXPORT int fsl_db_get_int64v( fsl_db * const db, int64_t * rv, char const * sql, va_list args); /** Convenience form of fsl_db_get_int64() which returns the value directly but provides no way of checking for errors. On error, or if no result is found, defaultValue is returned. */ FSL_EXPORT int64_t fsl_db_g_int64( fsl_db * const db, int64_t defaultValue, char const * sql, ... ); /** The fsl_id_t counterpart of fsl_db_get_int32(). See that function for the semantics. */ FSL_EXPORT int fsl_db_get_id( fsl_db * const db, fsl_id_t * rv, char const * sql, ... ); /** va_list counterpart of fsl_db_get_id(). */ FSL_EXPORT int fsl_db_get_idv( fsl_db * const db, fsl_id_t * rv, char const * sql, va_list args); /** Convenience form of fsl_db_get_id() which returns the value directly but provides no way of checking for errors. On error, or if no result is found, defaultValue is returned. */ FSL_EXPORT fsl_id_t fsl_db_g_id( fsl_db * const db, fsl_id_t defaultValue, char const * sql, ... ); /** The fsl_size_t counterpart of fsl_db_get_int32(). See that function for the semantics. If this function would fetch a negative value, it returns FSL_RC_RANGE and *rv is not modified. */ FSL_EXPORT int fsl_db_get_size( fsl_db * const db, fsl_size_t * rv, char const * sql, ... ); /** va_list counterpart of fsl_db_get_size(). */ FSL_EXPORT int fsl_db_get_sizev( fsl_db * const db, fsl_size_t * rv, char const * sql, va_list args); /** Convenience form of fsl_db_get_size() which returns the value directly but provides no way of checking for errors. On error, or if no result is found, defaultValue is returned. */ FSL_EXPORT fsl_size_t fsl_db_g_size( fsl_db * const db, fsl_size_t defaultValue, char const * sql, ... ); /** The double counterpart of fsl_db_get_int32(). See that function for the semantics. */ FSL_EXPORT int fsl_db_get_double( fsl_db * const db, double * rv, char const * sql, ... ); /** va_list counterpart of fsl_db_get_double(). */ FSL_EXPORT int fsl_db_get_doublev( fsl_db * const db, double * rv, char const * sql, va_list args); /** Convenience form of fsl_db_get_double() which returns the value directly but provides no way of checking for errors. On error, or if no result is found, defaultValue is returned. */ FSL_EXPORT double fsl_db_g_double( fsl_db * const db, double defaultValue, char const * sql, ... ); /** The C-string counterpart of fsl_db_get_int32(). On success *rv will be set to a dynamically allocated string copied from the first column of the first result row. If rvLen is not NULL then *rvLen will be assigned the byte-length of that string. If no row is found, *rv is set to NULL and *rvLen (if not NULL) is set to 0, and 0 is returned. Note that NULL is also a legal result (an SQL NULL translates as a NULL string), The caller must eventually free the returned string value using fsl_free(). */ FSL_EXPORT int fsl_db_get_text( fsl_db * const db, char ** rv, fsl_size_t * rvLen, char const * sql, ... ); /** va_list counterpart of fsl_db_get_text(). */ FSL_EXPORT int fsl_db_get_textv( fsl_db * const db, char ** rv, fsl_size_t * rvLen, char const * sql, va_list args ); /** Convenience form of fsl_db_get_text() which returns the value directly but provides no way of checking for errors. On error, or if no result is found, NULL is returned. The returned string must eventually be passed to fsl_free() to free it. If len is not NULL then if non-NULL is returned, *len will be assigned the byte-length of the returned string. */ FSL_EXPORT char * fsl_db_g_text( fsl_db * const db, fsl_size_t * len, char const * sql, ... ); /** The Blob counterpart of fsl_db_get_text(). Identical to that function except that its output result (2nd paramter) type differs, and it fetches the data as a raw blob, without any sort of string interpretation. The returned *rv memory must eventually be passed to fsl_free() to free it. If len is not NULL then on success *len will be set to the byte length of the returned blob. If no row is found, *rv is set to NULL and *rvLen (if not NULL) is set to 0, and 0 is returned. Note that NULL is also a legal result (an SQL NULL translates as a NULL string), */ FSL_EXPORT int fsl_db_get_blob( fsl_db * const db, void ** rv, fsl_size_t * len, char const * sql, ... ); /** va_list counterpart of fsl_db_get_blob(). */ FSL_EXPORT int fsl_db_get_blobv( fsl_db * const db, void ** rv, fsl_size_t * stmtLen, char const * sql, va_list args ); /** Convenience form of fsl_db_get_blob() which returns the value directly but provides no way of checking for errors. On error, or if no result is found, NULL is returned. */ FSL_EXPORT void * fsl_db_g_blob( fsl_db * const db, fsl_size_t * len, char const * sql, ... ); /** Similar to fsl_db_get_text() and fsl_db_get_blob(), but writes its result to tgt, overwriting (not appending to) any existing memory it might hold. If asBlob is true then the underlying BLOB API is used to populate the buffer, else the underlying STRING/TEXT API is used. For many purposes there will be no difference, but if you know you might have binary data, be sure to pass a true value for asBlob to avoid any potential encoding-related problems. */ FSL_EXPORT int fsl_db_get_buffer( fsl_db * const db, fsl_buffer * const tgt, bool asBlob, char const * sql, ... ); /** va_list counterpart of fsl_db_get_buffer(). */ FSL_EXPORT int fsl_db_get_bufferv( fsl_db * const db, fsl_buffer * const tgt, bool asBlob, char const * sql, va_list args ); /** Expects sql to be a SELECT-style query which (potentially) returns a result set. For each row in the set callback() is called, as described for fsl_stmt_each(). Returns 0 on success. The callback is _not_ called for queries which return no rows. If clients need to know if rows were returned, they can add a counter to their callbackState and increment it from the callback. Returns FSL_RC_MISUSE if db is not opened, !callback, !sql. Returns FSL_RC_RANGE if !*sql. */ FSL_EXPORT int fsl_db_each( fsl_db * const db, fsl_stmt_each_f callback, void * callbackState, char const * sql, ... ); /** va_list counterpart to fsl_db_each(). */ FSL_EXPORT int fsl_db_eachv( fsl_db * const db, fsl_stmt_each_f callback, void * callbackState, char const * sql, va_list args ); /** Returns the given Julian date value formatted as an ISO8601 string (with a fractional seconds part if msPrecision is true, else without it). Returns NULL if !db, db is not connected, j |
︙ | ︙ | |||
9392 9393 9394 9395 9396 9397 9398 | bool localTime ); /** Returns the current time in Julian Date format. Returns a negative value if !db or db is not opened. */ | | | | 9476 9477 9478 9479 9480 9481 9482 9483 9484 9485 9486 9487 9488 9489 9490 9491 9492 9493 9494 9495 9496 9497 9498 9499 9500 9501 9502 9503 9504 9505 | bool localTime ); /** Returns the current time in Julian Date format. Returns a negative value if !db or db is not opened. */ FSL_EXPORT double fsl_db_julian_now(fsl_db * const db); /** Uses the given db to convert the given time string to Julian Day format. If it cannot be converted, a negative value is returned. The str parameter can be anything suitable for passing to sqlite's: SELECT julianday(str) Note that this routine will escape str for use with SQL - the caller must not do so. @see fsl_julian_to_iso8601() @see fsl_iso8601_to_julian() */ FSL_EXPORT double fsl_db_string_to_julian(fsl_db * const db, char const * str); /** Opens the given db file and populates db with its handle. db must have been cleanly initialized by copy-initializing it from fsl_db_empty (or fsl_db_empty_m) or by allocating it using fsl_db_malloc(). Failure to do so will lead to undefined behaviour. |
︙ | ︙ | |||
9461 9462 9463 9464 9465 9466 9467 | - If FSL_OPEN_F_SCHEMA_VALIDATE is set in openFlags then the db is validated to see if it has a fossil schema. If that validation fails, FSL_RC_REPO_NEEDS_REBUILD or FSL_RC_NOT_A_REPO will be returned and db's error state will be updated. db->f does not need to be set for that check to work. | < | < < | < < > | | 9545 9546 9547 9548 9549 9550 9551 9552 9553 9554 9555 9556 9557 9558 9559 9560 9561 9562 9563 9564 9565 9566 9567 9568 9569 9570 9571 9572 | - If FSL_OPEN_F_SCHEMA_VALIDATE is set in openFlags then the db is validated to see if it has a fossil schema. If that validation fails, FSL_RC_REPO_NEEDS_REBUILD or FSL_RC_NOT_A_REPO will be returned and db's error state will be updated. db->f does not need to be set for that check to work. If db->f is not NULL when this function is called then any error triggered during opening is _copied_ into db->f's error state. @see fsl_db_close() @see fsl_db_prepare() @see fsl_db_malloc() */ FSL_EXPORT int fsl_db_open( fsl_db * const db, char const * dbFile, int openFlags ); /** Closes the given db handle and frees any resources owned by db. Results are undefined if db is NULL. If db is not opened, this is a harmless no-op. If db was allocated using fsl_db_malloc() (as determined by examining db->allocStamp) then this routine also fsl_free()s it, otherwise it is assumed to either be on the stack or part of a larger struct and is not freed. If db has any pending transactions, they are rolled |
︙ | ︙ | |||
9504 9505 9506 9507 9508 9509 9510 | given code block is getting run. As a special case, if db->f is not NULL _before_ it is is fsl_db_open()ed, then this function automatically gets installed if the SQL tracing option is enabled for that fsl_cx instance before the db is opened. | | > > > > > > > > > | 9584 9585 9586 9587 9588 9589 9590 9591 9592 9593 9594 9595 9596 9597 9598 9599 9600 9601 9602 9603 9604 9605 9606 9607 | given code block is getting run. As a special case, if db->f is not NULL _before_ it is is fsl_db_open()ed, then this function automatically gets installed if the SQL tracing option is enabled for that fsl_cx instance before the db is opened. This is a no-op if db is not opened. TODOs: - Expand this API to take a client-side callback and state object, rather than a FILE pointer. - Provide a toggle for the tracing level: with and without "expanded" SQL. Expanding the SQL to include its bound values is far more expensive (but also far more informative). */ FSL_EXPORT void fsl_db_sqltrace_enable( fsl_db * const db, FILE * outStream ); /** Returns the row ID of the most recent insertion, or -1 if !db, db is not connected, or 0 if no inserts have been performed. |
︙ | ︙ | |||
9536 9537 9538 9539 9540 9541 9542 | */ FSL_EXPORT char const * fsl_db_name(fsl_db const * const db); /** Returns a db name string for the given fsl_db_role value. The string is static, guaranteed to live as long as the app. It | < | > | < | 9625 9626 9627 9628 9629 9630 9631 9632 9633 9634 9635 9636 9637 9638 9639 9640 9641 9642 | */ FSL_EXPORT char const * fsl_db_name(fsl_db const * const db); /** Returns a db name string for the given fsl_db_role value. The string is static, guaranteed to live as long as the app. It returns NULL if passed FSL_DBROLE_NONE or some value out of range for the enum. */ FSL_EXPORT const char * fsl_db_role_name(enum fsl_dbrole_e r); /** Allocates a new fsl_db instance(). Returns NULL on allocation error. Note that fsl_db instances can often be used from the stack - allocating them dynamically is an uncommon case necessary for script bindings. |
︙ | ︙ | |||
9588 9589 9590 9591 9592 9593 9594 | FSL_EXPORT int fsl_db_detach(fsl_db * const db, const char *zLabel); /** Expects fmt to be a SELECT-style query. For each row in the query, the first column is fetched as a string and appended to the tgt list. | | | 9676 9677 9678 9679 9680 9681 9682 9683 9684 9685 9686 9687 9688 9689 9690 | FSL_EXPORT int fsl_db_detach(fsl_db * const db, const char *zLabel); /** Expects fmt to be a SELECT-style query. For each row in the query, the first column is fetched as a string and appended to the tgt list. Returns 0 on success, FSL_RC_MISUSE if !fmt or fmt is empty, or any number of potential FSL_RC_OOM or db-related errors. Results rows with a NULL value (resulting from an SQL NULL) are added to the list as NULL entries. Each entry appended to the list is a (char *) which must be freed using fsl_free(). To easiest way to clean up |
︙ | ︙ | |||
9624 9625 9626 9627 9628 9629 9630 | fsl_list_visit_free(&li, 1); ``` Of course fsl_list_visit() may be used to traverse the list as well, as long as the visitor expects (char [const]*) list elements. */ | | | | | | | | < | < | 9712 9713 9714 9715 9716 9717 9718 9719 9720 9721 9722 9723 9724 9725 9726 9727 9728 9729 9730 9731 9732 9733 9734 9735 9736 9737 9738 9739 9740 9741 9742 9743 9744 9745 9746 9747 9748 9749 9750 9751 9752 9753 9754 9755 9756 | fsl_list_visit_free(&li, 1); ``` Of course fsl_list_visit() may be used to traverse the list as well, as long as the visitor expects (char [const]*) list elements. */ FSL_EXPORT int fsl_db_select_slist( fsl_db * const db, fsl_list * const tgt, char const * fmt, ... ); /** The va_list counterpart of fsl_db_select_slist(). */ FSL_EXPORT int fsl_db_select_slistv( fsl_db * const db, fsl_list * const tgt, char const * fmt, va_list args ); /** Returns n bytes of random lower-case hexidecimal characters using the given db as its data source, plus a terminating NUL byte. The returned memory must eventually be freed using fsl_free(). Returns NULL if !n, db is not opened, or on a db-level error. */ FSL_EXPORT char * fsl_db_random_hex(fsl_db * const db, fsl_size_t n); /** Returns the "number of database rows that were changed or inserted or deleted by the most recently completed SQL statement" (to quote the underlying APIs). Returns 0 if db is not opened. See: https://sqlite.org/c3ref/changes.html */ FSL_EXPORT int fsl_db_changes_recent(fsl_db * const db); /** Returns "the number of row changes caused by INSERT, UPDATE or DELETE statements since the database connection was opened" (to quote the underlying APIs). Returns 0 if db is not opened. See; https://sqlite.org/c3ref/total_changes.html */ FSL_EXPORT int fsl_db_changes_total(fsl_db * const db); /** Initializes the given database file. zFilename is the name of |
︙ | ︙ | |||
9785 9786 9787 9788 9789 9790 9791 | FSL_EXPORT int fsl_stmt_bind_step( fsl_stmt * st, char const * fmt, ... ); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_DB_H_INCLUDED */ | | | | 9871 9872 9873 9874 9875 9876 9877 9878 9879 9880 9881 9882 9883 9884 9885 9886 | FSL_EXPORT int fsl_stmt_bind_step( fsl_stmt * st, char const * fmt, ... ); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_DB_H_INCLUDED */ /* end of file ./include/fossil-scm/db.h */ /* start of file ./include/fossil-scm/hash.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_HASH_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_HASH_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt |
︙ | ︙ | |||
10327 10328 10329 10330 10331 10332 10333 | FSL_EXPORT const char * fsl_hash_type_name(fsl_hash_types_e h, const char *zUnknown); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_HASH_H_INCLUDED */ | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 10413 10414 10415 10416 10417 10418 10419 10420 10421 10422 10423 10424 10425 10426 10427 10428 10429 10430 10431 10432 10433 10434 10435 10436 10437 10438 10439 10440 10441 10442 10443 10444 10445 10446 10447 10448 10449 10450 10451 10452 10453 10454 10455 10456 10457 10458 10459 10460 10461 10462 10463 10464 10465 10466 10467 10468 10469 10470 10471 10472 10473 10474 10475 10476 10477 10478 10479 10480 10481 10482 10483 10484 10485 10486 10487 10488 10489 10490 10491 10492 10493 10494 10495 10496 10497 10498 10499 10500 10501 10502 | FSL_EXPORT const char * fsl_hash_type_name(fsl_hash_types_e h, const char *zUnknown); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_HASH_H_INCLUDED */ /* end of file ./include/fossil-scm/hash.h */ /* start of file ./include/fossil-scm/repo.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_REPO_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_REPO_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /** @file repo.h fossil-repo.h declares APIs specifically dealing with repository-db-side state, as opposed to specifically checkout-side state or non-content-related APIs. */ #if defined(__cplusplus) extern "C" { #endif typedef struct fsl_card_F fsl_card_F; typedef struct fsl_card_J fsl_card_J; typedef struct fsl_card_Q fsl_card_Q; typedef struct fsl_card_T fsl_card_T; typedef struct fsl_checkin_opt fsl_checkin_opt; typedef struct fsl_deck fsl_deck; /** Opens the given db file name as f's repository. Returns 0 on success. On error it sets f's error state and returns that code unless the error was FSL_RC_MISUSE (which indicates invalid arguments and it does not set the error state). Returns FSL_RC_ACCESS if f already has an opened repo db (use fsl_repo_close() or fsl_ckout_close() to close it). Returns FSL_RC_NOT_FOUND if repoDbFile is not found, as this routine cannot create a new repository db. Results are undefined if any argument is NULL. When a repository is opened, the fossil-level user name associated with f (if any) is overwritten with the default user from the repo's login table (the one with uid=1). Thus fsl_cx_user_get() may return a value even if the client has not called fsl_cx_user_set(). It would be nice to have a parameter specifying that the repo should be opened read-only. That's not as straightforward as it sounds because of how the various dbs are internally managed (via one db handle). Until then, the permissions of the underlying repo file will determine how it is opened. i.e. a read-only repo will be opened read-only. Potentially interesting side-effects: - On success this re-sets several bits of f's configuration to match the repository-side settings. @see fsl_repo_create() @see fsl_repo_close() @see fsl_close_scm_dbs() */ FSL_EXPORT int fsl_repo_open( fsl_cx * const f, char const * repoDbFile/*, char readOnlyCurrentlyIgnored*/ ); /** This function is a programmatic interpretation of this table: https://fossil-scm.org/index.html/doc/trunk/www/fileformat.wiki#summary For a given control artifact type and a card name in the form of |
︙ | ︙ | |||
10497 10498 10499 10500 10501 10502 10503 | These lists, and F-cards in generally, are typically maintained internally in the library. There's probably "no good reason" for clients to manipulate them. */ struct fsl_card_F_list { /** The list of F-cards. The first this->used elements are in-use. | | | 10623 10624 10625 10626 10627 10628 10629 10630 10631 10632 10633 10634 10635 10636 10637 | These lists, and F-cards in generally, are typically maintained internally in the library. There's probably "no good reason" for clients to manipulate them. */ struct fsl_card_F_list { /** The list of F-cards. The first this->used elements are in-use. This pointer may change any time the list is reallocated. */ fsl_card_F * list; /** The number of entries in this->list which are in use. */ uint32_t used; /** |
︙ | ︙ | |||
11078 11079 11080 11081 11082 11083 11084 11085 11086 11087 11088 11089 11090 11091 11092 11093 11094 11095 | Returns 0 on success, else an error code propagated by fsl_deck_F_set(), fsl_repo_blob_lookup(), or some other lower-level routine. This routine requires that a transaction is active and returns FSL_RC_MISUSE if none is active. For any non-trivial error's, d->f's error state will be updated with a description of the problem. TODO: add a fsl_cx-level or fsl_deck-level API for marking content saved this way as private. This type of content is intended for use cases which do not have a checkout, and thus cannot be processed with fsl_checkin_commit() (which includes a flag to mark its content as private). @see fsl_deck_F_set() @see fsl_deck_F_add() @see fsl_deck_derive() */ | > > > > > > > > > > | | | < | | | > > > | > | | < > > > > > > > | | 11204 11205 11206 11207 11208 11209 11210 11211 11212 11213 11214 11215 11216 11217 11218 11219 11220 11221 11222 11223 11224 11225 11226 11227 11228 11229 11230 11231 11232 11233 11234 11235 11236 11237 11238 11239 11240 11241 11242 11243 11244 11245 11246 11247 11248 11249 11250 11251 11252 11253 11254 11255 11256 11257 11258 11259 11260 11261 11262 11263 11264 11265 11266 11267 11268 11269 11270 11271 11272 11273 11274 11275 11276 11277 11278 11279 11280 11281 11282 11283 11284 11285 11286 11287 | Returns 0 on success, else an error code propagated by fsl_deck_F_set(), fsl_repo_blob_lookup(), or some other lower-level routine. This routine requires that a transaction is active and returns FSL_RC_MISUSE if none is active. For any non-trivial error's, d->f's error state will be updated with a description of the problem. Returns FSL_RC_MISUSE if `d->rid>0` (which indicates that the deck has already been saved in the repository). fsl_deck_derive() can be used to "extend" a saved deck into a new version before using this API. Returns FSL_RC_RANGE if zName is not a valid filename for use as a repository entry, as per fsl_is_simple_pathname(). On error, d->f's error state will be updated with a description of the problem. TODO: add a fsl_cx-level or fsl_deck-level API for marking content saved this way as private. This type of content is intended for use cases which do not have a checkout, and thus cannot be processed with fsl_checkin_commit() (which includes a flag to mark its content as private). @see fsl_deck_F_set() @see fsl_deck_F_add() @see fsl_deck_derive() */ FSL_EXPORT int fsl_deck_F_set_content( fsl_deck * const d, char const * name, fsl_buffer const * const src, fsl_fileperm_e perm, char const * priorName); /** UNDER CONSTRUCTION! EXPERIMENTAL! This routine rewires d such that it becomes the basis for a derived version of itself. Requires that d be a loaded from a repository, complete with an RID, else FSL_RC_MISUSE is returned. In short, this function peforms the following: - Clears d->P - Assigns d->P[0] to the UUID of d->rid - Clears d->rid - Clears any other members which need to be (re)set by the new child/derived version. That includes the following card letters: `ACDEGHIJKLMNQRTUW`. - If d is a delta manifest it restructures it as a new baselin (see below). - It specifically keeps d->F intact OR creates a new one (see below). Returns 0 on success, FSL_RC_OOM on an allocation error, FSL_RC_MISUSE if d->rid<=0 (i.e. the deck has never been saved or was not loaded from the db). If d->type is not FSL_SATYPE_CHECKIN, FSL_RC_TYPE is returned (fixing that for other derivable types is TODO). On error, d may be left in an inconsistent state and must not be used further except to pass it to fsl_deck_finalize(). The intention of this function is to simplify creation of decks which are to be used for creating checkins without requiring a checkin. To avoid certain corner cases, this function does not allow creation of delta manifests. If d has a B-card then it is a delta. This function clears its B-card and recreates the F-card list using the B-card's F-card list and any F-cards from the current delta. In other words, it creates a new baseline manifest. The expected workflow for this API is something like: - Use fsl_deck_load_rid() to load a deck. - Pass that deck to fsl_deck_derive(). - Update the deck's cards to suit. - fsl_deck_save() the deck. @todo Extend this to support other inheritable deck types, e.g. wiki, forum posts, and technotes. @see fsl_deck_F_set_content() */ FSL_EXPORT int fsl_deck_derive(fsl_deck * const d); /** |
︙ | ︙ | |||
11160 11161 11162 11163 11164 11165 11166 | The F-cards will be visited in the order they are declared in d. For loaded-from-a-repo manifests this is always lexical order (for delta manifests, consistent across the delta and baseline). For hand-created decks which have not yet been fsl_deck_unshuffle()'d, the order is unspecified. */ | | > | | 11305 11306 11307 11308 11309 11310 11311 11312 11313 11314 11315 11316 11317 11318 11319 11320 11321 | The F-cards will be visited in the order they are declared in d. For loaded-from-a-repo manifests this is always lexical order (for delta manifests, consistent across the delta and baseline). For hand-created decks which have not yet been fsl_deck_unshuffle()'d, the order is unspecified. */ FSL_EXPORT int fsl_deck_F_foreach( fsl_deck * const d, fsl_card_F_visitor_f cb, void * const visitorState ); /** Fetches the next F-card entry from d. fsl_deck_F_rewind() must have be successfully executed one time before calling this, as that routine ensures that the baseline is loaded (if needed), which is needed for proper iteration over delta manifests. |
︙ | ︙ | |||
11278 11279 11280 11281 11282 11283 11284 | On any error but FSL_RC_MISUSE (basic argument validation) f's error state is updated to describe the error. @see fsl_content_get() */ FSL_EXPORT int fsl_card_F_content( fsl_cx * f, fsl_card_F const * fc, | | | 11424 11425 11426 11427 11428 11429 11430 11431 11432 11433 11434 11435 11436 11437 11438 | On any error but FSL_RC_MISUSE (basic argument validation) f's error state is updated to describe the error. @see fsl_content_get() */ FSL_EXPORT int fsl_card_F_content( fsl_cx * f, fsl_card_F const * fc, fsl_buffer * const dest ); /** Sets the 'G' card on a forum-post deck to a copy of the given UUID. */ FSL_EXPORT int fsl_deck_G_set( fsl_deck * const mf, fsl_uuid_cstr uuid); /** |
︙ | ︙ | |||
11312 11313 11314 11315 11316 11317 11318 | particular if their isAppend values differ. Returns 0 on success, FSL_RC_MISUSE if !mf or !key, FSL_RC_RANGE if !*field, FSL_RC_TYPE if mf is of a type for which J cards are not legal (see fsl_card_is_legal()), FSL_RC_OOM on allocation error. */ | | | > > | | | 11458 11459 11460 11461 11462 11463 11464 11465 11466 11467 11468 11469 11470 11471 11472 11473 11474 11475 11476 11477 11478 11479 11480 | particular if their isAppend values differ. Returns 0 on success, FSL_RC_MISUSE if !mf or !key, FSL_RC_RANGE if !*field, FSL_RC_TYPE if mf is of a type for which J cards are not legal (see fsl_card_is_legal()), FSL_RC_OOM on allocation error. */ FSL_EXPORT int fsl_deck_J_add( fsl_deck * const mf, bool isAppend, char const * key, char const * value ); /** Sets the K-card (ticket ID) on the given deck. If passed NULL, it creates a new ticket ID (a 40-digit string of random hex bytes) and returns FSL_RC_OOM if allocation of those bytes fails. If uuid is not NULL then it must be a 40-byte lower-case hex string, the K-card value of the ticket this change is being applied to. */ FSL_EXPORT int fsl_deck_K_set( fsl_deck * const mf, fsl_uuid_cstr uuid); /** Semantically identical fsl_deck_B_set() but sets the L-card. title must be the wiki page title text of the wiki page this change is being applied to. |
︙ | ︙ | |||
11413 11414 11415 11416 11417 11418 11419 | If uuid is not NULL and fsl_is_uuid(uuid) returns false then this function returns FSL_RC_RANGE. If uuid is NULL then it is assumed to be the UUID of the currently-being-constructed artifact in which the tag is contained (which appears as the '*' character in generated artifacts). | | | | | | 11561 11562 11563 11564 11565 11566 11567 11568 11569 11570 11571 11572 11573 11574 11575 11576 11577 11578 11579 11580 11581 11582 | If uuid is not NULL and fsl_is_uuid(uuid) returns false then this function returns FSL_RC_RANGE. If uuid is NULL then it is assumed to be the UUID of the currently-being-constructed artifact in which the tag is contained (which appears as the '*' character in generated artifacts). Returns 0 on success. Returns FSL_RC_MISUSE if !d or !name. Returns FSL_RC_TYPE (and update's d's error state with a message) if the T card is not legal for d (see fsl_card_is_legal()). Returns FSL_RC_RANGE if !*name, tagType is invalid, or if uuid is not NULL and fsl_is_uuid(uuid) return false. Returns FSL_RC_OOM if an allocation fails. */ FSL_EXPORT int fsl_deck_T_add( fsl_deck * const d, fsl_tagtype_e tagType, fsl_uuid_cstr uuid, char const * name, char const * value); /** Adds the given tag instance to the given manifest. Returns 0 on success, FSL_RC_MISUSE if either argument is NULL, FSL_RC_OOM if appending the tag to the list |
︙ | ︙ | |||
11444 11445 11446 11447 11448 11449 11450 11451 | tags to the given deck: "branch" with a value of branchName and "sym-branchName" with no value. Returns 0 on success. Returns FSL_RC_OOM on allocation error and FSL_RC_RANGE if branchName is empty or contains any characters with ASCII values <=32d. It natively assumes that any characters >=128 are part of multibyte UTF8 characters. */ | > > > > > > | | 11592 11593 11594 11595 11596 11597 11598 11599 11600 11601 11602 11603 11604 11605 11606 11607 11608 11609 11610 11611 11612 11613 | tags to the given deck: "branch" with a value of branchName and "sym-branchName" with no value. Returns 0 on success. Returns FSL_RC_OOM on allocation error and FSL_RC_RANGE if branchName is empty or contains any characters with ASCII values <=32d. It natively assumes that any characters >=128 are part of multibyte UTF8 characters. ACHTUNG: this does not arrange for canceling the previous branch because it doesn't know that branch at this point. To cancel the previous branch a cancelation T-card needs to be added to the deck named "sym-BRANCHNAME". Historically such tags have had the value "Cancelled by branch", but that's not a requirement. */ FSL_EXPORT int fsl_deck_branch_set( fsl_deck * const d, char const * branchName ); /** Calculates the value of d's R-card based on its F-cards and updates d->R. It may also, as a side-effect, sort d->F.list lexically (a requirement of a R-card calculation). Returns 0 on success. Requires that d->f have an opened |
︙ | ︙ | |||
11470 11471 11472 11473 11474 11475 11476 | allows the client to decide on whether to use them (for more (admittedly redundant!) integrity checking) or not (much faster but "not strictly historically correct"), but defaults to having them enabled for symmetry with fossil(1). @see fsl_deck_R_calc2() */ | | | 11624 11625 11626 11627 11628 11629 11630 11631 11632 11633 11634 11635 11636 11637 11638 | allows the client to decide on whether to use them (for more (admittedly redundant!) integrity checking) or not (much faster but "not strictly historically correct"), but defaults to having them enabled for symmetry with fossil(1). @see fsl_deck_R_calc2() */ FSL_EXPORT int fsl_deck_R_calc(fsl_deck * const d); /** A variant of fsl_deck_R_calc() which calculates the given deck's R-card but does not assign it to the deck, instead returning it via the 2nd argument: If *tgt is not NULL when this function is called, it is required to |
︙ | ︙ | |||
11611 11612 11613 11614 11615 11616 11617 | F-cards were used, but it was eventually made optional because (A) the memory cost and (B) it's part of a 3rd or 4th level of integrity-related checks, and is somewhat superfluous. @see fsl_deck_output() @see fsl_deck_save() */ | | > > > | 11765 11766 11767 11768 11769 11770 11771 11772 11773 11774 11775 11776 11777 11778 11779 11780 11781 11782 11783 11784 11785 11786 11787 | F-cards were used, but it was eventually made optional because (A) the memory cost and (B) it's part of a 3rd or 4th level of integrity-related checks, and is somewhat superfluous. @see fsl_deck_output() @see fsl_deck_save() */ FSL_EXPORT int fsl_deck_unshuffle( fsl_deck * const d, bool calculateRCard ); /** Renders the given control artifact's contents to the given output function and calculates any cards which cannot be calculated until the contents are complete (namely the R-card and Z-card). If both (output, outputState) are NULL then d->f's outputer is used. The given deck is "logically const" but traversal over F-cards and baselines requires non-const operations. To keep this routine from requiring an undue amount of pre-call effort on the client's part, it also takes care of calling fsl_deck_unshuffle() to ensure that all of the deck's cards are in order. (If the deck has no R card, but has F-cards, and d->f is configured to generate R-cards, then |
︙ | ︙ | |||
11638 11639 11640 11641 11642 11643 11644 | Returns FSL_RC_SYNTAX if fsl_deck_has_required_cards() returns false. On errors more serious than argument validation, the deck's context's (d->f) error state is updated. The exact structure of the ouput depends on the value of | | | | 11795 11796 11797 11798 11799 11800 11801 11802 11803 11804 11805 11806 11807 11808 11809 11810 11811 11812 11813 11814 11815 | Returns FSL_RC_SYNTAX if fsl_deck_has_required_cards() returns false. On errors more serious than argument validation, the deck's context's (d->f) error state is updated. The exact structure of the ouput depends on the value of d->type, and FSL_RC_TYPE is returned if this function cannot figure out what to do with the given deck's type. @see fsl_deck_unshuffle() @see fsl_deck_save() */ FSL_EXPORT int fsl_deck_output( fsl_deck * const d, fsl_output_f out, void * outputState ); /** Saves the given deck into f's repository database as new control artifact content. If isPrivate is true then the content is marked as private, otherwise it is not. Note that isPrivate is a |
︙ | ︙ | |||
11774 11775 11776 11777 11778 11779 11780 11781 11782 11783 | the destination deck when this function returns. d might be partially populated on error, so regardless of success or failure, the client must eventually pass d to fsl_deck_finalize() to free its memory. Error result codes include: - FSL_RC_MISUSE if any pointer argument is NULL or d->f is NULL. | > > > > > > > < < | > > > > > > > > | > > > > > > > > > | 11931 11932 11933 11934 11935 11936 11937 11938 11939 11940 11941 11942 11943 11944 11945 11946 11947 11948 11949 11950 11951 11952 11953 11954 11955 11956 11957 11958 11959 11960 11961 11962 11963 11964 11965 11966 11967 11968 11969 11970 11971 11972 11973 11974 11975 11976 11977 11978 11979 11980 | the destination deck when this function returns. d might be partially populated on error, so regardless of success or failure, the client must eventually pass d to fsl_deck_finalize() to free its memory. Error result codes include: - FSL_RC_SYNTAX on syntax errors. Note that fossil's approach to determine "is this an artifact?" is "can it pass through fsl_deck_parse()?" This result code simply means that the input is, strictly speaking, not a fossil artifact. In some contexts this condition must be caught and treated as not-an-error (but not an artifact). - FSL_RC_MISUSE if any pointer argument is NULL or d->f is NULL. - FSL_RC_CONSISTENCY if validation of a Z-card fails. This is a more specialized form of FSL_RC_SYNTAX but indicates that the artifact is (or may be) well-formed but has an incorrect hash. This check happens relatively early in the parsing process, but after this function has uses fsl_might_be_artifact() to do a basic sniff-test. In practice, this error "cannot happen" unless the source buffer has been manually manipulated. Whether or not client-side code wants to treat this as FSL_RC_SYNTAX (i.e. "not an artifact but not an error") is up to the client - Any number of errors coming from the allocator, database, or fsl_deck APIs used here. ACHTUNG API CHANGE: prior to 2021-10-20, this routine set d->rid (and the now-removed d->uuid) based on the hash of the input buffer if a matching record could be found in the db. That proved to be a huge performance hit and was removed. Maintenance reminder: in keeping with fossil's "if it quacks like an artifact, it is an artifact, else it's not" approach to determining whether opaque blobs are artifacts, this function _must_ continue to return FSL_RC_SYNTAX to indicate that "it doesn't quack like an artifact but there's otherwise nothing wrong," which downstream code must be able to rely upon as the input being a non-artifact. More serious errors, e.g. FSL_RC_OOM, are (of course) to be propagated back. @see fsl_deck_parse2() */ FSL_EXPORT int fsl_deck_parse(fsl_deck * const d, fsl_buffer * const src); /** This variant of fsl_deck_parse() works identically to that |
︙ | ︙ | |||
11811 11812 11813 11814 11815 11816 11817 | FSL_EXPORT int fsl_deck_parse2(fsl_deck * const d, fsl_buffer * const src, fsl_id_t rid); /** Quickly determines whether the content held by the given buffer "might" be a structural artifact. It performs a fast sanity check for prominent features which can be checked either in O(1) or very short O(N) time (with a fixed N). If it returns false then the | | | | 11990 11991 11992 11993 11994 11995 11996 11997 11998 11999 12000 12001 12002 12003 12004 12005 | FSL_EXPORT int fsl_deck_parse2(fsl_deck * const d, fsl_buffer * const src, fsl_id_t rid); /** Quickly determines whether the content held by the given buffer "might" be a structural artifact. It performs a fast sanity check for prominent features which can be checked either in O(1) or very short O(N) time (with a fixed N). If it returns false then the given buffer's contents are, with 100% certainty, _not_ a structural artifact. If it returns true then they _might_ be, but being 100% certain requires passing the contents to fsl_deck_parse() to fully parse them. */ FSL_EXPORT bool fsl_might_be_artifact(fsl_buffer const * const src); /** Loads the content from given rid and tries to parse it as a |
︙ | ︙ | |||
11939 11940 11941 11942 11943 11944 11945 | const, but certain operations on a deck are necessarily non-const operations. That includes, but may not be limited to: - Iterating over F-cards, which requires calling fsl_deck_F_rewind() before doing so. - Loading a checkin's baseline (required for F-card iteration and | | | < | > > > > > | 12118 12119 12120 12121 12122 12123 12124 12125 12126 12127 12128 12129 12130 12131 12132 12133 12134 12135 12136 12137 12138 12139 12140 12141 12142 12143 12144 12145 12146 12147 12148 12149 12150 12151 12152 12153 12154 12155 | const, but certain operations on a deck are necessarily non-const operations. That includes, but may not be limited to: - Iterating over F-cards, which requires calling fsl_deck_F_rewind() before doing so. - Loading a checkin's baseline (required for F-card iteration and performed automatically by fsl_deck_F_rewind()). Aside from such iteration-related mutable state, it is STRICTLY ILLEGAL to modify a deck's artifact-related state while it is undergoing crosslinking. Potential TODO: add some client-opaque state to decks so that they can be flagged as "being crosslinked" and fail mutation operations such as card adders/setters. @see fsl_xlink_listener() */ typedef int (*fsl_deck_xlink_f)(fsl_deck * const d, void * state); /** A type for holding state for artifact crosslinking callbacks. */ struct fsl_xlinker { /** Human-readable name of the crosslinker, noting that each registered crosslinker must have a unique name. Registering a crosslinker with the same name as an existing one replaces that one. */ char const * name; /** Callback function. */ fsl_deck_xlink_f f; /** State for this->f's last argument. */ void * state; }; typedef struct fsl_xlinker fsl_xlinker; |
︙ | ︙ | |||
12041 12042 12043 12044 12045 12046 12047 | names they register. The library reserves the prefix "fsl/" for its own use, and will happily overwrite client-registered entries with the same names. The name string need not be stable across application sessions and maybe be a randomly-generated string. Caveat: some obscure artifact crosslinking steps do not happen unless crosslinking takes place in the context of a | | > > > > > > > | 12224 12225 12226 12227 12228 12229 12230 12231 12232 12233 12234 12235 12236 12237 12238 12239 12240 12241 12242 12243 12244 12245 12246 12247 12248 12249 12250 | names they register. The library reserves the prefix "fsl/" for its own use, and will happily overwrite client-registered entries with the same names. The name string need not be stable across application sessions and maybe be a randomly-generated string. Caveat: some obscure artifact crosslinking steps do not happen unless crosslinking takes place in the context of a fsl__crosslink_begin() and fsl__crosslink_end() session. Thus, at the time client-side crosslinker callbacks are called, certain crosslinking state in the database may still be pending. It is as yet unclear how best to resolve that minor discrepancy, or whether it even needs resolving. As a rule, it is important that crosslink handler checks the deck->type field of the deck they are passed, and return 0, without side effects, if the type is not specifically handled by that handler. Every crosslink handler is passed every crosslinked artifact, but it's rare for crosslink handlers to handle more than one type of artifact, except perhaps for purposes of notifying a user that some progress is being made. Default (overrideable) crosslink handlers: The library internally splits crosslinking of artifacts into two parts: the main one (which clients cannot modify) handles the database-level linking of relational state implied by a given artifact. The secondary one adds an entry to the "event" table, |
︙ | ︙ | |||
12072 12073 12074 12075 12076 12077 12078 12079 12080 12081 12082 12083 12084 12085 | - Technote artifacts: "fsl/technote/timeline" - Wiki artifacts: "fsl/wiki/timeline" A context registers listeners under those names when it initializes, and clients may override them at any point after that. Caveat: updating the timeline requires a bit of knowledge about the Fossil DB schema and/or conventions. Updates for certain types, e.g. attachment/control/forum post, is somewhat more involved and updating the timeline for wiki comments requires observing a "quirk of conventions" for labeling such comments, such that they will appear properly when the main fossil app renders them. That said, | > > > > > > > > > > | 12262 12263 12264 12265 12266 12267 12268 12269 12270 12271 12272 12273 12274 12275 12276 12277 12278 12279 12280 12281 12282 12283 12284 12285 | - Technote artifacts: "fsl/technote/timeline" - Wiki artifacts: "fsl/wiki/timeline" A context registers listeners under those names when it initializes, and clients may override them at any point after that. Sidebar: due to how tickets are crosslinked (_after_ the general crosslinking phase is actually finished and requiring state which other crosslinkers do not), it is not currently possible to override the ticket crosslink handler. Thus the core ticket crosslinker will always run, and update the [event] table, but a custom crosslinker may overwrite the resulting [event] table entries (in particular, the comment). Determining whether/how ticket crosslinking can be restructured to be consistent with the other types is on the TODO list. Caveat: updating the timeline requires a bit of knowledge about the Fossil DB schema and/or conventions. Updates for certain types, e.g. attachment/control/forum post, is somewhat more involved and updating the timeline for wiki comments requires observing a "quirk of conventions" for labeling such comments, such that they will appear properly when the main fossil app renders them. That said, |
︙ | ︙ | |||
12116 12117 12118 12119 12120 12121 12122 | negative value on error (dig around the sources to decode them - this is not expected to fail unless the system is undergoing a catastrophe). @see fsl_content_blob() @see fsl_content_get() */ | | | 12316 12317 12318 12319 12320 12321 12322 12323 12324 12325 12326 12327 12328 12329 12330 | negative value on error (dig around the sources to decode them - this is not expected to fail unless the system is undergoing a catastrophe). @see fsl_content_blob() @see fsl_content_get() */ FSL_EXPORT fsl_int_t fsl_content_size( fsl_cx * const f, fsl_id_t blobRid ); /** For the given blob.rid value, fetches the content field of that record and overwrites tgt's contents with it (reusing tgt's memory if it has any and if it can). The blob's contents are uncompressed if they were stored in compressed form. This extracts a raw blob and does not apply any deltas - use |
︙ | ︙ | |||
12228 12229 12230 12231 12232 12233 12234 | must not hold a pointer to it or its contents. @see fsl_wiki_load_latest() @see fsl_wiki_latest_rid() @see fsl_wiki_names_get() @see fsl_wiki_page_exists() */ | | | | | | 12428 12429 12430 12431 12432 12433 12434 12435 12436 12437 12438 12439 12440 12441 12442 12443 12444 12445 12446 12447 12448 12449 12450 12451 12452 12453 12454 12455 12456 12457 12458 12459 12460 12461 12462 12463 12464 12465 12466 12467 12468 12469 12470 12471 12472 12473 12474 12475 12476 12477 12478 12479 12480 12481 12482 12483 12484 12485 12486 12487 | must not hold a pointer to it or its contents. @see fsl_wiki_load_latest() @see fsl_wiki_latest_rid() @see fsl_wiki_names_get() @see fsl_wiki_page_exists() */ FSL_EXPORT int fsl_wiki_foreach_page( fsl_cx * const f, fsl_deck_visitor_f cb, void * state ); /** Fetches the most recent RID for the given wiki page name and assigns *newId (if it is not NULL) to that value. Returns 0 on success, FSL_RC_MISUSE if !f or !pageName, FSL_RC_RANGE if !*pageName, and a host of other potential db-side errors indicating more serious problems. If no such page is found, newRid is not modified and this function returns 0 (as opposed to FSL_RC_NOT_FOUND) because that simplifies usage (so far). On error *newRid is not modified. @see fsl_wiki_load_latest() @see fsl_wiki_foreach_page() @see fsl_wiki_names_get() @see fsl_wiki_page_exists() */ FSL_EXPORT int fsl_wiki_latest_rid( fsl_cx * const f, char const * pageName, fsl_id_t * const newRid ); /** Loads the artifact for the most recent version of the given wiki page, populating d with its contents. Returns 0 on success. On error d might be partially populated, so it needs to be passed to fsl_deck_finalize() regardless of whether this function succeeds or fails. Returns FSL_RC_NOT_FOUND if no page with that name is found. @see fsl_wiki_latest_rid() @see fsl_wiki_names_get() @see fsl_wiki_page_exists() */ FSL_EXPORT int fsl_wiki_load_latest( fsl_cx * const f, char const * pageName, fsl_deck * d ); /** Returns true (non-0) if f's repo database contains a page with the given name, else false. @see fsl_wiki_load_latest() @see fsl_wiki_latest_rid() @see fsl_wiki_names_get() @see fsl_wiki_names_get() */ FSL_EXPORT bool fsl_wiki_page_exists(fsl_cx * const f, char const * pageName); /** A helper type for use with fsl_wiki_save(), intended primarily to help client-side code readability somewhat. */ enum fsl_wiki_save_mode_t { /** |
︙ | ︙ | |||
12436 12437 12438 12439 12440 12441 12442 | Represents a J card in a Ticket Control Artifact. */ struct fsl_card_J { /** If true, the new value should be appended to any existing one with the same key, else it will replace any old one. */ | | | | 12636 12637 12638 12639 12640 12641 12642 12643 12644 12645 12646 12647 12648 12649 12650 12651 12652 12653 12654 12655 12656 12657 12658 12659 12660 12661 12662 12663 12664 12665 | Represents a J card in a Ticket Control Artifact. */ struct fsl_card_J { /** If true, the new value should be appended to any existing one with the same key, else it will replace any old one. */ bool append; /** For internal use only. */ unsigned char flags; /** The ticket field to update. The bytes are owned by this object. */ char * field; /** The value for the field. The bytes are owned by this object. */ char * value; }; /** Empty-initialized fsl_card_J struct. */ #define fsl_card_J_empty_m {false,0,NULL, NULL} /** Empty-initialized fsl_card_J struct. */ FSL_EXPORT const fsl_card_J fsl_card_J_empty; /** Represents a tag in a Manifest or Control Artifact. */ struct fsl_card_T { |
︙ | ︙ | |||
12630 12631 12632 12633 12634 12635 12636 | it is impossible to distinguish between the results "invalid rid" and "empty directory list" (which is a legal result). On success it returns 0 and tgt will have a number of (char *) entries appended to it equal to the number of subdirectories in the repo (possibly 0). | | > | | | | | | | | | < | | | | | | | | | | | 12830 12831 12832 12833 12834 12835 12836 12837 12838 12839 12840 12841 12842 12843 12844 12845 12846 12847 12848 12849 12850 12851 12852 12853 12854 12855 12856 12857 12858 12859 12860 12861 12862 12863 12864 12865 12866 12867 12868 12869 12870 12871 12872 12873 12874 12875 12876 12877 12878 12879 12880 12881 12882 12883 12884 12885 12886 12887 12888 12889 12890 12891 12892 12893 | it is impossible to distinguish between the results "invalid rid" and "empty directory list" (which is a legal result). On success it returns 0 and tgt will have a number of (char *) entries appended to it equal to the number of subdirectories in the repo (possibly 0). Returns non-0 on error, FSL_RC_MISUSE if !tgt, FSL_RC_NOT_A_REPO if f has no opened repository. On other errors error tgt might have been partially populated and the list contents should not be considered valid/complete. Results are undefined if f is NULL. Ownership of the returned strings is transfered to the caller, who must eventually free each one using fsl_free(). fsl_list_visit_free() is the simplest way to free them all at once. */ FSL_EXPORT int fsl_repo_dir_names( fsl_cx * const f, fsl_id_t rid, fsl_list * const tgt, bool addSlash ); /** ZIPs up a copy of the contents of a specific version from f's opened repository db. sym is the symbolic name for the checkin to ZIP. filename is the name of the ZIP file to output the result to. See fsl_zip_writer for details and caveats of this library's ZIP creation. If vRootDir is not NULL and not empty then each file injected into the ZIP gets that directory prepended to its name. If progressVisitor is not NULL then it is called once just before each file is processed, passed the F-card for the file about to be zipped and the progressState parameter. If it returns non-0, ZIPping is cancelled and that result code is returned. This is intended primarily for providing feedback on the zip progress, but could also be used to cancel the operation between files. As of 2021-09-05 this routine automatically adds the files (manifest, manifest.uuid, manifest.tags) to the zip file, regardless of repository-level settings regarding those pseudo-files (see fsl_ckout_manifest_write()). As there are no F-cards associated with those non-files, the progressVisitor is not called for those. BUG/FIXME: this function does not honor symlink content in a fossil-compatible fashion. If it encounters a symlink entry during ZIP generation, it will fail and f's error state will be updated with an explanation of this shortcoming. @see fsl_zip_writer @see fsl_card_F_visitor_f() */ FSL_EXPORT int fsl_repo_zip_sym_to_filename( fsl_cx * const f, char const * sym, char const * vRootDir, char const * fileName, fsl_card_F_visitor_f progressVisitor, void * progressState); /** Callback state for use with fsl_repo_extract_f() implementations to stream a given version of a repository's file's, one file at a time, to a client. Instances are never created by client code, only by fsl_repo_extract() and its delegates, which pass them to |
︙ | ︙ | |||
12839 12840 12841 12842 12843 12844 12845 | /** Initialized-with-defaults fsl_repo_extract_opt instance, intended for intializing new non-const instances. */ FSL_EXPORT const fsl_repo_extract_opt fsl_repo_extract_opt_empty; /** | | < < < < | | | | | | | 13039 13040 13041 13042 13043 13044 13045 13046 13047 13048 13049 13050 13051 13052 13053 13054 13055 13056 13057 13058 13059 13060 13061 13062 13063 13064 13065 13066 13067 13068 13069 13070 13071 13072 13073 13074 13075 13076 13077 13078 13079 13080 13081 13082 13083 13084 13085 13086 13087 | /** Initialized-with-defaults fsl_repo_extract_opt instance, intended for intializing new non-const instances. */ FSL_EXPORT const fsl_repo_extract_opt fsl_repo_extract_opt_empty; /** Iterates over the file content of a single checkin in a repository, sending the appropriate version of each file's contents to a client-specified callback. For each file in the given checkin, opt->callback() is passed a fsl_repo_extract_state instance containing enough information to, e.g., unpack the contents to a working directory, add it to a compressed archive, or send it to some other destination. Returns 0 on success, non-0 on error. It will fail if f has no opened repository db. If the callback returns any code other than 0 or FSL_RC_BREAK, looping over the list of files ends and this function returns that value. FSL_RC_BREAK causes looping to stop but 0 is returned. See fsl_repo_extract_f() for more details about the semantics of the callback. See fsl_repo_extract_opt for the documentation of the various options. Fossil's internal metadata format guarantees that files will be passed to the callback in "lexical order" (as defined by fossil's manifest format definition). i.e. the files will be passed in case-sensitive, alphabetical order. Note that upper-case letters sort before lower-case ones. Sidebar: this function makes a bitwise copy of the 2nd argument before starting its work, just in case the caller gets the crazy idea to modify it from the extraction callback. Whether or not there are valid/interesting uses for such modification remains to be seen. If any are found, this copy behavior may change. */ FSL_EXPORT int fsl_repo_extract( fsl_cx * const f, fsl_repo_extract_opt const * const opt ); /** Equivalent to fsl_tag_an_rid() except that it takes a symbolic artifact name in place of an artifact ID as the third argumemnt. This function passes symToTag to fsl_sym_to_rid(), and on |
︙ | ︙ | |||
12985 12986 12987 12988 12989 12990 12991 12992 12993 | /** Looks for the delta table record where rid==deltaRid, and returns that record's srcid via *rv. Returns 0 on success, non-0 on error. If no record is found, *rv is set to 0 and 0 is returned (as opposed to FSL_RC_NOT_FOUND) because that generally simplifies the error checking. */ FSL_EXPORT int fsl_delta_src_id( fsl_cx * const f, fsl_id_t deltaRid, | > > | | 13181 13182 13183 13184 13185 13186 13187 13188 13189 13190 13191 13192 13193 13194 13195 13196 13197 13198 13199 | /** Looks for the delta table record where rid==deltaRid, and returns that record's srcid via *rv. Returns 0 on success, non-0 on error. If no record is found, *rv is set to 0 and 0 is returned (as opposed to FSL_RC_NOT_FOUND) because that generally simplifies the error checking. Results are undefined if any pointer argument is NULL. */ FSL_EXPORT int fsl_delta_src_id( fsl_cx * const f, fsl_id_t deltaRid, fsl_id_t * const rv ); /** Return true if the given artifact ID should is listed in f's shun table, else false. */ FSL_EXPORT int fsl_uuid_is_shunned(fsl_cx * const f, fsl_uuid_cstr zUuid); |
︙ | ︙ | |||
13022 13023 13024 13025 13026 13027 13028 | This routine is much more efficient if used to answer several queries in a row for the same manifest (the vid parameter). It is least efficient when it is passed intermixed manifest IDs, e.g. (1, 3, 1, 4, 1,...). This is a side-effect of the caching used in the computation of ancestors for a given vid. */ | | > | > | 13220 13221 13222 13223 13224 13225 13226 13227 13228 13229 13230 13231 13232 13233 13234 13235 13236 13237 13238 13239 13240 13241 13242 13243 13244 13245 | This routine is much more efficient if used to answer several queries in a row for the same manifest (the vid parameter). It is least efficient when it is passed intermixed manifest IDs, e.g. (1, 3, 1, 4, 1,...). This is a side-effect of the caching used in the computation of ancestors for a given vid. */ FSL_EXPORT int fsl_mtime_of_manifest_file(fsl_cx * const f, fsl_id_t vid, fsl_id_t fid, fsl_time_t * const pMTime); /** A convenience form of fsl_mtime_of_manifest_file() which looks up fc's RID based on its UUID. vid must be the RID of the checkin version fc originates from. See fsl_mtime_of_manifest_file() for full details - this function simply calculates the 3rd argument for that one. */ FSL_EXPORT int fsl_mtime_of_F_card(fsl_cx * const f, fsl_id_t vid, fsl_card_F const * const fc, fsl_time_t * const pMTime); /** Ensures that the given list has capacity for at least n entries. If the capacity is currently equal to or less than n, this is a no-op unless n is 0, in which case li->list is freed and the list is zeroed out. Else li->list is expanded to hold at least n elements. Returns 0 on success, FSL_RC_OOM on allocation error. |
︙ | ︙ | |||
13085 13086 13087 13088 13089 13090 13091 | The julian time of the branch. If 0 or less, default is the current time. */ double mtime; /** If true, the branch will be marked as private. */ | | | 13285 13286 13287 13288 13289 13290 13291 13292 13293 13294 13295 13296 13297 13298 13299 | The julian time of the branch. If 0 or less, default is the current time. */ double mtime; /** If true, the branch will be marked as private. */ bool isPrivate; }; typedef struct fsl_branch_opt fsl_branch_opt; #define fsl_branch_opt_empty_m { \ 0/*basisRid*/, NULL/*name*/, \ NULL/*user*/, NULL/*comment*/, \ NULL/*bgColor*/, \ 0.0/*mtime*/, 0/*isPrivate*/ \ |
︙ | ︙ | |||
13420 13421 13422 13423 13424 13425 13426 | problems, another (more serious) result code is returned, e.g. FSL_RC_OOM or FSL_RC_DB. If FSL_RC_NOT_FOUND is returned and hashOut is not NULL, *hashOut is set to the value of f's preferred hash. *ridOut is only modified if 0 is returned, in which case *ridOut will have a positive value. */ | | > | 13620 13621 13622 13623 13624 13625 13626 13627 13628 13629 13630 13631 13632 13633 13634 13635 | problems, another (more serious) result code is returned, e.g. FSL_RC_OOM or FSL_RC_DB. If FSL_RC_NOT_FOUND is returned and hashOut is not NULL, *hashOut is set to the value of f's preferred hash. *ridOut is only modified if 0 is returned, in which case *ridOut will have a positive value. */ FSL_EXPORT int fsl_repo_blob_lookup( fsl_cx * const f, fsl_buffer const * const src, fsl_id_t * const ridOut, fsl_uuid_str * hashOut ); /** Returns true if the specified file name ends with any reserved name, e.g.: _FOSSIL_ or .fslckout. For the sake of efficiency, zFilename must be a canonical name, |
︙ | ︙ | |||
13468 13469 13470 13471 13472 13473 13474 | This routine does not require that f have an opened repo, but if it does then this routine compares the canonicalized forms of both the repository db and the given path and fails if zPath refers to the repository db. Be aware that the relativeToCwd flag may influence that test. | | | | | > | < | | < | > | | 13669 13670 13671 13672 13673 13674 13675 13676 13677 13678 13679 13680 13681 13682 13683 13684 13685 13686 13687 13688 13689 13690 13691 13692 13693 13694 13695 13696 13697 13698 13699 13700 13701 13702 13703 13704 13705 | This routine does not require that f have an opened repo, but if it does then this routine compares the canonicalized forms of both the repository db and the given path and fails if zPath refers to the repository db. Be aware that the relativeToCwd flag may influence that test. This routine also checks fsl_ckout_manifest_setting() and reports any of the files represented by that function's results as being reserved. It only treats such names as reserved if they are at the top level of the repository - those same names in subdirectories are not reserved. If f has no checkout opened and relativeToCwd is true then those names are considered to be at the "top" if they are in the current directory. */ FSL_EXPORT int fsl_reserved_fn_check(fsl_cx * const f, const char *zPath, fsl_int_t nFile, bool relativeToCwd); /** Recompute/rebuild the entire repo.leaf table. This is not normally needed, as leaf tracking is part of the crosslinking process, but "just in case," here it is. This can supposedly be expensive (in time) for a really large repository. Testing implies otherwise. Returns 0 on success. On error f's error state may be updated. Results are undefined if f is invalid or has no opened repository. */ FSL_EXPORT int fsl_repo_leaves_rebuild(fsl_cx * const f); /** Flags for use with fsl_leaves_compute(). */ enum fsl_leaves_compute_e { /** Compute all leaves regardless of the "closed" tag. |
︙ | ︙ | |||
13536 13537 13538 13539 13540 13541 13542 | fsl_repo_leaves_rebuild()). @see fsl_leaves_computed_has() @see fsl_leaves_computed_count() @see fsl_leaves_computed_latest() @see fsl_leaves_computed_cleanup() */ | | | | | | | | | 13737 13738 13739 13740 13741 13742 13743 13744 13745 13746 13747 13748 13749 13750 13751 13752 13753 13754 13755 13756 13757 13758 13759 13760 13761 13762 13763 13764 13765 13766 13767 13768 13769 13770 13771 13772 13773 13774 13775 13776 13777 13778 13779 13780 13781 13782 13783 13784 13785 13786 13787 13788 13789 13790 13791 13792 13793 13794 13795 13796 13797 13798 13799 13800 13801 13802 13803 13804 13805 13806 13807 13808 13809 13810 13811 13812 13813 13814 13815 13816 13817 13818 13819 13820 13821 13822 13823 | fsl_repo_leaves_rebuild()). @see fsl_leaves_computed_has() @see fsl_leaves_computed_count() @see fsl_leaves_computed_latest() @see fsl_leaves_computed_cleanup() */ FSL_EXPORT int fsl_leaves_compute(fsl_cx * const f, fsl_id_t vid, fsl_leaves_compute_e leafMode); /** Requires that a prior call to fsl_leaves_compute() has succeeded, else results are undefined. Returns true if the leaves list computed by fsl_leaves_compute() is not empty, else false. This is more efficient than checking against fsl_leaves_computed_count()>0. */ FSL_EXPORT bool fsl_leaves_computed_has(fsl_cx * const f); /** Requires that a prior call to fsl_leaves_compute() has succeeded, else results are undefined. Returns a count of the leaves list computed by fsl_leaves_compute(), or a negative value if a db-level error is encountered. On errors other than FSL_RC_OOM, f's error state will be updated with information about the error. */ FSL_EXPORT fsl_int_t fsl_leaves_computed_count(fsl_cx * const f); /** Requires that a prior call to fsl_leaves_compute() has succeeded, else results are undefined. Returns the RID of the most recent checkin from those computed by fsl_leaves_compute(), 0 if no entries are found, or a negative value if a db-level error is encountered. On errors other than FSL_RC_OOM, f's error state will be updated with information about the error. */ FSL_EXPORT fsl_id_t fsl_leaves_computed_latest(fsl_cx * const f); /** Cleans up any db-side resources created by fsl_leaves_compute(). e.g. drops the temporary table created by that routine. Any errors are silenty ignored. */ FSL_EXPORT void fsl_leaves_computed_cleanup(fsl_cx * const f); /** Returns true if f's current repository has the forbid-delta-manifests setting set to a truthy value. Results are undefined if f has no opened repository. Some routines behave differently if this setting is enabled. e.g. fsl_checkin_commit() will never generate a delta manifest and fsl_deck_save() will refuse to save a delta. This does not affect parsing or deltas or those which are injected into the db via lower-level means (e.g. a direct blob import or from a remote sync). Results are undefined if f has no opened repository. */ FSL_EXPORT bool fsl_repo_forbids_delta_manifests(fsl_cx * const f); /** This is a variant of fsl_ckout_manifest_write() which writes data regarding the given manifest RID to the given blobs. If manifestRid is 0 or less then the current checkout is assumed and FSL_RC_NOT_A_CKOUT is returned if no checkout is opened (or FSL_RC_RANGE if an empty checkout is opened - a freshly-created repository with no checkins). For each buffer argument which is not NULL, the corresponding checkin-related data are appended to it. All such blobs will end in a terminating newline character. Returns 0 on success, any of numerious non-0 fsl_rc_e codes on error. */ FSL_EXPORT int fsl_repo_manifest_write(fsl_cx * const f, fsl_id_t manifestRid, fsl_buffer * const manifest, fsl_buffer * const manifestUuid, fsl_buffer * const manifestTags ); /** |
︙ | ︙ | |||
13778 13779 13780 13781 13782 13783 13784 | TODO: figure out and explain the difference between versionRid and originRid. */ fsl_id_t originRid; /** The maximum number of versions to search through. | < < < < | 13979 13980 13981 13982 13983 13984 13985 13986 13987 13988 13989 13990 13991 13992 | TODO: figure out and explain the difference between versionRid and originRid. */ fsl_id_t originRid; /** The maximum number of versions to search through. */ uint32_t limitVersions; /** An approximate number of milliseconds of processing time to limit the annotation to. Note that this is measured in CPU time, not "wall clock" time. This value is rough minimum approximation, |
︙ | ︙ | |||
13965 13966 13967 13968 13969 13970 13971 | /** Options for the rebuild process. */ struct fsl_rebuild_opt { /** Scan artifacts in a random order (generally only of use in testing | | | < | | 14162 14163 14164 14165 14166 14167 14168 14169 14170 14171 14172 14173 14174 14175 14176 14177 14178 14179 14180 14181 14182 14183 14184 14185 | /** Options for the rebuild process. */ struct fsl_rebuild_opt { /** Scan artifacts in a random order (generally only of use in testing the library's code). This is primarily for testing that the library can handle its inputs in an arbitrary order. */ bool randomize; /** True if clusters should be created. NOT YET IMPLEMENTED. */ bool createClusters; /** If true, the transaction started by the rebuild process will end in a rollback even on success. In that case, if a transaction is started before the rebuild is initiated, it will be left in the rolling-back state after rebuild completes. */ bool dryRun; |
︙ | ︙ | |||
13997 13998 13999 14000 14001 14002 14003 | Optional state for the callback function. */ void * callbackState; }; /** Initialized-with-defaults fsl_rebuild_opt structure, intended for const-copy initialization. */ | | < | 14193 14194 14195 14196 14197 14198 14199 14200 14201 14202 14203 14204 14205 14206 14207 14208 14209 14210 14211 | Optional state for the callback function. */ void * callbackState; }; /** Initialized-with-defaults fsl_rebuild_opt structure, intended for const-copy initialization. */ #define fsl_rebuild_opt_empty_m {false,false,false,NULL,NULL} /** Initialized-with-defaults fsl_rebuild_opt structure, intended for non-const copy initialization. */ FSL_EXPORT const fsl_rebuild_opt fsl_rebuild_opt_empty; /** "Rebuilds" the current repository database. This involves _at least_ the following: - DROPPING all transient repository tables. ALL tables in the db which do not specifically belong to fossil and do not start with |
︙ | ︙ | |||
14052 14053 14054 14055 14056 14057 14058 14059 14060 14061 14062 14063 | artifacts, so this routine does _not_ drop and rebuild the ticket-related tables. If the FSL_CX_F_SKIP_UNKNOWN_CROSSLINKS flag is _not_ set on f, this routine _will fail_ if it encounters any ticket artifacts. */ FSL_EXPORT int fsl_repo_rebuild(fsl_cx * const f, fsl_rebuild_opt const * const opt); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_REPO_H_INCLUDED */ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 14247 14248 14249 14250 14251 14252 14253 14254 14255 14256 14257 14258 14259 14260 14261 14262 14263 14264 14265 14266 14267 14268 14269 14270 14271 14272 14273 14274 14275 14276 14277 14278 14279 14280 14281 14282 14283 14284 14285 14286 14287 14288 14289 14290 14291 14292 14293 14294 14295 14296 14297 14298 14299 14300 14301 14302 14303 14304 14305 14306 14307 14308 14309 14310 14311 14312 14313 14314 14315 14316 14317 14318 14319 14320 14321 14322 14323 14324 14325 14326 14327 14328 14329 14330 14331 14332 14333 14334 14335 14336 14337 14338 14339 14340 14341 14342 14343 14344 14345 14346 14347 14348 14349 14350 14351 14352 14353 14354 14355 14356 14357 14358 14359 14360 14361 14362 14363 14364 14365 14366 14367 14368 14369 14370 14371 14372 14373 14374 14375 14376 14377 14378 14379 14380 14381 14382 14383 14384 14385 14386 14387 14388 14389 14390 14391 14392 14393 14394 14395 14396 14397 14398 14399 14400 14401 14402 14403 14404 14405 14406 14407 14408 14409 14410 14411 14412 14413 14414 14415 14416 14417 14418 14419 14420 14421 14422 14423 14424 14425 14426 14427 14428 14429 14430 14431 14432 14433 14434 14435 14436 14437 14438 14439 14440 14441 14442 14443 14444 14445 14446 14447 14448 14449 14450 14451 14452 14453 14454 14455 14456 14457 14458 14459 14460 14461 14462 14463 14464 14465 14466 14467 14468 14469 14470 14471 14472 14473 14474 14475 14476 14477 14478 14479 14480 14481 14482 14483 14484 14485 14486 14487 14488 14489 14490 14491 14492 14493 14494 14495 14496 14497 14498 14499 14500 14501 14502 14503 14504 14505 14506 14507 14508 14509 14510 14511 14512 14513 14514 14515 14516 14517 14518 14519 14520 14521 14522 14523 14524 14525 14526 14527 14528 14529 14530 14531 14532 14533 14534 14535 14536 14537 14538 14539 14540 14541 14542 14543 14544 14545 14546 14547 14548 14549 14550 14551 14552 14553 14554 14555 14556 14557 14558 14559 14560 14561 14562 14563 14564 14565 14566 14567 14568 14569 14570 14571 14572 14573 14574 14575 14576 14577 14578 14579 14580 14581 14582 14583 14584 14585 14586 14587 14588 14589 14590 14591 14592 14593 14594 14595 14596 14597 14598 14599 14600 14601 14602 14603 14604 14605 14606 14607 14608 14609 14610 14611 14612 14613 14614 14615 14616 14617 14618 14619 14620 14621 14622 14623 14624 14625 14626 14627 14628 14629 14630 14631 14632 14633 14634 14635 14636 14637 14638 14639 14640 14641 14642 14643 14644 14645 14646 14647 14648 14649 14650 14651 14652 14653 14654 14655 14656 14657 14658 14659 14660 14661 14662 14663 14664 14665 14666 14667 14668 14669 14670 14671 14672 14673 14674 14675 14676 14677 14678 14679 14680 14681 14682 14683 14684 14685 14686 14687 14688 14689 14690 14691 14692 14693 14694 14695 14696 14697 14698 14699 14700 14701 14702 14703 14704 14705 14706 14707 14708 14709 14710 14711 14712 14713 14714 14715 14716 14717 14718 14719 14720 14721 14722 14723 14724 14725 14726 14727 14728 14729 14730 14731 14732 14733 14734 14735 14736 14737 14738 14739 14740 14741 14742 14743 14744 14745 14746 14747 14748 14749 14750 14751 14752 14753 14754 14755 14756 14757 14758 14759 14760 14761 14762 14763 14764 14765 14766 14767 14768 14769 14770 14771 14772 14773 14774 14775 14776 14777 14778 14779 14780 14781 14782 14783 14784 14785 14786 14787 14788 14789 14790 14791 14792 14793 14794 14795 | artifacts, so this routine does _not_ drop and rebuild the ticket-related tables. If the FSL_CX_F_SKIP_UNKNOWN_CROSSLINKS flag is _not_ set on f, this routine _will fail_ if it encounters any ticket artifacts. */ FSL_EXPORT int fsl_repo_rebuild(fsl_cx * const f, fsl_rebuild_opt const * const opt); /** Tries to determine the branch name of the given rid, which is assumed to refer to a checkin artifact. If it cannot find one and doFallback is true then it looks for the `main-branch` repository-level config setting and uses that (falling back to "trunk" is that setting is not set). On success it returns 0 and sets `*zOut` to the branch name, transfering ownership of those bytes to the caller. If doFallback is false and no direct branch name is found then it sets `*zOut` to NULL. If doFallback is true then, on success, `*zOut` will always be set to some non-NULL value. On error `*zOut` is not modified. On error it may return FSL_RC_NOT_A_REPO, FSL_RC_OOM, or any number of db-side error codes. */ FSL_EXPORT int fsl_branch_of_rid(fsl_cx * const f, fsl_int_t rid, bool doFallback, char ** zOut ); /** Convenience typedef and obligatory forward declaration. */ typedef struct fsl_cidiff_state fsl_cidiff_state; /** Callback type for use with fsl_cidiff(). It must return 0 on success or a value from the fsl_rc_e enum on error. On error it "should" update the error state in the corresponding fsl_cx object by passing state->f to fsl_cx_err_set() (or equivalent). */ typedef int (*fsl_cidiff_f)(fsl_cidiff_state const *state); /** Options for use with fsl_cidiff() */ struct fsl_cidiff_opt { /** Checkin version (RID) for "version 1". */ fsl_id_t v1; /** Checkin version (RID) for "version 2". This checkin need not have any relationship with version 1, in terms of SCM-side lineage. */ fsl_id_t v2; /** Callback to call on each iteration step. */ fsl_cidiff_f callback; /** Opaque state for the callback. It can be accessed from the callback via arg->opt->callbackState. */ void * callbackState; }; /** Convenience typedef. */ typedef struct fsl_cidiff_opt fsl_cidiff_opt; /** Initialized-with-defaults fsl_cidiff_opt structure, intended for const-copy initialization. */ #define fsl_cidiff_opt_empty_m {0,0} /** Initialized-with-defaults fsl_cidiff_opt structure, intended for non-const copy initialization. */ FSL_EXPORT const fsl_cidiff_opt fsl_cidiff_opt_empty; /** Descriptors for the type of information being reported for each step of fsl_cidiff() iteration, as reported via the fsl_cidiff_state::changes attribute. */ enum fsl_cidiff_e { /** Indicates that the v1 and v2 files are the same. Specifically, this means: - Same current names, compared case-sensitively. fsl_card_F::priorName values are ignored for this - Same permissions. - Same hash. */ FSL_CIDIFF_NONE = 0, /** Indicates that the hashes of the v1 and v2 files differ. */ FSL_CIDIFF_FILE_MODIFIED = 0x0001, /** Indicates that the v2 file was renamed. Caveats: - If v1 and v2 are not immediate relatives in the SCM DAG sense. e.g. when comparing a version X and unrelated version Y, or version X and X+30, it is possible that a rename goes unreported via fsl_cidiff or that it gets misdiagnosed. e.g. if version X renames file A to B and version X+100 renames file C to A, it will be reported as a rename. Detecting the true reality of such cases is remarkably challenging, requiring going through the entire history which links v1 and v2. - Pedantically speaking, if v1 and v2 are unrelated in the SCM DAG, "renames" are not possible but will be reported as such if their names happen to match up. */ FSL_CIDIFF_FILE_RENAMED = 0x0002, /** Indicates that the permissions of the current file differ between v1 and v2. This is only set if both versions have a given file (by name, as opposed to hash). */ FSL_CIDIFF_FILE_PERMS = 0x0004, /** Indicates that the file is in v2 but not v1. If v1 and v2 are unrelated versions or are not immediate DAG neighbors, this might also indicate that a file from v1 was renamed in v2. */ FSL_CIDIFF_FILE_ADDED = 0x0010, /** Indicates that the file is in v1 but not v2. If v1 and v2 are unrelated versions or are not immediate DAG neighbors, this might also indicate that a file from v1 was renamed in v2. */ FSL_CIDIFF_FILE_REMOVED = 0x0020 }; /** Convenience typedef. */ typedef enum fsl_cidiff_e fsl_cidiff_e; /** Holds the state for a single iteration step of fsl_cidiff. */ struct fsl_cidiff_state { /** The associated fsl_cx instance. */ fsl_cx * f; /** The options object passed to fsl_cidiff(). */ fsl_cidiff_opt const *opt; /** Denotes the type of this step in the iteration. Before fsl_cidiff() starts its loop over F-card changes, it calls the callback once with this value set to 0. The intent is to give the caller an opporuntity to do any required setup, e.g. outputing a report header. The fc1 and fc2 members will both be NULL, but the d1 and d2 members will be set. For each step of the F-card iteration, stepType will be set to FSL_RC_STEP_ROW. After successful difference iteration, fsl_cidiff() calls its callback with stepType set to FSL_RC_STEP_DONE. The intent is to give the caller an opporuntity to do any required cleanup, e.g. outputing a report footer. The fc1 and fc2 members will both be NULL, but the d1 and d2 members will be set. */ int stepType; /** Describes the change(s) being reported by the current iteration step, as a bitmask of fsl_cidiff_e values. */ int changes; /** The file, if any, corresponding to this->v1. This will be NULL this->changeType is FSL_CIDIFF_FILE_ADDED. */ fsl_card_F const * fc1; /** The file, if any, corresponding to this->v2. This will be NULL this->changeType is FSL_CIDIFF_FILE_REMOVED. */ fsl_card_F const * fc2; /** The deck corresponding to this->opt->v1. It is strictly forbidden for this->callback to manipulate this object. Specifically, any traversal of its F-card list will invalidate the iteration being done by fsl_cidiff(). Read-only operations on other state of the deck are legal. */ fsl_deck const * d1; /** The deck corresponding to this->opt->v2. See the docs for this->d1 for important details. */ fsl_deck const * d2; }; /** Initialized-with-defaults fsl_cidiff_state structure, intended for const-copy initialization. */ #define fsl_cidiff_state_empty_m {\ NULL/*f*/,NULL/*opt*/, \ 0/*stepType*/,FSL_CIDIFF_NONE/*changes*/, \ NULL/*fc1*/,NULL/*fc2*/, \ NULL/*d1*/,NULL/*d2*/ \ } /** Initialized-with-defaults fsl_cidiff_state structure, intended for non-const copy initialization. */ FSL_EXPORT const fsl_cidiff_state fsl_cidiff_state_empty; /** A utility for reporting the differences between the manifests of two checkins. This loads the fsl_deck instances for each version opt->v1 and opt->v2, then calls opt->callback for each step of the difference-checking process. It only inspects and reports the difference between _exactly_ v1 and _exactly_ v2, not the difference between the chain of SCM DAG relatives (if any) between the two. It is not required that v1 and v2 be related in the SCM DAG but its report of differences may be misleading if v1 and v2 are either unrelated or separated by more than 1 step in the DAG. See the docs for fsl_cidiff_e for cases known to be potentially confusing. Returns 0 on success. If the callback returns non-0, that result is propagated back to the caller. It may otherwise return any number of othe result codes including, but not limited to: - FSL_RC_OOM on allocation error - FSL_RC_NOT_A_REPO if f has no opened repository. - FSL_RC_TYPE if either of the given versions is not a checkin. - FSL_RC_NOT_FOUND if either of given versions is not found in the repository. Potential TODO: add fsl_deck_diff() which takes two decks, instead of RIDs, to compare. This function would just be a proxy for that one, loading the given RIDs and passing on the decks. That would require a significantly larger set of possible change-type values and would require much type-specific handling (e.g. maybe reporting J-card differences for a pair of ticket decks). */ FSL_EXPORT int fsl_cidiff(fsl_cx * const f, fsl_cidiff_opt const * const opt); /** Configuration parameters for fsl_repo_create(). Always copy-construct these from fsl_repo_create_opt_empty resp. fsl_repo_create_opt_empty_m in order to ensure proper behaviour vis-a-vis default values. TODOs: - Add project name/description, and possibly other configuration bits. - Allow client to set password for default user (currently set randomly, as fossil(1) does). */ struct fsl_repo_create_opt { /** The file name for the new repository. */ char const * filename; /** Fossil user name for the admin user in the new repo. If NULL, defaults to the Fossil context's user (see fsl_cx_user_get()). If that is NULL, it defaults to "root" for historical reasons. */ char const * username; /** The comment text used for the initial commit. If NULL or empty (starts with a NUL byte) then no initial check is created. fossil(1) is largely untested with that scenario (but it seems to work), so for compatibility it is not recommended that this be set to NULL. The default value (when copy-initialized) is "egg". There's a story behind the use of "egg" as the initial checkin comment, and it all started with a typo: "initial chicken" */ char const * commitMessage; /** Mime type for the commit message (manifest N-card). Manifests support this but fossil(1) has never (as of 2021-02) made use of it. It is provided for completeness but should, for compatibility's sake, probably not be set, as the fossil UI may not honor it. The implied default is text/x-fossil-wiki. Other ostensibly legal values include text/plain and text/x-markdown. This API will accept any value, but results are technically undefined with any values other than those listed above. */ char const * commitMessageMimetype; /** If not NULL and not empty, fsl_repo_create() will use this repository database to copy the configuration, copying over the following settings: - The reportfmt table, overwriting any existing entries. - The user table fields (cap, info, mtime, photo) are copied for the "system users". The system users are: anonymous, nobody, developer, reader. - The vast majority of the config table is copied, arguably more than it should (e.g. the 'manifest' setting). */ char const * configRepo; /** If false, fsl_repo_create() will fail if this->filename already exists. */ bool allowOverwrite; }; typedef struct fsl_repo_create_opt fsl_repo_create_opt; /** Initialized-with-defaults fsl_repo_create_opt struct, intended for in-struct initialization. */ #define fsl_repo_create_opt_empty_m { \ NULL/*filename*/, \ NULL/*username*/, \ "egg"/*commitMessage*/, \ NULL/*commitMessageMimetype*/, \ NULL/*configRepo*/, \ false/*allowOverwrite*/ \ } /** Initialized-with-defaults fsl_repo_create_opt struct, intended for copy-initialization. */ FSL_EXPORT const fsl_repo_create_opt fsl_repo_create_opt_empty; /** Creates a new repository database using the options provided in the second argument. If f is not NULL, it must be a valid context instance, though it need not have an opened checkout/repository. If f has an opened repo or checkout, this routine closes them but that closing _will fail_ if a transaction is currently active! If f is NULL, a temporary context is used for creating the repository, in which case the caller will not have access to detailed error information (only the result code) if this operation fails. In that case, the resulting repository file will, on success, be found at the location referred to by opt.filename. The opt argument may not be NULL. If opt->allowOverwrite is false (0) and the file exists, it fails with FSL_RC_ALREADY_EXISTS, otherwise is creates/overwrites the file. This is a destructive operation if opt->allowOverwrite is true, so be careful: the existing database will be truncated and re-created. This operation installs the various "static" repository schemas into the db, sets up some default settings, and installs a default user. This operation always closes any repository/checkout opened by f because setting up the new db requires wiring it to f to set up some of the db-side infrastructure. The one exception is if argument validation fails, in which case f's repo/checkout-related state are not modified. Note that closing will fail if a transaction is currently active and that, in turn, will cause this operation to fail. See the fsl_repo_create_opt docs for more details regarding the creation options. On success, 0 is returned and f (if not NULL) is left with the new repository opened and ready for use. On error, f's error state is updated and any number of the FSL_RC_xxx codes may be returned - there are no less than 30 different _potential_ error conditions on the way to creating a new repository. If initialization of the repository fails, this routine will attempt to remove its partially-initialize corpse from the filesystem but will ignore any errors encountered while doing so. Example usage: ``` fsl_repo_create_opt opt = fsl_repo_create_opt_empty; int rc; opt.filename = "my.fossil"; // ... any other opt.xxx you want to set, e.g.: // opt.user = "fred"; // Assume fsl is a valid fsl_cx instance: rc = fsl_repo_create(fsl, &opt); if(rc) { ...error... } else { fsl_db * db = fsl_cx_db_repo(f); assert(db); // == the new repo db ... } ``` @see fsl_repo_open() @see fsl_repo_close() */ FSL_EXPORT int fsl_repo_create(fsl_cx * f, fsl_repo_create_opt const * opt ); /** UNTESTED. Returns true if f has an opened repository database which is opened in read-only mode, else returns false. */ FSL_EXPORT char fsl_repo_is_readonly(fsl_cx const * f); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_REPO_H_INCLUDED */ /* end of file ./include/fossil-scm/repo.h */ /* start of file ./include/fossil-scm/checkout.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_CHECKOUT_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_CHECKOUT_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /** @file checkout.h fossil-checkout.h declares APIs specifically dealing with checkout-side state, as opposed to purely repository-db-side state or non-content-related APIs. */ #if defined(__cplusplus) extern "C" { #endif /** Tries to open a checked-out fossil repository db in the given directory (or "." if dirName is NULL). This routine canonicalizes its dirName argument using fsl_file_canonical_name(), then passes that and checkParentDirs on to fsl_ckout_db_search() to find a checkout db, so see that routine for how it searches. If this routine finds/opens a checkout, it also tries to open the repository database from which the checkout derives, and fails if it cannot. The library never allows a checkout to be opened without its corresponding repository partner because a checkout has hard dependencies on the repo's state. Returns 0 on success. If there is an error opening or validating the checkout or its repository db, f's error state will be updated. Error codes/conditions include: - FSL_RC_MISUSE if f is NULL. - FSL_RC_ACCESS if f already has and opened checkout. - FSL_RC_OOM if an allocation fails. - FSL_RC_NOT_FOUND if no checkout is foud or if a checkout's repository is not found. - FSL_RC_RANGE if dirname is not NULL but has a length of 0. - Various codes from fsl_getcwd() (if dirName is NULL). - Various codes if opening the associated repository DB fails. TODO: there's really nothing in the architecture which restricts a checkout db to being in the same directory as the checkout, except for some historical bits which "could" be refactored. It "might be interesting" to eventually provide a variant which opens a checkout db file directly. We have the infrastructure, just need some refactoring. It "shouldn't" require any trickery or incompatibilities with fossil(1). */ FSL_EXPORT int fsl_ckout_open_dir( fsl_cx * const f, char const * dirName, bool checkParentDirs ); /** Searches the given directory (or the current directory if dirName is 0) for a fossil checkout database file named one of (_FOSSIL_, .fslckout). If it finds one, it returns 0 and appends the file's path to pOut if pOut is not 0. If neither is found AND if checkParentDirs is true an then it moves up the path one directory and tries again, until it hits the root of the dirPath (see below for a note/caveat). If dirName is NULL then it behaves as if it had been passed the absolute path of the current directory (as determined by fsl_getcwd()). This function does no normalization of dirName. Because of that... Achtung: if dirName is relative, this routine might not find a checkout where it would find one if given an absolute path (because it traverses the path string given it instead of its canonical form). Whether this is a bug or a feature is not yet clear. When in doubt, use fsl_file_canonical_name() to normalize the directory name before passing it in here. If it turns out that we always want that behaviour, this routine will be modified to canonicalize the name. This routine can return at least the following error codes: - FSL_RC_NOT_FOUND: either no checkout db was found or the given directory was not found. - FSL_RC_RANGE if dirName is an empty string. (We could arguably interpret this as a NULL string, i.e. the current directory.) - FSL_RC_OOM if allocation of a filename buffer fails. TODO? - Why was the decision made not to canonicalize dirName from here? We might want to change that. */ FSL_EXPORT int fsl_ckout_db_search( char const * dirName, bool checkParentDirs, fsl_buffer * const pOut ); /** Returns version information for the current checkout. If f has an opened checkout then... If uuid is not NULL then *uuid is set to the UUID of the opened checkout, or NULL if there is no checkout. If rid is not NULL, *rid |
︙ | ︙ | |||
14111 14112 14113 14114 14115 14116 14117 | as those always "seed" the database with an initial commit artifact containing no files. */ FSL_EXPORT void fsl_ckout_version_info(fsl_cx * const f, fsl_id_t * const rid, fsl_uuid_cstr * const uuid ); /** | | | | | | 14806 14807 14808 14809 14810 14811 14812 14813 14814 14815 14816 14817 14818 14819 14820 14821 14822 14823 14824 | as those always "seed" the database with an initial commit artifact containing no files. */ FSL_EXPORT void fsl_ckout_version_info(fsl_cx * const f, fsl_id_t * const rid, fsl_uuid_cstr * const uuid ); /** Given a fsl_cx with an opened checkout, and a file/directory name, this function canonicalizes zOrigName to a form suitable for use as an in-repo filename, _appending_ the results to pOut. If pOut is NULL, it performs its normal checking but does not write a result, other than to return 0 for success. As a special case, if zOrigName refers to the top-level checkout directory, it resolves to either "." or "./", depending on whether zOrigName contains a trailing slash. If relativeToCwd is true then the filename is canonicalized based on the current working directory (see fsl_getcwd()), |
︙ | ︙ | |||
14148 14149 14150 14151 14152 14153 14154 | This function does not validate whether or not the file actually exists, only that its name is potentially valid as a filename for use in a checkout (though other, downstream rules might prohibit that, e.g. the filename "..../...." is not valid but is not seen as invalid by this function). (Reminder to self: we could run the end result through fsl_is_simple_pathname() to catch that?) */ | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > | | < | 14843 14844 14845 14846 14847 14848 14849 14850 14851 14852 14853 14854 14855 14856 14857 14858 14859 14860 14861 14862 14863 14864 14865 14866 14867 14868 14869 14870 14871 14872 14873 14874 14875 14876 14877 14878 14879 14880 14881 14882 14883 14884 14885 14886 14887 14888 14889 14890 14891 14892 14893 14894 14895 14896 14897 14898 14899 14900 14901 14902 14903 14904 14905 14906 14907 14908 14909 14910 14911 14912 14913 14914 14915 14916 14917 14918 14919 14920 14921 14922 14923 14924 14925 | This function does not validate whether or not the file actually exists, only that its name is potentially valid as a filename for use in a checkout (though other, downstream rules might prohibit that, e.g. the filename "..../...." is not valid but is not seen as invalid by this function). (Reminder to self: we could run the end result through fsl_is_simple_pathname() to catch that?) */ FSL_EXPORT int fsl_ckout_filename_check( fsl_cx * const f, bool relativeToCwd, char const * zOrigName, fsl_buffer * const pOut ); /** Convenience typedef and required forward decl. */ typedef struct fsl_ckout_manage_opt fsl_ckout_manage_opt; /** State passed to fsl_ckout_manage_f() callback. */ struct fsl_ckout_manage_state { /** The fsl_cx instance for the correspnding fsl_ckout_manage() call. */ fsl_cx * f; /** The options object passed to the corresponding call to fsl_ckout_manage(). This is provided primarily for access to its callbackState member. The client must never modify any state in this opt object other than the callbackState or to use other APIs of this->f. */ fsl_ckout_manage_opt const * opt; /** The name of the file being managed, relative to the root of the checkout. fsl_cx_stat2() can be used to transform it to an absolute path, if needed. Given a fsl_ckout_manage_state named `ms`, that call would look like: ``` fsl_buffer_reuse(&yourBuffer); // ^^^ noting that fsl_cx_stat2() APPENDS to the buffer. int rc = fsl_cx_stat2(ms->f, false, ms->filename, NULL, &yourBuffer, true); // ^^^ noting that the stat "should not" fail in this case // because fsl_ckout_manage() has validated that the file // exists. ``` */ char const * filename; }; /** Convenience typedef. */ typedef struct fsl_ckout_manage_state fsl_ckout_manage_state; /** Callback type for use with fsl_ckout_manage_opt(). It should inspect the given (`mst->filename`) using whatever criteria it likes, set *include to true or false to indicate whether the filename is okay to include the current add-file-to-repo operation, and return 0. If it returns non-0 the add-file-to-repo process will end and that error code will be reported to its caller. Such result codes must come from the FSL_RC_xxx family. They may report details of the error via fsl_cx_err_set() with the `mst->f` object. It will be passed a name which is relative to the top-most checkout directory. The final argument is not used by the library, but is passed on as-is from the fsl_ckout_manage_opt::callbackState pointer which is passed to fsl_ckout_manage(). */ typedef int (*fsl_ckout_manage_f)(fsl_ckout_manage_state const *mst, bool *include); /** Options for use with fsl_ckout_manage(). */ struct fsl_ckout_manage_opt { /** The file or directory name to add. If it is a directory, the add process will recurse into it. |
︙ | ︙ | |||
14256 14257 14258 14259 14260 14261 14262 | any of those globs. - The client-provided callback says not to include the file. */ uint32_t skipped; } counts; }; | < | 14997 14998 14999 15000 15001 15002 15003 15004 15005 15006 15007 15008 15009 15010 | any of those globs. - The client-provided callback says not to include the file. */ uint32_t skipped; } counts; }; /** Initialized-with-defaults fsl_ckout_manage_opt instance, intended for use in const-copy initialization. */ #define fsl_ckout_manage_opt_empty_m {\ NULL/*filename*/, true/*relativeToCwd*/, true/*checkIgnoreGlobs*/, \ NULL/*callback*/, NULL/*callbackState*/, \ |
︙ | ︙ | |||
14305 14306 14307 14308 14309 14310 14311 14312 14313 14314 14315 14316 14317 14318 14319 14320 14321 14322 14323 | ``` Returns 0 on success, non-0 on error. Files queued for addition this way can be unqueued before they are committed using fsl_ckout_unmanage(). @see fsl_ckout_unmanage() @see fsl_reserved_fn_check() */ FSL_EXPORT int fsl_ckout_manage( fsl_cx * const f, fsl_ckout_manage_opt * const opt ); /** Callback type for use with fsl_ckout_unmanage(). It is called by the removal process, immediately after a file is "removed" from SCM management (a.k.a. when the file becomes "unmanaged"). | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | > > | | | < < < < | | 15045 15046 15047 15048 15049 15050 15051 15052 15053 15054 15055 15056 15057 15058 15059 15060 15061 15062 15063 15064 15065 15066 15067 15068 15069 15070 15071 15072 15073 15074 15075 15076 15077 15078 15079 15080 15081 15082 15083 15084 15085 15086 15087 15088 15089 15090 15091 15092 15093 15094 15095 15096 15097 15098 15099 15100 15101 15102 15103 15104 15105 15106 15107 15108 15109 15110 15111 15112 15113 15114 15115 15116 15117 15118 15119 15120 15121 15122 15123 15124 15125 15126 15127 15128 15129 15130 | ``` Returns 0 on success, non-0 on error. Files queued for addition this way can be unqueued before they are committed using fsl_ckout_unmanage(). To avoid Significant Grief, this routine automatically skips any directories under opt->filename which appear to be fossil checkout roots unless that directory is f's current checkout directory, into which it will recurse normally. @see fsl_ckout_unmanage() @see fsl_reserved_fn_check() */ FSL_EXPORT int fsl_ckout_manage( fsl_cx * const f, fsl_ckout_manage_opt * const opt ); /** Convenience typedef and required forward decl. */ typedef struct fsl_ckout_unmanage_opt fsl_ckout_unmanage_opt; /** State passed to fsl_ckout_unmanage_f() callback. */ struct fsl_ckout_unmanage_state { /** The fsl_cx instance for the correspnding fsl_ckout_unmanage() call. */ fsl_cx * f; /** The options object passed to the corresponding call to fsl_ckout_unmanage(). This is provided primarily for access to its callbackState member. The client must never modify any state in this opt object other than the callbackState or to use other APIs of this->f. */ fsl_ckout_unmanage_opt const * opt; /** The name of the file being unmanaged, relative to the root of the checkout. fsl_cx_stat2() can be used to transform it to an absolute path, if needed. Given a fsl_ckout_unmanage_state named `ums`, that call would look like: ``` fsl_buffer_reuse(&yourBuffer); // ^^^ noting that fsl_cx_stat2() APPENDS to the buffer. int rc = fsl_cx_stat2(ums->f, false, ums->filename, NULL, &yourBuffer, true); // ^^^ noting that the stat will legitimately and harmlessly // fail if the file does not exist, so this error can // normally be ignored. ``` */ char const * filename; }; /** Convenience typedef. */ typedef struct fsl_ckout_unmanage_state fsl_ckout_unmanage_state; /** Callback type for use with fsl_ckout_unmanage(). It is called by the removal process, immediately after a file is "removed" from SCM management (a.k.a. when the file becomes "unmanaged"). If it returns non-0 the unmanage process will end and that error code will be reported to its caller. Such result codes must come from the FSL_RC_xxx family. They may report details of the error via fsl_cx_err_set() with the `ums->f` object. The object passed to it will hold the name of the file being unmanaged, relative to the top-most checkout directory. The client is free to unlink the file from the filesystem if they like - the library does not do so automatically */ typedef int (*fsl_ckout_unmanage_f)(fsl_ckout_unmanage_state const * ums); /** Options for use with fsl_ckout_unmanage(). */ struct fsl_ckout_unmanage_opt { /** The file or directory name to add. If it is a directory, the add |
︙ | ︙ | |||
14380 14381 14382 14383 14384 14385 14386 | The name it is passed is relative to the checkout root. */ fsl_ckout_unmanage_f callback; /** State to be passed to this->callback. */ void * callbackState; | < < | 15167 15168 15169 15170 15171 15172 15173 15174 15175 15176 15177 15178 15179 15180 15181 | The name it is passed is relative to the checkout root. */ fsl_ckout_unmanage_f callback; /** State to be passed to this->callback. */ void * callbackState; }; /** Initialized-with-defaults fsl_ckout_unmanage_opt instance, intended for use in const-copy initialization. */ #define fsl_ckout_unmanage_opt_empty_m {\ NULL/*filename*/, NULL/*vfileIds*/,\ true/*relativeToCwd*/,true/*scanForChanges*/, \ |
︙ | ︙ | |||
14858 14859 14860 14861 14862 14863 14864 | opt->filename must refer to a path within the current checkout. @see fsl_checkin_enqueue() @see fsl_checkin_is_enqueued() @see fsl_checkin_discard() @see fsl_checkin_commit() */ | | | | | | | | | > > | > | | 15643 15644 15645 15646 15647 15648 15649 15650 15651 15652 15653 15654 15655 15656 15657 15658 15659 15660 15661 15662 15663 15664 15665 15666 15667 15668 15669 15670 15671 15672 15673 15674 15675 15676 15677 15678 15679 15680 15681 15682 15683 15684 15685 15686 15687 15688 15689 15690 15691 15692 15693 15694 15695 15696 15697 15698 15699 15700 15701 15702 15703 15704 15705 15706 | opt->filename must refer to a path within the current checkout. @see fsl_checkin_enqueue() @see fsl_checkin_is_enqueued() @see fsl_checkin_discard() @see fsl_checkin_commit() */ FSL_EXPORT int fsl_checkin_dequeue(fsl_cx * const f, fsl_checkin_queue_opt const * opt); /** Returns true if the file named by zName is in f's current file checkin queue. If NO files are in the current selection queue then this routine assumes that ALL files are implicitely selected. As long as at least one file is enqueued (via fsl_checkin_enqueue()) then this function only returns true for files which have been explicitly enqueued. If relativeToCwd then zName is resolved based on the current directory, otherwise it assumed to be related to the checkout's root directory. This function returning true does not necessarily indicate that the file _will_ be checked in at the next commit. If the file has not been modified at commit-time then it will not be part of the commit. This function honors the fsl_cx_is_case_sensitive() setting when comparing names. Achtung: this does not resolve directory names like fsl_checkin_enqueue() and fsl_checkin_dequeue() do. It only works with file names. Results are undefined if f is NULL. @see fsl_checkin_enqueue() @see fsl_checkin_dequeue() @see fsl_checkin_discard() @see fsl_checkin_commit() */ FSL_EXPORT bool fsl_checkin_is_enqueued(fsl_cx * const f, char const * zName, bool relativeToCwd); /** Discards any state accumulated for a pending checking, including any files queued via fsl_checkin_enqueue() and tags added via fsl_checkin_T_add(). @see fsl_checkin_enqueue() @see fsl_checkin_dequeue() @see fsl_checkin_is_enqueued() @see fsl_checkin_commit() @see fsl_checkin_T_add() */ FSL_EXPORT void fsl_checkin_discard(fsl_cx * const f); /** Parameters for fsl_checkin_commit(). Checkins are created in a multi-step process: - fsl_checkin_enqueue() queues up a file or directory for |
︙ | ︙ | |||
15392 15393 15394 15395 15396 15397 15398 | Empty-initialised fsl_repo_open_ckout_opt instance. Clients should copy this value (or fsl_repo_open_ckout_opt_empty_m) to initialise fsl_repo_open_ckout_opt instances for sane default values. */ FSL_EXPORT const fsl_repo_open_ckout_opt fsl_repo_open_ckout_opt_empty; /** | < < | | > | 16180 16181 16182 16183 16184 16185 16186 16187 16188 16189 16190 16191 16192 16193 16194 16195 16196 16197 | Empty-initialised fsl_repo_open_ckout_opt instance. Clients should copy this value (or fsl_repo_open_ckout_opt_empty_m) to initialise fsl_repo_open_ckout_opt instances for sane default values. */ FSL_EXPORT const fsl_repo_open_ckout_opt fsl_repo_open_ckout_opt_empty; /** Opens a checkout db for use with the currently-connected repository or creates a new checkout db. If opening an existing one, it gets "stolen" from any repository it might have been previously mapped to. - Requires that f have an opened repository db and no opened checkout. Returns FSL_RC_NOT_A_REPO if no repo is opened and FSL_RC_MISUSE if a checkout *is* opened. - Creates/re-uses a .fslckout DB in the dir opt->targetDir. The directory must be NULL or already exist, else FSL_RC_NOT_FOUND is |
︙ | ︙ | |||
15418 15419 15420 15421 15422 15423 15424 | Pending: - If opening an existing checkout db for a different repo then delete the STASH and UNDO entries, as they're not valid for a different repo. */ | | > | 16205 16206 16207 16208 16209 16210 16211 16212 16213 16214 16215 16216 16217 16218 16219 16220 | Pending: - If opening an existing checkout db for a different repo then delete the STASH and UNDO entries, as they're not valid for a different repo. */ FSL_EXPORT int fsl_repo_open_ckout( fsl_cx * const f, fsl_repo_open_ckout_opt const * opt ); typedef struct fsl_ckup_state fsl_ckup_state; /** A callback type for use with fsl_ckup_state. It gets called via fsl_repo_ckout() and fsl_ckout_update() to report progress of the extraction process. It gets called after one of those functions has successfully extracted a file or skipped over it because the file |
︙ | ︙ | |||
15479 15480 15481 15482 15483 15484 15485 | /** Merge was not performed because at least one of the inputs appears to be binary. The updated-to version overwrites the previous version in this case. */ FSL_CKUP_FCHANGE_UPDATED_BINARY, /** Updated with a merge by the update process. */ FSL_CKUP_FCHANGE_MERGED, | | | 16267 16268 16269 16270 16271 16272 16273 16274 16275 16276 16277 16278 16279 16280 16281 | /** Merge was not performed because at least one of the inputs appears to be binary. The updated-to version overwrites the previous version in this case. */ FSL_CKUP_FCHANGE_UPDATED_BINARY, /** Updated with a merge by the update process. */ FSL_CKUP_FCHANGE_MERGED, /** Special case of FSL_CKUP_FCHANGE_MERGED. Merge was performed and conflicts were detected. The newly-updated file will contain conflict markers. @see fsl_buffer_contains_merge_marker() */ FSL_CKUP_FCHANGE_CONFLICT_MERGED, /** Added in the current checkout but also contained in the |
︙ | ︙ | |||
15503 15504 15505 15506 15507 15508 15509 | TODO: use confirmer here to ask user whether to overwrite. */ FSL_CKUP_FCHANGE_CONFLICT_ADDED_UNMANAGED, /** Edited locally but removed from updated-to version. Local edits will be left in the checkout tree. */ FSL_CKUP_FCHANGE_CONFLICT_RM, /** Cannot merge if one or both of the update/updating verions of a | | > > > > > > > > > | 16291 16292 16293 16294 16295 16296 16297 16298 16299 16300 16301 16302 16303 16304 16305 16306 16307 16308 16309 16310 16311 16312 16313 16314 16315 16316 16317 16318 16319 | TODO: use confirmer here to ask user whether to overwrite. */ FSL_CKUP_FCHANGE_CONFLICT_ADDED_UNMANAGED, /** Edited locally but removed from updated-to version. Local edits will be left in the checkout tree. */ FSL_CKUP_FCHANGE_CONFLICT_RM, /** Cannot merge if one or both of the update/updating verions of a file is a symlink. The updated-to version overwrites the previous version in this case. We probably need a better name for this. */ FSL_CKUP_FCHANGE_CONFLICT_SYMLINK, /** Indicates that a merge of binary content was requested. TODO: figure out why UPDATE uses the target version, instead of triggering an error here, and why MERGE does not do the same. fossil(1) simply skips over, with a warning, binaries during a merge. */ FSL_CKUP_FCHANGE_CONFLICT_BINARY, /** File was renamed in the updated-to version. If a file is both modified and renamed, it is flagged as renamed instead of modified. */ FSL_CKUP_FCHANGE_RENAMED, /** Locally modified. This state appears only when "updating" a checkout to the same version. */ FSL_CKUP_FCHANGE_EDITED |
︙ | ︙ | |||
15788 15789 15790 15791 15792 15793 15794 | repo, FSL_RC_NOT_A_CKOUT if no checkout is opened. If cOpt->callback is not NULL and returns a non-0 result code, extraction ends and that result is returned. If it returns non-0 at any point after basic argument validation, it rolls back all changes or sets the current transaction stack into a rollback state. | | | 16585 16586 16587 16588 16589 16590 16591 16592 16593 16594 16595 16596 16597 16598 16599 | repo, FSL_RC_NOT_A_CKOUT if no checkout is opened. If cOpt->callback is not NULL and returns a non-0 result code, extraction ends and that result is returned. If it returns non-0 at any point after basic argument validation, it rolls back all changes or sets the current transaction stack into a rollback state. @see fsl_repo_open_ckout() */ FSL_EXPORT int fsl_repo_ckout(fsl_cx * f, fsl_ckup_opt const * cOpt); /** UNDER CONSTRUCTION. |
︙ | ︙ | |||
15843 15844 15845 15846 15847 15848 15849 15850 15851 15852 15853 15854 15855 15856 15857 15858 | FSL_EXPORT int fsl_ckout_calc_update_version(fsl_cx * f, fsl_id_t * outRid); /** Bitmask used by fsl_ckout_manifest_setting() and fsl_ckout_manifest_write(). */ enum fsl_cx_manifest_mask_e { FSL_MANIFEST_MAIN = 0x001, FSL_MANIFEST_UUID = 0x010, FSL_MANIFEST_TAGS = 0x100 }; typedef enum fsl_cx_manifest_mask_e fsl_cx_manifest_mask_e; /** Returns a bitmask representing which manifest files, if any, will be written when opening or updating a checkout directory, as | > > > | 16640 16641 16642 16643 16644 16645 16646 16647 16648 16649 16650 16651 16652 16653 16654 16655 16656 16657 16658 | FSL_EXPORT int fsl_ckout_calc_update_version(fsl_cx * f, fsl_id_t * outRid); /** Bitmask used by fsl_ckout_manifest_setting() and fsl_ckout_manifest_write(). */ enum fsl_cx_manifest_mask_e { /** Coresponds to the file "manifest". */ FSL_MANIFEST_MAIN = 0x001, /** Coresponds to the file "manifest.uuid". */ FSL_MANIFEST_UUID = 0x010, /** Coresponds to the file "manifest.tags". */ FSL_MANIFEST_TAGS = 0x100 }; typedef enum fsl_cx_manifest_mask_e fsl_cx_manifest_mask_e; /** Returns a bitmask representing which manifest files, if any, will be written when opening or updating a checkout directory, as |
︙ | ︙ | |||
15930 15931 15932 15933 15934 15935 15936 | written by this routine and is also not part of the current checkout (i.e. not listed in the vfile table) will be removed from disk, but a failure while attempting to do so will be silently ignored. @see fsl_repo_manifest_write() */ | | | | | | 16730 16731 16732 16733 16734 16735 16736 16737 16738 16739 16740 16741 16742 16743 16744 16745 16746 16747 16748 16749 16750 16751 16752 16753 16754 16755 16756 16757 16758 16759 16760 16761 16762 16763 16764 16765 16766 16767 16768 | written by this routine and is also not part of the current checkout (i.e. not listed in the vfile table) will be removed from disk, but a failure while attempting to do so will be silently ignored. @see fsl_repo_manifest_write() */ FSL_EXPORT int fsl_ckout_manifest_write(fsl_cx * const f, int manifest, int manifestUuid, int manifestTags, int * const wroteWhat ); /** Returns true if f has an opened checkout and the given absolute path is rooted in that checkout, else false. As a special case, it returns false if the path _is_ the checkout root unless zAbsPath has a trailing slash. (The checkout root is always stored with a trailing slash because that simplifies its internal usage.) Note that this is strictly a string comparison, not a filesystem-level operation. */ FSL_EXPORT bool fsl_is_rooted_in_ckout(fsl_cx * const f, char const * const zAbsPath); /** Works like fsl_is_rooted_in_ckout() except that it returns 0 on success, and on error updates f with a description of the problem and returns non-0: FSL_RC_RANGE or (if updating the error state fails) FSL_RC_OOM. */ FSL_EXPORT int fsl_is_rooted_in_ckout2(fsl_cx * const f, char const * const zAbsPath); /** Change-type values for use with fsl_ckout_revert_f() callbacks. */ enum fsl_ckout_revert_e { /** Sentinel value. */ FSL_REVERT_NONE = 0, |
︙ | ︙ | |||
16178 16179 16180 16181 16182 16183 16184 | filenames in a more flexible form than that routine. This routine works exactly like that one except for the following differences: 1) The given filename and the relativeToCwd arguments are passed to by fsl_ckout_filename_check() to canonicalize the name and ensure that it points to someplace within f's current checkout. | > > > | > > | | | > | 16978 16979 16980 16981 16982 16983 16984 16985 16986 16987 16988 16989 16990 16991 16992 16993 16994 16995 16996 16997 16998 16999 17000 17001 17002 17003 17004 | filenames in a more flexible form than that routine. This routine works exactly like that one except for the following differences: 1) The given filename and the relativeToCwd arguments are passed to by fsl_ckout_filename_check() to canonicalize the name and ensure that it points to someplace within f's current checkout. 2) Directory names passed to it may optionally end in an trailing slash. 3) Because of (1), zName may not be NULL or empty. To fetch all of the vfile IDs for the current checkout, pass a zName of "." and relativeToCwd=false. Returns 0 on success, else: - FSL_RC_MISUSE if zName is NULL or empty. - FSL_RC_OOM on allocation error. - FSL_RC_NOT_A_CKOUT if f has no opened checkout. - FSL_RC_RANGE if the given name points outside of the checkout. */ FSL_EXPORT int fsl_ckout_vfile_ids( fsl_cx * const f, fsl_id_t vid, fsl_id_bag * const dest, char const * zName, bool relativeToCwd, bool changedOnly ); /** |
︙ | ︙ | |||
16295 16296 16297 16298 16299 16300 16301 | it should be. TODO: currently the library offers no automated recovery mechanism from a mismatch, the only remedy being to close the checkout database, destroy it, and re-create it. fossil(1) is able, in some cases, to automatically recover from this situation. */ | | | 17101 17102 17103 17104 17105 17106 17107 17108 17109 17110 17111 17112 17113 17114 17115 | it should be. TODO: currently the library offers no automated recovery mechanism from a mismatch, the only remedy being to close the checkout database, destroy it, and re-create it. fossil(1) is able, in some cases, to automatically recover from this situation. */ FSL_EXPORT int fsl_ckout_fingerprint_check(fsl_cx * const f); /** Looks for the given file in f's current checkout. If relativeToCwd then the name is resolved from the current directory, otherwise it is assumed to be relative to the checkout root or an absolute path with the checkout dir as a prefix of that path. |
︙ | ︙ | |||
16324 16325 16326 16327 16328 16329 16330 | char const * zName, fsl_buffer * const dest); /** Fetches the timestamp of the given F-card's name against the filesystem and/or the most recent checkin in which it was modified (as reported by fsl_mtime_of_manifest()). vid is the checkin | | | 17130 17131 17132 17133 17134 17135 17136 17137 17138 17139 17140 17141 17142 17143 17144 | char const * zName, fsl_buffer * const dest); /** Fetches the timestamp of the given F-card's name against the filesystem and/or the most recent checkin in which it was modified (as reported by fsl_mtime_of_manifest()). vid is the checkin version to look at. If it's <=0, the current checkout will be used. On success, returns 0 and: - If repoMtime is not NULL then (*repoMtime) is assigned to the result of fsl_mtime_of_manifest_file() for the given file. - If localMtime is not NULL then (*localMtime) is assigned to |
︙ | ︙ | |||
16348 16349 16350 16351 16352 16353 16354 16355 16356 | - FSL_RC_OOM. */ FSL_EXPORT int fsl_card_F_ckout_mtime(fsl_cx * const f, fsl_id_t vid, fsl_card_F const * const fc, fsl_time_t * repoMtime, fsl_time_t * localMtime); /** UNDER CONSTRUCTION! INCOMPLETE! | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | < > > | > > > > | > > > > > > > > > > > > > > > > > > | | > > > > > > > | < < < < > > > > | | | | | | > | | | > > > > | > > | > > > > > > > > > > > > > | < | | | | | < < < < < < | | > > > | < > > < < | | < | | > > | | > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | 17154 17155 17156 17157 17158 17159 17160 17161 17162 17163 17164 17165 17166 17167 17168 17169 17170 17171 17172 17173 17174 17175 17176 17177 17178 17179 17180 17181 17182 17183 17184 17185 17186 17187 17188 17189 17190 17191 17192 17193 17194 17195 17196 17197 17198 17199 17200 17201 17202 17203 17204 17205 17206 17207 17208 17209 17210 17211 17212 17213 17214 17215 17216 17217 17218 17219 17220 17221 17222 17223 17224 17225 17226 17227 17228 17229 17230 17231 17232 17233 17234 17235 17236 17237 17238 17239 17240 17241 17242 17243 17244 17245 17246 17247 17248 17249 17250 17251 17252 17253 17254 17255 17256 17257 17258 17259 17260 17261 17262 17263 17264 17265 17266 17267 17268 17269 17270 17271 17272 17273 17274 17275 17276 17277 17278 17279 17280 17281 17282 17283 17284 17285 17286 17287 17288 17289 17290 17291 17292 17293 17294 17295 17296 17297 17298 17299 17300 17301 17302 17303 17304 17305 17306 17307 17308 17309 17310 17311 17312 17313 17314 17315 17316 17317 17318 17319 17320 17321 17322 17323 17324 17325 17326 17327 17328 17329 17330 17331 17332 17333 17334 17335 17336 17337 17338 17339 17340 17341 17342 17343 17344 17345 17346 17347 17348 17349 17350 17351 17352 17353 17354 17355 17356 17357 17358 17359 17360 17361 17362 17363 17364 17365 17366 17367 17368 17369 17370 17371 17372 17373 17374 17375 17376 17377 17378 17379 17380 17381 17382 17383 17384 17385 17386 17387 17388 17389 17390 17391 17392 17393 17394 17395 17396 17397 17398 17399 17400 17401 17402 17403 17404 17405 17406 17407 17408 17409 17410 17411 17412 17413 17414 17415 17416 17417 17418 17419 17420 17421 17422 17423 17424 17425 17426 17427 17428 17429 17430 17431 17432 17433 17434 17435 17436 17437 17438 17439 17440 17441 17442 17443 17444 17445 17446 17447 17448 17449 17450 17451 17452 17453 17454 17455 17456 17457 17458 17459 17460 17461 17462 17463 17464 17465 17466 17467 17468 17469 17470 17471 17472 17473 17474 17475 17476 17477 17478 17479 17480 17481 17482 17483 17484 17485 17486 17487 17488 17489 17490 17491 17492 17493 17494 17495 17496 17497 17498 17499 17500 17501 17502 17503 17504 17505 17506 17507 17508 17509 17510 17511 17512 17513 17514 17515 17516 17517 17518 17519 17520 17521 17522 17523 17524 17525 17526 17527 17528 17529 17530 17531 17532 17533 17534 17535 17536 17537 17538 17539 17540 17541 17542 17543 17544 17545 17546 17547 17548 17549 17550 17551 17552 17553 17554 17555 17556 17557 17558 17559 17560 17561 17562 17563 17564 17565 17566 17567 17568 17569 17570 17571 17572 17573 17574 17575 17576 17577 17578 17579 17580 17581 17582 17583 17584 17585 17586 17587 17588 17589 17590 17591 17592 17593 17594 17595 17596 17597 | - FSL_RC_OOM. */ FSL_EXPORT int fsl_card_F_ckout_mtime(fsl_cx * const f, fsl_id_t vid, fsl_card_F const * const fc, fsl_time_t * repoMtime, fsl_time_t * localMtime); /** File change types for use with fsl_merge_state::fileChangeType. Terminology used in some of the descriptions: - (P) is the "pivot" - the common ancestor for the merge. - (M) is the version being merged in to... - (V) is current checkout version into which (M) is being merged. Maintenance reminder: this enum's values must start at 0 and increment sequentially, and FSL_MERGE_FCHANGE_count must be the final entry. This is to enable the creation of arrays, e.g. for keeping track (client-side) of how many times a given change type has been seen during a given merge run. */ enum fsl_merge_fchange_e { /** Not currently used. Merge does not (and cannot without some surgery) report state of files unaffected by a merge. This entry exists for the case that that changes. This is the only entry in the enum which is guaranteed to have a specific value: 0, so that it can be used as a boolean false. */ FSL_MERGE_FCHANGE_NONE = 0, /** File was added to (V) from (M). */ FSL_MERGE_FCHANGE_ADDED, /** File content was copied as-is from (M) to (V). */ FSL_MERGE_FCHANGE_COPIED, /** File was removed from (V) via (M). a.k.a. it became "unmanaged." */ FSL_MERGE_FCHANGE_RM, /** Content from (M) was merged into (V). */ FSL_MERGE_FCHANGE_MERGED, /** Special case of FSL_MERGE_FCHANGE_MERGED. Merge was performed from (M) to (V) and conflicts were detected. The newly-updated file will contain conflict markers. @see fsl_buffer_contains_merge_marker() */ FSL_MERGE_FCHANGE_CONFLICT_MERGED, #if 0 /** Added in the current checkout but also contained in the updated-to version. The local copy takes precedence. */ FSL_MERGE_FCHANGE_CONFLICT_ADDED, #endif /** Added to (V) by (M) but a local unmanaged copy exists. The local copy is overwritten, per historical fossil(1) convention (noting that fossil has undo support to allow one to avoid loss of such a file's contents). */ FSL_MERGE_FCHANGE_CONFLICT_ADDED_UNMANAGED, #if 0 /* Fossil deletes merged-over removed files, regardless of whether they're locally edited, so we'll do the same for now (noting that fossil has undo support which can hypothetically save that case from data loss). fsl_ckout_update() does not do so, but has extra infastructure to deal with this. */ /** Edited locally but removed from merged-in version. Local edits will be left in the checkout tree. */ FSL_MERGE_FCHANGE_CONFLICT_RM, #endif /** Cannot merge if one or both of the update/updating versions of a file is a symlink. This case needs re-thinking. fossil(1) simply skips such merges with a warning but no error. This library has no warning mechanism other than to pass this code on to the fsl_merge_f() callback, so that's what we do. For UPDATE ops, the updated-to version overwrites the previous version in this case. Why merge doesn't do that isn't clear, but it's probably because we can have any number of merge parents and choosing which one to use in the merge/replace case would be impossible. */ FSL_MERGE_FCHANGE_CONFLICT_SYMLINK, /** Indicates that a merge of binary content was requested. We cannot merge binaries, so this indicates that the file in question was skipped over for merge purposes. fossil(1) simply skips over, with a warning, binaries during a merge, so we do the same (for lack of a better option). */ FSL_MERGE_FCHANGE_CONFLICT_BINARY, /** Indicates that the given file cannot be merged because no common ancestor can be found for it. This condition is not strictly fatal but does indicate a problem with the input data. Merging will continue unless the fsl_merge_f() to which this is reported returns non-0 to cancel it. This particular status is reported very early in the fsl_ckout_merge() process, before any files have been written by the merge, thus the callback can effectively abort the merge without side-effects by returning non-0 if this status is reported to it. If the fsl_ckout_merge() call has no callback set, this case will go silently undiagnosed! Potential TODO: add a flag to fsl_merge_opt to tell it to treat any of these cases as merge-fatal. */ FSL_MERGE_FCHANGE_CONFLICT_ANCESTOR, /** File was renamed in the updated-to version. If a file is both modified and renamed, it will be reported twice: once for each type of change. The new name is reported via fsl_merge_state::filename and the previous name via fsl_merge_state::priorName. */ FSL_MERGE_FCHANGE_RENAMED, /** This is the number of entries in this enum, for purposes of creating, e.g. arrays of counters. This entry is never reported via a fsl_merge_state::fileChangeType. */ FSL_MERGE_FCHANGE_count }; typedef enum fsl_merge_fchange_e fsl_merge_fchange_e; /** Reqired forward decl. */ typedef struct fsl_merge_opt fsl_merge_opt; /** UNDER CONSTRUCTION! INCOMPLETE! A type for passing state to fsl_merge_f callbacks during fsl_ckout_merge() processing. For each step of a merge operation which affects a file, state reflecting that change is set in one of these objects and it is passed to the fsl_merge_f implementation supplied by the caller. Unlike fsl_ckout_update(), fsl_ckout_merge() reports only files which are affected by a merge, not unmodified files. Whether that's a bug or a feature is not yet clear, but the merge algorithm does not, as is, support reporting unaffected files. Due to the complexity and intricacy of the merge operation, it is possible that any given file will get passed to the fsl_merge_f() callback more than once with a different fsl_merge_state::fileChangeType value. Most notably, a file which has been modified and renamed may be passed on one with FSL_MERGE_FCHANGE_COPIED and once with FSL_MERGE_FCHANGE_RENAMED. Whether that's a bug or a feature is as-yet undecided, but (A) fossil(1) does it that way and (B) _not_ doing that would require some rearchitecting. */ struct fsl_merge_state { /** The fsl_cx object for which the current merge is running. */ fsl_cx * f; /** The options object which drives the current fsl_ckout_merge() run. */ fsl_merge_opt const * opt; /** The checkout-relative name of the file affected by the merge. These bytes are invalidated after the fsl_merge_f() callback returns, so must be copied if the client requires them for later. */ char const * filename; /** If this->fileChangeType is FSL_MERGE_FCHANGE_RENAMED then this is the previous name of the file, else it is NULL. */ char const * priorName; /** Indicates the state of the file currently being merged. Merge does not support the full range fo fsl_ckup_fchange_e values. TODO: list which it does or create a new enum which enumerates only merge-specific change types. */ fsl_merge_fchange_e fileChangeType; /** Indicates whether the current file was removed. A state of FSL_CKUP_RM_KEPT and fileChangeType of FSL_MERGE_FCHANGE_RM indicates that the file has become unmanaged but the local copy was retained because it was flagged as locally modified. */ fsl_ckup_rm_state_e fileRmInfo; }; typedef struct fsl_merge_state fsl_merge_state; /** Callback type for use with fsl_merge_opt and fsl_ckout_merge(). */ typedef int (*fsl_merge_f)(fsl_merge_state const * const); /** Merge type enum for use with fsl_merge_opt::mergeType. The values of these entries are fossil-magic values for the `vmerge.id` db field and must stay in sync with fossil's definition. */ enum fsl_merge_type_e { /** Indicates a normal merge. */ FSL_MERGE_TYPE_NORMAL = 0, /** Indicates an "integrate" merge, which tells the next checkin operation to apply a "closed" tag to the checkin from which this merge is performed (effectively closing its branch). Certain merge-time state will force this merge type to silently behave like FSL_MERGE_TYPE_NORMAL: - If the being-merged-in content is marked as private. - If the being-merged-in content is not a leaf. */ FSL_MERGE_TYPE_INTEGRATE = -4, /** Indicates a cherrypick merge, pulling in only the changes made to a specific checkin without otherwise inheriting its lineage. */ FSL_MERGE_TYPE_CHERRYPICK = -1, /** Indicates a backout merge, a reverse cherrypick, backing out any changes which were added by the corresponding fsl_merge_opt::mergeRid. */ FSL_MERGE_TYPE_BACKOUT = -2 }; typedef enum fsl_merge_type_e fsl_merge_type_e; /** UNDER CONSTRUCTION. Options for use with fsl_ckout_merge(). */ struct fsl_merge_opt { /** The version of the repostitory to merge into the current checkout. This must be the `blob.rid` of a checkin artifact. */ fsl_id_t mergeRid; /** The version of the most recent common ancestor. Must normally be 0. The default is calculated automatically based on this->mergeRid and this->mergeType. This corresponds to fossil(1)'s `--baseline` merge flag. fsl_ckout_merge() will fail if this is >0 and it does not refer to a checkin version or if this->mergeType is FSL_MERGE_TYPE_CHERRYPICK. */ fsl_id_t baselineRid; /** Specifies the merge type to perform. Certain merge-internal logic may override this. Specifically, integrate-merges may be treated as regular merges, as documented for FSL_MERGE_TYPE_INTEGRATE. */ fsl_merge_type_e mergeType; /** Gets called once per merge-updated file, passed a fsl_ckup_state instance with information about the merged file and related metadata. May be NULL, in which case the merge process will do as much work as it can, even if that means doing certain questionable things (such as skipping updates of binary files or symlinks because it refuses to merge them). As a rule of thumb, if fossil(1) performs a given "questional" merge features without generating an error, fsl_ckout_merge() does as well. This callback gives clients a chance to decide that certain states _Simply Will Not Stand_ and cancel the merge by returning non-0 (preferably after calling fsl_cx_err_set() on the passed-in fsl_merge_state::f object). The callback is called after any on-disk changes are made to the file, e.g. merging, file permissions, renaming, etc. However, when this->dryRun is true, filesystem-level changes are skipped. */ fsl_merge_f callback; /** Client-defined state for use with this->callback. */ void * callbackState; /** A hint to fsl_ckout_merge() about whether it needs to scan the checkout for changes. Set this to false ONLY if the calling code calls fsl_ckout_changes_scan() (or equivalent, e.g. fsl_vfile_changes_scan()) immediately before calling fsl_ckout_merge(), as that function requires a non-stale changes scan in order to function properly. */ bool scanForChanges; /** If true, the extraction process will "go through the motions" but will not write any files to disk. It may still perform I/O such as stat()'ing to see, e.g., if it would have needed to overwrite a file. When in dry-run, this->callback is still called as if dry-run mode were not in effect. Thus the on-disk state may not actually reflect what the callback sees when dry-run mode is active. */ bool dryRun; /** This flag is not part of the public API and will be removed once the merge operation's development has settled down. */ unsigned short debug; /** TODO: - How to handle fossil's --binary GLOBPATTERN flag. Plain string or a glob list object or a stateful predicate function or... ? We currently rely entirely on the global `binary-glob` setting. */ }; /** Initialized-with-defaults fsl_merge_opt structure, intended for const-copy initialization. */ #define fsl_merge_opt_empty_m \ {-1/*mergeRid*/,0/*baselineRid*/, \ FSL_MERGE_TYPE_NORMAL/*mergeType*/, \ NULL/*callback*/, NULL/*callbackState*/, \ true/*scanForChanges*/, \ false/*dryRun*/,0/*debug*/} /** Initialized-with-defaults fsl_merge_opt structure, intended for non-const copy initialization. */ extern const fsl_merge_opt fsl_merge_opt_empty; /** UNDER CONSTRUCTION and not yet well-tested. Performs a "merge" operation on the current checkout, merging in version opt->mergeRid. If that version has already been merged, this call has no SCM-related side effects. Returns 0 on success, any number of non-0 codes on error, including, _but not limited to_: - FSL_RC_NOT_A_CKOUT if f has no opened checkout. - FSL_RC_OOM on allocation error. - FSL_RC_TYPE if opt->mergeRid or opt->baselineRid do to refer to a checkin. - FSL_RC_PHANTOM if a file participating in the merge is a phantom. - FSL_RC_RANGE if the to-be-merged-in RID is the same as the current checkout RID or the same as the pivot/baseline of the merge. - FSL_RC_NOT_FOUND if no common ancestor can be found for use as a basis for the merge. - FSL_RC_MISUSE if the current checkout is empty (has an RID of 0). - Any number of DB- or I/O-related codes, as well as codes from underlying APIs such as fsl_vfile_changes_scan(). For all but the most trivial argument validation errors or allocation errors, f's error state will be updated with a description of the problem. TODOs and potential TODOs: - There are certain illegal combinations of merge state which may require adding new result codes for. e.g. a no-op merge. - Empty directories may be left behind when a merge removes all files in a directory. fsl_ckout_update() handles that case but fsl_ckout_merge() currently does not. */ FSL_EXPORT int fsl_ckout_merge(fsl_cx * const f, fsl_merge_opt const * const opt); /** If zDirName is a directory name which contains what appears to be a fossil checkout database (noting that only a cursory check is done - the db is not opened and validated), the name of that database file (minus the directory part) is returned, else NULL is returned. The returned bytes are static. @see fsl_ckout_dbnames() */ FSL_EXPORT char const * fsl_is_top_of_ckout(char const *zDirName); /** Returns an array of strings with the base names of valid fossil checkout databases. The array is terminated by a NULL element. As of this writing, and for the foreseeable future, the list is comprised of only 3 elements, {".fslckout", "_FOSSIL_", NULL}, but the order of the non-NULL elements is unspecified by the interface. */ FSL_EXPORT char const ** fsl_ckout_dbnames(void); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_CHECKOUT_H_INCLUDED */ /* end of file ./include/fossil-scm/checkout.h */ /* start of file ./include/fossil-scm/confdb.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_CONFDB_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_CONFDB_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /** @file confdb.h fossil-confdb.h declares APIs dealing with fossil's various configuration option storage backends. */ #if defined(__cplusplus) |
︙ | ︙ | |||
16576 16577 16578 16579 16580 16581 16582 16583 16584 16585 16586 16587 16588 16589 | were */ enum fsl_confdb_e { /** Sentinel value. Not for use with public APIs. */ FSL_CONFDB_NONE = 0, /** Signfies the global-level (per system user) configuration area. */ FSL_CONFDB_GLOBAL = 1, /** Signfies the repository-level configuration area. */ FSL_CONFDB_REPO = 2, /** | > > > > > > | 17610 17611 17612 17613 17614 17615 17616 17617 17618 17619 17620 17621 17622 17623 17624 17625 17626 17627 17628 17629 | were */ enum fsl_confdb_e { /** Sentinel value. Not for use with public APIs. */ FSL_CONFDB_NONE = 0, /** Signfies the global-level (per system user) configuration area. Note that fsl_config_... APIs which use this do not currently open that database on demand due to the potential for downstream locking-related issues when the config db is left open, as well as locking-related issues here when a separate client or instance is holding that db open. That behaviour may change in the future. */ FSL_CONFDB_GLOBAL = 1, /** Signfies the repository-level configuration area. */ FSL_CONFDB_REPO = 2, /** |
︙ | ︙ | |||
17013 17014 17015 17016 17017 17018 17019 | fsl_size_t * len); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_CONFDB_H_INCLUDED */ | | | | 18053 18054 18055 18056 18057 18058 18059 18060 18061 18062 18063 18064 18065 18066 18067 18068 | fsl_size_t * len); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_CONFDB_H_INCLUDED */ /* end of file ./include/fossil-scm/confdb.h */ /* start of file ./include/fossil-scm/vpath.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_VPATH_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_VPATH_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt |
︙ | ︙ | |||
17252 17253 17254 17255 17256 17257 17258 | #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_VPATH_H_INCLUDED */ | | | | 18292 18293 18294 18295 18296 18297 18298 18299 18300 18301 18302 18303 18304 18305 18306 18307 | #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_VPATH_H_INCLUDED */ /* end of file ./include/fossil-scm/vpath.h */ /* start of file ./include/fossil-scm/internal.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_INTERNAL_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_INTERNAL_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt |
︙ | ︙ | |||
17432 17433 17434 17435 17436 17437 17438 | */ fsl_uint_t nextAge; /** List of cached content, ordered by age. */ fsl__bccache_line * list; /** | | > | 18472 18473 18474 18475 18476 18477 18478 18479 18480 18481 18482 18483 18484 18485 18486 18487 | */ fsl_uint_t nextAge; /** List of cached content, ordered by age. */ fsl__bccache_line * list; /** RIDs of all artifacts currently in the this->list cache. */ fsl_id_bag inCache; /** RIDs of known-missing content. */ fsl_id_bag missing; /** |
︙ | ︙ | |||
17537 17538 17539 17540 17541 17542 17543 | /* The fsl_cx class is documented in main public header. */ struct fsl_cx { /** A pointer to the "main" db handle. Exactly which db IS the main db is, because we have three DBs, not generally knowble. | | | | > | > > | | | > > | > > > > > > > > > > | | | < > > | | < < | < < < > > > > < < < < < < < < < < < < < < | < | | | 18578 18579 18580 18581 18582 18583 18584 18585 18586 18587 18588 18589 18590 18591 18592 18593 18594 18595 18596 18597 18598 18599 18600 18601 18602 18603 18604 18605 18606 18607 18608 18609 18610 18611 18612 18613 18614 18615 18616 18617 18618 18619 18620 18621 18622 18623 18624 18625 18626 18627 18628 18629 18630 18631 18632 18633 18634 18635 18636 18637 18638 18639 18640 18641 18642 18643 18644 18645 18646 18647 18648 18649 18650 18651 18652 18653 18654 18655 18656 18657 18658 18659 18660 18661 18662 18663 | /* The fsl_cx class is documented in main public header. */ struct fsl_cx { /** A pointer to the "main" db handle. Exactly which db IS the main db is, because we have three DBs, not generally knowble. The internal management of fsl_cx's db handles has changed a couple of times. As of 2022-01-01 the following applies: dbMain starts out NULL. When a repo or checkout is opened, dbMain is pointed at the first of those which is opened. When its parter is opened, it is ATTACHed to dbMain. dbMain->role holds a bitmask of fsl_dbrole_e values reflecing which roles are opened/attached to it. The db-specific separate handles (this->{repo,ckout}.db) are used to store the name and file path to each db. ONE of those will have a db->dbh value of non-NULL, and that one is the instance which dbMain points to. Whichever db is opened first gets aliased to the corresponding fsl_db_role_name() for is role so that SQL code need not care which db is "main" and which is "repo" or "ckout". (Sidebar: when this library was started, the ability to alias a db with another name did not exist, and thus we required a middle-man "main" db to which we ATTACHed the repo and checkout dbs.) As of 20211230, f->config.db is its own handle, not ATTACHed with the others. Its db gets aliased to fsl_db_role_name(FSL_DBROLE_CONFIG). Internal code should rely as little as possible on the actual arrangement of internal DB handles, and should use fsl_cx_db_repo(), fsl_cx_db_ckout(), and fsl_cx_db_config() to get a handle to the specific db they want. Whether or not they return the same handle or 3 different ones may change at some point, so the public API treats them as separate entities. That is especially important for the global config db, as that one is (for locking reason) almost certain to remain in its own db handle, independent of the repo/checkout dbs. In any case, the internals very much rely on the repo and checkout dbs being accessible via a single db handle because the checkout-related SQL requires both dbs for most queries. The internals are less picky about the genuine layout of those handles (e.g. which one, if either, is the MAIN db). */ fsl_db * dbMain; /** Marker which tells us whether fsl_cx_finalize() needs to fsl_free() this instance or not. */ void const * allocStamp; /** Holds info directly related to a checkout database. */ struct { /** Holds the filename of the current checkout db and possibly related state. */ fsl_db db; /** The directory part of an opened checkout db. This is currently only set by fsl_ckout_open_dir(). It contains a trailing slash, largely because that simplifies porting fossil(1) code and appending filenames to this directory name to create absolute paths (a frequently-needed option). Useful for doing absolute-to-relative path conversions for checking file lists. */ char * dir; /** Optimization: fsl_strlen() of dir. Guaranteed to be set to dir's length if dir is not NULL, else it will be 0. */ fsl_size_t dirLen; /** The rid of the current checkout. May be 0 for an empty repo/checkout. Must be negative if not yet known. */ fsl_id_t rid; |
︙ | ︙ | |||
17634 17635 17636 17637 17638 17639 17640 | /** Holds info directly related to a repo database. */ struct { /** Holds the filename of the current repo db and possibly related | | < | > > | > | | 18675 18676 18677 18678 18679 18680 18681 18682 18683 18684 18685 18686 18687 18688 18689 18690 18691 18692 18693 18694 18695 18696 18697 18698 18699 18700 18701 18702 18703 18704 18705 18706 18707 18708 18709 18710 18711 18712 18713 18714 18715 | /** Holds info directly related to a repo database. */ struct { /** Holds the filename of the current repo db and possibly related state. */ fsl_db db; /** The default user name, for operations which need one. See fsl_cx_user_set(). */ char * user; } repo; /** Holds info directly related to a global config database. */ struct { /** Holds the filename of the current global config db and possibly related state. This handle is managed separately from the repo/ckout handles because this db is shared by all fossil instances are we have to ensure that we don't lock it for longer than necessary, thus this db may get opened and closed multiple times within even within a short-lived application. */ fsl_db db; } config; /** State for incrementally preparing a checkin operation. */ struct { /** Holds a list of "selected files" in the form of vfile.id values. */ fsl_id_bag selectedIds; |
︙ | ︙ | |||
17686 17687 17688 17689 17690 17691 17692 17693 17694 17695 17696 17697 17698 17699 | /** Output channel used by fsl_output() and friends. This was added primarily so that fossil client apps can share a single output channel which the user can swap out, e.g. to direct all output to a UI widget or a file. */ fsl_outputer output; /** Can be used to tie client-specific data to the context. Its finalizer is called when fsl_cx_finalize() cleans up. The library does not use this state. It is intended primarily for tying, | > > > > > > > | 18729 18730 18731 18732 18733 18734 18735 18736 18737 18738 18739 18740 18741 18742 18743 18744 18745 18746 18747 18748 18749 | /** Output channel used by fsl_output() and friends. This was added primarily so that fossil client apps can share a single output channel which the user can swap out, e.g. to direct all output to a UI widget or a file. Though the library has adamantly avoided adding a "warning" output channel, features like: https://fossil-scm.org/home/info/52a389d3dbd4b6cc arguably argue for one. */ fsl_outputer output; /** Can be used to tie client-specific data to the context. Its finalizer is called when fsl_cx_finalize() cleans up. The library does not use this state. It is intended primarily for tying, |
︙ | ︙ | |||
17710 17711 17712 17713 17714 17715 17716 | db-driver-provided error state. It is not used by "simple" routines for which an integer code always suffices. APIs which set this should denote it with a comment like "updates the context's error state on error." */ fsl_error error; | < < < < < < < < < < | | | 18760 18761 18762 18763 18764 18765 18766 18767 18768 18769 18770 18771 18772 18773 18774 18775 18776 18777 18778 18779 18780 18781 18782 18783 18784 18785 18786 18787 18788 18789 18790 18791 18792 18793 18794 18795 18796 18797 18798 | db-driver-provided error state. It is not used by "simple" routines for which an integer code always suffices. APIs which set this should denote it with a comment like "updates the context's error state on error." */ fsl_error error; /** Reuseable scratchpads for low-level file canonicalization buffering and whatnot. Not intended for huge content: use this->fileContent for that. This list should stay relatively short, as should the buffers (a few kb each, at most). @see fsl__cx_scratchpad() @see fsl__cx_scratchpad_yield() */ struct { /** Strictly-internal temporary buffers we intend to reuse many times, mostly for filename canonicalization, holding hash values, and small encoding/decoding tasks. These must never be used for values which will be long-lived, nor are they intended to be used for large content, e.g. reading files, with the possible exception of holding versioned config settings, as those are typically rather small. If needed, the lengths of this->buf[] and this->used[] may be extended, but anything beyond 8, maybe 10, seems a bit extreme. They should only be increased if we find code paths which require it. As of this writing (2021-03-17), the peak concurrently used was 5. In any case fsl__cx_scratchpad() fails fatally if it needs more than it has, so we won't/can't fail to overlook such a case. */ fsl_buffer buf[8]; /** Flags telling us which of this->buf is currenly in use. */ bool used[8]; |
︙ | ︙ | |||
17776 17777 17778 17779 17780 17781 17782 | flags to the cache member along with the rest of them. */ int flags; /** Error flag which is intended to be set via signal handlers or a UI thread to tell this context to cancel any currently | | > > < < < < < < | | | 18816 18817 18818 18819 18820 18821 18822 18823 18824 18825 18826 18827 18828 18829 18830 18831 18832 18833 18834 18835 18836 18837 18838 18839 18840 18841 18842 18843 18844 18845 18846 18847 18848 18849 18850 18851 18852 18853 18854 18855 18856 | flags to the cache member along with the rest of them. */ int flags; /** Error flag which is intended to be set via signal handlers or a UI thread to tell this context to cancel any currently long-running operation. Not all operations honor this check, but the ones which are prone to "exceedingly long" operation (at least a few seconds) do. */ volatile int interrupted; /** List of callbacks for deck crosslinking purposes. */ fsl_xlinker_list xlinkers; /** A place for caching generic things. */ struct { /** If true, skip "dephantomization" of phantom blobs. This is a detail from fossil(1) with as-yet-undetermined utility. It's apparently only used during the remote-sync process, which this API does not (as of 2021-10) yet have. */ bool ignoreDephantomizations; /** Whether or not a running commit process should be marked as private. This member is used for communicating this flag through multiple levels of API. */ bool markPrivate; /** True if fsl__crosslink_begin() has been called but fsl__crosslink_end() is still pending. */ |
︙ | ︙ | |||
17829 17830 17831 17832 17833 17834 17835 17836 17837 17838 17839 17840 17841 17842 | /** Is used to tell the content-save internals that a "final verification" (a.k.a. verify-before-commit) is underway. */ bool inFinalVerify; /** Cached copy of the allow-symlinks config option, because it is (hypothetically) needed on many stat() call. Negative value=="not yet determined", 0==no, positive==yes. The negative value means we need to check the repo config resp. the global config to see if this is on. | > > > > > > > | 18865 18866 18867 18868 18869 18870 18871 18872 18873 18874 18875 18876 18877 18878 18879 18880 18881 18882 18883 18884 18885 | /** Is used to tell the content-save internals that a "final verification" (a.k.a. verify-before-commit) is underway. */ bool inFinalVerify; /** Specifies whether SOME repository-level file-name comparisons/searches will work case-insensitively. <0 means not-yet-determined, 0 = no, >0 = yes. */ short caseInsensitive; /** Cached copy of the allow-symlinks config option, because it is (hypothetically) needed on many stat() call. Negative value=="not yet determined", 0==no, positive==yes. The negative value means we need to check the repo config resp. the global config to see if this is on. |
︙ | ︙ | |||
17855 17856 17857 17858 17859 17860 17861 | /** Indicates whether or not this repo has ever seen a delta manifest. If none has ever been seen then the repository will prefer to use baseline (non-delta) manifests. Once a delta is seen in the repository, the checkin algorithm is free to choose deltas later on unless its otherwise prohibited, e.g. by the | | | > > > > > > > > > > > > > > > > > | 18898 18899 18900 18901 18902 18903 18904 18905 18906 18907 18908 18909 18910 18911 18912 18913 18914 18915 18916 18917 18918 18919 18920 18921 18922 18923 18924 18925 18926 18927 18928 18929 18930 18931 18932 18933 18934 18935 18936 18937 18938 18939 18940 18941 18942 18943 18944 18945 18946 18947 18948 18949 18950 18951 18952 18953 18954 18955 18956 18957 18958 18959 18960 18961 | /** Indicates whether or not this repo has ever seen a delta manifest. If none has ever been seen then the repository will prefer to use baseline (non-delta) manifests. Once a delta is seen in the repository, the checkin algorithm is free to choose deltas later on unless its otherwise prohibited, e.g. by the `forbid-delta-manifests` config db setting. This article provides an overview to the topic delta manifests and essentially debunks their ostensible benefits: https://fossil-scm.org/home/doc/tip/www/delta-manifests.md Values: negative==undetermined, 0==no, positive==yes. This is updated when a repository is first opened and when new content is written to it. */ short seenDeltaManifest; /** Records whether this repository has an FTS search index. <0=undetermined, 0=no, >0=yes. */ short searchIndexExists; /** Cache for the `manifest` config setting, as used by fsl_ckout_manifest_setting(), with the caveat that if the setting changes after it is cached, we won't necessarily see that here! */ short manifestSetting; /** Record ID of rcvfrom entry during commits. This is likely to remain unused in libf until/unless the sync protocol is implemented. */ fsl_id_t rcvId; /** A place for temporarily holding file content. We use this in places where we have to loop over files and read their entire contents, so that we can reuse this buffer's memory if possible. The loop and the reading might be happening in different functions, though, and some care must be taken to avoid use in two functions concurrently. */ fsl_buffer fileContent; /** Reusable buffer for creating and fetching deltas via fsl_content_get() and fsl__content_deltify(). The number of allocations this actually saves is pretty small. */ fsl_buffer deltaContent; /** fsl_content_get() cache. */ fsl__bccache blobContent; /** Used during manifest parsing to keep track of artifacts we have |
︙ | ︙ | |||
17916 17917 17918 17919 17920 17921 17922 | /** Infrastructure for fsl_mtime_of_manifest_file(). It remembers the previous RID so that it knows when it has to invalidate/rebuild its ancestry cache. */ fsl_id_t mtimeManifest; /** | | | | | 18976 18977 18978 18979 18980 18981 18982 18983 18984 18985 18986 18987 18988 18989 18990 18991 18992 18993 18994 18995 18996 18997 18998 18999 | /** Infrastructure for fsl_mtime_of_manifest_file(). It remembers the previous RID so that it knows when it has to invalidate/rebuild its ancestry cache. */ fsl_id_t mtimeManifest; /** The "project-code" config option. We do not currently (2022-01) use this but it will be important if/when the sync protocol is implemented or we want to create hashes, e.g. for user passwords, which depend in part on the project code. */ char * projectCode; /** Internal optimization to avoid duplicate fsl_stat() calls across two functions in some cases. */ fsl_fstat fstat; /** Parsed-deck cache. */ fsl__mcache mcache; |
︙ | ︙ | |||
17959 17960 17961 17962 17963 17964 17965 17966 17967 17968 17969 17970 17971 17972 | */ fsl_list binary; /** Holds the "crnl-glob" globs. */ fsl_list crnl; } globs; } cache; /** Ticket-related information. */ struct { /** | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 19019 19020 19021 19022 19023 19024 19025 19026 19027 19028 19029 19030 19031 19032 19033 19034 19035 19036 19037 19038 19039 19040 19041 19042 19043 19044 19045 19046 19047 19048 19049 19050 19051 19052 19053 19054 19055 19056 19057 19058 19059 19060 19061 19062 19063 19064 19065 19066 19067 | */ fsl_list binary; /** Holds the "crnl-glob" globs. */ fsl_list crnl; } globs; /** Very-frequently-used SQL statements. This are not stored as pointers into the fsl_db_prepare_cached() list because that cache can be invalidated via a db-close. These particular statements are potentially prepared so often that we manage them separate from fsl_db_prepare_cached() as a further optimization. This optimization was single-handedly responsible for cutting f-rebuild's time in less than half. The rest of that time was spent building the SQL strings (indirectly via fsl_appendf()) to figure out if they corresponded to a cached query or not. */ struct { /** Query fetching [delta].[srcid] for a given [delta].[rid]. */ fsl_stmt deltaSrcId; /** Query fetching a [blob].[rid] for an exact-match [blob].[uuid]. */ fsl_stmt uuidToRid; /** Query fetching [blob].[rid] for a [blob].[uuid] prefix. */ fsl_stmt uuidToRidGlob; /** Query fetching [blob].[size] for a [blob].[rid] */ fsl_stmt contentSize; /** Query fetching [blob].[content,size] for a [blob].[rid] */ fsl_stmt contentBlob; /** Placeholder. */ fsl_stmt nextEntry; } stmt; /** Holds a list of temp-dir names. Must be allocated using fsl_temp_dirs_get() and freed using fsl_temp_dirs_free(). */ char **tempDirs; } cache; /** Ticket-related information. */ struct { /** |
︙ | ︙ | |||
18003 18004 18005 18006 18007 18008 18009 18010 18011 18012 18013 18014 18015 18016 18017 18018 18019 18020 18021 18022 18023 18024 18025 18026 | */ bool hasChng; /** Gets set to true (at some point) if the client has the ticketchng.rid db field. */ bool hasChngRid; } ticket; /* Note: no state related to server/user/etc. That is higher-level stuff. We might need to allow the user to set a default user name to avoid that he has to explicitly set it on all of the various Control Artifact-generation bits which need it. */ }; /** @internal Initialized-with-defaults fsl_cx struct. */ #define fsl_cx_empty_m { \ NULL /*dbMain*/, \ NULL/*allocStamp*/, \ | > > > > > > > > > > > < < < > > > > > > > > > > > | > | | > > | 19098 19099 19100 19101 19102 19103 19104 19105 19106 19107 19108 19109 19110 19111 19112 19113 19114 19115 19116 19117 19118 19119 19120 19121 19122 19123 19124 19125 19126 19127 19128 19129 19130 19131 19132 19133 19134 19135 19136 19137 19138 19139 19140 19141 19142 19143 19144 19145 19146 19147 19148 19149 19150 19151 19152 19153 19154 19155 19156 19157 19158 19159 19160 19161 19162 19163 19164 19165 19166 19167 19168 19169 19170 19171 19172 19173 19174 19175 19176 19177 19178 19179 19180 19181 19182 19183 19184 19185 19186 19187 19188 19189 19190 19191 19192 19193 19194 19195 19196 19197 19198 19199 19200 19201 19202 19203 19204 19205 19206 19207 19208 19209 19210 19211 19212 | */ bool hasChng; /** Gets set to true (at some point) if the client has the ticketchng.rid db field. */ bool hasChngRid; /** The name of the ticket-table field which refers to a ticket's title. Default = "title". The bytes are owned by this object. */ char * titleColumn; /** The name of the ticket-table field which refers to a ticket's status. Default = "status". The bytes are owned by this object. */ char * statusColumn; } ticket; /* Note: no state related to server/user/etc. That is higher-level stuff. We might need to allow the user to set a default user name to avoid that he has to explicitly set it on all of the various Control Artifact-generation bits which need it. */ }; /** @internal Initialized-with-defaults fsl_cx struct. */ #define fsl_cx_empty_m { \ NULL /*dbMain*/, \ NULL/*allocStamp*/, \ {/*ckout*/ \ fsl_db_empty_m /*db*/, \ NULL /*dir*/, 0/*dirLen*/, \ -1/*rid*/, NULL/*uuid*/, 0/*mtime*/ \ }, \ {/*repo*/ fsl_db_empty_m /*db*/, \ 0/*user*/ \ }, \ {/*config*/ fsl_db_empty_m /*db*/ }, \ {/*ckin*/ \ fsl_id_bag_empty_m/*selectedIds*/, \ fsl_deck_empty_m/*mf*/ \ }, \ fsl_confirmer_empty_m/*confirmer*/, \ fsl_outputer_FILE_m /*output*/, \ fsl_state_empty_m /*clientState*/, \ fsl_error_empty_m /*error*/, \ {/*scratchpads*/ \ {fsl_buffer_empty_m,fsl_buffer_empty_m, \ fsl_buffer_empty_m,fsl_buffer_empty_m, \ fsl_buffer_empty_m,fsl_buffer_empty_m}, \ {false,false,false,false,false,false}, \ 0/*next*/ \ }, \ fsl_cx_config_empty_m /*cxConfig*/, \ FSL_CX_F_DEFAULTS/*flags*/, \ 0/*interrupted*/, \ fsl_xlinker_list_empty_m/*xlinkers*/, \ {/*cache*/ \ false/*ignoreDephantomizations*/, \ false/*markPrivate*/, \ false/*isCrosslinking*/, \ false/*xlinkClustersOnly*/, \ false/*inFinalVerify*/, \ -1/*caseInsensitive*/, \ -1/*allowSymlinks*/, \ -1/*seenDeltaManifest*/, \ -1/*searchIndexExists*/, \ -1/*manifestSetting*/,\ 0/*rcvId*/, \ fsl_buffer_empty_m /*fileContent*/, \ fsl_buffer_empty_m /*deltaContent*/, \ fsl__bccache_empty_m/*blobContent*/, \ fsl_id_bag_empty_m/*mfSeen*/, \ fsl_id_bag_empty_m/*leafCheck*/, \ fsl_id_bag_empty_m/*toVerify*/, \ 0/*mtimeManifest*/, \ NULL/*projectCode*/, \ fsl_fstat_empty_m/*fstat*/, \ fsl__mcache_empty_m/*mcache*/, \ {/*globs*/ \ fsl_list_empty_m/*ignore*/, \ fsl_list_empty_m/*binary*/, \ fsl_list_empty_m/*crnl*/ \ }, \ {/*stmt*/ \ fsl_stmt_empty_m/*deltaSrcId*/, \ fsl_stmt_empty_m/*uuidToRid*/, \ fsl_stmt_empty_m/*uuidToRidGlob*/, \ fsl_stmt_empty_m/*contentSize*/, \ fsl_stmt_empty_m/*contentBlob*/, \ fsl_stmt_empty_m/*???*/ \ }, \ NULL/*tempDirs*/ \ }/*cache*/, \ {/*ticket*/ \ fsl_list_empty_m/*customFields*/, \ 0/*hasTicket*/, \ 0/*hasCTime*/, \ 0/*hasChng*/, \ 0/*hasCngRid*/, \ NULL/*titleColumn*/, \ NULL/*statusColumn*/ \ } \ } /** @internal Initialized-with-defaults fsl_cx instance. */ extern const fsl_cx fsl_cx_empty; |
︙ | ︙ | |||
18287 18288 18289 18290 18291 18292 18293 | left untouched. Returns 0 if a delta is successfully made or none needs to be made, non-0 on error. @see fsl__content_undeltify() */ | | | | | 19404 19405 19406 19407 19408 19409 19410 19411 19412 19413 19414 19415 19416 19417 19418 19419 19420 19421 19422 19423 19424 19425 19426 19427 19428 19429 19430 19431 19432 19433 19434 19435 19436 | left untouched. Returns 0 if a delta is successfully made or none needs to be made, non-0 on error. @see fsl__content_undeltify() */ int fsl__content_deltify(fsl_cx * const f, fsl_id_t rid, fsl_id_t srcid, bool force); /** @internal Creates a new phantom blob with the given UUID and return its artifact ID via *newId. Returns 0 on success, FSL_RC_MISUSE if !f or !uuid, FSL_RC_RANGE if fsl_is_uuid(uuid) returns false, FSL_RC_NOT_A_REPO if f has no repository opened, FSL_RC_ACCESS if the given uuid has been shunned, and about 20 other potential error codes from the underlying db calls. If isPrivate is true _or_ f has been flagged as being in "private mode" then the new content is flagged as private. newId may be NULL, but if it is then the caller will have to find the record id himself by using the UUID (see fsl_uuid_to_rid()). */ int fsl__content_new( fsl_cx * const f, fsl_uuid_cstr uuid, bool isPrivate, fsl_id_t * const newId ); /** @internal Check to see if checkin "rid" is a leaf and either add it to the LEAF table if it is, or remove it if it is not. Returns 0 on success, FSL_RC_MISUSE if !f or f has no repo db |
︙ | ︙ | |||
18820 18821 18822 18823 18824 18825 18826 | operation. It degrades to O(N) if out-of-lexical-order searches are performed. */ fsl_card_F * fsl__deck_F_seek(fsl_deck * const d, const char *zName); /** @internal | > > > > > > > > > > > > > | | | 19937 19938 19939 19940 19941 19942 19943 19944 19945 19946 19947 19948 19949 19950 19951 19952 19953 19954 19955 19956 19957 19958 19959 19960 19961 19962 19963 19964 19965 | operation. It degrades to O(N) if out-of-lexical-order searches are performed. */ fsl_card_F * fsl__deck_F_seek(fsl_deck * const d, const char *zName); /** @internal Ensures that f's single file content buffer is available for use and returns it to the caller. If it appears to already be in use, this function fails fatally via fsl__fatal(), indicating a serious misuse of the internal API. Calling this obligates the caller to call fsl__cx_content_buffer_yield() as soon as they are done with the buffer. */ fsl_buffer * fsl__cx_content_buffer(fsl_cx * const f); /** @internal Part of the fsl_cx::cache::fileContent optimization. This sets f->cache.fileContent.used to 0 and if its capacity is over a certain (unspecified, unconfigurable) size then it is trimmed to that size. */ void fsl__cx_content_buffer_yield(fsl_cx * const f); /** @internal |
︙ | ︙ | |||
18848 18849 18850 18851 18852 18853 18854 | to the db. */ int fsl__search_doc_touch(fsl_cx * const f, fsl_satype_e saType, fsl_id_t rid, const char * docName); /** @internal | < < < < < < < < < < < < < < < < < < | | < | | > > > > > | < | | 19978 19979 19980 19981 19982 19983 19984 19985 19986 19987 19988 19989 19990 19991 19992 19993 19994 19995 19996 19997 19998 19999 20000 20001 20002 20003 20004 20005 20006 20007 20008 20009 20010 20011 20012 20013 20014 20015 20016 20017 20018 20019 20020 20021 20022 20023 20024 20025 | to the db. */ int fsl__search_doc_touch(fsl_cx * const f, fsl_satype_e saType, fsl_id_t rid, const char * docName); /** @internal Returns true if the given file name is a reserved filename (case-insensitive) on Windows platforms, else returns false. zPath must be a canonical path with forward-slash directory separators. nameLen is the length of zPath. If negative, fsl_strlen() is used to determine its length. */ bool fsl__is_reserved_fn_windows(const char *zPath, fsl_int_t nameLen); /** @internal Clears any pending merge state from the f's checkout db's vmerge table. Returns 0 on success, non-0 on db error. If fullWipe is true, it clears all vfile contents uncondtionally, else it clears only entries for which the corresponding vfile entries are marked as unchanged and then cleans up remaining merge state if no file-level merge changes are pending. */ int fsl__ckout_clear_merge_state( fsl_cx * const f, bool fullWipe ); /** @internal Installs or reinstalls the checkout database schema into f's open checkout db. Returns 0 on success, FSL_RC_NOT_A_CKOUT if f has no opened checkout, or an code if a lower-level operation fails. If dropIfExists is true then all affected tables are dropped beforehand if they exist. "It's the only way to be sure." If dropIfExists is false and the schema appears to already exists (without actually validating its validity), 0 is returned. */ int fsl__ckout_install_schema(fsl_cx * const f, bool dropIfExists); /** @internal Attempts to remove empty directories from under a checkout, starting with tgtDir and working upwards until it either cannot remove one or it reaches the top of the checkout dir. |
︙ | ︙ | |||
18918 18919 18920 18921 18922 18923 18924 | Results are undefined if tgtDir is not an absolute path rooted in f's current checkout. There are any number of valid reasons removal of a directory might fail, and this routine stops at the first one which does. */ | | > | | | 20033 20034 20035 20036 20037 20038 20039 20040 20041 20042 20043 20044 20045 20046 20047 20048 20049 20050 20051 20052 20053 20054 20055 20056 20057 20058 20059 20060 20061 20062 20063 20064 20065 20066 20067 | Results are undefined if tgtDir is not an absolute path rooted in f's current checkout. There are any number of valid reasons removal of a directory might fail, and this routine stops at the first one which does. */ unsigned int fsl__ckout_rm_empty_dirs(fsl_cx * const f, fsl_buffer const * const tgtDir); /** @internal This is intended to be passed the name of a file which was just deleted and "might" have left behind an empty directory. The name _must_ an absolute path based in f's current checkout. This routine uses fsl_file_dirpart() to strip path components from the string and remove directories until either removing one fails or the top of the checkout is reached. Since removal of a directory can fail for any given reason, this routine ignores such errors. It returns 0 on success, FSL_RC_OOM if allocation of the working buffer for the filename hackery fails, and FSL_RC_MISUSE if zFilename is not rooted in the checkout (in which case it may assert(), so don't do that). @see fsl_is_rooted_in_ckout() @see fsl_rm_empty_dirs() */ int fsl__ckout_rm_empty_dirs_for_file(fsl_cx * const f, char const *zAbsPath); /** @internal If f->cache.seenDeltaManifest<=0 then this routine sets it to 1 and sets the 'seen-delta-manifest' repository config setting to 1, else this has no side effects. Returns 0 on success, non-0 if there is an error while writing to the repository config. |
︙ | ︙ | |||
19076 19077 19078 19079 19080 19081 19082 | 'allow-symlinks' repo-level config setting is true. That said: the addition of symlinks support into fossil was, IMHO, a poor decision for $REASONS. That might (might) be reflected long-term in this API by only supporting them in the way fossil does for platforms which do not support symlinks. */ int fsl__ckout_symlink_create(fsl_cx * const f, char const *zTgtFile, | | | 20192 20193 20194 20195 20196 20197 20198 20199 20200 20201 20202 20203 20204 20205 20206 | 'allow-symlinks' repo-level config setting is true. That said: the addition of symlinks support into fossil was, IMHO, a poor decision for $REASONS. That might (might) be reflected long-term in this API by only supporting them in the way fossil does for platforms which do not support symlinks. */ int fsl__ckout_symlink_create(fsl_cx * const f, char const *zTgtFile, char const * zLinkFile); /** Compute all file name changes that occur going from check-in iFrom to check-in iTo. Requires an opened repository. If revOK is true, the algorithm is free to move backwards in the |
︙ | ︙ | |||
19178 19179 19180 19181 19182 19183 19184 | beyond the file size change, is performed. - FSL__LOCALMOD_NOFOUND = file was not found in the local checkout. Noting that: - Combined values of (FSL__LOCALMOD_PERM | FSL__LOCALMOD_CONTENT) are | | | 20294 20295 20296 20297 20298 20299 20300 20301 20302 20303 20304 20305 20306 20307 20308 | beyond the file size change, is performed. - FSL__LOCALMOD_NOFOUND = file was not found in the local checkout. Noting that: - Combined values of (FSL__LOCALMOD_PERM | FSL__LOCALMOD_CONTENT) are possible, but FSL__LOCALMOD_NOTFOUND will never be combined with one of the other values. If stat() fails for any reason other than file-not-found (e.g. permissions), an error is triggered. Returns 0 on success. On error, returns non-0 and f's error state will be updated and isModified... isNotModified. Errors include, |
︙ | ︙ | |||
19313 19314 19315 19316 19317 19318 19319 | @see fsl_ckout_fingerprint_check() */ int fsl__repo_fingerprint_search(fsl_cx * const f, fsl_id_t rcvid, char ** zOut); /** | | | > > > > | | | | | | < | | > | > > | | > > | | > > | < < | 20429 20430 20431 20432 20433 20434 20435 20436 20437 20438 20439 20440 20441 20442 20443 20444 20445 20446 20447 20448 20449 20450 20451 20452 20453 20454 20455 20456 20457 20458 20459 20460 20461 20462 20463 20464 20465 20466 20467 20468 20469 20470 20471 20472 20473 20474 20475 20476 20477 20478 20479 20480 20481 20482 20483 20484 20485 20486 | @see fsl_ckout_fingerprint_check() */ int fsl__repo_fingerprint_search(fsl_cx * const f, fsl_id_t rcvid, char ** zOut); /** State for running a raw diff. @see fsl__diff_all() */ struct fsl__diff_cx { /** aEdit describes the raw diff. Each triple of integers in aEdit[] means: (1) COPY: Number of lines aFrom and aTo have in common (2) DELETE: Number of lines found only in aFrom (3) INSERT: Number of lines found only in aTo The triples repeat until all lines of both aFrom and aTo are accounted for. The array is terminated with a triple of (0,0,0). */ int *aEdit /*TODO unsigned*/; /** Number of integers (3x num of triples) in aEdit[]. */ int nEdit /*TODO unsigned*/; /** Number of elements allocated for aEdit[]. */ int nEditAlloc /*TODO unsigned*/; /** File content for the left side of the diff. */ fsl_dline *aFrom; /** Number of lines in aFrom[]. */ int nFrom /*TODO unsigned*/; /** File content for the right side of the diff. */ fsl_dline *aTo; /** Number of lines in aTo[]. */ int nTo /*TODO unsigned*/; /** Predicate for comparing LHS/RHS lines for equivalence. */ int (*cmpLine)(const fsl_dline * const, const fsl_dline *const); }; /** Convenience typeef. */ typedef struct fsl__diff_cx fsl__diff_cx; /** Initialized-with-defaults fsl__diff_cx structure, intended for const-copy initialization. */ #define fsl__diff_cx_empty_m {\ NULL,0,0,NULL,0,NULL,0,fsl_dline_cmp \ } /** Initialized-with-defaults fsl__diff_cx structure, intended for non-const copy initialization. */ extern const fsl__diff_cx fsl__diff_cx_empty; /** @internal Compute the differences between two files already loaded into the fsl__diff_cx structure. A divide and conquer technique is used. We look for a large |
︙ | ︙ | |||
19370 19371 19372 19373 19374 19375 19376 | Any common text at the beginning and end of the two files is removed before starting the divide-and-conquer algorithm. Returns 0 on succes, FSL_RC_OOM on an allocation error. */ int fsl__diff_all(fsl__diff_cx * const p); | | < | < | | > > < | 20494 20495 20496 20497 20498 20499 20500 20501 20502 20503 20504 20505 20506 20507 20508 20509 20510 20511 20512 20513 20514 20515 20516 20517 20518 20519 20520 20521 20522 20523 20524 20525 20526 20527 20528 20529 | Any common text at the beginning and end of the two files is removed before starting the divide-and-conquer algorithm. Returns 0 on succes, FSL_RC_OOM on an allocation error. */ int fsl__diff_all(fsl__diff_cx * const p); /** @internal */ void fsl__diff_optimize(fsl__diff_cx * const p); /** @internal */ void fsl__diff_cx_clean(fsl__diff_cx * const cx); /** @internal Undocumented. For internal debugging only. */ void fsl__dump_triples(fsl__diff_cx const * const p, char const * zFile, int ln ); /** @internal Removes from the BLOB table all artifacts that are in the SHUN table. Returns 0 on success. Requires (asserts) that a repo is opened. Note that this is not a simple DELETE operation, as it requires ensuring that all removed blobs have been undeltified first so that no stale delta records are left behind. */ int fsl__shunned_remove(fsl_cx * const f); /** @internal This is a fossil-specific internal detail not needed by the more generic parts of the fsl_db API. It loops through all "cached" prepared statements for which stmt->role has been assigned a value |
︙ | ︙ | |||
19414 19415 19416 19417 19418 19419 19420 19421 19422 19423 19424 19425 19426 19427 19428 | As a special case, if role==0 then ALL cached statements are closed, with the caveat that the process will still fail if any statement is currently flagged as active. */ int fsl__db_cached_clear_role(fsl_db * const db, int role); /** @internal Maximum length of a line in a text file, in bytes. (2**15 = 32k) */ #define FSL__LINE_LENGTH_MASK_SZ 15 /** @internal | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | 20537 20538 20539 20540 20541 20542 20543 20544 20545 20546 20547 20548 20549 20550 20551 20552 20553 20554 20555 20556 20557 20558 20559 20560 20561 20562 20563 20564 20565 20566 20567 20568 20569 20570 20571 20572 20573 20574 20575 20576 20577 20578 20579 20580 20581 20582 20583 20584 20585 20586 20587 20588 20589 20590 20591 20592 20593 20594 20595 20596 20597 20598 20599 20600 20601 20602 20603 20604 20605 20606 20607 20608 20609 20610 20611 20612 20613 20614 20615 20616 20617 20618 20619 20620 20621 20622 20623 20624 20625 20626 20627 20628 20629 20630 20631 20632 20633 20634 20635 20636 20637 20638 20639 20640 20641 20642 20643 20644 20645 20646 20647 20648 20649 20650 20651 20652 20653 20654 20655 20656 20657 20658 20659 20660 20661 20662 20663 20664 20665 20666 20667 20668 20669 20670 20671 20672 20673 20674 20675 20676 20677 20678 20679 20680 20681 20682 20683 20684 20685 20686 20687 20688 | As a special case, if role==0 then ALL cached statements are closed, with the caveat that the process will still fail if any statement is currently flagged as active. */ int fsl__db_cached_clear_role(fsl_db * const db, int role); /** @internal Part of the crosslinking bits: rebuilds the entry for the ticket with the given K-card value. */ int fsl__ticket_rebuild(fsl_cx * const f, char const * zTktId); /** @internal Calls all registered crosslink link listeners, passing each the given deck. Returns 0 if there are no listeners or if all return 0, else it propagates an error from a failed listener. This must only be called while crosslinking is underway. @see fsl_xlink_listener() */ int fsl__call_xlink_listeners(fsl_deck * const d); /** @internal Copies symlink zFrom to a new symlink or pseudo-symlink named zTo. If realLink is true and this is a non-Windows platform, symlink zFrom is copied to zTo. If realLink is false or this is a Windows platform them... - On Windows this has currently undesired, or at least, highly arguable, behavior (historical, inherited from fossil(1)), in that an empty file named zTo will be created. In fossil(1) this function's counterpart is (apparently) never called on Windows, so that behavior seems to be moot. It is, however, important that this library never call it on Windows. - On non-Windows, a pseudo-symlink will be created: the string zFrom will be written to a regular file named zTo. That is, the file zTo will hold, as its contents, what it would point to if it were a symlink. */ int fsl__symlink_copy(char const *zFrom, char const *zTo, bool realLink); /** @internal Clears the contents of f->cache.mcache. */ void fsl__cx_mcache_clear(fsl_cx * const f); /** @internal Translates sqliteCode (or, if it's 0, sqlite3_errcode()) to an approximate FSL_RC_xxx match but treats SQLITE_ROW and SQLITE_DONE as non-errors (result code 0). If non-0 is returned db's error state is updated with the current sqlite3_errmsg() string. */ int fsl__db_errcode(fsl_db * const db, int sqliteCode); /** @internal Clears various internal caches and resets various internally-cached values related to a repository db, but the data cleared here are not associated directly with a db handle. This is intended primarily to be used when a db transaction is rolled back which might have introduced state into those caches which would be stale after a rollback. */ void fsl__cx_clear_repo_caches(fsl_cx * const f); /** @internal Plug in fsl_cx-specific db functionality into the given db handle. This must only be passed the MAIN db handle for the context, immediately after opening that handle, before f->dbMain is assigned. This function has very limited applicability and various preconditions which are assert()ed. */ int fsl__cx_init_db(fsl_cx * const f, fsl_db * const db); /** @internal Attaches the given db file to f with the given role. This function "should" be static but we need it in repo.c when creating a new repository. This function has tightly-controlled preconditions which will assert if not met. r must be one of FSL_DBROLE_CKOUT or FSL_DBROLE_REPO. If createIfNotExists is true and zDbName does not exist in the filesystem, it is created before/as part of the OPEN or ATTACH. This is almost never desired, but is required for operations which create a repo (e.g. the aptly-named fsl_repo_create()) or a checkout db (e.g. fsl_repo_open_ckout()). */ int fsl__cx_attach_role(fsl_cx * const f, const char *zDbName, fsl_dbrole_e r, bool createIfNotExists); /** @internal Returns one of f->{repo,ckout}.db or NULL. ACHTUNG and REMINDER TO SELF: the current (2021-03) design means that none of these handles except for FSL_DBROLE_MAIN actually has an sqlite3 db handle assigned to it. This returns a handle to the "level of abstraction" we need to keep track of each db's name and db-specific other state. e.g. passing a role of FSL_DBROLE_CKOUT this does NOT return the same thing as fsl_cx_db_ckout(). */ fsl_db * fsl__cx_db_for_role(fsl_cx * const f, fsl_dbrole_e r); /** @internal Frees/clears the non-db state of f->ckout. */ void fsl__cx_ckout_clear(fsl_cx * const f); /** @internal Maximum length of a line in a text file, in bytes. (2**15 = 32k) */ #define FSL__LINE_LENGTH_MASK_SZ 15 /** @internal Bitmask which, when AND-ed with a number, will result in the bottom FSL__LINE_LENGTH_MASK_SZ bits of that number. */ #define FSL__LINE_LENGTH_MASK ((1<<FSL__LINE_LENGTH_MASK_SZ)-1) #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_INTERNAL_H_INCLUDED */ /* end of file ./include/fossil-scm/internal.h */ /* start of file ./include/fossil-scm/auth.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_AUTH_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_AUTH_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt |
︙ | ︙ | |||
19479 19480 19481 19482 19483 19484 19485 | returns a copy of zPw) if the project code is not set, under the assumption that this is "the first xfer request of a clone." Whether or not that will apply at this level to libfossil remains to be seen. TODO? Does fossil still use SHA1 for this? */ | | | | | | | | | 20722 20723 20724 20725 20726 20727 20728 20729 20730 20731 20732 20733 20734 20735 20736 20737 20738 20739 20740 20741 20742 20743 20744 20745 20746 20747 20748 20749 20750 20751 20752 20753 20754 20755 20756 20757 20758 20759 20760 20761 20762 20763 20764 20765 20766 20767 20768 20769 20770 20771 20772 20773 20774 20775 20776 20777 20778 20779 20780 20781 20782 20783 20784 20785 20786 20787 20788 20789 20790 20791 20792 20793 20794 20795 20796 20797 20798 20799 20800 20801 20802 | returns a copy of zPw) if the project code is not set, under the assumption that this is "the first xfer request of a clone." Whether or not that will apply at this level to libfossil remains to be seen. TODO? Does fossil still use SHA1 for this? */ FSL_EXPORT char * fsl_sha1_shared_secret( fsl_cx * const f, char const * zLoginName, char const * zPw ); /** Fetches the login group name (if any) for the given context's current repositorty db. If f has no opened repo, 0 is returned. If the repo belongs to a login group, its name is returned in the form of a NUL-terminated string. The returned value (which may be 0) is owned by the caller, who must eventually fsl_free() it. The value (unlike in fossil(1)) is not cached because it may change via modification of the login group. */ FSL_EXPORT char * fsl_repo_login_group_name(fsl_cx * const f); /** Fetches the login cookie name associated with the current repository db, or 0 if no repository is opened. The returned (NUL-terminated) string is owned by the caller, who must eventually fsl_free() it. The value is not cached in f because it may change during the lifetime of a repo (if a login group is set or removed). The login cookie name is a string in the form "fossil-XXX", where XXX is the first 16 hex digits of either the repo's 'login-group-code' or 'project-code' config values (in that order). */ FSL_EXPORT char * fsl_repo_login_cookie_name(fsl_cx * const f); /** Searches for a user ID (from the repo.user.uid DB field) for a given username and password. The password may be either its hashed form or non-hashed form (if it is not exactly 40 bytes long, that is!). On success, 0 is returned and *pId holds the ID of the user found (if any). *pId will be set to 0 if no match for the name/password was found, or positive if a match was found. If any of the arguments are NULL, FSL_RC_MISUSE is returned. f must have an opened repo, else FSL_RC_NOT_A_REPO is returned. */ FSL_EXPORT int fsl_repo_login_search_uid(fsl_cx * const f, char const * zUsername, char const * zPasswd, fsl_id_t * pId); /** Clears all login state for the given user ID. If the ID is <=0 then ALL logins are cleared. Has no effect on the built-in pseudo-users. Returns non-0 on error, and not finding a matching user ID is not considered an error. f must have an opened repo, or FSL_RC_NOT_A_REPO is returned. TODO: there are currently no APIs for _setting_ the state this function clears! */ FSL_EXPORT int fsl_repo_login_clear( fsl_cx * const f, fsl_id_t userId ); #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_AUTH_H_INCLUDED */ /* end of file ./include/fossil-scm/auth.h */ /* start of file ./include/fossil-scm/forum.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_FSL_FORUM_H_INCLUDED) #define ORG_FOSSIL_SCM_FSL_FORUM_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt |
︙ | ︙ | |||
19585 19586 19587 19588 19589 19590 19591 | #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_FORUM_H_INCLUDED */ | | | | 20828 20829 20830 20831 20832 20833 20834 20835 20836 20837 20838 20839 20840 20841 20842 20843 | #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* ORG_FOSSIL_SCM_FSL_FORUM_H_INCLUDED */ /* end of file ./include/fossil-scm/forum.h */ /* start of file ./include/fossil-scm/pages.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(ORG_FOSSIL_SCM_PAGES_H_INCLUDED) #define ORG_FOSSIL_SCM_PAGES_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt |
︙ | ︙ | |||
20092 20093 20094 20095 20096 20097 20098 | ``` */ /** @page page_code_conventions Code Conventions Project and Code Conventions... | | | 21335 21336 21337 21338 21339 21340 21341 21342 21343 21344 21345 21346 21347 21348 21349 | ``` */ /** @page page_code_conventions Code Conventions Project and Code Conventions... Foreword: all of this more or less evolved organically or was inherited from fossil(1) (where it evolved organically, or was inherited from sqilte (where it evol...)), and is written up here more or less as a formality. Historically i've not been a fan of coding conventions, but as someone else put it to me, "the code should look like it comes from a single source," and the purpose of this section is to help orient those looking to hack in the sources. Note that most of what is said below becomes obvious |
︙ | ︙ | |||
20133 20134 20135 20136 20137 20138 20139 20140 20141 20142 20143 20144 20145 20146 20147 | for fun). - Public API members have a fsl_ or FSL_ prefix (fossil_ seems too long). For private/static members, anything goes. Optional or "add-on" APIs (e.g. ::fcli) may use other prefixes, but are encouraged use an "f-word" (as it were), simply out of deference to long-standing software naming conventions. - Public-API structs and functions use lower_underscore_style(). Static/internal APIs may use different styles. It's not uncommon to see UpperCamelCase for file-scope structs. - Overall style, especially scope blocks and indentation, should follow Fossil's. We are _not at all_ picky about whether or not there is a space after/before parens in if( foo ), and similar | > > > > > > > > | > | | | | | | > | | < | | | | | | 21376 21377 21378 21379 21380 21381 21382 21383 21384 21385 21386 21387 21388 21389 21390 21391 21392 21393 21394 21395 21396 21397 21398 21399 21400 21401 21402 21403 21404 21405 21406 21407 21408 21409 21410 21411 21412 21413 21414 21415 21416 21417 21418 21419 21420 21421 21422 21423 21424 21425 21426 21427 21428 21429 21430 21431 21432 21433 21434 21435 21436 21437 21438 21439 21440 21441 21442 21443 21444 21445 21446 21447 21448 21449 21450 21451 21452 21453 21454 21455 21456 21457 21458 21459 21460 21461 21462 21463 21464 | for fun). - Public API members have a fsl_ or FSL_ prefix (fossil_ seems too long). For private/static members, anything goes. Optional or "add-on" APIs (e.g. ::fcli) may use other prefixes, but are encouraged use an "f-word" (as it were), simply out of deference to long-standing software naming conventions. - Internal APIs, especially non-static ones, start with `fsl__` or `FSL__`, with two underscores. Such APIs must never be used in client-side code. - Public-API structs and functions use lower_underscore_style(). Static/internal APIs may use different styles. It's not uncommon to see UpperCamelCase for file-scope structs. - Function parameters and function-scope vars have no set conventions - implementors are free to name those however they like. - Overall style, especially scope blocks and indentation, should follow Fossil's. We are _not at all_ picky about whether or not there is a space after/before parens in if( foo ), and similar small details, just the overall code pattern and two-space indentation. Hard tabs are verboten. - Structs and enums all get the optional typedef so that they do not need to be qualified with 'struct' resp. 'enum' when used. Because of how doxygen tracks those, the typedef should be separate from the struct declaration, rather than combinding those into a single declaration. - Function typedefs are named fsl_XXX_f. Implementations of such typedefs/interfaces are typically named fsl_XXX_f_SUFFIX(), where SUFFIX describes the implementation's specialization. e.g. fsl_output_f() is a callback typedef/interface and fsl_output_f_FILE() is a concrete implementation for FILE handles. - Enums tend to be named fsl_XXX_e. - Functions follow the naming pattern prefix_NOUN_VERB(), rather than the more C-conventional prefix_VERB_NOUN(), e.g. fsl_foo_get() and fsl_foo_set() rather than fsl_get_foo() and fsl_get_foo(). The primary reasons are (A) sortability for document processors and (B) they more naturally match with OO API conventions, e.g. `noun.verb()`. A few cases knowingly violate this convention for the sake of readability or sorting of several related functions (e.g. fsl_db_get_TYPE() instead of fsl_db_TYPE_get()). - Structs intended to be creatable on the stack are accompanied by a const instance named fsl_STRUCT_NAME_empty, and possibly by a macro named fsl_STRUCT_NAME_empty_m, both of which are "default-initialized" instances of that struct. This is superiour to using `memset()` for struct initialization because we can define (and document) arbitrary default values and all clients who copy-construct them are unaffected by many types of changes to the struct's signature (though they may need a recompile). The intention of the fsl_STRUCT_NAME_empty_m macro is to provide a struct-embeddable form for use in other structs or copy-initialization of const structs, and the `_m` macro is always used to initialize its const struct counterpart. e.g. the library guarantees that fsl_cx_empty_m (a macro representing an empty fsl_cx instance) holds the same default values as fsl_cx_empty (a const fsl_cx value). - Returning int vs fsl_int_t vs fsl_size_t: int is used as a conventional result code. fsl_int_t is often used as a signed length-style result code (e.g. printf() semantics). Unsigned ranges use fsl_size_t. Ints are (also) used as a "triplean" (3 potential values, e.g. <0, 0, >0). fsl_int_t also guarantees that it will be 64-bit if available, so can be used for places where large values are needed but a negative value is legal (or handy), e.g. the final arguments for fsl_strndup() and fsl_buffer_append(). The use of the fsl_xxx_t typedefs, rather than (unsigned) int, is primarily for readability/documentation, e.g. so that readers can know immediately that the function uses a given argument or return value following certain API-wide semantics. It also allows us to better define platform-portable printf/scanf-style format modifiers for them (analog to C99's PRIi32 and friends), which often come in handy. - Signed vs. unsigned types for size/length arguments: use the fsl_int_t (signed) argument type when the client may legally pass in a negative value as a hint that the API should use fsl_strlen() (or similar) to determine a byte array's length. Use fsl_size_t when no automatic length determination is possible (or desired), to "force" the client to pass the proper length. Internally |
︙ | ︙ | |||
20325 20326 20327 20328 20329 20330 20331 | executable bit and only does anything useful on platforms which support symlinks. */ #endif /* ORG_FOSSIL_SCM_PAGES_H_INCLUDED */ | | | < < < < < < > | 21577 21578 21579 21580 21581 21582 21583 21584 21585 21586 21587 21588 21589 21590 21591 21592 21593 21594 21595 21596 21597 21598 21599 21600 21601 21602 21603 21604 21605 21606 21607 21608 21609 21610 21611 21612 21613 21614 | executable bit and only does anything useful on platforms which support symlinks. */ #endif /* ORG_FOSSIL_SCM_PAGES_H_INCLUDED */ /* end of file ./include/fossil-scm/pages.h */ /* start of file ./include/fossil-scm/cli.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(_ORG_FOSSIL_SCM_FCLI_H_INCLUDED_) #define _ORG_FOSSIL_SCM_FCLI_H_INCLUDED_ /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). ***************************************************************************** This file provides a basis for basic libfossil-using apps. It attempts to provide basic services required by a wide variety of fossil-using apps, with the intent of simplifying their creation. */ #include <stdlib.h> /* EXIT_SUCCESS and friends */ #include <assert.h> /** @page page_fcli fcli (formerly FossilApp) ::fcli (formerly FossilApp) provides a small framework for bootstrapping simple libfossil applications which only need a single fsl_cx instance managing a single checkout and/or repository. It is primarily intended for use with CLI apps |
︙ | ︙ | |||
20776 20777 20778 20779 20780 20781 20782 | If not NULL then fcli_setup() will attempt to open the checkout for the given dir, including its associated repo db. By default this is "." (the current directory). Applications can set this to NULL _before_ calling fcli_setup() in order to disable the automatic attemp to open a checkout under the current directory. Doing so is | | | 22023 22024 22025 22026 22027 22028 22029 22030 22031 22032 22033 22034 22035 22036 22037 | If not NULL then fcli_setup() will attempt to open the checkout for the given dir, including its associated repo db. By default this is "." (the current directory). Applications can set this to NULL _before_ calling fcli_setup() in order to disable the automatic attemp to open a checkout under the current directory. Doing so is equivalent to using the --no-checkout flag. The global --checkout-dir flag will trump that setting, though. */ char const * checkoutDir; /** A verbosity level counter. Starts at 0 (no verbosity) and goes up for higher verbosity levels. Currently levels 1 and 2 are |
︙ | ︙ | |||
20799 20800 20801 20802 20803 20804 20805 | */ struct { /** repo db name string from -R/--repo CLI flag. */ const char * repoDbArg; /** | | | 22046 22047 22048 22049 22050 22051 22052 22053 22054 22055 22056 22057 22058 22059 22060 | */ struct { /** repo db name string from -R/--repo CLI flag. */ const char * repoDbArg; /** User name from the --user CLI flag. */ const char * userArg; /** Incremented if fcli_setup() detects -? or --help in the argument list, or if the first non-flag argument is "help". */ short helpRequested; |
︙ | ︙ | |||
20855 20856 20857 20858 20859 20860 20861 | fcli_cx() returns the API's fsl_cx instance. It will be non-NULL (but might not have an opened checkout/repository) if fsl_setup() succeeds. */ FSL_EXPORT fcli_t fcli; | < < < < < < < < < < | | > | > | | | > | | 22102 22103 22104 22105 22106 22107 22108 22109 22110 22111 22112 22113 22114 22115 22116 22117 22118 22119 22120 22121 22122 22123 22124 22125 22126 22127 22128 22129 22130 22131 22132 22133 22134 22135 22136 22137 22138 22139 22140 22141 22142 22143 22144 22145 22146 | fcli_cx() returns the API's fsl_cx instance. It will be non-NULL (but might not have an opened checkout/repository) if fsl_setup() succeeds. */ FSL_EXPORT fcli_t fcli; /** Initializes fcli's state and CLI flags processing. MUST BE CALLED BEFORE fsl_malloc() and friends are used, as this swaps out the allocator with one which aborts on OOM. (But see fcli_pre_setup() for a workaround for that.) Should be called early on in main(), passed the arguments passed to main(). Returns 0 on success. This sets up the ::fcli instance and opens any checkout found in/above the current dir by default. To disable the automatic search for a checkout, assign `fcli.clientFlags.checkoutDir` to `NULL` before calling this. If the 3rd argument is not NULL, this sets `fcli.cliFlags` to its value. If the 4th argument is not NULL, this sets `fcli.appHelp` to that value. If argument processing finds either of the (`--help`, `-?`) flags, or the first non-flag argument is "help", it sets fcli.transient.helpRequested to a true value, calls fcli_help(), and returns FCLI_RC_HELP, in which case the application should exit/return from main with code 0 immediately. It behaves similar when it finds the `--lib-version` flag. This function behaves significantly differently if its 3rd argument is not NULL or if fcli.cliFlags has been set before it is called. In that case, it parses the CLI flags using that type's rules and sets up fcli_help() to use those flags for generating the help. It parses the global flags first, then the app-specific flags (this means that global flags will be consumed from the argv array before app-specific flags with the same names). Returns 0 on success. Results other than FCLI_RC_HELP should be treated as fatal to the app, and fcli.f's error state _might_ contain info about the error. If this function returns non-0, the convention is that the app immediately returns the result of fcli_end_of_main(THE_RESULT_CODE) from main(). That function will treat FCLI_RC_HELP as a non-error and will report any error state |
︙ | ︙ | |||
21230 21231 21232 21233 21234 21235 21236 21237 | complex values like multi-dimensional arrays. "fax" is short for "free at exit." Results are undefined if the same address or overlapping addresses are queued more than once. Once an entry is in this queue, there is no way to remove it. */ | > > > > > > | | 22470 22471 22472 22473 22474 22475 22476 22477 22478 22479 22480 22481 22482 22483 22484 22485 22486 22487 22488 22489 22490 22491 | complex values like multi-dimensional arrays. "fax" is short for "free at exit." Results are undefined if the same address or overlapping addresses are queued more than once. Once an entry is in this queue, there is no way to remove it. Returns its argument so that it can be used like: ``` char * x = fcli_fax( fsl_strdup("...") ); ``` */ FSL_EXPORT void * fcli_fax(void * mem); /** Requires an array of fcli_cliflag objects terminated with an instance with NULL values for the (flagShort, flagLong) members (fcli_cliflag_empty_m is an easy way to get that). If fcli.cliFlags is set before fcli_setup() is called, this routine |
︙ | ︙ | |||
21377 21378 21379 21380 21381 21382 21383 | Returns 0 on success. If there are no more CLI arguments when it is called then it returns FSL_RC_MISUSE and updates the fcli error state with a description of the problem. It may return any number of non-0 codes from the underlying operations. Sidebar: fsl_filename_to_vfile_ids() requires that directory names | | | | | > | 22623 22624 22625 22626 22627 22628 22629 22630 22631 22632 22633 22634 22635 22636 22637 22638 22639 22640 22641 22642 22643 22644 | Returns 0 on success. If there are no more CLI arguments when it is called then it returns FSL_RC_MISUSE and updates the fcli error state with a description of the problem. It may return any number of non-0 codes from the underlying operations. Sidebar: fsl_filename_to_vfile_ids() requires that directory names passed to it have no trailing slashes, and this routine strips trailing slashes from its arguments before passing them on to that routine, so they may be entered with slashes without ill effect. @see fsl_filename_to_vfile_ids() */ FSL_EXPORT int fcli_args_to_vfile_ids(fsl_id_bag * const tgt, fsl_id_t vid, bool relativeToCwd, bool changedFilesOnly); /** Performs a "fingerprint check" on the current checkout/repo combination, as per fsl_ckout_fingerprint_check(). If the check fails and reportImmediately is true then an error report is |
︙ | ︙ | |||
21426 21427 21428 21429 21430 21431 21432 | */ FCLI_DIFF_COLORS_RG, FCLI_DIFF_COLORS_DEFAULT = FCLI_DIFF_COLORS_RG }; typedef enum fcli_diff_colors_e fcli_diff_colors_e; /** | | | | 22673 22674 22675 22676 22677 22678 22679 22680 22681 22682 22683 22684 22685 22686 22687 22688 22689 22690 | */ FCLI_DIFF_COLORS_RG, FCLI_DIFF_COLORS_DEFAULT = FCLI_DIFF_COLORS_RG }; typedef enum fcli_diff_colors_e fcli_diff_colors_e; /** Populates the given fsl_dibu_opt::ansiColors state with values dependend on the second argument. */ FSL_EXPORT void fcli_diff_colors(fsl_dibu_opt * const tgt, fcli_diff_colors_e theme); /** @internal This function is intented for use in development of libfossil. It dumps the current state of cached SQL statements to fcli_printf(). |
︙ | ︙ | |||
21461 21462 21463 21464 21465 21466 21467 | #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* _ORG_FOSSIL_SCM_FCLI_H_INCLUDED_ */ | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 22708 22709 22710 22711 22712 22713 22714 22715 22716 22717 22718 22719 22720 22721 22722 22723 22724 22725 22726 22727 22728 22729 22730 22731 22732 22733 22734 22735 22736 22737 22738 22739 22740 22741 22742 22743 22744 22745 22746 22747 22748 22749 22750 22751 22752 22753 22754 22755 22756 22757 22758 22759 22760 22761 22762 22763 22764 22765 22766 22767 22768 22769 22770 22771 22772 22773 22774 22775 22776 22777 22778 22779 22780 22781 22782 22783 22784 22785 22786 22787 22788 22789 22790 22791 22792 22793 22794 22795 22796 22797 22798 22799 22800 22801 22802 22803 22804 22805 22806 22807 22808 22809 22810 22811 22812 22813 22814 22815 22816 22817 22818 22819 22820 22821 22822 22823 22824 22825 22826 22827 22828 22829 22830 22831 22832 22833 22834 22835 22836 22837 22838 22839 22840 22841 22842 22843 22844 22845 22846 22847 22848 22849 22850 22851 22852 22853 22854 22855 22856 22857 22858 22859 22860 22861 22862 22863 22864 22865 22866 22867 22868 22869 22870 22871 22872 22873 22874 22875 22876 22877 22878 22879 22880 22881 22882 22883 22884 22885 22886 22887 22888 22889 22890 22891 22892 22893 22894 22895 22896 22897 22898 22899 22900 22901 22902 22903 22904 22905 22906 22907 22908 22909 22910 22911 22912 22913 22914 22915 22916 22917 22918 22919 22920 22921 22922 22923 22924 22925 22926 22927 22928 22929 22930 22931 22932 22933 22934 22935 22936 22937 22938 22939 22940 22941 22942 22943 22944 22945 22946 22947 22948 22949 22950 22951 22952 22953 22954 22955 22956 22957 22958 22959 22960 22961 22962 22963 22964 22965 22966 22967 22968 | #if defined(__cplusplus) } /*extern "C"*/ #endif #endif /* _ORG_FOSSIL_SCM_FCLI_H_INCLUDED_ */ /* end of file ./include/fossil-scm/cli.h */ /* start of file ./include/fossil-scm/deprecated.h */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 et sw=2 tw=80: */ #if !defined(FSL_OMIT_DEPRECATED) #if !defined(ORG_FOSSIL_SCM_LIBFOSSIL_DEPRECATED_H_INCLUDED) #define ORG_FOSSIL_SCM_LIBFOSSIL_DEPRECATED_H_INCLUDED /* Copyright 2013-2021 The Libfossil Authors, see LICENSES/BSD-2-Clause.txt SPDX-License-Identifier: BSD-2-Clause-FreeBSD SPDX-FileCopyrightText: 2021 The Libfossil Authors SPDX-ArtifactOfProjectName: Libfossil SPDX-FileType: Code Heavily indebted to the Fossil SCM project (https://fossil-scm.org). */ /** @file deprecated.h This file holds APIs which are deprecated or otherwise "on the chopping block." The libfossil public API has gathered a good deal of cruft over the years. */ /** @deprecated fsl_db_role_name() is easier to deal with. Similar to fsl_cx_db_file_ckout() and friends except that it applies to DB name (as opposed to DB _file_ name) implied by the specified role (2nd parameter). If no such role is opened, or the role is invalid, NULL is returned. If the 3rd argument is not NULL, it is set to the length, in bytes, of the returned string. The returned strings are NUL-terminated and are either static or owned by the db handle they correspond to. If the client does not care whether the db in question is actually opened, the name for the corresponding role can be fetched via fsl_db_role_name(). This is the "easiest" way to figure out the DB name of the given role, independent of what order f's databases were opened (because the first-opened DB is always called "main"). The Fossil-standard names of its primary databases are: "localdb" (checkout), "repository", and "configdb" (global config DB), but libfossil uses "ckout", "repo", and "cfg", respective. So long as queries use table names which unambiguously refer to a given database, the DB name is normally not needed. It is needed when creating new non-TEMP db tables and views. By default such tables/views would go into the "main" DB, and which one is the "main" db is dependent on the order the DBs are opened, so it's important to use the correct DB name when creating such constructs. Note that the role of FSL_DBROLE_TEMP is invalid here. */ char const * fsl_cx_db_name_for_role(fsl_cx const * const f, fsl_dbrole_e r, fsl_size_t * len); /** Flags for use with text-diff generation APIs, e.g. fsl_diff_text(). Maintenance reminders: - These values are holy and must not be changed without also changing the corresponding code in diff.c. - Where these entries semantically overlap with their fsl_diff2_flag_e counterparts, they MUST have the same values because some internal APIs are used by both of the diff APIs. @deprecated Prefer fsl_diff2_flag_e and fsl_diff_v2() instead. */ enum fsl_diff_flag_e { /** Ignore end-of-line whitespace */ FSL_DIFF_IGNORE_EOLWS = 0x01, /** Ignore end-of-line whitespace */ FSL_DIFF_IGNORE_ALLWS = 0x03, /** Generate a side-by-side diff */ FSL_DIFF_SIDEBYSIDE = 0x04, /** Missing shown as empty files */ FSL_DIFF_VERBOSE = 0x08, /** Show filenames only. Not used in this impl! */ FSL_DIFF_BRIEF = 0x10, /** Render HTML. */ FSL_DIFF_HTML = 0x20, /** Show line numbers. */ FSL_DIFF_LINENO = 0x40, /** Suppress optimizations (debug). */ FSL_DIFF_NOOPT = 0x0100, /** Invert the diff (debug). */ FSL_DIFF_INVERT = 0x0200, /* ACHTUNG: do not use 0x0400 because of semantic collision with FSL_DIFF2_CONTEXT_ZERO */ /** Only display if not "too big." */ FSL_DIFF_NOTTOOBIG = 0x0800, /** Strip trailing CR */ FSL_DIFF_STRIP_EOLCR = 0x1000, /** This flag tells text-mode diff generation to add ANSI color sequences to some output. The colors are currently hard-coded and non-configurable. This has no effect for HTML output, and that flag trumps this one. It also currently only affects unified diffs, not side-by-side. Maintenance reminder: this one currently has no counterpart in fossil(1), is not tracked in the same way, and need not map to an internal flag value. */ FSL_DIFF_ANSI_COLOR = 0x2000 }; /** Generates a textual diff from two text inputs and writes it to the given output function. pA and pB are the buffers to diff. contextLines is the number of lines of context to output. This parameter has a built-in limit of 2^16, and values larger than that get truncated. A value of 0 is legal, in which case no surrounding context is provided. A negative value translates to some unspecified default value. sbsWidth specifies the width (in characters) of the side-by-side columns. If sbsWidth is not 0 then this function behaves as if diffFlags contains the FSL_DIFF_SIDEBYSIDE flag. If sbsWidth is negative, OR if diffFlags explicitly contains FSL_DIFF_SIDEBYSIDE and sbsWidth is 0, then some default width is used. This parameter has a built-in limit of 255, and values larger than that get truncated to 255. diffFlags is a mask of fsl_diff_flag_t values. Not all of the fsl_diff_flag_t flags are yet [sup]ported. The output is sent to out(outState,...). If out() returns non-0 during processing, processing stops and that result is returned to the caller of this function. Returns 0 on success, FSL_RC_OOM on allocation error, FSL_RC_MISUSE if any arguments are invalid, FSL_RC_TYPE if any of the content appears to be binary (contains embedded NUL bytes), FSL_RC_RANGE if some range is exceeded (e.g. the maximum number of input lines). None of (pA, pB, out) may be NULL. TODOs: - Add a predicate function for outputing only matching differences, analog to fossil(1)'s regex support (but more flexible). - Expose the raw diff-generation bits via the internal API to facilitate/enable the creation of custom diff formats. @see fsl_diff_v2() @deprecated Prefer fsl_diff_v2() for new code. */ int fsl_diff_text(fsl_buffer const *pA, fsl_buffer const *pB, fsl_output_f out, void * outState, short contextLines, short sbsWidth, int diffFlags ); /** Functionally equivalent to: ``` fsl_diff_text(pA, pB, fsl_output_f_buffer, pOut, contextLines, sbsWidth, diffFlags); ``` Except that it returns FSL_RC_MISUSE if !pOut. @see fsl_diff_v2() @deprecated Prefer fsl_diff_v2() for new code. */ int fsl_diff_text_to_buffer(fsl_buffer const *pA, fsl_buffer const *pB, fsl_buffer *pOut, short contextLines, short sbsWidth, int diffFlags ); /** Equivalent to `fcli_setup_v2(argc,argv,fcli.cliFlags,fcli.appHelp)`. @see fcli_pre_setup() @see fcli_setup_v2() @see fcli_end_of_main() @deprecated Its signature will change to fcli_setup_v2()'s at some point. */ int fcli_setup(int argc, char const * const * argv ); /** @internal Performs the same job as fsl_diff_text() but produces the results in the low-level form of an array of "copy/delete/insert triples." This is primarily intended for internal use in other library-internal algorithms, not for client code. Note all FSL_DIFF_xxx flags apply to this form. Returns 0 on success, any number of non-0 codes on error. On success *outRaw will contain the resulting array, which must eventually be fsl_free()'d by the caller. On error *outRaw is not modified. @deprecated Use fsl_diff_v2_raw() instead. */ int fsl__diff_text_raw(fsl_buffer const *p1, fsl_buffer const *p2, int diffFlags, int ** outRaw); /** @deprecated fsl_close_scm_dbs() As of 2021-01-01, this functions identically to fsl_close_scm_dbs(). Prior to that... If fsl_repo_open_xxx() has been used to open a respository db, perhaps indirectly via opening of a checkout, this call closes that db and any corresponding checkout db. Returns 0 on success or if no repo/checkout db is opened. It may propagate an error from the db layer if closing/detaching the db fails. @see fsl_repo_open() @see fsl_repo_create() */ int fsl_repo_close( fsl_cx * const f ); /** @deprecated use fsl_close_scm_dbs() instead As of 2021-01-01, this functions identically to fsl_close_scm_dbs(). Prior to that... If fsl_ckout_open_dir() (or similar) has been used to open a checkout db, this call closes that db, as well as any corresponding repository db. Returns 0 on success or if no checkout db is opened. It may propagate an error from the db layer if closing/detaching the db fails. Returns FSL_RC_MISUSE if f has any transactions pending. This also closes the repository which was implicitly opened for the checkout. */ int fsl_ckout_close( fsl_cx * const f ); #endif /* ORG_FOSSIL_SCM_LIBFOSSIL_DEPRECATED_H_INCLUDED */ #endif /* FSL_OMIT_DEPRECATED */ /* end of file ./include/fossil-scm/deprecated.h */ |
Deleted signify/fnc-05-release.pub.
|
| < < |
Added signify/fnc-07-release.pub.
> > | 1 2 | untrusted comment: fnc 0.7 public key RWS7z+k9eoeF8OQp7R9VyUfKlxOODpUYCBM2v/YEbk8YXiSK1FzkIVJD |
Changes to src/fnc.1.
1 | .\" | | | 1 2 3 4 5 6 7 8 9 | .\" .\" Copyright (c) 2021, 2022 Mark Jamsek <mark@jamsek.com> .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above .\" copyright notice and this permission notice appear in all copies. .\" .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
︙ | ︙ | |||
23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | .Nm .Op Ar command .Op Fl h | -help .Nm .Op Fl h | -help .Op Fl v | -version .Nm .Cm timeline .Op Fl Cz .Op Fl b Ar branch .Op Fl c Ar commit .Op Fl f Ar glob .Op Fl n Ar number .Op Fl T Ar tag .Op Fl t Ar type .Op Fl u Ar user .Op Ar path .Nm .Cm diff .Op Fl Ciw .Op Fl x Ar number .Op Ar artifact1 Op Ar artifact2 .Op Ar path ... .Nm .Cm tree .Op Fl C .Op Fl c Ar commit .Op Ar path .Nm .Cm blame .Op Fl C .Op Fl c Ar commit Op Fl r .Op Fl n Ar number .Ar path .Nm .Cm branch .Op Fl Ccopr .Op Fl a Ar date | Fl b Ar date .Op Fl s Ar order .Op Ar glob .Nm | > > > > > > > > > > > < < < < < | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | .Nm .Op Ar command .Op Fl h | -help .Nm .Op Fl h | -help .Op Fl v | -version .Nm .Cm config .Op Fl hu .Op Fl -ls .Op Fl R Ar path .Op Ar setting Op Ar value .Nm .Cm timeline .Op Fl Cz .Op Fl b Ar branch .Op Fl c Ar commit .Op Fl f Ar glob .Op Fl n Ar number .Op Fl R Ar path .Op Fl T Ar tag .Op Fl t Ar type .Op Fl u Ar user .Op Ar path .Nm .Cm diff .Op Fl Ciw .Op Fl R Ar path .Op Fl x Ar number .Op Ar artifact1 Op Ar artifact2 .Op Ar path ... .Nm .Cm tree .Op Fl C .Op Fl c Ar commit .Op Fl R Ar path .Op Ar path .Nm .Cm blame .Op Fl C .Op Fl c Ar commit Op Fl r .Op Fl n Ar number .Op Fl R Ar path .Ar path .Nm .Cm branch .Op Fl Ccopr .Op Fl a Ar date | Fl b Ar date .Op Fl R Ar path .Op Fl s Ar order .Op Ar glob .Nm .Op Ar path .Sh DESCRIPTION .Nm is an interactive read-only browser for .Xr fossil 1 repositories, and supports multiple views to display repository data: |
︙ | ︙ | |||
98 99 100 101 102 103 104 | version that last modified the line. .It Branch view Display navigable list of all repository branches. .El .Pp .Nm provides both global and command-specific options and in-app key | | < > > > > > > > > | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 | version that last modified the line. .It Branch view Display navigable list of all repository branches. .El .Pp .Nm provides both global and command-specific options and in-app key bindings. Global options are as follows: .Bl -tag -width 6v .It Fl h , -help Display program help and usage information then exit. .It Fl R , -repo Ar path Use the .Xr fossil 1 repository database at the specified .Ar path for the current .Nm session. See command specific options for details. .It Fl v , -version Display program version then exit. .El .Pp Note that any global options preceding a command name will be interpreted as the command-specific variant if such an option exists. .Pp |
︙ | ︙ | |||
134 135 136 137 138 139 140 | .El .Pp Commands available to .Nm are as follows: .Bl -tag -width 4v .Tg conf | | | | > > > > > > > > > > > > > > > | > > | | | > > > > > | 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 | .El .Pp Commands available to .Nm are as follows: .Bl -tag -width 4v .Tg conf .It Cm config Oo Fl h | -help Oc Oo Fl -ls Oc Oo Fl R | -repo Ar path Oc \ Oo Ar setting Op Ar value | Fl -unset Oc .Dl Pq aliases: Cm conf , Cm cfg , Cm settings , Cm set Retrieve the current, or set a new, .Ar value for .Ar setting in the local repository. When specified, .Ar value will become the new value for .Ar setting , otherwise .Nm will display the current value of .Ar setting . With no arguments, .Cm fnc config will display a list of all configurable settings. Alternatively, see .Sx ENVIRONMENT for a detailed list of available settings used in the display or processing of data. When no value is found for a given setting in the local repository, environment variables will be searched. If still not found, default values will be used. Unless the .Sy --repo option is used, this command must be executed from within the repository hierarchy; that is, .Nm assumes a local checkout is open in or above the current working directory. Options for .Cm fnc config are as follows: .Bl -tag -width Ds .It Fl h , -help Display config command help and usage information then exit. .It Fl -ls List all currently defined settings. .It Fl R , -repo Ar path Use the .Xr fossil 1 repository database at the specified .Ar path for the current .Cm fnc config invocation. .It Fl u , -unset Clear the specified .Ar setting. .El .Tg log .It Cm timeline Oo Fl C | -no-colour Oc Oo Fl T | -tag Ar tag Oc \ Oo Fl b | -branch Ar branch Oc Oo Fl c | -commit Ar commit Oc \ Oo Fl f | -filter Ar glob Oc Oo Fl h | -help Oc Oo Fl n | -limit Ar n Oc \ Oo Fl R | -repo Ar path Oc Oo Fl t | -type Ar type Oc \ Oo Fl u | -username Ar user Oc Oo Fl z | -utc Oc \ Op Ar path .Dl Pq aliases: Cm log , Cm tl , Cm time , Cm ti Display commit history of a repository. If .Ar path is specified, only commits that modified the file(s) at this path will populate the timeline. The .Ar path may be absolute, relative to the current working directory, or relative to the repository root. Unless the .Sy --repo option is used, this command must be executed from within the repository hierarchy; that is, .Nm assumes a local checkout is open in or above the current working directory. .Pp If no command is explicitly specified, this command will be executed by default. .Pp Options for .Cm fnc timeline are as follows: .Bl -tag -width Ds .It Fl b , -branch Ar branch Display commits that are members of the specified .Ar branch . The expected argument is a glob of the symbolic name of a branch, with the most recent branch to match being selected. Pattern matching is case-insensitive unless .Ar branch has at least one uppercase character, in which case the search will be case-sensitive. By default, .Nm will display all commits irrespective of the branch on which they reside. .It Fl C , -no-colour Disable colourised timeline, which is enabled by default on supported terminals. If this option is not used, colour can be toggled with the .Sy c |
︙ | ︙ | |||
223 224 225 226 227 228 229 | will open the timeline to the latest leaf on the repository tree. For a complete list of valid arguments this option accepts, see .Lk https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki \ "Fossil's Check-in Names". .It Fl f , -filter Ar glob Filter timeline by commits containing .Ar glob | | < | | < < > | > > > > > > > > > > > > > > > > > > > > > > > > > | | 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 | will open the timeline to the latest leaf on the repository tree. For a complete list of valid arguments this option accepts, see .Lk https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki \ "Fossil's Check-in Names". .It Fl f , -filter Ar glob Filter timeline by commits containing .Ar glob in any of the commit comment, user, or branch fields. Pattern matching is case-insensitive unless .Ar glob has at least one uppercase character, in which case the search will be case-sensitive. Filtering can also be performed in-session with the .Sy F timeline view key binding as documented below. .It Fl h , -help Display timeline command help and usage information then exit. .It Fl n , -limit Ar n Limit timeline to the latest .Ar n commits. By default, .Nm will load the entire history of the repository's local checkout. Negative values are a no-op. .It Fl R , -repo Ar path Use the .Xr fossil 1 repository database at the specified .Ar path for the current .Cm fnc timeline invocation. When this option is used, the checkout-related Fossil special tags .Qq current , .Qq prev , and .Qq next are invalid arguments to the .Sy --commit option. When .Sy --commit is not specified, .Nm will default to populating the timeline from the latest commit. .It Fl T , -tag Ar tag Only display commits with T cards containing .Ar tag . The expected argument is a glob of a commit manifest's T card argument, with the most recent tag to match being selected. Pattern matching is case-insensitive unless .Ar tag has at least one uppercase character, in which case the search will be case-sensitive. By default, .Nm will indiscriminately display all commits irrespective of which T cards are attached to the commit manifest. .It Fl t , -type Ar type Only display .Ar type commits. Valid |
︙ | ︙ | |||
277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 | .Nm .Cm timeline .Cm -t e -t t Ns ). .It Fl u , -username Ar user Only display commits authored by .Ar user . .It Fl z , -utc Use Coordinated Universal Time (UTC) rather than local time when displaying commit dates and timestamps. .El .Pp Key bindings for .Cm fnc timeline are as follows: .Bl -tag -width Ds .It Cm Arrow-down, j, >, \&. Move selection cursor down the timeline. .It Cm Arrow-up, k, <, \&, Move selection cursor up the timeline. .It Cm C-f, Page-down | > > > > | | > > > > | 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 | .Nm .Cm timeline .Cm -t e -t t Ns ). .It Fl u , -username Ar user Only display commits authored by .Ar user . The search is case-insensitive by default unless .Ar user contains at least one uppercase character, in which case the search will be case-sensitive. .It Fl z , -utc Use Coordinated Universal Time (UTC) rather than local time when displaying commit dates and timestamps. .El .Pp Key bindings for .Cm fnc timeline are as follows: .Bl -tag -width Ds .It Cm Arrow-down, j, >, \&. Move selection cursor down the timeline. .It Cm Arrow-up, k, <, \&, Move selection cursor up the timeline. .It Cm C-f, Page-down Scroll timeline view one page downwards in the buffer. .It Cm C-b, Page-up Scroll timeline view one page upwards in the buffer. .It Cm C-d Scroll timeline view half a page downwards in the buffer. .It Cm C-u Scroll timeline view half a page upwards in the buffer. .It Cm G, End Move selection cursor to the last commit on the timeline (i.e., oldest commit in the repository). .It Cm gg, Home Move selection cursor to the first commit on the timeline (i.e., newest commit in the repository). .It Cm Enter, Space |
︙ | ︙ | |||
334 335 336 337 338 339 340 | the timeline is consumed. .It Cm N Find the previous commit that matches the current search term. The search will continue until either a match is found or the latest commit on the timeline is consumed. .El .Tg di | | | | 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 | the timeline is consumed. .It Cm N Find the previous commit that matches the current search term. The search will continue until either a match is found or the latest commit on the timeline is consumed. .El .Tg di .It Cm diff Oo Fl C | -no-colour Oc Oo Fl h | -help Oc Oo Fl i | -invert Oc \ Oo Fl R | -repo Ar path Oc Oo Fl w | -whitespace Oc Oo Fl x | -context Ar n Oc \ Oo Ar artifact1 Oo Ar artifact2 Oc Oc Op Ar path ... .Dl Pq alias: Cm di Display the differences between two repository artifacts, or between the local changes on disk and a given commit. If neither .Ar artifact1 nor .Ar artifact2 |
︙ | ︙ | |||
366 367 368 369 370 371 372 | .Ar artifact1 and .Ar artifact2 must be of the same type, which is expected to be either a symbolic check-in name, tag, (unique abbreviated prefix of) a commit or blob artifact UUID SHA1 or SHA3 hash, or an ISO 8601 formatted date. Both artifact arguments must be supplied when diffing blobs; any following non-option arguments are invalid | | > > > > > > > > > > > > > > > > > > > > > > > > | | > > > > > > > > > > > > > > > > > > > > | | > > > > > > > > > > | | > > | | 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 | .Ar artifact1 and .Ar artifact2 must be of the same type, which is expected to be either a symbolic check-in name, tag, (unique abbreviated prefix of) a commit or blob artifact UUID SHA1 or SHA3 hash, or an ISO 8601 formatted date. Both artifact arguments must be supplied when diffing blobs; any following non-option arguments are invalid and will be ignored. Unless the .Sy --repo option is used, this command must be executed from within the repository hierarchy; that is, .Nm assumes a local checkout is open in or above the current working directory. .Pp Options for .Cm fnc diff are as follows: .Bl -tag -width Ds .It Fl C , -no-colour Disable coloured diff output, which is enabled by default on supported terminals. If this option is not used, colour can be toggled with the .Sy c diff view key binding as documented below. User-defined colours are also supported, see .Sx ENVIRONMENT for details. .It Fl h , -help Display diff command help and usage information then exit. .It Fl i , -invert Invert the difference between artifacts when displaying the diff. .It Fl R , -repo Ar path Use the .Xr fossil 1 repository database at the specified .Ar path for the current .Cm fnc diff invocation. When this option is used, both .Ar artifact1 and .Ar artifact2 are required, and the checkout-related Fossil special tags .Qq current , .Qq prev , and .Qq next are invalid .Sy artifact operands. .It Fl w , -whitespace Ignore whitespace-only changes when displaying the diff. .It Fl x , -context Ar n Set .Ar n context lines to be shown in the diff. By default, 5 context lines are shown. Negative values are a no-op. .El .Pp Key bindings for .Cm fnc diff are as follows: .Bl -tag -width Ds .It Cm Arrow-down, j Move the selection cursor down one line. .It Cm Arrow-up, k Move the selection cursor up one line. .It Cm Arrow-right, l Scroll the view two columns to the right in the buffer. Diff output moves left on the screen. .It Cm Arrow-left, h Scroll the view two columns to the left in the buffer. Diff output moves right on the screen. .It Cm $ Scroll the view right to the end of the longest line in the diff. .It Cm 0 Scroll the view left to the beginning of the line. .It Cm C-e Scroll view one line downwards in the buffer. Diff output moves upwards on the screen. .It Cm C-y Scroll view one line upwards in the buffer. Diff output moves downwards on the screen. .It Cm C-n Navigate to next file in the diff. .It Cm C-p Navigate to previous file in the diff. .It Cm C-f, Page-down, Space Scroll diff view one page downwards in the buffer. .It Cm C-b, Page-up Scroll diff view one page upwards in the buffer. .It Cm C-d Scroll diff view half a page downwards in the buffer. .It Cm C-u Scroll diff view half a page upwards in the buffer. .It Cm G, End Scroll to the end of the view (i.e., last line of diff output). .It Cm gg, Home Scroll to the top of the view (i.e., first line of diff output). .It Cm C-k, K, <, \&, Move up the .Cm timeline to the previous (i.e., newer) commit and display its diff. (Only available if the diff was accessed from the timeline.) .It Cm C-j, J, >, \&. Move down the .Cm timeline to the next (i.e., older) commit and display its diff. (Only available if the diff was accessed from the timeline.) .It Cm \&-, \&_ Decrease the number of context lines shown in diff output. .It Cm \&=, \&+ Increase the number of context lines shown in diff output. .It Cm # Toggle display of diff view line numbers. .It Cm b Open and populate branch view with all repository branches. .It Cm c Toggle coloured diff output. On supported terminals, .Nm will default to displaying changes and diff metadata in colour. .It Cm F Open prompt to enter file number and navigate to that file in the diff. .It Cm i Toggle inversion of diff output. .It Cm L Open prompt to enter line number and navigate to line. .It Cm v Toggle verbosity of diff output. By default, .Nm will display the entire content of newly added or deleted files. .It Cm w Toggle whether whitespace-only changes are ignored when comparing lines in the diff. .It Cm / Prompt to enter a search term to begin searching the diff output for lines matching the pattern provided. The search term is an extended regular expression, which is documented in .Xr re_format 7 . .It Cm n Find the next line that matches the current search term. .It Cm N Find the previous line that matches the current search term. .El .Tg dir .It Cm tree Oo Fl C | -no-colour Oc Oo Fl c | -commit Ar commit Oc \ Oo Fl h | -help Oc Oo Fl R | -repo Ar path Oc Op Ar path .Dl Pq aliases: Cm dir , Cm tr Display navigable, hierarchical tree of a repository. If a .Ar path is specified, display tree nodes of this path. The .Ar path may be absolute, relative to the current working directory, or relative to the repository root. With no options passed, the tree will reflect the state of the latest commit on trunk. Unless the .Sy --repo option is used, this command must be executed from within the repository hierarchy; that is, .Nm assumes a local checkout is open in or above the current working directory. .Pp Tree nodes are lexicographically ordered and may be postfixed with an identifier corresponding to the mode of the file object on disk as returned by .Xr lstat 2 : .Bl -column -offset Ds YXZ description |
︙ | ︙ | |||
499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 | to the latest commit on the given branch, or (a unique abbreviated prefix of) a valid commit UUID SHA1 or SHA3 hash. For a complete list of valid arguments this option accepts, see .Lk https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki \ "Fossil's Check-in Names". .It Fl h , -help Display tree command help and usage information then exit. .El .Pp Key bindings for .Cm fnc tree are as follows: .Bl -tag -width Ds .It Cm Enter, Arrow-right, l Enter the currently selected directory, or open a .Cm blame view of the currently selected file. .It Cm Backspace, Arrow-left, h Move up a level to the parent directory. This is a no-op when in the root tree. .It Cm Arrow-down, j Move selection cursor one node down the tree. .It Cm Arrow-up, k Move selection cursor one node up the tree. | > > > > > > > > > > > > > > > > > > > > | | | | > > > > < < | | > > | | 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 | to the latest commit on the given branch, or (a unique abbreviated prefix of) a valid commit UUID SHA1 or SHA3 hash. For a complete list of valid arguments this option accepts, see .Lk https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki \ "Fossil's Check-in Names". .It Fl h , -help Display tree command help and usage information then exit. .It Fl R , -repo Ar path Use the .Xr fossil 1 repository database at the specified .Ar path for the current .Cm fnc tree invocation. When this option is used, the checkout-related Fossil special tags .Qq current , .Qq prev , and .Qq next are invalid arguments to the .Sy --commit option. .El .Pp Key bindings for .Cm fnc tree are as follows: .Bl -tag -width Ds .It Cm Enter, Arrow-right, l Enter the currently selected directory, or open a .Cm blame view of the currently selected file. .It Cm Backspace, Arrow-left, h Move up a level to the parent directory. This is a no-op when in the root tree. .It Cm Arrow-down, j Move selection cursor one node down the tree. .It Cm Arrow-up, k Move selection cursor one node up the tree. .It Cm C-f, Page-down Scroll tree view one page downwards in the buffer. .It Cm C-b, Page-up Scroll tree view one page upwards in the buffer. .It Cm C-d Scroll tree view half a page downwards in the buffer. .It Cm C-u Scroll tree view half a page upwards in the buffer. .It Cm Home, gg Move selection cursor to the first node in the tree. .It Cm End, G Move selection cursor to the last node in the tree. .It Cm b Open and populate branch view with all repository branches. .It Cm c Toggle coloured output. On supported terminals, .Nm will default to displaying the tree in colour. .It Cm d Toggle ISO8601 modified timestamp display for each tree entry. .It Cm i Toggle SHA hash UUID display for all file nodes displayed in the tree. .It Cm t Open .Cm timeline view for the currently selected tree node. This will display the timeline of all commits that involve the versioned file(s) corresponding to the selected node. .It Cm / Prompt to enter a search term to begin searching the tree for nodes matching the entered pattern. The search term is an extended regular expression, as documented in .Xr re_format 7 , and is matched against the path of each tree node. .It Cm n Find the next tree node that matches the current search pattern. .It Cm N Find the previous tree node that matches the current search pattern. .El .Tg praise .It Cm blame Oo Fl C | -no-colour Oc \ Oo Fl c | -commit Ar commit Oo Fl r | -reverse Oc Oc Oo Fl h | -help Oc \ Oo Fl n | -limit Ar n Oc Oo Fl R | -repo Ar path Oc Ar path .Dl Pq aliases: Cm praise , Cm annotate , Cm bl , Cm pr , Cm an Show commit attribution history for each line of the file at the specified .Ar path , which may be absolute, relative to the current working directory, or relative to the repository root. Unless the .Sy --repo option is used, this command must be executed from within the repository hierarchy; that is, .Nm assumes a local checkout is open in or above the current working directory. .Pp Options for .Cm fnc blame are as follows: .Bl -tag -width Ds |
︙ | ︙ | |||
601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 | .Nm will traverse either as many commits as specified, or as possible in the specified time limit. By default, .Nm will traverse the entire historical record of the file, which can be expensive for large files that span many commits. Use this option for a faster, more targeted annotation. .It Fl r , -reverse Reverse annotate the file starting from a historical commit and move forward in time. That is, rather than show the most recent change to each line, show the first time each line was modified by a subsequent commit after the specified .Ar commit . (Requires \fB\-c\fP|\fB\-\-commit\fP.) .El .Pp Key bindings for .Cm fnc blame are as follows: .Bl -tag -width Ds .It Cm Arrow-down, j Move selection cursor down one line. .It Cm Arrow-up, k Move selection cursor up one line. | > > > > > > > > > > > > > > > > > > > > > > > > > > | < > | > > > > | > > > > > > > > < < < < < < < > > > > > > > | | | | | | | | | > > | < < | | | 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 | .Nm will traverse either as many commits as specified, or as possible in the specified time limit. By default, .Nm will traverse the entire historical record of the file, which can be expensive for large files that span many commits. Use this option for a faster, more targeted annotation. .It Fl R , -repo Ar path Use the .Xr fossil 1 repository database at the specified .Ar path for the current .Cm fnc blame invocation. When this option is used, the checkout-related Fossil special tags .Qq current , .Qq prev , and .Qq next are invalid arguments to the .Sy --commit option. When .Sy --commit is not specified, .Nm will default to blaming the version of the file found in the latest commit. .It Fl r , -reverse Reverse annotate the file starting from a historical commit and move forward in time. That is, rather than show the most recent change to each line, show the first time each line was modified by a subsequent commit after the specified .Ar commit . (Requires \fB\-c\fP|\fB\-\-commit\fP.) .El .Pp Key bindings for .Cm fnc blame are as follows: .Bl -tag -width Ds .It Cm Arrow-down, j Move selection cursor down one line. .It Cm Arrow-up, k Move selection cursor up one line. .It Cm Arrow-right, l Scroll the view two columns to the right in the buffer. File output moves left on the screen. .It Cm Arrow-left, h Scroll the view two columns to the left in the buffer. File output moves right on the screen. .It Cm $ Scroll the view right to the end of the longest line in the file. .It Cm 0 Scroll the view left to the beginning of the line. .It Cm C-f, Page-down Scroll blame view one page downwards in the buffer. .It Cm C-b, Page-up Scroll blame view one page upwards in the buffer. .It Cm C-d Scroll blame view half a page downwards in the buffer. .It Cm C-u Scroll blame view half a page upwards in the buffer. .It Cm Home, gg Move selection cursor to the first line in the file. .It Cm End, G Move selection cursor to the last line in the file. .It Cm Enter Display the .Cm diff of the commit corresponding to the currently selected line. .It Cm # Toggle display of file line numbers. .It Cm B, Backspace Reload the previous blamed version of the file. .It Cm b Blame the version of the file corresponding to the commit in the currently selected line. .It Cm c Toggle coloured output. On supported terminals, .Nm will default to displaying the blamed file in colour. .It Cm L Open prompt to enter line number and navigate to line. .It Cm p Blame the version of the file corresponding to the parent of the commit in the currently selected line. .It Cm T Open and populate branch view with all repository branches. .It Cm / Prompt to enter a search term to begin searching the file for tokens matching the entered pattern. The search term is an extended regular expression, as documented in .Xr re_format 7 . .It Cm N Find the previous token that matches the current search pattern. .It Cm n Find the next token that matches the current search pattern. .El .Tg tag .It Cm branch Oo Fl C | -no-colour Oc Oo Fl -after Ar date | \ Fl -before Ar date Oc Oo Fl h | -help Oc Oo Fl -open | Fl -closed Oc \ Oo Fl p | -no-private Oc Oo Fl R | -repo Ar path Oc Oo Fl r | -reverse Oc \ Oo Fl s | -sort Ar order Oc Op Ar glob .Dl Pq aliases: Cm tag , Cm br Display navigable list of repository branches. If .Ar glob is specified, only display branches matching the pattern provided. Pattern matching is case-insensitive unless .Ar glob contains at least one uppercase character, in which case the search will be case-sensitive. Unless the .Sy --repo option is used, this command must be executed from within the repository hierarchy; that is, .Nm assumes a local checkout is open in or above the current working directory. .Pp Branches are lexicographically ordered by default, and are prefixed with an identifier corresponding to the branch state (i.e., open/closed). The current and private branches are additionally annotated with a postfixed identifier: |
︙ | ︙ | |||
692 693 694 695 696 697 698 | .Pp Options for .Cm fnc branch are as follows: .Bl -tag -width Ds .It Fl a , -after Ar date Display only those branches with activity after the specified | | > > > > > > > > > | > > > > > > > > > > > > > > > > > | 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 | .Pp Options for .Cm fnc branch are as follows: .Bl -tag -width Ds .It Fl a , -after Ar date Display only those branches with activity after the specified .Ar date , which is expected to be either an ISO8601 .Po e.g., .Sy 2020-10-10 .Pc or unambiguous .Sy DD/MM/YYYY or .Sy MM/DD/YYYY formatted date. .It Fl b , -before Ar date Display only those branches with activity before the specified .Ar date , which is expected to be either an ISO8601 .Po e.g., .Sy 2020-10-10 .Pc or unambiguous .Sy DD/MM/YYYY or .Sy MM/DD/YYYY formatted date. .It Fl C , -no-colour Disable coloured output, which is enabled by default on supported terminals. If this option is not used, colour can be toggled with the .Sy c branch view key binding as documented below. User-defined colours are also supported, see .Sx ENVIRONMENT for details. .It Fl c , -close Display only closed branches. .It Fl h , -help Display branch command help and usage information then exit. .It Fl o , -open Display only opened branches. .It Fl p , -no-private Do not show private branches, which are included in the list of displayed branches by default. .It Fl R , -repo Ar path Use the .Xr fossil 1 repository database at the specified .Ar path for the current .Cm fnc branch invocation. .It Fl r , -reverse Reverse the order in which branches are displayed. .It Fl s , -sort Ar order Sort branches by .Ar order . Valid .Ar order |
︙ | ︙ | |||
737 738 739 740 741 742 743 | .Cm fnc branch are as follows: .Bl -tag -width Ds .It Cm Arrow-down, j Move selection cursor down one branch. .It Cm Arrow-up, k Move selection cursor up one branch. | > > > > | < > | < > > > > > > > | 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 | .Cm fnc branch are as follows: .Bl -tag -width Ds .It Cm Arrow-down, j Move selection cursor down one branch. .It Cm Arrow-up, k Move selection cursor up one branch. .It Cm C-f, Page-down Scroll branch view one page downwards in the buffer. .It Cm C-b, Page-up Scroll branch view one page upwards in the buffer. .It Cm C-d Scroll branch view half a page downwards in the buffer. .It Cm C-u Scroll branch view half a page upwards in the buffer. .It Cm Home, gg Move selection cursor to the first branch in the list. .It Cm End, G Move selection cursor to the last branch in the list. .It Cm Enter, Space Display the .Cm timeline of the currently selected branch. .It Cm c Toggle coloured output. On supported terminals, .Nm will default to displaying the branch list in colour. .It Cm d Toggle display of the date on which the branch last received changes. .It Cm i Toggle display of the SHA{1,3} hash that identifies branch, which is the hash of the commit on the tip of said branch. .It Cm s Toggle sort order of currently displayed branches. If branches are ordered lexicographically, .Nm will sort branches in most recently used order, otherwise branches will be sorted by their open/closed state. .It Cm t Open the .Cm tree view of the currently selected branch. .It Cm R, C-l Reload the view with all repository branches, irrespective of which options were used in this |
︙ | ︙ | |||
779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 | .It Cm n Find the next branch that matches the current search pattern. .It Cm N Find the previous branch that matches the current search pattern. .El .El .Sh ENVIRONMENT .Nm displays coloured output by default in supported terminals. Each colour object identified below can be defined by either exporting environment variables .Po e.g., .Cm export FNC_COLOUR_COMMIT=red .Pc , or with .Nm Cm config as documented above. At startup, .Nm will search for user-defined colours in the following order: .Bl -column " environment variables " description -offset Ds .It 1. repository settings Ta Pa repo.fossil .It 3. environment variables Ta Sy shell .El .Pp If none are found, the default colour scheme will be displayed. This enables setting per-project colours to visually distinguish the current repository being viewed, and globally changing the colour scheme for all repositories with | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > | | | 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 | .It Cm n Find the next branch that matches the current search pattern. .It Cm N Find the previous branch that matches the current search pattern. .El .El .Sh ENVIRONMENT Depending on the available screen estate determined by the LINES and COLUMNS environment variables, .Nm will display child views in either a horizontal or vertical split. By default, if COLUMNS is \(>= 120, a child view will open in a vertical split at least 80 columns wide. Otherwise, the child view will open in a horizontal split that is approximately 60% of the terminal height. This behaviour can be customised by configuring the following options as either exported environment variables or with .Nm Cm config as documented above. .Bl -tag -width FNC_VIEW_SPLIT_HEIGHT .It Ev FNC_VIEW_SPLIT_MODE Open child views in a horizontal or vertical split. Value can be one of .Sy auto , .Sy horizontal , or .Sy vertical . Default: .Qq auto . .It Ev FNC_VIEW_SPLIT_HEIGHT Height of the child view when opening in a horizontal split. Valid numeric values are 1 \(<= .Sy n < LINES. Percentage values denoted with a postfixed .Sq % .Po e.g., .Sy 55% .Pc are also valid. Default: .Qq 60% . .It Ev FNC_VIEW_SPLIT_WIDTH Minimum width of the child view when opening in a vertical split. Currently a no-op. Default: .Qq 80 . .El .Pp .Nm displays coloured output by default in supported terminals. Each colour object identified below can be defined by either exporting environment variables .Po e.g., .Cm export FNC_COLOUR_COMMIT=red .Pc , or with .Nm Cm config as documented above. At startup, .Nm will search for user-defined colours in the following order: .Bl -column " environment variables " description -offset Ds .It 1. repository settings Ta Pa repo.fossil .It 3. environment variables Ta Sy shell .El .Pp If none are found, the default colour scheme will be displayed. This enables setting per-project colours to visually distinguish the current repository being viewed, and globally changing the colour scheme for all repositories with no local settings configured. Except where documented below, colours supported in .Nm are: .Bl -column "black" "yellow" "magenta" "default" -offset indent-two .It Qo black Qc Ta Qo green Qc Ta Qo blue Qc Ta Qo cyan Qc .It Qo red Qc Ta Qo yellow Qc Ta Qo magenta Qc Ta Qo default Qc .El .Pp Where .Qq default is the current foreground (i.e., text) colour in the terminal. User-definable colour objects displayed in various .Nm |
︙ | ︙ | |||
834 835 836 837 838 839 840 | .Qq magenta . .It Ev FNC_COLOUR_DIFF_PLUS Added lines displayed in the diff view. If not defined, the default value is .Qq cyan . .It Ev FNC_COLOUR_DIFF_CHUNK Chunk header lines .Po e.g., | | | 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 | .Qq magenta . .It Ev FNC_COLOUR_DIFF_PLUS Added lines displayed in the diff view. If not defined, the default value is .Qq cyan . .It Ev FNC_COLOUR_DIFF_CHUNK Chunk header lines .Po e.g., .Li @@ -732,34 +747,40 @@ .Pc displayed in the diff view. If not defined, the default value is .Qq yellow . .It Ev FNC_COLOUR_DIFF_META Metadata displayed in the diff view. If not defined, the default value is .Qq green . .It Ev FNC_COLOUR_DIFF_TAGS |
︙ | ︙ | |||
871 872 873 874 875 876 877 878 879 880 881 882 883 884 | .It Ev FNC_COLOUR_BRANCH_CURRENT The branch corresponding to the current checkout displayed in the branch view. If not defined, the default value is .Qq green . .It Ev FNC_COLOUR_BRANCH_PRIVATE Private branches displayed in the branch view. If not defined, the default value is .Qq yellow . .El .Pp To clear environment variables, issue .Cm unset Ar ENVIRONMENT_VARIABLE in the shell. .Sh EXIT STATUS | > > > > > > > > > > > > | 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 | .It Ev FNC_COLOUR_BRANCH_CURRENT The branch corresponding to the current checkout displayed in the branch view. If not defined, the default value is .Qq green . .It Ev FNC_COLOUR_BRANCH_PRIVATE Private branches displayed in the branch view. If not defined, the default value is .Qq yellow . .It Ev FNC_COLOUR_HL_LINE Selected line highlight in the diff view. Value can be one of .Sy auto or .Sy mono . The former will invert the foreground colour of the selected line, while the latter will use a monochromatic highlight. If not defined, the default value is .Qq auto . .It Ev FNC_COLOUR_HL_SEARCH Search term highlight in blame and diff view. If not defined, the default value is .Qq yellow . .El .Pp To clear environment variables, issue .Cm unset Ar ENVIRONMENT_VARIABLE in the shell. .Sh EXIT STATUS |
︙ | ︙ |
Changes to src/fnc.c.
1 | /* | | | 1 2 3 4 5 6 7 8 9 | /* * Copyright (c) 2021, 2022 Mark Jamsek <mark@jamsek.com> * Copyright (c) 2013-2021 Stephan Beal <https://wanderinghorse.net> * Copyright (c) 2020 Stefan Sperling <stsp@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * |
︙ | ︙ | |||
31 32 33 34 35 36 37 38 39 40 41 42 43 44 | # endif # if !defined(_DEFAULT_SOURCE) # define _DEFAULT_SOURCE /* Needed for strsep() on glibc >= 2.19. */ # endif #endif #include <sys/queue.h> #include <sys/ioctl.h> #include <sys/stat.h> #ifdef _WIN32 #include <windows.h> | > > > | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | # endif # if !defined(_DEFAULT_SOURCE) # define _DEFAULT_SOURCE /* Needed for strsep() on glibc >= 2.19. */ # endif #endif #ifdef FCLI_USE_SIGACTION #define FCLI_USE_SIGACTION 0 /* We want C-c to exit. */ #endif #include <sys/queue.h> #include <sys/ioctl.h> #include <sys/stat.h> #ifdef _WIN32 #include <windows.h> |
︙ | ︙ | |||
67 68 69 70 71 72 73 | #include "libfossil.h" #include "settings.h" #define FNC_VERSION VERSION /* cf. Makefile */ /* Utility macros. */ | | | > > | | > > > | | | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 | #include "libfossil.h" #include "settings.h" #define FNC_VERSION VERSION /* cf. Makefile */ /* Utility macros. */ #define MIN(_a, _b) ((_a) < (_b) ? (_a) : (_b)) #define MAX(_a, _b) ((_a) > (_b) ? (_a) : (_b)) #define ABS(_n) ((_n) >= 0 ? (_n) : -(_n)) #if !defined(CTRL) #define CTRL(key) ((key) & 037) /* CTRL+<key> input. */ #endif #define nitems(a) (sizeof((a)) / sizeof((a)[0])) #define ndigits(_d, _n) do { _d++; } while (_n /= 10) #define STRINGIFYOUT(s) #s #define STRINGIFY(s) STRINGIFYOUT(s) #define CONCATOUT(a, b) a ## b #define CONCAT(a, b) CONCATOUT(a, b) #define FILE_POSITION __FILE__ ":" STRINGIFY(__LINE__) #define FLAG_SET(f, b) ((f) |= (b)) #define FLAG_CHK(f, b) ((f) & (b)) #define FLAG_TOG(f, b) ((f) ^= (b)) #define FLAG_CLR(f, b) ((f) &= ~(b)) /* Application macros. */ #define PRINT_VERSION STRINGIFY(FNC_VERSION) #define DEF_DIFF_CTX 5 /* Default diff context lines. */ #define MAX_DIFF_CTX 64 /* Max diff context lines. */ #define HSPLIT_SCALE 0.4 /* Default horizontal split scale. */ #define SPIN_INTERVAL 200 /* Status line progress indicator. */ #define LINENO_WIDTH 6 /* View lineno max column width. */ #define MAX_PCT_LEN 7 /* Line position upto max len 99.99% */ #define SPINNER "\\|/-\0" #define NULL_DEVICE "/dev/null" #define NULL_DEVICELEN (sizeof(NULL_DEVICE) - 1) #define KEY_ESCAPE 27 #if DEBUG #define RC(r, fmt, ...) fcli_err_set(r, "%s::%s " fmt, \ __func__, FILE_POSITION, __VA_ARGS__) #else #define RC(r, fmt, ...) fcli_err_set(r, fmt, __VA_ARGS__) #endif /* DEBUG */ /* Portability macros. */ #ifndef __OpenBSD__ #ifndef HAVE_STRTONUM # define strtonum(s, min, max, o) strtol(s, (char **)o, 10) # endif /* HAVE_STRTONUM */ #endif #ifndef __dead #define __dead __attribute__((noreturn)) #endif #ifndef TAILQ_FOREACH_SAFE /* Rewrite of OpenBSD 6.9 sys/queue.h for Linux builds. */ #define TAILQ_FOREACH_SAFE(var, head, field, tmp) \ for ((var) = ((head)->tqh_first); \ (var) != (NULL) && ((tmp) = TAILQ_NEXT(var, field), 1); \ |
︙ | ︙ | |||
172 173 174 175 176 177 178 | /* Timeline options. */ struct artifact_types { const char **values; short nitems; } filter_types; /* Only load commits of <type>. */ union { const char *zlimit; | | | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 | /* Timeline options. */ struct artifact_types { const char **values; short nitems; } filter_types; /* Only load commits of <type>. */ union { const char *zlimit; long limit; } nrecords; /* Number of commits to load. */ const char *filter_tag; /* Only load commits with <tag>. */ const char *filter_branch; /* Only load commits from <branch>. */ const char *filter_user; /* Only load commits from <user>. */ const char *filter_type; /* Placeholder for repeatable types. */ const char *glob; /* Only load commits containing glob */ bool utc; /* Display UTC sans user local time. */ |
︙ | ︙ | |||
204 205 206 207 208 209 210 | bool lsconf; /* List all defined settings. */ bool unset; /* Unset the specified setting. */ /* Command line flags and help. */ fcli_help_info fnc_help; /* Global help. */ fcli_cliflag cliflags_global[3]; /* Global options. */ fcli_command cmd_args[7]; /* App commands. */ | | | | | | | | 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 | bool lsconf; /* List all defined settings. */ bool unset; /* Unset the specified setting. */ /* Command line flags and help. */ fcli_help_info fnc_help; /* Global help. */ fcli_cliflag cliflags_global[3]; /* Global options. */ fcli_command cmd_args[7]; /* App commands. */ fcli_cliflag cliflags_timeline[13]; /* Timeline options. */ fcli_cliflag cliflags_diff[8]; /* Diff options. */ fcli_cliflag cliflags_tree[5]; /* Tree options. */ fcli_cliflag cliflags_blame[7]; /* Blame options. */ fcli_cliflag cliflags_branch[11]; /* Branch options. */ fcli_cliflag cliflags_config[5]; /* Config options. */ } fnc_init = { NULL, /* cmdarg copy of argv[1] to aid usage/error report. */ NULL, /* sym(bolic name) of commit to open defaults to tip. */ NULL, /* path for tree to open or timeline to find commits. */ 0, /* err fnc error state. */ false, /* hflag if --help is requested. */ false, /* vflag if --version is requested. */ |
︙ | ︙ | |||
276 277 278 279 280 281 282 283 284 285 286 | {"config", "conf\0cfg\0settings\0set\0", "Configure or view currently available settings.", cmd_config, usage_config, fnc_init.cliflags_config}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel. */ }, { /* cliflags_timeline timeline command related options. */ FCLI_FLAG_BOOL("C", "no-colour", &fnc_init.nocolour, "Disable colourised timeline, which is enabled by default on\n " "supported terminals. Colour can also be toggled with the 'c' " "\n key binding in timeline view when this option is not used."), | > > < < < < > > > > > | 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 | {"config", "conf\0cfg\0settings\0set\0", "Configure or view currently available settings.", cmd_config, usage_config, fnc_init.cliflags_config}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel. */ }, { /* cliflags_timeline timeline command related options. */ FCLI_FLAG("b", "branch", "<branch>", &fnc_init.filter_branch, "Only display commits that reside on the given <branch>."), FCLI_FLAG_BOOL("C", "no-colour", &fnc_init.nocolour, "Disable colourised timeline, which is enabled by default on\n " "supported terminals. Colour can also be toggled with the 'c' " "\n key binding in timeline view when this option is not used."), FCLI_FLAG("c", "commit", "<commit>", &fnc_init.sym, "Open the timeline from <commit>. Common symbols are:\n" "\tSHA{1,3} hash\n" "\tSHA{1,3} unique prefix\n" "\tbranch\n" "\ttag:TAG\n" "\troot:BRANCH\n" "\tISO8601 date\n" "\tISO8601 timestamp\n" "\t{tip,current,prev,next}\n " "For a complete list of symbols see Fossil's Check-in Names:\n " "https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki"), FCLI_FLAG_CSTR("f", "filter", "<glob>", &fnc_init.glob, "Populate the timeline with commits containing <glob> in the commit" "\n comment, user, or branch field."), FCLI_FLAG_BOOL("h", "help", NULL, "Display timeline command help and usage."), FCLI_FLAG("n", "limit", "<n>", &fnc_init.nrecords.zlimit, "Limit display to <n> latest commits; defaults to entire history " "of\n current checkout. Negative values are a no-op."), FCLI_FLAG_CSTR("R", "repo", "<path>", NULL, "Use the fossil(1) repository located at <path> for this timeline\n" " invocation."), FCLI_FLAG("T", "tag", "<tag>", &fnc_init.filter_tag, "Only display commits with T cards containing <tag>."), FCLI_FLAG_X("t", "type", "<type>", &fnc_init.filter_type, fcli_flag_type_arg_cb, "Only display <type> commits. Valid types are:\n" "\tci - check-in\n" "\tw - wiki\n" "\tt - ticket\n" "\te - technote\n" |
︙ | ︙ | |||
335 336 337 338 339 340 341 342 343 344 345 346 347 348 | FCLI_FLAG_BOOL("i", "invert", &fnc_init.invert, "Invert difference between artifacts. Inversion can also be " "toggled\n with the 'i' key binding in diff view."), FCLI_FLAG_BOOL("q", "quiet", &fnc_init.quiet, "Disable verbose diff output; that is, do not output complete" " content\n of newly added or deleted files. Verbosity can also" " be toggled with\n the 'v' key binding in diff view."), FCLI_FLAG_BOOL("w", "whitespace", &fnc_init.ws, "Ignore whitespace-only changes when displaying diff. This option " "can\n also be toggled with the 'w' key binding in diff view."), FCLI_FLAG("x", "context", "<n>", &fnc_init.context, "Show <n> context lines when displaying diff; <n> is capped at 64." "\n Negative values are a no-op."), fcli_cliflag_empty_m | > > > | 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 | FCLI_FLAG_BOOL("i", "invert", &fnc_init.invert, "Invert difference between artifacts. Inversion can also be " "toggled\n with the 'i' key binding in diff view."), FCLI_FLAG_BOOL("q", "quiet", &fnc_init.quiet, "Disable verbose diff output; that is, do not output complete" " content\n of newly added or deleted files. Verbosity can also" " be toggled with\n the 'v' key binding in diff view."), FCLI_FLAG_CSTR("R", "repo", "<path>", NULL, "Use the fossil(1) repository located at <path> for this diff\n " "invocation."), FCLI_FLAG_BOOL("w", "whitespace", &fnc_init.ws, "Ignore whitespace-only changes when displaying diff. This option " "can\n also be toggled with the 'w' key binding in diff view."), FCLI_FLAG("x", "context", "<n>", &fnc_init.context, "Show <n> context lines when displaying diff; <n> is capped at 64." "\n Negative values are a no-op."), fcli_cliflag_empty_m |
︙ | ︙ | |||
364 365 366 367 368 369 370 371 372 373 374 375 376 377 | "\tISO8601 date\n" "\tISO8601 timestamp\n" "\t{tip,current,prev,next}\n " "For a complete list of symbols see Fossil's Check-in Names:\n " "https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki"), FCLI_FLAG_BOOL("h", "help", NULL, "Display tree command help and usage."), fcli_cliflag_empty_m }, /* End cliflags_tree. */ { /* cliflags_blame blame command related options. */ FCLI_FLAG_BOOL("C", "no-colour", &fnc_init.nocolour, "Disable coloured output, which is enabled by default on supported" "\n terminals. Colour can also be toggled with the 'c' key " | > > > | 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 | "\tISO8601 date\n" "\tISO8601 timestamp\n" "\t{tip,current,prev,next}\n " "For a complete list of symbols see Fossil's Check-in Names:\n " "https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki"), FCLI_FLAG_BOOL("h", "help", NULL, "Display tree command help and usage."), FCLI_FLAG_CSTR("R", "repo", "<path>", NULL, "Use the fossil(1) repository located at <path> for this tree\n " "invocation."), fcli_cliflag_empty_m }, /* End cliflags_tree. */ { /* cliflags_blame blame command related options. */ FCLI_FLAG_BOOL("C", "no-colour", &fnc_init.nocolour, "Disable coloured output, which is enabled by default on supported" "\n terminals. Colour can also be toggled with the 'c' key " |
︙ | ︙ | |||
391 392 393 394 395 396 397 398 399 400 401 402 403 404 | FCLI_FLAG_BOOL("h", "help", NULL, "Display blame command help and usage."), FCLI_FLAG("n", "limit", "<n>", &fnc_init.nrecords.zlimit, "Limit depth of blame history to <n> commits or seconds. Denote the" "\n latter by postfixing 's' (e.g., 30s). Useful for large files" " with\n extensive history. Persists for the duration of the " "session."), FCLI_FLAG_BOOL("r", "reverse", &fnc_init.reverse, "Reverse annotate the file starting from a historical commit. " "Rather\n than show the most recent change of each line, show " "the first time\n each line was modified after the specified " "commit. Requires -c|--commit."), fcli_cliflag_empty_m }, /* End cliflags_blame. */ | > > > | 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 | FCLI_FLAG_BOOL("h", "help", NULL, "Display blame command help and usage."), FCLI_FLAG("n", "limit", "<n>", &fnc_init.nrecords.zlimit, "Limit depth of blame history to <n> commits or seconds. Denote the" "\n latter by postfixing 's' (e.g., 30s). Useful for large files" " with\n extensive history. Persists for the duration of the " "session."), FCLI_FLAG_CSTR("R", "repo", "<path>", NULL, "Use the fossil(1) repository located at <path> for this blame\n" " invocation."), FCLI_FLAG_BOOL("r", "reverse", &fnc_init.reverse, "Reverse annotate the file starting from a historical commit. " "Rather\n than show the most recent change of each line, show " "the first time\n each line was modified after the specified " "commit. Requires -c|--commit."), fcli_cliflag_empty_m }, /* End cliflags_blame. */ |
︙ | ︙ | |||
423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 | "Display branch command help and usage."), FCLI_FLAG_BOOL("o", "open", &fnc_init.open, "Show open branches only. Open and closed branches are listed by " "\n default."), FCLI_FLAG_BOOL("p", "no-private", &fnc_init.noprivate, "Do not show private branches, which are otherwise included in the" "\n list of displayed branches by default."), FCLI_FLAG_BOOL("r", "reverse", &fnc_init.reverse, "Reverse the order in which branches are displayed."), FCLI_FLAG("s", "sort", "<order>", &fnc_init.sort, "Sort branches by <order>. Available options are:\n" "\tmru - most recently used\n" "\tstate - open/closed state\n " "Branches are sorted in lexicographical order by default."), fcli_cliflag_empty_m }, /* End cliflags_blame. */ { /* cliflags_config config command related options. */ FCLI_FLAG_BOOL("h", "help", NULL, "Display config command help and usage."), FCLI_FLAG_BOOL(NULL, "ls", &fnc_init.lsconf, "Display a list of all currently defined settings."), FCLI_FLAG_BOOL("u", "unset", &fnc_init.unset, "Unset (i.e., remove) the specified repository setting."), fcli_cliflag_empty_m }, /* End cliflags_tree. */ }; enum date_string { ISO8601_DATE_ONLY = 10, ISO8601_TIMESTAMP = 20 }; enum fnc_view_id { FNC_VIEW_TIMELINE, FNC_VIEW_DIFF, FNC_VIEW_TREE, | > > > > > > > | 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 | "Display branch command help and usage."), FCLI_FLAG_BOOL("o", "open", &fnc_init.open, "Show open branches only. Open and closed branches are listed by " "\n default."), FCLI_FLAG_BOOL("p", "no-private", &fnc_init.noprivate, "Do not show private branches, which are otherwise included in the" "\n list of displayed branches by default."), FCLI_FLAG_CSTR("R", "repo", "<path>", NULL, "Use the fossil(1) repository located at <path> for this branch\n" " invocation."), FCLI_FLAG_BOOL("r", "reverse", &fnc_init.reverse, "Reverse the order in which branches are displayed."), FCLI_FLAG("s", "sort", "<order>", &fnc_init.sort, "Sort branches by <order>. Available options are:\n" "\tmru - most recently used\n" "\tstate - open/closed state\n " "Branches are sorted in lexicographical order by default."), fcli_cliflag_empty_m }, /* End cliflags_blame. */ { /* cliflags_config config command related options. */ FCLI_FLAG_BOOL("h", "help", NULL, "Display config command help and usage."), FCLI_FLAG_BOOL(NULL, "ls", &fnc_init.lsconf, "Display a list of all currently defined settings."), FCLI_FLAG_CSTR("R", "repo", "<path>", NULL, "Use the fossil(1) repository located at <path> for this config\n" " invocation."), FCLI_FLAG_BOOL("u", "unset", &fnc_init.unset, "Unset (i.e., remove) the specified repository setting."), fcli_cliflag_empty_m }, /* End cliflags_tree. */ }; enum date_string { ISO8601_DATE_ONLY = 10, ISO8601_DATE_HHMM = 16, ISO8601_TIMESTAMP = 20 }; enum fnc_view_id { FNC_VIEW_TIMELINE, FNC_VIEW_DIFF, FNC_VIEW_TREE, |
︙ | ︙ | |||
472 473 474 475 476 477 478 | SEARCH_WAITING, SEARCH_CONTINUE, SEARCH_COMPLETE, SEARCH_NO_MATCH, SEARCH_FOR_END }; | < < < < < < < < < < < < < < < < < < < < < > > > > > > > > > | 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 | SEARCH_WAITING, SEARCH_CONTINUE, SEARCH_COMPLETE, SEARCH_NO_MATCH, SEARCH_FOR_END }; enum fnc_diff_type { FNC_DIFF_CKOUT, FNC_DIFF_COMMIT, FNC_DIFF_BLOB, FNC_DIFF_WIKI }; struct input { void *data; char *prompt; enum input_type type; bool clear; char buf[BUFSIZ]; long ret; }; struct fnc_colour { STAILQ_ENTRY(fnc_colour) entries; regex_t regex; uint8_t scheme; }; STAILQ_HEAD(fnc_colours, fnc_colour); |
︙ | ︙ | |||
618 619 620 621 622 623 624 | int ncommits_needed; /* * XXX Is there a more elegant solution to retrieving return codes from * thread functions while pinging between, but before we join, threads? */ int rc; bool endjmp; | | | > | > > > > > > > > > > > > | > > > > > | 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 | int ncommits_needed; /* * XXX Is there a more elegant solution to retrieving return codes from * thread functions while pinging between, but before we join, threads? */ int rc; bool endjmp; bool eotl; bool reset; sig_atomic_t *quit; pthread_cond_t commit_consumer; pthread_cond_t commit_producer; }; struct fnc_tl_view_state { struct fnc_tl_thread_cx thread_cx; struct commit_queue commits; struct commit_entry *first_commit_onscreen; struct commit_entry *last_commit_onscreen; struct commit_entry *selected_commit; struct commit_entry *matched_commit; struct commit_entry *search_commit; struct fnc_colours colours; const char *curr_ckout_uuid; const char *glob; /* Match commits containing glob. */ char *path; /* Match commits involving path. */ int selected_idx; int nscrolled; sig_atomic_t quit; pthread_t thread_id; bool colour; }; struct fnc_pathlist_entry { TAILQ_ENTRY(fnc_pathlist_entry) entry; const char *path; size_t pathlen; void *data; /* XXX May want to save id, mode, etc. */ }; TAILQ_HEAD(fnc_pathlist_head, fnc_pathlist_entry); struct index { size_t *lineno; off_t *offset; uint32_t n; uint32_t idx; }; struct fnc_diff_view_state { struct fnc_view *timeline_view; struct fnc_commit_artifact *selected_commit; struct fnc_pathlist_head *paths; fsl_buffer buf; struct fnc_colours colours; struct index index; FILE *f; fsl_uuid_str id1; fsl_uuid_str id2; int first_line_onscreen; int last_line_onscreen; int diff_flags; int context; int sbs; int matched_line; int selected_line; int maxx; int lineno; int gtl; size_t ncols; size_t nlines; enum line_attr sline; off_t *line_offsets; bool eof; bool colour; bool showmeta; bool showln; }; TAILQ_HEAD(fnc_parent_trees, fnc_parent_tree); struct fnc_tree_view_state { /* Parent trees of the- */ struct fnc_parent_trees parents; /* -current subtree. */ struct fnc_repository_tree *repo; /* The repository tree. */ struct fnc_tree_object *root; /* Top level repo tree. */ struct fnc_tree_object *tree; /* Currently displayed tree */ struct fnc_tree_entry *first_entry_onscreen; struct fnc_tree_entry *last_entry_onscreen; struct fnc_tree_entry *selected_entry; struct fnc_tree_entry *matched_entry; struct fnc_colours colours; char *tree_label; /* Headline string. */ fsl_uuid_str commit_id; fsl_id_t rid; int ndisplayed; int selected_idx; bool colour; bool show_id; bool show_date; }; struct fnc_blame_line { fsl_uuid_str id; unsigned int lineno; bool annotated; }; struct fnc_blame_cb_cx { struct fnc_view *view; struct fnc_blame_line *lines; fsl_uuid_str commit_id; fsl_uuid_str root_commit; int nlines; uint32_t maxlen; bool *quit; }; typedef int (*fnc_cancel_cb)(void *); struct fnc_blame_thread_cx { struct fnc_blame_cb_cx *cb_cx; |
︙ | ︙ | |||
751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 | fsl_uuid_str commit_id; char *path; int first_line_onscreen; int last_line_onscreen; int selected_line; int matched_line; int spin_idx; bool done; bool blame_complete; bool eof; bool colour; }; struct fnc_branch { char *name; char *date; fsl_uuid_str id; bool private; | > > > | 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 | fsl_uuid_str commit_id; char *path; int first_line_onscreen; int last_line_onscreen; int selected_line; int matched_line; int spin_idx; int gtl; uint32_t *maxx; bool done; bool blame_complete; bool eof; bool colour; bool showln; }; struct fnc_branch { char *name; char *date; fsl_uuid_str id; bool private; |
︙ | ︙ | |||
799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 | int ndisplayed; int selected; int when; bool colour; bool show_date; bool show_id; }; TAILQ_HEAD(view_tailhead, fnc_view); struct fnc_view { TAILQ_ENTRY(fnc_view) entries; WINDOW *window; PANEL *panel; struct fnc_view *parent; struct fnc_view *child; union { struct fnc_diff_view_state diff; struct fnc_tl_view_state timeline; struct fnc_tree_view_state tree; struct fnc_blame_view_state blame; struct fnc_branch_view_state branch; } state; enum fnc_view_id vid; enum fnc_search_state search_status; enum fnc_search_mvmnt searching; | > > > > > > > > > > > > > > > > | | | | | | > | > > > > > > > > > > > > > > > | < | | | < | < | > | > > | > | | | < | | | > > | | > > > > | | | | > > | | < < < | < | > > | | > > > | > > > > > > > > > | < | < > > | | | | 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 | int ndisplayed; int selected; int when; bool colour; bool show_date; bool show_id; }; struct line { char buf[BUFSIZ]; int sz; enum line_type type; bool selected; }; struct position { int col; int line; int offset; }; TAILQ_HEAD(view_tailhead, fnc_view); struct fnc_view { TAILQ_ENTRY(fnc_view) entries; WINDOW *window; PANEL *panel; struct fnc_view *parent; struct fnc_view *child; struct line line; struct position pos; union { struct fnc_diff_view_state diff; struct fnc_tl_view_state timeline; struct fnc_tree_view_state tree; struct fnc_blame_view_state blame; struct fnc_branch_view_state branch; } state; enum fnc_view_id vid; enum view_mode mode; enum fnc_search_state search_status; enum fnc_search_mvmnt searching; int nlines; /* Dependent on split height. */ int ncols; /* Dependent on split width. */ int start_ln; int start_col; int lines; /* Always curses LINES macro */ int cols; /* Always curses COLS macro. */ bool focus_child; bool active; /* Only 1 parent or child at a time. */ bool egress; bool started_search; regex_t regex; regmatch_t regmatch; int (*show)(struct fnc_view *); int (*input)(struct fnc_view **, struct fnc_view *, int); int (*close)(struct fnc_view *); void (*grep_init)(struct fnc_view *); int (*grep)(struct fnc_view *); }; static volatile sig_atomic_t rec_sigwinch; static volatile sig_atomic_t rec_sigpipe; static volatile sig_atomic_t rec_sigcont; static void fnc_show_version(void); static int init_curses(void); static int fnc_set_signals(void); static struct fnc_view *view_open(int, int, int, int, enum fnc_view_id); static int open_timeline_view(struct fnc_view *, fsl_id_t, const char *, const char *); static int view_loop(struct fnc_view *); static int show_timeline_view(struct fnc_view *); static void *tl_producer_thread(void *); static int block_main_thread_signals(void); static int build_commits(struct fnc_tl_thread_cx *); static int commit_builder(struct fnc_commit_artifact **, fsl_id_t, fsl_stmt *); static int signal_tl_thread(struct fnc_view *, int); static int draw_commits(struct fnc_view *); static void parse_emailaddr_username(char **); static int formatln(wchar_t **, int *, const char *, int, int, size_t, bool); static size_t expand_tab(char *, size_t, const char *, int); static int multibyte_to_wchar(const char *, wchar_t **, size_t *); static int write_commit_line(struct fnc_view *, struct fnc_commit_artifact *, int); static int view_input(struct fnc_view **, int *, struct fnc_view *, struct view_tailhead *); static int cycle_view(struct fnc_view *); static int toggle_fullscreen(struct fnc_view **, struct fnc_view *); static int help(struct fnc_view *); static int padpopup(struct fnc_view *, int, int, FILE *, const char *); static void centerprint(WINDOW *, int, int, int, const char *, chtype); static int tl_input_handler(struct fnc_view **, struct fnc_view *, int); static int move_tl_cursor_down(struct fnc_view *, uint16_t); static void move_tl_cursor_up(struct fnc_view *, uint16_t, bool); static int timeline_scroll_down(struct fnc_view *, int); static void timeline_scroll_up(struct fnc_tl_view_state *, int); static void select_commit(struct fnc_tl_view_state *); static int request_view(struct fnc_view **, struct fnc_view *, enum fnc_view_id); static int init_view(struct fnc_view **, struct fnc_view *, enum fnc_view_id, int, int); static enum view_mode view_get_split(struct fnc_view *, int *, int *); static int split_view(struct fnc_view *, int *); static int offset_selected_line(struct fnc_view *); static int view_split_start_col(int); static int view_split_start_ln(int); static int make_splitscreen(struct fnc_view *); static int make_fullscreen(struct fnc_view *); static int view_search_start(struct fnc_view *); static void tl_grep_init(struct fnc_view *); static int tl_search_next(struct fnc_view *); static bool find_commit_match(struct fnc_commit_artifact *, regex_t *); static int init_diff_view(struct fnc_view **, int, int, struct fnc_commit_artifact *, struct fnc_view *); static int open_diff_view(struct fnc_view *, struct fnc_commit_artifact *, int, bool, bool, bool, struct fnc_view *, bool, struct fnc_pathlist_head *); static void show_diff_status(struct fnc_view *); static int create_diff(struct fnc_diff_view_state *); static int create_changeset(struct fnc_commit_artifact *); static int write_commit_meta(struct fnc_diff_view_state *); static int wrapline(char *, fsl_size_t ncols_avail, struct fnc_diff_view_state *, off_t *); static int add_line_offset(off_t **, size_t *, off_t); static int diff_commit(struct fnc_diff_view_state *); static int diff_checkout(struct fnc_diff_view_state *); static int write_diff_meta(fsl_buffer *, const char *, fsl_uuid_str, const char *, fsl_uuid_str, int, enum fsl_ckout_change_e); static int diff_file(struct fnc_diff_view_state *, fsl_buffer *, const char *, fsl_uuid_str, const char *, enum fsl_ckout_change_e); static int fnc_diff_builder(fsl_dibu **, fsl_uuid_cstr, fsl_uuid_cstr, const char *, const char *, int, int, fsl_buffer *); static void fnc_free_diff_builder(fsl_dibu *); static int diff_non_checkin(fsl_buffer *, struct fnc_commit_artifact *, int, int, int); static int diff_file_artifact(struct fnc_diff_view_state *, fsl_id_t, const fsl_card_F *, const fsl_card_F *, fsl_ckout_change_e); static int show_diff(struct fnc_view *); static int write_diff(struct fnc_view *, char *); static int match_line(const char *, regex_t *, size_t, regmatch_t *); static int draw_matched_line(struct fnc_view *, int *, int, regmatch_t *, attr_t); static void drawborder(struct fnc_view *); static int diff_input_handler(struct fnc_view **, struct fnc_view *, int); static int request_tl_commits(struct fnc_view *); static int reset_diff_view(struct fnc_view *, bool); static int set_selected_commit(struct fnc_diff_view_state *, struct commit_entry *); static void diff_grep_init(struct fnc_view *); static int find_next_match(struct fnc_view *); static void grep_set_view(struct fnc_view *, FILE **, off_t **, size_t *, int **, int **, int **, int **); static int view_close(struct fnc_view *); static int map_repo_path(char **); static int init_timeline_view(struct fnc_view **, int, int, fsl_id_t, const char *, const char *); static bool path_is_child(const char *, const char *, size_t); static int path_skip_common_ancestor(char **, const char *, size_t, const char *, size_t); static bool fnc_path_is_root_dir(const char *); /* static bool fnc_path_is_cwd(const char *); */ static int fnc_pathlist_insert(struct fnc_pathlist_entry **, struct fnc_pathlist_head *, const char *, void *); static int fnc_path_cmp(const char *, const char *, size_t, size_t); static void fnc_pathlist_free(struct fnc_pathlist_head *); static int browse_commit_tree(struct fnc_view **, int, int, struct commit_entry *, const char *); static int open_tree_view(struct fnc_view *, const char *, fsl_id_t); static int walk_tree_path(struct fnc_tree_view_state *, struct fnc_repository_tree *, struct fnc_tree_object **, const char *); static int create_repository_tree(struct fnc_repository_tree **, fsl_uuid_str *, fsl_id_t); static int tree_builder(struct fnc_repository_tree *, struct fnc_tree_object **, const char *); /* static void delete_tree_node(struct fnc_tree_entry **, */ /* struct fnc_tree_entry *); */ static int link_tree_node(struct fnc_repository_tree *, const char *, const char *, double); static int show_tree_view(struct fnc_view *); static int tree_input_handler(struct fnc_view **, struct fnc_view *, int); static int blame_tree_entry(struct fnc_view **, int, int, struct fnc_tree_entry *, struct fnc_parent_trees *, fsl_uuid_str); static void tree_grep_init(struct fnc_view *); static int tree_search_next(struct fnc_view *); static int tree_entry_path(char **, struct fnc_parent_trees *, struct fnc_tree_entry *); static int draw_tree(struct fnc_view *, const char *); static int blame_selected_file(struct fnc_view **, struct fnc_view *); static int timeline_tree_entry(struct fnc_view **, int, struct fnc_tree_view_state *); static void tree_scroll_up(struct fnc_tree_view_state *, int); static int tree_scroll_down(struct fnc_view *, int); static int visit_subtree(struct fnc_tree_view_state *, struct fnc_tree_object *); static int tree_entry_get_symlink_target(char **, struct fnc_tree_entry *); static int match_tree_entry(struct fnc_tree_entry *, regex_t *); static void fnc_object_tree_close(struct fnc_tree_object *); static void fnc_close_repository_tree(struct fnc_repository_tree *); static int open_blame_view(struct fnc_view *, char *, fsl_uuid_str, fsl_id_t, int); static int run_blame(struct fnc_view *); static int fnc_dump_buffer_to_file(off_t *, int *, off_t **, FILE *, fsl_buffer *); static int show_blame_view(struct fnc_view *); static void *blame_thread(void *); static int blame_cb(void *, fsl_annotate_opt const * const, fsl_annotate_step const * const); static int draw_blame(struct fnc_view *); static int blame_input_handler(struct fnc_view **, struct fnc_view *, int); static void blame_grep_init(struct fnc_view *); static fsl_uuid_cstr get_selected_commit_id(struct fnc_blame_line *, int, int, int); static int fnc_commit_qid_alloc(struct fnc_commit_qid **, fsl_uuid_cstr); static int close_blame_view(struct fnc_view *); static int stop_blame(struct fnc_blame *); static int cancel_blame(void *); static void fnc_commit_qid_free(struct fnc_commit_qid *); static int fnc_load_branches(struct fnc_branch_view_state *); static int create_tmp_branchlist_table(void); static int alloc_branch(struct fnc_branch **, const char *, double, bool, bool, bool); static int fnc_branchlist_insert(struct fnc_branchlist_entry **, struct fnc_branchlist_head *, struct fnc_branch *); static int open_branch_view(struct fnc_view *, int, const char *, double, int); static int show_branch_view(struct fnc_view *); static int branch_input_handler(struct fnc_view **, struct fnc_view *, int); static int browse_branch_tree(struct fnc_view **, int, struct fnc_branchlist_entry *); static void branch_scroll_up(struct fnc_branch_view_state *, int); static int branch_scroll_down(struct fnc_view *, int); static int branch_search_next(struct fnc_view *); static void branch_grep_init(struct fnc_view *); static int match_branchlist_entry(struct fnc_branchlist_entry *, regex_t *); static int close_branch_view(struct fnc_view *); static void fnc_free_branches(struct fnc_branchlist_head *); static void fnc_branch_close(struct fnc_branch *); static bool view_is_parent(struct fnc_view *); static void view_set_child(struct fnc_view *, struct fnc_view *); static int view_close_child(struct fnc_view *); static int close_tree_view(struct fnc_view *); static int close_timeline_view(struct fnc_view *); static int close_diff_view(struct fnc_view *); static void free_index(struct index *); static int view_resize(struct fnc_view *, enum view_mode); static bool screen_is_split(struct fnc_view *); static bool screen_is_shared(struct fnc_view *); static void updatescreen(WINDOW *, bool, bool); static void fnc_resizeterm(void); static int join_tl_thread(struct fnc_tl_view_state *); static void fnc_free_commits(struct commit_queue *); static void fnc_commit_artifact_close(struct fnc_commit_artifact*); static int fsl_file_artifact_free(void *, void *); static void sigwinch_handler(int); static void sigpipe_handler(int); static void sigcont_handler(int); static int draw_lineno(struct fnc_view *, int, int, attr_t); static bool gotoline(struct fnc_view *, int *, int *); static int strtonumcheck(long *, const char *, const int, const int); static int fnc_prompt_input(struct fnc_view *, struct input *); static int fnc_date_to_mtime(double *, const char *, int); static int cook_input(char *, int, WINDOW *); static void fnc_print_msg(struct fnc_view *, const char *, bool, bool, bool); static char *fnc_strsep (char **, const char *); static bool fnc_str_has_upper(const char *); static int fnc_make_sql_glob(char **, char **, const char *, bool); #ifdef __OpenBSD__ static int init_unveil(const char *, const char *, bool); #endif static int set_colours(struct fnc_colours *, enum fnc_view_id); static int set_colour_scheme(struct fnc_colours *, const int (*)[2], const char **, int); static int init_colour(enum fnc_opt_id); static int default_colour(enum fnc_opt_id); static void free_colours(struct fnc_colours *); static bool fnc_home(struct fnc_view *); static char *fnc_conf_getopt(enum fnc_opt_id, bool); static int fnc_conf_setopt(enum fnc_opt_id, const char *, bool); static int fnc_conf_lsopt(bool); static enum fnc_opt_id fnc_conf_str2enum(const char *); static const char *fnc_conf_enum2str(enum fnc_opt_id); static struct fnc_colour *get_colour(struct fnc_colours *, int); static struct fnc_colour *match_colour(struct fnc_colours *, const char *); static struct fnc_tree_entry *get_tree_entry(struct fnc_tree_object *, int); static struct fnc_tree_entry *find_tree_entry(struct fnc_tree_object *, const char *, size_t); |
︙ | ︙ | |||
1073 1074 1075 1076 1077 1078 1079 | if (!setlocale(LC_CTYPE, "")) fsl_fprintf(stderr, "[!] Warning: Can't set locale.\n"); fnc_init.cmdarg = argv[1]; /* Which cmd to show usage if needed. */ #if DEBUG fcli.clientFlags.verbose = 2; /* Verbose error reporting. */ #endif | | | < > > > > > > > > > > > > | 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 | if (!setlocale(LC_CTYPE, "")) fsl_fprintf(stderr, "[!] Warning: Can't set locale.\n"); fnc_init.cmdarg = argv[1]; /* Which cmd to show usage if needed. */ #if DEBUG fcli.clientFlags.verbose = 2; /* Verbose error reporting. */ #endif rc = fcli_setup_v2(argc, argv, fnc_init.cliflags_global, &fnc_init.fnc_help); if (rc) goto end; if (fnc_init.vflag) { fnc_show_version(); goto end; } else if (fnc_init.hflag) usage(); /* NOT REACHED */ #ifdef __OpenBSD__ /* * See pledge(2). This is the most restrictive set we can operate under. * Look for any adverse impact & revise when implementing new features. * stdio (close, sigaction); rpath (chdir getcwd lstat); wpath (getcwd); * cpath (symlink); flock (open); tty (TIOCGWINSZ); unveil (unveil). */ if (pledge("stdio rpath wpath cpath flock tty unveil", NULL) == -1) { rc = RC(fsl_errno_to_rc(errno, FSL_RC_ACCESS), "%s", "pledge"); goto end; } #endif rc = fcli_fingerprint_check(true); if (rc) goto end; if (argc == 1) cmd = &fnc_init.cmd_args[FNC_VIEW_TIMELINE]; else { |
︙ | ︙ | |||
1178 1179 1180 1181 1182 1183 1184 | fnc_init.sym); } if (fnc_init.glob) glob = fsl_strdup(fnc_init.glob); if (fnc_init.path) path = fsl_strdup(fnc_init.path); | | | > > > | | > > | < > | | > > > > > > > > > > > > > > > | 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 | fnc_init.sym); } if (fnc_init.glob) glob = fsl_strdup(fnc_init.glob); if (fnc_init.path) path = fsl_strdup(fnc_init.path); else { rc = map_repo_path(&path); if (rc) goto end; } rc = init_curses(); if (rc) goto end; #ifdef __OpenBSD__ rc = init_unveil(fsl_cx_db_file_repo(f, NULL), fsl_cx_ckout_dir_name(f, NULL), false); if (rc) goto end; #endif rc = init_timeline_view(&v, 0, 0, rid, path, glob); if (!rc) rc = view_loop(v); end: fsl_free(glob); fsl_free(path); return rc; } static int init_timeline_view(struct fnc_view **view, int x, int y, fsl_id_t rid, const char *path, const char *glob) { int rc = FSL_RC_OK; *view = view_open(0, 0, y, x, FNC_VIEW_TIMELINE); if (view == NULL) rc = RC(FSL_RC_ERROR, "%s", "view_open"); if (!rc) rc = open_timeline_view(*view, rid, path, glob); return rc; } /* * Look for an in-repository path in **argv. If found, canonicalise it as an * absolute path relative to the repository root (e.g., /ckoutdir/found/path), * and assign to a dynamically allocated string in *requested_path, which the |
︙ | ︙ | |||
1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 | { initscr(); cbreak(); noecho(); nonl(); intrflush(stdscr, FALSE); keypad(stdscr, TRUE); curs_set(0); set_escdelay(0); /* ESC should return immediately. */ #ifndef __linux__ typeahead(-1); /* Don't disrupt screen update operations. */ #endif if (!fnc_init.nocolour && has_colors()) { start_color(); use_default_colors(); } if (sigaction(SIGPIPE, &(struct sigaction){{sigpipe_handler}}, NULL) == -1) return RC(fsl_errno_to_rc(errno, FSL_RC_ERROR), "%s", "sigaction(SIGPIPE)"); if (sigaction(SIGWINCH, &(struct sigaction){{sigwinch_handler}}, NULL) == -1) return RC(fsl_errno_to_rc(errno, FSL_RC_ERROR), "%s", "sigaction(SIGWINCH)"); if (sigaction(SIGCONT, &(struct sigaction){{sigcont_handler}}, NULL) == -1) return RC(fsl_errno_to_rc(errno, FSL_RC_ERROR), "%s", "sigaction(SIGCONT)"); | > > > > > > > | | 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 | { initscr(); cbreak(); noecho(); nonl(); intrflush(stdscr, FALSE); keypad(stdscr, TRUE); raw(); /* Don't signal control characters, specifically C-y */ curs_set(0); set_escdelay(0); /* ESC should return immediately. */ #ifndef __linux__ typeahead(-1); /* Don't disrupt screen update operations. */ #endif if (!fnc_init.nocolour && has_colors()) { start_color(); use_default_colors(); } return fnc_set_signals(); } static int fnc_set_signals(void) { if (sigaction(SIGPIPE, &(struct sigaction){{sigpipe_handler}}, NULL) == -1) return RC(fsl_errno_to_rc(errno, FSL_RC_ERROR), "%s", "sigaction(SIGPIPE)"); if (sigaction(SIGWINCH, &(struct sigaction){{sigwinch_handler}}, NULL) == -1) return RC(fsl_errno_to_rc(errno, FSL_RC_ERROR), "%s", "sigaction(SIGWINCH)"); if (sigaction(SIGCONT, &(struct sigaction){{sigcont_handler}}, NULL) == -1) return RC(fsl_errno_to_rc(errno, FSL_RC_ERROR), "%s", "sigaction(SIGCONT)"); return FSL_RC_OK; } static struct fnc_view * view_open(int nlines, int ncols, int start_ln, int start_col, enum fnc_view_id vid) { struct fnc_view *view = calloc(1, sizeof(*view)); |
︙ | ︙ | |||
1511 1512 1513 1514 1515 1516 1517 1518 | const char *glob) { struct fnc_tl_view_state *s = &view->state.timeline; fsl_cx *const f = fcli_cx(); fsl_db *db = fsl_cx_db_repo(f); fsl_buffer sql = fsl_buffer_empty; char *startdate = NULL; fsl_id_t idtag = 0; | > | < < | 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 | const char *glob) { struct fnc_tl_view_state *s = &view->state.timeline; fsl_cx *const f = fcli_cx(); fsl_db *db = fsl_cx_db_repo(f); fsl_buffer sql = fsl_buffer_empty; char *startdate = NULL; char *op = NULL, *str = NULL; fsl_id_t idtag = 0; int idx, rc = FSL_RC_OK; if (path != s->path) { fsl_free(s->path); s->path = fsl_strdup(path); if (s->path == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_strdup"); } |
︙ | ︙ | |||
1612 1613 1614 1615 1616 1617 1618 1619 | for (idx = 0; idx < fnc_init.filter_types.nitems; ++idx) fsl_buffer_appendf(&sql, " eventtype=%Q%s", fnc_init.filter_types.values[idx], (idx + 1) < fnc_init.filter_types.nitems ? " OR " : ")"); } if (fnc_init.filter_branch) { idtag = fsl_db_g_id(db, 0, | > > > > | < > | | > > | | > > > > > | | | | | | > > | | | > > > > | | < > | | > > | > > | < > | | | < | | 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 | for (idx = 0; idx < fnc_init.filter_types.nitems; ++idx) fsl_buffer_appendf(&sql, " eventtype=%Q%s", fnc_init.filter_types.values[idx], (idx + 1) < fnc_init.filter_types.nitems ? " OR " : ")"); } if (fnc_init.filter_branch) { rc = fnc_make_sql_glob(&op, &str, fnc_init.filter_branch, !fnc_str_has_upper(fnc_init.filter_branch)); if (rc) goto end; idtag = fsl_db_g_id(db, 0, "SELECT tagid FROM tag WHERE tagname %q 'sym-%q'" " ORDER BY tagid DESC", op, str); if (idtag) { rc = fsl_buffer_appendf(&sql, " AND EXISTS(SELECT 1 FROM tagxref" " WHERE tagid=%"FSL_ID_T_PFMT " AND tagtype > 0 AND rid=blob.rid)", idtag); if (rc) goto end; } else { rc = RC(FSL_RC_NOT_FOUND, "branch not found: %s", fnc_init.filter_branch); goto end; } } if (fnc_init.filter_tag) { /* Lookup non-branch tag first; if not found, lookup branch. */ rc = fnc_make_sql_glob(&op, &str, fnc_init.filter_tag, !fnc_str_has_upper(fnc_init.filter_tag)); if (rc) goto end; idtag = fsl_db_g_id(db, 0, "SELECT tagid FROM tag WHERE tagname %q '%q'" " ORDER BY tagid DESC", op, str); if (idtag == 0) idtag = fsl_db_g_id(db, 0, "SELECT tagid FROM tag WHERE tagname %q 'sym-%q'" " ORDER BY tagid DESC", op, str); if (idtag) { rc = fsl_buffer_appendf(&sql, " AND EXISTS(SELECT 1 FROM tagxref" " WHERE tagid=%"FSL_ID_T_PFMT " AND tagtype > 0 AND rid=blob.rid)", idtag); if (rc) goto end; } else { rc = RC(FSL_RC_NOT_FOUND, "tag not found: %s", fnc_init.filter_tag); goto end; } } if (fnc_init.filter_user) { rc = fnc_make_sql_glob(&op, &str, fnc_init.filter_user, !fnc_str_has_upper(fnc_init.filter_user)); if (rc) goto end; rc = fsl_buffer_appendf(&sql, " AND coalesce(euser, user) %q '%q'", op, str); if (rc) goto end; } if (glob) { /* Filter commits on comment, user, and branch name. */ rc = fnc_make_sql_glob(&op, &str, glob, !fnc_str_has_upper(glob)); if (rc) goto end; idtag = fsl_db_g_id(db, 0, "SELECT tagid FROM tag WHERE tagname %q 'sym-%q'" " ORDER BY tagid DESC", op, str); rc = fsl_buffer_appendf(&sql, " AND (coalesce(ecomment, comment) %q %Q" " OR coalesce(euser, user) %q %Q%c", op, str, op, str, idtag ? ' ' : ')'); if (!rc && idtag > 0) rc = fsl_buffer_appendf(&sql, " OR EXISTS(SELECT 1 FROM tagxref" " WHERE tagid=%"FSL_ID_T_PFMT " AND tagtype > 0 AND rid=blob.rid))", idtag); if (rc) goto end; } if (startdate) { fsl_buffer_appendf(&sql, " AND event.mtime <= %s", startdate); fsl_free(startdate); } /* * If path is not root ("/"), a versioned path in the repository has * been requested, only retrieve commits involving path. */ if (path[1]) { fsl_buffer_appendf(&sql, " AND EXISTS(SELECT 1 FROM mlink" " WHERE mlink.mid = event.objid" " AND mlink.fnid IN "); if (fsl_cx_is_case_sensitive(f,false)) { fsl_buffer_appendf(&sql, "(SELECT fnid FROM filename" " WHERE name = %Q OR name GLOB '%q/*')", path + 1, path + 1); /* Skip prepended slash. */ } else { fsl_buffer_appendf(&sql, "(SELECT fnid FROM filename" |
︙ | ︙ | |||
1710 1711 1712 1713 1714 1715 1716 | if (fnc_init.nrecords.limit > 0) fsl_buffer_appendf(&sql, " LIMIT %d", fnc_init.nrecords.limit); view->show = show_timeline_view; view->input = tl_input_handler; view->close = close_timeline_view; | | | | 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 | if (fnc_init.nrecords.limit > 0) fsl_buffer_appendf(&sql, " LIMIT %d", fnc_init.nrecords.limit); view->show = show_timeline_view; view->input = tl_input_handler; view->close = close_timeline_view; view->grep_init = tl_grep_init; view->grep = tl_search_next; s->thread_cx.q = fsl_stmt_malloc(); rc = fsl_db_prepare(db, s->thread_cx.q, "%b", &sql); if (rc) { rc = RC(rc, "%s", "fsl_db_prepare"); goto end; } |
︙ | ︙ | |||
1738 1739 1740 1741 1742 1743 1744 | s->colour = !fnc_init.nocolour && has_colors(); s->thread_cx.rc = 0; s->thread_cx.db = db; s->thread_cx.spin_idx = 0; s->thread_cx.ncommits_needed = view->nlines - 1; s->thread_cx.commits = &s->commits; | | | > > > | > > | 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 | s->colour = !fnc_init.nocolour && has_colors(); s->thread_cx.rc = 0; s->thread_cx.db = db; s->thread_cx.spin_idx = 0; s->thread_cx.ncommits_needed = view->nlines - 1; s->thread_cx.commits = &s->commits; s->thread_cx.eotl = false; s->thread_cx.quit = &s->quit; s->thread_cx.first_commit_onscreen = &s->first_commit_onscreen; s->thread_cx.selected_commit = &s->selected_commit; s->thread_cx.searching = &view->searching; s->thread_cx.search_status = &view->search_status; s->thread_cx.regex = &view->regex; s->thread_cx.path = s->path; s->thread_cx.reset = true; if (s->colour) { STAILQ_INIT(&s->colours); rc = set_colours(&s->colours, FNC_VIEW_TIMELINE); } end: fsl_buffer_clear(&sql); fsl_free(op); fsl_free(str); if (rc) { if (view->close) view_close(view); else close_timeline_view(view); if (db->error.code) rc = fsl_cx_uplift_db_error(f, db); } return rc; } static int |
︙ | ︙ | |||
1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 | prev = TAILQ_PREV(view, view_tailhead, entries); else if (view->parent) prev = view->parent; if (view->parent) { view->parent->child = NULL; view->parent->focus_child = false; } else TAILQ_REMOVE(&views, view, entries); rc = view_close(view); if (rc) goto end; | > > > > > | 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 | prev = TAILQ_PREV(view, view_tailhead, entries); else if (view->parent) prev = view->parent; if (view->parent) { view->parent->child = NULL; view->parent->focus_child = false; /* Restore fullscreen line height. */ view->parent->nlines = view->parent->lines; rc = view_resize(view->parent, VIEW_SPLIT_NONE); if (rc) goto end; } else TAILQ_REMOVE(&views, view, entries); rc = view_close(view); if (rc) goto end; |
︙ | ︙ | |||
1860 1861 1862 1863 1864 1865 1866 | goto end; } rc = view->show(view); if (rc) goto end; if (view->child) { rc = view->child->show(view->child); | < < < > < | < < < < | 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 | goto end; } rc = view->show(view); if (rc) goto end; if (view->child) { rc = view->child->show(view->child); if (rc) goto end; updatescreen(view->child->window, false, false); } updatescreen(view->window, true, true); } } end: while (!TAILQ_EMPTY(&views)) { view = TAILQ_FIRST(&views); TAILQ_REMOVE(&views, view, entries); view_close(view); |
︙ | ︙ | |||
1973 1974 1975 1976 1977 1978 1979 | } if ((rc = pthread_mutex_unlock(&fnc_mutex))) rc = RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_unlock"); } | | | | 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 | } if ((rc = pthread_mutex_unlock(&fnc_mutex))) rc = RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_unlock"); } cx->eotl = true; return (void *)(intptr_t)rc; } static int block_main_thread_signals(void) { sigset_t set; if (sigemptyset(&set) == -1) return RC(fsl_errno_to_rc(errno, FSL_RC_MISUSE), "%s", "sigemptyset"); /* Bespoke signal handlers for SIGWINCH and SIGCONT. */ if (sigaddset(&set, SIGWINCH) == -1) |
︙ | ︙ | |||
2003 2004 2005 2006 2007 2008 2009 | return RC(fsl_errno_to_rc(errno, FSL_RC_MISUSE), "%s", "sigaddset"); if (pthread_sigmask(SIG_BLOCK, &set, NULL)) return RC(fsl_errno_to_rc(errno, FSL_RC_MISUSE), "%s", "pthread_sigmask"); | | | < | | | | | | 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 | return RC(fsl_errno_to_rc(errno, FSL_RC_MISUSE), "%s", "sigaddset"); if (pthread_sigmask(SIG_BLOCK, &set, NULL)) return RC(fsl_errno_to_rc(errno, FSL_RC_MISUSE), "%s", "pthread_sigmask"); return FSL_RC_OK; } static int build_commits(struct fnc_tl_thread_cx *cx) { int rc = 0; if (cx->reset && cx->commits->ncommits) { /* * If a child view was opened, there may be cached stmts that * necessitate resetting the commit builder stmt. Otherwise one * of the APIs down the fsl_stmt_step() call stack fails; * irrespective of whether fsl_db_prepare_cached() was used. */ fsl_size_t loaded = cx->commits->ncommits + 1; cx->reset = false; rc = fsl_stmt_reset(cx->q); if (rc) return RC(rc, "%s", "fsl_stmt_reset"); while (loaded--) if ((rc = fsl_stmt_step(cx->q)) != FSL_RC_STEP_ROW) return RC(rc, "%s", "fsl_stmt_step"); } |
︙ | ︙ | |||
2210 2211 2212 2213 2214 2215 2216 | static int signal_tl_thread(struct fnc_view *view, int wait) { struct fnc_tl_thread_cx *cx = &view->state.timeline.thread_cx; int rc = 0; while (cx->ncommits_needed > 0) { | | | 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 | static int signal_tl_thread(struct fnc_view *view, int wait) { struct fnc_tl_thread_cx *cx = &view->state.timeline.thread_cx; int rc = 0; while (cx->ncommits_needed > 0) { if (cx->eotl) break; /* Wake timeline thread. */ if ((rc = pthread_cond_signal(&cx->commit_consumer))) return RC(fsl_errno_to_rc(rc, FSL_RC_MISUSE), "%s", "pthread_cond_signal"); |
︙ | ︙ | |||
2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 | struct commit_entry *entry = s->selected_commit; struct fnc_colour *c = NULL; const char *search_str = NULL; char *headln = NULL, *idxstr = NULL; char *branch = NULL, *type = NULL; char *uuid = NULL; wchar_t *wcstr; int ncommits = 0, rc = 0, wstrlen = 0; int ncols_needed, max_usrlen = -1; if (s->selected_commit && !(view->searching != SEARCH_DONE && view->search_status == SEARCH_WAITING)) { uuid = fsl_strdup(s->selected_commit->commit->uuid); branch = fsl_strdup(s->selected_commit->commit->branch); type = fsl_strdup(s->selected_commit->commit->type); } | > | | 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 | struct commit_entry *entry = s->selected_commit; struct fnc_colour *c = NULL; const char *search_str = NULL; char *headln = NULL, *idxstr = NULL; char *branch = NULL, *type = NULL; char *uuid = NULL; wchar_t *wcstr; attr_t rx = A_BOLD; int ncommits = 0, rc = 0, wstrlen = 0; int ncols_needed, max_usrlen = -1; if (s->selected_commit && !(view->searching != SEARCH_DONE && view->search_status == SEARCH_WAITING)) { uuid = fsl_strdup(s->selected_commit->commit->uuid); branch = fsl_strdup(s->selected_commit->commit->branch); type = fsl_strdup(s->selected_commit->commit->type); } if (tcx->ncommits_needed > 0 && !tcx->eotl) { if ((idxstr = fsl_mprintf(" [%d/%d] %s", entry ? entry->idx + 1 : 0, s->commits.ncommits, (view->searching && !view->search_status) ? "searching..." : "loading...")) == NULL) { rc = RC(FSL_RC_RANGE, "%s", "fsl_mprintf"); goto end; } |
︙ | ︙ | |||
2326 2327 2328 2329 2330 2331 2332 | == NULL) { rc = RC(FSL_RC_RANGE, "%s", "fsl_mprintf"); headln = NULL; goto end; } if (SPINNER[++tcx->spin_idx] == '\0') tcx->spin_idx = 0; | | | | | > < < < | | > | | | 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 | == NULL) { rc = RC(FSL_RC_RANGE, "%s", "fsl_mprintf"); headln = NULL; goto end; } if (SPINNER[++tcx->spin_idx] == '\0') tcx->spin_idx = 0; rc = formatln(&wcstr, &wstrlen, headln, view->ncols, 0, 0, false); if (rc) goto end; werase(view->window); if (screen_is_shared(view) || view->active) rx |= A_REVERSE; if (s->colour) c = get_colour(&s->colours, FNC_COLOUR_COMMIT); if (c) rx |= COLOR_PAIR(c->scheme); wattron(view->window, rx); waddwstr(view->window, wcstr); while (wstrlen < view->ncols) { waddch(view->window, ' '); ++wstrlen; } wattroff(view->window, rx); fsl_free(wcstr); if (view->nlines <= 1) goto end; /* Parse commits to be written on screen for the longest username. */ entry = s->first_commit_onscreen; while (entry) { wchar_t *usr_wcstr; char *user; int usrlen; if (ncommits >= view->nlines - 1) break; user = fsl_strdup(entry->commit->user); if (user == NULL) { rc = RC(FSL_RC_ERROR, "%s", "fsl_strdup"); goto end; } if (strpbrk(user, "<@>") != NULL) parse_emailaddr_username(&user); rc = formatln(&usr_wcstr, &usrlen, user, view->ncols, 0, 0, false); if (max_usrlen < usrlen) max_usrlen = usrlen; fsl_free(usr_wcstr); fsl_free(user); ++ncommits; entry = TAILQ_NEXT(entry, entries); } ncommits = 0; entry = s->first_commit_onscreen; s->last_commit_onscreen = s->first_commit_onscreen; while (entry) { if (ncommits >= MIN(view->nlines - 1, view->lines - 1)) break; if (ncommits == s->selected_idx) wattr_on(view->window, A_REVERSE, NULL); rc = write_commit_line(view, entry->commit, max_usrlen); if (ncommits == s->selected_idx) wattr_off(view->window, A_REVERSE, NULL); ++ncommits; s->last_commit_onscreen = entry; entry = TAILQ_NEXT(entry, entries); } drawborder(view); end: free(branch); free(type); free(uuid); free(idxstr); free(headln); |
︙ | ︙ | |||
2419 2420 2421 2422 2423 2424 2425 | usr[strcspn(usr, "@>")] = '\0'; *username = usr; } static int formatln(wchar_t **ptr, int *wstrlen, const char *mbstr, int column_limit, | | > | | > > > > > > > > | | 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 | usr[strcspn(usr, "@>")] = '\0'; *username = usr; } static int formatln(wchar_t **ptr, int *wstrlen, const char *mbstr, int column_limit, int start_column, size_t skip, bool expand) { wchar_t *wline = NULL; static char exstr[BUFSIZ]; size_t i, sz, wlen; int cols = 0, rc = FSL_RC_OK; *ptr = NULL; *wstrlen = 0; sz = fsl_strlen(mbstr); if (expand) { sz = expand_tab(exstr, sizeof(exstr), mbstr, sz); mbstr = exstr; } if (skip) skip = MIN(skip, sz); rc = multibyte_to_wchar(mbstr + skip, &wline, &wlen); if (rc) return rc; if (wlen > 0 && wline[wlen - 1] == L'\n') { wline[wlen - 1] = L'\0'; wlen--; } |
︙ | ︙ | |||
2458 2459 2460 2461 2462 2463 2464 | if (cols + width > column_limit) break; cols += width; i++; } else if (width == -1) { if (wline[i] == L'\t') { width = TABSIZE - | | | 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 | if (cols + width > column_limit) break; cols += width; i++; } else if (width == -1) { if (wline[i] == L'\t') { width = TABSIZE - ((cols + start_column) % TABSIZE); } else { width = 1; wline[i] = L'.'; } if (cols + width > column_limit) break; cols += width; |
︙ | ︙ | |||
2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 | end: if (rc) free(wline); else *ptr = wline; return rc; } static int multibyte_to_wchar(const char *src, wchar_t **dst, size_t *dstlen) { int rc = 0; /* | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 | end: if (rc) free(wline); else *ptr = wline; return rc; } /* * Copy the string src into the statically sized dst char array, and expand * any tab ('\t') characters found into the equivalent number of space (' ') * characters. Return number of bytes written to dst minus the terminating NUL. */ static size_t expand_tab(char *dst, size_t dstlen, const char *src, int srclen) { size_t sz = 0; int idx = 0; while (sz < dstlen - 1 && idx < srclen && src[idx]) { const char c = *(src + idx); if (c == '\t') { size_t spaces = TABSIZE - (sz % TABSIZE); if (spaces + sz >= dstlen - 1) spaces = dstlen - sz - 1; memcpy(dst + sz, " ", spaces); sz += spaces; } else { dst[sz++] = src[idx]; } ++idx; } dst[sz] = '\0'; return sz; } static int multibyte_to_wchar(const char *src, wchar_t **dst, size_t *dstlen) { int rc = 0; /* |
︙ | ︙ | |||
2589 2590 2591 2592 2593 2594 2595 | */ user = fsl_strdup(commit->user); if (user == NULL) goto end; if (strpbrk(user, "<@>") != NULL) parse_emailaddr_username(&user); rc = formatln(&usr_wcstr, &usrlen, user, view->ncols - col_pos, | | | 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 | */ user = fsl_strdup(commit->user); if (user == NULL) goto end; if (strpbrk(user, "<@>") != NULL) parse_emailaddr_username(&user); rc = formatln(&usr_wcstr, &usrlen, user, view->ncols - col_pos, col_pos, 0, false); if (rc) goto end; if (s->colour) c = get_colour(&s->colours, FNC_COLOUR_USER); if (c) wattr_on(view->window, COLOR_PAIR(c->scheme), NULL); waddwstr(view->window, usr_wcstr); |
︙ | ︙ | |||
2616 2617 2618 2619 2620 2621 2622 | return RC(FSL_RC_ERROR, "%s", "fsl_strdup"); while (*comment == '\n') ++comment; eol = strchr(comment, '\n'); if (eol) *eol = '\0'; ncols_avail = view->ncols - col_pos; | | > | 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 | return RC(FSL_RC_ERROR, "%s", "fsl_strdup"); while (*comment == '\n') ++comment; eol = strchr(comment, '\n'); if (eol) *eol = '\0'; ncols_avail = view->ncols - col_pos; rc = formatln(&wcomment, &commentlen, comment, ncols_avail, col_pos, 0, false); if (rc) goto end; waddwstr(view->window, wcomment); col_pos += commentlen; while (col_pos < view->ncols) { waddch(view->window, ' '); ++col_pos; |
︙ | ︙ | |||
2657 2658 2659 2660 2661 2662 2663 | if ((rc = pthread_mutex_unlock(&fnc_mutex))) return RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_unlock"); sched_yield(); if ((rc = pthread_mutex_lock(&fnc_mutex))) return RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_lock"); | | | > | > | > | < < < < < < < < > > > > > > < < < < < < < < < < < < < < < < | < < < | < < < | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 | if ((rc = pthread_mutex_unlock(&fnc_mutex))) return RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_unlock"); sched_yield(); if ((rc = pthread_mutex_lock(&fnc_mutex))) return RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_lock"); rc = view->grep(view); return rc; } nodelay(stdscr, FALSE); /* Allow thread to make progress while waiting for input. */ if ((rc = pthread_mutex_unlock(&fnc_mutex))) return RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_unlock"); ch = wgetch(view->window); if ((rc = pthread_mutex_lock(&fnc_mutex))) return RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_lock"); if (rec_sigwinch || rec_sigcont) { fnc_resizeterm(); rec_sigwinch = 0; rec_sigcont = 0; TAILQ_FOREACH(v, views, entries) { rc = view_resize(v, v->mode); if (rc) return rc; rc = v->input(new, v, KEY_RESIZE); if (rc) return rc; if (v->child) { rc = view_resize(v->child, v->child->mode); if (rc) return rc; rc = v->child->input(new, v->child, KEY_RESIZE); if (rc) return rc; } } } switch (ch) { case '\t': rc = cycle_view(view); break; case KEY_F(1): case 'H': case '?': help(view); break; case 'q': if (view->parent && view->parent->vid == FNC_VIEW_TIMELINE && view->mode == VIEW_SPLIT_HRZN) { /* May need more commits to fill fullscreen. */ rc = request_tl_commits(view->parent); view->parent->mode = VIEW_SPLIT_NONE; } rc = view->input(new, view, ch); view->egress = true; break; case 'f': rc = toggle_fullscreen(new, view); break; case '/': if (view->grep_init) view_search_start(view); else rc = view->input(new, view, ch); break; case 'N': case 'n': if (view->started_search && view->grep) { view->searching = (ch == 'n' ? SEARCH_FORWARD : SEARCH_REVERSE); view->search_status = SEARCH_WAITING; rc = view->grep(view); } else rc = view->input(new, view, ch); break; case KEY_RESIZE: break; case ERR: break; case CTRL('c'): case 'Q': *done = 1; break; case CTRL('z'): raise(SIGTSTP); default: rc = view->input(new, view, ch); break; } return rc; } static int cycle_view(struct fnc_view *view) { int rc = FSL_RC_OK; if (view->child) { view->active = false; view->child->active = true; view->focus_child = true; } else if (view->parent) { view->active = false; view->parent->active = true; view->parent->focus_child = false; if (view->mode == VIEW_SPLIT_HRZN && !screen_is_split(view)) { if (view->parent->vid == FNC_VIEW_TIMELINE) { rc = request_tl_commits(view->parent); if (rc) return rc; } rc = make_fullscreen(view->parent); } } return rc; } static int toggle_fullscreen(struct fnc_view **new, struct fnc_view *view) { int rc = FSL_RC_OK; if (view_is_parent(view)) { if (view->child == NULL) return rc; if (screen_is_split(view->child)) { rc = make_fullscreen(view); if (!rc) rc = make_fullscreen(view->child); } else rc = make_splitscreen(view->child); if (!rc) rc = view->child->input(new, view->child, KEY_RESIZE); } else { if (screen_is_split(view)) rc = make_fullscreen(view); else rc = make_splitscreen(view); if (!rc) rc = view->input(new, view, KEY_RESIZE); } if (!rc && view->vid == FNC_VIEW_TIMELINE) rc = request_tl_commits(view); if (!rc) { if (view->parent) rc = offset_selected_line(view->parent); if (!rc) rc = offset_selected_line(view); } return rc; } static int help(struct fnc_view *view) { FILE *help = NULL; char *title = NULL; static const char *keys[][2] = { {""}, {""}, /* Global */ {" H,?,F1 ", " ❬H❭❬?❭❬F1❭ "}, {" k,<Up> ", " ❬↑❭❬k❭ "}, {" j,<Down> ", " ❬↓❭❬j❭ "}, {" C-b,PgUp ", " ❬C-b❭❬PgUp❭ "}, {" C-f,PgDn ", " ❬C-f❭❬PgDn❭ "}, {" C-u, ", " ❬C-u❭ "}, {" C-d, ", " ❬C-d❭ "}, {" gg,Home ", " ❬gg❭❬Home❭ "}, {" G,End ", " ❬G❭❬End❭ "}, {" Tab ", " ❬TAB❭ "}, {" c ", " ❬c❭ "}, {" f ", " ❬f❭ "}, {" / ", " ❬/❭ "}, {" n ", " ❬n❭ "}, |
︙ | ︙ | |||
2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 | {" Enter,Space ", " ❬Enter❭❬Space❭ "}, {" b ", " ❬b❭ "}, {" F ", " ❬F❭ "}, {" t ", " ❬t❭ "}, {""}, {""}, /* Diff */ {" Space ", " ❬Space❭ "}, {" b ", " ❬b❭ "}, {" i ", " ❬i❭ "}, {" v ", " ❬v❭ "}, {" w ", " ❬w❭ "}, {" -,_ ", " ❬-❭❬_❭ "}, {" +,= ", " ❬+❭❬=❭ "}, {" C-k,K,<,, ", " ❬C-k❭❬K❭❬<❭❬,❭ "}, {" C-j,J,>,. ", " ❬C-j❭❬J❭❬>❭❬.❭ "}, {""}, {""}, /* Tree */ {" l,Enter,<Right> ", " ❬→❭❬l❭❬Enter❭ "}, {" h,<BS>,<Left> ", " ❬←❭❬h❭❬⌫❭ "}, {" b ", " ❬b❭ "}, {" i ", " ❬i❭ "}, {" t ", " ❬t❭ "}, {""}, {""}, /* Blame */ {" Space ", " ❬Space❭ "}, {" Enter ", " ❬Enter❭ "}, {" b ", " ❬b❭ "}, {" p ", " ❬p❭ "}, {" B ", " ❬B❭ "}, {" T ", " ❬T❭ "}, {""}, {""}, /* Branch */ {" Enter,Space ", " ❬Enter❭❬Space❭ "}, {" d ", " ❬d❭ "}, {" i ", " ❬i❭ "}, {" t ", " ❬t❭ "}, {" R,<C-l> ", " ❬R❭❬C-l❭ "}, {""}, {""}, {0} }; static const char *desc[] = { "", "Global", "Open in-app help", "Move selection cursor or page up one line", "Move selection cursor or page down one line", | > > > > > > > > > > > > > > > > > > > | | > > | 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 | {" Enter,Space ", " ❬Enter❭❬Space❭ "}, {" b ", " ❬b❭ "}, {" F ", " ❬F❭ "}, {" t ", " ❬t❭ "}, {""}, {""}, /* Diff */ {" Space ", " ❬Space❭ "}, {" # ", " ❬#❭ "}, {" $ ", " ❬$❭ "}, {" 0 ", " ❬0❭ "}, {" C-e ", " ❬C-e❭ "}, {" C-y ", " ❬C-y❭ "}, {" C-n ", " ❬C-n❭ "}, {" C-p ", " ❬C-p❭ "}, {" l<Right> ", " ❬l❭❬→❭ "}, {" h<Left> ", " ❬h❭❬←❭ "}, {" b ", " ❬b❭ "}, {" F ", " ❬F❭ "}, {" i ", " ❬i❭ "}, {" L ", " ❬L❭ "}, {" v ", " ❬v❭ "}, {" w ", " ❬w❭ "}, {" -,_ ", " ❬-❭❬_❭ "}, {" +,= ", " ❬+❭❬=❭ "}, {" C-k,K,<,, ", " ❬C-k❭❬K❭❬<❭❬,❭ "}, {" C-j,J,>,. ", " ❬C-j❭❬J❭❬>❭❬.❭ "}, {""}, {""}, /* Tree */ {" l,Enter,<Right> ", " ❬→❭❬l❭❬Enter❭ "}, {" h,<BS>,<Left> ", " ❬←❭❬h❭❬⌫❭ "}, {" b ", " ❬b❭ "}, {" d ", " ❬d❭ "}, {" i ", " ❬i❭ "}, {" t ", " ❬t❭ "}, {""}, {""}, /* Blame */ {" Space ", " ❬Space❭ "}, {" Enter ", " ❬Enter❭ "}, {" # ", " ❬#❭ "}, {" $ ", " ❬$❭ "}, {" 0 ", " ❬0❭ "}, {" l<Right> ", " ❬l❭❬→❭ "}, {" h<Left> ", " ❬h❭❬←❭ "}, {" L ", " ❬L❭ "}, {" b ", " ❬b❭ "}, {" p ", " ❬p❭ "}, {" B ", " ❬B❭ "}, {" T ", " ❬T❭ "}, {""}, {""}, /* Branch */ {" Enter,Space ", " ❬Enter❭❬Space❭ "}, {" d ", " ❬d❭ "}, {" i ", " ❬i❭ "}, {" s ", " ❬s❭ "}, {" t ", " ❬t❭ "}, {" R,<C-l> ", " ❬R❭❬C-l❭ "}, {""}, {""}, {0} }; static const char *desc[] = { "", "Global", "Open in-app help", "Move selection cursor or page up one line", "Move selection cursor or page down one line", "Scroll view up one page", "Scroll view down one page", "Scroll view up one half page", "Scroll view down one half page", "Jump to first line or start of the view", "Jump to last line or end of the view", "Switch focus between open views", "Toggle coloured output", "Toggle fullscreen", "Open prompt to enter search term (not available in this view)", "Find next line or token matching the current search term", |
︙ | ︙ | |||
2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 | "Open diff view of the selected commit", "Open and populate branch view with all repository branches", "Open prompt to enter term with which to filter new timeline view", "Display a tree reflecting the state of the selected commit", "", "Diff", "Scroll down one page of diff output", "Open and populate branch view with all repository branches", "Toggle inversion of diff output", "Toggle verbosity of diff output", "Toggle ignore whitespace-only changes in diff", "Decrease the number of context lines", "Increase the number of context lines", "Display diff of next (newer) commit in the timeline", "Display diff of previous (older) commit in the timeline", "", "Tree", "Move into the selected directory", "Return to the parent directory", "Open and populate branch view with all repository branches", "Toggle display of file artifact SHA hash ID", "Display timeline of all commits modifying the selected entry", "", "Blame", "Scroll down one page", "Display the diff of the commit corresponding to the selected line", "Blame the version of the file found in the selected line's commit", "Blame the version of the file found in the selected line's parent " "commit", "Reload the previous blamed version of the file", "Open and populate branch view with all repository branches", "", "Branch", "Display the timeline of the currently selected branch", "Toggle display of the date when the branch last received changes", "Toggle display of the SHA hash that identifies the branch", "Open a tree view of the currently selected branch", "Reload view with all repository branches and no filters applied", "", " See fnc(1) for complete list of options and key bindings." }; int cs, ln, width = 0, rc = 0; | > > > > > > > > > > > > > > > > > > > | 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 | "Open diff view of the selected commit", "Open and populate branch view with all repository branches", "Open prompt to enter term with which to filter new timeline view", "Display a tree reflecting the state of the selected commit", "", "Diff", "Scroll down one page of diff output", "Toggle display of diff view line numbers", "Scroll the view right to the end of the longest line", "Scroll the view left to the beginning of the line", "Scroll the view down in the buffer", "Scroll the view up in the buffer", "Navigate to next file in the diff", "Navigate to previous file in the diff", "Scroll the view right", "Scroll the view left", "Open and populate branch view with all repository branches", "Open prompt to enter file number and navigate to file", "Toggle inversion of diff output", "Open prompt to enter line number and navigate to line", "Toggle verbosity of diff output", "Toggle ignore whitespace-only changes in diff", "Decrease the number of context lines", "Increase the number of context lines", "Display diff of next (newer) commit in the timeline", "Display diff of previous (older) commit in the timeline", "", "Tree", "Move into the selected directory", "Return to the parent directory", "Open and populate branch view with all repository branches", "Toggle ISO8601 modified timestamp display for each tree entry", "Toggle display of file artifact SHA hash ID", "Display timeline of all commits modifying the selected entry", "", "Blame", "Scroll down one page", "Display the diff of the commit corresponding to the selected line", "Toggle display of file line numbers", "Scroll the view right to the end of the longest line", "Scroll the view left to the beginning of the line", "Scroll the view right", "Scroll the view left", "Open prompt to enter line number and navigate to line", "Blame the version of the file found in the selected line's commit", "Blame the version of the file found in the selected line's parent " "commit", "Reload the previous blamed version of the file", "Open and populate branch view with all repository branches", "", "Branch", "Display the timeline of the currently selected branch", "Toggle display of the date when the branch last received changes", "Toggle display of the SHA hash that identifies the branch", "Toggle branch sort order (lexicographical -> mru -> state)", "Open a tree view of the currently selected branch", "Reload view with all repository branches and no filters applied", "", " See fnc(1) for complete list of options and key bindings." }; int cs, ln, width = 0, rc = 0; |
︙ | ︙ | |||
2988 2989 2990 2991 2992 2993 2994 | case 'j': if (cury < end) ++cury; break; case KEY_PPAGE: case CTRL('b'): if (cury > 0) { | | | | 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 | case 'j': if (cury < end) ++cury; break; case KEY_PPAGE: case CTRL('b'): if (cury > 0) { cury -= wy - 3; if (cury < 0) cury = 0; } break; case KEY_NPAGE: case CTRL('f'): case ' ': if (cury < end) { cury += wy - 3; if (cury > end) cury = end; } break; case 'g': if (!fnc_home(view)) break; |
︙ | ︙ | |||
3065 3066 3067 3068 3069 3070 3071 | refresh(); } static int tl_input_handler(struct fnc_view **new_view, struct fnc_view *view, int ch) { struct fnc_tl_view_state *s = &view->state.timeline; | < < | > < < < < < | | | | > < < < | < < < < < < < | | < < | | < < > < < < < | < < | < < < < | < < < < < < < < < < < < < < < < < < < < | < < < | < < < < < < < < < < < < < < < < < < < | < < < < | < < < < < | < < < > | < < < < | < < < < | < < > | < < < < < < < < < < < < < < | < | < | < < < < < < < < < < < < < < < < < | < < < < < < | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | < | | > > | 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 | refresh(); } static int tl_input_handler(struct fnc_view **new_view, struct fnc_view *view, int ch) { struct fnc_tl_view_state *s = &view->state.timeline; int rc = FSL_RC_OK; uint16_t nscroll = view->nlines - 2; switch (ch) { case KEY_DOWN: case 'j': case '.': case '>': rc = move_tl_cursor_down(view, 0); break; case CTRL('d'): nscroll >>= 1; /* FALL THROUGH */ case KEY_NPAGE: case CTRL('f'): { rc = move_tl_cursor_down(view, nscroll); break; } case KEY_END: case 'G': view->search_status = SEARCH_FOR_END; view_search_start(view); break; case 'k': case KEY_UP: case '<': case ',': move_tl_cursor_up(view, false, false); break; case CTRL('u'): nscroll >>= 1; /* FALL THROUGH */ case KEY_PPAGE: case CTRL('b'): move_tl_cursor_up(view, nscroll, false); break; case 'g': if (!fnc_home(view)) break; /* FALL THROUGH */ case KEY_HOME: move_tl_cursor_up(view, false, true); break; case KEY_RESIZE: if (s->selected_idx > view->nlines - 2) s->selected_idx = view->nlines - 2; if (s->selected_idx > s->commits.ncommits - 1) s->selected_idx = s->commits.ncommits - 1; select_commit(s); if (s->commits.ncommits < view->nlines - 1 && !s->thread_cx.eotl) { s->thread_cx.ncommits_needed += (view->nlines - 1) - s->commits.ncommits; rc = signal_tl_thread(view, 1); } break; case KEY_ENTER: case ' ': case '\r': rc = request_view(new_view, view, FNC_VIEW_DIFF); break; case 'b': rc = request_view(new_view, view, FNC_VIEW_BRANCH); break; case 'c': s->colour = !s->colour; break; case 'F': { struct input input = {NULL, "filter: ", INPUT_ALPHA, true}; rc = fnc_prompt_input(view, &input); if (rc) return rc; s->glob = input.buf; rc = request_view(new_view, view, FNC_VIEW_TIMELINE); if (rc == FSL_RC_BREAK) { fnc_print_msg(view, "-- no matching commits --", true, true, true); fcli_err_reset(); rc = FSL_RC_OK; } break; } case 't': if (s->selected_commit == NULL) break; if (!fsl_rid_is_a_checkin(fcli_cx(), s->selected_commit->commit->rid)) fnc_print_msg(view, "-- tree requires check-in artifact --", true, true, true); else rc = request_view(new_view, view, FNC_VIEW_TREE); break; case 'q': s->quit = 1; break; default: break; } return rc; } static int move_tl_cursor_down(struct fnc_view *view, uint16_t page) { struct fnc_tl_view_state *s = &view->state.timeline; struct commit_entry *first; int rc = FSL_RC_OK; first = s->first_commit_onscreen; if (first == NULL) return rc; if (s->thread_cx.eotl && s->selected_commit->idx >= s->commits.ncommits - 1) return rc; /* Last commit already selected. */ if (!page) { /* Still more commits on this page to scroll down. */ if (s->selected_idx < MIN(view->nlines - 2, s->commits.ncommits - 1)) ++s->selected_idx; else /* Last commit on screen is selected, need to scroll. */ rc = timeline_scroll_down(view, 1); } else if (s->thread_cx.eotl) { /* Last displayed commit is the end, jump to it. */ if (s->last_commit_onscreen->idx == s->commits.ncommits - 1) s->selected_idx += MIN(s->last_commit_onscreen->idx - s->selected_commit->idx, page + 1); else /* Scroll the page. */ rc = timeline_scroll_down(view, MIN(page, s->commits.ncommits - s->selected_commit->idx - 1)); } else { rc = timeline_scroll_down(view, page); if (rc) return rc; if (first == s->first_commit_onscreen && s->selected_idx < MIN(view->nlines - 2, s->commits.ncommits - 1)) { /* End of timeline, no more commits; move cursor down */ s->selected_idx = MIN(s->commits.ncommits - 1, page); } /* * If we've overshot (necessarily possible with horizontal * splits), select the final commit. */ s->selected_idx = MIN(s->selected_idx, s->last_commit_onscreen->idx - s->first_commit_onscreen->idx); } if (!rc) select_commit(s); return rc; } static void move_tl_cursor_up(struct fnc_view *view, uint16_t page, bool home) { struct fnc_tl_view_state *s = &view->state.timeline; if (s->first_commit_onscreen == NULL) return; if ((page && TAILQ_FIRST(&s->commits.head) == s->first_commit_onscreen) || home) s->selected_idx = home ? 0 : MAX(0, s->selected_idx - page - 1); if (!page && !home && s->selected_idx > 0) --s->selected_idx; else timeline_scroll_up(s, home ? s->commits.ncommits : MAX(page, 1)); select_commit(s); return; } static int request_view(struct fnc_view **new_view, struct fnc_view *view, enum fnc_view_id request) { struct fnc_view *requested = NULL; enum view_mode split = VIEW_SPLIT_NONE; int x = 0, y = 0, rc = FSL_RC_OK; /* * Need to report to this view if request fails, so get dimensions * for new view initialisation but don't split yet. */ if (view_is_parent(view)) split = view_get_split(view, &x, &y); rc = init_view(&requested, view, request, x, y); if (rc || !requested) return rc; if (split == VIEW_SPLIT_HRZN) { /* Request success, safe to split. */ rc = split_view(view, &y); if (rc) return rc; } view->active = false; requested->active = true; requested->mode = view->mode; requested->nlines = view->lines - y; if (view_is_parent(view)) { rc = view_close_child(view); if (rc) return rc; view_set_child(view, requested); view->focus_child = true; } else *new_view = requested; return rc; } static int init_view(struct fnc_view **new_view, struct fnc_view *view, enum fnc_view_id request, int x, int y) { int rc = FSL_RC_OK; switch (request) { case FNC_VIEW_DIFF: { struct fnc_tl_view_state *s = &view->state.timeline; if (s->selected_commit == NULL) break; rc = init_diff_view(new_view, x, y, s->selected_commit->commit, view); break; } case FNC_VIEW_BLAME: { struct fnc_tree_view_state *s = &view->state.tree; rc = blame_tree_entry(new_view, x, y, s->selected_entry, &s->parents, s->commit_id); break; } case FNC_VIEW_TIMELINE: { const char *glob = NULL; int rid = 0; if (view->vid == FNC_VIEW_TIMELINE) glob = view->state.timeline.glob; else if (view->vid == FNC_VIEW_BRANCH) rid = fsl_uuid_to_rid(fcli_cx(), view->state.branch.selected_branch->branch->id); rc = init_timeline_view(new_view, x, y, rid, "/", glob); break; } case FNC_VIEW_TREE: { struct fnc_tl_view_state *s = &view->state.timeline; rc = browse_commit_tree(new_view, x, y, s->selected_commit, s->path); break; } case FNC_VIEW_BRANCH: { *new_view = view_open(0, 0, y, x, FNC_VIEW_BRANCH); if (*new_view == NULL) return RC(FSL_RC_ERROR, "%s", "view_open"); rc = open_branch_view(*new_view, BRANCH_LS_OPEN_CLOSED, NULL, 0, 0); /* FALL THROUGH */ } default: break; } return rc; } /* * Get dimensions for splitscreen view. If FNC_VIEW_SPLIT_MODE is either unset * or set to auto, determine vertical or horizontal split depending on screen * estate. If set to 'v' or 'h', assign start column or start line of the split * view to *start_col and *start_ln, respectively, and return split mode. */ static enum view_mode view_get_split(struct fnc_view *view, int *start_col, int *start_ln) { char *mode = fnc_conf_getopt(FNC_VIEW_SPLIT_MODE, false); if (!mode || mode[0] != 'h') *start_col = view_split_start_col(view->start_col); if (!*start_col && (!mode || mode[0] != 'v')) *start_ln = view_split_start_ln(view->lines); return *start_col ? VIEW_SPLIT_VERT : VIEW_SPLIT_HRZN; } /* Split view horizontally at *start_ln and offset view->state->selected line */ static int split_view(struct fnc_view *view, int *start_ln) { int rc = FSL_RC_OK; view->mode = VIEW_SPLIT_HRZN; view->nlines = *start_ln; rc = view_resize(view, VIEW_SPLIT_NONE); if (!rc) { view->nlines = *start_ln - 1; rc = offset_selected_line(view); } return rc; } /* * If view->state->selected line is outside the now split view, scroll offset * lines to move selected line into view and index its new position. */ static int offset_selected_line(struct fnc_view *view) { int (*scrolld)(struct fnc_view *, int); int header, offset, rc = FSL_RC_OK; int *selected; switch (view->vid) { case FNC_VIEW_TIMELINE: { struct fnc_tl_view_state *s = &view->state.timeline; scrolld = &timeline_scroll_down; header = 2; selected = &s->selected_idx; break; } case FNC_VIEW_TREE: { struct fnc_tree_view_state *s = &view->state.tree; scrolld = &tree_scroll_down; header = 4; selected = &s->selected_idx; break; } case FNC_VIEW_BRANCH: { struct fnc_branch_view_state *s = &view->state.branch; scrolld = &branch_scroll_down; header = 1; selected = &s->selected; break; } default: selected = NULL; scrolld = NULL; header = 0; break; } if (selected && *selected > view->nlines - header) { offset = ABS(view->nlines - *selected - header); rc = scrolld ? scrolld(view, offset) : rc; view->pos.line = *selected; *selected -= offset; view->pos.offset = offset; } return rc; } static int timeline_scroll_down(struct fnc_view *view, int maxscroll) { struct fnc_tl_view_state *s = &view->state.timeline; struct commit_entry *pentry; int rc = 0, nscrolled = 0, ncommits_needed; if (s->last_commit_onscreen == NULL || !maxscroll) return rc; ncommits_needed = s->last_commit_onscreen->idx + 1 + maxscroll; if (s->commits.ncommits < ncommits_needed && !s->thread_cx.eotl) { /* Signal timeline thread for n commits needed. */ s->thread_cx.ncommits_needed += maxscroll; rc = signal_tl_thread(view, 1); if (rc) return rc; } do { pentry = TAILQ_NEXT(s->last_commit_onscreen, entries); if (pentry == NULL && view->mode != VIEW_SPLIT_HRZN) break; s->last_commit_onscreen = pentry ? pentry : s->last_commit_onscreen; pentry = TAILQ_NEXT(s->first_commit_onscreen, entries); if (pentry == NULL) break; s->first_commit_onscreen = pentry; } while (++nscrolled < maxscroll); s->nscrolled += view->mode == VIEW_SPLIT_HRZN ? nscrolled : 0; return rc; } static void timeline_scroll_up(struct fnc_tl_view_state *s, int maxscroll) { struct commit_entry *entry; |
︙ | ︙ | |||
3373 3374 3375 3376 3377 3378 3379 | ++ncommits; } } static int make_splitscreen(struct fnc_view *view) { | | | > | > | > | > > > > | > | > | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < > | | | < < | < < < < < | | | < < < | | | | < | 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 | ++ncommits; } } static int make_splitscreen(struct fnc_view *view) { int rc = FSL_RC_OK; view->start_ln = view->mode == VIEW_SPLIT_HRZN ? view_split_start_ln(view->nlines) : 0; view->start_col = view->mode != VIEW_SPLIT_HRZN ? view_split_start_col(0) : 0; view->nlines = LINES - view->start_ln; view->ncols = COLS - view->start_col; view->lines = LINES; view->cols = COLS; rc = view_resize(view, view->mode); if (rc) return rc; if (view->parent && view->mode == VIEW_SPLIT_HRZN) view->parent->nlines = view->lines - view->nlines - 1; if (mvwin(view->window, view->start_ln, view->start_col) == ERR) return RC(FSL_RC_ERROR, "%s", "mvwin"); return rc; } static int make_fullscreen(struct fnc_view *view) { int rc = FSL_RC_OK; view->start_col = 0; view->start_ln = 0; view->nlines = LINES; view->ncols = COLS; view->lines = LINES; view->cols = COLS; rc = view_resize(view, VIEW_SPLIT_NONE); if (rc) return rc; if (mvwin(view->window, view->start_ln, view->start_col) == ERR) return RC(FSL_RC_ERROR, "%s", "mvwin"); return rc; } /* * Find start column for vertical split. If terminal width is < 120 columns, * return 0 (i.e., do not split; open new view in the existing one). If >= 120, * return the largest of 80 columns or 50% of the current view width subtracted * from COLS so that the child view will be no smaller than 80 columns wide. */ static int view_split_start_col(int start_col) { if (start_col > 0 || COLS < 120) return 0; return (COLS - MAX(COLS / 2, 80)); } /* * Find start line for horizontal split. If FNC_VIEW_SPLIT_HEIGHT is set as * either an absolute line value or % equalling less than lines - 2, subtract * from lines and return. If invalid or not set, return HSPLIT_SCALE(lines). */ static int view_split_start_ln(int lines) { char *height = NULL; long n = 0; int rc = FSL_RC_OK; height = fnc_conf_getopt(FNC_VIEW_SPLIT_HEIGHT, false); if (height && height[fsl_strlen(height) - 1] == '%') { n = strtol(height, NULL, 10); if (n > INT_MAX || (errno == ERANGE && n == LONG_MAX)) rc = RC(fsl_errno_to_rc(errno, FSL_RC_RANGE), "%s", "strtol"); if (n < INT_MIN || (errno == ERANGE && n == LONG_MIN)) rc = RC(fsl_errno_to_rc(errno, FSL_RC_RANGE), "%s", "strtol"); if (!rc) n = lines * ((float)n / 100); } else if (height) rc = strtonumcheck(&n, height, 0, lines); fsl_free(height); return !rc && n && n < (lines - 2) ? lines - n : lines * HSPLIT_SCALE; } static int view_search_start(struct fnc_view *view) { struct input input = {NULL, "/", INPUT_ALPHA, true}; int rc = FSL_RC_OK; if (view->started_search) { regfree(&view->regex); view->searching = SEARCH_DONE; memset(&view->regmatch, 0, sizeof(view->regmatch)); } view->started_search = false; if (view->nlines < 1) return rc; if (view->search_status == SEARCH_FOR_END) { view->grep_init(view); view->started_search = true; view->searching = SEARCH_FORWARD; view->search_status = SEARCH_WAITING; view->state.timeline.thread_cx.endjmp = true; rc = view->grep(view); return rc; } rc = fnc_prompt_input(view, &input); if (rc) return rc; if (regcomp(&view->regex, input.buf, REG_EXTENDED | REG_NEWLINE) == 0) { view->grep_init(view); view->started_search = true; view->searching = SEARCH_FORWARD; view->search_status = SEARCH_WAITING; rc = view->grep(view); } return rc; } static void tl_grep_init(struct fnc_view *view) { struct fnc_tl_view_state *s = &view->state.timeline; s->matched_commit = NULL; s->search_commit = NULL; } static int tl_search_next(struct fnc_view *view) { struct fnc_tl_view_state *s = &view->state.timeline; struct commit_entry *entry; |
︙ | ︙ | |||
3534 3535 3536 3537 3538 3539 3540 | entry = TAILQ_FIRST(&s->commits.head); else entry = TAILQ_LAST(&s->commits.head, commit_tailhead); } while (1) { if (entry == NULL) { | | | | | 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 | entry = TAILQ_FIRST(&s->commits.head); else entry = TAILQ_LAST(&s->commits.head, commit_tailhead); } while (1) { if (entry == NULL) { if (s->thread_cx.eotl && s->thread_cx.endjmp) { s->matched_commit = TAILQ_LAST(&s->commits.head, commit_tailhead); view->search_status = SEARCH_COMPLETE; s->thread_cx.endjmp = false; break; } if (s->thread_cx.eotl || view->searching == SEARCH_REVERSE) { view->search_status = (s->matched_commit == NULL ? SEARCH_NO_MATCH : SEARCH_COMPLETE); s->search_commit = NULL; cbreak(); return rc; } /* |
︙ | ︙ | |||
3610 3611 3612 3613 3614 3615 3616 | return false; } static int view_close(struct fnc_view *view) { | | | | 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 | return false; } static int view_close(struct fnc_view *view) { int rc = FSL_RC_OK; if (view->child) { view_close(view->child); view->child = NULL; } if (view->close) rc = view->close(view); if (view->panel) del_panel(view->panel); if (view->window) delwin(view->window); fsl_free(view); return rc; } static int close_timeline_view(struct fnc_view *view) { |
︙ | ︙ | |||
3743 3744 3745 3746 3747 3748 3749 | fsl_free(ffa->fc); fsl_free(ffa); return 0; } static int | | | | | | > > > > > > > > > | | | | | 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 | fsl_free(ffa->fc); fsl_free(ffa); return 0; } static int init_diff_view(struct fnc_view **new_view, int start_col, int start_ln, struct fnc_commit_artifact *commit, struct fnc_view *timeline_view) { struct fnc_view *diff_view; int rc = 0; diff_view = view_open(0, 0, start_ln, start_col, FNC_VIEW_DIFF); if (diff_view == NULL) return RC(FSL_RC_ERROR, "%s", "view_open"); rc = open_diff_view(diff_view, commit, DEF_DIFF_CTX, fnc_init.ws, fnc_init.invert, !fnc_init.quiet, timeline_view, true, NULL); if (!rc) *new_view = diff_view; return rc; } static int open_diff_view(struct fnc_view *view, struct fnc_commit_artifact *commit, int context, bool ignore_ws, bool invert, bool verbosity, struct fnc_view *timeline_view, bool showmeta, struct fnc_pathlist_head *paths) { struct fnc_diff_view_state *s = &view->state.diff; char *opt; int rc = 0; opt = fnc_conf_getopt(FNC_COLOUR_HL_LINE, false); if (!fsl_stricmp(opt, "mono")) s->sline = SLINE_MONO; fsl_free(opt); s->index.n = 0; s->index.idx = 0; s->maxx = 0; s->paths = paths; s->selected_commit = commit; s->first_line_onscreen = 1; s->last_line_onscreen = view->nlines; s->selected_line = 1; s->f = NULL; s->context = context; s->sbs = 0; verbosity ? FLAG_SET(s->diff_flags, FSL_DIFF_VERBOSE) : 0; ignore_ws ? FLAG_SET(s->diff_flags, FSL_DIFF2_IGNORE_ALLWS) : 0; invert ? FLAG_SET(s->diff_flags, FSL_DIFF2_INVERT) : 0; s->timeline_view = timeline_view; s->colour = !fnc_init.nocolour && has_colors(); s->showmeta = showmeta; if (s->colour) { STAILQ_INIT(&s->colours); rc = set_colours(&s->colours, FNC_VIEW_DIFF); |
︙ | ︙ | |||
3809 3810 3811 3812 3813 3814 3815 | free_colours(&s->colours); return rc; } view->show = show_diff; view->input = diff_input_handler; view->close = close_diff_view; | | | < | < < < < > | | 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 | free_colours(&s->colours); return rc; } view->show = show_diff; view->input = diff_input_handler; view->close = close_diff_view; view->grep_init = diff_grep_init; view->grep = find_next_match; return rc; } static void show_diff_status(struct fnc_view *view) { mvwaddstr(view->window, 0, 0, "generating diff..."); updatescreen(view->window, true, true); } static int create_diff(struct fnc_diff_view_state *s) { FILE *fout = NULL; char *line, *st0 = NULL, *st = NULL; off_t lnoff = 0; uint32_t idx = 0; int rc = 0; free(s->line_offsets); s->line_offsets = fsl_malloc(sizeof(off_t)); if (s->line_offsets == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_malloc"); s->nlines = 0; |
︙ | ︙ | |||
3859 3860 3861 3862 3863 3864 3865 | /* * We'll diff artifacts of type "ci" (i.e., "checkin") separately, as * it's a different process to diff the others (wiki, technote, etc.). */ if (s->selected_commit->diff_type == FNC_DIFF_COMMIT) rc = create_changeset(s->selected_commit); else if (s->selected_commit->diff_type == FNC_DIFF_BLOB) | | | < < > > | 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 | /* * We'll diff artifacts of type "ci" (i.e., "checkin") separately, as * it's a different process to diff the others (wiki, technote, etc.). */ if (s->selected_commit->diff_type == FNC_DIFF_COMMIT) rc = create_changeset(s->selected_commit); else if (s->selected_commit->diff_type == FNC_DIFF_BLOB) rc = diff_file_artifact(s, s->selected_commit->prid, NULL, NULL, FSL_CKOUT_CHANGE_MOD); else if (s->selected_commit->diff_type == FNC_DIFF_WIKI) rc = diff_non_checkin(&s->buf, s->selected_commit, s->diff_flags, s->context, s->sbs); if (rc) goto end; /* * Delay assigning diff headline labels (i.e., diff id1 id2) till now * because wiki parent commits are obtained in diff_non_checkin(). */ if (s->selected_commit->puuid) { fsl_free(s->id1); s->id1 = fsl_strdup(s->selected_commit->puuid); if (s->id1 == NULL) { rc = RC(FSL_RC_ERROR, "%s", "fsl_strdup"); goto end; } } else s->id1 = NULL; /* Initial commit, tag, technote, etc. */ if (s->selected_commit->uuid) { fsl_free(s->id2); s->id2 = fsl_strdup(s->selected_commit->uuid); if (s->id2 == NULL) { rc = RC(FSL_RC_ERROR, "%s", "fsl_strdup"); goto end; } } else s->id2 = NULL; /* Local work tree. */ |
︙ | ︙ | |||
3903 3904 3905 3906 3907 3908 3909 | /* * Diff local changes on disk in the current checkout differently to * checked-in versions: the former compares on disk file content with * file artifacts; the latter compares file artifact blobs only. */ if (s->selected_commit->diff_type == FNC_DIFF_COMMIT) | | < | < > | > > > > > > | < < < < < < | | 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 | /* * Diff local changes on disk in the current checkout differently to * checked-in versions: the former compares on disk file content with * file artifacts; the latter compares file artifact blobs only. */ if (s->selected_commit->diff_type == FNC_DIFF_COMMIT) diff_commit(s); else if (s->selected_commit->diff_type == FNC_DIFF_CKOUT) diff_checkout(s); /* * Parse the diff buffer line-by-line to record byte offsets of each * line for scrolling and searching in diff view. */ st0 = fsl_strdup(fsl_buffer_str(&s->buf)); st = st0; lnoff = (s->line_offsets)[s->nlines - 1]; s->index.lineno = fsl_malloc(s->index.n * sizeof(size_t)); while ((line = fnc_strsep(&st, "\n")) != NULL) { int lineno, n = fprintf(s->f, "%s\n", line); s->maxx = MAX((int)s->maxx, n); if (s->index.offset && idx < s->index.n && lnoff == s->index.offset[idx]) { lineno = s->nlines + (idx ? 1 : 0); s->index.lineno[idx++] = lineno; } lnoff += n; rc = add_line_offset(&s->line_offsets, &s->nlines, lnoff); if (rc) goto end; } --s->nlines; /* Don't count EOF '\n' */ end: fsl_free(st0); fsl_buffer_clear(&s->buf); if (s->f && fflush(s->f) != 0 && rc == 0) rc = RC(FSL_RC_IO, "%s", "fflush"); return rc; } static int |
︙ | ︙ | |||
4051 4052 4053 4054 4055 4056 4057 | if (st == NULL) { RC(FSL_RC_ERROR, "%s", "fsl_strdup"); goto end; } while ((line = fnc_strsep(&st, "\n")) != NULL) { linelen = fsl_strlen(line); if (linelen >= s->ncols) { | | > > > | 4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 | if (st == NULL) { RC(FSL_RC_ERROR, "%s", "fsl_strdup"); goto end; } while ((line = fnc_strsep(&st, "\n")) != NULL) { linelen = fsl_strlen(line); if (linelen >= s->ncols) { rc = wrapline(line, s->ncols - LINENO_WIDTH, s, &lnoff); if (rc) goto end; } else { if ((n = fprintf(s->f, "%s\n", line)) < 0) goto end; lnoff += n; if ((rc = add_line_offset(&s->line_offsets, &s->nlines, lnoff))) goto end; } } fputc('\n', s->f); ++lnoff; if ((rc = add_line_offset(&s->line_offsets, &s->nlines, lnoff))) goto end; if (s->selected_commit->diff_type == FNC_DIFF_WIKI) goto end; /* No changeset for wiki commits. */ for (idx = 0; idx < s->selected_commit->changeset.used; ++idx) { char *changeline; struct fsl_file_artifact *file_change; file_change = s->selected_commit->changeset.list[idx]; |
︙ | ︙ | |||
4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 | file_change->fc->name)) < 0) goto end; lnoff += n; if ((rc = add_line_offset(&s->line_offsets, &s->nlines, lnoff))) goto end; } end: free(st0); free(line); if (rc) { free(*&s->line_offsets); s->line_offsets = NULL; s->nlines = 0; | > > > > > > > | 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 | file_change->fc->name)) < 0) goto end; lnoff += n; if ((rc = add_line_offset(&s->line_offsets, &s->nlines, lnoff))) goto end; } /* Add blank line between end of changeset and diff. */ fputc('\n', s->f); ++lnoff; rc = add_line_offset(&s->line_offsets, &s->nlines, lnoff); s->index.offset = fsl_realloc(s->index.offset, (s->index.n + 1) * sizeof(size_t)); s->index.offset[s->index.n++] = lnoff; end: free(st0); free(line); if (rc) { free(*&s->line_offsets); s->line_offsets = NULL; s->nlines = 0; |
︙ | ︙ | |||
4183 4184 4185 4186 4187 4188 4189 | * exists in both d1 and d2). In cases (1) and (2), we call diff_file_artifact() * to dump the complete content of the added/deleted file if FSL_DIFF_VERBOSE is * set, otherwise only diff metatadata will be output. In case (3), if the * hash (UUID) of each F card is the same, there are no changes; if different, * both artifacts will be passed to diff_file_artifact() to be diffed. */ static int | < | | > | > | | | | 4629 4630 4631 4632 4633 4634 4635 4636 4637 4638 4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 | * exists in both d1 and d2). In cases (1) and (2), we call diff_file_artifact() * to dump the complete content of the added/deleted file if FSL_DIFF_VERBOSE is * set, otherwise only diff metatadata will be output. In case (3), if the * hash (UUID) of each F card is the same, there are no changes; if different, * both artifacts will be passed to diff_file_artifact() to be diffed. */ static int diff_commit(struct fnc_diff_view_state *s) { fsl_cx *const f = fcli_cx(); const fsl_card_F *fc1 = NULL; const fsl_card_F *fc2 = NULL; fsl_deck d1 = fsl_deck_empty; fsl_deck d2 = fsl_deck_empty; fsl_id_t id1; int different = 0, rc = 0; rc = fsl_deck_load_rid(f, &d2, s->selected_commit->rid, FSL_SATYPE_CHECKIN); if (rc) goto end; rc = fsl_deck_F_rewind(&d2); if (rc) goto end; /* * For the one-and-only special case of repositories, such as the * canonical fnc, that do not have an "initial empty check-in", we * proceed with no parent version to diff against. */ if (s->selected_commit->puuid) { rc = fsl_sym_to_rid(f, s->selected_commit->puuid, FSL_SATYPE_CHECKIN, &id1); if (rc) goto end; rc = fsl_deck_load_rid(f, &d1, id1, FSL_SATYPE_CHECKIN); if (rc) goto end; rc = fsl_deck_F_rewind(&d1); if (rc) goto end; fsl_deck_F_next(&d1, &fc1); } fsl_deck_F_next(&d2, &fc2); while (fc1 || fc2) { const fsl_card_F *a = NULL, *b = NULL; fsl_ckout_change_e change = FSL_CKOUT_CHANGE_NONE; bool diff = true; if (s->paths != NULL && !TAILQ_EMPTY(s->paths)) { struct fnc_pathlist_entry *pe; diff = false; TAILQ_FOREACH(pe, s->paths, entry) if (!fsl_strcmp(pe->path, fc1->name) || !fsl_strcmp(pe->path, fc2->name) || !fsl_strncmp(pe->path, fc1->name, pe->pathlen) || !fsl_strncmp(pe->path, fc2->name, pe->pathlen)) { diff = true; break; |
︙ | ︙ | |||
4257 4258 4259 4260 4261 4262 4263 | fsl_deck_F_next(&d2, &fc2); } else if (different < 0) { a = fc1; change = FSL_CKOUT_CHANGE_REMOVED; fsl_deck_F_next(&d1, &fc1); } if (diff) | | < < | | < | | | 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 | fsl_deck_F_next(&d2, &fc2); } else if (different < 0) { a = fc1; change = FSL_CKOUT_CHANGE_REMOVED; fsl_deck_F_next(&d1, &fc1); } if (diff) rc = diff_file_artifact(s, id1, a, b, change); } else if (!fsl_uuidcmp(fc1->uuid, fc2->uuid)) { /* No change */ fsl_deck_F_next(&d1, &fc1); fsl_deck_F_next(&d2, &fc2); } else { change = FSL_CKOUT_CHANGE_MOD; if (diff) rc = diff_file_artifact(s, id1, fc1, fc2, change); fsl_deck_F_next(&d1, &fc1); fsl_deck_F_next(&d2, &fc2); } if (rc == FSL_RC_RANGE) { fsl_buffer_append(&s->buf, "\nDiff has too many changes\n", -1); rc = 0; fsl_cx_err_reset(f); } else if (rc == FSL_RC_DIFF_BINARY) { fsl_buffer_append(&s->buf, "\nBinary files cannot be diffed\n", -1); rc = 0; fsl_cx_err_reset(f); } else if (rc) goto end; } end: |
︙ | ︙ | |||
4301 4302 4303 4304 4305 4306 4307 | * buf output buffer in which diff content is appended * vid repository database record id of the version to diff against * diff_flags, context, and sbs are the same parameters as diff_file_artifact() * nb. This routine is only called with 'fnc diff [hash]'; that is, one or * zero args—not two—supplied to fnc's diff command line interface. */ static int | < | | > | 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 | * buf output buffer in which diff content is appended * vid repository database record id of the version to diff against * diff_flags, context, and sbs are the same parameters as diff_file_artifact() * nb. This routine is only called with 'fnc diff [hash]'; that is, one or * zero args—not two—supplied to fnc's diff command line interface. */ static int diff_checkout(struct fnc_diff_view_state *s) { fsl_cx *const f = fcli_cx(); fsl_stmt *st = NULL; fsl_buffer sql, abspath, bminus; fsl_uuid_str xminus = NULL; fsl_id_t cid, vid; int rc = 0; bool allow_symlinks; abspath = bminus = sql = fsl_buffer_empty; vid = s->selected_commit->prid; fsl_ckout_version_info(f, &cid, NULL); /* cid = fsl_config_get_id(f, FSL_CONFDB_CKOUT, 0, "checkout"); */ /* XXX Already done in cmd_diff(): Load vfile table with local state. */ /* rc = fsl_vfile_changes_scan(f, cid, */ /* FSL_VFILE_CKSIG_ENOTFILE & FSL_VFILE_CKSIG_KEEP_OTHERS); */ /* if (rc) */ /* return RC(rc, "%s", "fsl_vfile_changes_scan"); */ |
︙ | ︙ | |||
4437 4438 4439 4440 4441 4442 4443 | } if (!xminus) xminus = fsl_strdup(NULL_DEVICE); allow_symlinks = fsl_config_get_bool(f, FSL_CONFDB_REPO, false, "allow-symlinks"); if (!symlink != !(fsl_is_symlink(fsl_buffer_cstr(&abspath)) && allow_symlinks)) { | | | | | | | | | < | | | 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 | } if (!xminus) xminus = fsl_strdup(NULL_DEVICE); allow_symlinks = fsl_config_get_bool(f, FSL_CONFDB_REPO, false, "allow-symlinks"); if (!symlink != !(fsl_is_symlink(fsl_buffer_cstr(&abspath)) && allow_symlinks)) { rc = write_diff_meta(&s->buf, path, xminus, path, NULL_DEVICE, s->diff_flags, change); fsl_buffer_append(&s->buf, "\nSymbolic links cannot be diffed\n", -1); if (rc) goto yield; continue; } if (fid > 0 && change != FSL_CKOUT_CHANGE_ADDED) { rc = fsl_content_get(f, fid, &bminus); if (rc) goto yield; } else fsl_buffer_clear(&bminus); if (s->paths != NULL && !TAILQ_EMPTY(s->paths)) { struct fnc_pathlist_entry *pe; diff = false; TAILQ_FOREACH(pe, s->paths, entry) if (!fsl_strncmp(pe->path, path, pe->pathlen) || !fsl_strcmp(pe->path, path)) { diff = true; break; } } if (diff) rc = diff_file(s, &bminus, path, xminus, fsl_buffer_cstr(&abspath), change); fsl_buffer_reuse(&bminus); fsl_buffer_reuse(&abspath); fsl_free(xminus); xminus = NULL; if (rc == FSL_RC_RANGE) { fsl_buffer_append(&s->buf, "\nDiff has too many changes\n", -1); rc = 0; fsl_cx_err_reset(f); } else if (rc == FSL_RC_DIFF_BINARY) { fsl_buffer_append(&s->buf, "\nBinary files cannot be diffed\n", -1); rc = 0; fsl_cx_err_reset(f); } else if (rc) goto yield; } |
︙ | ︙ | |||
4542 4543 4544 4545 4546 4547 4548 | /* FALL THROUGH */ default: minus = xminus; plus = xplus; break; } | | | | > | | | < > < | 4985 4986 4987 4988 4989 4990 4991 4992 4993 4994 4995 4996 4997 4998 4999 5000 5001 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 5017 5018 5019 5020 5021 5022 5023 5024 5025 5026 5027 5028 5029 5030 5031 5032 5033 5034 5035 5036 5037 5038 5039 5040 5041 | /* FALL THROUGH */ default: minus = xminus; plus = xplus; break; } if FLAG_CHK(diff_flags, FSL_DIFF2_INVERT) { const char *tmp = minus; minus = plus; plus = tmp; tmp = zminus; zminus = zplus; zplus = tmp; } if (!FLAG_CHK(diff_flags, (FSL_DIFF_SIDEBYSIDE | FSL_DIFF_BRIEF))) { rc = fsl_buffer_appendf(buf, "%sIndex: %s\n%.71c\n", buf->used ? "\n" : "", index, '='); if (!rc) rc = fsl_buffer_appendf(buf, "hash - %s\nhash + %s\n", minus, plus); } if (!rc && !FLAG_CHK(diff_flags, FSL_DIFF_BRIEF)) rc = fsl_buffer_appendf(buf, "--- %s\n+++ %s\n", zminus, zplus); return rc; } /* * The diff_file_artifact() counterpart that diffs actual files on disk rather * than file artifacts in the Fossil repository's blob table. * buf output buffer in which diff output will be appended * bminus blob containing content of the versioned file being diffed against * zminus filename of bminus * xminus hex UUID containing the SHA{1,3} hash of the file named zminus * abspath absolute path to the file on disk being diffed * change enum denoting the versioning change of the file * diff_flags, context, and sbs are the same parameters as diff_file_artifact() */ static int diff_file(struct fnc_diff_view_state *s, fsl_buffer *bminus, const char *zminus, fsl_uuid_str xminus, const char *abspath, enum fsl_ckout_change_e change) { fsl_cx *const f = fcli_cx(); fsl_dibu *diffbld = NULL; fsl_buffer bplus = fsl_buffer_empty; fsl_buffer xplus = fsl_buffer_empty; const char *zplus = NULL; int rc = 0; /* * If it exists, read content of abspath to diff EXCEPT for the content * of 'fossil rm FILE' files because they will either: (1) have the same * content as the versioned file's blob in bminus or (2) have changes. * As a result, the upcoming call to fsl_diff_text_to_buffer() _will_ * (1) produce an empty diff or (2) show the differences; neither are |
︙ | ︙ | |||
4644 4645 4646 4647 4648 4649 4650 | default: RC(FSL_RC_SIZE_MISMATCH, "invalid artifact uuid [%s]", xminus); goto end; } if (rc) goto end; | > > > | | > > > > > < | | > > | | < | < > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 5087 5088 5089 5090 5091 5092 5093 5094 5095 5096 5097 5098 5099 5100 5101 5102 5103 5104 5105 5106 5107 5108 5109 5110 5111 5112 5113 5114 5115 5116 5117 5118 5119 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 5143 5144 5145 5146 5147 5148 5149 5150 5151 5152 5153 5154 5155 5156 5157 5158 5159 5160 5161 5162 5163 5164 5165 5166 5167 5168 5169 5170 5171 5172 5173 5174 5175 5176 5177 5178 5179 5180 5181 5182 5183 5184 5185 5186 5187 5188 5189 | default: RC(FSL_RC_SIZE_MISMATCH, "invalid artifact uuid [%s]", xminus); goto end; } if (rc) goto end; s->index.offset = fsl_realloc(s->index.offset, (s->index.n + 1) * sizeof(size_t)); s->index.offset[s->index.n++] = s->buf.used; rc = write_diff_meta(&s->buf, zminus, xminus, zplus, fsl_buffer_str(&xplus), s->diff_flags, change); if (rc) goto end; rc = fnc_diff_builder(&diffbld, xminus, fsl_buffer_str(&xplus), zminus, zplus, s->context, s->diff_flags, &s->buf); if (rc) goto end; if FLAG_CHK(s->diff_flags, FSL_DIFF_BRIEF) { rc = fsl_buffer_compare(bminus, &bplus); if (!rc) rc = fsl_buffer_appendf(&s->buf, "CHANGED -> %s\n", zminus); } else if (FLAG_CHK(s->diff_flags, FSL_DIFF_VERBOSE) || (bminus->used && bplus.used)) rc = fsl_diff_v2(bminus, &bplus, diffbld); end: fsl_buffer_clear(&bplus); fsl_buffer_clear(&xplus); fnc_free_diff_builder(diffbld); return rc; } static int fnc_diff_builder(fsl_dibu **ptr, fsl_uuid_cstr xminus, fsl_uuid_cstr xplus, const char *zminus, const char *zplus, int context, int diff_flags, fsl_buffer *buf) { fsl_dibu *diffbld = NULL; fsl_dibu_opt *diffopt = NULL; struct fsl_dibu_opt_ansi ansiopt = {"", "", "", ""}; int rc = FSL_RC_OK; *ptr = NULL; diffopt = fsl_malloc(sizeof(fsl_dibu_opt)); if (diffopt == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_malloc"); FLAG_SET(diff_flags, FSL_DIFF2_CONTEXT_ZERO); diffopt->ansiColor = ansiopt; diffopt->hashLHS = xminus; diffopt->hashRHS = xplus; diffopt->nameLHS = zminus; diffopt->nameRHS = zplus; diffopt->diffFlags = diff_flags; diffopt->contextLines = context; diffopt->out = fsl_output_f_buffer; diffopt->outState = buf; rc = fsl_dibu_factory(FSL_DIBU_UNIFIED_TEXT, &diffbld); if (!rc) { diffbld->opt = diffopt; diffbld->start = NULL; *ptr = diffbld; } else fsl_free(diffopt); return rc; } static void fnc_free_diff_builder(fsl_dibu *diffbld) { if (diffbld) { if (diffbld->opt) fsl_free(diffbld->opt); diffbld->finalize(diffbld); } } /* * Parse the deck of non-checkin commits to present a 'fossil ui' equivalent * of the corresponding artifact when selected from the timeline. * TODO: Rename this horrible function name. */ static int diff_non_checkin(fsl_buffer *buf, struct fnc_commit_artifact *commit, int diff_flags, int context, int sbs) { fsl_cx *const f = fcli_cx(); fsl_dibu *diffbld = NULL; fsl_buffer wiki = fsl_buffer_empty; fsl_buffer pwiki = fsl_buffer_empty; fsl_id_t prid = 0; fsl_size_t idx; int rc = 0; fsl_deck *d = NULL; |
︙ | ︙ | |||
4751 4752 4753 4754 4755 4756 4757 | else { fsl_buffer_copy(buf, &wiki); goto end; } } /* Diff the artifacts if a parent is found. */ | | > | > | | > > > > > > | | < > > < | | 5251 5252 5253 5254 5255 5256 5257 5258 5259 5260 5261 5262 5263 5264 5265 5266 5267 5268 5269 5270 5271 5272 5273 5274 5275 5276 5277 5278 5279 5280 5281 5282 5283 5284 5285 5286 5287 5288 5289 5290 5291 5292 5293 5294 5295 5296 5297 5298 5299 5300 5301 5302 5303 5304 5305 5306 5307 5308 5309 5310 5311 5312 5313 5314 5315 5316 5317 5318 5319 5320 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 | else { fsl_buffer_copy(buf, &wiki); goto end; } } /* Diff the artifacts if a parent is found. */ rc = fsl_sym_to_rid(f, commit->puuid, FSL_SATYPE_ANY, &prid); if (rc) goto end; rc = fsl_deck_load_rid(f, d, prid, FSL_SATYPE_ANY); if (rc) goto end; fsl_buffer_append(&pwiki, d->W.mem, d->W.used); rc = fnc_diff_builder(&diffbld, NULL, NULL, NULL, NULL, context, diff_flags, buf); if (rc) goto end; rc = fsl_diff_v2(&pwiki, &wiki, diffbld); if (rc) goto end; /* If a technote, provide the full content after its diff. */ if (d->type == FSL_SATYPE_TECHNOTE) fsl_buffer_appendf(buf, "\n---\n\n%s", wiki.mem); end: fsl_buffer_clear(&wiki); fsl_buffer_clear(&pwiki); fsl_deck_finalize(d); fnc_free_diff_builder(diffbld); return rc; } /* * Compute the differences between two repository file artifacts to produce the * set of changes necessary to convert one into the other. * buf output buffer in which diff output will be appended * vid1 repo record id of the version from which artifact a belongs * a file artifact being diffed against * vid2 repo record id of the version from which artifact b belongs * b file artifact being diffed * change enum denoting the versioning change of the file * diff_flags bitwise flags to control the diff * context the number of context lines to surround changes * sbs number of columns in which to display each side-by-side diff */ static int diff_file_artifact(struct fnc_diff_view_state *s, fsl_id_t vid1, const fsl_card_F *a, const fsl_card_F *b, enum fsl_ckout_change_e change) { fsl_cx *const f = fcli_cx(); fsl_dibu *diffbld = NULL; fsl_stmt stmt = fsl_stmt_empty; fsl_buffer fbuf1 = fsl_buffer_empty; fsl_buffer fbuf2 = fsl_buffer_empty; char *zminus0 = NULL, *zplus0 = NULL; const char *zplus = NULL, *zminus = NULL; fsl_uuid_str xplus0 = NULL, xminus0 = NULL; fsl_uuid_str xplus = NULL, xminus = NULL; fsl_id_t vid2 = s->selected_commit->rid; int rc = 0; assert(vid1 != vid2); assert(vid2 > 0 && "local checkout should be diffed with diff_checkout()"); fbuf2.used = fbuf1.used = 0; if (a) { rc = fsl_card_F_content(f, a, &fbuf1); if (rc) goto end; zminus = a->name; xminus = a->uuid; } else if (s->selected_commit->diff_type == FNC_DIFF_BLOB) { rc = fsl_cx_prepare(f, &stmt, "SELECT name FROM filename, mlink " "WHERE filename.fnid=mlink.fnid AND mlink.fid = %d", vid1); if (rc) { rc = RC(FSL_RC_DB, "%s %d", "fsl_cx_prepare", vid1); goto end; } |
︙ | ︙ | |||
4842 4843 4844 4845 4846 4847 4848 | } if (b) { rc = fsl_card_F_content(f, b, &fbuf2); if (rc) goto end; zplus = b->name; xplus = b->uuid; | | | 5350 5351 5352 5353 5354 5355 5356 5357 5358 5359 5360 5361 5362 5363 5364 | } if (b) { rc = fsl_card_F_content(f, b, &fbuf2); if (rc) goto end; zplus = b->name; xplus = b->uuid; } else if (s->selected_commit->diff_type == FNC_DIFF_BLOB) { rc = fsl_cx_prepare(f, &stmt, "SELECT name FROM filename, mlink " "WHERE filename.fnid=mlink.fnid AND mlink.fid = %d", vid2); if (rc) { rc = RC(FSL_RC_DB, "%s %d", "fsl_cx_prepare", vid2); goto end; } |
︙ | ︙ | |||
4867 4868 4869 4870 4871 4872 4873 | } xplus0 = fsl_rid_to_uuid(f, vid2); xplus = xplus0; fsl_stmt_finalize(&stmt); fsl_content_get(f, vid2, &fbuf2); } | > > > > > | | < | > | > | > > > > > | 5375 5376 5377 5378 5379 5380 5381 5382 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392 5393 5394 5395 5396 5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 5407 5408 5409 5410 5411 5412 5413 5414 5415 5416 5417 | } xplus0 = fsl_rid_to_uuid(f, vid2); xplus = xplus0; fsl_stmt_finalize(&stmt); fsl_content_get(f, vid2, &fbuf2); } if (s->buf.used) { s->index.offset = fsl_realloc(s->index.offset, (s->index.n + 1) * sizeof(size_t)); s->index.offset[s->index.n++] = s->buf.used + s->index.offset[0]; } rc = write_diff_meta(&s->buf, zminus, xminus, zplus, xplus, s->diff_flags, change); if (rc) goto end; rc = fnc_diff_builder(&diffbld, xminus, xplus, zminus, zplus, s->context, s->diff_flags, &s->buf); if (rc) goto end; if (FLAG_CHK(s->diff_flags, FSL_DIFF_VERBOSE) || (a && b)) rc = fsl_diff_v2(&fbuf1, &fbuf2, diffbld); if (rc) RC(rc, "%s: fsl_diff_text_to_buffer\n" " -> %s [%s]\n -> %s [%s]", fsl_rc_cstr(rc), a ? a->name : NULL_DEVICE, a ? a->uuid : NULL_DEVICE, b ? b->name : NULL_DEVICE, b ? b->uuid : NULL_DEVICE); end: fsl_free(zminus0); fsl_free(zplus0); fsl_free(xminus0); fsl_free(xplus0); fsl_buffer_clear(&fbuf1); fsl_buffer_clear(&fbuf2); fnc_free_diff_builder(diffbld); return rc; } static int show_diff(struct fnc_view *view) { struct fnc_diff_view_state *s = &view->state.diff; |
︙ | ︙ | |||
4931 4932 4933 4934 4935 4936 4937 | regmatch_t *regmatch = &view->regmatch; struct fnc_colour *c = NULL; wchar_t *wcstr; char *line; size_t linesz = 0; ssize_t linelen; off_t line_offset; | | | | > > > > > > > > > > > | | | | > | > | | < | | | < | > > > > > > > > > > > > > > | | > | | < > | > > | | | > | | > | | | | < < | 5450 5451 5452 5453 5454 5455 5456 5457 5458 5459 5460 5461 5462 5463 5464 5465 5466 5467 5468 5469 5470 5471 5472 5473 5474 5475 5476 5477 5478 5479 5480 5481 5482 5483 5484 5485 5486 5487 5488 5489 5490 5491 5492 5493 5494 5495 5496 5497 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507 5508 5509 5510 5511 5512 5513 5514 5515 5516 5517 5518 5519 5520 5521 5522 5523 5524 5525 5526 5527 5528 5529 5530 5531 5532 5533 5534 5535 5536 5537 5538 5539 5540 5541 5542 5543 5544 5545 5546 5547 5548 5549 5550 5551 5552 5553 5554 5555 5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 5568 5569 5570 5571 5572 5573 5574 5575 5576 5577 5578 5579 5580 5581 5582 5583 5584 5585 | regmatch_t *regmatch = &view->regmatch; struct fnc_colour *c = NULL; wchar_t *wcstr; char *line; size_t linesz = 0; ssize_t linelen; off_t line_offset; attr_t rx = A_BOLD; int col, wstrlen, max_lines = view->nlines; int nlines = s->nlines; int npad = 0, nprinted = 0, rc = FSL_RC_OK; bool selected; s->lineno = s->first_line_onscreen - 1; line_offset = s->line_offsets[s->first_line_onscreen - 1]; if (fseeko(s->f, line_offset, SEEK_SET)) return RC(fsl_errno_to_rc(errno, FSL_RC_ERROR), "%s", "fseeko"); werase(view->window); if (headln) { static char pct[MAX_PCT_LEN]; double percent; int ln, pctlen; ln = s->gtl ? s->gtl : s->lineno + s->selected_line; percent = 100.00 * ln / nlines; pctlen = snprintf(pct, MAX_PCT_LEN, "%.*lf%%", percent > 99.99 ? 0 : 2, percent); if (pctlen < 0) return RC(FSL_RC_RANGE, "%s", "snprintf"); line = fsl_mprintf("[%d/%d] %s", ln, nlines, headln); if (line == NULL) return RC(FSL_RC_RANGE, "%s", "fsl_mprintf"); rc = formatln(&wcstr, &wstrlen, line, view->ncols, 0, 0, false); fsl_free(line); fsl_free(headln); if (rc) return rc; if (screen_is_shared(view) || view->active) rx |= A_REVERSE; wattron(view->window, rx); waddwstr(view->window, wcstr); fsl_free(wcstr); wcstr = NULL; col = wstrlen; while (col++ < view->ncols) waddch(view->window, ' '); if (wstrlen < view->ncols - pctlen) mvwaddstr(view->window, 0, view->ncols - pctlen, pct); wattroff(view->window, rx); if (--max_lines < 1) return rc; } s->eof = false; line = NULL; while (max_lines > 0 && nprinted < max_lines) { linelen = getline(&line, &linesz, s->f); if (linelen == -1) { if (feof(s->f)) { s->eof = true; break; } fsl_free(line); RC(ferror(s->f) ? fsl_errno_to_rc(errno, FSL_RC_IO) : FSL_RC_IO, "%s", "getline"); return rc; } if (++s->lineno < s->first_line_onscreen) continue; if (s->gtl) if (!gotoline(view, &s->lineno, &nprinted)) continue; rx = 0; if ((selected = nprinted == s->selected_line - 1)) rx = A_BOLD | A_REVERSE; if (s->showln) npad = draw_lineno(view, nlines, s->lineno, rx); if (s->colour) c = match_colour(&s->colours, line); if (c && !(selected && s->sline == SLINE_MONO)) rx |= COLOR_PAIR(c->scheme); if (c || selected) wattron(view->window, rx); if (s->first_line_onscreen + nprinted == s->matched_line && regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) { rc = draw_matched_line(view, &wstrlen, npad, regmatch, rx); if (rc) { fsl_free(line); return rc; } } else { rc = formatln(&wcstr, &wstrlen, line, view->ncols - npad, npad, view->pos.col, true); if (rc) { fsl_free(line); return rc; } waddwstr(view->window, wcstr); fsl_free(wcstr); wcstr = NULL; } col = wstrlen + npad; while (col++ < view->ncols) waddch(view->window, ' '); if (c || selected) wattroff(view->window, rx); if (++nprinted == 1) s->first_line_onscreen = s->lineno; } fsl_free(line); if (nprinted >= 1) s->last_line_onscreen = s->first_line_onscreen + (nprinted - 1); else s->last_line_onscreen = s->first_line_onscreen; drawborder(view); if (s->eof) { while (nprinted++ < view->nlines) waddch(view->window, '\n'); wstandout(view->window); waddstr(view->window, "(END)"); wstandend(view->window); } return rc; |
︙ | ︙ | |||
5047 5048 5049 5050 5051 5052 5053 | return false; } else if (!screen_is_split(view)) return false; return view->active; } | | | | > > > > > > > > > > > > > | | | | > | > > > | > > | | | | > | > > > > > > > | < | > | | | | > | > > | > > > | | > | > | > > > > > | | > > > > > | > | | | < | > > > > > > > > > > | | | < > | > > > | < | > | < < | | < | | | | | | < < < > > | > | > | | > > | > > | > | > < | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > < > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 5604 5605 5606 5607 5608 5609 5610 5611 5612 5613 5614 5615 5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 5628 5629 5630 5631 5632 5633 5634 5635 5636 5637 5638 5639 5640 5641 5642 5643 5644 5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 5656 5657 5658 5659 5660 5661 5662 5663 5664 5665 5666 5667 5668 5669 5670 5671 5672 5673 5674 5675 5676 5677 5678 5679 5680 5681 5682 5683 5684 5685 5686 5687 5688 5689 5690 5691 5692 5693 5694 5695 5696 5697 5698 5699 5700 5701 5702 5703 5704 5705 5706 5707 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717 5718 5719 5720 5721 5722 5723 5724 5725 5726 5727 5728 5729 5730 5731 5732 5733 5734 5735 5736 5737 5738 5739 5740 5741 5742 5743 5744 5745 5746 5747 5748 5749 5750 5751 5752 5753 5754 5755 5756 5757 5758 5759 5760 5761 5762 5763 5764 5765 5766 5767 5768 5769 5770 5771 5772 5773 5774 5775 5776 5777 5778 5779 5780 5781 5782 5783 5784 5785 5786 5787 5788 5789 5790 5791 5792 5793 5794 5795 5796 5797 5798 5799 5800 5801 5802 5803 5804 5805 5806 5807 5808 5809 5810 5811 5812 5813 5814 5815 5816 5817 5818 5819 5820 5821 5822 5823 5824 5825 5826 5827 5828 5829 5830 5831 5832 5833 5834 5835 5836 5837 5838 5839 5840 5841 5842 5843 5844 5845 5846 5847 5848 5849 5850 5851 5852 5853 5854 5855 5856 5857 5858 5859 5860 5861 5862 5863 5864 5865 5866 5867 5868 5869 5870 5871 5872 5873 5874 5875 5876 5877 5878 5879 5880 5881 5882 5883 5884 5885 5886 5887 5888 5889 5890 5891 5892 5893 5894 5895 5896 5897 5898 5899 5900 5901 5902 5903 5904 5905 5906 5907 5908 5909 5910 5911 5912 5913 5914 5915 5916 5917 5918 5919 5920 5921 5922 5923 5924 5925 5926 5927 5928 5929 5930 5931 5932 5933 5934 5935 5936 5937 5938 5939 5940 5941 5942 5943 5944 | return false; } else if (!screen_is_split(view)) return false; return view->active; } static bool view_is_parent(struct fnc_view *view) { return view->parent == NULL; } static bool screen_is_split(struct fnc_view *view) { return view->start_col > 0 || view->start_ln > 0; } static void updatescreen(WINDOW *win, bool panel, bool update) { #ifdef __linux__ wnoutrefresh(win); #else if (panel) update_panels(); #endif if (update) doupdate(); } static int draw_matched_line(struct fnc_view *view, int *col, int offset, regmatch_t *regmatch, attr_t rx) { wchar_t *wcstr; char *s; int rme, rms, skip = view->pos.col, wstrlen; int n = 0, ncols_avail = view->ncols - offset, rc = 0; attr_t hl = A_BOLD | A_REVERSE; *col = 0; rms = regmatch->rm_so; rme = regmatch->rm_eo; /* * Copy line up to string match and draw to screen. Trim preceding skip * chars if scrolled right. Don't copy if skip consumes substring. */ s = fsl_strndup(view->line.buf + skip, MAX(rms - skip, 0)); if (s == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_strndup"); rc = formatln(&wcstr, &wstrlen, s, ncols_avail, offset, 0, false); if (rc) { free(s); return rc; } waddwstr(view->window, wcstr); free(wcstr); free(s); ncols_avail -= wstrlen; *col += wstrlen; /* * Copy string match and draw with highlight. If skip traverses string * match, trim n chars off the front. Don't copy if skip consumed match. */ if (ncols_avail > 0) { int len = rme - rms; if (skip > rms) { n = skip - rms; len = MAX(len - n, 0); } s = fsl_strndup(view->line.buf + rms + n, len); if (s == NULL) { rc = RC(FSL_RC_ERROR, "%s", "fsl_strndup"); free(s); return rc; } rc = formatln(&wcstr, &wstrlen, s, ncols_avail, offset, 0, false); if (rc) { free(s); return rc; } wattron(view->window, COLOR_PAIR(FNC_COLOUR_HL_SEARCH) | hl); waddwstr(view->window, wcstr); wattroff(view->window, COLOR_PAIR(FNC_COLOUR_HL_SEARCH) | hl); free(wcstr); free(s); ncols_avail -= wstrlen; *col += wstrlen; } /* * Write rest of line if not yet at EOL. If skip passes the end of * string match, trim n chars off the front of substring. */ if (ncols_avail > 0 && view->line.sz > rme) { n = 0; if (skip > rme) n = MIN(skip - rme, view->line.sz - rme); rc = formatln(&wcstr, &wstrlen, view->line.buf + rme + n, ncols_avail, offset, 0, false); if (rc) return rc; wattron(view->window, rx); waddwstr(view->window, wcstr); free(wcstr); ncols_avail -= wstrlen; *col += wstrlen; while (--ncols_avail >= 0) { ++(*col); waddch(view->window, ' '); } wattroff(view->window, rx); } return rc; } static void drawborder(struct fnc_view *view) { const struct fnc_view *view_above; char *codeset = nl_langinfo(CODESET); PANEL *panel; if (view->parent) drawborder(view->parent); panel = panel_above(view->panel); if (panel == NULL) return; view_above = panel_userptr(panel); if (view->mode == VIEW_SPLIT_HRZN) mvwhline(view->window, view_above->start_ln - 1, view->start_col, (strcmp(codeset, "UTF-8") == 0) ? ACS_HLINE : '-', view->ncols); else mvwvline(view->window, view->start_ln, view_above->start_col - 1, (strcmp(codeset, "UTF-8") == 0) ? ACS_VLINE : '|', view->nlines); updatescreen(view->window, false, false); } static int diff_input_handler(struct fnc_view **new_view, struct fnc_view *view, int ch) { struct fnc_view *branch_view; struct fnc_diff_view_state *s = &view->state.diff; struct fnc_tl_view_state *tlstate; struct commit_entry *previous_selection; char *line = NULL; ssize_t linelen; size_t linesz = 0; int nlines, i = 0, rc = FSL_RC_OK; uint16_t nscroll = view->nlines - 2; bool tl_down = false; nlines = s->nlines; s->lineno = s->first_line_onscreen - 1 + s->selected_line; switch (ch) { case '0': view->pos.col = 0; break; case '$': view->pos.col = s->maxx - view->ncols / 2; break; case KEY_RIGHT: case 'l': if (view->pos.col + view->ncols / 2 < s->maxx) view->pos.col += 2; break; case KEY_LEFT: case 'h': view->pos.col -= MIN(view->pos.col, 2); break; case CTRL('p'): if (s->selected_commit->diff_type == FNC_DIFF_WIKI) break; if (!((size_t)s->lineno > s->index.lineno[s->index.n - 1])) { if (s->index.idx == 0) s->index.idx = s->index.n - 1; else --s->index.idx; } else s->index.idx = s->index.n - 1; s->first_line_onscreen = s->index.lineno[s->index.idx]; s->selected_line = 1; break; case CTRL('n'): if (s->selected_commit->diff_type == FNC_DIFF_WIKI) break; if (!((size_t)s->lineno < s->index.lineno[0])) { if (++s->index.idx == s->index.n) s->index.idx = 0; } else s->index.idx = 0; s->first_line_onscreen = s->index.lineno[s->index.idx]; s->selected_line = 1; break; case CTRL('e'): if (!s->eof) { ++s->first_line_onscreen; if (s->lineno == nlines) --s->selected_line; } break; case CTRL('y'): if (s->first_line_onscreen > 1) --s->first_line_onscreen; break; case KEY_DOWN: case 'j': if (s->first_line_onscreen + s->selected_line == nlines + 2) break; if (s->selected_line < view->nlines - 1 && s->lineno != nlines) ++s->selected_line; else if (s->last_line_onscreen <= nlines && !s->eof) { ++s->first_line_onscreen; if (s->lineno == nlines) --s->selected_line; } break; case KEY_UP: case 'k': if (s->selected_line > 1) --s->selected_line; else if (s->selected_line == 1 && s->first_line_onscreen > 1) --s->first_line_onscreen; break; case CTRL('d'): nscroll >>= 1; /* FALL THROUGH */ case KEY_NPAGE: case CTRL('f'): case ' ': if (s->eof && s->last_line_onscreen == nlines) { uint16_t move = nlines - s->lineno; s->selected_line += MIN(nscroll, move); break; } while (!s->eof && i++ < nscroll) { linelen = getline(&line, &linesz, s->f); ++s->first_line_onscreen; if (linelen == -1) { if (!feof(s->f)) return RC(ferror(s->f) ? fsl_errno_to_rc(errno, FSL_RC_IO) : FSL_RC_IO, "%s", "getline"); if (s->selected_line > nscroll) s->selected_line = view->nlines - 2; else s->selected_line = nscroll; s->eof = true; break; } } fsl_free(line); break; case CTRL('u'): nscroll >>= 1; /* FALL THROUGH */ case KEY_PPAGE: case CTRL('b'): if (s->first_line_onscreen == 1) { uint16_t move = s->selected_line - 1; s->selected_line -= MIN(nscroll, move); break; } while (i++ < nscroll && s->first_line_onscreen > 1) --s->first_line_onscreen; break; case KEY_END: case 'G': if (nlines < view->nlines - 1) { s->selected_line = nlines; s->first_line_onscreen = 1; } else { s->selected_line = nscroll; s->first_line_onscreen = nlines - view->nlines + 3; } /* * XXX Assume user would expect file navigation (C-n/p) to * follow a jump to the end of the diff. */ s->index.idx = s->index.n - 1; s->eof = true; break; case 'g': if (!fnc_home(view)) break; /* FALL THROUGH */ case KEY_HOME: s->selected_line = 1; s->first_line_onscreen = 1; /* * XXX Assume user would expect file navigation (C-n/p) to * reset after jumping home. */ s->index.idx = 0; break; case 'F': if (s->selected_commit->diff_type == FNC_DIFF_WIKI) break; fsl_buffer buf = fsl_buffer_empty; struct input input; char *end = fsl_mprintf(", ..., %d: ", s->index.n); size_t maxwidth = view->ncols - 12; uint32_t idx = 0; fsl_buffer_append(&buf, "File ", -1); while (++idx <= s->index.n && buf.used < maxwidth) fsl_buffer_appendf(&buf, "%d%s", idx, (idx + 1 < s->index.n ? buf.used + 6 < maxwidth ? ", " : end : (idx < s->index.n ? " or " : ": "))); input = (struct input){(int []){1, s->index.n}, fsl_buffer_str(&buf), INPUT_NUMERIC, true}; rc = fnc_prompt_input(view, &input); if (input.ret) { s->index.idx = input.ret - 1; s->first_line_onscreen = s->index.lineno[s->index.idx]; s->selected_line = 1; } fsl_buffer_clear(&buf); fsl_free(end); break; case 'L': { struct input input = {(int []){1, nlines}, "line: ", INPUT_NUMERIC, true}; rc = fnc_prompt_input(view, &input); s->gtl = input.ret; break; } case '#': s->showln = !s->showln; break; case 'b': { int start_col = 0; if (view_is_parent(view)) start_col = view_split_start_col(view->start_col); branch_view = view_open(view->nlines, view->ncols, view->start_ln, start_col, FNC_VIEW_BRANCH); |
︙ | ︙ | |||
5245 5246 5247 5248 5249 5250 5251 | case 'c': case 'i': case 'v': case 'w': if (ch == 'c') s->colour = !s->colour; if (ch == 'i') | | | | < < < | < | < < < < < < | | < | 5965 5966 5967 5968 5969 5970 5971 5972 5973 5974 5975 5976 5977 5978 5979 5980 5981 5982 5983 5984 5985 5986 5987 5988 5989 5990 5991 5992 5993 5994 5995 5996 5997 | case 'c': case 'i': case 'v': case 'w': if (ch == 'c') s->colour = !s->colour; if (ch == 'i') FLAG_TOG(s->diff_flags, FSL_DIFF2_INVERT); if (ch == 'v') FLAG_TOG(s->diff_flags, FSL_DIFF_VERBOSE); if (ch == 'w') FLAG_TOG(s->diff_flags, FSL_DIFF2_IGNORE_ALLWS); rc = reset_diff_view(view, true); break; case '-': case '_': if (s->context > 0) { --s->context; rc = reset_diff_view(view, true); } break; case '+': case '=': if (s->context < MAX_DIFF_CTX) { ++s->context; rc = reset_diff_view(view, true); } break; case CTRL('j'): case '>': case '.': case 'J': tl_down = true; |
︙ | ︙ | |||
5302 5303 5304 5305 5306 5307 5308 | if (previous_selection == tlstate->selected_commit) break; if ((rc = set_selected_commit(s, tlstate->selected_commit))) break; | > > > > > > | > > | > > | > > > > > | | > > | > > > > > > > | > > | > | > > > > > > > > > > | | < | < | > | > > | > | > > > | | | | | | | | | | | | > > > > > > > > > > > > > > > > > > > > > > | < > | > > | < > | | > > > | < | < | | > > > | > > > > > | | > > > > > > > | > > > < < > > > > > > > > > > > > | | | 6011 6012 6013 6014 6015 6016 6017 6018 6019 6020 6021 6022 6023 6024 6025 6026 6027 6028 6029 6030 6031 6032 6033 6034 6035 6036 6037 6038 6039 6040 6041 6042 6043 6044 6045 6046 6047 6048 6049 6050 6051 6052 6053 6054 6055 6056 6057 6058 6059 6060 6061 6062 6063 6064 6065 6066 6067 6068 6069 6070 6071 6072 6073 6074 6075 6076 6077 6078 6079 6080 6081 6082 6083 6084 6085 6086 6087 6088 6089 6090 6091 6092 6093 6094 6095 6096 6097 6098 6099 6100 6101 6102 6103 6104 6105 6106 6107 6108 6109 6110 6111 6112 6113 6114 6115 6116 6117 6118 6119 6120 6121 6122 6123 6124 6125 6126 6127 6128 6129 6130 6131 6132 6133 6134 6135 6136 6137 6138 6139 6140 6141 6142 6143 6144 6145 6146 6147 6148 6149 6150 6151 6152 6153 6154 6155 6156 6157 6158 6159 6160 6161 6162 6163 6164 6165 6166 6167 6168 6169 6170 6171 6172 6173 6174 6175 6176 6177 6178 6179 6180 6181 6182 6183 6184 6185 6186 6187 6188 6189 6190 6191 6192 6193 6194 6195 6196 6197 6198 6199 6200 6201 6202 6203 6204 6205 6206 6207 6208 6209 6210 6211 6212 6213 6214 6215 6216 6217 6218 6219 6220 6221 6222 6223 6224 6225 6226 6227 6228 6229 6230 6231 6232 6233 6234 6235 6236 6237 6238 6239 6240 6241 6242 6243 6244 6245 6246 6247 6248 6249 6250 6251 6252 6253 6254 6255 6256 6257 6258 6259 6260 6261 6262 6263 | if (previous_selection == tlstate->selected_commit) break; if ((rc = set_selected_commit(s, tlstate->selected_commit))) break; s->selected_line = 1; reset_diff_view(view, false); break; default: break; } return rc; } static int reset_diff_view(struct fnc_view *view, bool stay) { struct fnc_diff_view_state *s = &view->state.diff; int n, rc = FSL_RC_OK; n = s->nlines; free_index(&s->index); show_diff_status(view); rc = create_diff(s); if (rc) return rc; if (stay) { float scale = (float)s->first_line_onscreen / n; s->first_line_onscreen = MAX(1, (int)(s->nlines * scale)); } else { s->first_line_onscreen = 1; view->pos.col = 0; } s->last_line_onscreen = s->first_line_onscreen + view->nlines; s->matched_line = 0; return rc; } static int request_tl_commits(struct fnc_view *view) { struct fnc_tl_view_state *state = &view->state.timeline; int rc = FSL_RC_OK; state->thread_cx.ncommits_needed = state->nscrolled; rc = signal_tl_thread(view, 1); state->nscrolled = 0; return rc; } static int set_selected_commit(struct fnc_diff_view_state *s, struct commit_entry *entry) { fsl_free(s->id2); s->id2 = fsl_strdup(entry->commit->uuid); if (s->id2 == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_strdup"); fsl_free(s->id1); s->id1 = entry->commit->puuid ? fsl_strdup(entry->commit->puuid) : NULL; s->selected_commit = entry->commit; return 0; } static void diff_grep_init(struct fnc_view *view) { struct fnc_diff_view_state *s = &view->state.diff; s->matched_line = 0; } static int find_next_match(struct fnc_view *view) { FILE *f = NULL; off_t *line_offsets = NULL; ssize_t linelen; size_t nlines = 0, linesz = 0; int *first, *last, *match, *selected; int lineno; char *line = NULL; first = last = match = selected = NULL; grep_set_view(view, &f, &line_offsets, &nlines, &first, &last, &match, &selected); if (view->searching == SEARCH_DONE) { view->search_status = SEARCH_CONTINUE; return 0; } if (*match) { if (view->searching == SEARCH_FORWARD) lineno = *match + 1; else lineno = *match - 1; } else { if (view->searching == SEARCH_FORWARD) lineno = 1; else lineno = nlines; } while (1) { off_t offset; if (lineno <= 0 || (size_t)lineno > nlines) { if (*match == 0) { view->search_status = SEARCH_CONTINUE; break; } if (view->searching == SEARCH_FORWARD) lineno = 1; else lineno = nlines; } offset = line_offsets[lineno - 1]; if (fseeko(f, offset, SEEK_SET) != 0) { fsl_free(line); return RC(fsl_errno_to_rc(errno, FSL_RC_IO), "%s", "fseeko"); } /* * Expand tabs for accurate rm_so/rm_eo offsets, and save to * view->line so we don't have to expand when drawing matches. */ linelen = getline(&line, &linesz, f); view->line.sz = expand_tab(view->line.buf, sizeof(view->line.buf), line, linelen); if (linelen != -1 && regexec(&view->regex, view->line.buf, 1, &view->regmatch, 0) == 0) { view->search_status = SEARCH_CONTINUE; *match = lineno; while (view->pos.col > view->regmatch.rm_so) --view->pos.col; /* Scroll till on-screen. */ break; } if (view->searching == SEARCH_FORWARD) ++lineno; else --lineno; } fsl_free(line); /* * If match is on current screen, move to it and highlight; else, * scroll view till matching line is ~1/3rd from the top and highlight. */ if (*match) { if (*match >= *first && *match <= *last) *selected = *match - *first + 1; else { *first = MAX(*match - view->nlines / 3, 1); *selected = *match - *first + 1; } } return FSL_RC_OK; } static void grep_set_view(struct fnc_view *view, FILE **f, off_t **line_offsets, size_t *nlines, int **first, int **last, int **match, int **selected) { if (view->vid == FNC_VIEW_DIFF) { struct fnc_diff_view_state *s = &view->state.diff; *f = s->f; *nlines = s->nlines; *line_offsets = s->line_offsets; *match = &s->matched_line; *first = &s->first_line_onscreen; *last = &s->last_line_onscreen; *selected = &s->selected_line; } else if (view->vid == FNC_VIEW_BLAME) { struct fnc_blame_view_state *s = &view->state.blame; *f = s->blame.f; *nlines = s->blame.nlines; *line_offsets = s->blame.line_offsets; *match = &s->matched_line; *first = &s->first_line_onscreen; *last = &s->last_line_onscreen; *selected = &s->selected_line; } } static int close_diff_view(struct fnc_view *view) { struct fnc_diff_view_state *s = &view->state.diff; int rc = 0; if (s->f && fclose(s->f) == EOF) rc = RC(fsl_errno_to_rc(errno, FSL_RC_IO), "%s", "fclose"); fsl_free(s->id1); s->id1 = NULL; fsl_free(s->id2); s->id2 = NULL; fsl_free(s->line_offsets); free_colours(&s->colours); s->line_offsets = NULL; s->nlines = 0; free_index(&s->index); return rc; } static void free_index(struct index *index) { index->idx = 0; index->n = 0; fsl_free(index->lineno); index->lineno = NULL; fsl_free(index->offset); index->offset = NULL; } static void fnc_resizeterm(void) { struct winsize size; int cols, lines; if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) { cols = 80; lines = 24; } else { cols = size.ws_col; lines = size.ws_row; } resize_term(lines, cols); } static int view_resize(struct fnc_view *view, enum view_mode mode) { int nlines, ncols, rc = FSL_RC_OK; if (view->lines > LINES) nlines = view->nlines - (view->lines - LINES); else nlines = view->nlines + (LINES - view->lines); if (view->cols > COLS) |
︙ | ︙ | |||
5468 5469 5470 5471 5472 5473 5474 | wclear(view->window); view->nlines = nlines; view->ncols = ncols; view->lines = LINES; view->cols = COLS; | | | | | | > > | < | 6272 6273 6274 6275 6276 6277 6278 6279 6280 6281 6282 6283 6284 6285 6286 6287 6288 6289 6290 6291 6292 6293 6294 6295 6296 6297 6298 6299 6300 6301 6302 6303 6304 6305 6306 6307 6308 6309 6310 6311 6312 6313 6314 6315 6316 6317 6318 | wclear(view->window); view->nlines = nlines; view->ncols = ncols; view->lines = LINES; view->cols = COLS; if (view->child && mode != VIEW_SPLIT_NONE) { view->child->start_col = view_split_start_col(view->start_col); if (view->mode == VIEW_SPLIT_HRZN || !view->child->start_col) { rc = make_fullscreen(view->child); if (view->child->active) show_panel(view->child->panel); else show_panel(view->panel); } else { rc = make_splitscreen(view->child); show_panel(view->child->panel); } } return rc; } /* * Consume repeatable arguments containing artifact type values used in * constructing the SQL query to generate commit records of the specified type * for the timeline. n.b. filter_types->values is owned by fcli—do not free. * TODO: Enhance to generalise processing of various repeatable args--paths, * usernames, branches, etc.--so we can filter on multiples of these values. */ static int fcli_flag_type_arg_cb(fcli_cliflag const *v) { struct artifact_types *ft = &fnc_init.filter_types; const char *t = *((const char **)v->flagValue); /* Valid types: ci, e, f, g, t, w */ if (t[2] || (t[1] && (*t != 'c' || t[1] != 'i')) || (!t[1] && (*t != 'e' && *t != 'f' && *t != 'g' && *t != 't' && *t != 'w'))) { fnc_init.err = RC(FSL_RC_TYPE, "invalid type: %s", t); usage(); /* NOT REACHED */ } ft->values = fsl_realloc(ft->values, (ft->nitems + 1) * sizeof(char *)); ft->values[ft->nitems++] = t; |
︙ | ︙ | |||
5585 5586 5587 5588 5589 5590 5591 | exit(fcli_end_of_main(fnc_init.err)); } static void usage_timeline(void) { fsl_fprintf(fnc_init.err ? stderr : stdout, | | | | | | | > | | | > | | > | 6390 6391 6392 6393 6394 6395 6396 6397 6398 6399 6400 6401 6402 6403 6404 6405 6406 6407 6408 6409 6410 6411 6412 6413 6414 6415 6416 6417 6418 6419 6420 6421 6422 6423 6424 6425 6426 6427 6428 6429 6430 6431 6432 6433 6434 6435 6436 6437 6438 6439 6440 6441 6442 6443 6444 6445 6446 6447 6448 6449 6450 6451 6452 6453 6454 6455 6456 6457 6458 6459 6460 6461 6462 6463 6464 6465 6466 6467 6468 6469 6470 6471 6472 6473 6474 6475 6476 6477 | exit(fcli_end_of_main(fnc_init.err)); } static void usage_timeline(void) { fsl_fprintf(fnc_init.err ? stderr : stdout, " usage: %s timeline [-C|--no-colour] [-R path] [-T tag] " "[-b branch] [-c commit] [-f glob] [-h|--help] [-n n] [-t type] " "[-u user] [-z|--utc] [path]\n" " e.g.: %s timeline --type ci -u jimmy src/frobnitz.c\n\n", fcli_progname(), fcli_progname()); } static void usage_diff(void) { fsl_fprintf(fnc_init.err ? stderr : stdout, " usage: %s diff [-C|--no-colour] [-R path] [-h|--help] " "[-i|--invert] [-q|--quiet] [-w|--whitespace] [-x|--context n] " "[artifact1 [artifact2]] [path ...]\n " "e.g.: %s diff --context 3 d34db33f c0ff33 src/*.c\n\n", fcli_progname(), fcli_progname()); } static void usage_tree(void) { fsl_fprintf(fnc_init.err ? stderr : stdout, " usage: %s tree [-C|--no-colour] [-R path] [-c commit] [-h|--help]" " [path]\n" " e.g.: %s tree -c d34dc0d3\n\n" , fcli_progname(), fcli_progname()); } static void usage_blame(void) { fsl_fprintf(fnc_init.err ? stderr : stdout, " usage: %s blame [-C|--no-colour] [-R path] [-c commit [-r]] " "[-h|--help] [-n n] path\n" " e.g.: %s blame -c d34db33f src/foo.c\n\n" , fcli_progname(), fcli_progname()); } static void usage_branch(void) { fsl_fprintf(fnc_init.err ? stderr : stdout, " usage: %s branch [-C|--no-colour] [-R path] [-a|--after date] " "[-b|--before date] [-c|--closed] [-h|--help] [-o|--open] " "[-p|--no-private] [-r|--reverse] [-s|--sort order] [glob]\n" " e.g.: %s branch -b 2020-10-10\n\n" , fcli_progname(), fcli_progname()); } static void usage_config(void) { fsl_fprintf(fnc_init.err ? stderr : stdout, " usage: %s config [-R path] [-h|--help] [--ls] " "[setting [value|--unset]]\n" " e.g.: %s config FNC_DIFF_COMMIT blue\n\n" , fcli_progname(), fcli_progname()); } static int cmd_diff(fcli_command const *argv) { fsl_cx *const f = fcli_cx(); struct fnc_view *view; struct fnc_commit_artifact *commit = NULL; struct fnc_pathlist_head paths; struct fnc_pathlist_entry *pe; fsl_deck d = fsl_deck_empty; fsl_stmt *q = NULL; const char *artifact1 = NULL, *artifact2 = NULL; char *path0 = NULL; fsl_id_t prid = -1, rid = -1; long context = DEF_DIFF_CTX; int rc = FSL_RC_OK; unsigned short blob = 0; enum fnc_diff_type diff_type = FNC_DIFF_CKOUT; bool showmeta = false; rc = fcli_process_flags(argv->flags); if (rc || (rc = fcli_has_unused_flags(false))) return rc; |
︙ | ︙ | |||
5799 5800 5801 5802 5803 5804 5805 5806 5807 5808 5809 5810 | commit->type = fsl_strdup("blob"); commit->diff_type = diff_type; } rc = init_curses(); if (rc) goto end; if (fnc_init.context) { if ((rc = strtonumcheck(&context, fnc_init.context, INT_MIN, INT_MAX))) goto end; | > > > > > > | | 6607 6608 6609 6610 6611 6612 6613 6614 6615 6616 6617 6618 6619 6620 6621 6622 6623 6624 6625 6626 6627 6628 6629 6630 6631 6632 | commit->type = fsl_strdup("blob"); commit->diff_type = diff_type; } rc = init_curses(); if (rc) goto end; #ifdef __OpenBSD__ rc = init_unveil(fsl_cx_db_file_repo(f, NULL), fsl_cx_ckout_dir_name(f, NULL), false); if (rc) goto end; #endif if (fnc_init.context) { if ((rc = strtonumcheck(&context, fnc_init.context, INT_MIN, INT_MAX))) goto end; context = MIN(MAX_DIFF_CTX, context); } view = view_open(0, 0, 0, 0, FNC_VIEW_DIFF); if (view == NULL) { rc = RC(FSL_RC_ERROR, "%s", "view_open"); goto end; } |
︙ | ︙ | |||
5830 5831 5832 5833 5834 5835 5836 | TAILQ_FOREACH(pe, &paths, entry) free((char *)pe->path); fnc_pathlist_free(&paths); return rc; } static int | | | | 6644 6645 6646 6647 6648 6649 6650 6651 6652 6653 6654 6655 6656 6657 6658 6659 6660 6661 6662 6663 6664 | TAILQ_FOREACH(pe, &paths, entry) free((char *)pe->path); fnc_pathlist_free(&paths); return rc; } static int browse_commit_tree(struct fnc_view **new_view, int start_col, int start_ln, struct commit_entry *entry, const char *path) { struct fnc_view *tree_view; int rc = 0; tree_view = view_open(0, 0, start_ln, start_col, FNC_VIEW_TREE); if (tree_view == NULL) return RC(FSL_RC_ERROR, "%s", "view_open"); rc = open_tree_view(tree_view, path, entry->commit->rid); if (rc) return rc; |
︙ | ︙ | |||
5905 5906 5907 5908 5909 5910 5911 5912 5913 5914 5915 5916 5917 5918 | fcli_progname()); goto end; } rc = init_curses(); if (rc) goto end; view = view_open(0, 0, 0, 0, FNC_VIEW_TREE); if (view == NULL) { RC(FSL_RC_ERROR, "%s", "view_open"); goto end; } | > > > > > > | 6719 6720 6721 6722 6723 6724 6725 6726 6727 6728 6729 6730 6731 6732 6733 6734 6735 6736 6737 6738 | fcli_progname()); goto end; } rc = init_curses(); if (rc) goto end; #ifdef __OpenBSD__ rc = init_unveil(fsl_cx_db_file_repo(f, NULL), fsl_cx_ckout_dir_name(f, NULL), false); if (rc) goto end; #endif view = view_open(0, 0, 0, 0, FNC_VIEW_TREE); if (view == NULL) { RC(FSL_RC_ERROR, "%s", "view_open"); goto end; } |
︙ | ︙ | |||
5981 5982 5983 5984 5985 5986 5987 | if (rc) goto end; } view->show = show_tree_view; view->input = tree_input_handler; view->close = close_tree_view; | | | | 6801 6802 6803 6804 6805 6806 6807 6808 6809 6810 6811 6812 6813 6814 6815 6816 | if (rc) goto end; } view->show = show_tree_view; view->input = tree_input_handler; view->close = close_tree_view; view->grep_init = tree_grep_init; view->grep = tree_search_next; end: if (rc) close_tree_view(view); return rc; } /* |
︙ | ︙ | |||
6089 6090 6091 6092 6093 6094 6095 | memset(ptr, 0, sizeof(struct fnc_repository_tree)); rc = fsl_deck_load_rid(f, &d, rid, FSL_SATYPE_CHECKIN); if (rc) return RC(rc, "fsl_deck_load_rid(%d) [%s]", rid, id); rc = fsl_deck_F_rewind(&d); if (rc) | | | | > < | 6909 6910 6911 6912 6913 6914 6915 6916 6917 6918 6919 6920 6921 6922 6923 6924 6925 6926 6927 6928 6929 6930 6931 6932 6933 6934 6935 6936 6937 6938 6939 6940 6941 6942 6943 6944 6945 6946 6947 6948 6949 6950 6951 6952 6953 6954 | memset(ptr, 0, sizeof(struct fnc_repository_tree)); rc = fsl_deck_load_rid(f, &d, rid, FSL_SATYPE_CHECKIN); if (rc) return RC(rc, "fsl_deck_load_rid(%d) [%s]", rid, id); rc = fsl_deck_F_rewind(&d); if (rc) goto end; rc = fsl_deck_F_next(&d, &cf); if (rc) goto end; while (cf) { char *filename = NULL, *uuid = NULL; fsl_time_t mtime; filename = fsl_strdup(cf->name); if (filename == NULL) { rc = RC(FSL_RC_ERROR, "%s", "fsl_strdup"); goto end; } uuid = fsl_strdup(cf->uuid); if (uuid == NULL) { rc = RC(FSL_RC_ERROR, "%s", "fsl_strdup"); goto end; } rc = fsl_mtime_of_F_card(f, rid, cf, &mtime); if (!rc) rc = link_tree_node(ptr, filename, uuid, fsl_unix_to_julian(mtime)); fsl_free(filename); fsl_free(uuid); if (!rc) rc = fsl_deck_F_next(&d, &cf); if (rc) goto end; } end: fsl_deck_finalize(&d); *repo = ptr; return rc; } /* * This routine constructs the (sub)trees that are displayed. The directory dir * and its contents form a subtree, which is an array of tree entries copied |
︙ | ︙ | |||
6222 6223 6224 6225 6226 6227 6228 | * path The repository relative pathname of the versioned file * uuid The SHA hash of the file * mtime Modification time of the file * Returns 0 on success, non-zero on error. */ static int link_tree_node(struct fnc_repository_tree *tree, const char *path, | | | 7042 7043 7044 7045 7046 7047 7048 7049 7050 7051 7052 7053 7054 7055 7056 | * path The repository relative pathname of the versioned file * uuid The SHA hash of the file * mtime Modification time of the file * Returns 0 on success, non-zero on error. */ static int link_tree_node(struct fnc_repository_tree *tree, const char *path, const char *uuid, double mtime) { struct fnc_repo_tree_node *parent_dir; fsl_buffer buf = fsl_buffer_empty; struct stat s; int i, rc = 0; parent_dir = tree->tail; |
︙ | ︙ | |||
6338 6339 6340 6341 6342 6343 6344 | rc = tree_entry_path(&treepath, &s->parents, NULL); if (rc) return rc; rc = draw_tree(view, treepath); fsl_free(treepath); | | | 7158 7159 7160 7161 7162 7163 7164 7165 7166 7167 7168 7169 7170 7171 7172 | rc = tree_entry_path(&treepath, &s->parents, NULL); if (rc) return rc; rc = draw_tree(view, treepath); fsl_free(treepath); drawborder(view); return rc; } /* * Construct absolute repository path of the currently selected tree entry to * display in the tree view header, or pass to open_timeline_view() to construct |
︙ | ︙ | |||
6421 6422 6423 6424 6425 6426 6427 | static int draw_tree(struct fnc_view *view, const char *treepath) { struct fnc_tree_view_state *s = &view->state.tree; struct fnc_tree_entry *te; struct fnc_colour *c = NULL; wchar_t *wcstr; | | | > | 7241 7242 7243 7244 7245 7246 7247 7248 7249 7250 7251 7252 7253 7254 7255 7256 7257 7258 7259 7260 7261 7262 7263 7264 7265 7266 7267 | static int draw_tree(struct fnc_view *view, const char *treepath) { struct fnc_tree_view_state *s = &view->state.tree; struct fnc_tree_entry *te; struct fnc_colour *c = NULL; wchar_t *wcstr; int rc = FSL_RC_OK; int wstrlen, n, idx, nentries; int limit = view->nlines; uint_fast8_t hashlen = FSL_UUID_STRLEN_MIN; s->ndisplayed = 0; werase(view->window); if (limit == 0) return rc; /* Write (highlighted) headline (if view is active in splitscreen). */ rc = formatln(&wcstr, &wstrlen, s->tree_label, view->ncols, 0, 0, false); if (rc) return rc; if (screen_is_shared(view)) wattron(view->window, A_REVERSE); if (s->colour) c = get_colour(&s->colours, FNC_COLOUR_COMMIT); if (c) |
︙ | ︙ | |||
6456 6457 6458 6459 6460 6461 6462 | wattroff(view->window, A_REVERSE); fsl_free(wcstr); wcstr = NULL; if (--limit <= 0) return rc; /* Write this (sub)tree's absolute repository path subheader. */ | | < | | < | > | > | 7277 7278 7279 7280 7281 7282 7283 7284 7285 7286 7287 7288 7289 7290 7291 7292 7293 7294 7295 7296 7297 7298 7299 7300 7301 7302 7303 7304 7305 7306 7307 7308 7309 7310 7311 7312 7313 7314 7315 7316 7317 7318 7319 7320 7321 7322 7323 7324 7325 7326 7327 7328 7329 7330 7331 7332 7333 7334 7335 7336 7337 7338 7339 7340 7341 7342 7343 7344 7345 7346 7347 | wattroff(view->window, A_REVERSE); fsl_free(wcstr); wcstr = NULL; if (--limit <= 0) return rc; /* Write this (sub)tree's absolute repository path subheader. */ rc = formatln(&wcstr, &wstrlen, treepath, view->ncols, 0, 0, false); if (rc) return rc; waddwstr(view->window, wcstr); fsl_free(wcstr); wcstr = NULL; if (wstrlen < view->ncols - 1) waddch(view->window, '\n'); if (--limit <= 0) return rc; waddch(view->window, '\n'); if (--limit <= 0) return rc; /* Write parent dir entry (i.e., "..") if top of the tree is in view. */ if (s->first_entry_onscreen == NULL) { te = &s->tree->entries[0]; if (s->selected_idx == 0) { wattr_on(view->window, A_REVERSE, NULL); s->selected_entry = NULL; } waddstr(view->window, " ..\n"); if (s->selected_idx == 0) wattr_off(view->window, A_REVERSE, NULL); ++s->ndisplayed; if (--limit <= 0) return rc; n = 1; } else { n = 0; te = s->first_entry_onscreen; } nentries = s->tree->nentries; for (idx = 0; idx < nentries; ++idx) /* Find max hash length. */ hashlen = MAX(fsl_strlen(s->tree->entries[idx].uuid), hashlen); /* Iterate and write tree nodes postfixed with path type identifier. */ for (idx = te->idx; idx < nentries; ++idx) { char *line = NULL, *idstr = NULL, *targetlnk = NULL; char iso8601[ISO8601_TIMESTAMP] = {0}; const char *modestr = ""; mode_t mode; if (idx < 0 || idx >= s->tree->nentries) return rc; te = &s->tree->entries[idx]; mode = te->mode; if (s->show_id) { idstr = fsl_strdup(te->uuid); /* Directories don't have UUIDs; pad with "..." dots. */ if (idstr == NULL && !S_ISDIR(mode)) return RC(FSL_RC_ERROR, "%s", "fsl_strdup"); /* If needed, pad SHA1 hash to align w/ SHA3 hashes. */ if (idstr == NULL || fsl_strlen(idstr) < hashlen) { char buf[hashlen], pad = '.'; buf[hashlen] = '\0'; idstr = fsl_mprintf("%s%s", idstr ? idstr : "", (char *)memset(buf, pad, hashlen - fsl_strlen(idstr))); if (idstr == NULL) return RC(FSL_RC_RANGE, "%s", "fsl_mprintf"); idstr[hashlen] = '\0'; |
︙ | ︙ | |||
6541 6542 6543 6544 6545 6546 6547 | } modestr = "@"; } else if (S_ISDIR(mode)) modestr = "/"; else if (mode & S_IXUSR) modestr = "*"; | > > > > > > > | > | | | | > | < | < | < | | | | 7362 7363 7364 7365 7366 7367 7368 7369 7370 7371 7372 7373 7374 7375 7376 7377 7378 7379 7380 7381 7382 7383 7384 7385 7386 7387 7388 7389 7390 7391 7392 7393 7394 7395 7396 7397 7398 7399 7400 7401 7402 7403 7404 7405 7406 7407 7408 7409 7410 | } modestr = "@"; } else if (S_ISDIR(mode)) modestr = "/"; else if (mode & S_IXUSR) modestr = "*"; if (s->show_date) { char *t; if (fsl_julian_to_iso8601(te->mtime, iso8601, false)) *(t = strchr(iso8601, 'T')) = ' '; else rc = FSL_RC_ERROR; } line = fsl_mprintf("%s%s%.*s %s%s%s%s", idstr ? idstr : "", (*iso8601 && idstr) ? " " : "", ISO8601_DATE_HHMM, *iso8601 ? iso8601 : "", te->basename, modestr, targetlnk ? " -> ": "", targetlnk ? targetlnk : ""); fsl_free(idstr); fsl_free(targetlnk); if (rc || line == NULL) return RC(rc ? rc : FSL_RC_RANGE, "%s", rc ? "fsl_julian_to_iso8601" : "fsl_mprintf"); rc = formatln(&wcstr, &wstrlen, line, view->ncols, 0, 0, false); if (rc) { fsl_free(line); break; } if (n == s->selected_idx) { wattr_on(view->window, A_REVERSE, NULL); s->selected_entry = te; } if (s->colour) c = match_colour(&s->colours, line); if (c) wattr_on(view->window, COLOR_PAIR(c->scheme), NULL); waddwstr(view->window, wcstr); if (c) wattr_off(view->window, COLOR_PAIR(c->scheme), NULL); if (wstrlen < view->ncols) waddch(view->window, '\n'); if (n == s->selected_idx) wattr_off(view->window, A_REVERSE, NULL); fsl_free(line); fsl_free(wcstr); wcstr = NULL; ++n; ++s->ndisplayed; s->last_entry_onscreen = te; |
︙ | ︙ | |||
6647 6648 6649 6650 6651 6652 6653 | } static int tree_input_handler(struct fnc_view **new_view, struct fnc_view *view, int ch) { struct fnc_view *branch_view, *timeline_view; struct fnc_tree_view_state *s = &view->state.tree; | < | > < < > > > | 7474 7475 7476 7477 7478 7479 7480 7481 7482 7483 7484 7485 7486 7487 7488 7489 7490 7491 7492 7493 7494 7495 7496 7497 7498 7499 7500 7501 7502 7503 7504 7505 7506 7507 7508 7509 7510 7511 7512 7513 7514 7515 7516 7517 7518 7519 7520 7521 7522 | } static int tree_input_handler(struct fnc_view **new_view, struct fnc_view *view, int ch) { struct fnc_view *branch_view, *timeline_view; struct fnc_tree_view_state *s = &view->state.tree; struct fnc_tree_entry *te; int n, start_col = 0, rc = FSL_RC_OK; uint16_t nscroll = view->nlines - 3; switch (ch) { case 'b': if (view_is_parent(view)) start_col = view_split_start_col(view->start_col); branch_view = view_open(view->nlines, view->ncols, view->start_ln, start_col, FNC_VIEW_BRANCH); if (branch_view == NULL) return RC(FSL_RC_ERROR, "%s", "view_open"); rc = open_branch_view(branch_view, BRANCH_LS_OPEN_CLOSED, NULL, 0, 0); if (rc) { view_close(branch_view); return rc; } view->active = false; branch_view->active = true; if (view_is_parent(view)) { rc = view_close_child(view); if (rc) return rc; view_set_child(view, branch_view); view->focus_child = true; } else *new_view = branch_view; break; case 'c': s->colour = !s->colour; break; case 'd': s->show_date = !s->show_date; break; case 'i': s->show_id = !s->show_id; break; case 't': if (!s->selected_entry) break; if (view_is_parent(view)) |
︙ | ︙ | |||
6732 6733 6734 6735 6736 6737 6738 | } s->first_entry_onscreen = te; te = get_tree_entry(s->tree, te->idx - 1); } if (n > 0) s->selected_idx = n - 1; break; | < < < < < < < < < < < < < < < < < < < | > > > > > > > > > > > | > | > > > > > > > > > > > > > > | 7560 7561 7562 7563 7564 7565 7566 7567 7568 7569 7570 7571 7572 7573 7574 7575 7576 7577 7578 7579 7580 7581 7582 7583 7584 7585 7586 7587 7588 7589 7590 7591 7592 7593 7594 7595 7596 7597 7598 7599 7600 7601 7602 7603 7604 7605 7606 7607 7608 7609 7610 7611 7612 7613 7614 7615 7616 7617 7618 7619 7620 7621 7622 7623 | } s->first_entry_onscreen = te; te = get_tree_entry(s->tree, te->idx - 1); } if (n > 0) s->selected_idx = n - 1; break; case KEY_DOWN: case 'j': if (s->selected_idx < s->ndisplayed - 1) { ++s->selected_idx; break; } if (get_tree_entry(s->tree, s->last_entry_onscreen->idx + 1) == NULL) break; /* Reached last entry. */ tree_scroll_down(view, 1); break; case KEY_UP: case 'k': if (s->selected_idx > 0) { --s->selected_idx; break; } tree_scroll_up(s, 1); break; case CTRL('d'): nscroll >>= 1; /* FALL THROUGH */ case KEY_NPAGE: case CTRL('f'): if (get_tree_entry(s->tree, s->last_entry_onscreen->idx + 1) == NULL) { /* * When the last entry on screen is the last node in the * tree move cursor to it instead of scrolling the view. */ if (s->selected_idx < s->ndisplayed - 1) s->selected_idx += MIN(nscroll, s->ndisplayed - s->selected_idx - 1); break; } tree_scroll_down(view, nscroll); break; case CTRL('u'): nscroll >>= 1; /* FALL THROUGH */ case KEY_PPAGE: case CTRL('b'): if (s->tree == s->root) { if (&s->tree->entries[0] == s->first_entry_onscreen) s->selected_idx -= MIN(s->selected_idx, nscroll); } else { if (s->first_entry_onscreen == NULL) s->selected_idx -= MIN(s->selected_idx, nscroll); } tree_scroll_up(s, nscroll); break; case KEY_BACKSPACE: case KEY_ENTER: case KEY_LEFT: case KEY_RIGHT: case '\r': case 'h': |
︙ | ︙ | |||
6802 6803 6804 6805 6806 6807 6808 6809 6810 6811 6812 6813 6814 6815 6816 6817 6818 6819 6820 6821 | TAILQ_REMOVE(&s->parents, parent, entry); fnc_object_tree_close(s->tree); s->tree = parent->tree; s->first_entry_onscreen = parent->first_entry_onscreen; s->selected_entry = parent->selected_entry; s->selected_idx = parent->selected_idx; fsl_free(parent); } else if (s->selected_entry != NULL && S_ISDIR(s->selected_entry->mode)) { struct fnc_tree_object *subtree = NULL; rc = tree_builder(s->repo, &subtree, s->selected_entry->path); if (rc) break; rc = visit_subtree(s, subtree); if (rc) { fnc_object_tree_close(subtree); break; } | > > > | < < < | < < < < < < < < < < < < < < < > > > > > > > > > > > > > > > > > > > > > > > > | 7637 7638 7639 7640 7641 7642 7643 7644 7645 7646 7647 7648 7649 7650 7651 7652 7653 7654 7655 7656 7657 7658 7659 7660 7661 7662 7663 7664 7665 7666 7667 7668 7669 7670 7671 7672 7673 7674 7675 7676 7677 7678 7679 7680 7681 7682 7683 7684 7685 7686 7687 7688 7689 7690 7691 7692 7693 7694 7695 7696 7697 7698 7699 7700 7701 7702 7703 | TAILQ_REMOVE(&s->parents, parent, entry); fnc_object_tree_close(s->tree); s->tree = parent->tree; s->first_entry_onscreen = parent->first_entry_onscreen; s->selected_entry = parent->selected_entry; s->selected_idx = parent->selected_idx; if (s->selected_idx > view->nlines - 3) offset_selected_line(view); fsl_free(parent); } else if (s->selected_entry != NULL && S_ISDIR(s->selected_entry->mode)) { struct fnc_tree_object *subtree = NULL; rc = tree_builder(s->repo, &subtree, s->selected_entry->path); if (rc) break; rc = visit_subtree(s, subtree); if (rc) { fnc_object_tree_close(subtree); break; } } else if (s->selected_entry != NULL && S_ISREG(s->selected_entry->mode)) rc = blame_selected_file(new_view, view); break; case KEY_RESIZE: if (view->nlines >= 4 && s->selected_idx >= view->nlines - 3) s->selected_idx = view->nlines - 4; break; default: break; } return rc; } static int blame_selected_file(struct fnc_view **new_view, struct fnc_view *view) { fsl_cx *const f = fcli_cx(); struct fnc_tree_view_state *s = &view->state.tree; fsl_buffer buf = fsl_buffer_empty; fsl_id_t fid; int rc = FSL_RC_OK; fid = fsl_uuid_to_rid(f, s->selected_entry->uuid); rc = fsl_content_get(f, fid, &buf); if (rc) goto end; if (fsl_looks_like_binary(&buf)) fnc_print_msg(view, "-- cannot blame binary file --", false, true, true); else rc = request_view(new_view, view, FNC_VIEW_BLAME); end: fsl_buffer_clear(&buf); return rc; } static int timeline_tree_entry(struct fnc_view **new_view, int start_col, struct fnc_tree_view_state *s) { struct fnc_view *timeline_view; char *path; |
︙ | ︙ | |||
6897 6898 6899 6900 6901 6902 6903 | break; } s->first_entry_onscreen = te; te = get_tree_entry(s->tree, te->idx - 1); } } | | | > | | | > | | > > | 7741 7742 7743 7744 7745 7746 7747 7748 7749 7750 7751 7752 7753 7754 7755 7756 7757 7758 7759 7760 7761 7762 7763 7764 7765 7766 7767 7768 7769 7770 7771 7772 7773 7774 7775 7776 7777 7778 | break; } s->first_entry_onscreen = te; te = get_tree_entry(s->tree, te->idx - 1); } } static int tree_scroll_down(struct fnc_view *view, int maxscroll) { struct fnc_tree_view_state *s = &view->state.tree; struct fnc_tree_entry *next, *last; int n = 0; if (s->first_entry_onscreen) next = get_tree_entry(s->tree, s->first_entry_onscreen->idx + 1); else next = &s->tree->entries[0]; last = s->last_entry_onscreen; while (next && n++ < maxscroll) { if (last) last = get_tree_entry(s->tree, last->idx + 1); if (last || (view->mode == VIEW_SPLIT_HRZN && next)) { s->first_entry_onscreen = next; next = get_tree_entry(s->tree, next->idx + 1); } } return FSL_RC_OK; } static int visit_subtree(struct fnc_tree_view_state *s, struct fnc_tree_object *subtree) { struct fnc_parent_tree *parent; |
︙ | ︙ | |||
6941 6942 6943 6944 6945 6946 6947 | s->selected_idx = 0; s->first_entry_onscreen = NULL; return 0; } static int | | | | | < | > | < > | < > > | 7789 7790 7791 7792 7793 7794 7795 7796 7797 7798 7799 7800 7801 7802 7803 7804 7805 7806 7807 7808 7809 7810 7811 7812 7813 7814 7815 7816 7817 7818 7819 7820 7821 7822 7823 7824 7825 7826 7827 7828 7829 7830 7831 7832 7833 7834 7835 7836 7837 7838 7839 7840 7841 7842 7843 7844 7845 7846 7847 7848 7849 7850 7851 7852 7853 7854 7855 7856 7857 7858 7859 7860 7861 7862 7863 7864 7865 7866 7867 7868 7869 | s->selected_idx = 0; s->first_entry_onscreen = NULL; return 0; } static int blame_tree_entry(struct fnc_view **new_view, int start_col, int start_ln, struct fnc_tree_entry *te, struct fnc_parent_trees *parents, fsl_uuid_str commit_id) { struct fnc_view *blame_view; char *path; int rc = 0; *new_view = NULL; rc = tree_entry_path(&path, parents, te); if (rc) return rc; blame_view = view_open(0, 0, start_ln, start_col, FNC_VIEW_BLAME); if (blame_view == NULL) { rc = RC(FSL_RC_ERROR, "%s", "view_open"); goto end; } rc = open_blame_view(blame_view, path, commit_id, 0, 0); if (rc) view_close(blame_view); else *new_view = blame_view; end: fsl_free(path); return rc; } static void tree_grep_init(struct fnc_view *view) { struct fnc_tree_view_state *s = &view->state.tree; s->matched_entry = NULL; } static int tree_search_next(struct fnc_view *view) { struct fnc_tree_view_state *s = &view->state.tree; struct fnc_tree_entry *te = NULL; int rc = FSL_RC_OK; if (view->searching == SEARCH_DONE) { view->search_status = SEARCH_CONTINUE; return rc; } if (s->matched_entry) { if (view->searching == SEARCH_FORWARD) { if (s->selected_entry) te = get_tree_entry(s->tree, s->selected_entry->idx + 1); else te = &s->tree->entries[0]; } else { if (s->selected_entry == NULL) te = &s->tree->entries[s->tree->nentries - 1]; else te = get_tree_entry(s->tree, s->selected_entry->idx - 1); } } else { if (s->selected_entry) te = s->selected_entry; if (view->searching == SEARCH_FORWARD) te = &s->tree->entries[0]; else te = &s->tree->entries[s->tree->nentries - 1]; } while (1) { |
︙ | ︙ | |||
7032 7033 7034 7035 7036 7037 7038 | if (match_tree_entry(te, &view->regex)) { view->search_status = SEARCH_CONTINUE; s->matched_entry = te; break; } if (view->searching == SEARCH_FORWARD) | | | > > > > > > > > | | > | 7881 7882 7883 7884 7885 7886 7887 7888 7889 7890 7891 7892 7893 7894 7895 7896 7897 7898 7899 7900 7901 7902 7903 7904 7905 7906 7907 7908 7909 7910 7911 | if (match_tree_entry(te, &view->regex)) { view->search_status = SEARCH_CONTINUE; s->matched_entry = te; break; } if (view->searching == SEARCH_FORWARD) te = get_tree_entry(s->tree, te->idx + 1); else te = get_tree_entry(s->tree, te->idx - 1); } if (s->matched_entry) { int idx = s->matched_entry->idx; bool parent = !s->first_entry_onscreen; if (idx >= (parent ? 0 : s->first_entry_onscreen->idx) && idx <= s->last_entry_onscreen->idx) s->selected_idx = idx - (parent ? - 1 : s->first_entry_onscreen->idx); else { s->first_entry_onscreen = s->matched_entry; s->selected_idx = 0; } } return rc; } static int match_tree_entry(struct fnc_tree_entry *te, regex_t *regex) |
︙ | ︙ | |||
7146 7147 7148 7149 7150 7151 7152 | } fsl_free(repo); } static int cmd_config(const fcli_command *argv) { | | > | > > > > > > > > > > > | | | | | | | | | | | < < < < < < | | | | | < < < < < < | | | < < < < < < < | | 8004 8005 8006 8007 8008 8009 8010 8011 8012 8013 8014 8015 8016 8017 8018 8019 8020 8021 8022 8023 8024 8025 8026 8027 8028 8029 8030 8031 8032 8033 8034 8035 8036 8037 8038 8039 8040 8041 8042 8043 8044 8045 8046 8047 8048 8049 8050 8051 8052 8053 8054 8055 8056 8057 8058 8059 8060 8061 8062 8063 8064 8065 8066 8067 8068 8069 8070 8071 8072 8073 8074 8075 8076 8077 8078 8079 8080 8081 8082 8083 8084 8085 8086 8087 8088 8089 8090 8091 8092 8093 8094 8095 8096 8097 8098 8099 8100 8101 8102 8103 8104 8105 8106 8107 8108 8109 8110 8111 8112 8113 8114 8115 8116 8117 8118 8119 8120 8121 8122 8123 8124 | } fsl_free(repo); } static int cmd_config(const fcli_command *argv) { const char *opt = NULL, *value = NULL; char *prev, *v; enum fnc_opt_id setid; int rc = FSL_RC_OK; #ifdef __OpenBSD__ const fsl_cx *const f = fcli_cx(); fsl_buffer buf = fsl_buffer_empty; fsl_file_dirpart(fsl_cx_db_file_repo(f, NULL), -1, &buf, false); rc = init_unveil(fsl_buffer_cstr(&buf), fsl_cx_ckout_dir_name(f, NULL), true); if (rc) return rc; #endif rc = fcli_process_flags(argv->flags); if (rc || (rc = fcli_has_unused_flags(false))) return rc; opt = fcli_next_arg(true); if (opt == NULL || fnc_init.lsconf) { if (fnc_init.unset) { fnc_init.err = RC(FSL_RC_MISSING_INFO, "%s", "-u|--unset requires <setting>"); usage(); /* NOT REACHED */ } return fnc_conf_lsopt(fnc_init.lsconf ? false : true); } setid = fnc_conf_str2enum(opt); if (!setid) return RC(FSL_RC_NOT_FOUND, "invalid setting: %s", opt); value = fcli_next_arg(true); if (value || fnc_init.unset) { if (value && fnc_init.unset) return RC(FSL_RC_MISUSE, "\n--unset or set %s to %s?", opt, value); prev = fnc_conf_getopt(setid, true); rc = fnc_conf_setopt(setid, value, fnc_init.unset); if (!rc) f_out("%s: %s -> %s (local)", fnc_conf_enum2str(setid), prev ? prev : "default", value ? value : "default"); fsl_free(prev); } else { v = fnc_conf_getopt(setid, true); f_out("%s = %s", fnc_conf_enum2str(setid), v ? v : "default"); fsl_free(v); } return rc; } static int fnc_conf_lsopt(bool all) { char *value = NULL; int idx, last = 0; size_t maxlen = 0; for (idx = FNC_START_SETTINGS + 1; idx < FNC_EOF_SETTINGS; ++idx) { last = (value = fnc_conf_getopt(idx, true)) ? idx : last; maxlen = MAX(fsl_strlen(fnc_opt_name[idx]), maxlen); fsl_free(value); } if (!last && !all) { f_out("No user-defined settings: " "'%s config' for list of available settings.", fcli_progname()); return 0; } for (idx = FNC_START_SETTINGS + 1; idx < FNC_EOF_SETTINGS; ++idx) { value = fnc_conf_getopt(idx, true); if (value || all) f_out("%-*s%s%s%c", maxlen + 2, fnc_opt_name[idx], value ? " = " : "", value ? value : "", all ? (idx + 1 < FNC_EOF_SETTINGS ? '\n' : '\0') : idx < last ? '\n' : '\0'); fsl_free(value); value = NULL; } return 0; } static enum fnc_opt_id fnc_conf_str2enum(const char *str) { enum fnc_opt_id idx; for (idx = FNC_START_SETTINGS + 1; idx < FNC_EOF_SETTINGS; ++idx) if (!fsl_stricmp(str, fnc_opt_name[idx])) return idx; return FNC_START_SETTINGS; } static const char * fnc_conf_enum2str(enum fnc_opt_id id) { if (id <= FNC_START_SETTINGS || id >= FNC_EOF_SETTINGS) return NULL; return fnc_opt_name[id]; } static int view_close_child(struct fnc_view *view) { int rc = 0; |
︙ | ︙ | |||
7281 7282 7283 7284 7285 7286 7287 7288 7289 7290 7291 7292 | } static void view_set_child(struct fnc_view *view, struct fnc_view *child) { view->child = child; child->parent = view; } static int set_colours(struct fnc_colours *s, enum fnc_view_id vid) { | > > > > > > > > > > | | 8132 8133 8134 8135 8136 8137 8138 8139 8140 8141 8142 8143 8144 8145 8146 8147 8148 8149 8150 8151 8152 8153 8154 8155 8156 8157 8158 8159 8160 8161 | } static void view_set_child(struct fnc_view *view, struct fnc_view *child) { view->child = child; child->parent = view; /* * If the timeline is open and has not yet loaded /all/ commits, cached * stmts require resetting the commit builder stmt before restepping. */ if (view->vid == FNC_VIEW_TIMELINE) { struct fnc_tl_thread_cx *tcx = &view->state.timeline.thread_cx; if (tcx && !tcx->eotl) tcx->reset = true; } } static int set_colours(struct fnc_colours *s, enum fnc_view_id vid) { int rc = FSL_RC_OK; switch (vid) { case FNC_VIEW_DIFF: { static const char *regexp_diff[] = { "^((checkin|wiki|ticket|technote) " "[0-9a-f]|hash [+-] |\\[[+~>-]] |[+-]{3} )", "^user:", "^date:", "^tags:", "^-", "^\\+", "^@@" |
︙ | ︙ | |||
7362 7363 7364 7365 7366 7367 7368 7369 7370 7371 7372 7373 7374 7375 | nitems(regexp_branch)); break; } default: rc = RC(FSL_RC_TYPE, "invalid fnc_view_id: %s", vid); } return rc; } static int set_colour_scheme(struct fnc_colours *colours, const int (*pairs)[2], const char **regexp, int n) { | > > | 8223 8224 8225 8226 8227 8228 8229 8230 8231 8232 8233 8234 8235 8236 8237 8238 | nitems(regexp_branch)); break; } default: rc = RC(FSL_RC_TYPE, "invalid fnc_view_id: %s", vid); } init_pair(FNC_COLOUR_HL_SEARCH, init_colour(FNC_COLOUR_HL_SEARCH), -1); return rc; } static int set_colour_scheme(struct fnc_colours *colours, const int (*pairs)[2], const char **regexp, int n) { |
︙ | ︙ | |||
7397 7398 7399 7400 7401 7402 7403 | STAILQ_INSERT_HEAD(colours, colour, entries); } return rc; } static int | | | | 8260 8261 8262 8263 8264 8265 8266 8267 8268 8269 8270 8271 8272 8273 8274 8275 8276 8277 8278 8279 | STAILQ_INSERT_HEAD(colours, colour, entries); } return rc; } static int init_colour(enum fnc_opt_id id) { char *val = NULL; int rc = 0; val = fnc_conf_getopt(id, false); if (val == NULL) return default_colour(id); if (!fsl_stricmp(val, "black")) rc = COLOR_BLACK; else if (!fsl_stricmp(val, "red")) |
︙ | ︙ | |||
7439 7440 7441 7442 7443 7444 7445 | * found, return a dynamically allocated string obtained from fsl_db_g_text() or * strdup(), which must be disposed of by the caller. Alternatively, if ls is * set, search local settings and envvars for id. If found, dynamically allocate * and return a formatted string for pretty printing the current state of id, * which the caller must free. In either case, if not found, return NULL. */ static char * | | | | | | | | | | | | | | | | > | < < < < < < < | | | | | < | < | < | | | | | | | > | | | | | | | > | | 8302 8303 8304 8305 8306 8307 8308 8309 8310 8311 8312 8313 8314 8315 8316 8317 8318 8319 8320 8321 8322 8323 8324 8325 8326 8327 8328 8329 8330 8331 8332 8333 8334 8335 8336 8337 8338 8339 8340 8341 8342 8343 8344 8345 8346 8347 8348 8349 8350 8351 8352 8353 8354 8355 8356 8357 8358 8359 8360 8361 8362 8363 8364 8365 8366 8367 8368 8369 8370 8371 8372 8373 8374 8375 8376 8377 8378 8379 8380 | * found, return a dynamically allocated string obtained from fsl_db_g_text() or * strdup(), which must be disposed of by the caller. Alternatively, if ls is * set, search local settings and envvars for id. If found, dynamically allocate * and return a formatted string for pretty printing the current state of id, * which the caller must free. In either case, if not found, return NULL. */ static char * fnc_conf_getopt(enum fnc_opt_id id, bool ls) { fsl_cx *const f = fcli_cx(); fsl_db *db = NULL; char *optval = NULL, *envvar = NULL; db = fsl_needs_repo(f); if (!db) { /* Theoretically, this shouldn't happen. */ RC(FSL_RC_DB, "%s", "fsl_needs_repo"); return NULL; } optval = fsl_db_g_text(db, NULL, "SELECT value FROM config WHERE name=%Q", fnc_conf_enum2str(id)); if (optval == NULL || ls) envvar = fsl_strdup(getenv(fnc_conf_enum2str(id))); if (ls && (optval || envvar)) { char *showopt = fsl_mprintf("%s%s%s%s%s", optval ? optval : "", optval ? " (local)" : "", optval && envvar ? ", " : "", envvar ? envvar : "", envvar ? " (envvar)" : ""); fsl_free(optval); fsl_free(envvar); optval = showopt; } return ls ? optval : (optval ? optval : envvar); } static int default_colour(enum fnc_opt_id id) { switch (id) { case FNC_COLOUR_COMMIT: case FNC_COLOUR_DIFF_META: case FNC_COLOUR_TREE_EXEC: case FNC_COLOUR_BRANCH_CURRENT: return COLOR_GREEN; case FNC_COLOUR_USER: case FNC_COLOUR_DIFF_PLUS: case FNC_COLOUR_TREE_DIR: case FNC_COLOUR_BRANCH_OPEN: return COLOR_CYAN; case FNC_COLOUR_DATE: case FNC_COLOUR_DIFF_CHUNK: case FNC_COLOUR_BRANCH_PRIVATE: return COLOR_YELLOW; case FNC_COLOUR_DIFF_MINUS: case FNC_COLOUR_DIFF_TAGS: case FNC_COLOUR_TREE_LINK: case FNC_COLOUR_BRANCH_CLOSED: return COLOR_MAGENTA; case FNC_COLOUR_HL_SEARCH: return COLOR_YELLOW; default: return -1; /* Terminal default foreground colour. */ } } static int fnc_conf_setopt(enum fnc_opt_id id, const char *val, bool unset) { fsl_cx *const f = fcli_cx(); fsl_db *db = NULL; db = fsl_needs_repo(f); if (!db) /* Theoretically, this shouldn't happen. */ |
︙ | ︙ | |||
7599 7600 7601 7602 7603 7604 7605 | cmd_blame(fcli_command const *argv) { fsl_cx *const f = fcli_cx(); struct fnc_view *view; char *path = NULL; fsl_uuid_str commit_id = NULL; fsl_id_t tip = 0, rid = 0; | | > | 8455 8456 8457 8458 8459 8460 8461 8462 8463 8464 8465 8466 8467 8468 8469 8470 | cmd_blame(fcli_command const *argv) { fsl_cx *const f = fcli_cx(); struct fnc_view *view; char *path = NULL; fsl_uuid_str commit_id = NULL; fsl_id_t tip = 0, rid = 0; long nlimit = 0; int rc = 0; rc = fcli_process_flags(argv->flags); if (rc || (rc = fcli_has_unused_flags(false))) goto end; if (!fcli_next_arg(false)) { rc = RC(FSL_RC_MISSING_INFO, "%s blame requires versioned file path", fcli_progname()); |
︙ | ︙ | |||
7638 7639 7640 7641 7642 7643 7644 | rc = fsl_sym_to_rid(f, "tip", FSL_SATYPE_CHECKIN, &tip); if (rc) goto end; } rc = fsl_sym_to_rid(f, fnc_init.sym, FSL_SATYPE_CHECKIN, &rid); if (rc) goto end; | | > > > | > > > > > > > > | 8495 8496 8497 8498 8499 8500 8501 8502 8503 8504 8505 8506 8507 8508 8509 8510 8511 8512 8513 8514 8515 8516 8517 8518 8519 8520 8521 8522 8523 8524 8525 8526 8527 8528 8529 8530 8531 8532 8533 8534 8535 8536 8537 8538 8539 | rc = fsl_sym_to_rid(f, "tip", FSL_SATYPE_CHECKIN, &tip); if (rc) goto end; } rc = fsl_sym_to_rid(f, fnc_init.sym, FSL_SATYPE_CHECKIN, &rid); if (rc) goto end; } else if (!fnc_init.sym) { fsl_ckout_version_info(f, &rid, NULL); if (!rid) /* -R|--repo option used */ fsl_sym_to_rid(f, "tip", FSL_SATYPE_CHECKIN, &rid); } rc = map_repo_path(&path); if (rc) { if (rc != FSL_RC_NOT_FOUND || !fnc_init.sym) goto end; /* Path may be valid in repository tree of specified commit. */ rc = 0; fcli_err_reset(); } commit_id = fsl_rid_to_uuid(f, rid); if (rc || (path[0] == '/' && path[1] == '\0')) { rc = rc ? rc : RC(FSL_RC_MISSING_INFO, "%s blame requires versioned file path", fcli_progname()); goto end; } rc = init_curses(); if (rc) goto end; #ifdef __OpenBSD__ rc = init_unveil(fsl_cx_db_file_repo(f, NULL), fsl_cx_ckout_dir_name(f, NULL), false); if (rc) goto end; #endif view = view_open(0, 0, 0, 0, FNC_VIEW_BLAME); if (view == NULL) { rc = RC(FSL_RC_ERROR, "%s", view_open); goto end; } |
︙ | ︙ | |||
7717 7718 7719 7720 7721 7722 7723 | if (rc) return rc; } view->show = show_blame_view; view->input = blame_input_handler; view->close = close_blame_view; | | | | 8585 8586 8587 8588 8589 8590 8591 8592 8593 8594 8595 8596 8597 8598 8599 8600 | if (rc) return rc; } view->show = show_blame_view; view->input = blame_input_handler; view->close = close_blame_view; view->grep_init = blame_grep_init; view->grep = find_next_match; return run_blame(view); } static int run_blame(struct fnc_view *view) { |
︙ | ︙ | |||
7759 7760 7761 7762 7763 7764 7765 7766 7767 7768 7769 7770 7771 7772 | rc = RC(FSL_RC_NOT_FOUND, "'%s' not found in tree [%s]", filepath, s->blamed_commit->id); goto end; } rc = fsl_card_F_content(f, cf, &buf); if (rc) goto end; /* * We load f with the actual file content to map line offsets so we * accurately find tokens when running a search. */ blame->f = tmpfile(); if (blame->f == NULL) { | > > > > | 8627 8628 8629 8630 8631 8632 8633 8634 8635 8636 8637 8638 8639 8640 8641 8642 8643 8644 | rc = RC(FSL_RC_NOT_FOUND, "'%s' not found in tree [%s]", filepath, s->blamed_commit->id); goto end; } rc = fsl_card_F_content(f, cf, &buf); if (rc) goto end; if (fsl_looks_like_binary(&buf)) { rc = RC(FSL_RC_DIFF_BINARY, "%s", "cannot blame binary file"); goto end; } /* * We load f with the actual file content to map line offsets so we * accurately find tokens when running a search. */ blame->f = tmpfile(); if (blame->f == NULL) { |
︙ | ︙ | |||
7842 7843 7844 7845 7846 7847 7848 | s->blame_complete = false; if (s->first_line_onscreen + view->nlines - 1 > blame->nlines) { s->first_line_onscreen = 1; s->last_line_onscreen = view->nlines; s->selected_line = 1; } | | > | 8714 8715 8716 8717 8718 8719 8720 8721 8722 8723 8724 8725 8726 8727 8728 8729 | s->blame_complete = false; if (s->first_line_onscreen + view->nlines - 1 > blame->nlines) { s->first_line_onscreen = 1; s->last_line_onscreen = view->nlines; s->selected_line = 1; } s->matched_line = 0; s->maxx = &blame->thread_cx.cb_cx->maxlen; end: fsl_free(master); fsl_free(root); fsl_deck_finalize(&d); fsl_buffer_clear(&buf); if (rc) stop_blame(blame); |
︙ | ︙ | |||
7877 7878 7879 7880 7881 7882 7883 | if (filesz) *filesz = 0; if (nlines) *nlines = 0; len = buf->used; if (len == 0) | | | | 8750 8751 8752 8753 8754 8755 8756 8757 8758 8759 8760 8761 8762 8763 8764 8765 | if (filesz) *filesz = 0; if (nlines) *nlines = 0; len = buf->used; if (len == 0) return rc; /* empty file */ if (nlines) { if (line_offsets && *line_offsets == NULL) { *nlines = 1; nalloc = alloc_chunksz; *line_offsets = calloc(nalloc, sizeof(**line_offsets)); if (*line_offsets == NULL) return RC(fsl_errno_to_rc(errno, FSL_RC_ERROR), |
︙ | ︙ | |||
7972 7973 7974 7975 7976 7977 7978 | halfdelay(1); /* Fast refresh while annotating. */ } if (s->blame_complete) cbreak(); /* Return to blocking mode. */ rc = draw_blame(view); | | | 8845 8846 8847 8848 8849 8850 8851 8852 8853 8854 8855 8856 8857 8858 8859 | halfdelay(1); /* Fast refresh while annotating. */ } if (s->blame_complete) cbreak(); /* Return to blocking mode. */ rc = draw_blame(view); drawborder(view); return rc; } static void * blame_thread(void *state) { |
︙ | ︙ | |||
8047 8048 8049 8050 8051 8052 8053 8054 8055 8056 8057 8058 8059 8060 8061 8062 8063 8064 8065 8066 8067 8068 8069 8070 8071 8072 | /* -r can return lines with no version, so use root check-in. */ if (opt->originRid && !line->id) { line->id = fsl_strdup(cx->root_commit); line->annotated = true; } ++cx->nlines; end: rc = pthread_mutex_unlock(&fnc_mutex); if (rc) rc = RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_unlock"); return rc; } static int draw_blame(struct fnc_view *view) { struct fnc_blame_view_state *s = &view->state.blame; struct fnc_blame *blame = &s->blame; struct fnc_blame_line *blame_line; regmatch_t *regmatch = &view->regmatch; struct fnc_colour *c = NULL; wchar_t *wcstr; char *line = NULL; | > > | | > | < < < | < | | 8920 8921 8922 8923 8924 8925 8926 8927 8928 8929 8930 8931 8932 8933 8934 8935 8936 8937 8938 8939 8940 8941 8942 8943 8944 8945 8946 8947 8948 8949 8950 8951 8952 8953 8954 8955 8956 8957 8958 8959 8960 8961 8962 8963 8964 8965 8966 8967 8968 8969 8970 8971 8972 8973 | /* -r can return lines with no version, so use root check-in. */ if (opt->originRid && !line->id) { line->id = fsl_strdup(cx->root_commit); line->annotated = true; } line->lineno = step->lineNumber; cx->maxlen = MAX(step->lineLength, cx->maxlen); ++cx->nlines; end: rc = pthread_mutex_unlock(&fnc_mutex); if (rc) rc = RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_unlock"); return rc; } static int draw_blame(struct fnc_view *view) { struct fnc_blame_view_state *s = &view->state.blame; struct fnc_blame *blame = &s->blame; struct fnc_blame_line *blame_line; regmatch_t *regmatch = &view->regmatch; struct fnc_colour *c = NULL; wchar_t *wcstr; char *line = NULL; fsl_uuid_str prev_id = NULL; ssize_t linelen; size_t linesz = 0; int width, lineno = 0, nprinted = 0; int rc = FSL_RC_OK; int npad = 0; const int idfield = 11; /* Prefix + space. */ bool selected; rewind(blame->f); werase(view->window); if ((line = fsl_mprintf("checkin %s", s->blamed_commit->id)) == NULL) { rc = RC(fsl_errno_to_rc(errno, FSL_RC_ERROR), "%s", "fsl_mprintf"); return rc; } rc = formatln(&wcstr, &width, line, view->ncols, 0, 0, false); fsl_free(line); line = NULL; if (rc) return rc; if (screen_is_shared(view)) wattron(view->window, A_REVERSE); if (s->colour) |
︙ | ︙ | |||
8112 8113 8114 8115 8116 8117 8118 | if (screen_is_shared(view)) wattroff(view->window, A_REVERSE); fsl_free(wcstr); wcstr = NULL; if (width < view->ncols - 1) waddch(view->window, '\n'); | | | | < | > > > > | > | > | < | | 8984 8985 8986 8987 8988 8989 8990 8991 8992 8993 8994 8995 8996 8997 8998 8999 9000 9001 9002 9003 9004 9005 9006 9007 9008 9009 9010 9011 9012 9013 9014 9015 9016 9017 9018 9019 9020 9021 9022 9023 9024 9025 9026 9027 9028 9029 9030 9031 9032 9033 9034 9035 9036 9037 9038 9039 9040 9041 9042 9043 9044 | if (screen_is_shared(view)) wattroff(view->window, A_REVERSE); fsl_free(wcstr); wcstr = NULL; if (width < view->ncols - 1) waddch(view->window, '\n'); line = fsl_mprintf("[%d/%d] %s%s%s %c", s->gtl ? s->gtl : MIN(blame->nlines, s->first_line_onscreen - 1 + s->selected_line), blame->nlines, s->blame_complete ? "" : "annotating... ", fnc_init.sym ? "/" : "", s->path, s->blame_complete ? ' ' : SPINNER[s->spin_idx]); if (SPINNER[++s->spin_idx] == '\0') s->spin_idx = 0; rc = formatln(&wcstr, &width, line, view->ncols, 0, 0, false); fsl_free(line); line = NULL; if (rc) return rc; waddwstr(view->window, wcstr); fsl_free(wcstr); wcstr = NULL; if (width < view->ncols - 1) waddch(view->window, '\n'); s->eof = false; while (nprinted < view->nlines - 2) { attr_t rx = 0; linelen = getline(&line, &linesz, blame->f); if (linelen == -1) { if (feof(blame->f)) { s->eof = true; break; } fsl_free(line); return RC(ferror(blame->f) ? fsl_errno_to_rc(errno, FSL_RC_IO) : FSL_RC_IO, "%s", "getline"); } if (++lineno < s->first_line_onscreen) continue; if (s->gtl) if (!gotoline(view, &lineno, &nprinted)) continue; if ((selected = nprinted == s->selected_line - 1)) { rx = A_BOLD | A_REVERSE; wattron(view->window, rx); } if (blame->nlines > 0) { blame_line = &blame->lines[lineno - 1]; if (blame_line->annotated && prev_id && !fsl_uuidcmp(prev_id, blame_line->id) && !selected) { waddstr(view->window, " "); } else if (blame_line->annotated) { char *id_str; id_str = fsl_strndup(blame_line->id, idfield - 1); if (id_str == NULL) { fsl_free(line); |
︙ | ︙ | |||
8182 8183 8184 8185 8186 8187 8188 8189 8190 8191 8192 8193 | COLOR_PAIR(c->scheme), NULL); fsl_free(id_str); prev_id = blame_line->id; } else { waddstr(view->window, ".........."); prev_id = NULL; } } else { waddstr(view->window, ".........."); prev_id = NULL; } | > > > | | | | < | | > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > | 9058 9059 9060 9061 9062 9063 9064 9065 9066 9067 9068 9069 9070 9071 9072 9073 9074 9075 9076 9077 9078 9079 9080 9081 9082 9083 9084 9085 9086 9087 9088 9089 9090 9091 9092 9093 9094 9095 9096 9097 9098 9099 9100 9101 9102 9103 9104 9105 9106 9107 9108 9109 9110 9111 9112 9113 9114 9115 9116 9117 9118 9119 9120 9121 9122 9123 9124 9125 9126 9127 9128 9129 9130 9131 9132 9133 9134 9135 9136 9137 9138 9139 9140 9141 9142 9143 9144 9145 9146 9147 9148 9149 9150 9151 9152 9153 9154 9155 9156 9157 9158 9159 9160 9161 9162 9163 9164 9165 9166 9167 9168 9169 9170 9171 9172 9173 9174 9175 9176 9177 9178 9179 9180 9181 9182 9183 9184 9185 9186 9187 9188 9189 9190 9191 9192 9193 9194 9195 9196 9197 9198 9199 9200 9201 9202 9203 9204 9205 9206 9207 9208 9209 9210 9211 9212 9213 9214 | COLOR_PAIR(c->scheme), NULL); fsl_free(id_str); prev_id = blame_line->id; } else { waddstr(view->window, ".........."); prev_id = NULL; } if (s->showln) npad = draw_lineno(view, blame->nlines, blame_line->lineno, rx); } else { waddstr(view->window, ".........."); prev_id = NULL; } if (selected) wattroff(view->window, rx); waddch(view->window, ' '); if (view->ncols <= idfield) { width = idfield; wcstr = wcsdup(L""); if (wcstr == NULL) { rc = RC(fsl_errno_to_rc(errno, FSL_RC_RANGE), "%s", "wcsdup"); fsl_free(line); return rc; } } else if (s->first_line_onscreen + nprinted == s->matched_line && regmatch->rm_so >= 0 && regmatch->rm_so < regmatch->rm_eo) { rc = draw_matched_line(view, &width, idfield + npad, regmatch, 0); if (rc) { fsl_free(line); return rc; } width += idfield; } else { rc = formatln(&wcstr, &width, line, view->ncols - idfield - npad, idfield + npad, view->pos.col, true); waddwstr(view->window, wcstr); fsl_free(wcstr); wcstr = NULL; width += idfield; } if (width + npad <= view->ncols - 1) waddch(view->window, '\n'); if (++nprinted == 1) s->first_line_onscreen = lineno; } fsl_free(line); s->last_line_onscreen = lineno; drawborder(view); return rc; } /* * Draw column of line numbers up to nlines for the given view. */ static int draw_lineno(struct fnc_view *view, int nlines, int lineno, attr_t rx) { int npad = 0; ndigits(npad, nlines); /* Number of digits to pad. */ wattron(view->window, rx | A_BOLD); wprintw(view->window, " %*d ", npad, lineno); if (view->vid == FNC_VIEW_BLAME) /* Don't highlight separator. */ wattroff(view->window, A_REVERSE); waddch(view->window, (strcmp(nl_langinfo(CODESET), "UTF-8") == 0) ? ACS_VLINE : '|'); wattroff(view->window, rx | A_BOLD); npad += 3; /* {ap,pre}pended ' ' + line separator */ return npad; } static bool gotoline(struct fnc_view *view, int *lineno, int *nprinted) { FILE *f = NULL; int *first, *selected, *gtl; bool *eof; if (view->vid == FNC_VIEW_BLAME) { struct fnc_blame_view_state *s = &view->state.blame; first = &s->first_line_onscreen; selected = &s->selected_line; gtl = &s->gtl; eof = &s->eof; f = s->blame.f; } else if (view->vid == FNC_VIEW_DIFF) { struct fnc_diff_view_state *s = &view->state.diff; first = &s->first_line_onscreen; selected = &s->selected_line; gtl = &s->gtl; eof = &s->eof; f = s->f; } else return false; if (*first != 1 && (*lineno >= *gtl - (view->nlines - 3) / 2)) { rewind(f); *nprinted = 0; *eof = false; *first = 1; *lineno = 0; return false; } if (*lineno < *gtl - (view->nlines - 3) / 2) return false; *selected = *gtl <= (view->nlines - 3) / 2 ? *gtl : (view->nlines - 3) / 2 + 1; *gtl = 0; return true; } static int blame_input_handler(struct fnc_view **new_view, struct fnc_view *view, int ch) { struct fnc_view *branch_view, *diff_view; struct fnc_blame_view_state *s = &view->state.blame; int start_col = 0, rc = FSL_RC_OK; uint16_t nscroll = view->nlines - 2; switch (ch) { case '0': view->pos.col = 0; break; case '$': view->pos.col = *s->maxx - view->ncols / 2; break; case KEY_RIGHT: case 'l': if ((size_t)view->pos.col + view->ncols / 2 < *s->maxx) view->pos.col += 2; break; case KEY_LEFT: case 'h': view->pos.col -= MIN(view->pos.col, 2); break; case 'q': s->done = true; if (s->selected_commit) fnc_commit_artifact_close(s->selected_commit); break; case 'c': s->colour = !s->colour; |
︙ | ︙ | |||
8267 8268 8269 8270 8271 8272 8273 | s->first_line_onscreen = 1; } else { s->selected_line = view->nlines - 2; s->first_line_onscreen = s->blame.nlines - (view->nlines - 3); } break; | < < < < < < < < < < < < < < < < < < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 9227 9228 9229 9230 9231 9232 9233 9234 9235 9236 9237 9238 9239 9240 9241 9242 9243 9244 9245 9246 9247 9248 9249 9250 9251 9252 9253 9254 9255 9256 9257 9258 9259 9260 9261 9262 9263 9264 9265 9266 9267 9268 9269 9270 9271 9272 9273 9274 9275 9276 9277 9278 9279 9280 9281 9282 9283 9284 9285 9286 9287 9288 9289 9290 9291 9292 9293 9294 9295 9296 9297 9298 9299 9300 | s->first_line_onscreen = 1; } else { s->selected_line = view->nlines - 2; s->first_line_onscreen = s->blame.nlines - (view->nlines - 3); } break; case KEY_DOWN: case 'j': if (s->selected_line < view->nlines - 2 && s->first_line_onscreen + s->selected_line <= s->blame.nlines) ++s->selected_line; else if (s->last_line_onscreen < s->blame.nlines) ++s->first_line_onscreen; break; case KEY_UP: case 'k': if (s->selected_line > 1) --s->selected_line; else if (s->selected_line == 1 && s->first_line_onscreen > 1) --s->first_line_onscreen; break; case CTRL('d'): nscroll >>= 1; /* FALL THROUGH */ case KEY_NPAGE: case CTRL('f'): case ' ': if (s->last_line_onscreen >= s->blame.nlines) { if (s->selected_line >= MIN(s->blame.nlines, view->nlines - 2)) break; s->selected_line += MIN(nscroll, s->last_line_onscreen - s->first_line_onscreen - s->selected_line + 1); break; } if (s->last_line_onscreen + nscroll <= s->blame.nlines) s->first_line_onscreen += nscroll; else s->first_line_onscreen = s->blame.nlines - (view->nlines - 3); break; case CTRL('u'): nscroll >>= 1; /* FALL THROUGH */ case KEY_PPAGE: case CTRL('b'): if (s->first_line_onscreen == 1) { s->selected_line = MAX(1, s->selected_line - nscroll); break; } if (s->first_line_onscreen > nscroll) s->first_line_onscreen -= nscroll; else s->first_line_onscreen = 1; break; case 'L': { struct input input = {(int []){1, s->blame.nlines}, "line: ", INPUT_NUMERIC, true}; rc = fnc_prompt_input(view, &input); s->gtl = input.ret; break; } case '#': s->showln = !s->showln; break; case 'b': case 'p': { fsl_uuid_cstr id = NULL; id = get_selected_commit_id(s->blame.lines, s->blame.nlines, s->first_line_onscreen, s->selected_line); if (id == NULL) break; |
︙ | ︙ | |||
8331 8332 8333 8334 8335 8336 8337 | if (fsl_deck_F_search(&d, s->path + (fnc_init.sym ? 0 : 1)) == NULL) { char *m = fsl_mprintf("-- %s not in [%.12s] --", s->path + (fnc_init.sym ? 0 : 1), pid); if (m == NULL) rc = RC(FSL_RC_ERROR, "%s", "fsl_mprintf"); | < | < < < < < < | 9324 9325 9326 9327 9328 9329 9330 9331 9332 9333 9334 9335 9336 9337 9338 | if (fsl_deck_F_search(&d, s->path + (fnc_init.sym ? 0 : 1)) == NULL) { char *m = fsl_mprintf("-- %s not in [%.12s] --", s->path + (fnc_init.sym ? 0 : 1), pid); if (m == NULL) rc = RC(FSL_RC_ERROR, "%s", "fsl_mprintf"); fnc_print_msg(view, m, true, true, true); fsl_deck_finalize(&d); fsl_free(pid); fsl_free(m); break; } rc = fnc_commit_qid_alloc(&s->blamed_commit, pid); if (rc) |
︙ | ︙ | |||
8439 8440 8441 8442 8443 8444 8445 | start_col = view_split_start_col(view->start_col); diff_view = view_open(0, 0, 0, start_col, FNC_VIEW_DIFF); if (diff_view == NULL) { fnc_commit_artifact_close(commit); rc = RC(FSL_RC_ERROR, "%s", "view_open"); break; } | | | 9425 9426 9427 9428 9429 9430 9431 9432 9433 9434 9435 9436 9437 9438 9439 | start_col = view_split_start_col(view->start_col); diff_view = view_open(0, 0, 0, start_col, FNC_VIEW_DIFF); if (diff_view == NULL) { fnc_commit_artifact_close(commit); rc = RC(FSL_RC_ERROR, "%s", "view_open"); break; } rc = open_diff_view(diff_view, commit, DEF_DIFF_CTX, fnc_init.ws, fnc_init.invert, !fnc_init.quiet, NULL, true, NULL); s->selected_commit = commit; if (rc) { fnc_commit_artifact_close(commit); view_close(diff_view); break; |
︙ | ︙ | |||
8462 8463 8464 8465 8466 8467 8468 | view->focus_child = true; } else *new_view = diff_view; if (rc) break; break; } | < < < < < < < < < < < < < < < < < < | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 9448 9449 9450 9451 9452 9453 9454 9455 9456 9457 9458 9459 9460 9461 9462 9463 9464 9465 9466 9467 9468 9469 9470 9471 9472 9473 9474 9475 9476 9477 9478 9479 | view->focus_child = true; } else *new_view = diff_view; if (rc) break; break; } case KEY_RESIZE: if (s->selected_line > view->nlines - 2) { s->selected_line = MIN(s->blame.nlines, view->nlines - 2); } break; default: break; } return rc; } static void blame_grep_init(struct fnc_view *view) { struct fnc_blame_view_state *s = &view->state.blame; s->matched_line = 0; } static fsl_uuid_cstr get_selected_commit_id(struct fnc_blame_line *lines, int nlines, int first_line_onscreen, int selected_line) { struct fnc_blame_line *line; |
︙ | ︙ | |||
8630 8631 8632 8633 8634 8635 8636 | static int stop_blame(struct fnc_blame *blame) { int idx, rc = 0; if (blame->thread_id) { | | | 9528 9529 9530 9531 9532 9533 9534 9535 9536 9537 9538 9539 9540 9541 9542 | static int stop_blame(struct fnc_blame *blame) { int idx, rc = 0; if (blame->thread_id) { intptr_t retval; rc = pthread_mutex_unlock(&fnc_mutex); if (rc) return RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), "%s", "pthread_mutex_unlock"); rc = pthread_join(blame->thread_id, (void **)&retval); if (rc) return RC(fsl_errno_to_rc(rc, FSL_RC_ACCESS), |
︙ | ︙ | |||
8748 8749 8750 8751 8752 8753 8754 | when = fnc_init.after ? 1 : -1; rc = fnc_date_to_mtime(&dateline, d, when); if (rc) return rc; } glob = fsl_strdup(fcli_next_arg(true)); | | > > > > > > > > > | < < | < < | | | | > > | 9646 9647 9648 9649 9650 9651 9652 9653 9654 9655 9656 9657 9658 9659 9660 9661 9662 9663 9664 9665 9666 9667 9668 9669 9670 9671 9672 9673 9674 9675 9676 9677 9678 9679 9680 9681 9682 9683 9684 9685 9686 9687 9688 9689 9690 9691 9692 9693 9694 9695 9696 9697 9698 9699 9700 9701 9702 9703 9704 9705 9706 9707 9708 9709 9710 9711 9712 9713 9714 9715 | when = fnc_init.after ? 1 : -1; rc = fnc_date_to_mtime(&dateline, d, when); if (rc) return rc; } glob = fsl_strdup(fcli_next_arg(true)); rc = init_curses(); if (rc) goto end; #ifdef __OpenBSD__ const fsl_cx *const f = fcli_cx(); rc = init_unveil(fsl_cx_db_file_repo(f, NULL), fsl_cx_ckout_dir_name(f, NULL), false); if (rc) goto end; #endif view = view_open(0, 0, 0, 0, FNC_VIEW_BRANCH); if (view == NULL) { rc = RC(FSL_RC_ERROR, "%s", "view_open"); goto end; } rc = open_branch_view(view, branch_flags, glob, dateline, when); if (!rc) rc = view_loop(view); end: fsl_free(glob); return rc; } static int open_branch_view(struct fnc_view *view, int branch_flags, const char *glob, double dateline, int when) { struct fnc_branch_view_state *s = &view->state.branch; int rc = 0; s->selected_branch = 0; s->colour = !fnc_init.nocolour && has_colors(); s->branch_flags = branch_flags; s->branch_glob = glob; s->dateline = dateline; s->when = when; rc = fnc_load_branches(s); if (rc) goto end; if (s->colour) { STAILQ_INIT(&s->colours); rc = set_colours(&s->colours, FNC_VIEW_BRANCH); } view->show = show_branch_view; view->input = branch_input_handler; view->close = close_branch_view; view->grep_init = branch_grep_init; view->grep = branch_search_next; end: if (rc) fnc_free_branches(&s->branches); return rc; } static int fnc_load_branches(struct fnc_branch_view_state *s) { fsl_cx *const f = fcli_cx(); |
︙ | ︙ | |||
8838 8839 8840 8841 8842 8843 8844 | " FROM tmp_brlist WHERE isclosed", -1); break; } if (rc) goto end; if (s->branch_glob) { | > > | > | | > | 9743 9744 9745 9746 9747 9748 9749 9750 9751 9752 9753 9754 9755 9756 9757 9758 9759 9760 9761 9762 9763 | " FROM tmp_brlist WHERE isclosed", -1); break; } if (rc) goto end; if (s->branch_glob) { char *op = NULL, *str = NULL; rc = fnc_make_sql_glob(&op, &str, s->branch_glob, !fnc_str_has_upper(s->branch_glob)); if (!rc) fsl_buffer_appendf(&sql, " AND name %q %Q", op, str); fsl_free(op); fsl_free(str); if (rc) goto end; } if (FLAG_CHK(s->branch_flags, BRANCH_LS_NO_PRIVATE)) { rc = fsl_buffer_append(&sql, " AND NOT isprivate", -1); if (rc) |
︙ | ︙ | |||
8913 8914 8915 8916 8917 8918 8919 | return rc; } static int create_tmp_branchlist_table(void) { fsl_cx *const f = fcli_cx(); | | | 9822 9823 9824 9825 9826 9827 9828 9829 9830 9831 9832 9833 9834 9835 9836 | return rc; } static int create_tmp_branchlist_table(void) { fsl_cx *const f = fcli_cx(); fsl_db *db = fsl_needs_repo(f); /* -R|--repo option */ static const char tmp_branchlist_table[] = "CREATE TEMP TABLE IF NOT EXISTS tmp_brlist AS " "SELECT tagxref.value AS name," " max(event.mtime) AS mtime," " EXISTS(SELECT 1 FROM tagxref AS tx WHERE tx.rid=tagxref.rid" " AND tx.tagid=(SELECT tagid FROM tag WHERE tagname='closed')" " AND tx.tagtype > 0) AS isclosed," |
︙ | ︙ | |||
8939 8940 8941 8942 8943 8944 8945 | " AND tagxref.tagtype>0" " AND tag.tagname='branch'" " AND event.objid=tagxref.rid " "GROUP BY 1;"; int rc = 0; if (!db) | | | 9848 9849 9850 9851 9852 9853 9854 9855 9856 9857 9858 9859 9860 9861 9862 | " AND tagxref.tagtype>0" " AND tag.tagname='branch'" " AND event.objid=tagxref.rid " "GROUP BY 1;"; int rc = 0; if (!db) return RC(FSL_RC_NOT_A_CKOUT, "%s", "fsl_needs_repo"); rc = fsl_db_exec(db, tmp_branchlist_table); return rc ? RC(fsl_cx_uplift_db_error2(f, db, rc), "%s", "fsl_db_exec") : rc; } static int |
︙ | ︙ | |||
9049 9050 9051 9052 9053 9054 9055 | be = s->first_branch_onscreen; if ((line = fsl_mprintf("branches [%d/%d]", be->idx + s->selected + 1, s->nbranches)) == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_mprintf"); | | | 9958 9959 9960 9961 9962 9963 9964 9965 9966 9967 9968 9969 9970 9971 9972 | be = s->first_branch_onscreen; if ((line = fsl_mprintf("branches [%d/%d]", be->idx + s->selected + 1, s->nbranches)) == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_mprintf"); rc = formatln(&wline, &width, line, view->ncols, 0, 0, false); if (rc) { fsl_free(line); return rc; } if (screen_is_shared(view)) wattron(view->window, A_REVERSE); waddwstr(view->window, wline); |
︙ | ︙ | |||
9089 9090 9091 9092 9093 9094 9095 | s->show_date ? be->branch->date : 0); if (line == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_mprintf"); if (s->colour) c = match_colour(&s->colours, line); | | | 9998 9999 10000 10001 10002 10003 10004 10005 10006 10007 10008 10009 10010 10011 10012 | s->show_date ? be->branch->date : 0); if (line == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_mprintf"); if (s->colour) c = match_colour(&s->colours, line); rc = formatln(&wline, &width, line, view->ncols, 0, 0, false); if (rc) { fsl_free(line); return rc; } if (n == s->selected) { if (view->active) |
︙ | ︙ | |||
9120 9121 9122 9123 9124 9125 9126 | ++n; ++s->ndisplayed; --limit; s->last_branch_onscreen = be; be = TAILQ_NEXT(be, entries); } | | | | > < < | | | > > | < < > | > | | | | > > | | 10029 10030 10031 10032 10033 10034 10035 10036 10037 10038 10039 10040 10041 10042 10043 10044 10045 10046 10047 10048 10049 10050 10051 10052 10053 10054 10055 10056 10057 10058 10059 10060 10061 10062 10063 10064 10065 10066 10067 10068 10069 10070 10071 10072 10073 10074 10075 10076 10077 10078 10079 10080 10081 10082 10083 10084 10085 10086 | ++n; ++s->ndisplayed; --limit; s->last_branch_onscreen = be; be = TAILQ_NEXT(be, entries); } drawborder(view); return rc; } static int branch_input_handler(struct fnc_view **new_view, struct fnc_view *view, int ch) { struct fnc_branch_view_state *s = &view->state.branch; struct fnc_view *tree_view; struct fnc_branchlist_entry *be; int start_col = 0, n, rc = FSL_RC_OK; uint16_t nscroll = view->nlines - 1; switch (ch) { case 'c': s->colour = !s->colour; break; case 'd': s->show_date = !s->show_date; break; case 'i': s->show_id = !s->show_id; break; case KEY_ENTER: case '\r': case ' ': if (!s->selected_branch) break; rc = request_view(new_view, view, FNC_VIEW_TIMELINE); break; case 's': /* * Toggle branch list sort order (cf. branch --sort option): * lexicographical (default) -> most recently used -> state */ if (FLAG_CHK(s->branch_flags, BRANCH_SORT_MTIME)) { FLAG_CLR(s->branch_flags, BRANCH_SORT_MTIME); FLAG_SET(s->branch_flags, BRANCH_SORT_STATUS); } else if (FLAG_CHK(s->branch_flags, BRANCH_SORT_STATUS)) FLAG_CLR(s->branch_flags, BRANCH_SORT_STATUS); else FLAG_SET(s->branch_flags, BRANCH_SORT_MTIME); fnc_free_branches(&s->branches); rc = fnc_load_branches(s); break; case 't': if (!s->selected_branch) break; if (view_is_parent(view)) start_col = view_split_start_col(view->start_col); rc = browse_branch_tree(&tree_view, start_col, |
︙ | ︙ | |||
9220 9221 9222 9223 9224 9225 9226 | if (s->selected < s->ndisplayed - 1) { ++s->selected; break; } if (TAILQ_NEXT(s->last_branch_onscreen, entries) == NULL) /* Reached last entry. */ break; | | > > > | | > > > > | | < < < < < < < < < < < < < < < < < < < < < < < < | 10132 10133 10134 10135 10136 10137 10138 10139 10140 10141 10142 10143 10144 10145 10146 10147 10148 10149 10150 10151 10152 10153 10154 10155 10156 10157 10158 10159 10160 10161 10162 10163 10164 10165 10166 10167 10168 10169 10170 10171 10172 10173 10174 10175 10176 10177 10178 10179 10180 10181 10182 10183 10184 10185 10186 10187 10188 10189 | if (s->selected < s->ndisplayed - 1) { ++s->selected; break; } if (TAILQ_NEXT(s->last_branch_onscreen, entries) == NULL) /* Reached last entry. */ break; branch_scroll_down(view, 1); break; case CTRL('u'): nscroll >>= 1; /* FALL THROUGH */ case KEY_PPAGE: case CTRL('b'): if (s->first_branch_onscreen == TAILQ_FIRST(&s->branches)) s->selected -= MIN(nscroll, s->selected); branch_scroll_up(s, nscroll); break; case CTRL('d'): nscroll >>= 1; /* FALL THROUGH */ case KEY_NPAGE: case CTRL('f'): if (TAILQ_NEXT(s->last_branch_onscreen, entries) == NULL) { /* No more entries off-page; move cursor down. */ if (s->selected < s->ndisplayed - 1) s->selected += MIN(nscroll, s->ndisplayed - s->selected - 1); break; } branch_scroll_down(view, nscroll); break; case CTRL('l'): case 'R': fnc_free_branches(&s->branches); s->branch_glob = NULL; /* Shared pointer. */ s->when = 0; s->branch_flags = BRANCH_LS_OPEN_CLOSED; rc = fnc_load_branches(s); break; case KEY_RESIZE: if (view->nlines >= 2 && s->selected >= view->nlines - 1) s->selected = view->nlines - 2; break; default: break; } return rc; } static int browse_branch_tree(struct fnc_view **new_view, int start_col, struct fnc_branchlist_entry *be) { struct fnc_view *tree_view; fsl_id_t rid; int rc = 0; |
︙ | ︙ | |||
9323 9324 9325 9326 9327 9328 9329 | if (be == NULL) break; s->first_branch_onscreen = be; be = TAILQ_PREV(be, fnc_branchlist_head, entries); } } | | | > | > | > | | < | 10218 10219 10220 10221 10222 10223 10224 10225 10226 10227 10228 10229 10230 10231 10232 10233 10234 10235 10236 10237 10238 10239 10240 10241 10242 10243 10244 10245 10246 10247 10248 10249 10250 10251 10252 10253 10254 10255 10256 10257 10258 10259 10260 10261 | if (be == NULL) break; s->first_branch_onscreen = be; be = TAILQ_PREV(be, fnc_branchlist_head, entries); } } static int branch_scroll_down(struct fnc_view *view, int maxscroll) { struct fnc_branch_view_state *s = &view->state.branch; struct fnc_branchlist_entry *next, *last; int idx = 0; if (s->first_branch_onscreen) next = TAILQ_NEXT(s->first_branch_onscreen, entries); else next = TAILQ_FIRST(&s->branches); last = s->last_branch_onscreen; while (next && last && idx++ < maxscroll) { last = TAILQ_NEXT(last, entries); if (last) { s->first_branch_onscreen = next; next = TAILQ_NEXT(next, entries); } } return FSL_RC_OK; } static void branch_grep_init(struct fnc_view *view) { struct fnc_branch_view_state *s = &view->state.branch; s->matched_branch = NULL; } static int branch_search_next(struct fnc_view *view) { struct fnc_branch_view_state *s = &view->state.branch; struct fnc_branchlist_entry *be = NULL; |
︙ | ︙ | |||
9412 9413 9414 9415 9416 9417 9418 | if (view->searching == SEARCH_FORWARD) be = TAILQ_NEXT(be, entries); else be = TAILQ_PREV(be, fnc_branchlist_head, entries); } if (s->matched_branch) { | > > > > > | | | | > | | 10309 10310 10311 10312 10313 10314 10315 10316 10317 10318 10319 10320 10321 10322 10323 10324 10325 10326 10327 10328 10329 10330 10331 10332 10333 | if (view->searching == SEARCH_FORWARD) be = TAILQ_NEXT(be, entries); else be = TAILQ_PREV(be, fnc_branchlist_head, entries); } if (s->matched_branch) { int idx = s->matched_branch->idx; if (idx >= s->first_branch_onscreen->idx && idx <= s->last_branch_onscreen->idx) s->selected = idx - s->first_branch_onscreen->idx; else { s->first_branch_onscreen = s->matched_branch; s->selected = 0; } } return FSL_RC_OK; } static int match_branchlist_entry(struct fnc_branchlist_entry *be, regex_t *regex) { regmatch_t regmatch; |
︙ | ︙ | |||
9577 9578 9579 9580 9581 9582 9583 | static void fnc_show_version(void) { printf("%s %s\n", fcli_progname(), PRINT_VERSION); } static int | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 10480 10481 10482 10483 10484 10485 10486 10487 10488 10489 10490 10491 10492 10493 10494 10495 10496 10497 10498 10499 10500 10501 10502 10503 10504 10505 10506 10507 10508 10509 10510 10511 10512 10513 10514 10515 10516 10517 10518 10519 10520 10521 10522 10523 10524 10525 10526 10527 10528 10529 10530 10531 10532 10533 10534 10535 10536 10537 10538 10539 10540 10541 10542 10543 10544 10545 10546 10547 10548 10549 10550 10551 10552 10553 10554 10555 10556 10557 10558 10559 10560 10561 10562 10563 10564 10565 10566 10567 10568 10569 10570 10571 10572 10573 10574 10575 10576 10577 10578 10579 10580 10581 | static void fnc_show_version(void) { printf("%s %s\n", fcli_progname(), PRINT_VERSION); } static int strtonumcheck(long *ret, const char *nstr, const int min, const int max) { const char *ptr; int n; ptr = NULL; errno = 0; n = strtonum(nstr, min, max, &ptr); if (errno == ERANGE) return RC(FSL_RC_RANGE, "<n> out of range: -n|--limit=%s [%s]", nstr, ptr); else if (errno != 0 || errno == EINVAL) return RC(FSL_RC_MISUSE, "<n> not a number: -n|--limit=%s [%s]", nstr, ptr); else if (ptr && *ptr != '\0') return RC(FSL_RC_MISUSE, "invalid char in <n>: -n|--limit=%s [%s]", nstr, ptr); *ret = n; return FSL_RC_OK; } static int fnc_prompt_input(struct fnc_view *view, struct input *input) { int rc = FSL_RC_OK; if (input->prompt) fnc_print_msg(view, input->prompt, input->clear, false, false); rc = cook_input(input->buf, sizeof(input->buf), view->window); if (rc || !input->buf[0]) return rc; if (input->type == INPUT_NUMERIC) { long n = 0; int min = INT_MIN, max = INT_MAX; if (input->data) { min = *(int *)input->data; max = ((int *)input->data)[1]; } rc = strtonumcheck(&n, input->buf, min, max); if (rc == FSL_RC_MISUSE) fnc_print_msg(view, "-- numeric input only --", true, true, true); else if (rc == FSL_RC_RANGE || n < min || n > max) fnc_print_msg(view, "-- line outside file range --", true, true, true); else input->ret = n; rc = FSL_RC_OK; fcli_err_reset(); } return rc; } static int cook_input(char *ret, int sz, WINDOW *win) { int rc; nocbreak(); echo(); rc = wgetnstr(win, ret, sz); cbreak(); noecho(); raw(); return rc == ERR ? FSL_RC_ERROR : FSL_RC_OK; } static void fnc_print_msg(struct fnc_view *view, const char *msg, bool clear, bool update, bool zzz) { wattr_on(view->window, A_BOLD, NULL); mvwaddstr(view->window, view->nlines - 1, 0, msg); if (clear) wclrtoeol(view->window); wattr_off(view->window, A_BOLD, NULL); if (update) { update_panels(); doupdate(); } if (zzz) sleep(1); } /* * Attempt to parse string d, which must resemble either an ISO8601 formatted * date (e.g., 2021-10-10, 2020-01-01T10:10:10), disgregarding any trailing * garbage or space characters such that "2021-10-10x" or "2020-01-01 10:10:10" * will pass, or an _unambiguous_ DD/MM/YYYY or MM/DD/YYYY formatted date. Upon |
︙ | ︙ | |||
9660 9661 9662 9663 9664 9665 9666 9667 | *token++ = '\0'; *ptr = token; } else *ptr = NULL; return s; } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 10630 10631 10632 10633 10634 10635 10636 10637 10638 10639 10640 10641 10642 10643 10644 10645 10646 10647 10648 10649 10650 10651 10652 10653 10654 10655 10656 10657 10658 10659 10660 10661 10662 10663 10664 10665 10666 10667 10668 10669 10670 10671 10672 10673 10674 10675 10676 10677 10678 10679 10680 10681 10682 10683 10684 10685 10686 10687 10688 10689 10690 10691 10692 10693 10694 10695 10696 10697 10698 10699 10700 10701 10702 10703 10704 10705 10706 10707 10708 10709 10710 10711 10712 10713 10714 10715 | *token++ = '\0'; *ptr = token; } else *ptr = NULL; return s; } static bool fnc_str_has_upper(const char *str) { int idx; for (idx = 0; str[idx]; ++idx) if (fsl_isupper(str[idx])) return true; return false; } /* * If fold is true, construct a pairing for SQL queries using the SQLite LIKE * operator to fold case with dynamically allocated strings such that: * *op = "LIKE" * *glob = "%%%%str%%%%" * Otherwise, construct a case-sensitive pairing: * *op = "GLOB" * *glob = "*str*" * Both *op and *glob must be disposed of by the caller. Return non-zero on * allocation failure, else return zero. */ static int fnc_make_sql_glob(char **op, char **glob, const char *str, bool fold) { if (fold) { *op = fsl_strdup("LIKE"); if (*op == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_strdup"); *glob = fsl_mprintf("%%%%%s%%%%", str); if (*glob == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_mprintf"); } else { *op = fsl_strdup("GLOB"); if (*op == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_strdup"); *glob = fsl_mprintf("*%s*", str); if (*glob == NULL) return RC(FSL_RC_ERROR, "%s", "fsl_mprintf"); } return 0; } #ifdef __OpenBSD__ /* * Read permissions for the below unveil() calls are self-evident; we need * to read the repository and ckout databases, and ckout dir for most all fnc * operations. Write and create permissions are briefly listed inline, but we * effectively veil the entire fs except the repo db, ckout dir, and /tmp. */ static int init_unveil(const char *repodb, const char *ckoutdir, bool cfg) { /* w repo db for 'fnc config' command: fnc_conf_setopt(). */ if (unveil(repodb, cfg ? "rwc" : "rw") == -1) return RC(fsl_errno_to_rc(errno, FSL_RC_ACCESS), "unveil(%s, \"rw\")", repodb); /* w .fslckout for fsl_ckout_changes_scan() in cmd_diff(). */ if (unveil(ckoutdir, "rw") == -1) return RC(fsl_errno_to_rc(errno, FSL_RC_ACCESS), "unveil(%s, \"rw\")", ckoutdir); /* rwc /tmp for tmpfile() in help(), create_diff(), and run_blame(). */ if (unveil(P_tmpdir, "rwc") == -1) return RC(fsl_errno_to_rc(errno, FSL_RC_ACCESS), "unveil(%s, \"rwc\")", P_tmpdir); if (unveil(NULL, NULL) == -1) return RC(fsl_errno_to_rc(errno, FSL_RC_ACCESS), "%s", "unveil"); return FSL_RC_OK; } #endif |