EliasFleckenstein03
/
plan9front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkg: more fixes

front
cinap_lenrek 2011-08-18 01:31:01 +02:00
parent 0aff2284b6
commit 50bdbb8f48
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/src/cmd/pkg/install
View File

@ -6,7 +6,7 @@ if(~ $#pkgpath 0)
cd /
mkdir -p /sys/lib/pkg
if (test -s /sys/lib/pkg/$1) {
echo $i already installed
echo $1 already installed
exit
}
echo Installing $1

20
sys/src/cmd/pkg/unpkg.c
View File

@ -56,6 +56,7 @@ void main(int argc, char *argv[]) {
struct th th;
ulong off;
uchar b[512];
char err[ERRMAX];
DigestState *s;
int r, wfd;
@ -76,13 +77,18 @@ void main(int argc, char *argv[]) {
sysfatal("%r", th.name);
s = nil;
for(off=0; off<th.size; off+=512) {
int n = th.size-off;
n = n<512 ? n : 512;
if(readn(0, b, 512) != 512)
sysfatal("%r");
if(write(wfd, b, n) != n)
sysfatal("%s: %r", th.name);
s = sha1(b, n, nil, s);
if(readn(0, b, 512) == 512){
if((r = th.size-off) > 512)
r = 512;
if(write(wfd, b, r) == r){
s = sha1(b, r, nil, s);
continue;
}
}
errstr(err, sizeof(err));
remove(th.name);
errstr(err, sizeof(err));
sysfatal("%s: %r", th.name);
}
uchar digest[20], hdigest[41];