projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zip-reader: Switch to a more usual error reporting mechanism.
[pspp]
/
tests
/
libpspp
/
zip-test.c
diff --git
a/tests/libpspp/zip-test.c
b/tests/libpspp/zip-test.c
index eded13e8bf67dccefeab4a547776716c96807c13..6590eb8e7817694933f4841e86e66cdee88badf1 100644
(file)
--- a/
tests/libpspp/zip-test.c
+++ b/
tests/libpspp/zip-test.c
@@
-30,7
+30,6
@@
#include <libpspp/str.h>
#include <errno.h>
#include <libpspp/str.h>
#include <errno.h>
-#include "xalloc.h"
\f
/* Exit with a failure code.
(Place a breakpoint on this function while debugging.) */
\f
/* Exit with a failure code.
(Place a breakpoint on this function while debugging.) */
@@
-43,52
+42,53
@@
check_die (void)
int
main (int argc, char **argv)
{
int
main (int argc, char **argv)
{
- if (
argc < 4)
+ if (argc < 4)
{
fprintf (stderr, "Usage zip-test: {r|w} archive file0 file1 ... filen\n");
check_die ();
}
{
fprintf (stderr, "Usage zip-test: {r|w} archive file0 file1 ... filen\n");
check_die ();
}
- if (
0 == strcmp ("w", argv[1]))
+ if (0 == strcmp ("w", argv[1]))
{
int i;
struct zip_writer *zw = zip_writer_create (argv[2]);
for (i = 3; i < argc; ++i)
{
{
int i;
struct zip_writer *zw = zip_writer_create (argv[2]);
for (i = 3; i < argc; ++i)
{
- FILE *fp = fopen (argv[i], "r");
- if (!fp
) check_die ();
+ FILE *fp = fopen (argv[i], "r
b
");
+ if (!fp) check_die ();
zip_writer_add (zw, fp, argv[i]);
}
zip_writer_close (zw);
}
zip_writer_add (zw, fp, argv[i]);
}
zip_writer_close (zw);
}
- else if (
0 == strcmp ("r", argv[1]))
+ else if (0 == strcmp ("r", argv[1]))
{
const int BUFSIZE=256;
char buf[BUFSIZE];
int i;
{
const int BUFSIZE=256;
char buf[BUFSIZE];
int i;
- struct
string st
r;
-
struct zip_reader *zr = zip_reader_create (argv[2], &st
r);
- if (
NULL == z
r)
+ struct
zip_reader *z
r;
+
char *error = zip_reader_create (argv[2], &z
r);
+ if (
erro
r)
{
{
- fprintf (stderr, "Could not create zip reader: %s\n",
ds_cstr (&str)
);
+ fprintf (stderr, "Could not create zip reader: %s\n",
error
);
check_die ();
}
for (i = 3; i < argc; ++i)
{
int x = 0;
check_die ();
}
for (i = 3; i < argc; ++i)
{
int x = 0;
- struct zip_member *zm ;
- FILE *fp = fopen (argv[i], "w");
- if ( NULL == fp)
+ FILE *fp = fopen (argv[i], "wb");
+ if (NULL == fp)
{
int e = errno;
fprintf (stderr, "Could not create file %s: %s\n", argv[i], strerror(e));
check_die ();
}
{
int e = errno;
fprintf (stderr, "Could not create file %s: %s\n", argv[i], strerror(e));
check_die ();
}
- zm = zip_member_open (zr, argv[i]);
- if ( NULL == zm)
+
+ struct zip_member *zm ;
+ char *error = zip_member_open (zr, argv[i], &zm);
+ if (error)
{
fprintf (stderr, "Could not open zip member %s from archive: %s\n",
{
fprintf (stderr, "Could not open zip member %s from archive: %s\n",
- argv[i],
ds_cstr (&str)
);
+ argv[i],
error
);
check_die ();
}
check_die ();
}
@@
-96,16
+96,20
@@
main (int argc, char **argv)
{
fwrite (buf, x, 1, fp);
}
{
fwrite (buf, x, 1, fp);
}
+ error = zip_member_steal_error (zm);
+ zip_member_finish (zm);
fclose (fp);
fclose (fp);
- if ( x < 0)
+
+ assert ((error != NULL) == (x < 0));
+ if (x < 0)
{
{
- fprintf (stderr, "Unzip failed: %s\n",
ds_cstr (&str)
);
+ fprintf (stderr, "Unzip failed: %s\n",
error
);
check_die ();
}
}
zip_reader_destroy (zr);
}
check_die ();
}
}
zip_reader_destroy (zr);
}
- else
+ else
exit (1);
return 0;
exit (1);
return 0;