Fix race condition in make and exit status of rahash2

This commit is contained in:
pancake 2013-03-04 00:44:46 +01:00
parent 53cf98c8df
commit 27c38164cf
2 changed files with 5 additions and 4 deletions

View file

@ -219,7 +219,7 @@ int main(int argc, char **argv) {
return 1;
}
for (i=optind; i<argc; i++) {
for (ret=0, i=optind; i<argc; i++) {
io = r_io_new ();
if (r_file_is_directory (argv[i])) {
eprintf ("rahash2: Cannot hash directories\n");
@ -229,7 +229,8 @@ int main(int argc, char **argv) {
eprintf ("rahash2: Cannot open '%s'\n", argv[i]);
return 1;
}
ret = do_hash (argv[i], algo, io, bsize, rad);
ret |= do_hash (argv[i], algo, io, bsize, rad);
r_io_free (io);
}
return ret;
}

View file

@ -7,8 +7,8 @@ LFX=${DESTDIR}/${LIBDIR}
IFX=${DESTDIR}/${INCLUDEDIR}
PWD=$(shell pwd)
LIBS0=util hash socket
LIBS1=reg cons db magic lib diff bp search config
LIBS0=util hash
LIBS1=reg cons db magic lib diff bp search config socket
LIBS2=syscall cmd lang io crypto flags bin
LIBS3=fs anal
LIBS4=parse sign