diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2005-05-11 17:02:38 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2005-05-11 17:02:38 +0000 |
| commit | 5cf3bf70f713d6c1ba70dea3ccd2487b0fc60e19 (patch) | |
| tree | aff2fa8788dfc58664aaf5b0e32d53ce7764353c /usr.bin/mkuzip | |
| parent | d81c813f107f591dc76a50e81c437bfe6a457001 (diff) | |
| download | src-test-5cf3bf70f713d6c1ba70dea3ccd2487b0fc60e19.tar.gz src-test-5cf3bf70f713d6c1ba70dea3ccd2487b0fc60e19.zip | |
- check for geom_uzip module presence using kldstat -m.
kldstat -m finds geom_uzip module even if it is compiled in statically.
- create output file with x bit set.
- build mkuzip on all architectures (verified with "make universe").
- fix typo in info message.
Notes
Notes:
svn path=/head/; revision=146107
Diffstat (limited to 'usr.bin/mkuzip')
| -rw-r--r-- | usr.bin/mkuzip/mkuzip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/mkuzip/mkuzip.c b/usr.bin/mkuzip/mkuzip.c index d29e639590428..2f770ffec37b3 100644 --- a/usr.bin/mkuzip/mkuzip.c +++ b/usr.bin/mkuzip/mkuzip.c @@ -30,7 +30,7 @@ #define CLOOP_MAGIC_LEN 128 static char CLOOP_MAGIC_START[] = "#!/bin/sh\n#V2.0 Format\n" - "m=geom_uzip\n(kldstat -n $m 2>&-||kldload $m)>&-&&" + "m=geom_uzip\n(kldstat -m $m 2>&-||kldload $m)>&-&&" "mount_cd9660 /dev/`mdconfig -af $0`.uzip $1\nexit $?\n"; static char *readblock(int, char *, u_int32_t); @@ -141,7 +141,7 @@ int main(int argc, char **argv) /* Not reached */ } fdw = open(oname, O_WRONLY | O_TRUNC | O_CREAT, - S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); if (fdw < 0) { err(1, "%s", oname); /* Not reached */ @@ -160,7 +160,7 @@ int main(int argc, char **argv) if (verbose != 0) fprintf(stderr, "data size %ju bytes, number of clusters " - "%u, index lengh %zu bytes\n", sb.st_size, + "%u, index length %zu bytes\n", sb.st_size, hdr.nblocks, iov[1].iov_len); for(i = 0; i == 0 || ibuf != NULL; i++) { |