commit fa434634c3b4a079df7fb045f44cfd646709f295
parent 4c1ab60bf8db6ea52f74bfc8824e576a3e383c3e
Author: ukai <ukai>
Date: Thu, 31 Jan 2002 09:43:14 +0000
[w3m-dev 02955] compression_decoders error message
* file.c (uncompress_stream): redirect stderr
* inflate.c (main): print error message
From: Fumitoshi UKAI <ukai@debian.or.jp>
Diffstat:
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,11 @@
2002-01-31 Fumitoshi UKAI <ukai@debian.or.jp>
+ * [w3m-dev 02955] compression_decoders error message
+ * file.c (uncompress_stream): redirect stderr
+ * inflate.c (main): print error message
+
+2002-01-31 Fumitoshi UKAI <ukai@debian.or.jp>
+
* [w3m-dev 02949] fix for #undef USE_MIGEMO
* main.c (dispincsrch): need #ifdef USE_MIGEMO
diff --git a/file.c b/file.c
@@ -6618,6 +6618,7 @@ uncompress_stream(URLFile *uf)
dup2(fd2[0], 0);
}
dup2(fd1[1], 1);
+ dup2(fd1[1], 2);
execlp(expand_cmd, expand_name, NULL);
exit(0);
}
diff --git a/inflate.c b/inflate.c
@@ -16,8 +16,10 @@ main(int argc, char **argv)
if (argc > 1) {
f = fopen(argv[1], "rb");
- if (!f)
+ if (!f) {
+ fprintf(stderr, "%s: cannot open %s\n", argv[0], argv[1]);
exit(1);
+ }
}
else
f = stdin;
@@ -26,8 +28,10 @@ main(int argc, char **argv)
s.zfree = Z_NULL;
s.opaque = Z_NULL;
status = inflateInit(&s);
- if (status != Z_OK)
+ if (status != Z_OK) {
+ fprintf(stderr, "%s: inflateInit() %s\n", argv[0], zError(status));
exit(1);
+ }
s.avail_in = 0;
s.next_out = (Bytef *) outbuf;
s.avail_out = sizeof(outbuf);
@@ -43,8 +47,10 @@ main(int argc, char **argv)
fwrite(outbuf, 1, sizeof(outbuf) - s.avail_out, stdout);
break;
}
- if (status != Z_OK)
+ if (status != Z_OK) {
+ fprintf(stderr, "%s: inflate() %s\n", argv[0], zError(status));
exit(1);
+ }
if (s.avail_out == 0) {
fwrite(outbuf, 1, sizeof(outbuf), stdout);
s.next_out = (Bytef *) outbuf;