Skip to content

Commit

Permalink
Merge pull request #13 from szcnick/dev
Browse files Browse the repository at this point in the history
CodeFormat Fix
  • Loading branch information
jinfeihan57 authored May 12, 2020
2 parents 48df501 + a16fc1a commit 2cd76ff
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 9 deletions.
26 changes: 22 additions & 4 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,26 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: build 7za
run: make 7za

run: |
make 7za
cd ./bin
7za a ta.7z ../CPP
7za x ta.7z
echo "compare file"
diff -r ../CPP ./CPP
echo "delete tmp file"
rm -rf ./ta.7z ./CPP
cd ..
- name: build 7z
run: make 7z

run: |
make 7z
cd ./bin
7z a t.7z ../CPP
7z x t.7z
echo "compare file"
diff -r ../CPP ./CPP
echo "delete tmp file"
rm -rf ./t.7z ./CPP
cd ..
8 changes: 4 additions & 4 deletions CPP/7zip/Compress/ShrinkDecoder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
{
_stack[i++] = _suffixes[cur];
cur = _parents[cur];
if (cur >= kNumItems || i >= kNumItems)
break;
if (cur >= kNumItems || i >= kNumItems)
break;
}

if (cur >= kNumItems || i >= kNumItems)
break;
if (cur >= kNumItems || i >= kNumItems)
break;

_stack[i++] = (Byte)cur;
lastChar2 = (Byte)cur;
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# README
# A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/).

This is the Github Page of [p7-Zip] with support of additional Codecs. The library used therefore is located here: [Multithreading Library](https://github.com/mcmilk/zstdmt)

Expand Down

0 comments on commit 2cd76ff

Please sign in to comment.