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 |       [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 |       # 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, |