더시드위키
최근 변경
최근 토론
임의 문서
도구
최근 변경
사용자:
Topoi/patch-7982fe078c2b4a25260c1bfdeb4f78df3b1e641225c3006bdd06dc78c766c2c9
(r4 RAW)
나무위키 파서 개발하다 빡쳐서 쓴 내용들 {{{#!syntax diff diff --git a/builtin/commit.c b/builtin/commit.c index 2f45968222..25e26a2f70 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -125,7 +125,7 @@ static int all, also, interactive, patch_interactive, only, amend, signoff; static int edit_flag = -1; /* unspecified */ static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship; static int config_commit_verbose = -1; /* unspecified */ -static int no_post_rewrite, allow_empty_message, pathspec_file_nul; +static int no_post_rewrite, allow_empty_message = 1, pathspec_file_nul; static const char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg; static const char *sign_commit, *pathspec_from_file; static struct strvec trailer_args = STRVEC_INIT; }}} 문제는 이대로 빌드하면 unit test가 실패하는 듯하다. {{{#!syntax sh error: builder for '/nix/store/m9iqhqfxxqs7p6jdj2jcf9aq2ygfiv0a-git-2.47.2.drv' failed with exit code 2; last 25 log lines: > t3404-rebase-interactive.sh (Wstat: 256 (exited 1) Tests: 131 Failed: 3) > Failed tests: 42-44 > Non-zero exit status: 1 > t7500-commit-template-squash-signoff.sh (Wstat: 256 (exited 1) Tests: 54 Failed: 5) > Failed tests: 4, 8, 22, 24, 34 > Non-zero exit status: 1 > t7501-commit-basic-functionality.sh (Wstat: 256 (exited 1) Tests: 77 Failed: 4) > Failed tests: 27, 29, 39, 47 > Non-zero exit status: 1 > t7507-commit-verbose.sh (Wstat: 256 (exited 1) Tests: 45 Failed: 23) > Failed tests: 8-10, 13-14, 19-21, 23-24, 26-27, 29-30 > 32-33, 35-36, 38-39, 41-42, 44 > Non-zero exit status: 1 > t7502-commit-porcelain.sh (Wstat: 256 (exited 1) Tests: 81 Failed: 1) > Failed test: 39 > Non-zero exit status: 1 > t7508-status.sh (Wstat: 256 (exited 1) Tests: 125 Failed: 66) > Failed tests: 13-19, 21-35, 37-41, 50-54, 58-66, 69, 71-93 > 107 > Non-zero exit status: 1 > Files=1023, Tests=30126, 216 wallclock secs (10.62 usr 2.79 sys + 449.92 cusr 960.70 csys = 1424.03 CPU) > Result: FAIL > make[1]: *** [Makefile:73: prove] Error 1 > make[1]: Leaving directory '/build/git-2.47.2/t' > make: *** [Makefile:3273: test] Error 2 For full logs, run 'nix log /nix/store/m9iqhqfxxqs7p6jdj2jcf9aq2ygfiv0a-git-2.47.2.drv'. error: 1 dependencies of derivation '/nix/store/2i62rn1l27qy4gm30msn39i0ban9q5f1-git-2.47.2-fish-completions.drv' failed to build error: 1 dependencies of derivation '/nix/store/hx9d5rydwzi4inqhbfi33azafafv7071-home-manager-path.drv' failed to build error: 1 dependencies of derivation '/nix/store/whrrhjd3lwjv6kj6j7smd3xx1h3b1d3l-home-manager-generation.drv' failed to build}}} 근데 make test를 돌리려고 하는데 perl shebang이 hardcode되어있다. {{{ { fetchurl, fetchpatch, lib, stdenv, buildPackages, curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio, gnugrep, gnused, gawk, coreutils, # needed at runtime by git-filter-branch etc openssh, pcre2, bash, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45, libxslt, tcl, tk, makeWrapper, libiconv, libiconvReal, svnSupport ? false, subversionClient, perlLibs, smtpPerlLibs, perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform, nlsSupport ? true, osxkeychainSupport ? stdenv.hostPlatform.isDarwin, guiSupport ? false, withManual ? true, pythonSupport ? true, withpcre2 ? true, sendEmailSupport ? perlSupport, Security, CoreServices, nixosTests, withLibsecret ? false, pkg-config, glib, libsecret, gzip, # needed at runtime by gitweb.cgi withSsh ? false, sysctl, deterministic-host-uname, # trick Makefile into targeting the host platform when cross-compiling doInstallCheck ? !stdenv.hostPlatform.isDarwin, # extremely slow on darwin tests, }: assert osxkeychainSupport -> stdenv.hostPlatform.isDarwin; assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let version = "2.47.2"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in stdenv.mkDerivation (finalAttrs: { pname = "git" + lib.optionalString svnSupport "-with-svn" + lib.optionalString ( !svnSupport && !guiSupport && !sendEmailSupport && !withManual && !pythonSupport && !withpcre2 ) "-minimal"; inherit version; src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; hash = "sha256-sZJovmtvFVa0ep3YNCcuFn06dXQM3NKDzzgS7f/jkw8="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; separateDebugInfo = true; hardeningDisable = [ "format" ]; enableParallelBuilding = true; patches = [ ./docbook2texi.patch ./git-sh-i18n.patch ./git-send-email-honor-PATH.patch ./installCheck-path.patch ] ++ lib.optionals withSsh [ ./ssh-path.patch ] ++ lib.optionals (guiSupport && stdenv.hostPlatform.isDarwin) [ # Needed to workaround an issue in macOS where gitk shows a empty window # https://github.com/Homebrew/homebrew-core/issues/68798 # https://github.com/git/git/pull/944 (fetchpatch { name = "gitk_check_main_window_visibility_before_waiting_for_it_to_show.patch"; url = "https://github.com/git/git/commit/1db62e44b7ec93b6654271ef34065b31496cd02e.patch"; hash = "sha256-ntvnrYFFsJ1Ebzc6vM9/AMFLHMS1THts73PIOG5DkQo="; }) ]; postPatch = '' # Fix references to gettext introduced by ./git-sh-i18n.patch substituteInPlace git-sh-i18n.sh \ --subst-var-by gettext ${gettext} # ensure we are using the correct shell when executing the test scripts patchShebangs t/*.sh '' + lib.optionalString withSsh '' for x in connect.c git-gui/lib/remote_add.tcl ; do substituteInPlace "$x" \ --subst-var-by ssh "${openssh}/bin/ssh" done ''; nativeBuildInputs = [ deterministic-host-uname gettext perlPackages.perl makeWrapper pkg-config ] ++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ]; buildInputs = [ curl openssl zlib expat cpio (if stdenv.hostPlatform.isFreeBSD then libiconvReal else libiconv) bash ] ++ lib.optionals perlSupport [ perlPackages.perl ] ++ lib.optionals guiSupport [ tcl tk ] ++ lib.optionals withpcre2 [ pcre2 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ] ++ lib.optionals withLibsecret [ glib libsecret ]; # required to support pthread_cancel() NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s" + lib.optionalString (stdenv.hostPlatform.isFreeBSD) "-lthr"; configureFlags = [ "ac_cv_prog_CURL_CONFIG=${lib.getDev curl}/bin/curl-config" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_fread_reads_directories=yes" "ac_cv_snprintf_returns_bogus=no" "ac_cv_iconv_omits_bom=no" ]; preBuild = '' makeFlagsArray+=( perllibdir=$out/$(perl -MConfig -wle 'print substr $Config{installsitelib}, 1 + length $Config{siteprefixexp}') ) ''; makeFlags = [ "prefix=\${out}" ] # Git does not allow setting a shell separately for building and run-time. # Therefore lets leave it at the default /bin/sh when cross-compiling ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "SHELL_PATH=${stdenv.shell}" ++ (if perlSupport then [ "PERL_PATH=${perlPackages.perl}/bin/perl" ] else [ "NO_PERL=1" ]) ++ (if pythonSupport then [ "PYTHON_PATH=${python3}/bin/python" ] else [ "NO_PYTHON=1" ]) ++ lib.optionals stdenv.hostPlatform.isSunOS [ "INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON=" ] ++ (if stdenv.hostPlatform.isDarwin then [ "NO_APPLE_COMMON_CRYPTO=1" ] else [ "sysconfdir=/etc" ]) ++ lib.optionals stdenv.hostPlatform.isMusl [ "NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease" ] ++ lib.optional withpcre2 "USE_LIBPCRE2=1" ++ lib.optional (!nlsSupport) "NO_GETTEXT=1" # git-gui refuses to start with the version of tk distributed with # macOS Catalina. We can prevent git from building the .app bundle # by specifying an invalid tk framework. The postInstall step will # then ensure that git-gui uses tcl/tk from nixpkgs, which is an # acceptable version. # # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706 ++ lib.optional stdenv.hostPlatform.isDarwin "TKFRAMEWORK=/nonexistent"; disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ stdenv.shellPackage ]; postBuild = '' make -C contrib/subtree '' + (lib.optionalString perlSupport '' make -C contrib/diff-highlight '') + (lib.optionalString osxkeychainSupport '' make -C contrib/credential/osxkeychain '') + (lib.optionalString withLibsecret '' make -C contrib/credential/libsecret ''); ## Install # WARNING: Do not `rm` or `mv` files from the source tree; use `cp` instead. # We need many of these files during the installCheckPhase. installFlags = [ "NO_INSTALL_HARDLINKS=1" ]; preInstall = (lib.optionalString osxkeychainSupport '' mkdir -p $out/bin ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin/ rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o '') + (lib.optionalString withLibsecret '' mkdir -p $out/bin ln -s $out/share/git/contrib/credential/libsecret/git-credential-libsecret $out/bin/ rm -f $PWD/contrib/credential/libsecret/git-credential-libsecret.o ''); postInstall = '' notSupported() { unlink $1 || true } # Install git-subtree. make -C contrib/subtree install ${lib.optionalString withManual "install-doc"} rm -rf contrib/subtree # Install contrib stuff. mkdir -p $out/share/git cp -a contrib $out/share/git/ mkdir -p $out/share/bash-completion/completions ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git ln -s $out/share/git/contrib/completion/git-prompt.sh $out/share/bash-completion/completions/ # only readme, developed in another repo rm -r contrib/hooks/multimail mkdir -p $out/share/git-core/contrib cp -a contrib/hooks/ $out/share/git-core/contrib/ substituteInPlace $out/share/git-core/contrib/hooks/pre-auto-gc-battery \ --replace ' grep' ' ${gnugrep}/bin/grep' \ # grep is a runtime dependency, need to patch so that it's found substituteInPlace $out/libexec/git-core/git-sh-setup \ --replace ' grep' ' ${gnugrep}/bin/grep' \ --replace ' egrep' ' ${gnugrep}/bin/egrep' # Fix references to the perl, sed, awk and various coreutil binaries used by # shell scripts that git calls (e.g. filter-branch) SCRIPT="$(cat <<'EOS' BEGIN{ @a=( '${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk', '${coreutils}/bin/cut', '${coreutils}/bin/basename', '${coreutils}/bin/dirname', '${coreutils}/bin/wc', '${coreutils}/bin/tr' ${lib.optionalString perlSupport ", '${perlPackages.perl}/bin/perl'"} ); } foreach $c (@a) { $n=(split("/", $c))[-1]; s|(?<=[^#][^/.-])\b''${n}(?=\s)|''${c}|g } EOS )" perl -0777 -i -pe "$SCRIPT" \ $out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,submodule,subtree,web--browse} # Also put git-http-backend into $PATH, so that we can use smart # HTTP(s) transports for pushing ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend ln -s $out/share/git/contrib/git-jump/git-jump $out/bin/git-jump '' + lib.optionalString perlSupport '' # wrap perl commands makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/bin/git-credential-netrc \ --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" wrapProgram $out/libexec/git-core/git-cvsimport \ --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" wrapProgram $out/libexec/git-core/git-archimport \ --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" wrapProgram $out/libexec/git-core/git-instaweb \ --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" wrapProgram $out/libexec/git-core/git-cvsexportcommit \ --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" # gzip (and optionally bzip2, xz, zip) are runtime dependencies for # gitweb.cgi, need to patch so that it's found sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ $out/share/gitweb/gitweb.cgi # Give access to CGI.pm and friends (was removed from perl core in 5.22) for p in ${lib.concatStringsSep " " gitwebPerlLibs}; do sed -i -e "/use CGI /i use lib \"$p/${perlPackages.perl.libPrefix}\";" \ "$out/share/gitweb/gitweb.cgi" done '' + ( if svnSupport then '' # wrap git-svn wrapProgram $out/libexec/git-core/git-svn \ --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${ perlPackages.makePerlPath (perlLibs ++ [ svn.out ]) }" \ --prefix PATH : "${svn.out}/bin" '' else '' # replace git-svn by notification script notSupported $out/libexec/git-core/git-svn '' ) + ( if sendEmailSupport then '' # wrap git-send-email wrapProgram $out/libexec/git-core/git-send-email \ --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath smtpPerlLibs}" '' else '' # replace git-send-email by notification script notSupported $out/libexec/git-core/git-send-email '' ) + lib.optionalString withManual '' # Install man pages make -j $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ -C Documentation '' + ( if guiSupport then '' # Wrap Tcl/Tk programs for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \ -e "s|exec wish|exec '${tk}/bin/wish'|g" \ "$out/$prog" done ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/gitk '' else '' # Don't wrap Tcl/Tk, replace them by notification scripts for prog in bin/gitk libexec/git-core/git-gui; do notSupported "$out/$prog" done '' ) + lib.optionalString osxkeychainSupport '' # enable git-credential-osxkeychain on darwin if desired (default) mkdir -p $out/etc cat > $out/etc/gitconfig << EOF [credential] helper = osxkeychain EOF ''; ## InstallCheck doCheck = false; inherit doInstallCheck; installCheckTarget = "test"; # see also installCheckFlagsArray installCheckFlags = [ "DEFAULT_TEST_TARGET=prove" "PERL_PATH=${buildPackages.perl}/bin/perl" ]; nativeInstallCheckInputs = lib.optional ( stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD ) sysctl; preInstallCheck = '' installCheckFlagsArray+=( GIT_PROVE_OPTS="--jobs $NIX_BUILD_CORES --failures --state=failed,save" GIT_TEST_INSTALLED=$out/bin ${lib.optionalString (!svnSupport) "NO_SVN_TESTS=y"} ) function disable_test { local test=$1 pattern=$2 if [ $# -eq 1 ]; then mv t/{,skip-}$test.sh || true else sed -i t/$test.sh \ -e "/^\s*test_expect_.*$pattern/,/^\s*' *\$/{s/^/: #/}" fi } # Shared permissions are forbidden in sandbox builds: substituteInPlace t/test-lib.sh \ --replace "test_set_prereq POSIXPERM" "" # TODO: Investigate while these still fail (without POSIXPERM): # Tested to fail: 2.46.0 disable_test t0001-init 'shared overrides system' # Tested to fail: 2.46.0 disable_test t0001-init 'init honors global core.sharedRepository' # Tested to fail: 2.46.0 disable_test t1301-shared-repo # /build/git-2.44.0/contrib/completion/git-completion.bash: line 452: compgen: command not found disable_test t9902-completion # Our patched gettext never fallbacks disable_test t0201-gettext-fallbacks '' + lib.optionalString (!sendEmailSupport) '' # Disable sendmail tests disable_test t9001-send-email '' + '' # Flaky tests: disable_test t6421-merge-partial-clone # Fails reproducibly on ZFS on Linux with formD normalization disable_test t0021-conversion disable_test t3910-mac-os-precompose '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # XXX: Some tests added in 2.24.0 fail. # Please try to re-enable on the next release. disable_test t7816-grep-binary-pattern # fail (as of 2.33.0) #===( 18623;1208 8/? 224/? 2/? )= =fatal: Not a valid object name refs/tags/signed-empty disable_test t6300-for-each-ref # not ok 1 - populate workdir (with 2.33.1 on x86_64-darwin) disable_test t5003-archive-zip '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' disable_test t7527-builtin-fsmonitor '' + lib.optionalString stdenv.hostPlatform.isMusl '' # Test fails (as of 2.17.0, musl 1.1.19) disable_test t3900-i18n-commit # Fails largely due to assumptions about BOM # Tested to fail: 2.18.0 disable_test t0028-working-tree-encoding ''; stripDebugList = [ "lib" "libexec" "bin" "share/git/contrib/credential/libsecret" ]; passthru = { shellPath = "/bin/git-shell"; tests = { withInstallCheck = finalAttrs.finalPackage.overrideAttrs (_: { doInstallCheck = true; }); buildbot-integration = nixosTests.buildbot; } // tests.fetchgit; updateScript = ./update.sh; }; meta = { homepage = "https://git-scm.com/"; description = "Distributed version control system"; license = lib.licenses.gpl2; changelog = "https://github.com/git/git/blob/v${version}/Documentation/RelNotes/${version}.txt"; longDescription = '' Git, a popular distributed version control system designed to handle very large projects with speed and efficiency. ''; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ primeos wmertens globin kashw2 ]; mainProgram = "git"; }; }) }}} pkgs 원본 소스를 까봤는데 perlSupport 설정이 정신나갈 거 같다. 일단 그냥 symlink 강제로 박아서 해결할 듯. 일단 실행은 된다. {{{#!syntax sh not ok 42 - aborted --continue does not squash commits after "edit" # # old=$(git rev-parse HEAD) && # test_tick && # ( # set_fake_editor && # FAKE_LINES="edit 1" git rebase -i HEAD^ && # echo "edited again" > file7 && # git add file7 && # test_must_fail env FAKE_COMMIT_MESSAGE=" " git rebase --continue # ) && # test $old = $(git rev-parse HEAD) && # git rebase --abort # not ok 43 - auto-amend only edited commits after "edit" # # test_tick && # ( # set_fake_editor && # FAKE_LINES="edit 1" git rebase -i HEAD^ && # echo "edited again" > file7 && # git add file7 && # FAKE_COMMIT_MESSAGE="edited file7 again" git commit && # echo "and again" > file7 && # git add file7 && # test_tick && # test_must_fail env FAKE_COMMIT_MESSAGE="and again" \ # git rebase --continue # ) && # git rebase --abort # not ok 44 - clean error after failed "exec" # # test_tick && # test_when_finished "git rebase --abort || :" && # ( # set_fake_editor && # test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^ # ) && # echo "edited again" > file7 && # git add file7 && # test_must_fail git rebase --continue 2>error && # test_grep "you have staged changes in your working tree" error && # test_grep ! "could not open.*for reading" error # }}} {{{#!syntax cpp struct delta_index { unsigned long memsize; const void *src_buf; unsigned long src_size; unsigned int hash_mask; struct index_entry *hash[FLEX_ARRAY]; }; struct delta_index * create_delta_index(const void *buf, unsigned long bufsize) { unsigned int i, hsize, hmask, entries, prev_val, *hash_count; const unsigned char *data, *buffer = buf; struct delta_index *index; struct unpacked_index_entry *entry, **hash; struct index_entry *packed_entry, **packed_hash; void *mem; unsigned long memsize; if (!buf || !bufsize) return NULL; entries = (bufsize - 1) / RABIN_WINDOW; if (bufsize >= 0xffffffffUL) { entries = 0xfffffffeU / RABIN_WINDOW; } hsize = entries / 4; for (i = 4; (1u << i) < hsize; i++); hsize = 1 << i; hmask = hsize - 1; /* allocate lookup index */ memsize = sizeof(*hash) * hsize + sizeof(*entry) * entries; mem = malloc(memsize); if (!mem) return NULL; hash = mem; mem = hash + hsize; entry = mem; memset(hash, 0, hsize * sizeof(*hash)); hash_count = calloc(hsize, sizeof(*hash_count)); if (!hash_count) { free(hash); return NULL; } prev_val = ~0; for (data = buffer + entries * RABIN_WINDOW - RABIN_WINDOW; data >= buffer; data -= RABIN_WINDOW) { unsigned int val = 0; for (i = 1; i <= RABIN_WINDOW; i++) val = ((val << 8) | data[i]) ^ T[val >> RABIN_SHIFT]; if (val == prev_val) { entry[-1].entry.ptr = data + RABIN_WINDOW; --entries; } else { prev_val = val; i = val & hmask; entry->entry.ptr = data + RABIN_WINDOW; entry->entry.val = val; entry->next = hash[i]; hash[i] = entry++; hash_count[i]++; } } for (i = 0; i < hsize; i++) { int acc; if (hash_count[i] <= HASH_LIMIT) continue; entries -= hash_count[i] - HASH_LIMIT; entry = hash[i]; acc = 0; do { acc += hash_count[i] - HASH_LIMIT; if (acc > 0) { struct unpacked_index_entry *keep = entry; do { entry = entry->next; acc -= HASH_LIMIT; } while (acc > 0); keep->next = entry->next; } entry = entry->next; } while (entry); } free(hash_count); memsize = sizeof(*index) + sizeof(*packed_hash) * (hsize+1) + sizeof(*packed_entry) * entries; mem = malloc(memsize); if (!mem) { free(hash); return NULL; } index = mem; index->memsize = memsize; index->src_buf = buf; index->src_size = bufsize; index->hash_mask = hmask; mem = index->hash; packed_hash = mem; mem = packed_hash + (hsize+1); packed_entry = mem; for (i = 0; i < hsize; i++) { packed_hash[i] = packed_entry; for (entry = hash[i]; entry; entry = entry->next) *packed_entry++ = entry->entry; } packed_hash[hsize] = packed_entry; assert(packed_entry - (struct index_entry *)mem == entries); free(hash); return index; } void free_delta_index(struct delta_index *index) { free(index); } unsigned long sizeof_delta_index(struct delta_index *index) { if (index) return index->memsize; else return 0; } #define MAX_OP_SIZE (5 + 5 + 1 + RABIN_WINDOW + 7) void * create_delta(const struct delta_index *index, const void *trg_buf, unsigned long trg_size, unsigned long *delta_size, unsigned long max_size) { unsigned int i, val; off_t outpos, moff; size_t l, outsize, msize; int inscnt; const unsigned char *ref_data, *ref_top, *data, *top; unsigned char *out; *delta_size = 0; if (!trg_buf || !trg_size) return NULL; outpos = 0; outsize = 8192; if (max_size && outsize >= max_size) outsize = max_size + MAX_OP_SIZE + 1; out = malloc(outsize); if (!out) return NULL; l = index->src_size; while (l >= 0x80) { out[outpos++] = l | 0x80; l >>= 7; } out[outpos++] = l; l = trg_size; while (l >= 0x80) { out[outpos++] = l | 0x80; l >>= 7; } out[outpos++] = l; ref_data = index->src_buf; ref_top = ref_data + index->src_size; data = trg_buf; top = (const unsigned char *) trg_buf + trg_size; outpos++; val = 0; for (i = 0; i < RABIN_WINDOW && data < top; i++, data++) { out[outpos++] = *data; val = ((val << 8) | *data) ^ T[val >> RABIN_SHIFT]; } inscnt = i; moff = 0; msize = 0; while (data < top) { if (msize < 4096) { struct index_entry *entry; val ^= U[data[-RABIN_WINDOW]]; val = ((val << 8) | *data) ^ T[val >> RABIN_SHIFT]; i = val & index->hash_mask; for (entry = index->hash[i]; entry < index->hash[i+1]; entry++) { const unsigned char *ref = entry->ptr; const unsigned char *src = data; unsigned int ref_size = ref_top - ref; if (entry->val != val) continue; if (ref_size > top - src) ref_size = top - src; if (ref_size <= msize) break; while (ref_size-- && *src++ == *ref) ref++; if (msize < ref - entry->ptr) { msize = ref - entry->ptr; moff = entry->ptr - ref_data; if (msize >= 4096) break; } } } if (msize < 4) { if (!inscnt) outpos++; out[outpos++] = *data++; inscnt++; if (inscnt == 0x7f) { out[outpos - inscnt - 1] = inscnt; inscnt = 0; } msize = 0; } else { unsigned int left; unsigned char *op; if (inscnt) { while (moff && ref_data[moff-1] == data[-1]) { msize++; moff--; data--; outpos--; if (--inscnt) continue; outpos--; inscnt--; break; } out[outpos - inscnt - 1] = inscnt; inscnt = 0; } left = (msize < 0x10000) ? 0 : (msize - 0x10000); msize -= left; op = out + outpos++; i = 0x80; if (moff & 0x000000ff) out[outpos++] = moff >> 0, i |= 0x01; if (moff & 0x0000ff00) out[outpos++] = moff >> 8, i |= 0x02; if (moff & 0x00ff0000) out[outpos++] = moff >> 16, i |= 0x04; if (moff & 0xff000000) out[outpos++] = moff >> 24, i |= 0x08; if (msize & 0x00ff) out[outpos++] = msize >> 0, i |= 0x10; if (msize & 0xff00) out[outpos++] = msize >> 8, i |= 0x20; *op = i; data += msize; moff += msize; msize = left; if (moff > 0xffffffff) msize = 0; if (msize < 4096) { int j; val = 0; for (j = -RABIN_WINDOW; j < 0; j++) val = ((val << 8) | data[j]) ^ T[val >> RABIN_SHIFT]; } } if (outpos >= outsize - MAX_OP_SIZE) { void *tmp = out; outsize = outsize * 3 / 2; if (max_size && outsize >= max_size) outsize = max_size + MAX_OP_SIZE + 1; if (max_size && outpos > max_size) break; out = realloc(out, outsize); if (!out) { free(tmp); return NULL; } } } if (inscnt) out[outpos - inscnt - 1] = inscnt; if (max_size && outpos > max_size) { free(out); return NULL; } *delta_size = outpos; return out; } }}}
Liberty
|
the seed